Merge pull request #23 from TaskarCenterAtUW/feature-rename-org-to-projectgroup

Rename org to projectgroup

Author: susrisha

README.md

@@ -204,7 +204,7 @@ from python_ms_core.core.auth.models.permission_request import PermissionRequest
 
 permission_request = PermissionRequest(
     user_id='<userID>',
-    org_id='<orgID>',
+    project_group_id='<projectGroupID>',
     should_satisfy_all=False,
     permissions=['permission1', 'permission2']
 )
@@ -252,7 +252,7 @@ core = Core()
 
 permission_request = PermissionRequest(
     user_id='<userID>',
-    org_id='<orgID>',
+    project_group_id='<projectGroupID>',
     should_satisfy_all=False,
     permissions=['permission1', 'permission2']
 )

freeze_version.py

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

src/example.py

@@ -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/python_ms_core/core/auth/models/permission_request.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:

tests/unit_tests/test_auth/abstract/test_authorizer_abstraction.py

@@ -10,7 +10,7 @@ def test_has_permission(self):
         # Create a mock PermissionRequest object
         request_params = PermissionRequest(
             user_id='SOME_USER_ID',
-            org_id='SOME_ORG_ID',
+            project_group_id='SOME_PROJECT_GROUP_ID',
             should_satisfy_all=False,
             permissions=['poc']
         )

tests/unit_tests/test_auth/models/test_permission_request.py

@@ -6,16 +6,16 @@ class TestPermissionRequest(unittest.TestCase):
 
     def test_get_search_params(self):
         user_id = '123'
-        org_id = '456'
+        project_group_id = '456'
         permissions = 'read,write'
         should_satisfy_all = True
 
-        request = PermissionRequest(user_id, org_id, permissions, should_satisfy_all)
+        request = PermissionRequest(user_id, project_group_id, permissions, should_satisfy_all)
         search_params = request.get_search_params()
 
         expected_params = {
             'userId': user_id,
-            'agencyId': org_id,
+            'projectGroupId': project_group_id,
             'affirmative': 'true',
             'roles': permissions
         }

tests/unit_tests/test_auth/provider/test_hosted_authorizer.py

@@ -13,11 +13,11 @@ def test_has_permission_with_valid_permissions(self):
         config.auth_url = 'https://example.com/api/auth'
 
         user_id = '123'
-        org_id = '456'
+        project_group_id = '456'
         permissions = ['poc']
         should_satisfy_all = True
 
-        request_params = PermissionRequest(user_id, org_id, permissions, should_satisfy_all)
+        request_params = PermissionRequest(user_id, project_group_id, permissions, should_satisfy_all)
 
         authorizer = HostedAuthorizer(config)
         response_data = {'status': 'success'}
@@ -32,11 +32,11 @@ def test_has_permission_with_invalid_permissions(self):
         config.auth_url = 'https://example.com/api/auth'
 
         user_id = '123'
-        org_id = '456'
+        project_group_id = '456'
         permissions = []
         should_satisfy_all = True
 
-        request_params = PermissionRequest(user_id, org_id, permissions, should_satisfy_all)
+        request_params = PermissionRequest(user_id, project_group_id, permissions, should_satisfy_all)
 
         authorizer = HostedAuthorizer(config)
 
@@ -51,11 +51,11 @@ def test_has_permission_with_missing_auth_url(self):
         config.auth_url = ''
 
         user_id = '123'
-        org_id = '456'
+        project_group_id = '456'
         permissions = ['poc']
         should_satisfy_all = True
 
-        request_params = PermissionRequest(user_id, org_id, permissions, should_satisfy_all)
+        request_params = PermissionRequest(user_id, project_group_id, permissions, should_satisfy_all)
 
         authorizer = HostedAuthorizer(config)