Refactor image upload and deletion utilities to improve file URL handling and streamline filename generation

Author: i-am-that-guy

src/utils/imageUtils.ts

@@ -4,32 +4,44 @@ import { ApiError } from './apiError'
 
 type MulterFile = Express.Multer.File
 
+function extractFilePathAndNameFromUrl(fileUrl: string): { filePath: string, fileName: string } {
+  try {
+    const url = new URL(fileUrl)
+    const pathParts = url.pathname.split('/') // ['', 'storage', 'v1', 'object', 'public', 'images', ...filePathParts]
+    const filePath = pathParts.slice(6).join('/') // 'images/...'
+    if (!filePath) throw new Error('Invalid file URL')
+    const fileName = filePath.split('/').pop() || ''
+    return { filePath, fileName }
+  } catch {
+    throw new ApiError('Invalid file URL', 400)
+  }
+}
+
+
 export async function uploadImage(
   supabase: SupabaseClient,
   file: MulterFile,
-  folder: string, 
-  fileName?: string
+  folder: string,
+  fileUrl?: string
 ): Promise<string> {
-  // 1) Determine file extension
-    const mime = file.mimetype // e.g. 'image/jpeg'
-    if (!mime) {
-        throw new ApiError('File type is missing', 400)
-    }
-  // Validate MIME type against allowed image types
-    const allowedTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp']
-    if (!allowedTypes.includes(mime)) {
-        throw new ApiError('Invalid file type. Only JPEG, PNG, GIF, and WebP images are allowed.', 400)
-    }
-  
+  const mime = file.mimetype
+  if (!mime) throw new ApiError('File type is missing', 400)
+  const allowedTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp']
+  if (!allowedTypes.includes(mime)) {
+    throw new ApiError('Invalid file type. Only JPEG, PNG, GIF, and WebP images are allowed.', 400)
+  }
   const ext = mime.split('/')[1]
 
-  // 2) Create filename
-const filename = fileName ? fileName : `${uuidv4()}.${ext}`
+  let filename: string
+  if (fileUrl) {
+    const { fileName } = extractFilePathAndNameFromUrl(fileUrl)
+    filename = fileName
+  } else {
+    filename = `${uuidv4()}.${ext}`
+  }
 
-  // 3) Build full path inside the bucket
   const filePath = `${folder}/${filename}`
 
-  // 4) Perform the upload (upsert: true will overwrite same path if it exists)
   const { error: uploadError } = await supabase
     .storage
     .from('images')
@@ -42,7 +54,6 @@ const filename = fileName ? fileName : `${uuidv4()}.${ext}`
     throw new ApiError(`Image upload failed: ${uploadError.message}`, 500)
   }
 
-  // 5) Generate a public URL
   const { data: urlData } = supabase
     .storage
     .from('images')
@@ -59,9 +70,7 @@ export async function deleteImage(
   supabase: SupabaseClient,
   fileUrl: string
 ): Promise<void> {
-  const url = new URL(fileUrl);
-  const pathParts = url.pathname.split('/'); // ['', 'storage', 'v1', 'object', 'public', 'images', ...filePathParts]
-  const filePath = pathParts.slice(6).join('/'); // 'images/...'
+  const { filePath } = extractFilePathAndNameFromUrl(fileUrl)
   if (!filePath) {
     throw new ApiError('Invalid file URL', 400)
   }