diff --git a/requirements.txt b/requirements.txt index 42a0c07..7a37957 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ psutil==5.9.5 fastapi==0.88.0 python-dotenv==0.21.0 pydantic==1.10.4 -python-ms-core==0.0.16 +python-ms-core==0.0.17 uvicorn==0.20.0 coverage==7.2.7 html_testRunner==1.2.1 diff --git a/src/assets/osw-upload.json b/src/assets/osw-upload.json index b52861a..09ce62b 100644 --- a/src/assets/osw-upload.json +++ b/src/assets/osw-upload.json @@ -4,7 +4,7 @@ "data": { "stage": "OSW-Upload", "request": { - "tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9", "collection_date": "2022-11-22T09:43:07.978Z", "collection_method": "manual", @@ -67,10 +67,10 @@ }, "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_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab" } } \ No newline at end of file diff --git a/src/assets/osw-validation.json b/src/assets/osw-validation.json index e069c9d..5f6adf9 100644 --- a/src/assets/osw-validation.json +++ b/src/assets/osw-validation.json @@ -4,7 +4,7 @@ "data": { "stage": "OSW-Validation", "request": { - "tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9", "collection_date": "2022-11-22T09:43:07.978Z", "collection_method": "manual", @@ -72,7 +72,7 @@ "message": "Validation successful" }, "tdei_record_id": "c8c76e89f30944d2b2abd2491bd95337", - "tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab" } } \ No newline at end of file diff --git a/src/models/queue_message_content.py b/src/models/queue_message_content.py index 0c14a10..4b13e11 100644 --- a/src/models/queue_message_content.py +++ b/src/models/queue_message_content.py @@ -76,7 +76,7 @@ def __init__(self, data: dict): self.meta = Meta(data=meta) if meta else {} self.response = Response(data=response) if response else {} self._tdei_record_id = data.get('tdei_record_id', '') - self._tdei_org_id = data.get('tdei_org_id', '') + self._tdei_project_group_id = data.get('tdei_project_group_id', '') self._user_id = data.get('user_id', '') @property @@ -92,10 +92,10 @@ def tdei_record_id(self): return self._tdei_record_id def tdei_record_id(self, value): self._tdei_record_id = value @property - def tdei_org_id(self): return self._tdei_org_id + def tdei_project_group_id(self): return self._tdei_project_group_id - @tdei_org_id.setter - def tdei_org_id(self, value): self._tdei_org_id = value + @tdei_project_group_id.setter + def tdei_project_group_id(self, value): self._tdei_project_group_id = value @property def user_id(self): return self._user_id @@ -112,7 +112,7 @@ def to_json(self): class Request: def __init__(self, data: dict): - self._tdei_org_id = data.get('tdei_org_id', '') + self._tdei_project_group_id = data.get('tdei_project_group_id', '') self._collected_by = data.get('collected_by', '') self._collection_date = data.get('collection_date', '') self._collection_method = data.get('collection_method', '') @@ -122,10 +122,10 @@ def __init__(self, data: dict): self._osw_schema_version = data.get('osw_schema_version', '') @property - def tdei_org_id(self): return self._tdei_org_id + def tdei_project_group_id(self): return self._tdei_project_group_id - @tdei_org_id.setter - def tdei_org_id(self, value): self._tdei_org_id = value + @tdei_project_group_id.setter + def tdei_project_group_id(self, value): self._tdei_project_group_id = value @property def collected_by(self): return self._collected_by diff --git a/src/osw_validator.py b/src/osw_validator.py index ece4fb7..e227c4f 100644 --- a/src/osw_validator.py +++ b/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_org_id, + project_group_id=queue_message.data.tdei_project_group_id, permissions=roles, should_satisfy_all=False ) diff --git a/test-case-enumeration.md b/test-case-enumeration.md index 69690f4..8fb80e7 100644 --- a/test-case-enumeration.md +++ b/test-case-enumeration.md @@ -61,11 +61,11 @@ if __name__ == '__main__': | Model | Upload | Functional| When requested with upload to_json | Expect to return same dict |:white_check_mark:| | -- | -- |--| -- |--|--| | Model | UploadData | Functional| When requested with stage parameter | Expect to return stage |:white_check_mark:| -| Model | UploadData | Functional| When requested with tdei_org_id parameter | Expect to return tdei_org_id |:white_check_mark:| +| Model | UploadData | Functional| When requested with tdei_project_group_id parameter | Expect to return tdei_project_group_id |:white_check_mark:| | Model | UploadData | Functional| When requested with tdei_record_id parameter | Expect to return tdei_record_id |:white_check_mark:| | Model | UploadData | Functional| When requested with user_id parameter | Expect to return user_id |:white_check_mark:| | -- | -- |--| -- |--|--| -| Model | TestRequest | Functional| When requested with tdei_org_id parameter | Expect to return tdei_org_id |:white_check_mark:| +| Model | TestRequest | Functional| When requested with tdei_project_group_id parameter | Expect to return tdei_project_group_id |:white_check_mark:| | -- | -- |--| -- |--|--| | Model | TestMeta | Functional| When requested with file_upload_path parameter | Expect to return file_upload_path |:white_check_mark:| | -- | -- |--| -- |--|--| diff --git a/tests/test_harness/test_files/osw_test_case1.json b/tests/test_harness/test_files/osw_test_case1.json index 7b11d57..5cfe2c4 100644 --- a/tests/test_harness/test_files/osw_test_case1.json +++ b/tests/test_harness/test_files/osw_test_case1.json @@ -1,7 +1,7 @@ { "stage": "OSW-Validation", "request": { - "tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9", "collection_date": "2022-11-22T09:43:07.978Z", "collection_method": "manual", @@ -65,9 +65,9 @@ }, "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_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab" } \ No newline at end of file diff --git a/tests/test_harness/test_files/osw_test_case2.json b/tests/test_harness/test_files/osw_test_case2.json index 10709fe..21fd808 100644 --- a/tests/test_harness/test_files/osw_test_case2.json +++ b/tests/test_harness/test_files/osw_test_case2.json @@ -1,7 +1,7 @@ { "stage": "OSW-Validation", "request": { - "tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9", "collection_date": "2022-11-22T09:43:07.978Z", "collection_method": "manual", @@ -65,9 +65,9 @@ }, "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_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", + "tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb", "user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab" } \ No newline at end of file diff --git a/tests/unit_tests/test_queue_message_content.py b/tests/unit_tests/test_queue_message_content.py index 91aec25..2fd7013 100644 --- a/tests/unit_tests/test_queue_message_content.py +++ b/tests/unit_tests/test_queue_message_content.py @@ -78,10 +78,10 @@ def test_tdei_record_id(self): self.upload_data.tdei_record_id = 'Test record ID' self.assertEqual(self.upload_data.tdei_record_id, 'Test record ID') - def test_tdei_org_id(self): - self.assertEqual(self.upload_data.tdei_org_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb') - self.upload_data.tdei_org_id = 'Test org ID' - self.assertEqual(self.upload_data.tdei_org_id, 'Test org ID') + 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 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') @@ -95,10 +95,10 @@ def setUp(self): data = TEST_DATA['data']['request'] self.request = Request(data) - def test_tdei_org_id(self): - self.assertEqual(self.request.tdei_org_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb') - self.request.tdei_org_id = 'Test org ID' - self.assertEqual(self.request.tdei_org_id, 'Test org ID') + 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 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')