Fixed some non-correct behavior. Codestyle. tests

Author: user-of-github

shop/constants.py

@@ -0,0 +1,4 @@
+STATUS_400_ERROR_TEXT: str = 'Validation Failed'
+STATUS_404_ERROR_TEXT: str = 'Item not found'
+
+SHOP_UNIT_TYPES: tuple = (('CATEGORY', 'CATEGORY'), ('OFFER', 'OFFER'))

shop/custom_types.py

@@ -1,6 +1,7 @@
+from rest_framework import status
 import dataclasses
 
-SHOP_UNIT_TYPES: tuple = (('CATEGORY', 'CATEGORY'), ('OFFER', 'OFFER'))
+from .constants import STATUS_400_ERROR_TEXT, STATUS_404_ERROR_TEXT
 
 
 @dataclasses.dataclass
@@ -9,4 +10,8 @@ class Error:
     message: str
 
     def to_dict(self):
-        return {'code': self.code, 'message': self.message}
+        return {'code': self.code, 'message': self.message}
+
+
+ERROR_400: Error = Error(status.HTTP_400_BAD_REQUEST, STATUS_400_ERROR_TEXT)
+ERROR_404: Error = Error(status.HTTP_404_NOT_FOUND, STATUS_404_ERROR_TEXT)

shop/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from .custom_types import SHOP_UNIT_TYPES
+from .constants import SHOP_UNIT_TYPES
 
 
 class ShopUnit(models.Model):

shop/serializers.py

@@ -1,4 +1,4 @@
-from .custom_types import SHOP_UNIT_TYPES
+from .constants import SHOP_UNIT_TYPES
 
 
 def shop_unit_to_dict(data, with_children: bool = True) -> dict:

shop/tests.py

@@ -1,4 +1,5 @@
-from .custom_types import SHOP_UNIT_TYPES
+from .custom_types import ERROR_400, ERROR_404
+from .constants import SHOP_UNIT_TYPES
 from .models import ShopUnit, HistoryTable, ShopUnitHistory
 from dateutil import parser
 
@@ -39,11 +40,11 @@ def remove_item_from_history(id_to_delete: str) -> None:
 
 
 def update_parent_prices_after_creating(item_to_start) -> None:
-    price_to_add: int = item_to_start.price
-
     if item_to_start.parentId is None:
         return
 
+    price_to_add: int = item_to_start.price
+
     nexts = ShopUnit.objects.filter(id=item_to_start.parentId)
 
     while len(nexts) != 0:
@@ -55,7 +56,7 @@ def update_parent_prices_after_creating(item_to_start) -> None:
         nexts = ShopUnit.objects.filter(id=parent.parentId)
 
 
-def update_parent_date_after_creating(item_to_start, new_date) -> None:
+def update_parent_date_after_item_creating(item_to_start, new_date: str) -> None:
     if item_to_start.parentId is None:
         return
 
@@ -68,14 +69,15 @@ def update_parent_date_after_creating(item_to_start, new_date) -> None:
         nexts = ShopUnit.objects.filter(id=parent.parentId)
 
 
-def update_parent_prices_after_deleting(nexts_initial, price_to_subtract: int, goods_count_to_subtract: int) -> None:
+def update_parent_prices_after_item_deleting(nexts_initial, price_to_subtract: int, goods_count_to_subtract: int) -> None:
     nexts = nexts_initial
 
     while len(nexts) != 0:
         parent = nexts[0]
 
         parent.totally_inner_goods_count -= goods_count_to_subtract
         parent.total_inner_sum -= price_to_subtract
+
         if parent.totally_inner_goods_count != 0:
             parent.price = parent.total_inner_sum // parent.totally_inner_goods_count
         else:
@@ -110,7 +112,6 @@ def update_parents_date_after_item_updating(nexts_initial, date: str) -> None:
 
     while len(nexts) != 0:
         parent = nexts[0]
-        #print(f'UPDATING {parent.name} from {parent.date} to {date}')
         parent.date = date
         parent.save()
         nexts = ShopUnit.objects.filter(id=parent.parentId)
@@ -137,30 +138,32 @@ def create_new_item(item: dict, date: str) -> None:
         parent.children.add(created_object)
         parent.save()
 
-    # if it is an offer => update prices in all parent
+    # if it is an offer => update prices in all parents and also update dates !
     if created_object.type != SHOP_UNIT_TYPES[0][0]:
         update_parent_prices_after_creating(created_object)
-
-    update_parent_date_after_creating(created_object, date)
+        update_parent_date_after_item_creating(created_object, date)
 
     add_parents_changes_to_history(ShopUnit.objects.filter(id=created_object.parentId))
 
 
 def update_existing_item(item: dict, date: str) -> None:
     existing_item = ShopUnit.objects.get(id=item['id'])
 
-    # firstly remove price and counts from statistics (maybe we move whole category, for example)
+    # firstly remove price and counts from statistics (maybe we move to another category)
     if existing_item.parentId is not None:
-        update_parent_prices_after_deleting(
-            ShopUnit.objects.filter(id=existing_item.parentId),
+        existing_item_parents = ShopUnit.objects.filter(id=existing_item.parentId)
+        update_parent_prices_after_item_deleting(
+            existing_item_parents,
             existing_item.total_inner_sum,
             existing_item.totally_inner_goods_count
         )
+        update_parents_date_after_item_updating(existing_item_parents, date)
 
-        # if moving to another category => update current parent history, than will update new parent history
+        # if moving to another category => update current parent history, after will update new parent history
         if existing_item.parentId != item['parentId']:
-            add_parents_changes_to_history(ShopUnit.objects.filter(id=existing_item.parentId))
+            add_parents_changes_to_history(existing_item_parents)
 
+    # now updating the item:
     existing_item.name = item['name']
     existing_item.date = date
     existing_item.save()
@@ -186,13 +189,12 @@ def update_existing_item(item: dict, date: str) -> None:
     existing_item.save()
     add_item_to_history_table(existing_item)
 
-    update_parent_prices_after_item_updating(
-        ShopUnit.objects.filter(id=existing_item.parentId),
-        existing_item.total_inner_sum, existing_item.totally_inner_goods_count
-    )
+    parents = ShopUnit.objects.filter(id=existing_item.parentId)
+
+    update_parent_prices_after_item_updating(parents, existing_item.total_inner_sum, existing_item.totally_inner_goods_count)
 
-    update_parents_date_after_item_updating(ShopUnit.objects.filter(id=existing_item.parentId), date)
-    add_parents_changes_to_history(ShopUnit.objects.filter(id=existing_item.parentId))
+    update_parents_date_after_item_updating(parents, date)
+    add_parents_changes_to_history(parents)
 
 
 def remove_item(element) -> None:
@@ -207,13 +209,13 @@ def remove_item(element) -> None:
 
 
 def satisfies_date_interval(item_date_source: str, right_date_range_border_source: str) -> bool:
-    SECONDS_IN_DAY: int = 3600
+    SECONDS_IN_HOUR: int = 60 * 60
     HOURS_IN_DAY: int = 24
 
     right_border = parser.parse(right_date_range_border_source)
     item_date = parser.parse(item_date_source)
 
-    return (right_border >= item_date) and ((right_border - item_date).total_seconds() / SECONDS_IN_DAY <= HOURS_IN_DAY)
+    return (right_border >= item_date) and (((right_border - item_date).total_seconds() / SECONDS_IN_HOUR) <= HOURS_IN_DAY)
 
 
 def get_node_statistics_filtered_by_date(row_in_history_table, date_from, date_to):

shop/utils.py

@@ -1,7 +1,7 @@
 from datetime import datetime
 from uuid import UUID
 
-from .custom_types import SHOP_UNIT_TYPES
+from .constants import SHOP_UNIT_TYPES
 from .models import ShopUnit
 
 

shop/validators.py

@@ -4,26 +4,29 @@
 
 from .validators import check_items_for_import, check_valid_uuid, check_date_iso
 from .utils import create_new_item, update_existing_item, remove_item
-from .utils import update_parent_prices_after_deleting
+from .utils import update_parent_prices_after_item_deleting
 from .utils import satisfies_date_interval
 from .utils import add_parents_changes_to_history
 from .utils import get_node_statistics_filtered_by_date
-from .custom_types import Error, SHOP_UNIT_TYPES
+from .custom_types import ERROR_400, ERROR_404
+from .constants import SHOP_UNIT_TYPES
 from .models import ShopUnit, HistoryTable
 from .serializers import shop_unit_to_dict
 
 
 class ImportsAPIView(views.APIView):
     def post(self, request: Request) -> Response:
-        received_post_data = request.data
+        if 'updateDate' not in request.data:
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
-        received_update_date = received_post_data['updateDate']
-        received_items = received_post_data['items']
+        if 'items' not in request.data:
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
-        check_result: bool = check_items_for_import(received_items, received_update_date)
+        received_update_date = request.data['updateDate']
+        received_items = request.data['items']
 
-        if not check_result:
-            return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+        if not check_items_for_import(received_items, received_update_date):
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         for item in received_items:
             existing_units = ShopUnit.objects
@@ -40,12 +43,12 @@ def post(self, request: Request) -> Response:
 class DeleteAPIView(views.APIView):
     def delete(self, request: Request, to_delete: str = None) -> Response:
         if not check_valid_uuid(to_delete):
-            return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         found_item = ShopUnit.objects.filter(id=to_delete)
 
         if len(found_item) == 0:
-            return Response(Error(404, 'Item not found').to_dict(), status=status.HTTP_404_NOT_FOUND)
+            return Response(ERROR_404.to_dict(), status=status.HTTP_404_NOT_FOUND)
 
         deleted_goods_count: int = found_item[0].totally_inner_goods_count
         deleted_total_sum: int = found_item[0].total_inner_sum
@@ -54,7 +57,7 @@ def delete(self, request: Request, to_delete: str = None) -> Response:
         remove_item(found_item[0])
 
         if len(parent) != 0:
-            update_parent_prices_after_deleting(parent, deleted_total_sum, deleted_goods_count)
+            update_parent_prices_after_item_deleting(parent, deleted_total_sum, deleted_goods_count)
             add_parents_changes_to_history(parent)
 
         return Response(status=status.HTTP_200_OK)
@@ -63,12 +66,12 @@ def delete(self, request: Request, to_delete: str = None) -> Response:
 class NodesAPIView(views.APIView):
     def get(self, request: Request, to_get: str) -> Response:
         if not check_valid_uuid(to_get):
-            return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         found_items = ShopUnit.objects.filter(id=to_get)
 
         if len(found_items) == 0:
-            return Response(Error(404, 'Item not found').to_dict(), status=status.HTTP_404_NOT_FOUND)
+            return Response(ERROR_404.to_dict(), status=status.HTTP_404_NOT_FOUND)
 
         found_item = found_items[0]
 
@@ -78,14 +81,15 @@ def get(self, request: Request, to_get: str) -> Response:
 class SalesAPIView(views.APIView):
     def get(self, request: Request) -> Response:
         if 'date' not in request.query_params:
-            return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         date_to_get: str = request.query_params['date']
 
         if not check_date_iso(date_to_get):
-            return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         all_offers = ShopUnit.objects.filter(type=SHOP_UNIT_TYPES[1][1])
+
         response: list = list()
 
         for offer in all_offers:
@@ -98,25 +102,23 @@ def get(self, request: Request) -> Response:
 class NodeStatisticsAPIView(views.APIView):
     def get(self, request: Request, to_get: str) -> Response:
         if not check_valid_uuid(to_get):
-            return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
-
-        query_parameters = request.query_params
+            return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
-        if 'dateStart' in query_parameters:
-            if not check_date_iso(query_parameters['dateStart']):
-                return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+        if 'dateStart' in request.query_params:
+            if not check_date_iso(request.query_params['dateStart']):
+                return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
-        if 'dateEnd' in query_parameters:
-            if not check_date_iso(query_parameters['dateEnd']):
-                return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
+        if 'dateEnd' in request.query_params:
+            if not check_date_iso(request.query_params['dateEnd']):
+                return Response(ERROR_400.to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
         found_item = HistoryTable.objects.filter(id=to_get)
 
         if len(found_item) == 0:
-            return Response(Error(404, 'Item not found').to_dict(), status=status.HTTP_404_NOT_FOUND)
+            return Response(ERROR_404.to_dict(), status=status.HTTP_404_NOT_FOUND)
 
-        filtered = get_node_statistics_filtered_by_date(found_item[0], query_parameters.get('dateStart'), query_parameters.get('dateEnd'))
+        filtered = get_node_statistics_filtered_by_date(found_item[0], request.query_params.get('dateStart'), request.query_params.get('dateEnd'))
 
         response: list[dict] = list(map(lambda item: shop_unit_to_dict(item, False), filtered))
 
-        return Response(response, status=status.HTTP_200_OK)
+        return Response(response, status=status.HTTP_200_OK)

shop/views.py

@@ -137,3 +137,60 @@
     ],
     'updateDate': '2022-06-08T16:00:00.000Z'
 }
+
+DATA_EMPTY_CATEGORY: dict = {
+    'items': [
+        {
+            'type': 'CATEGORY',
+            'name': 'Умные колонки',
+            'id': '74b81fad-9cdc-4b36-8927-c123afed5cf4',
+            'parentId': '069cb8d7-bbdd-47d3-ad8f-82ef4c269df1'
+        }
+    ],
+    'updateDate': '2022-06-08T16:00:00.000Z'
+}
+
+OFFER_FOR_THIS_CATEGORY: dict = {
+    'items': [
+        {
+            'type': 'OFFER',
+            'name': 'Тындекс Станция Мега',
+            'id': '74b81fad-9cdc-4b88-8888-c123afed5cf8',
+            'price': 1000,
+            'parentId': '74b81fad-9cdc-4b36-8927-c123afed5cf4'
+        }
+    ],
+    'updateDate': '2022-06-08T17:00:00.000Z'
+}
+
+UPDATE_OFFER_FOR_THIS_CATEGORY: dict = {
+    'items': [
+        {
+            'type': 'OFFER',
+            'name': 'ВыНдекс Станция Мега',
+            'id': '74b81fad-9cdc-4b88-8888-c123afed5cf8',
+            'price': 1200,
+            'parentId': '74b81fad-9cdc-4b36-8927-c123afed5cf4'
+        }
+    ],
+    'updateDate': '2022-06-08T18:00:00.000Z'
+}
+
+LETS_MOVE_OFFER: dict = {
+    'items': [
+        {
+            'type': 'CATEGORY',
+            'name': 'Не умные колонки',
+            'id': '74b81fad-9cdc-4b36-7777-c123afed5cf4',
+            'parentId': '069cb8d7-bbdd-47d3-ad8f-82ef4c269df1'
+        },
+        {
+            'type': 'OFFER',
+            'name': 'ВыНдекс Станция Мега (теперь обычная колонка)',
+            'id': '74b81fad-9cdc-4b88-8888-c123afed5cf8',
+            'price': 1205,
+            'parentId': '74b81fad-9cdc-4b36-7777-c123afed5cf4'
+        }
+    ],
+    'updateDate': '2022-06-08T19:00:00.000Z'
+}