Merge pull request #38 from call-0f-code/minor-fixes

Minor fixes

Author: i-am-that-guy

src/controllers/member.controller.ts

@@ -46,7 +46,7 @@ export const createAMember =
   (supabase: SupabaseClient) => async (req: Request, res: Response) => {
     const {email, name, password, passoutYear, provider} = req.body;
 
-    if (!email || !name || !password || !passoutYear) {
+    if (!email || !name || !password || !passoutYear || !provider) {
       throw new ApiError("Required fields absent", 400);
     }
 
@@ -89,7 +89,8 @@ export const updateAMember =
     }
     if (imageUrl) parsedBody.profilePhoto = imageUrl;
 
-    await memberService.updateMember(memberId, parsedBody);
+    if(parsedBody.password) await memberService.updatePassword(memberId, parsedBody.password);
+    else await memberService.updateMember(memberId, parsedBody);
 
     const updatedData = await memberService.getDetails(memberId);
     res

src/routes/members.ts

@@ -15,6 +15,9 @@ export default function membersRouter(
    * @apiGroup Member
    *
    * @apiSuccess {Object[]} unapprovedMembers List of unapproved members.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X GET http://localhost:3000/members/unapproved
    */
   router.get("/unapproved", memberCtrl.getUnapprovedMembers);
 
@@ -27,6 +30,9 @@ export default function membersRouter(
    *
    * @apiSuccess {Object} user Member object.
    * @apiError (Error 400) BadRequest No memberId provided.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X GET http://localhost:3000/members/123
    */
   router.get("/:memberId", memberCtrl.getUserDetails);
 
@@ -35,17 +41,23 @@ export default function membersRouter(
    * @apiName ListAllApprovedMembers
    * @apiGroup Member
    *
-   *  @apiDescription
+   * @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.
+   * @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 {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.
+   *
+   * @apiExample {curl} Example usage (list all):
+   *   curl -X GET http://localhost:3000/members
+   *
+   * @apiExample {curl} Example usage (get by email):
+   *   curl -X GET "http://localhost:3000/members?email=john@example.com"
    */
   router.get("/", memberCtrl.listAllApprovedMembers);
 
@@ -54,14 +66,27 @@ export default function membersRouter(
    * @apiName CreateAMember
    * @apiGroup Member
    *
-   * @apiBody {String} email Email of the member.
-   * @apiBody {String} name Full name of the member.
-   * @apiBody {String} password Member's password.
-   * @apiBody {String} passoutYear Graduation year.
-   * @apiBody {String}  imageUrl profile photo of the member.
+   * @apiBody {String} email Email of the member. (Required)
+   * @apiBody {String} name Full name of the member. (Required)
+   * @apiBody {String} password Member's password. (Required)
+   * @apiBody {String} passoutYear Graduation year (Required, e.g., "2026").
+   * @apiBody {String} provider Authentication provider (Required, e.g., "local", "google").
+   * @apiBody {File} [file] Profile photo file (field name: "file").
+   *
+   * @apiSuccess {Boolean} success Request status.
+   * @apiSuccess {Object}  user Created member object.
    *
-   * @apiSuccess {Object} user Created member object.
-   * @apiError (Error 402) ValidationError Required fields missing.
+   * @apiError (Error 400) ApiError Required fields absent.
+   * @apiError (Error 500) ServerError Error creating user.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X POST -F "file=@profile.jpg" \
+   *   -F "email=john@example.com" \
+   *   -F "name=John Doe" \
+   *   -F "password=securePass123" \
+   *   -F "passoutYear=2026" \
+   *   -F "provider=local" \
+   *   http://localhost:3000/members
    */
   router.post("/", upload.single("file"), memberCtrl.createAMember(supabase));
 
@@ -72,64 +97,87 @@ export default function membersRouter(
    *
    * @apiParam {String} memberId Member's unique ID.
    *
+   * @apiBody {String} memberData JSON string containing the member's updated details.
    * @apiBody {File} [file] Profile photo file (field name: "file").
-   * @apiBody {String} [name] Full name of the member.
-   * @apiBody {String} [email] Email address.
-   * @apiBody {String} [phone] Phone number.
-   * @apiBody {String} [bio] Short bio.
-   * @apiBody {String} [github] GitHub handle.
-   * @apiBody {String} [linkedin] LinkedIn handle.
-   * @apiBody {String} [twitter] Twitter handle.
-   * @apiBody {String} [geeksforgeeks] GeeksforGeeks username.
-   * @apiBody {String} [leetcode] LeetCode username.
-   * @apiBody {String} [codechef] CodeChef username.
-   * @apiBody {String} [codeforces] Codeforces username.
-   * @apiBody {Date}   [passoutYear] Graduation year (ISO string format).
-   *
-   * @apiSuccess {Object} member Updated member object.
+   *
+   * @apiBody (memberData fields) {String} [name] Full name of the member.
+   * @apiBody (memberData fields) {String} [email] Email address.
+   * @apiBody (memberData fields) {String} [phone] Phone number.
+   * @apiBody (memberData fields) {String} [bio] Short bio.
+   * @apiBody (memberData fields) {String} [github] GitHub handle.
+   * @apiBody (memberData fields) {String} [linkedin] LinkedIn handle.
+   * @apiBody (memberData fields) {String} [twitter] Twitter handle.
+   * @apiBody (memberData fields) {String} [geeksforgeeks] GeeksforGeeks username.
+   * @apiBody (memberData fields) {String} [leetcode] LeetCode username.
+   * @apiBody (memberData fields) {String} [codechef] CodeChef username.
+   * @apiBody (memberData fields) {String} [codeforces] Codeforces username.
+   * @apiBody (memberData fields) {Date}   [passoutYear] Graduation year (ISO string format).
+   * @apiBody (memberData fields) {String} [profilePhoto] (Auto-assigned if a new file is uploaded).
+   *
+   * @apiSuccess {Boolean} success Request status.
+   * @apiSuccess {Object}  user Updated member object.
+   *
+   * @apiError (Error 400) ApiError No memberId provided or invalid request data.
    * @apiError (Error 404) NotFound Member not found.
-   * @apiError (Error 400) ValidationError Invalid or missing fields.
    * @apiError (Error 500) ServerError Unexpected error occurred during update.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X PATCH -F "file=@profile.jpg" \
+   *   -F 'memberData={"name":"John Doe","email":"john@example.com"}' \
+   *   http://localhost:3000/members/123
    */
   router.patch(
     "/:memberId",
     upload.single("file"),
     memberCtrl.updateAMember(supabase),
   );
 
-  /**
-   * @api {patch} /members/approve/:memberId Approve/reject a member
+  
+/**
+   * @api {patch} /members/approve/:memberId Approve a member
    * @apiName UpdateApprovalRequest
    * @apiGroup Member
    *
    * @apiParam (URL Params) {String} memberId Member ID.
-   * @apiBody {Boolean} isApproved Approval status.
-   * @apiBody {String} adminId Admin who approved.
+   * @apiBody {Boolean} isApproved Approval status (true = approved, false = rejected).
+   * @apiBody {String} adminId ID of the admin who approved/rejected.
    *
-   * @apiSuccess {Object} update Approval status updated.
+   * @apiSuccess {Object} update Approval status update result.
    * @apiError (Error 400) BadRequest Missing required fields.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X PATCH http://localhost:3000/members/approve/123 \
+   *   -H "Content-Type: application/json" \
+   *   -d '{"isApproved": true, "adminId": "admin123"}'
    */
   router.patch("/approve/:memberId", memberCtrl.updateRequest);
 
-  /**
-   * @api {get} /members/:memberId/achievements Get member's achievements
-   * @apiName GetUserAchievements
-   * @apiGroup Member
-   *
-   * @apiParam (URL Params) {String} memberId Member ID.
-   *
-   * @apiSuccess {Object[]} achievements List of achievements.
-   */
+  
+/**
+  * @api {get} /members/:memberId/achievements Get member's achievements
+  * @apiName GetUserAchievements
+  * @apiGroup Member
+  *
+  * @apiParam (URL Params) {String} memberId Member ID.
+  *
+  * @apiSuccess {Object[]} achievements List of achievements.
+  *
+  * @apiExample {curl} Example usage:
+  *   curl -X GET http://localhost:3000/members/123/achievements
+  */
   router.get("/:memberId/achievements", memberCtrl.getUserAchievements);
 
   /**
-   * @api {get} /api/members/:memberId/projects Get member's projects
+   * @api {get} /members/:memberId/projects Get member's projects
    * @apiName GetUserProjects
    * @apiGroup Member
    *
    * @apiParam (URL Params) {String} memberId Member ID.
    *
    * @apiSuccess {Object[]} projects List of projects.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X GET http://localhost:3000/members/123/projects
    */
   router.get("/:memberId/projects", memberCtrl.getUserProjects);
 
@@ -141,6 +189,9 @@ export default function membersRouter(
    * @apiParam (URL Params) {String} memberId Member ID.
    *
    * @apiSuccess {Object[]} interviews List of interviews.
+   *
+   * @apiExample {curl} Example usage:
+   *   curl -X GET http://localhost:3000/members/123/interviews
    */
   router.get("/:memberId/interviews", memberCtrl.getUserInterviews);
 

src/services/member.service.ts

@@ -66,33 +66,35 @@ export const createMember = async (
 
 export const updateMember = async (
   id: string,
-  payload: UpdateMemberPayload,
+  payload: UpdateMemberPayload
 ) => {
   const { name, ...rest } = payload;
 
-  const member = await prisma.member.findUnique({
-    where: {
-      id: id,
-    },
-  });
-
-  if (!member) {
-    throw new ApiError("Member not found", 404);
-  }
-
   const dataToUpdate = Object.fromEntries(
-    Object.entries(rest).filter(([_, v]) => v !== undefined),
+    Object.entries({ name, ...rest }).filter(([_, v]) => v !== undefined)
   );
 
-  if (JSON.stringify(dataToUpdate) === "{}")
-    throw new ApiError("No fields passed", 400);
+  if (JSON.stringify(dataToUpdate) === "{}") throw new ApiError("No fields passed", 400);
 
   return await prisma.member.update({
     where: { id },
     data: dataToUpdate,
   });
 };
 
+export const updatePassword = async(id: string, password: string) => {
+  const account = await prisma.account.findFirst({
+      where: { memberId: id },
+    });
+
+    if (!account) throw new ApiError("Associated account not found", 404);
+
+    return await prisma.account.update({
+      where: { id: account.id },
+      data: { password }, 
+    });
+}
+
 export const unapprovedMembers = async () => {
   return await prisma.member.findMany({
     where: { isApproved: false },

src/types/members.d.ts

@@ -15,5 +15,6 @@ declare global {
     leetcode?: string;
     codechef?: string;
     codeforces?: string;
+    password?: string
   }
 }