chore: Remove related activity (#1278)

## Description Marking this as a `chore`. "Silently" removing this feat, there are no dialogs in staging that uses this. Removes related activity on DialogActivity.  ## Related Issue(s) - #1224 ## Verification - [ ] **Your** code builds clean without any errors or warnings - [ ] Manual testing done (required) - [ ] Relevant automated test added (if you find this hard, leave it and we'll help out) ## Documentation - [ ] Documentation is updated (either in `docs`-directory, Altinnpedia or a separate linked PR in [altinn-studio-docs.](https://github.com/Altinn/altinn-studio-docs), if applicable)  ## Summary by CodeRabbit - **New Features** - Simplified data structures by removing the `relatedActivityId` field from various models, enhancing clarity in dialog and activity management. - **Bug Fixes** - Removed outdated validation rules related to `relatedActivityId`, streamlining the validation process for dialog activities. - **Documentation** - Updated API specifications to reflect the removal of `relatedActivityId` across multiple data structures, improving documentation clarity. - **Tests** - Removed a test related to referencing old activities, aligning tests with the updated activity structure.
digdir · Oct 12, 2024 · cd4473d · cd4473d
1 parent dd4b019
commit cd4473d
Show file tree

Hide file tree

Showing 24 changed files with 2,037 additions and 201 deletions.
diff --git a/docs/schema/V1/schema.verified.graphql b/docs/schema/V1/schema.verified.graphql
@@ -21,7 +21,6 @@ type Activity {
   createdAt: DateTime
   extendedType: URL
   type: ActivityType!
-  relatedActivityId: UUID
   transmissionId: UUID
   performedBy: Actor!
   description: [Localization!]!

diff --git a/docs/schema/V1/swagger.verified.json b/docs/schema/V1/swagger.verified.json
@@ -120,12 +120,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the request body.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.\nMust be present in the request body.",
             "format": "guid",
@@ -387,12 +381,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the request body.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.\nMust be present in the request body.",
             "format": "guid",
@@ -965,11 +953,6 @@
           "performedBy": {
             "$ref": "#/components/schemas/GetDialogActivityPerformedByActorDto"
           },
-          "relatedActivityId": {
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "format": "guid",
             "nullable": true,
@@ -1012,11 +995,6 @@
           "performedBy": {
             "$ref": "#/components/schemas/GetDialogActivityPerformedByActorDtoSO"
           },
-          "relatedActivityId": {
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "format": "guid",
             "nullable": true,
@@ -1221,12 +1199,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the current dialog.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.",
             "format": "guid",
@@ -1279,12 +1251,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the current dialog.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.",
             "format": "guid",
@@ -3293,11 +3259,6 @@
             "format": "guid",
             "type": "string"
           },
-          "relatedActivityId": {
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "seenByEndUserIdHash": {
             "nullable": true,
             "type": "string"
@@ -3334,11 +3295,6 @@
             "format": "guid",
             "type": "string"
           },
-          "relatedActivityId": {
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "format": "guid",
             "nullable": true,
@@ -3465,12 +3421,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the current dialog.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.",
             "format": "guid",
@@ -3523,12 +3473,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the current dialog.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.",
             "format": "guid",
@@ -4401,12 +4345,6 @@
               }
             ]
           },
-          "relatedActivityId": {
-            "description": "The related activity identifier, if applicable. Must be present in the request body.",
-            "format": "guid",
-            "nullable": true,
-            "type": "string"
-          },
           "transmissionId": {
             "description": "If the activity is related to a particular transmission, this field will contain the transmission identifier.\nMust be present in the request body.",
             "format": "guid",
@@ -6439,7 +6377,6 @@
                       "ActorName": null,
                       "ActorType": 2
                     },
-                    "RelatedActivityId": null,
                     "TransmissionId": null,
                     "Type": 3
                   }

diff --git a/...ialogporten.Application/Features/V1/Common/Events/DialogActivityEventToAltinnForwarder.cs b/...ialogporten.Application/Features/V1/Common/Events/DialogActivityEventToAltinnForwarder.cs
@@ -40,11 +40,6 @@ private static Dictionary<string, object> GetCloudEventData(DialogActivityCreate
             data["extendedActivityType"] = domainEvent.ExtendedType.ToString();
         }
 
-        if (domainEvent.RelatedActivityId is not null)
-        {
-            data["relatedActivityId"] = domainEvent.RelatedActivityId.ToString()!;
-        }
-
         if (domainEvent.Process is not null)
         {
             data["process"] = domainEvent.Process;

diff --git a/...rten.Application/Features/V1/EndUser/DialogActivities/Queries/Get/GetDialogActivityDto.cs b/...rten.Application/Features/V1/EndUser/DialogActivities/Queries/Get/GetDialogActivityDto.cs
@@ -12,7 +12,6 @@ public sealed class GetDialogActivityDto
 
     public DialogActivityType.Values Type { get; set; }
 
-    public Guid? RelatedActivityId { get; set; }
     public Guid? TransmissionId { get; set; }
 
     public GetDialogActivityPerformedByActorDto PerformedBy { get; set; } = null!;

diff --git a/...pplication/Features/V1/EndUser/DialogActivities/Queries/Search/SearchDialogActivityDto.cs b/...pplication/Features/V1/EndUser/DialogActivities/Queries/Search/SearchDialogActivityDto.cs
@@ -11,6 +11,5 @@ public sealed class SearchDialogActivityDto
 
     public DialogActivityType.Values Type { get; set; }
 
-    public Guid? RelatedActivityId { get; set; }
     public Guid? TransmissionId { get; set; }
 }
diff --git a/...r.Domain.Dialogporten.Application/Features/V1/EndUser/Dialogs/Queries/Get/GetDialogDto.cs b/...r.Domain.Dialogporten.Application/Features/V1/EndUser/Dialogs/Queries/Get/GetDialogDto.cs
@@ -367,11 +367,6 @@ public sealed class GetDialogDialogActivityDto
     /// </summary>
     public DialogActivityType.Values Type { get; set; }
 
-    /// <summary>
-    /// The related activity identifier, if applicable. Must be present in the current dialog.
-    /// </summary>
-    public Guid? RelatedActivityId { get; set; }
-
     /// <summary>
     /// If the activity is related to a particular transmission, this field will contain the transmission identifier.
     /// </summary>

diff --git a/...ialogporten.Application/Features/V1/EndUser/Dialogs/Queries/Search/SearchDialogDtoBase.cs b/...ialogporten.Application/Features/V1/EndUser/Dialogs/Queries/Search/SearchDialogDtoBase.cs
@@ -180,11 +180,6 @@ public sealed class SearchDialogDialogActivityDto
     /// </summary>
     public DialogActivityType.Values Type { get; set; }
 
-    /// <summary>
-    /// The related activity identifier, if applicable. Must be present in the current dialog.
-    /// </summary>
-    public Guid? RelatedActivityId { get; set; }
-
     /// <summary>
     /// If the activity is related to a particular transmission, this field will contain the transmission identifier.
     /// </summary>

diff --git a/...Application/Features/V1/ServiceOwner/DialogActivities/Queries/Get/GetDialogActivityDto.cs b/...Application/Features/V1/ServiceOwner/DialogActivities/Queries/Get/GetDialogActivityDto.cs
@@ -14,7 +14,6 @@ public sealed class GetDialogActivityDto
 
     public DateTimeOffset? DeletedAt { get; set; }
 
-    public Guid? RelatedActivityId { get; set; }
     public Guid? TransmissionId { get; set; }
 
     public GetDialogActivityPerformedByActorDto PerformedBy { get; set; } = null!;

diff --git a/...ation/Features/V1/ServiceOwner/DialogActivities/Queries/Search/SearchDialogActivityDto.cs b/...ation/Features/V1/ServiceOwner/DialogActivities/Queries/Search/SearchDialogActivityDto.cs
@@ -12,6 +12,5 @@ public sealed class SearchDialogActivityDto
 
     public DateTimeOffset? DeletedAt { get; set; }
 
-    public Guid? RelatedActivityId { get; set; }
     public Guid? TransmissionId { get; set; }
 }
diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogCommandValidator.cs
@@ -128,9 +128,6 @@ public CreateDialogCommandValidator(
             .IsIn(x => x.Transmissions,
                 dependentKeySelector: activity => activity.TransmissionId,
                 principalKeySelector: transmission => transmission.Id)
-            .IsIn(x => x.Activities,
-                dependentKeySelector: activity => activity.RelatedActivityId,
-                principalKeySelector: activity => activity.Id)
             .SetValidator(activityValidator);
 
         RuleFor(x => x.Process)
@@ -401,10 +398,6 @@ public CreateDialogDialogActivityDtoValidator(
             .MaximumLength(Constants.DefaultMaxUriLength);
         RuleFor(x => x.Type)
             .IsInEnum();
-        RuleFor(x => x.RelatedActivityId)
-            .NotEqual(x => x.Id)
-            .WithMessage(x => $"An activity cannot reference itself ({nameof(x.RelatedActivityId)} is equal to {nameof(x.Id)}, '{x.Id}').")
-            .When(x => x.RelatedActivityId.HasValue);
         RuleFor(x => x.PerformedBy)
             .NotNull()
             .SetValidator(actorValidator);

diff --git a/...logporten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogDto.cs b/...logporten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Create/CreateDialogDto.cs
@@ -290,11 +290,6 @@ public sealed class CreateDialogDialogActivityDto
     /// </summary>
     public DialogActivityType.Values Type { get; set; }
 
-    /// <summary>
-    /// The related activity identifier, if applicable. Must be present in the request body.
-    /// </summary>
-    public Guid? RelatedActivityId { get; set; }
-
     /// <summary>
     /// If the activity is related to a particular transmission, this field will contain the transmission identifier.
     /// Must be present in the request body.

diff --git a/...orten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommand.cs b/...orten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommand.cs
@@ -102,7 +102,6 @@ public async Task<UpdateDialogResult> Handle(UpdateDialogCommand request, Cancel
         ValidateTimeFields(dialog);
 
         await AppendActivity(dialog, request.Dto, cancellationToken);
-        VerifyActivityRelations(dialog);
 
         await AppendTransmission(dialog, request.Dto, cancellationToken);
         VerifyTransmissionRelations(dialog);
@@ -244,33 +243,6 @@ private void VerifyActivityTransmissionRelations(DialogEntity dialog)
         }
     }
 
-    private void VerifyActivityRelations(DialogEntity dialog)
-    {
-        var relatedActivityIds = dialog.Activities
-            .Where(x => x.RelatedActivityId is not null)
-            .Select(x => x.RelatedActivityId)
-            .ToList();
-
-        if (relatedActivityIds.Count == 0)
-        {
-            return;
-        }
-
-        var activityIds = dialog.Activities.Select(x => x.Id).ToList();
-
-        var invalidRelatedActivityIds = relatedActivityIds
-            .Where(id => !activityIds.Contains(id!.Value))
-            .ToList();
-
-        if (invalidRelatedActivityIds.Count != 0)
-        {
-            _domainContext.AddError(
-                nameof(UpdateDialogDto.Activities),
-                $"Invalid '{nameof(DialogActivity.RelatedActivityId)}, entity '{nameof(DialogActivity)}'" +
-                $" with the following key(s) does not exist: ({string.Join(", ", invalidRelatedActivityIds)}) in '{nameof(dialog.Activities)}'");
-        }
-    }
-
     private async Task AppendTransmission(DialogEntity dialog, UpdateDialogDto dto, CancellationToken cancellationToken)
     {
         var newDialogTransmissions = _mapper.Map<List<DialogTransmission>>(dto.Transmissions);

diff --git a/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommandValidator.cs b/...lication/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogCommandValidator.cs
@@ -385,10 +385,6 @@ public UpdateDialogDialogActivityDtoValidator(
             .MaximumLength(Constants.DefaultMaxUriLength);
         RuleFor(x => x.Type)
             .IsInEnum();
-        RuleFor(x => x.RelatedActivityId)
-            .NotEqual(x => x.Id)
-            .WithMessage(x => $"An activity cannot reference itself ({nameof(x.RelatedActivityId)} is equal to {nameof(x.Id)}, '{x.Id}').")
-            .When(x => x.RelatedActivityId.HasValue);
         RuleFor(x => x.PerformedBy)
             .NotNull()
             .SetValidator(actorValidator);

diff --git a/...logporten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogDto.cs b/...logporten.Application/Features/V1/ServiceOwner/Dialogs/Commands/Update/UpdateDialogDto.cs
@@ -259,11 +259,6 @@ public class UpdateDialogDialogActivityDto
     /// </summary>
     public DialogActivityType.Values Type { get; set; }
 
-    /// <summary>
-    /// The related activity identifier, if applicable. Must be present in the request body.
-    /// </summary>
-    public Guid? RelatedActivityId { get; set; }
-
     /// <summary>
     /// If the activity is related to a particular transmission, this field will contain the transmission identifier.
     /// Must be present in the request body.

diff --git a/...ain.Dialogporten.Application/Features/V1/ServiceOwner/Dialogs/Queries/Get/GetDialogDto.cs b/...ain.Dialogporten.Application/Features/V1/ServiceOwner/Dialogs/Queries/Get/GetDialogDto.cs
@@ -385,11 +385,6 @@ public sealed class GetDialogDialogActivityDto
     /// </summary>
     public DialogActivityType.Values Type { get; set; }
 
-    /// <summary>
-    /// The related activity identifier, if applicable. Must be present in the current dialog.
-    /// </summary>
-    public Guid? RelatedActivityId { get; set; }
-
     /// <summary>
     /// If the activity is related to a particular transmission, this field will contain the transmission identifier.
     /// </summary>

diff --git a/...porten.Application/Features/V1/ServiceOwner/Dialogs/Queries/Search/SearchDialogDtoBase.cs b/...porten.Application/Features/V1/ServiceOwner/Dialogs/Queries/Search/SearchDialogDtoBase.cs
@@ -192,11 +192,6 @@ public sealed class SearchDialogDialogActivityDto
     /// </summary>
     public DialogActivityType.Values Type { get; set; }
 
-    /// <summary>
-    /// The related activity identifier, if applicable. Must be present in the current dialog.
-    /// </summary>
-    public Guid? RelatedActivityId { get; set; }
-
     /// <summary>
     /// If the activity is related to a particular transmission, this field will contain the transmission identifier.
     /// </summary>

diff --git a/src/Digdir.Domain.Dialogporten.Domain/Dialogs/Entities/Activities/DialogActivity.cs b/src/Digdir.Domain.Dialogporten.Domain/Dialogs/Entities/Activities/DialogActivity.cs
@@ -21,9 +21,6 @@ public sealed class DialogActivity : IImmutableEntity, IAggregateCreatedHandler,
     public Guid DialogId { get; set; }
     public DialogEntity Dialog { get; set; } = null!;
 
-    public Guid? RelatedActivityId { get; set; }
-    public DialogActivity? RelatedActivity { get; set; }
-
     public Guid? TransmissionId { get; set; }
     public DialogTransmission? Transmission { get; set; }
 
@@ -34,14 +31,11 @@ public sealed class DialogActivity : IImmutableEntity, IAggregateCreatedHandler,
     [AggregateChild]
     public DialogActivityPerformedByActor PerformedBy { get; set; } = null!;
 
-    public List<DialogActivity> RelatedActivities { get; set; } = [];
-
     public void OnCreate(AggregateNode self, DateTimeOffset utcNow)
     {
         _domainEvents.Add(new DialogActivityCreatedDomainEvent(
             DialogId, Id, TypeId, Dialog.Party,
-            Dialog.ServiceResource, Dialog.Process, Dialog.PrecedingProcess, ExtendedType,
-            RelatedActivityId));
+            Dialog.ServiceResource, Dialog.Process, Dialog.PrecedingProcess, ExtendedType));
     }
 
     private readonly List<IDomainEvent> _domainEvents = [];

diff --git a/....Domain.Dialogporten.Domain/Dialogs/Events/Activities/DialogActivityCreatedDomainEvent.cs b/....Domain.Dialogporten.Domain/Dialogs/Events/Activities/DialogActivityCreatedDomainEvent.cs
@@ -11,5 +11,4 @@ public sealed record DialogActivityCreatedDomainEvent(
     string ServiceResource,
     string? Process,
     string? PrecedingProcess,
-    Uri? ExtendedType,
-    Guid? RelatedActivityId) : DomainEvent;
+    Uri? ExtendedType) : DomainEvent;
diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/Common/ObjectTypes.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/Common/ObjectTypes.cs
@@ -30,7 +30,6 @@ public sealed class Activity
 
     public ActivityType Type { get; set; }
 
-    public Guid? RelatedActivityId { get; set; }
     public Guid? TransmissionId { get; set; }
 
     public Actor PerformedBy { get; set; } = null!;

diff --git a/...frastructure/Persistence/Configurations/Dialogs/Activities/DialogActivityConfiguration.cs b/...frastructure/Persistence/Configurations/Dialogs/Activities/DialogActivityConfiguration.cs
@@ -8,10 +8,6 @@ internal sealed class DialogActivityConfiguration : IEntityTypeConfiguration<Dia
 {
     public void Configure(EntityTypeBuilder<DialogActivity> builder)
     {
-        builder.HasOne(x => x.RelatedActivity)
-            .WithMany(x => x.RelatedActivities)
-            .OnDelete(DeleteBehavior.SetNull);
-
         builder.HasOne(x => x.Transmission)
             .WithMany(x => x.Activities)
             .OnDelete(DeleteBehavior.SetNull);