Merge pull request #24 from TaskarCenterAtUW/develop

orgId changed

Author: susrisha

.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+---
+name: Tests
+
+#############################
+# Start the job on all push #
+#############################
+on:
+  push:
+    branches-ignore:
+      - '**'
+    # Remove the line above to run when pushing to master
+  pull_request:
+    branches: [develop]
+
+jobs:
+  Tests:
+    name: Unit tests
+    # Set the agent to run on
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt
+
+      - name: Run unit tests
+        run: |
+          python -m unittest discover -v tests/unit_tests
+

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+
+### 0.0.17
+- Added Unit Test Cases
+- Updated Readme file 
+
 ### 0.0.16
 - Removed extra logs
 

README.md

@@ -11,7 +11,7 @@
 
 build_date = date.today().strftime('%Y-%m-%d')
 
-version = '0.0.16'
+version = '0.0.17'
 
 with open(version_file_path, 'w+') as version_file:
     version_file.write("version = '{}'\n".format(version))

freeze_version.py

@@ -19,3 +19,7 @@ typing_extensions==4.4.0
 uamqp==1.6.3
 urllib3==1.26.14
 pika==1.3.1
+httpx==0.24.1
+coverage==7.2.7
+html_testRunner==1.2.1
+psutil==5.9.5

requirements.txt

@@ -79,7 +79,7 @@ def process(message):
 
 # permission_params = PermissionRequest(
 #     user_id='7961d767-a352-464f-95b6-cd1c5189a93c',
-#     org_id='5e339544-3b12-40a5-8acd-78c66d1fa981',
+#     project_group__id='5e339544-3b12-40a5-8acd-78c66d1fa981',
 #     should_satisfy_all=False,
 #     permissions=['poc']
 # )

src/example.py

@@ -7,7 +7,7 @@
 from .core.storage.providers.local.local_storage_client import LocalStorageClient
 from .core.auth.provider.hosted.hosted_authorizer import HostedAuthorizer
 from .core.auth.provider.simulated.simulated_authorizer import SimulatedAuthorizer
-from .core.config.config import CoreConfig, LocalConfig, AuthConfig
+from .core.config.config import CoreConfig, LocalConfig, AuthConfig, UnknownConfig
 
 LOCAL_ENV = 'LOCAL'
 AZURE_ENV = 'AZURE'
@@ -17,11 +17,18 @@
 
 class Core:
     def __init__(self, config=None):
-        if config is not None and config.upper() == LOCAL_ENV:
-            self.config = LocalConfig()
+        if config is not None:
+            if config.upper() == LOCAL_ENV:
+                self.config = LocalConfig()
+            elif config.upper() == LOCAL_ENV:
+                self.config = CoreConfig()
+                self.__check_health()
+            else:
+                self.config = UnknownConfig(provider=config)
+                logging.error(f'Failed to initialize core.get_logger for provider: {config}')
         else:
             self.config = CoreConfig()
-        self.__check_health()
+            self.__check_health()
 
     def get_logger(self):
         logger_config = self.config.logger()
@@ -30,7 +37,7 @@ def get_logger(self):
         elif logger_config.provider.upper() == AZURE_ENV:
             return Logger(config=logger_config)
         else:
-            logging.error(f'Failed to initialization core.get_logger for provider: {logger_config.provider}')
+            logging.error(f'Failed to initialize core.get_logger for provider: {logger_config.provider}')
 
     def get_topic(self, topic_name: str):
         topic_config = self.config.topic()
@@ -39,7 +46,7 @@ def get_topic(self, topic_name: str):
         elif topic_config.provider.upper() == AZURE_ENV:
             return Topic(config=topic_config, topic_name=topic_name)
         else:
-            logging.error(f'Failed to  initialization core.get_topic for provider: {topic_config.provider}')
+            logging.error(f'Failed to initialize core.get_topic for provider: {topic_config.provider}')
 
     def get_storage_client(self):
         storage_config = self.config.storage()
@@ -48,7 +55,7 @@ def get_storage_client(self):
         elif storage_config.provider.upper() == AZURE_ENV:
             return AzureStorageClient(storage_config)
         else:
-            logging.error(f'Failed to  initialization core.get_storage_client for provider: {storage_config.provider}')
+            logging.error(f'Failed to initialize core.get_storage_client for provider: {storage_config.provider}')
 
     def get_authorizer(self, config: dict = None):
         if config is None:
@@ -62,7 +69,7 @@ def get_authorizer(self, config: dict = None):
         elif auth_config.provider.upper() == HOSTED_ENV:
             return HostedAuthorizer(config=auth_config)
         else:
-            logging.error(f'Failed to  initialization core.get_authorizer for provider: {auth_config.provider}')
+            logging.error(f'Failed to initialize core.get_authorizer for provider: {auth_config.provider}')
 
     def __check_health(self):
         print('\x1b[32m ------------------------- \x1b[0m')

src/python_ms_core/__init__.py

@@ -5,13 +5,13 @@
 @dataclass
 class PermissionRequest:
     user_id: str
-    org_id: str
+    project_group_id: str
     permissions: Optional[str] = None
     should_satisfy_all: bool = False
 
-    def __init__(self, user_id: str, org_id: str, permissions: Optional[str] = None, should_satisfy_all: bool = False):
+    def __init__(self, user_id: str, project_group_id: str, permissions: Optional[str] = None, should_satisfy_all: bool = False):
         self._user_id = user_id
-        self._org_id = org_id
+        self._project_group_id = project_group_id
         self._permissions = permissions
         self._should_satisfy_all = should_satisfy_all
 
@@ -24,12 +24,12 @@ def user_id(self, value):
         self._user_id = value
 
     @property
-    def org_id(self):
-        return self._org_id
+    def project_group_id(self):
+        return self._project_group_id
 
-    @org_id.setter
-    def org_id(self, value):
-        self._org_id = value
+    @project_group_id.setter
+    def project_group_id(self, value):
+        self.project_group_id = value
 
     @property
     def permissions(self):
@@ -51,7 +51,7 @@ def get_search_params(self):
         affirmative = 'true' if self._should_satisfy_all else 'false'
         params = {
             'userId': self._user_id,
-            'agencyId': self._org_id,
+            'projectGroupId': self.project_group_id,
             'affirmative': affirmative
         }
         if self._permissions and len(self._permissions) > 0:

src/python_ms_core/core/auth/models/permission_request.py

@@ -116,3 +116,44 @@ def auth(self):
         return AuthConfig(
             provider='Simulated'
         )
+
+
+class UnknownConfig:
+    def __init__(self, provider: str):
+        self.provider = provider
+        self.queue_connection = None
+        self.queue_name = None
+        self.topic_connection = None
+        self.storage_connection = None
+
+    def logger(self):
+        return LogerConfig(
+            provider=self.provider,
+            con_string=self.queue_connection,
+            queue_name=self.queue_name
+        )
+
+    def queue(self):
+        return QueueConfig(
+            provider=self.provider,
+            con_string=self.queue_connection,
+            queue_name=self.queue_name
+        )
+
+    def topic(self):
+        return TopicConfig(
+            provider=self.provider,
+            con_string=self.topic_connection
+        )
+
+    def storage(self):
+        return StorageConfig(
+            provider=self.provider,
+            con_string=self.storage_connection
+        )
+
+    def auth(self):
+        return AuthConfig(
+            provider='Simulated'
+        )
+

src/python_ms_core/core/config/config.py

@@ -36,3 +36,6 @@ def remove(self):
 
     def get_items(self):
         return self.queue
+
+    def empty(self):
+        self.queue = list()