had a "good" merge conflict but ended up resolving

Author: Tomiwa2

volunteerverse-api/src/app.ts

@@ -11,7 +11,7 @@ import { organizationRoutes } from './routes/organization';
 import { volunteerRoutes } from './routes/volunteer';
 import { projectRoutes } from './routes/projects';
 import { requireAuthenticatedUser } from './middleware/security';
-import { requireAuthenticatedUser } from './middleware/security';
+// import { requireAuthenticatedUser } from './middleware/security';
 
 
 export const app = express();
@@ -25,7 +25,7 @@ app.use("/auth", authRoutes)
 app.use("/volunteer", volunteerRoutes)
 app.use("/organization", requireAuthenticatedUser ,organizationRoutes)
 
-app.use("/project", projectRoutes)
+app.use("/project", requireAuthenticatedUser , projectRoutes)
 
 
 

volunteerverse-api/src/models/auth.ts

@@ -11,13 +11,15 @@ export class Auth{
 
     static async authenticate(creds: {email:string, password:string}){
         const requiredCreds = ["email", "password"]
+        console.log("authenticate", requiredCreds)
         try{
             validateFields({required:requiredCreds, obj:creds, location:"user authentication"})
         } catch(error) {
             throw error
         }
 
         const user = await this.fetchByEmail(creds.email)
+        console.log(user.rows)
         const {user_type} = user
 
         if (user){
@@ -41,7 +43,9 @@ export class Auth{
         const query = `SELECT * FROM authentication WHERE email=$1`
         const result = await db.query(query, [email])
         const user = result.rows[0]
+        console.log(user)
         if (user){
+            
             return user
         }
         return null

volunteerverse-api/src/models/organization.ts

@@ -7,7 +7,9 @@ import {
 } from "../utils/errors";
 
 import { BCRYPT_WORK_FACTOR } from "../config";
-
+/**
+ * @todo: change get org by email function or refactor
+ */
 export class Organization {
   /**
    * Convert a user from the database into a user object that can be viewed publically.
@@ -35,12 +37,11 @@ userType: "organization";
       await Organization.fetchOrganizationByEmail(creds.email);
     if (existingOrganizationWithEmail) {
       throw new BadRequestError(`Duplicate email: ${creds.email}`);
-      throw new BadRequestError(`Duplicate email: ${creds.email}`);
     }
 
     const salt = await bcrypt.genSalt(BCRYPT_WORK_FACTOR);
     const hashedPassword = await bcrypt.hash(creds.password, salt);
-    const normalizedOrgEmail = creds.email.toLowerCase();
+    const normalizedOrgEmail = creds.email.toLowerCase().trim();
 
     const orgResult = await db.query(
       `INSERT INTO organizations (
@@ -61,16 +62,12 @@ userType: "organization";
                website
                `,
       [
-        creds.orgName,
-        creds.orgDescription,
         creds.orgName,
         creds.orgDescription,
         normalizedOrgEmail,
         creds.logoUrl,
-        creds.logoUrl,
         creds.founders,
         creds.orgWebsite,
-        creds.orgWebsite,
       ]
     );
 
@@ -110,7 +107,7 @@ userType: "organization";
       logoUrl: logo_url,
       founders: founders,
       userType: user_type,
-      orgWebsite: website
+      orgWebsite: website,
     };
   }
   static async fetchInterestedVolunteersByEmail(email) {
@@ -136,9 +133,10 @@ userType: "organization";
     // item(that is access it) in the bracket(email in this case)
     const org_result = await db.query(
       `SELECT 
+         id,
         organization_name,
         organization_description,
-        organization_email,
+        organization_email AS "email",
         logo_url,
         founders
            FROM organizations
@@ -191,7 +189,14 @@ userType: "organization";
 
   //   return result.rows[0]
   // }
-  static async toggleStateOfOrgProject(projectId, orgId, active) {
+  static async toggleStateOfOrgProject(projectId, orgId) {
+
+    const activeResult = await db.query(`SELECT active FROM projects
+    WHERE id = $1 `,
+     [projectId])
+
+     console.log ("active result", activeResult.rows[0].active)
+
     const orgResult = await db.query(
       `SELECT * FROM projects WHERE org_id = $1 AND id = $2`,
       [orgId, projectId]
@@ -201,7 +206,7 @@ userType: "organization";
         `UPDATE "projects" SET "active" = $1 
                    WHERE "id" = $2 AND "org_id" = $3
                    RETURNING *`,
-        [!active, projectId, orgId]
+        [!activeResult.rows[0].active, projectId, orgId]
       );
       return result.rows;
     } else {
@@ -214,7 +219,6 @@ userType: "organization";
       `SELECT * FROM projects WHERE org_id = $1 AND id = $2`,
       [orgId, project_id]
     );
-    
     if (orgResult.rows.length !== 0) {
       const result = await db.query(
         `DELETE FROM "projects" WHERE "id" = $1`,
@@ -226,43 +230,44 @@ userType: "organization";
   }
 
   static async updateApprovedVolunteers(approved, email, project_id, org_id) {
-    //returns all the volunteers interested in the project
+    // to check if the volunteer exist(if this does interestedVoluteersInfo will be populated)
     const interestedVolunteersInfo =
       await Organization.fetchInterestedVolunteersByEmail(email);
 
+       // to check if the project and( / for the )org exists if it does orgResult will be populated
     const orgResult = await db.query(
       `SELECT * FROM projects WHERE org_id = $1 AND id = $2`,
       [org_id, project_id]
     );
-    console.log("the info under the projectid and orgid", orgResult.rows);
-
+    console.log("orgResult is here", orgResult);
+// to check if the volunteer exist
     if (interestedVolunteersInfo.length !== 0) {
       console.log(
         "the info of the volunteer if they exist",
         interestedVolunteersInfo
       );
 
+      // to check if the project and( / for the )org exists 
       if (orgResult.rows.length !== 0) {
         const result = await db.query(
           `UPDATE "interested_volunteers" SET "approved" = $1 
                      WHERE "email" = $2 AND "project_id" = $3
                      RETURNING *`,
           [!approved, email, project_id]
 
-         
         );
         console.log("updating approved works!", result.rows)
 
         return result.rows[0];
-     
 
+      } else {
+        throw new UnauthorizedError("Organization/Project not found");
       }
     } else {
       throw new UnauthorizedError("Volunteer Email not found");
     }
 
   }
-  
 
   static async incrementAndDecrementApprovedVolunteers(email, projectId, orgId){
     const approvedResult = await db.query(`SELECT approved FROM interested_volunteers 
@@ -274,12 +279,12 @@ userType: "organization";
                                 [projectId, orgId])
 
 
-      console.log("approvedResult", approvedResult)
-      console.log("approvedPeopleResult", approvedPeopleResult)
+      console.log("approvedResult", approvedResult.rows[0])
+      console.log("approvedPeopleResult", approvedPeopleResult.rows[0])
 
-    const approvedVolunteerState = await Organization.updateApprovedVolunteers(approvedResult.rows[0], email, projectId, orgId)
+    const approvedVolunteerState = await Organization.updateApprovedVolunteers(approvedResult.rows[0].approved, email, projectId, orgId)
 
-     console.log("bringing volunteer state into incre/decre works!",approvedVolunteerState)
+     console.log("bringing volunteer state into incre/decre works!",approvedVolunteerState.approved)
 
      console.log("approvedPeopleohhhhhh", approvedPeopleResult.rows[0].approved_people )
      if (approvedVolunteerState.approved === true){
@@ -296,7 +301,7 @@ userType: "organization";
          return result.rows;
 
         }  else if (approvedVolunteerState.approved === false){
-          console.log("oh wellllllll")
+          console.log("approved is false", typeof approvedPeopleResult.rows[0].approved_people)
           const result = await db.query(
             `UPDATE "projects" SET "approved_people" = $1 
             WHERE "org_id" = $2 AND "id" = $3
@@ -313,8 +318,6 @@ userType: "organization";
 
 
 
-
-
   static async fetchAllOrganizationProjectsById(org_id) {
     const result = await db.query(
       // make sure this matches spelling in the table too!!

volunteerverse-api/src/models/volunteer.ts

@@ -203,6 +203,8 @@ export class Volunteer {
     return null;
   }
 
+  // add a check to make sure that the user type IS volunteer (middleware). do the same for organization
+
   /**
    * When a volunteer expresses interest in a project, log it into database
    * @param projectId
@@ -213,7 +215,7 @@ export class Volunteer {
     if (volunteerCheck){
       throw new BadRequestError("Already expressed interest")
     }
-
+    
     const query = `INSERT into interested_volunteers(email, project_id, approved) VALUES ($1,$2,$3) RETURNING email,project_id as "projectId",approved`;
     const result = await db.query(query, [email, projectId, false]);
     return result.rows[0];

volunteerverse-api/src/routes/organization.ts

@@ -49,6 +49,17 @@ organizationRoutes.get("/projects", async function(req,res,next){
 
 // })
 
+organizationRoutes.put("/project/status/:projectId", async function(req,res,next){
+  try{
+    const { id } = res.locals.user
+    const projectId = parseInt(req.params.projectId)
+    //const {active} = req.body
+    const result = await Organization.toggleStateOfOrgProject(projectId, id)
+    res.json({projectState : result})
+  }catch (error) {
+    next(error);
+  }
+})
 organizationRoutes.put("/project/:projectId", async function(req,res,next){
   console.log('whyy')
   try{
@@ -64,16 +75,7 @@ organizationRoutes.put("/project/:projectId", async function(req,res,next){
 
 })
 
-organizationRoutes.post("/project/status", async function(req,res,next){
-  try{
-  const {projectId, orgId, active} = req.body
-  const result = await Organization.toggleStateOfOrgProject(projectId, orgId, active)
-  res.json({projectState : result})
-}catch (error) {
-    next(error);
-  }
- 
-})
+
 
 organizationRoutes.delete("/project/:projectId", async function(req,res,next){
   const { id } = res.locals.user
@@ -84,7 +86,9 @@ organizationRoutes.delete("/project/:projectId", async function(req,res,next){
 })
 
 
-organizationRoutes.put("/project/interested/:projectId", async function (req, res, next) {
+
+
+organizationRoutes.get("/project/interested/:projectId", async function (req, res, next) {
        //req.body is what we put in insomnia when we test which to equate to what we put in the browser
        //that then goes into the function below 
        const projectId = parseInt(req.params.projectId)

volunteerverse-api/src/routes/projects.ts

@@ -9,6 +9,9 @@ export const projectRoutes = express.Router()
 projectRoutes.post("/register", async function (req, res, next){
     try{
       const {id} = res.locals.user
+      console.log(id)
+      console.log("req.body", req.body)
+      console.log("getting here")
         const project = await Projects.registerProject({...req.body, orgId: id})
         return res.status(201).json(project)
     } catch (error){

volunteerverse-api/src/routes/volunteer.ts

@@ -24,10 +24,10 @@ volunteerRoutes.post("/fetch", async function (req, res, next) {
   }
 });
 
-volunteerRoutes.post("/interest/:projectId", async function (req, res, next) {
+volunteerRoutes.put("/interest/:projectId", async function (req, res, next) {
   try {
     const projectId = parseInt(req.params.projectId);
-    const { email } = req.body;
+    const { email } = res.locals.user;
     const result = await Volunteer.expressInterest(projectId, email);
     res.status(201).json(result);
   } catch (error) {

volunteerverse-api/volunteerverse-schema.sql

@@ -34,7 +34,7 @@ CREATE TABLE projects(
     created_at TIMESTAMP NOT NULL DEFAULT NOW(),
     image_url TEXT,
     requested_people INTEGER NOT NULL,
-    approved_people INTEGER NOT NULL,
+    approved_people INTEGER NOT NULL DEFAULT 0,
     active BOOLEAN DEFAULT TRUE
 );