Serialization: warehouse - manage filter for context record, site, find and warehouse query

1 files changed, 65 insertions, 19 deletions

diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py
index a14c0fb8c..52f1a96fc 100644
--- a/archaeological_warehouse/tests.py
+++ b/archaeological_warehouse/tests.py
@@ -27,9 +27,12 @@ from ishtar_common.tests import WizardTest, WizardTestFormData as FormData, \
 from ishtar_common.models import IshtarSiteProfile, SpatialReferenceSystem
 from archaeological_operations.models import Operation
 from archaeological_context_records.models import ContextRecord
+from archaeological_finds.models import Find
 
 from archaeological_warehouse import models, views, forms, serializers
 
+from archaeological_operations.serializers import operation_serialization
+
 
 class SerializationTest(GenericSerializationTest, FindInit, TestCase):
     fixtures = COMMON_FIXTURES + WAREHOUSE_FIXTURES
@@ -61,6 +64,7 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase):
             external_id="test3",
             warehouse_type=models.WarehouseType.objects.all()[0],
         )
+        self.warehouses = [w1, w2, w3]
         c1 = models.Container.objects.create(
             location=w1,
             responsible=w1,
@@ -201,41 +205,83 @@ class SerializationTest(GenericSerializationTest, FindInit, TestCase):
                  "archaeological_warehouse__ContainerLocalisation")]
         )
         self.assertEqual(len(loca_json), 3)
-        """
 
         result_queryset = ContextRecord.objects.filter(
             uuid=self.context_records[0].uuid)
         res = self.generic_serialization_test(
-            serializers.find_serialization, no_test=True,
+            serializers.warehouse_serialization, no_test=True,
             kwargs={"cr_queryset": result_queryset}
         )
-        find_json = json.loads(
-            res[('finds', 'archaeological_finds__Find')]
+        warehouse_json = json.loads(
+            res[('warehouse', "archaeological_warehouse__Warehouse")]
+        )
+        self.assertEqual(len(warehouse_json), 2)
+        container_json = json.loads(
+            res[('warehouse', "archaeological_warehouse__Container")]
+        )
+        self.assertEqual(len(container_json), 2)
+        div_json = json.loads(
+            res[('warehouse',
+                 "archaeological_warehouse__WarehouseDivisionLink")]
         )
-        self.assertEqual(len(find_json), 1)
-        bfind_json = json.loads(
-            res[('finds', 'archaeological_finds__BaseFind')]
+        self.assertEqual(len(div_json), 3)
+        loca_json = json.loads(
+            res[('warehouse',
+                 "archaeological_warehouse__ContainerLocalisation")]
         )
-        self.assertEqual(len(bfind_json), 1)
+        self.assertEqual(len(loca_json), 3)
 
-        result_queryset = models.Find.objects.filter(
-            uuid=self.finds[0].uuid)
+        result_queryset = Find.objects.filter(uuid=self.finds[0].uuid)
         res = self.generic_serialization_test(
-            serializers.find_serialization, no_test=True,
+            serializers.warehouse_serialization, no_test=True,
             kwargs={"find_queryset": result_queryset}
         )
-        find_json = json.loads(
-            res[('finds', 'archaeological_finds__Find')]
+        warehouse_json = json.loads(
+            res[('warehouse', "archaeological_warehouse__Warehouse")]
         )
-        self.assertEqual(len(find_json), 1)
-        bfind_json = json.loads(
-            res[('finds', 'archaeological_finds__BaseFind')]
+        self.assertEqual(len(warehouse_json), 2)
+        container_json = json.loads(
+            res[('warehouse', "archaeological_warehouse__Container")]
+        )
+        self.assertEqual(len(container_json), 2)
+        div_json = json.loads(
+            res[('warehouse',
+                 "archaeological_warehouse__WarehouseDivisionLink")]
+        )
+        self.assertEqual(len(div_json), 3)
+        loca_json = json.loads(
+            res[('warehouse',
+                 "archaeological_warehouse__ContainerLocalisation")]
+        )
+        self.assertEqual(len(loca_json), 3)
+
+        result_queryset = models.Warehouse.objects.filter(
+            id=self.warehouses[0].id)
+        res = self.generic_serialization_test(
+            serializers.warehouse_serialization, no_test=True,
+            kwargs={"warehouse_queryset": result_queryset}
+        )
+        warehouse_json = json.loads(
+            res[('warehouse', "archaeological_warehouse__Warehouse")]
+        )
+        self.assertEqual(len(warehouse_json), 1)
+        container_json = json.loads(
+            res[('warehouse', "archaeological_warehouse__Container")]
+        )
+        self.assertEqual(len(container_json), 3)
+        div_json = json.loads(
+            res[('warehouse',
+                 "archaeological_warehouse__WarehouseDivisionLink")]
+        )
+        self.assertEqual(len(div_json), 2)
+        loca_json = json.loads(
+            res[('warehouse',
+                 "archaeological_warehouse__ContainerLocalisation")]
         )
-        self.assertEqual(len(bfind_json), 1)
-        """
+        self.assertEqual(len(loca_json), 2)
 
     """
-    def test_ope_serialization_with_find_filter(self):
+    def test_ope_serialization_with_warehouse_filter(self):
         res = self.generic_serialization_test(
             operation_serialization, no_test=True,
         )