Issue #212: update JSON template

ai-cfia · Nov 29, 2024 · 7cdf3fb · 7cdf3fb
1 parent f8f8cd0
commit 7cdf3fb
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 36 deletions.
diff --git a/tests/fertiscan/analyse.json b/tests/fertiscan/analyse.json
@@ -1,12 +1,18 @@
 {
-  "company_name":"GreenGrow Fertilizers Inc.",
-  "company_address":"123 Greenway Blvd, Springfield IL 62701 USA",
-  "company_website":"www.greengrowfertilizers.com",
-  "company_phone_number":"+1 800 555 0199",
-  "manufacturer_name":"AgroTech Industries Ltd.",
-  "manufacturer_address":"456 Industrial Park Rd, Oakville ON L6H 5V4 Canada",
-  "manufacturer_website":"www.agrotechindustries.com",
-  "manufacturer_phone_number":"+1 416 555 0123",
+  "organization":[
+    {
+      "name":"GreenGrow Fertilizers Inc.",
+      "address":"123 Greenway Blvd, Springfield IL 62701 USA",
+      "website":"www.greengrowfertilizers.com",
+      "phone_number":"+1 800 555 0199"
+    },
+    {
+      "name":"AgroTech Industries Ltd.",
+      "address":"456 Industrial Park Rd, Oakville ON L6H 5V4 Canada",
+      "website":"www.agrotechindustries.com",
+      "phone_number":"+1 416 555 0123"
+    }
+  ],
   "fertiliser_name":"SuperGrow 20-20-20",
   "registration_number":[
     {

diff --git a/tests/fertiscan/inspection.json b/tests/fertiscan/inspection.json
@@ -1,11 +1,18 @@
 {
-    "company": {
-        "id": "dbd48ad7-3d3d-4b93-affc-55a427f11331",
-        "name": "GreenGrow Fertilizers Inc.",
-        "address": "123 Greenway Blvd, Springfield IL 62701 USA",
-        "website": "www.greengrowfertilizers.com",
-        "phone_number": "+1 800 555 0199"
-    },
+    "organization":[
+{
+            "name":"GreenGrow Fertilizers Inc.",
+            "address":"123 Greenway Blvd, Springfield IL 62701 USA",
+            "website":"www.greengrowfertilizers.com",
+            "phone_number":"+1 800 555 0199"
+        },
+        {
+            "name":"AgroTech Industries Ltd.",
+            "address":"456 Industrial Park Rd, Oakville ON L6H 5V4 Canada",
+            "website":"www.agrotechindustries.com",
+            "phone_number":"+1 416 555 0123"
+        }
+    ],
     "product": {
         "k": 20.0,
         "n": 20.0,
@@ -157,13 +164,6 @@
             "3. Conserver dans un endroit frais et sec."
         ]
     },
-    "manufacturer": {
-        "id": "fb3b5366-0bc0-49a3-9f2b-1c860a337b8c",
-        "name": "AgroTech Industries Ltd.",
-        "address": "456 Industrial Park Rd, Oakville ON L6H 5V4 Canada",
-        "website": "www.agrotechindustries.com",
-        "phone_number": "+1 416 555 0123"
-    },
     "inspection_id": "61c93c2f-78ae-4f90-be3c-fc888087bfb9",
     "micronutrients": {
         "en": [

diff --git a/tests/fertiscan/inspection_export.json b/tests/fertiscan/inspection_export.json
@@ -2,20 +2,22 @@
     "inspection_id": "61c93c2f-78ae-4f90-be3c-fc888087bfb9",
     "inspection_comment": "",
     "verified": false,
-    "company": {
-        "id": "dbd48ad7-3d3d-4b93-affc-55a427f11331",
-        "name": "GreenGrow Fertilizers Inc.",
-        "address": "123 Greenway Blvd, Springfield IL 62701 USA",
-        "website": "www.greengrowfertilizers.com",
-        "phone_number": "+1 800 555 0199"
-    },
-    "manufacturer": {
-        "id": "fb3b5366-0bc0-49a3-9f2b-1c860a337b8c",
-        "name": "AgroTech Industries Ltd.",
-        "address": "456 Industrial Park Rd, Oakville ON L6H 5V4 Canada",
-        "website": "www.agrotechindustries.com",
-        "phone_number": "+1 416 555 0123"
-    },
+    "organization": [
+      {
+          "id": "dbd48ad7-3d3d-4b93-affc-55a427f11331",
+          "name": "GreenGrow Fertilizers Inc.",
+          "address": "123 Greenway Blvd, Springfield IL 62701 USA",
+          "website": "www.greengrowfertilizers.com",
+          "phone_number": "+1 800 555 0199"
+      },
+      {
+          "id": "fb3b5366-0bc0-49a3-9f2b-1c860a337b8c",
+          "name": "AgroTech Industries Ltd.",
+          "address": "456 Industrial Park Rd, Oakville ON L6H 5V4 Canada",
+          "website": "www.agrotechindustries.com",
+          "phone_number": "+1 416 555 0123"
+      }
+    ],
     "product": {
         "name": "SuperGrow 20-20-20",
         "label_id": "cdca3638-a3c0-45df-8c72-74e28a8740c6",