Merge branch 'CA-708-workshop-4-UX' of github.com:intuitem/ciso-assis…

…tant-community into CA-708-workshop-4-UX
intuitem · Dec 16, 2024 · c60f974 · c60f974
2 parents 7eebaf3 + 2fb6202
commit c60f974
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/backend/ebios_rm/migrations/0001_initial.py b/backend/ebios_rm/migrations/0001_initial.py
@@ -354,12 +354,13 @@ class Migration(migrations.Migration):
                     models.TextField(blank=True, verbose_name="Justification"),
                 ),
                 (
-                    "attack_paths",
-                    models.ManyToManyField(
-                        help_text="Attack paths that are pertinent to the operational scenario",
-                        related_name="operational_scenarios",
+                    "attack_path",
+                    models.OneToOneField(
+                        help_text="Attack path that is pertinent to the operational scenario",
+                        related_name="operational_scenario",
                         to="ebios_rm.attackpath",
                         verbose_name="Attack paths",
+                        on_delete=django.db.models.deletion.CASCADE,
                     ),
                 ),
                 (

diff --git a/backend/ebios_rm/models.py b/backend/ebios_rm/models.py
@@ -418,11 +418,12 @@ class OperationalScenario(AbstractBaseModel, FolderMixin):
         related_name="operational_scenarios",
         on_delete=models.CASCADE,
     )
-    attack_paths = models.ManyToManyField(
+    attack_path = models.OneToOneField(
         AttackPath,
         verbose_name=_("Attack paths"),
-        related_name="operational_scenarios",
-        help_text=_("Attack paths that are pertinent to the operational scenario"),
+        related_name="operational_scenario",
+        help_text=_("Attack path that is pertinent to the operational scenario"),
+        on_delete=models.CASCADE,
     )
     threats = models.ManyToManyField(
         Threat,
@@ -465,11 +466,7 @@ def ref_id(self):
 
     @property
     def gravity(self):
-        gravity = -1
-        for attack_path in self.attack_paths.all():
-            if attack_path.gravity > gravity:
-                gravity = attack_path.gravity
-        return gravity
+        return self.attack_path.gravity
 
     def get_likelihood_display(self):
         if self.likelihood < 0:
@@ -478,6 +475,7 @@ def get_likelihood_display(self):
                 "name": "--",
                 "description": "not rated",
                 "value": -1,
+                "hexcolor": "#f9fafb",
             }
         risk_matrix = self.parsed_matrix
         return {

diff --git a/backend/ebios_rm/serializers.py b/backend/ebios_rm/serializers.py
@@ -157,7 +157,7 @@ class OperationalScenarioReadSerializer(BaseModelSerializer):
     str = serializers.CharField(source="__str__")
     ebios_rm_study = FieldsRelatedField()
     folder = FieldsRelatedField()
-    attack_paths = FieldsRelatedField(many=True)
+    attack_path = FieldsRelatedField()
     threats = FieldsRelatedField(many=True)
     likelihood = serializers.JSONField(source="get_likelihood_display")
     gravity = serializers.JSONField(source="get_gravity_display")

diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
@@ -693,7 +693,7 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'ebios_rm_study', urlModel: 'ebios-rm' },
 			{ field: 'threats', urlModel: 'threats' },
 			{
-				field: 'attack_paths',
+				field: 'attack_path',
 				urlModel: 'attack-paths',
 				endpointUrl: 'ebios-rm/attack-paths',
 				urlParams: 'ebios_rm_study=',

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
@@ -456,7 +456,7 @@ export const AttackPathSchema = z.object({
 
 export const operationalScenarioSchema = z.object({
 	ebios_rm_study: z.string(),
-	attack_paths: z.string().uuid().array(),
+	attack_path: z.string().uuid(),
 	threats: z.string().uuid().optional().array().optional(),
 	description: z.string(),
 	likelihood: z.number().optional().default(-1),