fix: deleted object v4 (#387)

Co-authored-by: Guillaume Lepoetre <[email protected]>
PrestaShopCorp · Oct 31, 2024 · 47e9406 · 47e9406
1 parent dbcdbab
commit 47e9406
Show file tree

Hide file tree

Showing 182 changed files with 2,365 additions and 2,304 deletions.
diff --git a/README.md b/README.md
@@ -118,9 +118,9 @@ const SHOP_CONTENTS = [
 ];
 ```
 
-Create a service "planesService.php" (in plural) in the [shop content services folder](src/Service/ShopContent/) that implements the [ShopContentServiceInterface.php](src/Service/ShopContent/ShopContentServiceInterface.php) interface. For the method structure, use the existing base on all other shop content services to maintain consistency.
+Create a service "planesService.php" (in plural) in the [shop content services folder](src/Service/ShopContent/) that extends the [ShopContentAbstractService](src/Service/ShopContent/ShopContentAbstractService.php) and implements the [ShopContentServiceInterface.php](src/Service/ShopContent/ShopContentServiceInterface.php) interface. For the method structure, use the existing base on all other shop content services to maintain consistency.
 ```PHP
-class PlanesService implements ShopContentServiceInterface
+class PlanesService extends ShopContentAbstractService implements ShopContentServiceInterface
 {
   ...  
 }

diff --git a/e2e-env/cloudsync-mock/src/lib/collector-api.ts b/e2e-env/cloudsync-mock/src/lib/collector-api.ts
@@ -1,25 +1,26 @@
 import { Server } from "./server";
-import {WsServer} from "./ws-server";
+import { WsServer } from "./ws-server";
 // @ts-expect-error we don't care about packaging here
 import multer from "multer";
 
-const storage = multer.memoryStorage()
-const upload = multer({ storage })
+const storage = multer.memoryStorage();
+const upload = multer({ storage });
 
 export class CollectorApiServer extends Server {
-  public constructor( probe: WsServer) {
-    super( probe);
+  public constructor(probe: WsServer) {
+    super(probe);
 
     this.api.get("/", (_req, res) => {
       res.status(200).end();
     });
 
-    this.api.post("/upload/:jobid", upload.single('file'), (req, res) => {
+    this.api.post("/upload/:jobid", upload.single("file"), (req, res) => {
       const jobId = req.params.jobid;
       if (jobId.startsWith("valid-job-")) {
-        req.body.file = req.file.buffer.toString()
-          .split('\n')
-          .map(line => JSON.parse(line.trim()))
+        req.body.file = req.file.buffer
+          .toString()
+          .split("\n")
+          .map((line) => JSON.parse(line.trim()));
         res.status(201).end();
       } else {
         res.status(500).end();

diff --git a/e2e/package.json b/e2e/package.json
@@ -27,6 +27,7 @@
     "jest-expect-message": "^1.1.3",
     "jest-extended": "^4.0.2",
     "jest-mock-extended": "^3.0.7",
+    "object-hash": "3.0.0", 
     "prettier": "^3.3.3",
     "ramda": "^0.30.1",
     "rxjs": "^7.8.1",

diff --git a/e2e/pnpm-lock.yaml b/e2e/pnpm-lock.yaml
diff --git a/e2e/src/fixtures/1.6/carrier_details.json b/e2e/src/fixtures/1.6/carrier_details.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "2-1-range_weight-1",
+    "action": "upsert",
     "collection": "carrier_details",
     "properties": {
       "id_reference": "2",
@@ -16,7 +16,7 @@
     }
   },
   {
-    "id": "2-2-range_weight-1",
+    "action": "upsert",
     "collection": "carrier_details",
     "properties": {
       "id_reference": "2",

diff --git a/e2e/src/fixtures/1.6/carriers.json b/e2e/src/fixtures/1.6/carriers.json
@@ -1,7 +1,7 @@
 [
   {
+    "action": "upsert",
     "collection": "carriers",
-    "id": "1",
     "properties": {
       "id_carrier": "1",
       "id_reference": "1",
@@ -30,8 +30,8 @@
     }
   },
   {
+    "action": "upsert",
     "collection": "carriers",
-    "id": "2",
     "properties": {
       "id_carrier": "2",
       "id_reference": "2",

diff --git a/e2e/src/fixtures/1.6/cart_products.json b/e2e/src/fixtures/1.6/cart_products.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "1-2-10",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "1",
@@ -12,7 +12,7 @@
     }
   },
   {
-    "id": "1-3-13",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "1",
@@ -24,7 +24,7 @@
     }
   },
   {
-    "id": "2-2-10",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "2",
@@ -36,7 +36,7 @@
     }
   },
   {
-    "id": "2-6-32",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "2",
@@ -48,7 +48,7 @@
     }
   },
   {
-    "id": "2-7-34",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "2",
@@ -60,7 +60,7 @@
     }
   },
   {
-    "id": "3-1-1",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "3",
@@ -72,7 +72,7 @@
     }
   },
   {
-    "id": "3-2-10",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "3",
@@ -84,7 +84,7 @@
     }
   },
   {
-    "id": "3-6-32",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "3",
@@ -96,7 +96,7 @@
     }
   },
   {
-    "id": "4-1-1",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "4",
@@ -108,7 +108,7 @@
     }
   },
   {
-    "id": "4-3-13",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "4",
@@ -120,7 +120,7 @@
     }
   },
   {
-    "id": "4-5-19",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "4",
@@ -132,7 +132,7 @@
     }
   },
   {
-    "id": "4-7-34",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "4",
@@ -144,7 +144,7 @@
     }
   },
   {
-    "id": "5-1-1",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "5",
@@ -156,7 +156,7 @@
     }
   },
   {
-    "id": "5-2-7",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "5",
@@ -168,7 +168,7 @@
     }
   },
   {
-    "id": "5-3-13",
+    "action": "upsert",
     "collection": "cart_products",
     "properties": {
       "id_cart": "5",

diff --git a/e2e/src/fixtures/1.6/carts.json b/e2e/src/fixtures/1.6/carts.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "1",
+    "action": "upsert",
     "collection": "carts",
     "properties": {
       "id_cart": "1",
@@ -9,7 +9,7 @@
     }
   },
   {
-    "id": "2",
+    "action": "upsert",
     "collection": "carts",
     "properties": {
       "id_cart": "2",
@@ -18,7 +18,7 @@
     }
   },
   {
-    "id": "3",
+    "action": "upsert",
     "collection": "carts",
     "properties": {
       "id_cart": "3",
@@ -27,7 +27,7 @@
     }
   },
   {
-    "id": "4",
+    "action": "upsert",
     "collection": "carts",
     "properties": {
       "id_cart": "4",
@@ -36,7 +36,7 @@
     }
   },
   {
-    "id": "5",
+    "action": "upsert",
     "collection": "carts",
     "properties": {
       "id_cart": "5",

diff --git a/e2e/src/fixtures/1.6/categories.json b/e2e/src/fixtures/1.6/categories.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "1-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "1-en",
@@ -18,7 +18,7 @@
     }
   },
   {
-    "id": "2-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "2-en",
@@ -36,7 +36,7 @@
     }
   },
   {
-    "id": "3-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "3-en",
@@ -54,7 +54,7 @@
     }
   },
   {
-    "id": "4-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "4-en",
@@ -72,7 +72,7 @@
     }
   },
   {
-    "id": "5-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "5-en",
@@ -90,7 +90,7 @@
     }
   },
   {
-    "id": "6-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "6-en",
@@ -108,7 +108,7 @@
     }
   },
   {
-    "id": "7-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "7-en",
@@ -126,7 +126,7 @@
     }
   },
   {
-    "id": "8-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "8-en",
@@ -144,7 +144,7 @@
     }
   },
   {
-    "id": "9-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "9-en",
@@ -162,7 +162,7 @@
     }
   },
   {
-    "id": "10-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "10-en",
@@ -180,7 +180,7 @@
     }
   },
   {
-    "id": "11-en",
+    "action": "upsert",
     "collection": "categories",
     "properties": {
       "unique_category_id": "11-en",