fix(misc): delete many

kouprlabs · Sep 19, 2024 · 5e8e755 · 5e8e755
1 parent edb7688
commit 5e8e755
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/api/docs/index.html b/api/docs/index.html
diff --git a/api/docs/swagger.yaml b/api/docs/swagger.yaml
@@ -337,6 +337,17 @@ definitions:
     required:
     - ids
     type: object
+  service.FileDeleteManyResult:
+    properties:
+      failed:
+        items:
+          type: string
+        type: array
+      succeeded:
+        items:
+          type: string
+        type: array
+    type: object
   service.FileList:
     properties:
       data:
@@ -909,9 +920,7 @@ paths:
         "200":
           description: OK
           schema:
-            items:
-              type: string
-            type: array
+            $ref: '#/definitions/service.FileDeleteManyResult'
         "500":
           description: Internal Server Error
           schema:

diff --git a/api/router/file_router.go b/api/router/file_router.go
@@ -622,7 +622,7 @@ func (r *FileRouter) DeleteOne(c *fiber.Ctx) error {
 //	@Id				files_delete_many
 //	@Produce		json
 //	@Param			body	body		service.FileDeleteManyOptions	true	"Body"
-//	@Success		200		{array}		string
+//	@Success		200		{object}	service.FileDeleteManyResult
 //	@Failure		500		{object}	errorpkg.ErrorResponse
 //	@Router			/files [delete]
 func (r *FileRouter) DeleteMany(c *fiber.Ctx) error {

diff --git a/api/service/file_service.go b/api/service/file_service.go
@@ -1390,7 +1390,10 @@ type FileDeleteManyResult struct {
 }
 
 func (svc *FileService) DeleteMany(opts FileDeleteManyOptions, userID string) (*FileDeleteManyResult, error) {
-	res := &FileDeleteManyResult{}
+	res := &FileDeleteManyResult{
+		Failed:    make([]string, 0),
+		Succeeded: make([]string, 0),
+	}
 	for _, id := range opts.IDs {
 		if err := svc.DeleteOne(id, userID); err != nil {
 			res.Failed = append(res.Failed, id)

diff --git a/ui/src/client/api/file.ts b/ui/src/client/api/file.ts
@@ -112,6 +112,11 @@ export type DeleteManyOptions = {
   ids: string
 }
 
+export type DeleteManyResult = {
+  succeeded: string[]
+  failed: string[]
+}
+
 export type PatchNameOptions = {
   name: string
 }
@@ -325,7 +330,7 @@ export default class FileAPI {
       url: `/files`,
       method: 'DELETE',
       body: JSON.stringify(options),
-    })
+    }) as Promise<DeleteManyResult>
   }
 
   static async moveOne(id: string, targetId: string) {