Merge pull request #86 from minos-framework/restyled/issue-78-redis-not-saving-data

Restyle Issue 78 redis not saving data

Author: vladyslav-fenchak

minos/api_gateway/discovery/database/client.py

@@ -16,7 +16,7 @@ class OrdersMinosApiRouter(MinosApiRouter):
 import logging
 from typing import (
     Any,
-    Optional
+    Optional,
 )
 
 import aioredis

tests/test_api_gateway/test_discovery/dataset.py

@@ -1,7 +1,9 @@
 import random
 import socket
 import struct
-from uuid import uuid4
+from uuid import (
+    uuid4,
+)
 
 
 def generate_random_microservice_names(quantity: int):
@@ -11,21 +13,27 @@ def generate_random_microservice_names(quantity: int):
 
 
 def generate_record(name):
-    ip = socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
+    ip = socket.inet_ntoa(struct.pack(">I", random.randint(1, 0xFFFFFFFF)))
     port = random.randint(1, 9999)
 
-    record = {"address": f"{ip}", "port": port,
-              "endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]]}
+    record = {
+        "address": f"{ip}",
+        "port": port,
+        "endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]],
+    }
 
     return record
 
 
 def generate_record_old(x):
-    ip = socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
+    ip = socket.inet_ntoa(struct.pack(">I", random.randint(1, 0xFFFFFFFF)))
     port = random.randint(1, 9999)
     name = f"microservice_{x}"
 
-    record = {"address": f"{ip}", "port": port,
-              "endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]]}
+    record = {
+        "address": f"{ip}",
+        "port": port,
+        "endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]],
+    }
 
     return name, record

tests/test_api_gateway/test_discovery/test_views/test_microservice.py

@@ -4,14 +4,18 @@
     AioHTTPTestCase,
     unittest_run_loop,
 )
+
 from minos.api_gateway.common import (
     MinosConfig,
 )
 from minos.api_gateway.discovery import (
     DiscoveryService,
 )
-from tests.test_api_gateway.test_discovery.dataset import generate_record, generate_random_microservice_names, \
-    generate_record_old
+from tests.test_api_gateway.test_discovery.dataset import (
+    generate_random_microservice_names,
+    generate_record,
+    generate_record_old,
+)
 from tests.utils import (
     BASE_PATH,
 )
@@ -70,15 +74,16 @@ async def test_bulk_update(self):
         # Check updated records are correct
         for record in expected:
             response = await self.client.get(
-                f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}")
+                f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}"
+            )
 
             self.assertEqual(200, response.status)
 
             body = await response.json()
 
-            self.assertEqual(record['body']['address'], body["address"])
-            self.assertEqual(record['body']['port'], int(body["port"]))
-            self.assertEqual(record['name'], body["name"])
+            self.assertEqual(record["body"]["address"], body["address"])
+            self.assertEqual(record["body"]["port"], int(body["port"]))
+            self.assertEqual(record["name"], body["name"])
 
     async def test_bulk_update_2(self):
         expected = list()
@@ -106,15 +111,16 @@ async def test_bulk_update_2(self):
 
         for record in expected:
             response = await self.client.get(
-                f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}")
+                f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}"
+            )
 
             self.assertEqual(200, response.status)
 
             body = await response.json()
 
-            self.assertEqual(record['body']['address'], body["address"])
-            self.assertEqual(int(record['body']['port']), int(body["port"]))
-            self.assertEqual(record['name'], body["name"])
+            self.assertEqual(record["body"]["address"], body["address"])
+            self.assertEqual(int(record["body"]["port"]), int(body["port"]))
+            self.assertEqual(record["name"], body["name"])
 
     @unittest_run_loop
     async def test_post_missing_param(self):