Merge branch 'main' into chore/add-redis-postgres-health-checks

Altinn · Sep 20, 2024 · a275c12 · a275c12
2 parents 42326d1 + c2559d8
commit a275c12
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 12 deletions.
diff --git a/.azure/applications/graphql/main.bicep b/.azure/applications/graphql/main.bicep
@@ -87,6 +87,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     apimIp: apimIp
     tags: tags
     resources: resources
+    revisionSuffix: imageTag
   }
 }
 

diff --git a/.azure/applications/web-api-eu/main.bicep b/.azure/applications/web-api-eu/main.bicep
@@ -90,6 +90,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     apimIp: apimIp
     tags: tags
     resources: resources
+    revisionSuffix: imageTag
   }
 }
 

diff --git a/.azure/applications/web-api-so/main.bicep b/.azure/applications/web-api-so/main.bicep
@@ -94,6 +94,7 @@ module containerApp '../../modules/containerApp/main.bicep' = {
     apimIp: apimIp
     tags: tags
     resources: resources
+    revisionSuffix: imageTag
   }
 }
 

diff --git a/.azure/modules/containerApp/main.bicep b/.azure/modules/containerApp/main.bicep
@@ -25,6 +25,12 @@ param tags object
 @description('CPU and memory resources for the container app')
 param resources object?
 
+@description('The suffix for the revision of the container app')
+param revisionSuffix string
+
+// Container app revision name does not allow '.' character
+var cleanedRevisionSuffix = replace(revisionSuffix, '.', '-')
+
 var probes = [
   {
     periodSeconds: 5
@@ -75,6 +81,7 @@ resource containerApp 'Microsoft.App/containerApps@2024-03-01' = {
     }
     environmentId: containerAppEnvId
     template: {
+      revisionSuffix: cleanedRevisionSuffix
       scale: {
         minReplicas: 1
         maxReplicas: 1 // temp disable scaling for outbox scheduling

diff --git a/.github/workflows/action-check-for-changes.yml b/.github/workflows/action-check-for-changes.yml
@@ -47,6 +47,7 @@ jobs:
               - '.github/**/*'
               - 'src/**/*'
               - '.azure/applications/**/*'
+              - '.azure/modules/containerApp/**/*'
             tests:
               - 'tests/**/*'
             azure:

diff --git a/docs/schema/V1/schema.verified.graphql b/docs/schema/V1/schema.verified.graphql
@@ -132,8 +132,9 @@ type DialogByIdPayload {
   errors: [DialogByIdError!]!
 }
 
-type DialogUpdatedPayload {
+type DialogEventPayload {
   id: UUID!
+  type: DialogEventType!
 }
 
 type GuiAction {
@@ -211,7 +212,7 @@ type SeenLog {
 }
 
 type Subscriptions @authorize(policy: "enduser") {
-  dialogUpdated(dialogId: UUID!): DialogUpdatedPayload!
+  dialogEvents(dialogId: UUID!): DialogEventPayload!
 }
 
 type Transmission {
@@ -296,6 +297,11 @@ enum AttachmentUrlConsumer {
   API
 }
 
+enum DialogEventType {
+  DIALOG_UPDATED
+  DIALOG_DELETED
+}
+
 enum DialogStatus {
   "The dialogue is considered new. Typically used for simple messages that do not require any interaction, or as an initial step for dialogues. This is the default."
   NEW
@@ -355,4 +361,4 @@ scalar DateTime @specifiedBy(url: "https:\/\/www.graphql-scalars.com\/date-time"
 
 scalar URL @specifiedBy(url: "https:\/\/tools.ietf.org\/html\/rfc3986")
 
-scalar UUID @specifiedBy(url: "https:\/\/tools.ietf.org\/html\/rfc4122")
+scalar UUID @specifiedBy(url: "https:\/\/tools.ietf.org\/html\/rfc4122")
diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/DialogById/ObjectTypes.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/DialogById/ObjectTypes.cs
@@ -201,7 +201,14 @@ public enum AttachmentUrlConsumer
     Api = 2
 }
 
-public sealed class DialogUpdatedPayload
+public sealed class DialogEventPayload
 {
     public Guid Id { get; set; }
+    public DialogEventType Type { get; set; }
+}
+
+public enum DialogEventType
+{
+    DialogUpdated = 1,
+    DialogDeleted = 2
 }
diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/DialogById/Subscriptions.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/DialogById/Subscriptions.cs
@@ -10,11 +10,12 @@ namespace Digdir.Domain.Dialogporten.GraphQL.EndUser.DialogById;
 public sealed class Subscriptions
 {
     [Subscribe]
-    [Topic($"{Constants.DialogUpdatedTopic}{{{nameof(dialogId)}}}")]
-    public DialogUpdatedPayload DialogUpdated(Guid dialogId,
-        [EventMessage] Guid eventMessage)
+    [Topic($"{Constants.DialogEventsTopic}{{{nameof(dialogId)}}}")]
+    public DialogEventPayload DialogEvents(Guid dialogId,
+        [EventMessage] DialogEventPayload eventMessage)
     {
+        ArgumentNullException.ThrowIfNull(dialogId);
         ArgumentNullException.ThrowIfNull(eventMessage);
-        return new DialogUpdatedPayload { Id = dialogId };
+        return eventMessage;
     }
 }
diff --git a/...rten.Infrastructure/DomainEvents/Outbox/ConvertDomainEventsToOutboxMessagesInterceptor.cs b/...rten.Infrastructure/DomainEvents/Outbox/ConvertDomainEventsToOutboxMessagesInterceptor.cs
@@ -1,6 +1,8 @@
 using Digdir.Domain.Dialogporten.Application.Common;
 using Digdir.Domain.Dialogporten.Domain.Dialogs.Events;
+using Digdir.Domain.Dialogporten.Domain.Dialogs.Events.Activities;
 using Digdir.Domain.Dialogporten.Domain.Outboxes;
+using Digdir.Domain.Dialogporten.Infrastructure.GraphQl;
 using Digdir.Library.Entity.Abstractions.Features.EventPublisher;
 using HotChocolate.Subscriptions;
 using Microsoft.EntityFrameworkCore.Diagnostics;
@@ -72,8 +74,28 @@ public override async ValueTask<int> SavedChangesAsync(SaveChangesCompletedEvent
                 var task = domainEvent switch
                 {
                     DialogUpdatedDomainEvent dialogUpdatedDomainEvent => _topicEventSender.SendAsync(
-                        $"{Constants.DialogUpdatedTopic}{dialogUpdatedDomainEvent.DialogId}",
-                        dialogUpdatedDomainEvent.DialogId,
+                        $"{Constants.DialogEventsTopic}{dialogUpdatedDomainEvent.DialogId}",
+                        new DialogEventPayload
+                        {
+                            Id = dialogUpdatedDomainEvent.DialogId,
+                            Type = DialogEventType.DialogUpdated
+                        },
+                        cancellationToken),
+                    DialogDeletedDomainEvent dialogDeletedDomainEvent => _topicEventSender.SendAsync(
+                        $"{Constants.DialogEventsTopic}{dialogDeletedDomainEvent.DialogId}",
+                        new DialogEventPayload
+                        {
+                            Id = dialogDeletedDomainEvent.DialogId,
+                            Type = DialogEventType.DialogDeleted
+                        },
+                        cancellationToken),
+                    DialogActivityCreatedDomainEvent dialogActivityCreatedDomainEvent => _topicEventSender.SendAsync(
+                        $"{Constants.DialogEventsTopic}{dialogActivityCreatedDomainEvent.DialogId}",
+                        new DialogEventPayload
+                        {
+                            Id = dialogActivityCreatedDomainEvent.DialogId,
+                            Type = DialogEventType.DialogUpdated
+                        },
                         cancellationToken),
                     _ => ValueTask.CompletedTask
                 };

diff --git a/src/Digdir.Domain.Dialogporten.Infrastructure/GraphQL/DialogEventPayload.cs b/src/Digdir.Domain.Dialogporten.Infrastructure/GraphQL/DialogEventPayload.cs
@@ -0,0 +1,13 @@
+namespace Digdir.Domain.Dialogporten.Infrastructure.GraphQl;
+
+internal struct DialogEventPayload
+{
+    public Guid Id { get; set; }
+    public DialogEventType Type { get; set; }
+}
+
+internal enum DialogEventType
+{
+    DialogUpdated = 1,
+    DialogDeleted = 2
+}
diff --git a/src/Digdir.Domain.Dialogporten.Infrastructure/GraphQL/GraphQlSubscriptionConstants.cs b/src/Digdir.Domain.Dialogporten.Infrastructure/GraphQL/GraphQlSubscriptionConstants.cs
@@ -3,5 +3,5 @@ namespace Digdir.Domain.Dialogporten.Infrastructure.GraphQl;
 public static class GraphQlSubscriptionConstants
 {
     public const string SubscriptionTopicPrefix = "graphql_subscriptions_";
-    public const string DialogUpdatedTopic = "dialogUpdated/";
+    public const string DialogEventsTopic = "dialogEvents/";
 }
diff --git a/tests/Digdir.Domain.Dialogporten.Architecture.Tests/InfrastructureArchitectureTests.cs b/tests/Digdir.Domain.Dialogporten.Architecture.Tests/InfrastructureArchitectureTests.cs
@@ -15,7 +15,7 @@ public void All_Classes_In_Infrastructure_Should_Be_Internal()
         {
             nameof(InfrastructureAssemblyMarker),
             nameof(InfrastructureExtensions),
-            
+
             // These classes are currently public, but should be internal, moved to another assembly, or deleted
             nameof(OutboxScheduler),
             nameof(IUpstreamServiceError)