Fix delete of channel 3

src/main/java/com/rudakova/media_archive/converter/FileConverter.java

@@ -13,23 +13,24 @@ import java.util.List;
  */
 public class FileConverter {
 
-    public static File convertFromGoogleFile(com.google.api.services.drive.model.File file, Account account, String folderId) {
-        File fileModel = convertFromGoogleFile(file, account);
+    public static File convertFromGoogleFile(com.google.api.services.drive.model.File file,
+                                             File fileFromBd, Account account, String folderId) {
+        File fileModel = convertFromGoogleFile(file, fileFromBd, account);
         fileModel.setBaseFolderId(folderId);
         return fileModel;
     }
 
-    public static File convertFromGoogleFile(com.google.api.services.drive.model.File file, Account account) {
-        File fileModel = new File();
-        fileModel.setAccount(account);
-        fileModel.setName(file.getName());
-        fileModel.setId(file.getId());
-        fileModel.setParents(file.getParents());
-        fileModel.setMimeType(file.getMimeType());
-        fileModel.setCreatedDate(file.getCreatedTime() == null ? null : file.getCreatedTime().toString());
-        fileModel.setWebLink(file.getWebViewLink());
-        fileModel.setPreview(file.getThumbnailLink());
-        return fileModel;
+    public static File convertFromGoogleFile(com.google.api.services.drive.model.File file,
+                                             File fileFromBd, Account account) {
+        fileFromBd.setAccount(account);
+        fileFromBd.setName(file.getName());
+        fileFromBd.setId(file.getId());
+        fileFromBd.setParents(file.getParents());
+        fileFromBd.setMimeType(file.getMimeType());
+        fileFromBd.setCreatedDate(file.getCreatedTime() == null ? null : file.getCreatedTime().toString());
+        fileFromBd.setWebLink(file.getWebViewLink());
+        fileFromBd.setPreview(file.getThumbnailLink());
+        return fileFromBd;
     }
 
     public static com.google.api.services.drive.model.File convertToGoogleShortcut(File file, String parentId) {
@@ -48,7 +49,8 @@ public class FileConverter {
     public static List<File> convertList(FileList fileList, Account account, String folderId) {
         List<File> files = new ArrayList<>();
         for (com.google.api.services.drive.model.File googleFile : fileList.getFiles()) {
-            files.add(convertFromGoogleFile(googleFile, account, folderId));
+            File file = new File();
+            files.add(convertFromGoogleFile(googleFile, file, account, folderId));
         }
         return files;
     }

src/main/java/com/rudakova/media_archive/google/GoogleService.java

@@ -271,17 +271,17 @@ public class GoogleService {
                                 Queue<String> folders, com.google.api.services.drive.model.File file) {
         String mimeType = file.getMimeType();
         NotificationDto.Address address;
-        File savedFile;
+        File savedFile = fileRepository.findById(file.getId()).orElse(new File());
         if (mimeType.equals("application/vnd.google-apps.folder")) {
             folders.offer(file.getId());
             address = NotificationDto.Address.FOLDER;
-            savedFile = fileRepository.save(FileConverter.convertFromGoogleFile(file, account, folderId));
+            fileRepository.save(FileConverter.convertFromGoogleFile(file, savedFile, account, folderId));
         } else if (mimeType.contains("video")) {
             if (file.getHasThumbnail()) {
                 savePreview(file);
             }
             address = NotificationDto.Address.VIDEO;
-            savedFile = fileRepository.save(FileConverter.convertFromGoogleFile(file, account, folderId));
+            fileRepository.save(FileConverter.convertFromGoogleFile(file, savedFile, account, folderId));
         } else {
             return;
         }
@@ -296,6 +296,7 @@ public class GoogleService {
             deleteWatchChannel(savedFile.getChannel(), account);
             savedFile.setChannel(null);
             savedFile.setNeedChannel(false);
+            fileRepository.save(savedFile);
         }
     }