Merge branch 'orgs_model'

Author: Tomiwa2

volunteerverse-api/src/models/auth.ts

@@ -18,11 +18,12 @@ export class Auth{
             throw error
         }
 
-        const user = await this.fetchByEmail(creds.email)
-        console.log(user.rows)
-        const {user_type} = user
+        const user = await this.fetchByEmail(creds.email.trim())
+        console.log(user)
+  
 
         if (user){
+            const {user_type} = user
             const isValid = await bcrypt.compare(creds.password, user.password)
             if (isValid===true){
                 if (user_type==="volunteer"){

volunteerverse-api/src/models/organization.ts

@@ -134,10 +134,10 @@ userType: "organization";
     const org_result = await db.query(
       `SELECT 
          id,
-        organization_name,
-        organization_description,
+        organization_name AS orgName,
+        organization_description as orgDesc,
         organization_email AS "email",
-        logo_url,
+        logo_url AS imageUrl,
         founders
            FROM organizations
            WHERE  organization_email = $1`, // this does to filtering to make sure we are being

volunteerverse-api/src/models/volunteer.ts

@@ -280,10 +280,4 @@ static async checkStatusProject(projectId:number, email:string){
   throw new BadRequestError(`${email} has not expressed interest in project ${projectId}`);
 
 }
-
-
-
-
-
-
 }

volunteerverse-api/src/routes/volunteer.ts

@@ -16,10 +16,12 @@ volunteerRoutes.get("/skills", async function (req, res, next) {
 });
 
 /** Route that handles when a volunteer expresses interest in a project - adds it to database */
-volunteerRoutes.put("/interest", async function (req, res, next) {
+volunteerRoutes.put("/interest/:projectId", async function (req, res, next) {
   try {
-    const { email } = res.locals.user;
-    const { projectId } = req.body;
+    const projectId = parseInt(req.params.projectId);
+    const {email } = res.locals.user;
+    console.log("EMAIL VALUE IN VOLUNTEER: ", email)
+    console.log("res.locals.user hereeee", res.locals.user)
     const result = await Volunteer.expressInterest(projectId, email);
     res.status(200).json(result);
   } catch (error) {