Browse Source

[server] Minor refactor

Neeraj Gupta 1 year ago
parent
commit
91620965b0
2 changed files with 2 additions and 9 deletions
  1. 0 8
      server/ente/collection.go
  2. 2 1
      server/pkg/controller/file_copy/file_copy.go

+ 0 - 8
server/ente/collection.go

@@ -114,14 +114,6 @@ type CopyResponse struct {
 	OldToNewFileIDMap map[int64]int64 `json:"oldToNewFileIDMap"`
 }
 
-func (cfr CopyFileSyncRequest) FileIDs() []int64 {
-	fileIDs := make([]int64, 0, len(cfr.CollectionFileItems))
-	for _, file := range cfr.CollectionFileItems {
-		fileIDs = append(fileIDs, file.ID)
-	}
-	return fileIDs
-}
-
 // RemoveFilesRequest represents a request to remove files from a collection
 type RemoveFilesRequest struct {
 	CollectionID int64 `json:"collectionID" binding:"required"`

+ 2 - 1
server/pkg/controller/file_copy/file_copy.go

@@ -65,11 +65,12 @@ func (fc *FileCopyController) CopyFiles(c *gin.Context, req ente.CopyFileSyncReq
 	if err != nil {
 		return nil, err
 	}
-	fileIDs := req.FileIDs()
+	fileIDs := make([]int64, 0, len(req.CollectionFileItems))
 	fileToCollectionFileMap := make(map[int64]*ente.CollectionFileItem, len(req.CollectionFileItems))
 	for i := range req.CollectionFileItems {
 		item := &req.CollectionFileItems[i]
 		fileToCollectionFileMap[item.ID] = item
+		fileIDs = append(fileIDs, item.ID)
 	}
 	s3ObjectsToCopy, err := fc.ObjectRepo.GetObjectsForFileIDs(fileIDs)
 	if err != nil {