Consolidated naming

Altinn · Dec 12, 2023 · a8c67ef · a8c67ef
1 parent 340f68a
commit a8c67ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/Altinn.Broker/Controllers/ServiceOwnerController.cs b/src/Altinn.Broker/Controllers/ServiceOwnerController.cs
@@ -59,7 +59,7 @@ public async Task<ActionResult<ServiceOwnerOverviewExt>> GetServiceOwner(string
         {
             Name = serviceOwner.Name,
             DeploymentStatus = (DeploymentStatusExt)deploymentStatus,
-            DeletionTime = serviceOwner.FileTimeToLive
+            FileTimeToLive = serviceOwner.FileTimeToLive
         };
     }
 }

diff --git a/src/Altinn.Broker/Mappers/FileStatusDetailsExtMapper.cs b/src/Altinn.Broker/Mappers/FileStatusDetailsExtMapper.cs
@@ -21,6 +21,7 @@ internal static FileStatusDetailsExt MapToExternalModel(FileEntity file, List<Fi
             PropertyList = fileOverview.PropertyList,
             Recipients = fileOverview.Recipients,
             SendersFileReference = fileOverview.SendersFileReference,
+            ExpirationTime = fileOverview.ExpirationTime,
             FileStatusHistory = MapToFileStatusHistoryExt(fileEvents),
             RecipientFileStatusHistory = MapToRecipientEvents(actorEvents)
         };

diff --git a/src/Altinn.Broker/Models/ServiceOwner/ServiceOwnerOverviewExt.cs b/src/Altinn.Broker/Models/ServiceOwner/ServiceOwnerOverviewExt.cs
@@ -8,5 +8,5 @@ public ServiceOwnerOverviewExt() { }
 
     public DeploymentStatusExt DeploymentStatus { get; set; }
 
-    public TimeSpan DeletionTime { get; set; }
+    public TimeSpan FileTimeToLive { get; set; }
 }