Merge https://github.com/call-0f-code/COC-API into minor-fixes

Author: shrutiiiyet

bun.lock

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Member" ALTER COLUMN "passoutYear" DROP NOT NULL;

prisma/migrations/20250727111821_passoutyear_optional/migration.sql

@@ -26,7 +26,7 @@ model Member {
   leetcode      String?
   codechef      String?
   codeforces    String?
-  passoutYear   DateTime
+  passoutYear   DateTime?
   isApproved    Boolean  @default(false)
   isManager     Boolean  @default(false)
   createdAt     DateTime @default(now())

prisma/schema.prisma

@@ -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";
 
@@ -73,19 +73,16 @@ export const createAchievement = async (req: Request, res: Response) => {
 
 export const updateAchievementById = async (req: Request, res: Response) => {
   const achievementId = parseInt(req.params.achievementId);
+
   if (!achievementId || isNaN(achievementId)) {
     throw new ApiError("Invalid achievement ID", 400);
   }
 
   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') {
+  if (typeof achievementData === "string") {
     try {
       achievementData = JSON.parse(achievementData);
     } catch (e) {
@@ -99,28 +96,31 @@ 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);
+  }
+
+  const { memberIds: _, ...updatePayload } = achievementData;
+
   if (imageUrl) {
-    achievementData.imageUrl = imageUrl;
+    updatePayload.imageUrl = imageUrl;
+  }
+
+  const hasSomethingToUpdate =
+    title || description || achievedAt || imageUrl || (Array.isArray(memberIds) && memberIds.length > 0);
+
+  if (!hasSomethingToUpdate) {
+    throw new ApiError("At least one field (title, description, achievedAt, image, or memberIds) must be provided for update", 400);
   }
 
   const updatedAchievement = await achievementService.updateAchievementById(
     achievementId,
-    achievementData
+    updatePayload
   );
 
   if (Array.isArray(memberIds) && memberIds.length > 0) {
@@ -141,6 +141,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/achievement.controller.ts

@@ -7,9 +7,9 @@ import { SupabaseClient } from "@supabase/supabase-js";
 // List all approved members
 export const listAllApprovedMembers = async (req: Request, res: Response) => {
 
-  const {email, password} = req.query;
+  const {email} = req.query;
 
-  if(email && password) {
+  if(email) {
 
     const user = await memberService.getUserByEmail(email as string);
 

src/controllers/member.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/controllers/project.controller.ts

@@ -1,6 +1,5 @@
 import express from 'express';
 import * as acheivementsCtrl from '../controllers/achievement.controller';
-import { supabase } from '../app';
 import { Multer } from 'multer';
 import { SupabaseClient } from '@supabase/supabase-js';
 

src/routes/achievements.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))

src/routes/index.ts

@@ -1,7 +1,6 @@
 import express from "express";
 import * as memberCtrl from "../controllers/member.controller";
 import { Multer } from "multer";
-import { supabase } from "../app";
 import { SupabaseClient } from "@supabase/supabase-js";
 
 export default function membersRouter(

src/routes/members.ts

@@ -15,8 +15,17 @@ export default function progressRouter() {
    * @apiParam {String} memberId ID of the member to retrieve completed questions for.
    *
    * @apiSuccess {String="SUCCESS"} status Response status.
-   * @apiSuccess {Object[]} completedQuestion List of completed questions.
-   * @apiSuccess {Number} completedQuestion.questionId Id of the completed question.
+   * @apiSuccess {Object[]} completedQuestion List of questions inside the topic.
+   * @apiSuccess {Object} completedQuestion[].question Question object.
+   * @apiSuccess {Number} completedQuestion[].question.id Question ID.
+   * @apiSuccess {String} completedQuestion[].question.questionName Name of the question.
+   * @apiSuccess {String} completedQuestion[].question.link Link to the question.
+   * @apiSuccess {String="Easy","Medium","Hard"} completedQuestion[].question.difficulty Difficulty level of the question.
+   * @apiSuccess {Number} completedQuestion[].question.topicId Topic ID associated with the question.
+   * @apiSuccess {Number} completedQuestion[].question.createdAt Timestamp when the question was created (Unix timestamp).
+   * @apiSuccess {Number} completedQuestion[].question.updatedAt Timestamp when the question was last updated (Unix timestamp).
+   * @apiSuccess {String} completedQuestion[].question.createdById ID of the user who created the question.
+   * @apiSuccess {String} completedQuestion[].question.updatedById ID of the user who last updated the question.
    *
    * @apiError (Error 400) BadRequest Missing required fields.
    * @apiError (Error 500) InternalServerError Error while fetching completed questions.
@@ -38,7 +47,7 @@ export default function progressRouter() {
    * @apiError (Error 500) InternalServerError Error while toggling question completion.
    */
   router.patch(
-    "/:memeberId/questions/:questionId/completed/toggle",
+    "/:memberId/questions/:questionId/completed/toggle",
     toggleQuestions,
   );