feat: created backend checking if the objects on creation/edit are relevant in domain context #1769
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -209,6 +209,93 @@ def test_create_requirement_assessments(self, test): | |||||||
| def test_update_requirement_assessments(self, test): | ||||||||
| """test to update requirement assessments with the API with authentication""" | ||||||||
|
|
||||||||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Framework") | ||||||||
| folder = Folder.objects.create(name="test2") | ||||||||
|
Comment on lines
+212
to
+213
There was a problem hiding this comment. 🛠️ Refactor suggestion Remove unused variable to maintain clarity. The - folder = Folder.objects.create(name="test2")📝 Committable suggestion
Suggested change
🧰 Tools🪛 Ruff (0.8.2)213-213: Local variable Remove assignment to unused variable (F841) |
||||||||
| compliance_assessment = ComplianceAssessment.objects.create( | ||||||||
| name="test", | ||||||||
| perimeter=Perimeter.objects.create(name="test", folder=test.folder), | ||||||||
| framework=Framework.objects.all()[0], | ||||||||
| ) | ||||||||
| compliance_assessment2 = ComplianceAssessment.objects.create( | ||||||||
| name="test2", | ||||||||
| perimeter=Perimeter.objects.create(name="test2", folder=test.folder), | ||||||||
| framework=Framework.objects.all()[0], | ||||||||
| ) | ||||||||
| applied_control = AppliedControl.objects.create(name="test", folder=test.folder) | ||||||||
|
|
||||||||
| EndpointTestsQueries.Auth.update_object( | ||||||||
| test.client, | ||||||||
| "Requirement Assessments", | ||||||||
| RequirementAssessment, | ||||||||
| { | ||||||||
| "status": REQUIREMENT_ASSESSMENT_STATUS, | ||||||||
| "observation": REQUIREMENT_ASSESSMENT_OBSERVATION, | ||||||||
| "folder": test.folder, | ||||||||
| "compliance_assessment": compliance_assessment, | ||||||||
| "requirement": RequirementNode.objects.all()[0], | ||||||||
| "score": None, | ||||||||
| }, | ||||||||
| { | ||||||||
| "status": REQUIREMENT_ASSESSMENT_STATUS2, | ||||||||
| "observation": "new " + REQUIREMENT_ASSESSMENT_OBSERVATION, | ||||||||
| "folder": str(test.folder.id), | ||||||||
| "compliance_assessment": str(compliance_assessment2.id), | ||||||||
| "requirement": str(RequirementNode.objects.all()[1].id), | ||||||||
| "applied_controls": [str(applied_control.id)], | ||||||||
| "score": 3, | ||||||||
| }, | ||||||||
| { | ||||||||
| "folder": {"id": str(test.folder.id), "str": test.folder.name}, | ||||||||
| "compliance_assessment": { | ||||||||
| "id": str(compliance_assessment.id), | ||||||||
| "str": compliance_assessment.name, | ||||||||
| }, | ||||||||
| "requirement": { | ||||||||
| "id": str(RequirementNode.objects.all()[0].id), | ||||||||
| "urn": RequirementNode.objects.all()[0].urn, | ||||||||
| "annotation": RequirementNode.objects.all()[0].annotation, | ||||||||
| "name": RequirementNode.objects.all()[0].name, | ||||||||
| "description": RequirementNode.objects.all()[0].description, | ||||||||
| "typical_evidence": RequirementNode.objects.all()[ | ||||||||
| 0 | ||||||||
| ].typical_evidence, | ||||||||
| "ref_id": RequirementNode.objects.all()[0].ref_id, | ||||||||
| "associated_reference_controls": RequirementNode.objects.all()[ | ||||||||
| 0 | ||||||||
| ].associated_reference_controls, | ||||||||
| "associated_threats": RequirementNode.objects.all()[ | ||||||||
| 0 | ||||||||
| ].associated_threats, | ||||||||
| "parent_requirement": { | ||||||||
| "str": RequirementNode.objects.all()[0].parent_requirement.get( | ||||||||
| "str" | ||||||||
| ), | ||||||||
| "urn": RequirementNode.objects.all()[0].parent_requirement.get( | ||||||||
| "urn" | ||||||||
| ), | ||||||||
| "id": str( | ||||||||
| RequirementNode.objects.all()[0].parent_requirement.get( | ||||||||
| "id" | ||||||||
| ) | ||||||||
| ), | ||||||||
| "ref_id": RequirementNode.objects.all()[ | ||||||||
| 0 | ||||||||
| ].parent_requirement.get("ref_id"), | ||||||||
| "name": RequirementNode.objects.all()[0].parent_requirement.get( | ||||||||
| "name" | ||||||||
| ), | ||||||||
| "description": RequirementNode.objects.all()[ | ||||||||
| 0 | ||||||||
| ].parent_requirement.get("description"), | ||||||||
| } | ||||||||
| if RequirementNode.objects.all()[0].parent_requirement | ||||||||
| else None, | ||||||||
| }, | ||||||||
| }, | ||||||||
| user_group=test.user_group, | ||||||||
| ) | ||||||||
|
|
||||||||
| """def test_update_requirement_assessments_fails_with_out_of_scope_object(self, test): | ||||||||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Framework") | ||||||||
| folder = Folder.objects.create(name="test2") | ||||||||
| compliance_assessment = ComplianceAssessment.objects.create( | ||||||||
|
|
@@ -293,7 +380,7 @@ def test_update_requirement_assessments(self, test): | |||||||
| }, | ||||||||
| }, | ||||||||
| user_group=test.user_group, | ||||||||
| )""" | ||||||||
|
|
||||||||
| def test_get_status_choices(self, test): | ||||||||
| """test to get requirement assessments status choices from the API with authentication""" | ||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -180,6 +180,56 @@ def test_create_risk_acceptances(self, test): | |
| def test_update_risk_acceptances(self, test): | ||
| """test to update risk acceptances with the API with authentication""" | ||
|
|
||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Framework") | ||
| approver = User.objects.create_user(email="[email protected]") | ||
| UserGroup.objects.get(name="BI-UG-GAP").user_set.add(approver) | ||
| approver2 = User.objects.create_user(email="[email protected]") | ||
| UserGroup.objects.get(name="BI-UG-GAP").user_set.add(approver2) | ||
| risk_scenario = RiskScenario.objects.create( | ||
| name="test scenario", | ||
| description="test description", | ||
| risk_assessment=RiskAssessment.objects.create( | ||
| name="test", | ||
| perimeter=Perimeter.objects.create(name="test", folder=test.folder), | ||
| risk_matrix=RiskMatrix.objects.create(name="test", folder=test.folder), | ||
| ), | ||
| ) | ||
|
|
||
| EndpointTestsQueries.Auth.update_object( | ||
| test.client, | ||
| "Risk Acceptances", | ||
| RiskAcceptance, | ||
| { | ||
| "name": RISK_ACCEPTANCE_NAME, | ||
| "description": RISK_ACCEPTANCE_DESCRIPTION, | ||
| "expiry_date": RISK_ACCEPTANCE_EXPIRY_DATE, | ||
| # 'state': RISK_ACCEPTANCE_STATE[0], | ||
| "folder": test.folder, | ||
| "approver": approver, | ||
| }, | ||
| { | ||
| "name": "new " + RISK_ACCEPTANCE_NAME, | ||
| "description": "new " + RISK_ACCEPTANCE_DESCRIPTION, | ||
| "expiry_date": "2024-05-05", | ||
| "folder": str(test.folder.id), | ||
| "approver": str(approver2.id), | ||
| "risk_scenarios": [str(risk_scenario.id)], | ||
| }, | ||
| { | ||
| "folder": {"id": str(test.folder.id), "str": test.folder.name}, | ||
| "approver": { | ||
| "id": str(approver.id), | ||
| "str": approver.email, | ||
| "last_name": approver.last_name, | ||
| "first_name": approver.first_name, | ||
| }, | ||
| # 'state': RISK_ACCEPTANCE_STATE[1], | ||
| }, | ||
| user_group=test.user_group, | ||
| ) | ||
|
|
||
| """def test_update_risk_acceptances(self, test): | ||
|
|
||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Framework") | ||
| folder = Folder.objects.create(name="test2") | ||
| approver = User.objects.create_user(email="[email protected]") | ||
|
|
@@ -227,7 +277,7 @@ def test_update_risk_acceptances(self, test): | |
| # 'state': RISK_ACCEPTANCE_STATE[1], | ||
| }, | ||
| user_group=test.user_group, | ||
| )""" | ||
|
|
||
| def test_delete_risk_acceptances(self, test): | ||
| """test to delete risk acceptances with the API with authentication""" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -170,6 +170,48 @@ def test_create_risk_assessments(self, test): | |
| def test_update_risk_assessments(self, test): | ||
| """test to update risk assessments with the API with authentication""" | ||
|
|
||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Risk matrix") | ||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Risk matrix2") | ||
| perimeter = Perimeter.objects.create(name="test", folder=test.folder) | ||
| perimeter2 = Perimeter.objects.create(name="test2", folder=test.folder) | ||
| risk_matrix = RiskMatrix.objects.all()[0] | ||
| risk_matrix2 = RiskMatrix.objects.all()[1] | ||
|
|
||
| EndpointTestsQueries.Auth.update_object( | ||
| test.client, | ||
| "Risk Assessment", | ||
| RiskAssessment, | ||
| { | ||
| "name": RISK_ASSESSMENT_NAME, | ||
| "description": RISK_ASSESSMENT_DESCRIPTION, | ||
| "version": RISK_ASSESSMENT_VERSION, | ||
| "perimeter": perimeter, | ||
| "risk_matrix": risk_matrix, | ||
| }, | ||
| { | ||
| "name": "new " + RISK_ASSESSMENT_NAME, | ||
| "description": "new " + RISK_ASSESSMENT_DESCRIPTION, | ||
| "version": RISK_ASSESSMENT_VERSION + ".1", | ||
| "perimeter": str(perimeter2.id), | ||
| "risk_matrix": str(risk_matrix2.id), | ||
| }, | ||
| { | ||
| "perimeter": { | ||
| "id": str(perimeter.id), | ||
| "str": perimeter.folder.name + "/" + perimeter.name, | ||
| "folder": { | ||
| "id": str(perimeter.folder.id), | ||
| "str": perimeter.folder.name, | ||
| }, | ||
| }, | ||
| "risk_matrix": {"id": str(risk_matrix.id), "str": str(risk_matrix)}, | ||
| }, | ||
| user_group=test.user_group, | ||
| scope=str(test.folder), | ||
| ) | ||
|
|
||
| """def test_update_risk_assessments(self, test): | ||
|
|
||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Risk matrix") | ||
| EndpointTestsQueries.Auth.import_object(test.admin_client, "Risk matrix2") | ||
| perimeter = Perimeter.objects.create(name="test", folder=test.folder) | ||
|
|
@@ -210,7 +252,7 @@ def test_update_risk_assessments(self, test): | |
| }, | ||
| user_group=test.user_group, | ||
| scope=str(test.folder), | ||
| )""" | ||
|
|
||
| def test_delete_risk_assessments(self, test): | ||
| """test to delete risk assessments with the API with authentication""" | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Inconsistency in expected response structure
The test correctly updates the compliance assessment with new perimeter (perimeter2) and framework (Framework.objects.all()[1]), but the expected response structure still references the original objects.
Consider updating the expected response to match the updated values:
{ "perimeter": { - "id": str(perimeter.id), - "str": perimeter.folder.name + "/" + perimeter.name, + "id": str(perimeter2.id), + "str": perimeter2.folder.name + "/" + perimeter2.name, "folder": { - "id": str(perimeter.folder.id), - "str": perimeter.folder.name, + "id": str(perimeter2.folder.id), + "str": perimeter2.folder.name, }, }, "framework": { - "id": str(Framework.objects.all()[0].id), - "str": str(Framework.objects.all()[0]), + "id": str(Framework.objects.all()[1].id), + "str": str(Framework.objects.all()[1]), "implementation_groups_definition": None, "reference_controls": [], - "min_score": Framework.objects.all()[0].min_score, - "max_score": Framework.objects.all()[0].max_score, - "ref_id": str(Framework.objects.all()[0].ref_id), + "min_score": Framework.objects.all()[1].min_score, + "max_score": Framework.objects.all()[1].max_score, + "ref_id": str(Framework.objects.all()[1].ref_id), }, },📝 Committable suggestion