Merge pull request #78 from sc4n1a471/dev

fix: updated test request (#76)
sc4n1a471 · Dec 12, 2023 · a130510 · a130510
2 parents a65dc56 + 98a97a4
commit a130510
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 91 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
-# NodeJS-Thingy_Python
+# car-thingy_Python
 [![Build, Publish, Redeploy Development](https://github.com/sc4n1a471/car-thingy_Python/actions/workflows/docker_dev.yml/badge.svg?branch=dev)](https://github.com/sc4n1a471/car-thingy_Python/actions/workflows/docker_dev.yml)
 [![Build, Publish, Redeploy Production](https://github.com/sc4n1a471/car-thingy_Python/actions/workflows/docker_prod.yml/badge.svg?branch=main)](https://github.com/sc4n1a471/car-thingy_Python/actions/workflows/docker_prod.yml)
-![Alt](https://repobeats.axiom.co/api/embed/fb6459316bd61876f71e174bfcbed2c37ac152c2.svg "Repobeats analytics image")
+![Alt](https://repobeats.axiom.co/api/embed/d7c3548129c77ccafe012e59e383f9902d39d85c.svg "Repobeats analytics image")
 
-Ez lenni repository for NodeJS_Thingy_Python
+Ez lenni repository for car-thingy_Python
 
 ---
 

diff --git a/application/data/settings.py b/application/data/settings.py
@@ -59,7 +59,7 @@ async def init(websocket_param):
 
         driver = webdriver.Chrome(service=s, options=option)
         # driver = webdriver.Safari()
-    await load_cookies()
+    # await load_cookies()
 
 
 def save_cookie():

diff --git a/application/request_car.py b/application/request_car.py
@@ -41,31 +41,22 @@ async def request_car(license_plates, websocket_param):
         )
         return
 
-    if license_plates[0].lower() == "test111":
+    if license_plates[0].lower() == "test111" or license_plates[0].lower() == "test112":
         settings.driver.quit()
 
-        num_of_keys = 17
         counter = 0
 
-        # iterate through RES.get("data")[0] and its keys, values and send them one by one
-        for key, value in RES.get("data")[0].items():
-            time.sleep(0.25)
+        for key, value in RES.items():
+            time.sleep(0.05)
             await settings.send_data(key, value, counter)
-            counter += 1
-        await settings.send_data("message", None, 17, "success")
-        return
-
-    if license_plates[0].lower() == "test112":
-        settings.driver.quit()
-
-        counter = 0
-
-        # iterate through RES.get("data")[0] and its keys, values and send them one by one
-        for key, value in RES.get("data")[0].items():
-            time.sleep(0.25)
-            await settings.send_data(key, value, counter)
-            counter += 5
-        await settings.send_data("message", "This is a test error message", 17, "fail")
+            counter += 100 / 17
+
+        if license_plates[0].lower() == "test112":
+            await settings.send_data(
+                "message", "This is a test error message", 100, "fail"
+            )
+        else:
+            await settings.send_data("message", None, 100, "success")
         return
 
     settings.driver.get(settings.URL)

diff --git a/tests/test_response.py b/tests/test_response.py
@@ -1,68 +1,19 @@
 RES = {
-    "data": [
-        {
-            "accidents": [
-                {
-                    "accident_date": "1995.01.01",
-                    "role": "Károkozó"
-                },
-                {
-                    "accident_date": "1995.01.02",
-                    "role": "Károkozó"
-                },
-                {
-                    "accident_date": "1995.01.03",
-                    "role": "Károkozó"
-                }
-            ],
-            "brand": "BMW",
-            "color": "FEKETE",
-            "engine_size": 4398,
-            "first_reg": "1998.10.15.",
-            "first_reg_hun": "1998.10.15.",
-            "fuel_type": "BENZIN",
-            "gearbox": "Automata",
-            "license_plate": "GSM140",
-            "mileage": [
-                {
-                    "mileage": 127973,
-                    "mileage_date": "2012.10.17."
-                },
-                {
-                    "mileage": 177050,
-                    "mileage_date": "2013.06.18."
-                },
-                {
-                    "mileage": 209246,
-                    "mileage_date": "2014.09.25."
-                },
-                {
-                    "mileage": 280900,
-                    "mileage_date": "2017.04.25."
-                },
-                {
-                    "mileage": 352876,
-                    "mileage_date": "2019.04.26."
-                },
-                {
-                    "mileage": 405278,
-                    "mileage_date": "2021.04.13."
-                },
-                {
-                    "mileage": 416294,
-                    "mileage_date": "2023.03.20."
-                }
-            ],
-            "model": "",
-            "num_of_owners": 5,
-            "performance": 281,
-            "restrictions": [
-                "1", "2", "3"
-            ],
-            "status": "A jármű forgalomban van",
-            "type_code": "740 I",
-            "year": 1998
-        }
-    ],
-    "status": "success"
-}
+    "accidents": [],
+    "brand": "BMW",
+    "color": "FEKETE",
+    "engine_size": 4398,
+    "first_reg": "1998.10.15.",
+    "first_reg_hun": "1998.10.15.",
+    "fuel_type": "BENZIN",
+    "gearbox": "Automata",
+    "status": "A jármű forgalomban van",
+    "type_code": "740 I",
+    "year": 1998,
+    "model": "",
+    "num_of_owners": 5,
+    "performance": 281,
+    "restrictions": [],
+    "mileage": [],
+    # "inspections": [],
+}