diff --git a/server/ente/collection.go b/server/ente/collection.go index d280f348a..71b4c50ac 100644 --- a/server/ente/collection.go +++ b/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"` diff --git a/server/pkg/controller/file_copy/file_copy.go b/server/pkg/controller/file_copy/file_copy.go index 9923e4b67..1d8b888ac 100644 --- a/server/pkg/controller/file_copy/file_copy.go +++ b/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 {