Merge pull request #76 from minos-framework/0.1.0

0.1.0

Author: Sergio García Prado

.gitignore

@@ -112,3 +112,4 @@ ENV/
 
 # Sphinx Api Documentation
 docs/api
+.run

HISTORY.md

@@ -50,3 +50,8 @@ History
 ------------------
 
 * modified PORT from string to INT
+
+0.1.0 (2022-02-3)
+------------------
+
+* New view /endpoints. Return all endpoints stored.

minos/api_gateway/discovery/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.8"
+__version__ = "0.1.0"
 
 from .cli import (
     app,

minos/api_gateway/discovery/database/client.py

@@ -13,12 +13,18 @@ class OrdersMinosApiRouter(MinosApiRouter):
 """
 
 import json
+from typing import (
+    Any,
+)
 
 import aioredis
 
 from minos.api_gateway.common import (
     MinosConfig,
 )
+from minos.api_gateway.discovery.domain.microservice import (
+    MICROSERVICE_KEY_PREFIX,
+)
 
 
 class MinosRedisClient:
@@ -53,6 +59,19 @@ async def get_data(self, key: str) -> str:
 
         return json_data
 
+    async def get_all(self) -> list:
+        """Get redis value by key"""
+        data = list()
+        try:
+            async for key in self.redis.scan_iter(match=f"{MICROSERVICE_KEY_PREFIX}:*"):
+                decoded_key = key.decode("utf-8")
+                redis_data: dict[str, Any] = await self.redis.get(decoded_key)
+                data.append(json.loads(redis_data))
+        except Exception:
+            pass
+
+        return data
+
     async def set_data(self, key: str, data: dict):
         flag = True
         try:

minos/api_gateway/discovery/domain/microservice.py

@@ -67,6 +67,18 @@ async def load(cls, microservice_key: bytes, db_client) -> Microservice:
         ]
         return cls(**microservice_dict)
 
+    @classmethod
+    async def get_all(cls, db_client) -> Microservice:
+        """Load an instance from the database.
+
+        :param microservice_key: The microservice key.
+        :param db_client: The database client.
+        :return: A ``Microservice`` instance.
+        """
+
+        res = await db_client.get_all()
+        return res
+
     async def save(self, db_client) -> None:
         """Store the instance into the database.
 

minos/api_gateway/discovery/views/__init__.py

@@ -1,6 +1,9 @@
 from .endpoint import (
     EndpointView,
 )
+from .endpoints import (
+    EndpointsView,
+)
 from .microservice import (
     MicroserviceView,
 )

minos/api_gateway/discovery/views/endpoints.py

@@ -0,0 +1,19 @@
+from aiohttp import (
+    web,
+)
+
+from ..domain import (
+    Microservice,
+)
+from .router import (
+    routes,
+)
+
+
+@routes.view("/endpoints")
+class EndpointsView(web.View):
+    async def get(self):
+        redis_client = self.request.app["db_client"]
+        endpoints = await Microservice.get_all(redis_client)
+
+        return web.json_response(endpoints)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "minos_discovery"
-version = "0.0.8"
+version = "0.1.0"
 description = "Minos Discovery service for Microservices subscription."
 readme = "README.md"
 repository = "https://github.com/clariteia/discovery"

tests/test_api_gateway/test_discovery/test_views/test_endpoints.py

@@ -0,0 +1,34 @@
+from aiohttp.test_utils import (
+    AioHTTPTestCase,
+)
+
+from minos.api_gateway.common import (
+    MinosConfig,
+)
+from minos.api_gateway.discovery import (
+    DiscoveryService,
+)
+from tests.utils import (
+    BASE_PATH,
+)
+
+
+class TestMicroserviceEndpoints(AioHTTPTestCase):
+    CONFIG_FILE_PATH = BASE_PATH / "config.yml"
+
+    async def get_application(self):
+        """
+        Override the get_app method to return your application.
+        """
+        config = MinosConfig(self.CONFIG_FILE_PATH)
+        service = DiscoveryService(
+            address=config.discovery.connection.host, port=config.discovery.connection.port, config=config
+        )
+
+        return await service.create_application()
+
+    async def test_get(self):
+        response = await self.client.get("/endpoints")
+
+        self.assertEqual(200, response.status)
+        self.assertIsInstance(await response.json(), list)