resolve the conflicts

Author: samrth07

.github/workflows/tests.yml

@@ -30,6 +30,9 @@ jobs:
 
       - name: Install dependencies
         run: bun install
+        
+      - name: Generate Prisma client
+        run: bun run generate
 
       - name: Run tests
         run: bun jest

src/controllers/progress.controller.ts

@@ -0,0 +1,31 @@
+import { Request, Response } from "express";
+import { ApiError } from "../utils/apiError";
+import * as progressServices from "../services/progress.service"
+
+export const getCompletedQuestion = async(req:Request,res:Response)=>{
+    const memberId = req.params.memberId;
+    if(!memberId){
+        throw new ApiError("required field is missing",400);
+    }
+
+    const completedQuestion = await progressServices.getCompletedQuestion(memberId);
+    res.status(200).json({
+        status:"SUCCESS",
+        completedQuestion
+    })
+
+}
+
+export const toggleQuestions = async(req:Request,res:Response) =>{
+    const memberId = req.params.memberId;
+    const questionId = parseInt(req.params.questionId);
+    if(!memberId || !questionId){
+        throw new ApiError("required field is missing",400);
+    }
+   
+    await progressServices.markQuestion(questionId,memberId);
+    res.status(200).json({
+        status:"SUCCESS",
+    })
+    
+}

src/controllers/project.controller.ts

@@ -7,33 +7,29 @@ import { supabase } from "../app";
 
 export const getProjects = async ( req : Request , res : Response ) => {
 
-        try {
+        
                 const projects = await projectService.getProjects();
                 res.status(200).json(projects);
-        } catch (error) {          
-           res.status(500).json({ error: "Failed to fetch projects" });
-        }
+        
 };
 
 
 export const getProjectById = async ( req : Request , res : Response ) => {
 
-        try{
+      
             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);
 
-        }catch(error){
-                throw new ApiError("No project with this ID" , 500);
-        }
+        
 };
 
 export const createProject = async ( req : Request , res : Response ) => {
 
-        try {
+      
                 const file = req.file;
                 if(!file) throw new ApiError('Image file not found' , 400); 
 
@@ -54,14 +50,11 @@ export const createProject = async ( req : Request , res : Response ) => {
                 const project = await projectService.createProject( projectContent );
                 res.status(200).json(project); 
 
-        } catch (error) {
-                throw new ApiError( error as string , 500);
-        }
 };
 
 export const updateProjects = async ( req : Request , res : Response ) => {
 
-        try {
+       
             const projectInfo = req.body.projectData;
             const projectId = parseInt(req.params.projectId);
             const updatedById = projectInfo.updatedById;
@@ -83,47 +76,40 @@ export const updateProjects = async ( req : Request , res : Response ) => {
              const project = await projectService.updateProjects( projectInfo  , projectId );
              res.status(200).json(project)
 
-        } catch (error) {
-            throw new ApiError(error as string , 500);
-        }
+        
 }
 
 
 export const deleteProjects = async ( req : Request , res : Response ) => {
 
-    try {
+   
              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)
 
-    } catch (error) {
-            throw new ApiError( error as string , 500);
-    }
+   
 
 }
 
 export const getMembersByProjectId = async ( req : Request , res : Response ) => {
 
-    try {
+   
                 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)
 
-    } 
-    catch (error) {
-                     throw new ApiError( error as string , 500);
-    }
+    
 
 
 }
 
 export const addMembers = async ( req : Request , res : Response ) => {
 
-    try {
+   
                 const  projectId = parseInt( req.params.projectId );
                 const memberData = req.body.memberId;
                 if( !projectId || !memberData ||  memberData.length === 0) throw new ApiError(" field is missing " , 400);
@@ -136,15 +122,13 @@ export const addMembers = async ( req : Request , res : Response ) => {
              const member = await projectService.addMembers( data );
             res.status(200).json(member);
 
-    } catch (error) {
-          throw new ApiError( error as string , 500);
-    }
+    
 }
 
 
 export const removeMembers = async ( req : Request , res : Response ) => {
 
-        try {
+        
                 const data = {
                 projectId : parseInt ( req.params.projectId ),
                 memberId :  req.params.memberId 
@@ -155,8 +139,6 @@ export const removeMembers = async ( req : Request , res : Response ) => {
         const removedMember  = await projectService.removeMembers(data);
         res.status(200).json( removedMember );
 
-        } catch (error) {
-                 throw new ApiError( error as string , 500);
-        }
+        
 }
 

src/controllers/question.controller.ts

@@ -0,0 +1,100 @@
+import { Request, Response } from 'express'
+import * as questionServices from '../services/question.service'
+import { ApiError } from '../utils/apiError';
+
+
+export const getQuestionByTopicId = async (req: Request, res: Response) => {
+    const topicId = parseInt(req.params.topicId);
+    if (!topicId) {
+        throw new ApiError("required field missing", 400);
+    }
+    
+    const questions = await questionServices.getQuestionByTopicId(topicId);
+
+    res.status(200).json({
+        status: "SUCCESS",
+        questions
+    })
+
+
+}
+
+export const addQuestion = async (req: Request, res: Response) => {
+
+    const topicId = parseInt(req.params.topicId);
+    const { questionName, difficulty, link } = req.body
+    const adminId = req.body.adminId;
+
+    if (!questionName || !difficulty || !link || !adminId || !topicId) {
+        throw new ApiError("required field missing", 400);
+    }
+
+    const question = await questionServices.addQuestionByTopicId(adminId, topicId, link, difficulty, questionName);
+    res.status(201).json({
+        status: "SUCCESS",
+        question
+    })
+
+
+}
+
+export const getQuestionByQuestionId = async (req: Request, res: Response) => {
+    const questionId = parseInt(req.params.questionId);
+    if (!questionId) {
+        throw new ApiError("required field missing", 400);
+    }
+
+    const question = await questionServices.getQuestionByQuestionId(questionId);
+
+    if (!question) {
+        throw new ApiError("No question found with this ID", 404);
+    }
+    res.status(200).json({
+        status: "SUCCESS",
+        question
+    })
+
+
+
+}
+
+
+export const updateQuestion = async (req: Request, res: Response) => {
+    const questionId = parseInt(req.params.questionId);
+
+    const adminId = req.body.adminId;
+    const questionData: questionData = req.body.questionData;
+
+    if (!questionData || JSON.stringify(questionData) === "{}" || !adminId) {
+        throw new ApiError("required field missing", 400);
+    }
+    questionData.updatedById = adminId;
+
+    const question = await questionServices.updateQuestion(questionData, questionId);
+
+    if (!question) {
+        throw new ApiError("No question found with this ID", 404);
+    }
+
+    res.status(200).json({
+        status: "SUCCESS",
+        question
+    })
+
+}
+
+export const deleteQuestion = async (req: Request, res: Response) => {
+    const questionId = parseInt(req.params.questionId);
+    if (!questionId) {
+        throw new ApiError("required field missing ", 400);
+    }
+
+
+    await questionServices.deleteQuestion(questionId);
+
+    res.status(200).json({
+        status: "SUCCESS"
+    })
+
+}
+

src/controllers/topic.controller.ts

@@ -0,0 +1,60 @@
+import { Request, Response } from 'express'
+import * as topicServices from '../services/topic.service'
+import { ApiError } from '../utils/apiError';
+
+
+export const getTopics = async (req: Request, res: Response) => {
+
+    const topics = await topicServices.getTopics();
+
+    res.status(201).json(topics)
+
+}
+
+
+
+export const createTopic = async (req: Request, res: Response) => {
+    const { title, description } = req.body
+
+    const adminId = req.body.adminId
+    if (!title || !description || !adminId) {
+        throw new ApiError("missing required fields", 400);
+    }
+    const topic = await topicServices.createTopics(title, description, adminId);
+    res.status(201).json(topic);
+
+}
+
+
+
+export const updateTopic = async (req: Request, res: Response) => {
+    const topicId = parseInt(req.params.topicId);
+
+    const adminId = req.body.adminId
+
+    const updateData: topicData = req.body.updateData
+
+    if (!updateData || JSON.stringify(updateData) === '{}' || !adminId) {
+        throw new ApiError("missing required fields", 400);
+    }
+
+
+    const updatedTopic = await topicServices.updateTopic(topicId, updateData, adminId);
+    res.status(200).json(updatedTopic)
+
+
+}
+
+export const deleteTopic = async (req: Request, res: Response) => {
+    const topicId = parseInt(req.params.topicId);
+    if (!topicId) {
+        throw new ApiError("missing required fields", 400);
+    }
+
+    await topicServices.deleteTopic(topicId);
+    res.status(200).json({
+        status: "SUCCESS"
+    })
+
+}
+

src/routes/index.ts

@@ -3,14 +3,22 @@ import { Multer } from 'multer'
 import { SupabaseClient } from '@supabase/supabase-js'
 // import membersRouter from './members'
 import projectsRouter from './projects'
-// bakiche tumhi import kara mala kantala ala
+import topicRouter from './topics'
+import quetionsRouter from './questions'
+import progressRouter from './progress'
 
 export default function routes(upload: Multer, supabase: SupabaseClient) {
   const router = Router()
 
   // router.use('/members', membersRouter(upload, supabase))
   router.use('/projects', projectsRouter(upload, supabase))
-  // … mount other routers, just write xyzRouter() if the routes in that router don't need multer or supabase
+  
+  router.use('/topics',topicRouter());
+
+  router.use('/questions',quetionsRouter());
+
+  router.use('/progress',progressRouter());
+  
 
   return router
 }