Merge branch 'main' of https://github.com/call-0f-code/COC-API into Acheivements-Routes

Author: Sherin-2711

.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/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

@@ -1,12 +1,12 @@
 import { Router } from 'express'
 import { Multer } from 'multer'
 import { SupabaseClient } from '@supabase/supabase-js'
-// import membersRouter from './members'
 import projectsRouter from './projects'
 import acheivementsRouter from './achievements'
 import interviewRouter from './interviews'
-
-// 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()
@@ -17,6 +17,13 @@ export default function routes(upload: Multer, supabase: SupabaseClient) {
   router.use('/achievements' ,acheivementsRouter(upload, supabase));
   router.use('/interviews', interviewRouter(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
 }

src/routes/progress.ts

@@ -1,81 +1,40 @@
 import { Router } from 'express'
-import { Multer } from 'multer'
-import { SupabaseClient } from '@supabase/supabase-js'
-import {
-    addMembers,
-    createProject,
-    deleteProjects,
-    getMembersByProjectId,
-    getProjectById,
-    getProjects,
-    removeMembers,
-    updateProjects
-} from '../controllers/project.controller'
+import { getCompletedQuestion, toggleQuestions } from '../controllers/progress.controller'
 
-
-
-export default function projectsRouter(
-    upload: Multer,
-    supabase: SupabaseClient
-) {
+export default function progressRouter() {
     const router = Router()
-
-    //   Getting all User
-    router.get(
-        '/',
-        getProjects
-    )
-
-    //  get Project by Id
-    router.get(
-        '/:projectId',
-        getProjectById
-    )
-
-    //  Create project
-    router.post(
-        '/',
-        createProject
-    )
-
-    //  Update Project
-    router.patch(
-        '/:projectId',
-        updateProjects
-    )
-
-    //  delete projects
-    router.delete(
-        '/:projectId',
-        deleteProjects
-    )
-
-    //  getMember by ProjectId
-
-    router.get(
-        '/:projectId/members',
-        getMembersByProjectId
-    )
-
-    //  add member to project
-    router.post(
-        '/:projectId/members',
-        addMembers
-    )
-
-    //  Remover the memnber
-    router.delete(
-        '/:projectId/members/:memberId',
-        removeMembers
-    )
-
-    // Photo upload endpoint:
-    //   router.post(
-    //     '/:projectId/photo',
-    //     upload.single('photo'),
-    //     (req, res, next) => memberCtrl.uploadPhoto(req, res, next, supabase)
-    //   )
-
+    
+    /**
+     * @api {get} /progress/:memberId/completed-questions Get Completed Questions
+     * @apiName GetCompletedQuestions
+     * @apiGroup Progress
+     * 
+     * @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.
+     * 
+     * @apiError (Error 400) BadRequest Missing required fields.
+     * @apiError (Error 500) InternalServerError Error while fetching completed questions.
+     * 
+     */
+    router.get('/:memberId/completed-questions',getCompletedQuestion);
+
+    /**
+     * @api {patch} /progress/:memberId/questions/:questionId/completed/toggle Toggle Question Completion
+     * @apiName ToggleQuestionCompletion
+     * @apiGroup Progress
+     * 
+     * @apiParam {String} memberId ID of the member to toggle question completion for.
+     * @apiParam {Number} questionId ID of the question to toggle completion for.
+     * 
+     * @apiSuccess {String="SUCCESS"} status Response status.
+     * 
+     * @apiError (Error 400) BadRequest Missing required fields.
+     * @apiError (Error 500) InternalServerError Error while toggling question completion.
+     */
+    router.patch('/:memeberId/questions/:questionId/completed/toggle',toggleQuestions);
 
     return router
 }