Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
223 changes: 144 additions & 79 deletions backend/core/mappings/engine.py

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions backend/core/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -8227,19 +8227,24 @@ def perform_create(self, serializer):
)

for req in target_requirement_assessments:
source = best_results["requirement_assessments"][
req.requirement.urn
]
for field in [
"result",
"status",
"observation",
"score",
"is_scored",
"documentation_score",
"mapping_inference",
]:
if field in source and source[field] is not None:
setattr(req, field, source[field])
if best_results["requirement_assessments"][
req.requirement.urn
].get(field):
req.__setattr__(
field,
best_results["requirement_assessments"][
req.requirement.urn
][field],
)
requirement_assessments_to_update.append(req)

RequirementAssessment.objects.bulk_update(
Expand All @@ -8251,6 +8256,7 @@ def perform_create(self, serializer):
"score",
"is_scored",
"documentation_score",
"mapping_inference",
],
batch_size=500,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Generated by Django 5.2.9 on 2025-12-26 18:32

import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("ebios_rm", "0020_alter_fearedevent_ebios_rm_study"),
]

operations = [
migrations.AddField(
model_name="strategicscenario",
name="focused_feared_event",
field=models.ForeignKey(
blank=True,
help_text="Override gravity with this specific feared event's gravity",
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="focused_strategic_scenarios",
to="ebios_rm.fearedevent",
verbose_name="Focused feared event",
),
),
]
17 changes: 14 additions & 3 deletions backend/ebios_rm/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,15 @@ class StrategicScenario(NameDescriptionMixin, FolderMixin):
help_text=_("RO/TO couple from which the attach path is derived"),
)
ref_id = models.CharField(max_length=100, blank=True)
focused_feared_event = models.ForeignKey(
FearedEvent,
verbose_name=_("Focused feared event"),
related_name="focused_strategic_scenarios",
on_delete=models.SET_NULL,
null=True,
blank=True,
help_text=_("Override gravity with this specific feared event's gravity"),
)

fields_to_check = ["ebios_rm_study", "name", "ref_id"]

Expand Down Expand Up @@ -753,9 +762,11 @@ def delete(self, *args, **kwargs):
return result

def get_gravity_display(self):
return FearedEvent.format_gravity(
self.ro_to_couple.get_gravity(), self.ebios_rm_study.parsed_matrix
)
if self.focused_feared_event:
gravity = self.focused_feared_event.gravity
else:
gravity = self.ro_to_couple.get_gravity()
return FearedEvent.format_gravity(gravity, self.ebios_rm_study.parsed_matrix)


class AttackPath(NameDescriptionMixin, FolderMixin):
Expand Down
31 changes: 31 additions & 0 deletions backend/ebios_rm/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,40 @@ class Meta:
model = StrategicScenario
exclude = ["created_at", "updated_at"]

def validate(self, attrs):
ro_to_couple = attrs.get("ro_to_couple") or (
self.instance.ro_to_couple if self.instance else None
)

# If the field is present in attrs, use it (even if None means clearing).
# Otherwise, fall back to the existing instance value.
if "focused_feared_event" in attrs:
focused_feared_event = attrs["focused_feared_event"]
else:
focused_feared_event = (
getattr(self.instance, "focused_feared_event", None)
if self.instance
else None
)

if focused_feared_event and ro_to_couple:
if not ro_to_couple.feared_events.filter(
id=focused_feared_event.id
).exists():
raise serializers.ValidationError(
{
"focused_feared_event": "The feared event must belong to the selected RoTo couple."
}
)

return super().validate(attrs)


class StrategicScenarioReadSerializer(BaseModelSerializer):
ebios_rm_study = FieldsRelatedField()
folder = FieldsRelatedField()
ro_to_couple = FieldsRelatedField()
focused_feared_event = FieldsRelatedField()
gravity = serializers.JSONField(source="get_gravity_display")
attack_paths = FieldsRelatedField(many=True)
feared_events = serializers.SerializerMethodField()
Expand Down Expand Up @@ -305,6 +334,7 @@ class StrategicScenarioImportExportSerializer(BaseModelSerializer):
folder = HashSlugRelatedField(slug_field="pk", read_only=True)
ebios_rm_study = HashSlugRelatedField(slug_field="pk", read_only=True)
ro_to_couple = HashSlugRelatedField(slug_field="pk", read_only=True)
focused_feared_event = HashSlugRelatedField(slug_field="pk", read_only=True)

class Meta:
model = StrategicScenario
Expand All @@ -314,6 +344,7 @@ class Meta:
"description",
"ebios_rm_study",
"ro_to_couple",
"focused_feared_event",
"folder",
"created_at",
"updated_at",
Expand Down
88 changes: 52 additions & 36 deletions enterprise/backend/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions frontend/messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,8 @@
"roToCouple": "RO/TO couple",
"roToCouples": "RO/TO couples",
"selectedRoToCouples": "Selected RO/TO couples",
"focusedFearedEvent": "Focused feared event",
"focusedOn": "Focused on",
"addRoto": "Add RO/TO couple",
"organizedCrime": "Organized crime",
"terrorist": "Terrorist",
Expand Down
2 changes: 2 additions & 0 deletions frontend/messages/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1382,6 +1382,8 @@
"roToCouple": "Couple SR/OV",
"roToCouples": "Couples SR/OV",
"selectedRoToCouples": "Couples SR/OV sélectionnés",
"focusedFearedEvent": "Événement redouté spécifique",
"focusedOn": "Concentré sur",
"addRoto": "Ajouter un couple SR/OV",
"organizedCrime": "Crime organisé",
"terrorist": "Terroriste",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@
bind:cachedValue={formDataCache['ro_to_couple']}
label={m.roToCouple()}
/>
{#key formDataCache['ro_to_couple'] || initialData.ro_to_couple}
<AutocompleteSelect
{form}
optionsEndpoint="feared-events"
optionsDetailedUrlParameters={[
['ebios_rm_study', initialData.ebios_rm_study],
['ro_to_couples', formDataCache['ro_to_couple'] || initialData.ro_to_couple]
]}
optionsLabelField="auto"
field="focused_feared_event"
cacheLock={cacheLocks['focused_feared_event']}
bind:cachedValue={formDataCache['focused_feared_event']}
label={m.focusedFearedEvent()}
nullable
/>
{/key}
<AutocompleteSelect
{form}
field="folder"
Expand Down
7 changes: 7 additions & 0 deletions frontend/src/lib/utils/crud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1378,6 +1378,12 @@ export const URL_MODEL_MAP: ModelMap = {
urlParams: 'is_selected=true&used=false&ebios_rm_study=',
detail: true
},
{
field: 'focused_feared_event',
urlModel: 'feared-events',
endpointUrl: 'ebios-rm/feared-events',
detail: true
},
{ field: 'folder', urlModel: 'folders', urlParams: 'content_type=DO' },
{
field: 'attack_paths',
Expand All @@ -1399,6 +1405,7 @@ export const URL_MODEL_MAP: ModelMap = {
{ field: 'description' },
{ field: 'feared_events', urlModel: 'feared-events' },
{ field: 'ro_to_couple' },
{ field: 'focused_feared_event', urlModel: 'feared-events' },
{ field: 'gravity' },
{ field: 'updated_at', type: 'datetime' },
{ field: 'ebios_rm_study' }
Expand Down
Loading
Loading