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

Temporary fix to a big f up

Author: i-am-that-guy

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);

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: {