PIMAG-687 | Bugfix: Fix first setup:upgrade issues #822

.github/workflows/end-2-end-test.yml

@@ -92,7 +92,7 @@ jobs:
         run: |
           docker exec magento-project-community-edition php /data/merge-config.php
           docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment"
-          docker exec magento-project-community-edition ./retry "php bin/magento setup:upgrade --no-interaction"
+          docker exec magento-project-community-edition ./retry "php bin/magento setup:upgrade --keep-generated --no-interaction"
           docker exec magento-project-community-edition /bin/bash /data/configure-mollie.sh
           docker exec magento-project-community-edition ./retry "bin/magento config:set payment/mollie_general/use_webhooks custom_url"
           docker exec magento-project-community-edition ./retry "bin/magento config:set payment/mollie_general/custom_webhook_url ${{ env.magento_url }}/mollie/checkout/webhook"

.github/workflows/integration-test.yml

@@ -30,7 +30,7 @@ jobs:
         run: docker cp $(pwd) magento-project-community-edition:/data/extensions/ && docker exec magento-project-community-edition ./install-composer-package mollie/magento2:@dev
 
       - name: Activate the extension
-        run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade"
+        run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade --keep-generated"
 
       - name: Run tests
         run: docker exec magento-project-community-edition bash -c "cd /data/dev/tests/integration/ && /data/vendor/bin/phpunit -c /data/dev/tests/integration/phpunit.xml"

.github/workflows/phpstan.yml

@@ -37,7 +37,7 @@ jobs:
               run: docker exec magento-project-community-edition ./install-composer-package mollie/magento2:@dev
 
             - name: Activate the extension
-              run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade && php bin/magento setup:di:compile"
+              run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade --keep-generated && php bin/magento setup:di:compile"
 
             - name: Run PHPStan
               continue-on-error: ${{ matrix.PHPSTAN_LEVEL == 2 }}

.github/workflows/unit-test.yml

@@ -30,7 +30,7 @@ jobs:
         run: docker cp $(pwd) magento-project-community-edition:/data/extensions/ && docker exec magento-project-community-edition ./install-composer-package mollie/magento2:@dev
 
       - name: Activate the extension
-        run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade && php bin/magento setup:di:compile"
+        run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Mollie_Payment && php bin/magento setup:upgrade --keep-generated && php bin/magento setup:di:compile"
 
       - name: Run tests
         run: docker exec magento-project-community-edition bash -c "vendor/bin/phpunit extensions/*/Test/Unit"

Setup/Patch/Data/EncryptFallbackKeys.php

@@ -8,53 +8,48 @@
 
 namespace Mollie\Payment\Setup\Patch\Data;
 
-use Magento\Framework\Api\Search\SearchCriteriaBuilder;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
-use Mollie\Payment\Api\ApiKeyFallbackRepositoryInterface;
 
 class EncryptFallbackKeys implements DataPatchInterface
 {
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-    /**
-     * @var ApiKeyFallbackRepositoryInterface
-     */
-    private $apiKeyFallbackRepository;
     /**
      * @var EncryptorInterface
      */
     private $encryptor;
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
 
     public function __construct(
-        SearchCriteriaBuilder $searchCriteriaBuilder,
-        ApiKeyFallbackRepositoryInterface $apiKeyFallbackRepository,
-        EncryptorInterface $encryptor
+        EncryptorInterface $encryptor,
+        ResourceConnection $resourceConnection
     ) {
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->apiKeyFallbackRepository = $apiKeyFallbackRepository;
         $this->encryptor = $encryptor;
+        $this->resourceConnection = $resourceConnection;
     }
 
     public function apply()
     {
-        $criteria = $this->searchCriteriaBuilder->create();
-        $list = $this->apiKeyFallbackRepository->getList($criteria);
+        $connection = $this->resourceConnection->getConnection();
+        $tableName = $connection->getTableName('mollie_payment_apikey_fallback');
 
-        if ($list->getTotalCount() === 0) {
+        if (!$connection->isTableExists($tableName)) {
             return $this;
         }
 
-        foreach ($list->getItems() as $item) {
-            $start = substr($item->getApiKey(), 0, 4);
+        $query = 'select * from ' . $tableName;
+        $result = $connection->fetchAll($query);
+        foreach ($result as $row) {
+            $start = substr($row['api_key'], 0, 4);
             if (!in_array($start, ['live', 'test'])) {
                 continue;
             }
 
-            $item->setApiKey($this->encryptor->encrypt($item->getApiKey()));
-            $this->apiKeyFallbackRepository->save($item);
+            $encrypted = $this->encryptor->encrypt($row['api_key']);
+            $connection->update($tableName, ['api_key' => $encrypted], ['id = ?' => $row['id']]);
         }
 
         return $this;