Merge pull request #32 from call-0f-code/main

updating prod

Author: callofcode07

src/controllers/member.controller.ts

@@ -1,15 +1,15 @@
 import { Request, Response } from "express";
 import * as memberService from "../services/member.service";
 import { ApiError } from "../utils/apiError";
-import { deleteImage, uploadImage } from "../utils/imageUtils";
+import { uploadImage } from "../utils/imageUtils";
 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);
 
@@ -58,10 +58,10 @@ export const createAMember =
     const user = await memberService.createMember(
       email,
       name,
+      provider,
       password,
       passoutYear,
       imageUrl,
-      provider,
     );
 
     if (!user) throw new ApiError("Error creating user", 500);
@@ -72,29 +72,31 @@ export const createAMember =
 // Update an existing member
 export const updateAMember =
   (supabase: SupabaseClient) => async (req: Request, res: Response) => {
-    const { memberId } = req.params;
+
+   const { memberId } = req.params;
 
     if(!memberId) throw new ApiError("No memberId provided", 400);
 
-    const body = req.body;
+    const parsedBody = JSON.parse(req.body.memberData);
+    let imageUrl: undefined | string;
 
     if (req.file) {
       const oldData = await memberService.getDetails(memberId);
       const oldImage = oldData?.profilePhoto;
 
       if(oldImage) await uploadImage(supabase, req.file, "members", oldImage);
-
-      const imageUrl = await uploadImage(supabase, req.file, "members");
-      body.profilePhoto = imageUrl;
+      else imageUrl = await uploadImage(supabase, req.file, "members");
     }
+    if (imageUrl) parsedBody.profilePhoto = imageUrl;
 
-    await memberService.updateMember(memberId, body);
+    await memberService.updateMember(memberId, parsedBody);
 
     const updatedData = await memberService.getDetails(memberId);
     res
       .status(200)
       .json({ success: true, user: updatedData });
-  };
+};
+
 
 // Get all unapproved members
 export const getUnapprovedMembers = async (req: Request, res: Response) => {

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

src/services/member.service.ts

@@ -11,9 +11,6 @@ export const getUserByEmail = async(email: string) => {
       isApproved: true,
       isManager: true,
       accounts: {
-        where: {
-          provider: 'credentials',
-        },
         select: {
           password: true
         }
@@ -42,9 +39,9 @@ export const createMember = async (
   email: string,
   name: string,
   provider: "google" | "github" | "credentials",
+  password?: string,
   passoutYear?: number,
   imageUrl?: string,
-  password?: string
 ) => {
   const newMember = await prisma.member.create({
     data: {

src/types/members.d.ts

@@ -15,7 +15,5 @@ declare global {
     leetcode?: string;
     codechef?: string;
     codeforces?: string;
-    isApproved?: boolean;
-    approvedBy?: string;
   }
-}
+}

tests/Member.test.ts

@@ -3,7 +3,7 @@ import { createAMember, updateAMember } from '../src/controllers/member.controll
 import * as memberService from '../src/services/member.service';
 import { ApiError } from '../src/utils/apiError';
 import { SupabaseClient } from '@supabase/supabase-js';
-import { uploadImage, deleteImage } from '../src/utils/imageUtils';
+import { uploadImage } from '../src/utils/imageUtils';
 
 jest.mock('../src/db/client', () => ({
   prisma: {
@@ -71,7 +71,7 @@ describe('Member Controller - updateAMember', () => {
   it('should update member and return updated data (no image)', async () => {
     const req = {
       params: { memberId: 'abc-123' },
-      body: { github: 'https://github.com/shrutii' },
+      body: { memberData: JSON.stringify({ github: 'https://github.com/shrutii' })  },
       file: undefined,
     } as unknown as Request;
 
@@ -106,7 +106,7 @@ describe('Member Controller - updateAMember', () => {
     const handler = updateAMember(mockSupabase);
     await handler(req, res);
 
-    expect(spyUpdate).toHaveBeenCalledWith('abc-123', req.body);
+    expect(spyUpdate).toHaveBeenCalledWith('abc-123', { github: 'https://github.com/shrutii' });
     expect(spyGet).toHaveBeenCalledTimes(1);
     expect(res.status).toHaveBeenCalledWith(200);
     expect(res.json).toHaveBeenCalledWith({
@@ -118,7 +118,7 @@ describe('Member Controller - updateAMember', () => {
   it('should upload new image, handle old image, update member, and return updated data', async () => {
     const req = {
       params: { memberId: 'abc-123' },
-      body: {},
+      body: { memberData: JSON.stringify({}) },
       file: { buffer: Buffer.from('fake-image-data') },
     } as unknown as Request;
 
@@ -153,7 +153,6 @@ describe('Member Controller - updateAMember', () => {
     };
 
     (uploadImage as jest.Mock)
-      .mockResolvedValueOnce(undefined) 
       .mockResolvedValueOnce('https://new.url/image.png'); 
 
     jest.spyOn(memberService, 'getDetails')
@@ -167,23 +166,16 @@ describe('Member Controller - updateAMember', () => {
     const handler = updateAMember(mockSupabase);
     await handler(req, res);
 
-    expect(uploadImage).toHaveBeenNthCalledWith(
-      1,
+    expect(uploadImage).toHaveBeenCalledWith(
       mockSupabase,
       req.file,
       'members',
       'https://old.url/image.png'
     );
 
-    expect(uploadImage).toHaveBeenNthCalledWith(
-      2,
-      mockSupabase,
-      req.file,
-      'members'
-    );
 
     expect(spyUpdate).toHaveBeenCalledWith('abc-123', {
-      profilePhoto: 'https://new.url/image.png',
+
     });
 
     expect(res.status).toHaveBeenCalledWith(200);
@@ -192,4 +184,4 @@ describe('Member Controller - updateAMember', () => {
       user: updatedMember,
     });
   });
-});
+});