Feature/reserve identifier with new issue url

CodecheckPlugin.php

@@ -21,6 +21,7 @@
 use APP\plugins\generic\codecheck\controllers\page\CodecheckPageHandler;
 use APP\plugins\generic\codecheck\classes\CodecheckRoles\CodecheckRoleArray;
 use APP\plugins\generic\codecheck\classes\CodecheckRoles\CodecheckRoleManager;
+use APP\core\Request;
 
 class CodecheckPlugin extends GenericPlugin
 {
@@ -249,7 +250,7 @@ public function addOptInCheckbox(string $hookName, \PKP\components\forms\FormCom
             $request = Application::get()->getRequest();
             $context = $request->getContext();
             $codecheckMode = $this->getSetting($context->getId(), Constants::CODECHECK_MODE);
-            error_log("[CODECHECK Settings] Mode: " . $codecheckMode);
+            CodecheckLogger::debug("Settings Mode: " . $codecheckMode);
             $checkboxValue = false;
             $checkboxDisabled = false;
             $codecheckDescription = __('plugins.generic.codecheck.optIn.description', [
@@ -380,11 +381,13 @@ public function manage($args, $request): JSONMessage
 
     public function setEnabled($enabled, $contextId = null)
     {
+        CodecheckLogger::debug("Plugin Enabled!");
         $result = parent::setEnabled($enabled, $contextId);
 
         if ($enabled) {
-            $this->migration = new CodecheckSchemaMigration();
-            $this->migration->up();
+            $migration = new CodecheckSchemaMigration();
+            $migration->up();
+            $migration->issueLabelsUp();
         }
 
         return $result;
@@ -395,6 +398,8 @@ public function resetSchema(): void
         $this->migration = new CodecheckSchemaMigration();
         $this->migration->down();
         $this->migration->up();
+        $this->migration->issueLabelsDown();
+        $this->migration->issueLabelsUp();
     }
 }
 

classes/CodecheckRegister/CertificateIdentifierList.php

@@ -30,13 +30,18 @@ function __construct()
      * @return CertificateIdentifierList Returns a new List containing all fetched Certificate Identifiers from GitHub
      */
     static function fromApi(
-        CodecheckGithubRegisterApiClient $codecheckGithubRegisterApiClient
+        CodecheckGithubRegisterApiClient $codecheckGithubRegisterApiClient,
+        ?bool $onlyNewestIdentifiers
     ): CertificateIdentifierList {
         $newCertificateIdentifierList = new CertificateIdentifierList();
 
         // fetch API
         try {
-            $codecheckGithubRegisterApiClient->fetchIssues();
+            if($onlyNewestIdentifiers == true) {
+                $codecheckGithubRegisterApiClient->fetchNewestIssues();
+            } else {
+                $codecheckGithubRegisterApiClient->fetchAllIssues();
+            }
         } catch (ApiFetchException $ae) {
             CodecheckLogger::error($ae->getMessage());
             throw $ae;
@@ -45,7 +50,46 @@ static function fromApi(
             throw $me;
         }
 
-        foreach ($codecheckGithubRegisterApiClient->getIssues() as $issue) {
+        return CertificateIdentifierList::createNewCertificateIdentifierList(
+            $codecheckGithubRegisterApiClient->getIssues(),
+            $newCertificateIdentifierList
+        );
+    }
+
+    /**
+     * Factory Method to create a new CertificateIdentifierList from a GitHub API fetch
+     * 
+     * @param CodecheckGithubRegisterApiClient $codecheckGithubRegisterApiClient The APIParser for the GitHub Issues
+     * @return CertificateIdentifierList Returns a new List containing all fetched Certificate Identifiers from GitHub
+     */
+    static function fromApiWithIdentifier(
+        CodecheckGithubRegisterApiClient $codecheckGithubRegisterApiClient,
+        CertificateIdentifier $certificateIdentifier
+    ): CertificateIdentifierList {
+        $newCertificateIdentifierList = new CertificateIdentifierList();
+
+        // fetch API
+        try {
+            $codecheckGithubRegisterApiClient->fetchIssueByIdentifier($certificateIdentifier);
+        } catch (ApiFetchException $ae) {
+            CodecheckLogger::error($ae->getMessage());
+            throw $ae;
+        } catch (NoMatchingIssuesFoundException $me) {
+            CodecheckLogger::error($me->getMessage());
+            throw $me;
+        }
+
+        return CertificateIdentifierList::createNewCertificateIdentifierList(
+            $codecheckGithubRegisterApiClient->getIssues(),
+            $newCertificateIdentifierList
+        );
+    }
+
+    private static function createNewCertificateIdentifierList(
+        array $issues,
+        CertificateIdentifierList $newCertificateIdentifierList
+    ): CertificateIdentifierList {
+        foreach ($issues as $issue) {
             // raw identifier (can still have ranges of identifiers);
             $rawIdentifier = CertificateIdentifierList::getRawIdentifier($issue['title']);
 
@@ -56,7 +100,7 @@ static function fromApi(
             }
 
             // append to all identifiers in new Register
-            $newCertificateIdentifierList->appendToCertificateIdList($rawIdentifier);
+            $newCertificateIdentifierList->appendToCertificateIdList($rawIdentifier, $issue);
         }
 
         // return the new Register
@@ -98,10 +142,11 @@ public static function getRawIdentifier(string $title): ?string
     /**
      * Appends a raw Identifier to the list of Certificate Identifiers
      * 
-     * @param string $rawidentifier The raw Identifier to be appended
+     * @param string $rawIdentifier The raw Identifier to be appended
+     * @param array $issue The GitHub Issue information of the raw Identifier to be appended
      * @return void
      */
-    public function appendToCertificateIdList(string $rawIdentifier): void
+    public function appendToCertificateIdList(string $rawIdentifier, array $issue): void
     {
         // list of certificate identifiers in range
         $idRange = [];
@@ -111,25 +156,33 @@ public function appendToCertificateIdList(string $rawIdentifier): void
             // split into "fromIdStr" and "toIdStr"
             list($fromIdStr, $toIdStr) = explode('/', $rawIdentifier);
 
-            $from_identifier = CertificateIdentifier::fromStr($fromIdStr);
-            $to_identifier = CertificateIdentifier::fromStr($toIdStr);
+            $fromIdentifier = CertificateIdentifier::fromStr($fromIdStr);
+            $toIdentifier = CertificateIdentifier::fromStr($toIdStr);
 
             // append to $idRange list
-            for ($id_count = $from_identifier->getNumber(); $id_count <= $to_identifier->getNumber(); $id_count++) {
-                $new_identifier = new CertificateIdentifier($from_identifier->getYear(), $id_count);
+            for ($id_count = $fromIdentifier->getNumber(); $id_count <= $toIdentifier->getNumber(); $id_count++) {
+                $newIdentifier = new CertificateIdentifier($fromIdentifier->getYear(), $id_count);
                 // append new identifier
-                $idRange[] = $new_identifier;
+                $idRange[] = [
+                    'identifier' => $newIdentifier,
+                    'issueUrl' => $issue['html_url'],
+                    'issueNumber' => $issue['number']
+                ];
             }
         }
         // if it isn't a list then just append on identifier
         else {
-            $new_identifier = CertificateIdentifier::fromStr($rawIdentifier);
-            $idRange[] = $new_identifier;
+            $newIdentifier = CertificateIdentifier::fromStr($rawIdentifier);
+            $idRange[] = [
+                'identifier' => $newIdentifier,
+                'issueUrl' => $issue['html_url'],
+                'issueNumber' => $issue['number']
+            ];
         }
 
         // append to all certificate identifiers
         foreach ($idRange as $identifier) {
-            if (!$this->uniqueArray->contains($identifier)) {
+            if (!$this->uniqueArray->containsIdentifier($identifier)) {
                 $this->uniqueArray->add($identifier);
             }
         }
@@ -142,11 +195,11 @@ public function sortAsc(): void
     {
         $this->uniqueArray->sort(function($a, $b) {
             // First, compare year
-            if ($a->getYear() !== $b->getYear()) {
-                return $a->getYear() <=> $b->getYear();
+            if ($a['identifier']->getYear() !== $b['identifier']->getYear()) {
+                return $a['identifier']->getYear() <=> $b['identifier']->getYear();
             }
             // If years are equal, compare ID
-            return $a->getNumber() <=> $b->getNumber();
+            return $a['identifier']->getNumber() <=> $b['identifier']->getNumber();
         });
     }
 
@@ -157,11 +210,11 @@ public function sortDesc(): void
     {
         $this->uniqueArray->sort(function($a, $b) {
             // First, compare year descending
-            if ($a->getYear() !== $b->getYear()) {
-                return $b->getYear() <=> $a->getYear();
+            if ($a['identifier']->getYear() !== $b['identifier']->getYear()) {
+                return $b['identifier']->getYear() <=> $a['identifier']->getYear();
             }
             // If years are equal, compare ID descending
-            return $b->getNumber() <=> $a->getNumber();
+            return $b['identifier']->getNumber() <=> $a['identifier']->getNumber();
         });
     }
 
@@ -184,7 +237,7 @@ public function getNewestIdentifier(): CertificateIdentifier
     {
         $this->sortDesc();
         // get first element of sort descending -> newest element
-        return $this->uniqueArray->at(0);
+        return $this->uniqueArray->at(0)['identifier'];
     }
 
     /**
@@ -194,10 +247,21 @@ public function getNewestIdentifier(): CertificateIdentifier
      */
     public function toStr(): string
     {
-        $return_str = "Certificate Identifiers:\n";
-        foreach ($this->uniqueArray->toArray() as $identifier) {
-            $return_str .= $identifier->toStr() . "\n";
+        $returnStr = "Certificate Identifiers:\n";
+        foreach ($this->uniqueArray->toArray() as $identifierInformation) {
+            $returnStr .= $identifierInformation['identifier']->toStr() . "\n";
         }
-        return $return_str;
+        return $returnStr;
+    }
+
+    public function getIssueInformationByIdentifier(CertificateIdentifier $identifier): ?array
+    {
+        foreach ($this->uniqueArray->toArray() as $identifierInformation) {
+            if($identifierInformation['identifier']->toStr() == $identifier->toStr()){
+                return $identifierInformation;
+            }
+        }
+
+        return null;
     }
 }