fix: auto-translate older carrier ids to the current ones (#60)

myparcelnl · Nov 15, 2021 · 5f9a037 · 5f9a037
1 parent 5bdae81
commit 5f9a037
Showing 1 changed file with 38 additions and 9 deletions.
diff --git a/src/Service/CarrierConfigurationProvider.php b/src/Service/CarrierConfigurationProvider.php
@@ -13,26 +13,31 @@ class CarrierConfigurationProvider
      */
     private static $configuration;
 
+    /**
+     * @var array
+     */
+    private static $legacyCarrierIdMap;
+
     /**
      * @var string
      */
     private static $table = Table::TABLE_CARRIER_CONFIGURATION;
 
     /**
-     * @param  int    $carrierId
-     * @param  string $name
-     * @param  null   $default
+     * @param int    $carrierId
+     * @param string $name
+     * @param null   $default
      *
      * @return null|mixed
      * @throws \PrestaShopDatabaseException
      */
     public static function get(int $carrierId, string $name, $default = null)
     {
+        self::fetchLegacyCarrierIdMap();
         if (! isset(static::$configuration[$carrierId][$name])) {
-            $query = (new DbQuery())
-                ->select('name, value')
+            $query = (new DbQuery())->select('name, value')
                 ->from(self::$table)
-                ->where('id_carrier = ' . $carrierId);
+                ->where('id_carrier = ' . (static::$legacyCarrierIdMap[$carrierId] ?? 0));
 
             $result = Db::getInstance()
                 ->executeS($query);
@@ -48,9 +53,9 @@ public static function get(int $carrierId, string $name, $default = null)
     }
 
     /**
-     * @param  int    $carrierId
-     * @param  string $name
-     * @param  string $value
+     * @param int    $carrierId
+     * @param string $name
+     * @param string $value
      */
     public static function updateValue(int $carrierId, string $name, string $value): void
     {
@@ -61,4 +66,28 @@ public static function updateValue(int $carrierId, string $name, string $value):
                 'id_carrier = ' . $carrierId . ' AND name = "' . pSQL($name) . '" '
             );
     }
+
+    /**
+     * @throws \PrestaShopDatabaseException
+     */
+    private static function fetchLegacyCarrierIdMap(): void
+    {
+        if (isset(static::$legacyCarrierIdMap)) {
+            return;
+        }
+
+        $query = new DbQuery();
+        $query->select('current.id_carrier as current_carrier_id, old.id_carrier as old_carrier_id');
+        $query->from(Table::withPrefix('carrier'), 'current');
+        $query->innerJoin(Table::withPrefix('carrier'), 'old', 'old.name = current.name');
+        $query->where('current.active=1');
+        $query->where('current.deleted=0');
+        $query->orderBy('current.id_carrier DESC');
+
+        $rows = Db::getInstance(_PS_USE_SQL_SLAVE_)
+            ->executeS($query);
+        foreach ($rows as $row) {
+            static::$legacyCarrierIdMap[$row['old_carrier_id']] = $row['current_carrier_id'];
+        }
+    }
 }