ASC.Files: FileMoveCopyOperation: reset lifetime settings when archiv…

…ing a room

products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs

@@ -418,6 +418,7 @@ Task<int> GetFoldersCountAsync(T parentId, FilterType filterType, bool subjectGr
     Task<T> SetWatermarkSettings(WatermarkSettings waterMarks, Folder<T> folder);
     Task<WatermarkSettings> GetWatermarkSettings(Folder<T> room);
     Task<Folder<T>> DeleteWatermarkSettings(Folder<T> room);
+    Task<Folder<T>> DeleteLifetimeSettings(Folder<T> room);
     #endregion
 }
 

products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs

@@ -594,6 +594,18 @@ public async Task<Folder<int>> DeleteWatermarkSettings(Folder<int> room)
         return room;
     }
 
+    public async Task<Folder<int>> DeleteLifetimeSettings(Folder<int> room)
+    {
+        var tenantId = await _tenantManager.GetCurrentTenantIdAsync();
+
+        await using var filesDbContext = await _dbContextFactory.CreateDbContextAsync();
+        var roomSettings = await filesDbContext.RoomSettingsAsync(tenantId, room.Id);
+        roomSettings.Lifetime = null;
+        filesDbContext.Update(roomSettings);
+        await filesDbContext.SaveChangesAsync();
+        return room;
+    }
+
     public async Task DeleteFolderAsync(int folderId)
     {
         if (folderId == default)

products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs

@@ -700,4 +700,12 @@ public Task<Folder<string>> DeleteWatermarkSettings(Folder<string> room)
 
         return folderDao.DeleteWatermarkSettings(room);
     }
+    public Task<Folder<string>> DeleteLifetimeSettings(Folder<string> room)
+    {
+        ArgumentNullException.ThrowIfNull(room);
+        var selector = _selectorFactory.GetSelector(room.Id);
+        var folderDao = selector.GetFolderDao(room.Id);
+
+        return folderDao.DeleteLifetimeSettings(room);
+    }
 }

products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs

@@ -477,6 +477,11 @@ public Task<Folder<string>> DeleteWatermarkSettings(Folder<string> room)
     {
         throw new NotImplementedException();
     }
+
+    public Task<Folder<string>> DeleteLifetimeSettings(Folder<string> room)
+    {
+        throw new NotImplementedException();
+    }
 }
 
 static file class Queries

products/ASC.Files/Core/Core/Thirdparty/ThirdPartyFolderDao.cs

@@ -697,6 +697,11 @@ public Task<Folder<string>> DeleteWatermarkSettings(Folder<string> room)
     {
         throw new NotImplementedException();
     }
+
+    public Task<Folder<string>> DeleteLifetimeSettings(Folder<string> room)
+    {
+        throw new NotImplementedException();
+    }
 }
 
 internal abstract class BaseFolderDao

products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs

@@ -770,6 +770,8 @@ await socketManager.DeleteFolder(folder, action: async () =>
                                         await TagDao.RemoveTagsAsync(pins);
                                     }
 
+                                    await FolderDao.DeleteLifetimeSettings(folder);
+
                                     await filesMessageService.SendAsync(MessageAction.RoomArchived, folder, _headers, folder.Title);
                                 }
                                 else