Some refactor

Author: user-of-github

.gitignore

@@ -7,16 +7,6 @@ obj/
 Debug/
 
 
-*.sln
-*.csproj
-*.user
-
-.sln/
-.csproj/
-.user/
-.vs/
-
-
 __pycache__/
 
 # C extensions
@@ -65,4 +55,7 @@ target/
 
 .ropeproject
 .drawio
-*.drawio
+*.drawio
+
+response.json
+expected.json

expected.json

@@ -1,25 +1,6 @@
-from rest_framework import serializers
-from .models import ShopUnit
 from .custom_types import SHOP_UNIT_TYPES
 
 
-class RecursiveField(serializers.Serializer):
-    def to_representation(self, value):
-        serializer = self.parent.parent.__class__(value, context=self.context)
-        if self.parent.parent.__class__(value)['type'].value != SHOP_UNIT_TYPES[0][0]:
-            return None
-
-        return serializer.data
-
-
-class ShopUnitSerializer(serializers.ModelSerializer):
-    children = RecursiveField(many=True)
-
-    class Meta:
-        model = ShopUnit
-        fields = ('id', 'name', 'type', 'parentId', 'date', 'price', 'children')
-
-
 def data_to_dict(data) -> dict:
     response: dict = dict()
 

response.json

@@ -1,54 +1,7 @@
-from datetime import datetime
-from uuid import UUID
 from .custom_types import SHOP_UNIT_TYPES
 from .models import ShopUnit
 
 
-def check_items_for_import(items_to_check: list[dict], update_date: str) -> bool:
-    existing_units = ShopUnit.objects
-    new_units: list = list()
-    ids_set: set = set()
-
-    for item_to_check in items_to_check:
-        # check name
-        if item_to_check['name'] is None:
-            return False
-
-        # check that all ids are different
-        if item_to_check['id'] in ids_set:
-            return False
-        ids_set.add(item_to_check['id'])
-
-        # check parent
-        if item_to_check['parentId'] is not None:
-            found_parent_in_existing = existing_units.filter(id=item_to_check['parentId'])
-            found_parent_in_new: list = list(filter(lambda unit: unit['id'] == item_to_check['parentId'], new_units))
-
-            if len(found_parent_in_existing) == 0 and len(found_parent_in_new) == 0:
-                return False
-            else:
-                if len(found_parent_in_new) != 0:
-                    if found_parent_in_new[0]['type'] != SHOP_UNIT_TYPES[0][0]:
-                        return False
-                else:
-                    if found_parent_in_existing[0].type != SHOP_UNIT_TYPES[0][0]:
-                        return False
-
-        # check price
-        if item_to_check['type'] != SHOP_UNIT_TYPES[0][0] and item_to_check['price'] < 0:
-            return False
-
-        new_units.append(item_to_check)
-
-    # check date
-    try:
-        datetime.fromisoformat(str(update_date).replace('Z', '+00:00'))
-    except:
-        return False
-
-    return True
-
-
 def update_parent_prices_after_creating(item_to_start) -> None:
     #print('UPDATING')
     price_to_add: int = item_to_start.price
@@ -197,18 +150,6 @@ def update_existing_item(item: dict, date: str) -> None:
     existing_item.save()
 
 
-def check_valid_uuid(to_delete: str) -> bool:
-    if to_delete is None:
-        return False
-
-    try:
-        uuid_obj = UUID(to_delete)
-    except ValueError:
-        return False
-
-    return True
-
-
 def remove_item(element) -> None:
     if element.type != SHOP_UNIT_TYPES[0][0]:
         element.delete()

shop/serializers.py

@@ -0,0 +1,69 @@
+from datetime import datetime
+from uuid import UUID
+
+from .custom_types import SHOP_UNIT_TYPES
+from .models import ShopUnit
+
+
+def check_date_iso(date: str) -> bool:
+    try:
+        datetime.fromisoformat(str(date).replace('Z', '+00:00'))
+    except:
+        return False
+
+    return True
+
+
+def check_valid_uuid(to_delete: str) -> bool:
+    if to_delete is None:
+        return False
+
+    try:
+        uuid_obj = UUID(to_delete)
+    except ValueError:
+        return False
+
+    return True
+
+
+def check_items_for_import(items_to_check: list[dict], update_date: str) -> bool:
+    existing_units = ShopUnit.objects
+    new_units: list = list()
+    ids_set: set = set()
+
+    for item_to_check in items_to_check:
+        # check name
+        if item_to_check['name'] is None:
+            return False
+
+        # check that all ids are different
+        if item_to_check['id'] in ids_set:
+            return False
+        ids_set.add(item_to_check['id'])
+
+        # check parent
+        if item_to_check['parentId'] is not None:
+            found_parent_in_existing = existing_units.filter(id=item_to_check['parentId'])
+            found_parent_in_new: list = list(filter(lambda unit: unit['id'] == item_to_check['parentId'], new_units))
+
+            if len(found_parent_in_existing) == 0 and len(found_parent_in_new) == 0:
+                return False
+            else:
+                if len(found_parent_in_new) != 0:
+                    if found_parent_in_new[0]['type'] != SHOP_UNIT_TYPES[0][0]:
+                        return False
+                else:
+                    if found_parent_in_existing[0].type != SHOP_UNIT_TYPES[0][0]:
+                        return False
+
+        # check price
+        if item_to_check['type'] != SHOP_UNIT_TYPES[0][0] and item_to_check['price'] < 0:
+            return False
+
+        new_units.append(item_to_check)
+
+    # check date
+    if not check_date_iso(update_date):
+        return False
+
+    return True

shop/utils.py

@@ -3,12 +3,12 @@
 from rest_framework.request import Request
 
 
-from .utils import check_items_for_import, check_valid_uuid
+from .validators import check_items_for_import, check_valid_uuid
 from .utils import create_new_item, update_existing_item, remove_item
 from .utils import update_parent_prices_after_deleting
 from .custom_types import Error
 from .models import ShopUnit
-from .serializers import ShopUnitSerializer, data_to_dict
+from .serializers import data_to_dict
 
 
 class ImportsAPIView(views.APIView):