fix patch files

Author: AmelieLoulergue

src/api/catalog/validators/index.ts

@@ -21,7 +21,7 @@ const fileSchema = Joi.object({
     original_mimetype: Joi.string().optional(),
     mimetype: Joi.string().optional(),
     signature: Joi.string().required(),
-    size: Joi.number().required()
+    size: Joi.number().allow(null).optional()
 });
 
 interface ValidateSchemaProps {
@@ -31,7 +31,7 @@ interface ValidateSchemaProps {
 
 interface ValidationErrorDetail {
     message: string;
-    path: (string | number)[];
+    path: ( string | number )[];
     type: string;
     context?: {
         key?: string;

src/api/controllers/files.controller.ts

@@ -88,13 +88,13 @@ export const patchAssets = async (req: Request, res: Response) => {
             }
             const fileInfo = generateFileInfo(file);
             const version = req.files ? file.catalogItem.version + 1 : file.catalogItem.version;
-            const updatedItem = await updateCatalogItem(file.uuid, {
+            const updatedItem = await updateCatalogItem(file.uuid ?? file.catalogItem.uuid, {
                 ...file.catalogItem,
                 ...file.fileInfo,
                 ...fileInfo,
                 version,
                 ...(signature && { signature }),
-                ...(file && { size: file.size })
+                ...(file?.size && { size: file.size })
             });
             if (updatedItem.datum) {
                 return { data: [...data, updatedItem.datum], errors };

src/api/middleware/validators/multipleFilesValidators.ts

@@ -115,11 +115,8 @@ export const validatorFilesBody = async (req: Request, res: Response, next: Next
     const { validFiles, invalidFiles } = await validFilesFromLocal.reduce(
         async (accumulator, file) => {
             const { validFiles, invalidFiles } = await accumulator;
-            const uniqueName = !file.uuid && generateUniqueName(file, req.body, namespace, toWebp);
-            const itemFound = await findFileInCatalog(file.uuid ? file.uuid : uniqueName, file.uuid ?
-                'uuid' :
-                'unique_name');
-            if (itemFound && req.method === 'POST') {
+
+            if (file.catalogItem && req.method === 'POST') {
                 return {
                     validFiles,
                     invalidFiles: [
@@ -149,12 +146,11 @@ export const validatorFilesBody = async (req: Request, res: Response, next: Next
                     ...validFiles,
                     {
                         ...file,
-                        uniqueName: itemFound ?
-                            itemFound.unique_name :
+                        uniqueName: file.catalogItem ?
+                            file.catalogItem.unique_name :
                             generateUniqueName(file, req.body, namespace, toWebp),
                         fileInfo,
-                        toWebp,
-                        catalogItem: itemFound
+                        toWebp
                     }
                 ],
                 invalidFiles
@@ -174,6 +170,7 @@ export const validatorFilesBody = async (req: Request, res: Response, next: Next
     next();
 };
 
+
 const _checkFilesInCatalog = async (files: any[], invalidFilesFromNamespace) => {
     return await files.reduce(
         async (accumulator, file) => {

src/api/middleware/validators/oneFileValidators.ts

@@ -113,7 +113,7 @@ export const generateFileInfo = (body, method = 'PATCH') => {
         const fileInfo = {};
         for (let key of bodyKeys) {
             if (keysAllowed.includes(key)) {
-                fileInfo[key] = body[key];
+                fileInfo[key] = body.changes ? body.changes[key] : body[key];
             }
         }
         return fileInfo;

src/api/props/catalog.ts

@@ -15,7 +15,7 @@ export interface FileProps {
     original_mimetype?: string;
     mimetype?: string;
     signature?: string;
-    size?: number | string;
+    size?: number | string ;
 }
 
 export interface ICatalogResponse {