Merge branch 'main' into fix/removeDataLocationUrlInResponses

Altinn · Aug 27, 2024 · f4952fc · f4952fc
2 parents b5c671d + 956c4f3
commit f4952fc
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/.azure/modules/postgreSql/AddAdministrationAccess.bicep b/.azure/modules/postgreSql/AddAdministrationAccess.bicep
@@ -3,7 +3,7 @@ param tenantId string
 param appName string
 param namePrefix string
 
-resource database 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' existing = {
+resource database 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12-01-preview' existing = {
   name: '${namePrefix}-dbserver'
 }
 resource databaseAccess 'Microsoft.DBforPostgreSQL/flexibleServers/administrators@2022-12-01' = {

diff --git a/.azure/modules/postgreSql/create.bicep b/.azure/modules/postgreSql/create.bicep
@@ -42,11 +42,11 @@ module saveMigrationConnectionString '../keyvault/upsertSecret.bicep' = {
   }
 }
 
-resource postgres 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-preview' = {
+resource postgres 'Microsoft.DBforPostgreSQL/flexibleServers@2023-12-01-preview' = {
   name: '${namePrefix}-dbserver'
   location: location
   properties: {
-    version: '14'
+    version: '16'
     administratorLogin: databaseUser
     administratorLoginPassword: administratorLoginPassword
     storage: {

diff --git a/Test/Altinn.Correspondence.Tests/CorrespondenceControllerTests.cs b/Test/Altinn.Correspondence.Tests/CorrespondenceControllerTests.cs
@@ -323,6 +323,7 @@ public async Task GetCorrespondenceDetails()
         var getCorrespondenceDetailsResponse = await _client.GetAsync($"correspondence/api/v1/correspondence/{correspondence?.CorrespondenceIds.FirstOrDefault()}/details");
         Assert.True(getCorrespondenceDetailsResponse.IsSuccessStatusCode, await getCorrespondenceDetailsResponse.Content.ReadAsStringAsync());
         var response = await getCorrespondenceDetailsResponse.Content.ReadFromJsonAsync<CorrespondenceDetailsExt>(_responseSerializerOptions);
+        Assert.NotEqual(string.Empty, response.ResourceId);
         Assert.Equal(response.Status, CorrespondenceStatusExt.Initialized);
     }
     [Fact]

diff --git a/...nn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs b/...nn.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsHandler.cs
@@ -64,14 +64,15 @@ await _correspondenceStatusRepository.AddCorrespondenceStatus(new Correspondence
             StatusText = latestStatus.StatusText,
             StatusChanged = latestStatus.StatusChanged,
             SendersReference = correspondence.SendersReference,
-            Content = correspondence.Content!,
             Created = correspondence.Created,
             Recipient = correspondence.Recipient,
+            Content = correspondence.Content!,
             ReplyOptions = correspondence.ReplyOptions == null ? new List<CorrespondenceReplyOptionEntity>() : correspondence.ReplyOptions,
             Notifications = correspondence.Notifications == null ? new List<CorrespondenceNotificationEntity>() : correspondence.Notifications,
             VisibleFrom = correspondence.VisibleFrom,
             IsReservable = correspondence.IsReservable == null || correspondence.IsReservable.Value,
-            StatusHistory = correspondence.Statuses
+            StatusHistory = correspondence.Statuses,
+            ResourceId = correspondence.ResourceId
         };
         return response;
     }

diff --git a/...n.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs b/...n.Correspondence.Application/GetCorrespondenceDetails/GetCorrespondenceDetailsResponse.cs
@@ -35,7 +35,7 @@ public class GetCorrespondenceDetailsResponse
 
     public List<ExternalReferenceEntity> ExternalReferences { get; set; } = new List<ExternalReferenceEntity>();
 
-    public Guid ResourceId { get; set; }
+    public string ResourceId { get; set; }
 
     public DateTimeOffset VisibleFrom { get; set; }