Strip nulls from data

openfoodfacts · Nov 1, 2023 · 974390c · 974390c
1 parent ced861b
commit 974390c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/domain/services/import.service.spec.ts b/src/domain/services/import.service.spec.ts
@@ -142,7 +142,7 @@ describe('importFromMongo', () => {
 
       // THEN: Product should be loaded with nuls stripped
       const ingredientsNew = await app.get(EntityManager).find(ProductIngredientsTag, {
-        product: { id: productIdNew},
+        product: { code: productIdNew},
       });
 
       expect(ingredientsNew).toHaveLength(1);

diff --git a/src/domain/services/import.service.ts b/src/domain/services/import.service.ts
@@ -104,6 +104,7 @@ export class ImportService {
   }
 
   /** Populate a Product record from MongoDB document */
+  nulRegex = /\0/g;
   async fixupProduct(
     update: boolean,
     updateId: string,
@@ -113,7 +114,16 @@ export class ImportService {
     const product = await this.findOrNewProduct(update, data);
     const dataToStore = {};
     for (const key of this.tags) {
-      dataToStore[key] = data[key];
+      const tagData = data[key] as string[];
+      if (tagData) {
+        // Strip out any nul characters
+        for (const [index, value] of tagData.entries()) {
+          if (value.includes('\u0000')) {
+            tagData[index] = value.replace(this.nulRegex, '');
+          }
+        }
+        dataToStore[key] = tagData;
+      }
     }
     product.data = dataToStore;
     product.name = data.product_name;