Fixed bug with not updating price

Author: user-of-github

.github/workflows/run-pytest.yml

@@ -1,4 +1,4 @@
-name: Test Django-Rest-Framework application via Unit Test
+name: Test Django-Rest-Framework application via PyTest
 
 on: [push]
 
@@ -28,10 +28,12 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
+        pip install pytest-django
     - name: Run migrations
       run: |
         python manage.py makemigrations
         python manage.py migrate
     - name: Run tests
       run: |
-        python unit_test.py
+        python -m coverage run -m pytest
+        python -m coverage report

Readme.md

@@ -15,7 +15,7 @@
 1. `pip install -r requirements.txt`  
 2. `coverage run -m pytest`  
 3. `coverage report` or `coverage html` (for generating report in HTML)
-4. `coverage-badge -o coverage.svg`
+4. Remove `coverage-badge` file and run `coverage-badge -o coverage.svg`
     
 
 #### To run application locally:  

core/settings.py

@@ -73,13 +73,23 @@
         }
     }
 else:
+    # DATABASES = {
+    #     'default': {
+    #         'ENGINE': 'django.db.backends.postgresql',
+    #         'NAME': 'd2n3ba1ushpvok',
+    #         'USER': 'jpdfcrppiqgfut',
+    #         'PASSWORD': '136a7f5787e41773c75aef3b90d612510dc0951fa63a671608089a569a52385c',
+    #         'HOST': 'ec2-176-34-215-248.eu-west-1.compute.amazonaws.com',
+    #         'PORT': '5432',
+    #     }
+    # }
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql',
-            'NAME': 'd2n3ba1ushpvok',
-            'USER': 'jpdfcrppiqgfut',
-            'PASSWORD': '136a7f5787e41773c75aef3b90d612510dc0951fa63a671608089a569a52385c',
-            'HOST': 'ec2-176-34-215-248.eu-west-1.compute.amazonaws.com',
+            'NAME': 'onlineservice',
+            'USER': 'postgres',
+            'PASSWORD': 'root',
+            'HOST': 'localhost',
             'PORT': '5432',
         }
     }

shop/utils.py

@@ -4,24 +4,33 @@
 
 
 def update_parent_prices_after_creating(item_to_start) -> None:
-    #print('UPDATING')
     price_to_add: int = item_to_start.price
 
     if item_to_start.parentId is None:
         return
 
-    current = item_to_start
     nexts = ShopUnit.objects.filter(id=item_to_start.parentId)
 
     while len(nexts) != 0:
         parent = nexts[0]
-        print('PARENT: ', parent.name)
         parent.totally_inner_goods_count = parent.totally_inner_goods_count + 1
         parent.total_inner_sum = parent.total_inner_sum + price_to_add
         parent.price = parent.total_inner_sum // parent.totally_inner_goods_count
         parent.save()
-        current = parent
-        nexts = ShopUnit.objects.filter(id=current.parentId)
+        nexts = ShopUnit.objects.filter(id=parent.parentId)
+
+
+def update_parent_date_after_creating(item_to_start, new_date) -> None:
+    if item_to_start.parentId is None:
+        return
+
+    nexts = ShopUnit.objects.filter(id=item_to_start.parentId)
+
+    while len(nexts) != 0:
+        parent = nexts[0]
+        parent.date = new_date
+        parent.save()
+        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:
@@ -50,6 +59,7 @@ def update_parent_prices_after_item_updating(nexts_initial, price: int, count: i
 
         parent.totally_inner_goods_count += count
         parent.total_inner_sum += price
+
         if parent.totally_inner_goods_count != 0:
             parent.price = parent.total_inner_sum // parent.totally_inner_goods_count
         else:
@@ -61,12 +71,11 @@ def update_parent_prices_after_item_updating(nexts_initial, price: int, count: i
 
 
 def update_parents_date_after_item_updating(nexts_initial, date: str) -> None:
-    #print('UPDATING PARENTS DATE')
     nexts = nexts_initial
 
     while len(nexts) != 0:
         parent = nexts[0]
-        print('parent ', parent.name)
+        print(f'UPDATING {parent.name} from {parent.date} to {date}')
         parent.date = date
         parent.save()
         nexts = ShopUnit.objects.filter(id=parent.parentId)
@@ -97,21 +106,15 @@ def create_new_item(item: dict, date: str) -> None:
         )
 
     created_object.save()
-    # print('CREATED')
-    # print('Now own children are: ', created_object.children.all())
-    # print('ParentId is: ', created_object.parentId)
 
     if created_object.parentId is not None:
-        # print('Looking parent for ', created_object.name)
         parent = ShopUnit.objects.filter(id=created_object.parentId)[0]
-        # print('So parent is: ', parent.name)
         parent.children.add(created_object)
-        # print('Now parents children are: ', parent.children.all())
-        # print('And own children are: ', created_object.children.all())
         parent.save()
 
     if created_object.type != SHOP_UNIT_TYPES[0][0]:
         update_parent_prices_after_creating(created_object)
+        update_parent_date_after_creating(created_object, date)
 
 
 def update_existing_item(item: dict, date: str) -> None:
@@ -127,6 +130,7 @@ def update_existing_item(item: dict, date: str) -> None:
 
     existing_item.name = item['name']
     existing_item.date = date
+    existing_item.save()
 
     if item['type'] != SHOP_UNIT_TYPES[0][0]:
         existing_item.price = item['price']
@@ -145,8 +149,8 @@ def update_existing_item(item: dict, date: str) -> None:
             new_parent.children.add(existing_item)
             new_parent.save()
 
-    #print('KEK')
     update_parent_prices_after_item_updating(ShopUnit.objects.filter(id=existing_item.parentId), existing_item.total_inner_sum, existing_item.totally_inner_goods_count)
+    # print(f'NOW WILL UPDATE PARENT DATE TO {date}')
     update_parents_date_after_item_updating(ShopUnit.objects.filter(id=existing_item.parentId), date)
 
     existing_item.save()

shop/validators.py

@@ -39,6 +39,7 @@ def check_items_for_import(items_to_check: list, update_date: str) -> bool:
         # 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

shop/views.py

@@ -24,15 +24,16 @@ def post(self, request: Request) -> Response:
         if not check_result:
             return Response(Error(400, 'Validation Failed').to_dict(), status=status.HTTP_400_BAD_REQUEST)
 
-        existing_units = ShopUnit.objects
-
         for item in received_items:
+            existing_units = ShopUnit.objects
             with_similar_id = existing_units.filter(id=item['id'])
+            print(existing_units)
 
             if len(with_similar_id) == 0:
                 # print('CREATING NEW: ', item['name'])
                 create_new_item(item, received_update_date)
             elif len(with_similar_id) == 1:
+                # print(f'VIEW: GONNA UPDATE {item["name"]}')
                 update_existing_item(item, received_update_date)
 
         return Response(status=status.HTTP_200_OK)

unit_test.py

@@ -1,5 +1,3 @@
-# encoding=utf8
-
 import json
 import re
 import subprocess
@@ -8,7 +6,8 @@
 import urllib.parse
 import urllib.request
 
-API_BASEURL = "http://localhost:80"
+API_BASEURL = 'http://127.0.0.1:8000'
+
 
 ROOT_ID = "069cb8d7-bbdd-47d3-ad8f-82ef4c269df1"
 
@@ -225,7 +224,7 @@ def test_nodes():
     status, response = request(f"/nodes/{ROOT_ID}", json_response=True)
     # print(json.dumps(response, indent=2, ensure_ascii=False))
 
-    assert status == 200, f"Expected HTTP status code 200, got {status}"
+    assert status == 200, f'Expected HTTP status code 200, got {status}'
 
     deep_sort_children(response)
     deep_sort_children(EXPECTED_TREE)
@@ -235,14 +234,16 @@ def test_nodes():
         print("Response tree doesn't match expected tree.")
         sys.exit(1)
 
-    print("Test nodes passed.")
+    print('Test nodes passed.')
 
 
 def test_sales():
     params = urllib.parse.urlencode({
         "date": "2022-02-04T00:00:00.000Z"
     })
-    status, response = request(f"/sales?{params}", json_response=True)
+    status, response = request(f'/sales?{params}', json_response=True)
+    # print(response)
+    # print(status)
     assert status == 200, f"Expected HTTP status code 200, got {status}"
     print("Test sales passed.")