Skip to content

Commit 2332693

Browse files
susrishasusrisha
authored
Merge pull request #7 from TaskarCenterAtUW/feature-rename-org-to-projectgroup
Rename org to projectgroup
2 parents b913cb0 + 9c67811 commit 2332693

File tree

9 files changed

+32
-32
lines changed

9 files changed

+32
-32
lines changed

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ psutil==5.9.5
22
fastapi==0.88.0
33
python-dotenv==0.21.0
44
pydantic==1.10.4
5-
python-ms-core==0.0.16
5+
python-ms-core==0.0.17
66
uvicorn==0.20.0
77
coverage==7.2.7
88
html_testRunner==1.2.1

‎src/assets/osw-upload.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"data": {
55
"stage": "OSW-Upload",
66
"request": {
7-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
7+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
88
"collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9",
99
"collection_date": "2022-11-22T09:43:07.978Z",
1010
"collection_method": "manual",
@@ -67,10 +67,10 @@
6767
},
6868
"response": {
6969
"success": true,
70-
"message": "File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
70+
"message": "File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
7171
},
7272
"tdei_record_id": "c8c76e89f30944d2b2abd2491bd95337",
73-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
73+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
7474
"user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab"
7575
}
7676
}

‎src/assets/osw-validation.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"data": {
55
"stage": "OSW-Validation",
66
"request": {
7-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
7+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
88
"collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9",
99
"collection_date": "2022-11-22T09:43:07.978Z",
1010
"collection_method": "manual",
@@ -72,7 +72,7 @@
7272
"message": "Validation successful"
7373
},
7474
"tdei_record_id": "c8c76e89f30944d2b2abd2491bd95337",
75-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
75+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
7676
"user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab"
7777
}
7878
}

‎src/models/queue_message_content.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __init__(self, data: dict):
7676
self.meta = Meta(data=meta) if meta else {}
7777
self.response = Response(data=response) if response else {}
7878
self._tdei_record_id = data.get('tdei_record_id', '')
79-
self._tdei_org_id = data.get('tdei_org_id', '')
79+
self._tdei_project_group_id = data.get('tdei_project_group_id', '')
8080
self._user_id = data.get('user_id', '')
8181

8282
@property
@@ -92,10 +92,10 @@ def tdei_record_id(self): return self._tdei_record_id
9292
def tdei_record_id(self, value): self._tdei_record_id = value
9393

9494
@property
95-
def tdei_org_id(self): return self._tdei_org_id
95+
def tdei_project_group_id(self): return self._tdei_project_group_id
9696

97-
@tdei_org_id.setter
98-
def tdei_org_id(self, value): self._tdei_org_id = value
97+
@tdei_project_group_id.setter
98+
def tdei_project_group_id(self, value): self._tdei_project_group_id = value
9999

100100
@property
101101
def user_id(self): return self._user_id
@@ -112,7 +112,7 @@ def to_json(self):
112112

113113
class Request:
114114
def __init__(self, data: dict):
115-
self._tdei_org_id = data.get('tdei_org_id', '')
115+
self._tdei_project_group_id = data.get('tdei_project_group_id', '')
116116
self._collected_by = data.get('collected_by', '')
117117
self._collection_date = data.get('collection_date', '')
118118
self._collection_method = data.get('collection_method', '')
@@ -122,10 +122,10 @@ def __init__(self, data: dict):
122122
self._osw_schema_version = data.get('osw_schema_version', '')
123123

124124
@property
125-
def tdei_org_id(self): return self._tdei_org_id
125+
def tdei_project_group_id(self): return self._tdei_project_group_id
126126

127-
@tdei_org_id.setter
128-
def tdei_org_id(self, value): self._tdei_org_id = value
127+
@tdei_project_group_id.setter
128+
def tdei_project_group_id(self, value): self._tdei_project_group_id = value
129129

130130
@property
131131
def collected_by(self): return self._collected_by

‎src/osw_validator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def has_permission(self, roles: List[str], queue_message: Upload) -> bool:
105105
try:
106106
permission_request = PermissionRequest(
107107
user_id=queue_message.data.user_id,
108-
org_id=queue_message.data.tdei_org_id,
108+
project_group_id=queue_message.data.tdei_project_group_id,
109109
permissions=roles,
110110
should_satisfy_all=False
111111
)

‎test-case-enumeration.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ if __name__ == '__main__':
6161
| Model | Upload | Functional| When requested with upload to_json | Expect to return same dict |:white_check_mark:|
6262
| -- | -- |--| -- |--|--|
6363
| Model | UploadData | Functional| When requested with stage parameter | Expect to return stage |:white_check_mark:|
64-
| Model | UploadData | Functional| When requested with tdei_org_id parameter | Expect to return tdei_org_id |:white_check_mark:|
64+
| Model | UploadData | Functional| When requested with tdei_project_group_id parameter | Expect to return tdei_project_group_id |:white_check_mark:|
6565
| Model | UploadData | Functional| When requested with tdei_record_id parameter | Expect to return tdei_record_id |:white_check_mark:|
6666
| Model | UploadData | Functional| When requested with user_id parameter | Expect to return user_id |:white_check_mark:|
6767
| -- | -- |--| -- |--|--|
68-
| Model | TestRequest | Functional| When requested with tdei_org_id parameter | Expect to return tdei_org_id |:white_check_mark:|
68+
| Model | TestRequest | Functional| When requested with tdei_project_group_id parameter | Expect to return tdei_project_group_id |:white_check_mark:|
6969
| -- | -- |--| -- |--|--|
7070
| Model | TestMeta | Functional| When requested with file_upload_path parameter | Expect to return file_upload_path |:white_check_mark:|
7171
| -- | -- |--| -- |--|--|

‎tests/test_harness/test_files/osw_test_case1.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"stage": "OSW-Validation",
33
"request": {
4-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
4+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
55
"collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9",
66
"collection_date": "2022-11-22T09:43:07.978Z",
77
"collection_method": "manual",
@@ -65,9 +65,9 @@
6565
},
6666
"response": {
6767
"success": true,
68-
"message": "File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
68+
"message": "File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337"
6969
},
7070
"tdei_record_id": "c8c76e89f30944d2b2abd2491bd95337",
71-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
71+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
7272
"user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab"
7373
}

‎tests/test_harness/test_files/osw_test_case2.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"stage": "OSW-Validation",
33
"request": {
4-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
4+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
55
"collected_by": "6D3E5B8C-FB16-4B6A-9436-72FD24756CC9",
66
"collection_date": "2022-11-22T09:43:07.978Z",
77
"collection_method": "manual",
@@ -65,9 +65,9 @@
6565
},
6666
"response": {
6767
"success": true,
68-
"message": "File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95338"
68+
"message": "File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95338"
6969
},
7070
"tdei_record_id": "c8c76e89f30944d2b2abd2491bd95338",
71-
"tdei_org_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
71+
"tdei_project_group_id": "0b41ebc5-350c-42d3-90af-3af4ad3628fb",
7272
"user_id": "c59d29b6-a063-4249-943f-d320d15ac9ab"
7373
}

‎tests/unit_tests/test_queue_message_content.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ def test_tdei_record_id(self):
7878
self.upload_data.tdei_record_id = 'Test record ID'
7979
self.assertEqual(self.upload_data.tdei_record_id, 'Test record ID')
8080

81-
def test_tdei_org_id(self):
82-
self.assertEqual(self.upload_data.tdei_org_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb')
83-
self.upload_data.tdei_org_id = 'Test org ID'
84-
self.assertEqual(self.upload_data.tdei_org_id, 'Test org ID')
81+
def test_tdei_project_group_id(self):
82+
self.assertEqual(self.upload_data.tdei_project_group_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb')
83+
self.upload_data.tdei_project_group_id = 'Test Project Group ID'
84+
self.assertEqual(self.upload_data.tdei_project_group_id, 'Test Project Group ID')
8585

8686
def test_user_id(self):
8787
self.assertEqual(self.upload_data.user_id, 'c59d29b6-a063-4249-943f-d320d15ac9ab')
@@ -95,10 +95,10 @@ def setUp(self):
9595
data = TEST_DATA['data']['request']
9696
self.request = Request(data)
9797

98-
def test_tdei_org_id(self):
99-
self.assertEqual(self.request.tdei_org_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb')
100-
self.request.tdei_org_id = 'Test org ID'
101-
self.assertEqual(self.request.tdei_org_id, 'Test org ID')
98+
def test_tdei_project_group_id(self):
99+
self.assertEqual(self.request.tdei_project_group_id, '0b41ebc5-350c-42d3-90af-3af4ad3628fb')
100+
self.request.tdei_project_group_id = 'Test Project Group ID'
101+
self.assertEqual(self.request.tdei_project_group_id, 'Test Project Group ID')
102102

103103
def test_collected_by(self):
104104
self.assertEqual(self.request.collected_by, '6D3E5B8C-FB16-4B6A-9436-72FD24756CC9')
@@ -165,7 +165,7 @@ def test_success(self):
165165

166166
def test_message(self):
167167
self.assertEqual(self.response.message,
168-
'File uploaded for the Organization : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337')
168+
'File uploaded for the Project Group : 0b41ebc5-350c-42d3-90af-3af4ad3628fb with tdei record id : c8c76e89f30944d2b2abd2491bd95337')
169169
self.response.message = 'Successful'
170170
self.assertEqual(self.response.message, 'Successful')
171171

0 commit comments

Comments
 (0)