diff options
| -rw-r--r-- | archaeological_operations/serializers.py | 27 | ||||
| -rw-r--r-- | archaeological_operations/tests.py | 39 | ||||
| -rw-r--r-- | ishtar_common/serializers.py | 15 | ||||
| -rw-r--r-- | ishtar_common/tests.py | 17 |
4 files changed, 85 insertions, 13 deletions
diff --git a/archaeological_operations/serializers.py b/archaeological_operations/serializers.py index 7d4d9033d..22f0aedc7 100644 --- a/archaeological_operations/serializers.py +++ b/archaeological_operations/serializers.py @@ -9,9 +9,30 @@ OPERATION_MODEL_LIST = [ def operation_serialization(archive=False, return_empty_types=False, - archive_name=None): - result = generic_get_results(OPERATION_MODEL_LIST, "operations") + archive_name=None, operation_queryset=None, + site_queryset=None): + result_queryset = {} + if operation_queryset: + result_queryset = { + models.Operation.__name__: operation_queryset, + models.ArchaeologicalSite.__name__: + models.ArchaeologicalSite.objects.filter( + operations__id__in=operation_queryset.values_list( + "id", flat=True) + ) + } + elif site_queryset: + result_queryset = { + models.ArchaeologicalSite.__name__: site_queryset, + models.Operation.__name__: models.Operation.objects.filter( + archaeological_sites__id__in=site_queryset.values_list( + "id", flat=True)) + } + + result = generic_get_results(OPERATION_MODEL_LIST, "operations", + result_queryset=result_queryset) full_archive = archive_serialization( result, archive_dir="operations", archive=archive, - return_empty_types=return_empty_types, archive_name=archive_name) + return_empty_types=return_empty_types, archive_name=archive_name, + ) return full_archive diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index d0726fbdc..2c06f5a35 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -750,9 +750,11 @@ class SerializationTest(GenericSerializationTest, TestCase): self.username, self.password, self.user = create_superuser() operation = create_operation(self.user, values={"code_patriarche": "66666"}) + create_operation(self.user, values={"code_patriarche": "66667"}) site = models.ArchaeologicalSite.objects.create( reference="ref-site" ) + operation.archaeological_sites.add(site) operation.top_sites.add(site) default = {"town": Town.objects.create(numero_insee="66666"), "section": 'A', 'parcel_number': '1', "operation": operation} @@ -762,7 +764,42 @@ class SerializationTest(GenericSerializationTest, TestCase): start_date=datetime.date.today(), end_date=datetime.date.today()) def test_serialization(self): - self.generic_serialization_test(serializers.operation_serialization) + res = self.generic_serialization_test( + serializers.operation_serialization) + ope_json = json.loads( + res[('operations', 'archaeological_operations__Operation')] + ) + self.assertEqual(len(ope_json), 2) + + result_queryset = models.Operation.objects.filter( + code_patriarche="66666") + res = self.generic_serialization_test( + serializers.operation_serialization, no_test=True, + kwargs={"operation_queryset": result_queryset} + ) + ope_json = json.loads( + res[('operations', 'archaeological_operations__Operation')] + ) + self.assertEqual(len(ope_json), 1) + site_json = json.loads( + res[('operations', 'archaeological_operations__ArchaeologicalSite')] + ) + self.assertEqual(len(site_json), 1) + + result_queryset = models.Operation.objects.filter( + code_patriarche="66667") + res = self.generic_serialization_test( + serializers.operation_serialization, no_test=True, + kwargs={"operation_queryset": result_queryset} + ) + ope_json = json.loads( + res[('operations', 'archaeological_operations__Operation')] + ) + self.assertEqual(len(ope_json), 1) + site_json = json.loads( + res[('operations', 'archaeological_operations__ArchaeologicalSite')] + ) + self.assertEqual(len(site_json), 0) def test_conf_restore(self): current_number, zip_filename = self.generic_restore_test_genzip( diff --git a/ishtar_common/serializers.py b/ishtar_common/serializers.py index 03433df89..409051ec0 100644 --- a/ishtar_common/serializers.py +++ b/ishtar_common/serializers.py @@ -103,13 +103,18 @@ def archive_serialization(result, archive_dir=None, archive=False, return archive_name -def generic_get_results(model_list, dirname, no_geo=True): +def generic_get_results(model_list, dirname, no_geo=True, + result_queryset=None): result = OrderedDict() for model in model_list: - model_name = model.__name__ - model_name = str(model.__module__).split(".")[0] + "__" + model_name - - base_q = model.objects + base_model_name = model.__name__ + model_name = str(model.__module__).split(".")[0] + "__" + \ + base_model_name + + if result_queryset and base_model_name in result_queryset: + base_q = result_queryset[base_model_name] + else: + base_q = model.objects q = base_q recursion = None if hasattr(model, "parent"): diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 7bb3ce098..68c206865 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -599,8 +599,12 @@ class CacheTest(TestCase): class GenericSerializationTest: - def generic_serialization_test(self, serialize): - json_result = serialize() + def generic_serialization_test(self, serialize, no_test=False, kwargs=None): + if not kwargs: + kwargs = {} + json_result = serialize(**kwargs) + if no_test: + return json_result for key in json_result.keys(): __, k = key module_name, model_name = k.split("__") @@ -615,12 +619,17 @@ class GenericSerializationTest: msg="Serialization for model {}.{} failed. {} serialized {} " "expected".format(module.__name__, model_name, serialization_count, current_count)) + return json_result - def generic_restore_test_genzip(self, model_list, serialization): + def generic_restore_test_genzip(self, model_list, serialization, + kwargs=None): current_number = {} for model in model_list: current_number[model.__name__] = model.objects.count() - zip_filename = serialization(archive=True) + if not kwargs: + kwargs = {} + kwargs["archive"] = True + zip_filename = serialization(**kwargs) return current_number, zip_filename def generic_restore_test(self, zip_filename, current_number, model_list): |