Merge pull request #8 from call-0f-code/project-routes

Project routes

Author: Harish-Naruto

bun.lock

@@ -32,6 +32,7 @@
   "devDependencies": {
     "@eslint/js": "^9.31.0",
     "@types/bun": "latest",
+    "@types/jest": "^30.0.0",
     "@typescript-eslint/eslint-plugin": "^8.36.0",
     "@typescript-eslint/parser": "^8.36.0",
     "eslint": "^9.31.0",
@@ -51,7 +52,6 @@
     "@supabase/supabase-js": "^2.50.5",
     "@types/cors": "^2.8.19",
     "@types/express": "^5.0.3",
-    "@types/jest": "^30.0.0",
     "@types/multer": "^2.0.0",
     "@types/node": "^24.0.13",
     "@types/uuid": "^10.0.0",

package.json

@@ -0,0 +1,13 @@
+-- Check for nulls before altering
+DO $$
+BEGIN
+    IF EXISTS (SELECT 1 FROM "Project" WHERE "imageUrl" IS NULL OR "githubUrl" IS NULL) THEN
+        RAISE EXCEPTION 'Migration aborted: Some rows in "Project" have NULL in "imageUrl" or "githubUrl"';
+    END IF;
+END
+$$;
+
+-- AlterTable safely
+ALTER TABLE "Project"
+  ALTER COLUMN "imageUrl" SET NOT NULL,
+  ALTER COLUMN "githubUrl" SET NOT NULL;

prisma/migrations/20250719123800_image_url_githuburk_make_complusory/migration.sql

@@ -102,8 +102,8 @@ model MemberAchievement {
 model Project {
   id        Int     @id @default(autoincrement())
   name      String
-  imageUrl  String?
-  githubUrl String?
+  imageUrl  String
+  githubUrl String
   deployUrl String?
 
   // Audit fields

prisma/schema.prisma

@@ -1,107 +1,144 @@
 import * as projectService from "../services/project.service";
 import { Request, Response } from "express";
 import { ApiError } from "../utils/apiError";
+import { uploadImage } from "../utils/imageUtils";
+import { supabase } from "../app";
+
 
 export const getProjects = async (req: Request, res: Response) => {
-  try {
-    const projects = await projectService.getPrjects();
-    res.json(projects);
-  } catch (error) {
-    throw new ApiError("No project found !!!", 404);
-  }
+
+
+  const projects = await projectService.getProjects();
+  res.status(200).json(projects);
+
 };
 
+
 export const getProjectById = async (req: Request, res: Response) => {
-  try {
-    const projectId = parseInt(req.params.projectId);
-    const project = await projectService.getProjectById(projectId);
-    res.json(project);
-  } catch (error) {
-    throw new ApiError("No project with this ID", 404);
-  }
+
+
+  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) => {
-  try {
-    const projectContent = {
-      name: req.body.name,
-      imageUrl: req.body.imageUrl,
-      githubUrl: req.body.githubUrl,
-      deployUrl: req.body.deployUrl,
-      adminId: req.AdminId,
-    };
-
-    const project = await projectService.createProject(projectContent);
-    res.json(project);
-  } catch (error) {
-    throw new ApiError(error as string, 404);
-  }
+
+
+  const file = req.file;
+  if (!file) throw new ApiError('Image file not found', 400);
+
+  const imageUrl = await uploadImage(supabase, file, 'projects');
+
+  if (!imageUrl) throw new ApiError("Image url is missing", 400);
+
+  if (!req.body.projectData.name || !req.body.projectData.githubUrl) throw new ApiError(" fiels is missing ", 400);
+
+  const projectContent = {
+    name: req.body.projectData.name,
+    imageUrl: imageUrl,
+    githubUrl: req.body.projectData.githubUrl,
+    deployUrl: req.body.deployUrl,
+    AdminId: req.body.projectData.adminId,
+  };
+
+  const project = await projectService.createProject(projectContent);
+  res.status(200).json(project);
+
 };
 
 export const updateProjects = async (req: Request, res: Response) => {
-  try {
-    const projectInfo = req.body;
-    const projectId = parseInt(req.params.projectId);
-    if (!projectId) throw new ApiError(" Send The project id ", 401);
-
-    const project = await projectService.updateProjects(projectInfo, projectId);
-    res.json(project);
-  } catch (error) {
-    throw new ApiError(error as string, 404);
+
+
+  const projectInfo = req.body.projectData;
+  const projectId = parseInt(req.params.projectId);
+  const updatedById = projectInfo.updatedById;
+
+  let imageUrl = null;
+  const file = req.file;
+
+  if (file) {
+    imageUrl = await uploadImage(supabase, file, 'projects');
   }
-};
 
-export const deleteProjects = async (req: Request, res: Response) => {
-  try {
-    const projectId = parseInt(req.params.projectId);
-    if (!projectId) throw new ApiError(" Send The project id ", 401);
-
-    const deleted = await projectService.deleteProjects(projectId);
-    res.json(deleted);
-  } catch (error) {
-    console.log(error);
-    throw new ApiError(error as string, 404);
+  if (imageUrl) {
+    projectInfo.imageUrl = imageUrl;
   }
-};
+
+
+  if (!projectId || projectInfo.length === 0 || !updatedById) throw new ApiError(" Something is Mising ", 400);
+
+  const project = await projectService.updateProjects(projectInfo, projectId);
+  res.status(200).json(project)
+
+
+}
+
+
+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 deleted = await projectService.deleteProjects(projectId);
+  res.status(200).json(deleted)
+
+
+
+}
 
 export const getMembersByProjectId = async (req: Request, res: Response) => {
-  try {
-    const projectId = parseInt(req.params.ProjectId);
 
-    if (!projectId) throw new ApiError(" Project Id required !!! ", 401);
 
-    const members = await projectService.getMembersByProjectId(projectId);
-    res.json(members);
-  } catch (error) {
-    throw new ApiError(error as string, 404);
-  }
-};
+  const projectId = parseInt(req.params.projectId);
+  if (!projectId) throw new ApiError(" Project Id required !!! ", 400);
+
+  const members = await projectService.getMembersByProjectId(projectId);
+  res.status(200).json(members)
+
+
+
+
+}
 
 export const addMembers = async (req: Request, res: Response) => {
-  try {
-    const data = {
-      projectId: parseInt(req.params.projectId),
-      memberId: req.body.memberId,
-    };
-
-    const member = await projectService.addMembers(data);
-    res.json(member);
-  } catch (error) {
-    console.log(error);
-    throw new ApiError(error as string, 404);
-  }
-};
+
+
+  const projectId = parseInt(req.params.projectId);
+  const memberData = req.body.memberId;
+  if (!projectId || !memberData || memberData.length === 0) throw new ApiError(" field is missing ", 400);
+
+  const data = memberData.map((memberId: string) => ({
+    projectId,
+    memberId
+  }))
+
+  const member = await projectService.addMembers(data);
+  res.status(200).json(member);
+
+
+}
+
 
 export const removeMembers = async (req: Request, res: Response) => {
-  try {
-    const data = {
-      projectId: parseInt(req.params.projectId),
-      memberId: req.body.memberId,
-    };
-
-    const removedMember = await projectService.removeMembers(data);
-    res.json(removedMember);
-  } catch (error) {
-    throw new ApiError(error as string, 404);
+
+
+  const data = {
+    projectId: parseInt(req.params.projectId),
+    memberId: req.params.memberId
   }
-};
+
+  if (!data.projectId || !data.memberId) throw new ApiError(' Field is missing !!!', 400);
+
+  const removedMember = await projectService.removeMembers(data);
+  res.status(200).json(removedMember);
+
+
+}
+

src/controllers/project.controller.ts

@@ -16,6 +16,7 @@ export const getQuestionByTopicId = async (req: Request, res: Response) => {
   });
 };
 
+
 export const addQuestion = async (req: Request, res: Response) => {
   const topicId = parseInt(req.params.topicId);
   const { questionName, difficulty, link } = req.body;

src/controllers/question.controller.ts

@@ -18,42 +18,12 @@ export default function routes(upload: Multer, supabase: SupabaseClient) {
 
   router.use('/interviews', interviewRouter(upload, supabase));
 
-  
   router.use('/topics',topicRouter());
 
-  router.use("/projects", projectsRouter(upload, supabase));
-
-  router.use("/topics", topicRouter());
-
   router.use("/questions", quetionsRouter());
 
   router.use("/progress", progressRouter());
 
   return router;
 }
 
-/*
-write your routes like this, skip the paramaeters in the exported function if your routes don't need supabase and multer
-
-import { Router } from 'express'
-import { Multer } from 'multer'
-import * as memberCtrl from '../controllers/member.controller'
-import { SupabaseClient } from '@supabase/supabase-js'
-
-export default function membersRouter(
-  upload: Multer,
-  supabase: SupabaseClient
-) {
-  const router = Router()
-
-  // Photo upload endpoint:
-  router.post(
-    '/:memberId/photo',
-    upload.single('photo'),
-    (req, res, next) => memberCtrl.uploadPhoto(req, res, next, supabase)
-  )
-
-  return router
-}
-
-*/