Merge pull request #20 from call-0f-code/minor-changes

Minor changes

Author: Harish-Naruto

src/controllers/achievement.controller.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
 import * as achievementService from "../services/achievement.service";
-import { uploadImage } from "../utils/imageUtils";
+import { uploadImage, deleteImage } from "../utils/imageUtils";
 import { supabase } from "../app";
 import { ApiError } from "../utils/apiError";
 
@@ -80,10 +80,6 @@ export const updateAchievementById = async (req: Request, res: Response) => {
   const file = req.file;
   let imageUrl: string | undefined;
 
-  if (file) {
-    imageUrl = await uploadImage(supabase, file, 'achievements');
-  }
-
   let achievementData = req.body.achievementData;
   if (typeof achievementData === 'string') {
     try {
@@ -99,25 +95,30 @@ export const updateAchievementById = async (req: Request, res: Response) => {
     throw new ApiError("updatedById is required", 400);
   }
 
-  if (
-    !title &&
-    !description &&
-    !achievedAt &&
-    !imageUrl &&
-    (!Array.isArray(memberIds) || memberIds.length === 0)
-  ) {
-    throw new ApiError("At least one field must be provided for update", 400);
-  }
-
+  
   const existingAchievement = await achievementService.getAchievementById(achievementId);
   if (!existingAchievement) {
     throw new ApiError("Achievement not found", 404);
   }
-
+  
+  if (file) {
+    imageUrl = await uploadImage(supabase, file, 'achievements', existingAchievement.imageUrl );
+  }
+  
   if (imageUrl) {
     achievementData.imageUrl = imageUrl;
   }
-
+  
+    if (
+      !title &&
+      !description &&
+      !achievedAt &&
+      !imageUrl &&
+      (!Array.isArray(memberIds) || memberIds.length === 0)
+    ) {
+      throw new ApiError("At least one field must be provided for update", 400);
+    }
+    
   const updatedAchievement = await achievementService.updateAchievementById(
     achievementId,
     achievementData
@@ -141,6 +142,15 @@ export const deleteAchievementById = async (req: Request, res: Response) => {
     throw new ApiError("Invalid achievement ID", 400);
   }
 
+  const existingAchievement = await achievementService.getAchievementById(achievementId);
+  if (!existingAchievement) {
+    throw new ApiError("Achievement not found", 404);
+  }
+
+  if (existingAchievement.imageUrl) {
+    await deleteImage(supabase, existingAchievement.imageUrl);
+  }
+
   await achievementService.deleteAchievementById(achievementId);
 
   res.status(200).json({

src/controllers/project.controller.ts

@@ -1,7 +1,7 @@
 import * as projectService from "../services/project.service";
 import { Request, Response } from "express";
 import { ApiError } from "../utils/apiError";
-import { uploadImage } from "../utils/imageUtils";
+import { deleteImage, uploadImage } from "../utils/imageUtils";
 import { supabase } from "../app";
 
 
@@ -16,20 +16,16 @@ export const getProjects = async (req: Request, res: Response) => {
 
 export const getProjectById = async (req: Request, res: Response) => {
 
-
   const projectId = parseInt(req.params.projectId);
-
   if (isNaN(projectId)) throw new ApiError("Invalid project ID", 400);
 
   const project = await projectService.getProjectById(projectId);
   res.status(200).json(project);
 
-
 };
 
 export const createProject = async (req: Request, res: Response) => {
 
-
   const file = req.file;
   if (!file) throw new ApiError('Image file not found', 400);
 
@@ -43,7 +39,7 @@ export const createProject = async (req: Request, res: Response) => {
     name: req.body.projectData.name,
     imageUrl: imageUrl,
     githubUrl: req.body.projectData.githubUrl,
-    deployUrl: req.body.deployUrl,
+    deployUrl: req.body.projectData.deployUrl,
     AdminId: req.body.projectData.adminId,
   };
 
@@ -54,24 +50,27 @@ export const createProject = async (req: Request, res: Response) => {
 
 export const updateProjects = async (req: Request, res: Response) => {
 
-
   const projectInfo = req.body.projectData;
   const projectId = parseInt(req.params.projectId);
   const updatedById = projectInfo.updatedById;
 
   let imageUrl = null;
   const file = req.file;
+  if( !projectId ) throw new ApiError("ProjectId is missng !!!" , 401);
 
-  if (file) {
-    imageUrl = await uploadImage(supabase, file, 'projects');
+  if ( file ) {
+    const response = await projectService.getProjectById(projectId);
+    const fileUlr = response?.imageUrl;
+    if( !fileUlr ) throw new ApiError("File is not exits");
+    imageUrl = await uploadImage(supabase, file, 'projects' , fileUlr);
   }
 
   if (imageUrl) {
     projectInfo.imageUrl = imageUrl;
   }
 
 
-  if (!projectId || projectInfo.length === 0 || !updatedById) throw new ApiError(" Something is Mising ", 400);
+  if ( projectInfo.length === 0 || !updatedById) throw new ApiError(" Something is Mising ", 400);
 
   const project = await projectService.updateProjects(projectInfo, projectId);
   res.status(200).json(project)
@@ -86,6 +85,13 @@ export const deleteProjects = async (req: Request, res: Response) => {
   const projectId = parseInt(req.params.projectId);
   if (!projectId) throw new ApiError(" Send The project id ", 400);
 
+  const response = await projectService.getProjectById(projectId);
+  const fileUrl = response?.imageUrl;
+
+  if(fileUrl){
+      await deleteImage(supabase , fileUrl);
+  }
+
   const deleted = await projectService.deleteProjects(projectId);
   res.status(200).json(deleted)
 

src/routes/index.ts

@@ -11,7 +11,6 @@ import membersRouter from './members'
 
 export default function routes(upload: Multer, supabase: SupabaseClient) {
   const router = Router();
-
   router.use('/members', membersRouter(upload, supabase))
 
   router.use('/projects', projectsRouter(upload, supabase))