rename org to project group

Author: iAKM

src/assets/osw-upload.json

@@ -67,7 +67,7 @@
     },
     "response": {
       "success": true,
-      "message": "File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
+      "message": "File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
     },
     "tdei_record_id": "c8c76e89f30944d2b2abd2491bd95337",
     "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",

src/osw_validator.py

@@ -105,7 +105,7 @@ def has_permission(self, roles: List[str], queue_message: Upload) -> bool:
         try:
             permission_request = PermissionRequest(
                 user_id=queue_message.data.user_id,
-                org_id=queue_message.data.tdei_project_group_id,
+                project_group_id=queue_message.data.tdei_project_group_id,
                 permissions=roles,
                 should_satisfy_all=False
             )

tests/test_harness/test_files/osw_test_case1.json

@@ -65,7 +65,7 @@
     },
     "response": {
       "success": true,
-      "message": "File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
+      "message": "File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
     },
     "tdei_record_id": "c8c76e89f30944d2b2abd2491bd95337",
     "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",

tests/test_harness/test_files/osw_test_case2.json

@@ -65,7 +65,7 @@
     },
     "response": {
       "success": true,
-      "message": "File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95338"
+      "message": "File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95338"
     },
     "tdei_record_id": "c8c76e89f30944d2b2abd2491bd95338",
     "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",

tests/unit_tests/test_queue_message_content.py

@@ -80,8 +80,8 @@ def test_tdei_record_id(self):
 
     def test_tdei_project_group_id(self):
         self.assertEqual(self.upload_data.tdei_project_group_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb')
-        self.upload_data.tdei_project_group_id = 'Test org ID'
-        self.assertEqual(self.upload_data.tdei_project_group_id, 'Test org ID')
+        self.upload_data.tdei_project_group_id = 'Test Project Group ID'
+        self.assertEqual(self.upload_data.tdei_project_group_id, 'Test Project Group ID')
 
     def test_user_id(self):
         self.assertEqual(self.upload_data.user_id, 'c59d29b6-a063-4249-943f-d320d15ac9ab')
@@ -97,8 +97,8 @@ def setUp(self):
 
     def test_tdei_project_group_id(self):
         self.assertEqual(self.request.tdei_project_group_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb')
-        self.request.tdei_project_group_id = 'Test org ID'
-        self.assertEqual(self.request.tdei_project_group_id, 'Test org ID')
+        self.request.tdei_project_group_id = 'Test Project Group ID'
+        self.assertEqual(self.request.tdei_project_group_id, 'Test Project Group ID')
 
     def test_collected_by(self):
         self.assertEqual(self.request.collected_by, '6D3E5B8C-FB16-4B6A-9436-72FD24756CC9')
@@ -165,7 +165,7 @@ def test_success(self):
 
     def test_message(self):
         self.assertEqual(self.response.message,
-                         'File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337')
+                         'File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337')
         self.response.message = 'Successful'
         self.assertEqual(self.response.message, 'Successful')