called prettier

Author: jessica2673

backend/typescript/models/entity.model.ts

@@ -22,4 +22,3 @@ export default class Entity extends Model {
   @Column
   file_name!: string;
 }
-

backend/typescript/rest/donationsRoutes.ts

@@ -1,6 +1,6 @@
 // import { Prisma } from "@prisma/client";
 import { Router } from "express";
-import prisma from '../prisma';
+import prisma from "../prisma";
 import DonationService from "../services/implementations/donationService";
 import IDonationService from "../services/interfaces/donationService";
 import { getErrorMessage } from "../utilities/errorUtils";
@@ -11,44 +11,45 @@ const donationRouter = Router();
 
 // display all donations
 donationRouter.get("/", async (req: any, res: any) => {
-    try {
-        const allDonations = await donationService.getAllDonations();
-        console.log('getting donations');
-        res.status(200).json(allDonations);
-    } catch (error) {
-        res.status(500).json({ error: getErrorMessage(error) });
-    }
+  try {
+    const allDonations = await donationService.getAllDonations();
+    console.log("getting donations");
+    res.status(200).json(allDonations);
+  } catch (error) {
+    res.status(500).json({ error: getErrorMessage(error) });
+  }
 });
 
 // display all donations made by a user
 donationRouter.get("/:id", async (req: any, res: any) => {
-    const id = req.params.id;
+  const { id } = req.params;
 
-    try {
-        const userDonations = await donationService.getUserDonation(id);
+  try {
+    const userDonations = await donationService.getUserDonation(id);
 
-        res.status(200).json(userDonations);
-    } catch (error) {
-        res.status(500).json({ error: getErrorMessage(error) });
-    }
+    res.status(200).json(userDonations);
+  } catch (error) {
+    res.status(500).json({ error: getErrorMessage(error) });
+  }
 });
 
 // Each donation has 1 cause associated with it, the donation from user will be split before calling this route.
 donationRouter.post("/give", async (req: any, res: any) => {
-    try {
-        const { user_id, amount, cause_id, is_recurring, confirmation_email_sent } = req.body;
-
-        const newDonation = await donationService.createDonation(
-            user_id,
-            amount,
-            cause_id,
-            is_recurring,
-            confirmation_email_sent
-        );
-        res.status(200).json(newDonation);
-    } catch (error) {
-        res.status(500).json({ error: getErrorMessage(error) });
-    }
-})
-
-export default donationRouter;
+  try {
+    const { user_id, amount, cause_id, is_recurring, confirmation_email_sent } =
+      req.body;
+
+    const newDonation = await donationService.createDonation(
+      user_id,
+      amount,
+      cause_id,
+      is_recurring,
+      confirmation_email_sent,
+    );
+    res.status(200).json(newDonation);
+  } catch (error) {
+    res.status(500).json({ error: getErrorMessage(error) });
+  }
+});
+
+export default donationRouter;

backend/typescript/rest/userRoutes.ts

@@ -95,7 +95,7 @@ userRouter.post("/", createUserDtoValidator, async (req, res) => {
     });
 
     await authService.sendEmailVerificationLink(req.body.email);
-    
+
     res.status(201).json(newUser);
   } catch (error: unknown) {
     res.status(500).json({ error: getErrorMessage(error) });

backend/typescript/server.ts

@@ -37,11 +37,11 @@ app.use("/entities", entityRouter);
 app.use("/simple-entities", simpleEntityRouter);
 app.use("/users", userRouter);
 app.use("/api-docs", swaggerUi.serve, swaggerUi.setup(swaggerDocument));
-app.use('/donations', donationRouter);
+app.use("/donations", donationRouter);
 
 // Health check
 app.get("/test", async (req: any, res: any) => {
-  res.status(200).json('endpoint hath been hit');
+  res.status(200).json("endpoint hath been hit");
 });
 
 sequelize.authenticate();

backend/typescript/services/implementations/__tests__/userService.test.ts

@@ -29,7 +29,6 @@ jest.mock("firebase-admin", () => {
   return { auth };
 });
 
-
 describe("pg userService", () => {
   let userService: UserService;
 

backend/typescript/services/implementations/authService.ts

@@ -168,9 +168,8 @@ class AuthService implements IAuthService {
     roles: Set<Role>,
   ): Promise<boolean> {
     try {
-      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken = await firebaseAdmin
-        .auth()
-        .verifyIdToken(accessToken, true);
+      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken =
+        await firebaseAdmin.auth().verifyIdToken(accessToken, true);
       const userRole = await this.userService.getUserRoleByAuthId(
         decodedIdToken.uid,
       );
@@ -190,9 +189,8 @@ class AuthService implements IAuthService {
     requestedUserId: string,
   ): Promise<boolean> {
     try {
-      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken = await firebaseAdmin
-        .auth()
-        .verifyIdToken(accessToken, true);
+      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken =
+        await firebaseAdmin.auth().verifyIdToken(accessToken, true);
       const tokenUserId = await this.userService.getUserIdByAuthId(
         decodedIdToken.uid,
       );
@@ -214,9 +212,8 @@ class AuthService implements IAuthService {
     requestedEmail: string,
   ): Promise<boolean> {
     try {
-      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken = await firebaseAdmin
-        .auth()
-        .verifyIdToken(accessToken, true);
+      const decodedIdToken: firebaseAdmin.auth.DecodedIdToken =
+        await firebaseAdmin.auth().verifyIdToken(accessToken, true);
 
       const firebaseUser = await firebaseAdmin
         .auth()

backend/typescript/services/implementations/donationService.ts

@@ -1,59 +1,67 @@
 import IDonationService from "../interfaces/donationService";
-import { DonationDTO, Recurrence } from "../../types"
+import { DonationDTO, Recurrence } from "../../types";
 import prisma from "../../prisma";
 import logger from "../../utilities/logger";
 import { getErrorMessage } from "../../utilities/errorUtils";
 
 const Logger = logger(__filename);
 
 class DonationService implements IDonationService {
-    async getAllDonations(): Promise<Array<DonationDTO>> {
-        try {
-            const allDonations = await prisma.donation.findMany();
-            
-            return allDonations;
-        } catch (error) {
-            Logger.error(`Error fetching donations. Reason = ${getErrorMessage(error)}`);
-            throw error;
-        }
+  async getAllDonations(): Promise<Array<DonationDTO>> {
+    try {
+      const allDonations = await prisma.donation.findMany();
+
+      return allDonations;
+    } catch (error) {
+      Logger.error(
+        `Error fetching donations. Reason = ${getErrorMessage(error)}`,
+      );
+      throw error;
+    }
+  }
+
+  async getUserDonation(user_id: string): Promise<Array<DonationDTO>> {
+    console.log(user_id);
+    try {
+      const userDonations = await prisma.donation.findMany({
+        where: {
+          user_id,
+        },
+      });
+
+      return userDonations;
+    } catch (error) {
+      Logger.error(`Error fetching donation for user ${user_id} = ${error}`);
+      throw error;
     }
+  }
 
-    async getUserDonation(user_id: string): Promise<Array<DonationDTO>> {
-      console.log(user_id);
+  async createDonation(
+    user_id: string,
+    amount: number,
+    cause_id: number,
+    is_recurring: string,
+    confirmation_email_sent: boolean,
+  ): Promise<DonationDTO> {
+    {
       try {
-        const userDonations = await prisma.donation.findMany({
-            where: {
-              user_id: user_id,
-            }
+        const newDonation = await prisma.donation.create({
+          data: {
+            user_id,
+            amount,
+            donation_date: new Date(),
+            cause_id,
+            is_recurring: is_recurring as Recurrence,
+            confirmation_email_sent,
+          },
         });
-
-        return userDonations;
+        return newDonation;
       } catch (error) {
-        Logger.error(`Error fetching donation for user ${user_id} = ${error}`);
+        Logger.error(`Error creating donation for user ${user_id} = ${error}`);
         throw error;
       }
     }
-
-    async createDonation(user_id: string, amount: number, cause_id: number, is_recurring: string, confirmation_email_sent: boolean): Promise<DonationDTO> {
-        {
-          try {
-            const newDonation = await prisma.donation.create({
-              data: {
-                user_id: user_id,
-                amount,
-                donation_date: new Date(),
-                cause_id: cause_id,
-                is_recurring: is_recurring as Recurrence,
-                confirmation_email_sent
-              },
-            });
-            return newDonation;
-          } catch (error) {
-            Logger.error(`Error creating donation for user ${user_id} = ${error}`);
-            throw error;
-          }
-        }
-    }
+  }
 }
 
-export default DonationService;
+export default DonationService;

backend/typescript/services/implementations/userService.ts

@@ -287,13 +287,12 @@ class UserService implements IUserService {
   async deleteUserById(userId: string): Promise<void> {
     try {
       // Sequelize doesn't provide a way to atomically find, delete, and return deleted row
-      const deletedUser: Prisma.UserCreateInput | null = await prisma.user.findUnique(
-        {
+      const deletedUser: Prisma.UserCreateInput | null =
+        await prisma.user.findUnique({
           where: {
             id: String(userId),
           },
-        },
-      );
+        });
 
       if (!deletedUser) {
         throw new Error(`userid ${userId} not found.`);
@@ -343,13 +342,12 @@ class UserService implements IUserService {
       const firebaseUser: firebaseAdmin.auth.UserRecord = await firebaseAdmin
         .auth()
         .getUserByEmail(email);
-      const deletedUser: Prisma.UserCreateInput | null = await prisma.user.findFirst(
-        {
+      const deletedUser: Prisma.UserCreateInput | null =
+        await prisma.user.findFirst({
           where: {
             auth_id: firebaseUser.uid,
           },
-        },
-      );
+        });
 
       if (!deletedUser) {
         throw new Error(`userid ${firebaseUser.uid} not found.`);

backend/typescript/services/interfaces/donationService.ts

@@ -1,38 +1,38 @@
 import { DonationDTO, Recurrence } from "../../types";
 
 interface IDonationService {
-    /**
-     * Get all donations across all users
-     * @returns an array of DonationDTO
-     * @throws Error if donation retrieval fails
-     */
-    getAllDonations(): Promise<Array<DonationDTO>>;
+  /**
+   * Get all donations across all users
+   * @returns an array of DonationDTO
+   * @throws Error if donation retrieval fails
+   */
+  getAllDonations(): Promise<Array<DonationDTO>>;
 
-    /**
-     * Get all donations associated with user_id
-     * @param user_id user's id
-     * @returns an array of DonationDTO
-     * @throws Error if donation retrieval fails
-     */
-    getUserDonation(user_id: string): Promise<Array<DonationDTO>>;
+  /**
+   * Get all donations associated with user_id
+   * @param user_id user's id
+   * @returns an array of DonationDTO
+   * @throws Error if donation retrieval fails
+   */
+  getUserDonation(user_id: string): Promise<Array<DonationDTO>>;
 
-    /**
-     * Create a donation
-     * @param user_id user's id
-     * @param amount the amount the user is donating toward this cause in the donation
-     * @param cause_id the id of the cause the donation is associated with
-     * @param is_recurring whether or not the donation is reoccurring
-     * @param confirmation_email_sent whether or not a confirmation email has been sent
-     * @returns the newly created DonationDTO
-     * @throws Error if donation cannot be created
-     */
-    createDonation(
-        user_id: string, 
-        amount: number, 
-        cause_id: number, 
-        is_recurring: string, 
-        confirmation_email_sent: boolean
-    ): Promise<DonationDTO>;
+  /**
+   * Create a donation
+   * @param user_id user's id
+   * @param amount the amount the user is donating toward this cause in the donation
+   * @param cause_id the id of the cause the donation is associated with
+   * @param is_recurring whether or not the donation is reoccurring
+   * @param confirmation_email_sent whether or not a confirmation email has been sent
+   * @returns the newly created DonationDTO
+   * @throws Error if donation cannot be created
+   */
+  createDonation(
+    user_id: string,
+    amount: number,
+    cause_id: number,
+    is_recurring: string,
+    confirmation_email_sent: boolean,
+  ): Promise<DonationDTO>;
 }
 
 export default IDonationService;

backend/typescript/testUtils/testDb.ts

@@ -2,7 +2,6 @@ import { resolve } from "path";
 
 import { Sequelize } from "sequelize-typescript";
 
-
 const DATABASE_URL =
   process.env.NODE_ENV === "production"
     ? /* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */

backend/typescript/types.ts

@@ -1,5 +1,4 @@
-import { DateDataType } from "sequelize";
-import { FloatDataType, IntegerDataType } from "sequelize";
+import { DateDataType, FloatDataType, IntegerDataType } from "sequelize";
 
 export type Role = "User" | "Admin";
 
@@ -48,6 +47,6 @@ export type DonationDTO = {
   cause_id: number;
   is_recurring: Recurrence;
   confirmation_email_sent: boolean;
-}
+};
 
 export type CreateDonationDTO = Omit<DonationDTO, "user_id">;