From 6253b151e158708e5516db64af5e462f427a87d2 Mon Sep 17 00:00:00 2001
From: pavelbannov <pavel.bannov@onlyoffice.com>
Date: Sun, 2 Aug 2020 21:48:58 +0300
Subject: [PATCH] fix ChangeHistory, UpdateFile, added UpdateComment

---
 .../Core/Model/ChangeHistoryModel.cs          |  8 +++++
 .../Core/Model/UpdateCommentModel.cs          |  8 +++++
 .../ASC.Files/Core/Model/UpdateFileModel.cs   |  8 +++++
 .../Server/Controllers/FilesController.cs     | 30 ++++++++++++++-----
 .../Server/Helpers/FilesControllerHelper.cs   |  5 ++++
 5 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 products/ASC.Files/Core/Model/ChangeHistoryModel.cs
 create mode 100644 products/ASC.Files/Core/Model/UpdateCommentModel.cs
 create mode 100644 products/ASC.Files/Core/Model/UpdateFileModel.cs

diff --git a/products/ASC.Files/Core/Model/ChangeHistoryModel.cs b/products/ASC.Files/Core/Model/ChangeHistoryModel.cs
new file mode 100644
index 0000000000..f9863c79ce
--- /dev/null
+++ b/products/ASC.Files/Core/Model/ChangeHistoryModel.cs
@@ -0,0 +1,8 @@
+namespace ASC.Files.Core.Model
+{
+    public class ChangeHistoryModel
+    {
+        public int Version { get; set; }
+        public bool ContinueVersion { get; set; }
+    }
+}
diff --git a/products/ASC.Files/Core/Model/UpdateCommentModel.cs b/products/ASC.Files/Core/Model/UpdateCommentModel.cs
new file mode 100644
index 0000000000..e3cb337f6f
--- /dev/null
+++ b/products/ASC.Files/Core/Model/UpdateCommentModel.cs
@@ -0,0 +1,8 @@
+namespace ASC.Files.Core.Model
+{
+    public class UpdateCommentModel
+    {
+        public int Version { get; set; }
+        public string Comment { get; set; }
+    }
+}
diff --git a/products/ASC.Files/Core/Model/UpdateFileModel.cs b/products/ASC.Files/Core/Model/UpdateFileModel.cs
new file mode 100644
index 0000000000..81d389fd13
--- /dev/null
+++ b/products/ASC.Files/Core/Model/UpdateFileModel.cs
@@ -0,0 +1,8 @@
+namespace ASC.Files.Core.Model
+{
+    public class UpdateFileModel
+    {
+        public string Title { get; set; }
+        public int LastVersion { get; set; }
+    }
+}
diff --git a/products/ASC.Files/Server/Controllers/FilesController.cs b/products/ASC.Files/Server/Controllers/FilesController.cs
index dcbb3f0f29..794d636225 100644
--- a/products/ASC.Files/Server/Controllers/FilesController.cs
+++ b/products/ASC.Files/Server/Controllers/FilesController.cs
@@ -42,6 +42,7 @@ using ASC.Core.Users;
 using ASC.FederatedLogin.Helpers;
 using ASC.FederatedLogin.LoginProviders;
 using ASC.Files.Core;
+using ASC.Files.Core.Model;
 using ASC.Files.Helpers;
 using ASC.Files.Model;
 using ASC.MessagingSystem;
@@ -812,15 +813,15 @@ namespace ASC.Api.Documents
         /// <param name="lastVersion">File last version number</param>
         /// <returns>File info</returns>
         [Update("file/{fileId}", DisableFormat = true)]
-        public FileWrapper<string> UpdateFile(string fileId, string title, int lastVersion)
+        public FileWrapper<string> UpdateFile(string fileId, UpdateFileModel model)
         {
-            return FilesControllerHelperString.UpdateFile(fileId, title, lastVersion);
+            return FilesControllerHelperString.UpdateFile(fileId, model.Title, model.LastVersion);
         }
 
         [Update("file/{fileId:int}")]
-        public FileWrapper<int> UpdateFile(int fileId, string title, int lastVersion)
+        public FileWrapper<int> UpdateFile(int fileId, UpdateFileModel model)
         {
-            return FilesControllerHelperInt.UpdateFile(fileId, title, lastVersion);
+            return FilesControllerHelperInt.UpdateFile(fileId, model.Title, model.LastVersion);
         }
 
         /// <summary>
@@ -1061,14 +1062,27 @@ namespace ASC.Api.Documents
         /// <category>Files</category>
         /// <returns></returns>
         [Update("file/{fileId}/history", DisableFormat = true)]
-        public IEnumerable<FileWrapper<string>> ChangeHistory(string fileId, int version, bool continueVersion)
+        public IEnumerable<FileWrapper<string>> ChangeHistory(string fileId, ChangeHistoryModel model)
         {
-            return FilesControllerHelperString.ChangeHistory(fileId, version, continueVersion);
+            return FilesControllerHelperString.ChangeHistory(fileId, model.Version, model.ContinueVersion);
         }
+
         [Update("file/{fileId:int}/history")]
-        public IEnumerable<FileWrapper<int>> ChangeHistory(int fileId, int version, bool continueVersion)
+        public IEnumerable<FileWrapper<int>> ChangeHistory(int fileId, ChangeHistoryModel model)
         {
-            return FilesControllerHelperInt.ChangeHistory(fileId, version, continueVersion);
+            return FilesControllerHelperInt.ChangeHistory(fileId, model.Version, model.ContinueVersion);
+        }
+
+        [Update("file/{fileId}/comment", DisableFormat = true)]
+        public object UpdateComment(string fileId, UpdateCommentModel model)
+        {
+            return FilesControllerHelperString.UpdateComment(fileId, model.Version, model.Comment);
+        }
+
+        [Update("file/{fileId:int}/comment")]
+        public object UpdateComment(int fileId, UpdateCommentModel model)
+        {
+            return FilesControllerHelperInt.UpdateComment(fileId, model.Version, model.Comment);
         }
 
         /// <summary>
diff --git a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
index c755d8c1fe..670e47ac07 100644
--- a/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
+++ b/products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
@@ -549,6 +549,11 @@ namespace ASC.Files.Helpers
             return history.Select(FileWrapperHelper.Get);
         }
 
+        public string UpdateComment(T fileId, int version, string comment)
+        {
+            return FileStorageService.UpdateComment(fileId, version, comment);
+        }
+
         public IEnumerable<FileShareWrapper> GetFileSecurityInfo(T fileId)
         {
             var fileShares = FileStorageService.GetSharedInfo(new ItemList<string> { string.Format("file_{0}", fileId) });