Merge pull request #46 from StreetSupport/feature/3017-create-location-specific-content-management-system

3017 - Update uploading files/images

Author: o-seliuchenko

package-lock.json

@@ -187,7 +187,7 @@ export const updateBanner = asyncHandler(async (req: Request, res: Response) =>
   // Handle template type change from RESOURCE_PROJECT to another type
   if (oldBannerData.TemplateType === BannerTemplateType.RESOURCE_PROJECT && 
       validation?.data?.TemplateType !== BannerTemplateType.RESOURCE_PROJECT) {
-    await handleResourceProjectTemplateChange(oldBannerData, validation.data);
+    await handleResourceProjectTemplateChange(oldBannerData);
   }
 
   // Handle resource project specific logic
@@ -359,7 +359,7 @@ function _handleResourceProjectBannerLogic(bannerData: any): any {
 
 // Private helper to handle template type change from RESOURCE_PROJECT
 // Cleans up resource file and CTA button with blob URL when template type changes
-async function handleResourceProjectTemplateChange(oldBannerData: any, newBannerData: any): Promise<void> {
+async function handleResourceProjectTemplateChange(oldBannerData: any): Promise<void> {
   // Check if old banner had a resource file with a blob URL
   if (oldBannerData.ResourceProject?.ResourceFile?.FileUrl) {
     const fileUrl = oldBannerData.ResourceProject.ResourceFile.FileUrl;

src/controllers/bannerController.ts

@@ -130,6 +130,7 @@ export const updateLocationLogo = asyncHandler(async (req: Request, res: Respons
 
   // Extract uploaded file URL from req
   let logoPath = existingLogo.LogoPath;
+  
   if (req.body.LogoPath && req.body.LogoPath !== existingLogo.LogoPath) {
     logoPath = req.body.LogoPath;
   }

src/controllers/locationLogoController.ts

@@ -37,14 +37,18 @@ const storage = multer.memoryStorage();
 const upload = multer({
   storage,
   limits: {
-    fileSize: 5 * 1024 * 1024, // 10MB limit
+    fileSize: 10 * 1024 * 1024, // 10MB limit
     files: 10 // Maximum 10 files
   },
   fileFilter: (req, file, cb) => {
-    // Combine banner image types with resource file types
-    const bannerImageTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/svg+xml'];
+    const imageTypes = [
+      'image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/svg+xml',
+      'image/x-xbitmap', 'image/tiff', 'image/jpeg', 'image/vnd.mozilla-apng', 
+      'image/svg+xml-compressed', 'image/x-icon', 'image/heif', 'image/heic', 
+      'image/avif', 'image/bmp', 'image/pjpeg'
+    ];
     const resourceFileTypes = Object.keys(SUPPORTED_RESOURCE_FILE_TYPES);
-    const allowedMimeTypes = [...new Set([...bannerImageTypes, ...resourceFileTypes])];
+    const allowedMimeTypes = [...new Set([...imageTypes, ...resourceFileTypes])];
 
     if (allowedMimeTypes.includes(file.mimetype)) {
       cb(null, true);
@@ -88,24 +92,7 @@ async function uploadToAzure(file: Express.Multer.File, containerName: string):
   return blockBlobClient.url;
 }
 
-// Fallback: Save to local uploads directory
-function saveToLocal(file: Express.Multer.File, containerName: string): string {
-  const uploadsDir = path.join(process.cwd(), 'public', 'uploads', containerName);
-  const fileExtension = path.extname(file.originalname);
-  const fileName = `${uuidv4()}${fileExtension}`;
-  const filePath = path.join(uploadsDir, fileName);
-
-  // Create directory if it doesn't exist
-  if (!fs.existsSync(uploadsDir)) {
-    fs.mkdirSync(uploadsDir, { recursive: true });
-  }
-
-  // Write file
-  fs.writeFileSync(filePath, file.buffer);
-
-  // Return relative URL
-  return `/public/uploads/${containerName}/${fileName}`;
-}
+// saveToLocal() function removed - Azure Blob Storage is required
 
 // Process uploaded files and add URLs to request body
 async function processUploads(req: Request, res: Response, next: NextFunction) {
@@ -139,7 +126,7 @@ async function processUploads(req: Request, res: Response, next: NextFunction) {
             if (blobServiceClient) {
               fileUrl = await uploadToAzure(file, BANNERS_CONTAINER_NAME);
             } else {
-              fileUrl = saveToLocal(file, BANNERS_CONTAINER_NAME);
+              throw new Error('Azure Blob Storage is required for file uploads.');
             }
 
             // Create asset object
@@ -257,7 +244,7 @@ export const uploadSwepImage = async (req: Request, res: Response, next: NextFun
       if (blobServiceClient) {
         fileUrl = await uploadToAzure(file, SWEPS_CONTAINER_NAME);
       } else {
-        fileUrl = saveToLocal(file, SWEPS_CONTAINER_NAME);
+        throw new Error('Azure Blob Storage is required for file uploads.');
       }
 
       // Attach uploaded file info to request body
@@ -302,7 +289,7 @@ export const uploadResourceFiles = async (req: Request, res: Response, next: Nex
         if (blobServiceClient) {
           fileUrl = await uploadToAzure(file, RESOURCES_CONTAINER_NAME);
         } else {
-          fileUrl = saveToLocal(file, RESOURCES_CONTAINER_NAME);
+          throw new Error('Azure Blob Storage is required for file uploads.');
         }
 
         // Attach uploaded file URL to request body using the field name
@@ -340,7 +327,7 @@ export const uploadLocationLogo = async (req: Request, res: Response, next: Next
       if (blobServiceClient) {
         fileUrl = await uploadToAzure(file, LOCATION_LOGOS_CONTAINER_NAME);
       } else {
-        fileUrl = saveToLocal(file, LOCATION_LOGOS_CONTAINER_NAME);
+        throw new Error('Azure Blob Storage is required for file uploads.');
       }
 
       // Attach uploaded file path to request body

src/middleware/uploadMiddleware.ts

@@ -13,7 +13,7 @@ export const LocationLogoSchemaCore = z.object({
   DisplayName: z.string().min(1, 'Display name is required'),
   LocationSlug: z.string().min(1, 'Location slug is required'),
   LocationName: z.string().min(1, 'Location name is required'),
-  LogoPath: z.string().min(1, 'Logo path is required'),
+  LogoPath: z.string().min(1, 'Logo is required'),
   Url: z.string().url('Must be a valid URL').min(1, 'URL is required'),
 });
 

src/schemas/locationLogoSchema.ts

@@ -35,6 +35,11 @@ export const SUPPORTED_RESOURCE_FILE_TYPES = {
 
   // Archives
   'application/zip': { extension: 'ZIP', description: 'ZIP Archive' },
+
+  // Images
+  'image/jpeg': { extension: 'JPG', description: 'JPEG Image' },
+  'image/jpg': { extension: 'JPG', description: 'JPEG Image' },
+  'image/png': { extension: 'PNG', description: 'PNG Image' },
 } as const;
 
 export const RESOURCE_FILE_ACCEPT_STRING = Object.keys(SUPPORTED_RESOURCE_FILE_TYPES).join(',');