Issue #154: fix rebase broken tests

ai-cfia · Nov 13, 2024 · 0edb01a · 0edb01a
1 parent c8b4a15
commit 0edb01a
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/fertiscan/db/bytebase/get_inspection/get_label_info_json.sql b/fertiscan/db/bytebase/get_inspection/get_label_info_json.sql
@@ -46,7 +46,6 @@ BEGIN
         'p', record.p,
         'npk', record.npk,
         'lot_number', record.lot_number,
-        'registration_number', record.registration_number,
         'verified', verified_bool,
         'record_keeping', record.record_keeping
     );

diff --git a/fertiscan/db/metadata/inspection/__init__.py b/fertiscan/db/metadata/inspection/__init__.py
@@ -434,7 +434,7 @@ def build_inspection_export(cursor, inspection_id) -> str:
             manufacturer=manufacturer,
             product=product_info,
             verified=db_inspection.verified,
-            registration_numbers=reg_numbers,
+            registration_numbers=reg_number_model_list,
             ingredients=ingredients,
         )
 

diff --git a/tests/fertiscan/db/test_ingredient.py b/tests/fertiscan/db/test_ingredient.py
@@ -129,7 +129,6 @@ def test_get_ingredient_json_record_keeping(self):
             self.product_name,
             self.lot_number,
             self.npk,
-            self.registration_number,
             self.n,
             self.p,
             self.k,

diff --git a/tests/fertiscan/db/test_registration_number.py b/tests/fertiscan/db/test_registration_number.py
@@ -52,6 +52,7 @@ def setUp(self):
             False,
             None,
             None,
+            None,
         )
 
         self.is_an_ingredient = False

diff --git a/tests/fertiscan/db/update_inspection/test_update_ingredients.py b/tests/fertiscan/db/update_inspection/test_update_ingredients.py
@@ -77,7 +77,6 @@ def setUp(self):
             None,
             None,
             None,
-            None,
             False,
             self.company_info_id,
             self.company_info_id,

diff --git a/tests/fertiscan/test_datastore.py b/tests/fertiscan/test_datastore.py
@@ -535,7 +535,7 @@ def test_update_inspection(self):
         self.assertEqual(label_info_data[7], new_title)
         self.assertNotEqual(label_info_data[7], old_title)
         self.assertEqual(label_info_data[8], old_title)
-        self.assertEqual(label_info_data[13], new_record_keeping)
+        self.assertEqual(label_info_data[12], new_record_keeping)
 
         guaranteed_data = nutrients.get_all_guaranteeds(self.cursor, label_id)
         for guaranteed in guaranteed_data:
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ def setUp(self): @@
                 False,
                 None,
                 None,
+                None,
             )
             self.is_an_ingredient = False
@@ Expand Down @@