From 6fb2e12f91af32d8d67c3d4857fdc742ff0380ec Mon Sep 17 00:00:00 2001
From: Theresa Kamerman <theresa.kamerman@jpl.nasa.gov>
Date: Tue, 13 Feb 2024 11:05:32 -0800
Subject: [PATCH 1/2] Fix filters in Upsert Preset in Commit Merge
- Was missing snapshot id and merge request filters
---
.../37_commit_merge_filter_presets/down.sql | 169 +++++++++++++++++
.../37_commit_merge_filter_presets/up.sql | 171 ++++++++++++++++++
.../sql/merlin/applied_migrations.sql | 1 +
.../merlin/functions/public/commit_merge.sql | 10 +-
4 files changed, 347 insertions(+), 4 deletions(-)
create mode 100644 deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/down.sql
create mode 100644 deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/up.sql
diff --git a/deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/down.sql b/deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/down.sql
new file mode 100644
index 0000000000..c090662a90
--- /dev/null
+++ b/deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/down.sql
@@ -0,0 +1,169 @@
+create or replace procedure commit_merge(_request_id integer)
+ language plpgsql as $$
+ declare
+ validate_noConflicts integer;
+ plan_id_R integer;
+ snapshot_id_S integer;
+begin
+ if(select id from merge_request where id = _request_id) is null then
+ raise exception 'Invalid merge request id %.', _request_id;
+ end if;
+
+ -- Stop if this merge is not 'in-progress'
+ if (select status from merge_request where id = _request_id) != 'in-progress' then
+ raise exception 'Cannot commit a merge request that is not in-progress.';
+ end if;
+
+ -- Stop if any conflicts have not been resolved
+ select * from conflicting_activities
+ where merge_request_id = _request_id and resolution = 'none'
+ limit 1
+ into validate_noConflicts;
+
+ if(validate_noConflicts is not null) then
+ raise exception 'There are unresolved conflicts in merge request %. Cannot commit merge.', _request_id;
+ end if;
+
+ select plan_id_receiving_changes from merge_request mr where mr.id = _request_id into plan_id_R;
+ select snapshot_id_supplying_changes from merge_request mr where mr.id = _request_id into snapshot_id_S;
+
+ insert into merge_staging_area(
+ merge_request_id, activity_id, name, tags, source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, type, arguments, metadata, anchor_id, anchored_to_start, change_type)
+ -- gather delete data from the opposite tables
+ select _request_id, activity_id, name, metadata.tag_ids_activity_directive(ca.activity_id, ad.plan_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'delete'::activity_change_type
+ from conflicting_activities ca
+ join activity_directive ad
+ on ca.activity_id = ad.id
+ where ca.resolution = 'supplying'
+ and ca.merge_request_id = _request_id
+ and plan_id = plan_id_R
+ and ca.change_type_supplying = 'delete'
+ union
+ select _request_id, activity_id, name, metadata.tag_ids_activity_snapshot(ca.activity_id, psa.snapshot_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'delete'::activity_change_type
+ from conflicting_activities ca
+ join plan_snapshot_activities psa
+ on ca.activity_id = psa.id
+ where ca.resolution = 'receiving'
+ and ca.merge_request_id = _request_id
+ and snapshot_id = snapshot_id_S
+ and ca.change_type_receiving = 'delete'
+ union
+ select _request_id, activity_id, name, metadata.tag_ids_activity_directive(ca.activity_id, ad.plan_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'none'::activity_change_type
+ from conflicting_activities ca
+ join activity_directive ad
+ on ca.activity_id = ad.id
+ where ca.resolution = 'receiving'
+ and ca.merge_request_id = _request_id
+ and plan_id = plan_id_R
+ and ca.change_type_receiving = 'modify'
+ union
+ select _request_id, activity_id, name, metadata.tag_ids_activity_snapshot(ca.activity_id, psa.snapshot_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'modify'::activity_change_type
+ from conflicting_activities ca
+ join plan_snapshot_activities psa
+ on ca.activity_id = psa.id
+ where ca.resolution = 'supplying'
+ and ca.merge_request_id = _request_id
+ and snapshot_id = snapshot_id_S
+ and ca.change_type_supplying = 'modify';
+
+ -- Unlock so that updates can be written
+ update plan
+ set is_locked = false
+ where id = plan_id_R;
+
+ -- Update the plan's activities to match merge-staging-area's activities
+ -- Add
+ insert into activity_directive(
+ id, plan_id, name, source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, type, arguments, metadata, anchor_id, anchored_to_start )
+ select activity_id, plan_id_R, name, source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, type, arguments, metadata, anchor_id, anchored_to_start
+ from merge_staging_area
+ where merge_staging_area.merge_request_id = _request_id
+ and change_type = 'add';
+
+ -- Modify
+ insert into activity_directive(
+ id, plan_id, "name", source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, "type", arguments, metadata, anchor_id, anchored_to_start )
+ select activity_id, plan_id_R, "name", source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, "type", arguments, metadata, anchor_id, anchored_to_start
+ from merge_staging_area
+ where merge_staging_area.merge_request_id = _request_id
+ and change_type = 'modify'
+ on conflict (id, plan_id)
+ do update
+ set name = excluded.name,
+ source_scheduling_goal_id = excluded.source_scheduling_goal_id,
+ created_at = excluded.created_at,
+ created_by = excluded.created_by,
+ last_modified_by = excluded.last_modified_by,
+ start_offset = excluded.start_offset,
+ type = excluded.type,
+ arguments = excluded.arguments,
+ metadata = excluded.metadata,
+ anchor_id = excluded.anchor_id,
+ anchored_to_start = excluded.anchored_to_start;
+
+ -- Tags
+ delete from metadata.activity_directive_tags adt
+ using merge_staging_area msa
+ where adt.directive_id = msa.activity_id
+ and adt.plan_id = plan_id_R
+ and msa.merge_request_id = _request_id
+ and msa.change_type = 'modify';
+
+ insert into metadata.activity_directive_tags(plan_id, directive_id, tag_id)
+ select plan_id_R, activity_id, t.id
+ from merge_staging_area msa
+ inner join metadata.tags t -- Inner join because it's specifically inserting into a tags-association table, so if there are no valid tags we do not want a null value for t.id
+ on t.id = any(msa.tags)
+ where msa.merge_request_id = _request_id
+ and (change_type = 'modify'
+ or change_type = 'add')
+ on conflict (directive_id, plan_id, tag_id) do nothing;
+ -- Presets
+ insert into preset_to_directive(preset_id, activity_id, plan_id)
+ select pts.preset_id, pts.activity_id, plan_id_R
+ from merge_staging_area msa, preset_to_snapshot_directive pts
+ where msa.activity_id = pts.activity_id
+ and msa.change_type = 'add'
+ or msa.change_type = 'modify'
+ on conflict (activity_id, plan_id)
+ do update
+ set preset_id = excluded.preset_id;
+
+ -- Delete
+ delete from activity_directive ad
+ using merge_staging_area msa
+ where ad.id = msa.activity_id
+ and ad.plan_id = plan_id_R
+ and msa.merge_request_id = _request_id
+ and msa.change_type = 'delete';
+
+ -- Clean up
+ delete from conflicting_activities where merge_request_id = _request_id;
+ delete from merge_staging_area where merge_staging_area.merge_request_id = _request_id;
+
+ update merge_request
+ set status = 'accepted'
+ where id = _request_id;
+
+ -- Attach snapshot history
+ insert into plan_latest_snapshot(plan_id, snapshot_id)
+ select plan_id_receiving_changes, snapshot_id_supplying_changes
+ from merge_request
+ where id = _request_id;
+end
+$$;
+
+call migrations.mark_migration_rolled_back('37');
diff --git a/deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/up.sql b/deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/up.sql
new file mode 100644
index 0000000000..fbbe110877
--- /dev/null
+++ b/deployment/hasura/migrations/AerieMerlin/37_commit_merge_filter_presets/up.sql
@@ -0,0 +1,171 @@
+create or replace procedure commit_merge(_request_id integer)
+ language plpgsql as $$
+ declare
+ validate_noConflicts integer;
+ plan_id_R integer;
+ snapshot_id_S integer;
+begin
+ if(select id from merge_request where id = _request_id) is null then
+ raise exception 'Invalid merge request id %.', _request_id;
+ end if;
+
+ -- Stop if this merge is not 'in-progress'
+ if (select status from merge_request where id = _request_id) != 'in-progress' then
+ raise exception 'Cannot commit a merge request that is not in-progress.';
+ end if;
+
+ -- Stop if any conflicts have not been resolved
+ select * from conflicting_activities
+ where merge_request_id = _request_id and resolution = 'none'
+ limit 1
+ into validate_noConflicts;
+
+ if(validate_noConflicts is not null) then
+ raise exception 'There are unresolved conflicts in merge request %. Cannot commit merge.', _request_id;
+ end if;
+
+ select plan_id_receiving_changes from merge_request mr where mr.id = _request_id into plan_id_R;
+ select snapshot_id_supplying_changes from merge_request mr where mr.id = _request_id into snapshot_id_S;
+
+ insert into merge_staging_area(
+ merge_request_id, activity_id, name, tags, source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, type, arguments, metadata, anchor_id, anchored_to_start, change_type)
+ -- gather delete data from the opposite tables
+ select _request_id, activity_id, name, metadata.tag_ids_activity_directive(ca.activity_id, ad.plan_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'delete'::activity_change_type
+ from conflicting_activities ca
+ join activity_directive ad
+ on ca.activity_id = ad.id
+ where ca.resolution = 'supplying'
+ and ca.merge_request_id = _request_id
+ and plan_id = plan_id_R
+ and ca.change_type_supplying = 'delete'
+ union
+ select _request_id, activity_id, name, metadata.tag_ids_activity_snapshot(ca.activity_id, psa.snapshot_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'delete'::activity_change_type
+ from conflicting_activities ca
+ join plan_snapshot_activities psa
+ on ca.activity_id = psa.id
+ where ca.resolution = 'receiving'
+ and ca.merge_request_id = _request_id
+ and snapshot_id = snapshot_id_S
+ and ca.change_type_receiving = 'delete'
+ union
+ select _request_id, activity_id, name, metadata.tag_ids_activity_directive(ca.activity_id, ad.plan_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'none'::activity_change_type
+ from conflicting_activities ca
+ join activity_directive ad
+ on ca.activity_id = ad.id
+ where ca.resolution = 'receiving'
+ and ca.merge_request_id = _request_id
+ and plan_id = plan_id_R
+ and ca.change_type_receiving = 'modify'
+ union
+ select _request_id, activity_id, name, metadata.tag_ids_activity_snapshot(ca.activity_id, psa.snapshot_id),
+ source_scheduling_goal_id, created_at, created_by, last_modified_by, start_offset, type, arguments, metadata, anchor_id, anchored_to_start,
+ 'modify'::activity_change_type
+ from conflicting_activities ca
+ join plan_snapshot_activities psa
+ on ca.activity_id = psa.id
+ where ca.resolution = 'supplying'
+ and ca.merge_request_id = _request_id
+ and snapshot_id = snapshot_id_S
+ and ca.change_type_supplying = 'modify';
+
+ -- Unlock so that updates can be written
+ update plan
+ set is_locked = false
+ where id = plan_id_R;
+
+ -- Update the plan's activities to match merge-staging-area's activities
+ -- Add
+ insert into activity_directive(
+ id, plan_id, name, source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, type, arguments, metadata, anchor_id, anchored_to_start )
+ select activity_id, plan_id_R, name, source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, type, arguments, metadata, anchor_id, anchored_to_start
+ from merge_staging_area
+ where merge_staging_area.merge_request_id = _request_id
+ and change_type = 'add';
+
+ -- Modify
+ insert into activity_directive(
+ id, plan_id, "name", source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, "type", arguments, metadata, anchor_id, anchored_to_start )
+ select activity_id, plan_id_R, "name", source_scheduling_goal_id, created_at, created_by, last_modified_by,
+ start_offset, "type", arguments, metadata, anchor_id, anchored_to_start
+ from merge_staging_area
+ where merge_staging_area.merge_request_id = _request_id
+ and change_type = 'modify'
+ on conflict (id, plan_id)
+ do update
+ set name = excluded.name,
+ source_scheduling_goal_id = excluded.source_scheduling_goal_id,
+ created_at = excluded.created_at,
+ created_by = excluded.created_by,
+ last_modified_by = excluded.last_modified_by,
+ start_offset = excluded.start_offset,
+ type = excluded.type,
+ arguments = excluded.arguments,
+ metadata = excluded.metadata,
+ anchor_id = excluded.anchor_id,
+ anchored_to_start = excluded.anchored_to_start;
+
+ -- Tags
+ delete from metadata.activity_directive_tags adt
+ using merge_staging_area msa
+ where adt.directive_id = msa.activity_id
+ and adt.plan_id = plan_id_R
+ and msa.merge_request_id = _request_id
+ and msa.change_type = 'modify';
+
+ insert into metadata.activity_directive_tags(plan_id, directive_id, tag_id)
+ select plan_id_R, activity_id, t.id
+ from merge_staging_area msa
+ inner join metadata.tags t -- Inner join because it's specifically inserting into a tags-association table, so if there are no valid tags we do not want a null value for t.id
+ on t.id = any(msa.tags)
+ where msa.merge_request_id = _request_id
+ and (change_type = 'modify'
+ or change_type = 'add')
+ on conflict (directive_id, plan_id, tag_id) do nothing;
+ -- Presets
+ insert into preset_to_directive(preset_id, activity_id, plan_id)
+ select pts.preset_id, pts.activity_id, plan_id_R
+ from merge_staging_area msa
+ inner join preset_to_snapshot_directive pts using (activity_id)
+ where pts.snapshot_id = snapshot_id_S
+ and msa.merge_request_id = _request_id
+ and (msa.change_type = 'add'
+ or msa.change_type = 'modify')
+ on conflict (activity_id, plan_id)
+ do update
+ set preset_id = excluded.preset_id;
+
+ -- Delete
+ delete from activity_directive ad
+ using merge_staging_area msa
+ where ad.id = msa.activity_id
+ and ad.plan_id = plan_id_R
+ and msa.merge_request_id = _request_id
+ and msa.change_type = 'delete';
+
+ -- Clean up
+ delete from conflicting_activities where merge_request_id = _request_id;
+ delete from merge_staging_area where merge_staging_area.merge_request_id = _request_id;
+
+ update merge_request
+ set status = 'accepted'
+ where id = _request_id;
+
+ -- Attach snapshot history
+ insert into plan_latest_snapshot(plan_id, snapshot_id)
+ select plan_id_receiving_changes, snapshot_id_supplying_changes
+ from merge_request
+ where id = _request_id;
+end
+$$;
+
+call migrations.mark_migration_applied('37');
diff --git a/merlin-server/sql/merlin/applied_migrations.sql b/merlin-server/sql/merlin/applied_migrations.sql
index d3096db0e8..fecaa4df73 100644
--- a/merlin-server/sql/merlin/applied_migrations.sql
+++ b/merlin-server/sql/merlin/applied_migrations.sql
@@ -39,3 +39,4 @@ call migrations.mark_migration_applied('33');
call migrations.mark_migration_applied('34');
call migrations.mark_migration_applied('35');
call migrations.mark_migration_applied('36');
+call migrations.mark_migration_applied('37');
diff --git a/merlin-server/sql/merlin/functions/public/commit_merge.sql b/merlin-server/sql/merlin/functions/public/commit_merge.sql
index d6c99fddf3..b2a73042ef 100644
--- a/merlin-server/sql/merlin/functions/public/commit_merge.sql
+++ b/merlin-server/sql/merlin/functions/public/commit_merge.sql
@@ -138,10 +138,12 @@ begin
-- Presets
insert into preset_to_directive(preset_id, activity_id, plan_id)
select pts.preset_id, pts.activity_id, plan_id_R
- from merge_staging_area msa, preset_to_snapshot_directive pts
- where msa.activity_id = pts.activity_id
- and msa.change_type = 'add'
- or msa.change_type = 'modify'
+ from merge_staging_area msa
+ inner join preset_to_snapshot_directive pts using (activity_id)
+ where pts.snapshot_id = snapshot_id_S
+ and msa.merge_request_id = _request_id
+ and (msa.change_type = 'add'
+ or msa.change_type = 'modify')
on conflict (activity_id, plan_id)
do update
set preset_id = excluded.preset_id;
From 514f089a6dc8f6fb7d30a5d2a2452c0305a2724a Mon Sep 17 00:00:00 2001
From: Theresa Kamerman <theresa.kamerman@jpl.nasa.gov>
Date: Tue, 13 Feb 2024 11:05:50 -0800
Subject: [PATCH 2/2] Update DB Tests
---
.../database/MerlinDatabaseTestHelper.java | 11 ++++
.../database/PlanCollaborationTests.java | 59 ++++++++++++++++++-
2 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/db-tests/src/test/java/gov/nasa/jpl/aerie/database/MerlinDatabaseTestHelper.java b/db-tests/src/test/java/gov/nasa/jpl/aerie/database/MerlinDatabaseTestHelper.java
index 9635082e44..507f506284 100644
--- a/db-tests/src/test/java/gov/nasa/jpl/aerie/database/MerlinDatabaseTestHelper.java
+++ b/db-tests/src/test/java/gov/nasa/jpl/aerie/database/MerlinDatabaseTestHelper.java
@@ -210,6 +210,17 @@ void assignPreset(int presetId, int activityId, int planId, String userSession)
}
}
+ void unassignPreset(int presetId, int activityId, int planId) throws SQLException {
+ try(final var statement = connection.createStatement()){
+ statement.execute(
+ //language=sql
+ """
+ delete from preset_to_directive
+ where (preset_id, activity_id, plan_id) = (%d, %d, %d);
+ """.formatted(presetId, activityId, planId));
+ }
+ }
+
int insertConstraintPlan(int plan_id, String name, String definition, User user) throws SQLException {
try(final var statement = connection.createStatement()) {
diff --git a/db-tests/src/test/java/gov/nasa/jpl/aerie/database/PlanCollaborationTests.java b/db-tests/src/test/java/gov/nasa/jpl/aerie/database/PlanCollaborationTests.java
index 531b2b3e73..4fb9c33754 100644
--- a/db-tests/src/test/java/gov/nasa/jpl/aerie/database/PlanCollaborationTests.java
+++ b/db-tests/src/test/java/gov/nasa/jpl/aerie/database/PlanCollaborationTests.java
@@ -2983,11 +2983,11 @@ void deleteActivityReanchorDoesNotImpactRelatedPlans() throws SQLException{
@Nested
class PresetTests{
private final gov.nasa.jpl.aerie.database.PresetTests presetTests = new gov.nasa.jpl.aerie.database.PresetTests();
+ { presetTests.setConnection(helper);}
// Activities added in branches keep their preset information when merged
@Test
void presetPersistsWithAdd() throws SQLException{
- presetTests.setConnection(helper);
merlinHelper.insertActivityType(missionModelId, "test-activity");
final int planId = merlinHelper.insertPlan(missionModelId);
final int branchId = duplicatePlan(planId, "Add Preset Branch");
@@ -3010,7 +3010,6 @@ void presetPersistsWithAdd() throws SQLException{
// The preset set in the supplying activity persists
@Test
void presetPersistsWithModify() throws SQLException{
- presetTests.setConnection(helper);
merlinHelper.insertActivityType(missionModelId, "test-activity");
final int planId = merlinHelper.insertPlan(missionModelId);
final int activityId = merlinHelper.insertActivity(planId);
@@ -3033,7 +3032,6 @@ void presetPersistsWithModify() throws SQLException{
// If the preset used in a snapshot is deleted during the merge, the activity does not have a preset after the merge.
@Test
void postMergeNoPresetIfPresetDeleted() throws SQLException{
- presetTests.setConnection(helper);
merlinHelper.insertActivityType(missionModelId, "test-activity");
final int planId = merlinHelper.insertPlan(missionModelId);
final int branchId = duplicatePlan(planId, "Delete Preset Branch");
@@ -3053,6 +3051,61 @@ void postMergeNoPresetIfPresetDeleted() throws SQLException{
assertNull(presetTests.getPresetAssignedToActivity(activityId, planId));
assertNull(presetTests.getPresetAssignedToActivity(activityId, branchId));
}
+
+ // Presets set in prior snapshots don't affect the merge
+ @Test
+ void presetOnlyPullsFromSourceSnapshot() throws SQLException {
+ merlinHelper.insertActivityType(missionModelId, "test-activity");
+ final int presetId = merlinHelper.insertPreset(missionModelId, "Demo Preset", "test-activity");
+
+ // Create a manual snapshot with a preset
+ final int planId = merlinHelper.insertPlan(missionModelId);
+ final int activityId = merlinHelper.insertActivity(planId);
+ merlinHelper.assignPreset(presetId, activityId, planId, merlinHelper.admin.session());
+ createSnapshot(planId);
+
+ // Remove preset from plan before branching
+ merlinHelper.unassignPreset(presetId, activityId, planId);
+ final int branchId = duplicatePlan(planId, "Delete Preset Branch");
+ updateActivityName("new name", activityId, branchId);
+
+ // Merge
+ final int mergeRQId = createMergeRequest(planId, branchId);
+ beginMerge(mergeRQId);
+ commitMerge(mergeRQId);
+
+ // Assertions
+ assertNull(presetTests.getPresetAssignedToActivity(activityId, planId));
+ assertNull(presetTests.getPresetAssignedToActivity(activityId, branchId));
+ }
+
+ @Test
+ void presetUnaffectedByUnrelatedSnapshot() throws SQLException {
+ merlinHelper.insertActivityType(missionModelId, "test-activity");
+ final int presetId = merlinHelper.insertPreset(missionModelId, "Demo Preset", "test-activity");
+
+ // Create a snapshot of an unrelated plan with a preset set
+ final int unrelatedPlanId = merlinHelper.insertPlan(missionModelId);
+ final int unrelatedActivityId = merlinHelper.insertActivity(unrelatedPlanId);
+ merlinHelper.assignPreset(presetId, unrelatedActivityId, unrelatedPlanId, merlinHelper.admin.session());
+ createSnapshot(unrelatedPlanId);
+
+ // Setup working plan
+ final int planId = merlinHelper.insertPlan(missionModelId);
+ final int activityId = merlinHelper.insertActivity(planId);
+ final int branchId = duplicatePlan(planId, "Delete Preset Branch");
+ updateActivityName("new name", activityId, branchId);
+
+ // Merge
+ final int mergeRQId = createMergeRequest(planId, branchId);
+ beginMerge(mergeRQId);
+ commitMerge(mergeRQId);
+
+ // Assertions
+ assertNull(presetTests.getPresetAssignedToActivity(activityId, planId));
+ assertNull(presetTests.getPresetAssignedToActivity(activityId, branchId));
+ assertEquals(presetId, presetTests.getPresetAssignedToActivity(unrelatedActivityId, unrelatedPlanId).id());
+ }
}
@Nested