Skip to content

Commit c15e604

Browse files
authored
fix(api): Enable to set recommendation and decision in risk_acceptance (#12303)
1 parent 3c9e7ff commit c15e604

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

dojo/api_v2/serializers.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,8 +1525,6 @@ class Meta:
15251525

15261526

15271527
class RiskAcceptanceSerializer(serializers.ModelSerializer):
1528-
recommendation = serializers.SerializerMethodField()
1529-
decision = serializers.SerializerMethodField()
15301528
path = serializers.SerializerMethodField()
15311529

15321530
def create(self, validated_data):
@@ -1554,14 +1552,6 @@ def update(self, instance, validated_data):
15541552
ra_helper.remove_finding_from_risk_acceptance(user, instance, finding)
15551553
return instance
15561554

1557-
@extend_schema_field(serializers.CharField())
1558-
def get_recommendation(self, obj):
1559-
return Risk_Acceptance.TREATMENT_TRANSLATIONS.get(obj.recommendation)
1560-
1561-
@extend_schema_field(serializers.CharField())
1562-
def get_decision(self, obj):
1563-
return Risk_Acceptance.TREATMENT_TRANSLATIONS.get(obj.decision)
1564-
15651555
@extend_schema_field(serializers.CharField())
15661556
def get_path(self, obj):
15671557
engagement = Engagement.objects.filter(

unittests/test_rest_framework.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,8 +1009,8 @@ def __init__(self, *args, **kwargs):
10091009
self.viewset = RiskAcceptanceViewSet
10101010
self.payload = {
10111011
"id": 2,
1012-
"recommendation": "Fix (The risk is eradicated)",
1013-
"decision": "Accept (The risk is acknowledged, yet remains)",
1012+
"recommendation": "F",
1013+
"decision": "A",
10141014
"path": "No proof has been supplied",
10151015
"name": "string",
10161016
"recommendation_details": "string",
@@ -1046,8 +1046,8 @@ def test_create_object_not_authorized(self):
10461046
def test_update_forbidden_engagement(self):
10471047
self.payload = {
10481048
"id": 1,
1049-
"recommendation": "Fix (The risk is eradicated)",
1050-
"decision": "Accept (The risk is acknowledged, yet remains)",
1049+
"recommendation": "F",
1050+
"decision": "A",
10511051
"path": "No proof has been supplied",
10521052
"name": "string",
10531053
"recommendation_details": "string",

0 commit comments

Comments
 (0)