Skip to content

Commit

Permalink
finish replacing
Browse files Browse the repository at this point in the history
  • Loading branch information
eric-intuitem committed Apr 18, 2024
1 parent dd28f0e commit e6f82d1
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion backend/app_tests/test_vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"BI-UG-GAD": {
"folder": "Global",
"name": "Global_auditor",
"name": "Global_reader",
"perms": READER_PERMISSIONS_LIST,
},
"BI-UG-GAP": {
Expand Down
14 changes: 7 additions & 7 deletions backend/core/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ def startup(**kwargs):

print("startup handler: initialize database")

auditor_permissions = Permission.objects.filter(
reader_permissions = Permission.objects.filter(
codename__in=READER_PERMISSIONS_LIST
)

Expand All @@ -277,8 +277,8 @@ def startup(**kwargs):
name="Global", content_type=Folder.ContentType.ROOT, builtin=True
)
# update builtin roles to facilitate migrations
auditor, created = Role.objects.get_or_create(name="BI-RL-AUD", builtin=True)
auditor.permissions.set(auditor_permissions)
reader, created = Role.objects.get_or_create(name="BI-RL-AUD", builtin=True)
reader.permissions.set(reader_permissions)
approver, created = Role.objects.get_or_create(name="BI-RL-APP", builtin=True)
approver.permissions.set(approver_permissions)
analyst, created = Role.objects.get_or_create(name="BI-RL-ANA", builtin=True)
Expand All @@ -302,23 +302,23 @@ def startup(**kwargs):
folder=Folder.get_root_folder(),
)
ra1.perimeter_folders.add(administrators.folder)
# if global auditors user group does not exist, then create it
# if global readers user group does not exist, then create it
if not UserGroup.objects.filter(
name="BI-UG-GAD", folder=Folder.get_root_folder()
).exists():
global_auditors = UserGroup.objects.create(
global_readers = UserGroup.objects.create(
name="BI-UG-GAD",
folder=Folder.objects.get(content_type=Folder.ContentType.ROOT),
builtin=True,
)
ra2 = RoleAssignment.objects.create(
user_group=global_auditors,
user_group=global_readers,
role=Role.objects.get(name="BI-RL-AUD"),
is_recursive=True,
builtin=True,
folder=Folder.get_root_folder(),
)
ra2.perimeter_folders.add(global_auditors.folder)
ra2.perimeter_folders.add(global_readers.folder)
# if global approvers user group does not exist, then create it
if not UserGroup.objects.filter(
name="BI-UG-GAP", folder=Folder.get_root_folder()
Expand Down
8 changes: 4 additions & 4 deletions backend/core/tests/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_get_rating_options_perm_to_view_matrix():
)
RiskScenario.objects.create(name="test", risk_assessment=risk_assessment)
role = Role.objects.create(name="test")
auditor_permissions = Permission.objects.filter(
reader_permissions = Permission.objects.filter(
codename__in=[
"view_project",
"view_riskassessment",
Expand All @@ -58,7 +58,7 @@ def test_get_rating_options_perm_to_view_matrix():
"view_usergroup",
]
)
role.permissions.set(auditor_permissions)
role.permissions.set(reader_permissions)
role.save()
role_assignment = RoleAssignment.objects.create(
user=user,
Expand Down Expand Up @@ -109,7 +109,7 @@ def test_get_rating_options_abbr_perm_to_view_matrix():
)
RiskScenario.objects.create(name="test", risk_assessment=risk_assessment)
role = Role.objects.create(name="test")
auditor_permissions = Permission.objects.filter(
reader_permissions = Permission.objects.filter(
codename__in=[
"view_project",
"view_riskassessment",
Expand All @@ -123,7 +123,7 @@ def test_get_rating_options_abbr_perm_to_view_matrix():
"view_usergroup",
]
)
role.permissions.set(auditor_permissions)
role.permissions.set(reader_permissions)
role.save()
role_assignment = RoleAssignment.objects.create(
user=user,
Expand Down
4 changes: 2 additions & 2 deletions backend/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ def perform_create(self, serializer):
serializer.save()
folder = Folder.objects.get(id=serializer.data["id"])
if folder.content_type == Folder.ContentType.DOMAIN:
auditors = UserGroup.objects.create(
readers = UserGroup.objects.create(
name=UserGroupCodename.READER, folder=folder, builtin=True
)
approvers = UserGroup.objects.create(
Expand All @@ -916,7 +916,7 @@ def perform_create(self, serializer):
name=UserGroupCodename.DOMAIN_MANAGER, folder=folder, builtin=True
)
ra1 = RoleAssignment.objects.create(
user_group=auditors,
user_group=readers,
role=Role.objects.get(name=RoleCodename.READER),
builtin=True,
folder=Folder.get_root_folder(),
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
"extraLarge": "Extra-large",
"rid": "RID",
"scope": "Scope",
"auditor": "Reader",
"reader": "Reader",
"lastUpdate": "Last update",
"riskScenarioAssetHelpText": "Assets impacted by this risk scenario",
"riskScenarioMeasureHelpText": "The existing applied controls to manage this risk",
Expand Down
2 changes: 1 addition & 1 deletion frontend/messages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
"extraLarge": "Très grand",
"rid": "RID",
"scope": "Périmètre",
"auditor": "Auditeur",
"reader": "Auditeur",
"lastUpdate": "Dernière mise à jour",
"riskScenarioAssetHelpText": "Biens sensibles impactés par ce scénario de risque",
"riskScenarioMeasureHelpText": "Les mesures appliquées existantes pour gérer ce risque",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/lib/utils/locales.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ export function localItems(languageTag: string): LocalItems {
notApplicable: m.notApplicable({ languageTag: languageTag }),
administrator: m.administrator({ languageTag: languageTag }),
analyst: m.analyst({ languageTag: languageTag }),
auditor: m.auditor({ languageTag: languageTag }),
reader: m.reader({ languageTag: languageTag }),
domainManager: m.domainManager({ languageTag: languageTag }),
authors: m.authors({ languageTag: languageTag }),
reviewers: m.reviewers({ languageTag: languageTag }),
Expand Down
2 changes: 1 addition & 1 deletion frontend/tests/utils/test-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default {
"view_user",
]
},
auditor: {
reader: {
name: 'Reader',
perms: [
"view_project",
Expand Down
2 changes: 1 addition & 1 deletion frontend/tests/utils/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ export class TestContent {
last_name: vars.user.lastName,
user_groups: [
`${vars.folderName} - ${vars.usergroups.analyst.name}`,
`${vars.folderName} - ${vars.usergroups.auditor.name}`,
`${vars.folderName} - ${vars.usergroups.reader.name}`,
`${vars.folderName} - ${vars.usergroups.domainManager.name}`,
`${vars.folderName} - ${vars.usergroups.approver.name}`
],
Expand Down

0 comments on commit e6f82d1

Please sign in to comment.