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

Author: Sherin-2711

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

@@ -6,10 +6,27 @@ import { SupabaseClient } from "@supabase/supabase-js";
 
 // List all approved members
 export const listAllApprovedMembers = async (req: Request, res: Response) => {
+  
+  const {email, password} = req.query;
+
+  if(email && password) {
+
+    const user = await memberService.getUserByEmail(email as string);
+
+    if(!user) throw new ApiError('Incorrect email or password', 400);
+
+    res.status(200).json({
+      success: true,
+      user
+    })
+  }
+  else {  
   const user = await memberService.approvedMembers();
   res
     .status(200)
-    .json({ user, success: true, message: "Fetched approved users" });
+    .json({ user, success: true });
+  }
+
 };
 
 // Get details of a single user
@@ -27,7 +44,7 @@ export const getUserDetails = async (req: Request, res: Response) => {
 // Create a new member
 export const createAMember =
   (supabase: SupabaseClient) => async (req: Request, res: Response) => {
-    const { email, name, password, passoutYear } = req.body;
+    const {email, name, password, passoutYear, provider} = req.body;
 
     if (!email || !name || !password || !passoutYear) {
       throw new ApiError("Required fields absent", 400);
@@ -44,6 +61,7 @@ export const createAMember =
       password,
       passoutYear,
       imageUrl,
+      provider,
     );
 
     if (!user) throw new ApiError("Error creating user", 500);

src/controllers/member.controller.ts

@@ -11,7 +11,7 @@ export default function membersRouter(
   const router = express.Router();
 
   /**
-   * @api {get} /members/details/:memberId Get a member's details
+   * @api {get} /members/:memberId Get a member's details
    * @apiName GetUserDetails
    * @apiGroup Member
    *
@@ -23,11 +23,21 @@ export default function membersRouter(
   router.get("/:memberId", memberCtrl.getUserDetails);
 
   /**
-   * @api {get} /members List all approved members
+   * @api {get} /members List all approved members or get member by email
    * @apiName ListAllApprovedMembers
    * @apiGroup Member
    *
-   * @apiSuccess {Object[]} user List of approved members.
+   *  @apiDescription
+   * - Returns a list of all approved members if no email query parameter is provided.
+   * - If `email` query parameter is provided, returns the member associated with that email.
+   *
+   *  @apiQuery {String} [email] Optional email to fetch a specific member.
+   *
+   * @apiSuccess {Object} user Single user object when email provided.
++  * @apiSuccess {Object[]} user Array of approved members when no email provided.
+   * @apiSuccess {String} [message] Message in case of full list fetch.
+   *
+   * @apiError (400) IncorrectEmail The provided email does not match any user.
    */
   router.get("/", memberCtrl.listAllApprovedMembers);
 

src/routes/members.ts

@@ -38,7 +38,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,
   );
 

src/routes/progress.ts

@@ -87,17 +87,7 @@ export default function topicRouter() {
    *
    * @apiSuccess {String} message Confirmation message
    * @apiSuccess {String="SUCCESS"} status  Response status.
-   * @apiSuccess {Object} question question object.
-   * @apiSuccess {Number} question.id Question ID.
-   * @apiSuccess {String} question.questionName Name of the question.
-   * @apiSuccess {String} question.link Link to the question.
-   * @apiSuccess {String="Easy","Medium","Hard"} question.difficulty Difficulty level of the question.
-   * @apiSuccess {Number} question.topicId Topic ID associated with the question.
-   * @apiSuccess {number} question.createdAt Timestamp when the question was created.
-   * @apiSuccess {number} question.updatedAt Timestamp when the question was last updated.
-   * @apiSuccess {String} question.createdById ID of the user who created the question.
-   * @apiSuccess {String} question.updatedById ID of the user who last updated the question.
-   *
+
    * @apiError (Error 400) BadRequest Missing required fields.
    */
   router.delete("/:topicId", deleteTopic);

src/routes/topics.ts

@@ -1,14 +1,26 @@
 import { prisma } from "../db/client";
 import { ApiError } from "../utils/apiError";
 
-export const checkAdmin = async (adminId: string) => {
+export const getUserByEmail = async(email: string) => {
   return await prisma.member.findUnique({
     where: {
-      id: adminId,
-      isManager: true,
+      email: email
     },
-  });
-};
+    select: {
+      id: true,
+      isApproved: true,
+      isManager: true,
+      accounts: {
+        where: {
+          provider: 'credentials',
+        },
+        select: {
+          password: true
+        }
+      },
+    }
+  })
+}
 
 export const approvedMembers = async () => {
   return await prisma.member.findMany({
@@ -29,24 +41,25 @@ export const getDetails = async (memberId: string) => {
 export const createMember = async (
   email: string,
   name: string,
-  password: string,
-  passoutYear: number,
+  provider: "google" | "github" | "credentials",
+  passoutYear?: number,
   imageUrl?: string,
+  password?: string
 ) => {
   const newMember = await prisma.member.create({
     data: {
-      email: email,
-      name: name,
-      passoutYear: new Date(passoutYear),
+      email,
+      name,
+      passoutYear: passoutYear === undefined ? "" :  new Date(passoutYear),
       profilePhoto: imageUrl,
     },
   });
 
   await prisma.account.create({
     data: {
-      provider: "credentials",
+      provider,
       providerAccountId: email,
-      password: password,
+      password: provider === "credentials" ? password : null,
       memberId: newMember.id,
     },
   });