Merge pull request #145 from PeerPrep/update-users-service

Style fixes

Author: sivayogasubramanian

users/src/activity/list.ts

@@ -1,22 +1,21 @@
-import { Request, Response } from "express"
+import { Request, Response } from "express";
 import { Activity } from "../entities/Activity";
 import { ApiResponse, StatusMessageType } from "../types";
 
 export async function listActivityHandler(req: Request, res: Response) {
-    const em = req.orm.em.fork();
+  const em = req.orm.em.fork();
 
-    const uid = req.userToken.uid;
+  const uid = req.userToken.uid;
 
-    const activities = await em.find(Activity, { uid: uid });
+  const activities = await em.find(Activity, { uid: uid });
 
-    const response: ApiResponse = {
-        statusMessage: {
-        type: StatusMessageType.SUCCESS,
-        message: "List user activity",
-        },
-        payload: activities,
-    };
+  const response: ApiResponse = {
+    statusMessage: {
+      type: StatusMessageType.SUCCESS,
+      message: "List user activity",
+    },
+    payload: activities,
+  };
 
-    res.send(response);
+  res.send(response);
 }
-  

users/src/activity/update.ts

@@ -13,7 +13,7 @@ export async function updateActivityHandler(req: Request, res: Response) {
     const activity = await em.upsert(Activity, {
       uid: uid,
       questionId: body.questionId,
-      submitted: new Date()
+      submitted: new Date(),
     });
 
     await em.persistAndFlush(activity);

users/src/admin/index.ts

@@ -1,4 +1,4 @@
-import { Router, Request, Response, NextFunction } from "express"
+import { Router, Request, Response, NextFunction } from "express";
 import { updateRoleHandler } from "./update";
 import { listProfileHandler } from "./list";
 import { handleCustomError, handleServerError } from "../utils";
@@ -8,29 +8,25 @@ import { Profile, Role } from "../entities/Profile";
 const router = Router();
 
 router.use(async (req: Request, res: Response, next: NextFunction) => {
-    const em = req.orm.em.fork();
-    const uid = req.userToken.uid;
+  const em = req.orm.em.fork();
+  const uid = req.userToken.uid;
 
-    try {
-        const profile = await em.findOneOrFail(Profile, {
-            uid: uid
-        });
-        
-        if (profile.role == Role.USER) {
-            return handleCustomError(
-                res,
-                {
-                    type: StatusMessageType.ERROR,
-                    message: "Insufficient Permissions"
-                }
-            );
-        }
-        
-        next();
+  try {
+    const profile = await em.findOneOrFail(Profile, {
+      uid: uid,
+    });
 
-    } catch (err: any) {
-        handleServerError(err, res);
+    if (profile.role == Role.USER) {
+      return handleCustomError(res, {
+        type: StatusMessageType.ERROR,
+        message: "Insufficient Permissions",
+      });
     }
+
+    next();
+  } catch (err: any) {
+    handleServerError(err, res);
+  }
 });
 
 router.post("/update", updateRoleHandler);

users/src/admin/list.ts

@@ -1,23 +1,23 @@
-import { Request, Response } from "express"
+import { Request, Response } from "express";
 import { Profile } from "../entities/Profile";
 import { ApiResponse, StatusMessageType } from "../types";
 import { handleServerError } from "../utils";
 
 export async function listProfileHandler(req: Request, res: Response) {
-    const em = req.orm.em.fork();
+  const em = req.orm.em.fork();
 
-    try {
-        const profiles = await em.find(Profile, {});
+  try {
+    const profiles = await em.find(Profile, {});
 
-        const response: ApiResponse = {
-            statusMessage: {
-            message: "Listed profiles successfully",
-                type: StatusMessageType.SUCCESS,
-            },
-            payload: profiles,
-        };
-        res.status(200).send(response);
-    } catch (err: any) {
-        handleServerError(err, res);
-    }
+    const response: ApiResponse = {
+      statusMessage: {
+        message: "Listed profiles successfully",
+        type: StatusMessageType.SUCCESS,
+      },
+      payload: profiles,
+    };
+    res.status(200).send(response);
+  } catch (err: any) {
+    handleServerError(err, res);
+  }
 }

users/src/admin/update.ts

@@ -4,37 +4,34 @@ import { ApiResponse, StatusMessageType } from "../types";
 import { handleCustomError, handleServerError } from "../utils";
 
 export async function updateRoleHandler(req: Request, res: Response) {
-    const em = req.orm.em.fork();
-    const body = req.body;
+  const em = req.orm.em.fork();
+  const body = req.body;
 
-    try {
-        if (body.role !== Role.USER && body.role !== Role.ADMIN) {
-            return handleCustomError(
-                res,
-                {
-                    message: "Invalid role specified",
-                    type: StatusMessageType.ERROR
-                }
-            );
-        }
-        
-        const loadedProfile = await em.findOneOrFail(Profile, {
-            uid: body.uid
-        });
+  try {
+    if (body.role !== Role.USER && body.role !== Role.ADMIN) {
+      return handleCustomError(res, {
+        message: "Invalid role specified",
+        type: StatusMessageType.ERROR,
+      });
+    }
 
-        loadedProfile.role = body.role;
+    const loadedProfile = await em.findOneOrFail(Profile, {
+      uid: body.uid,
+    });
 
-        await em.flush();
+    loadedProfile.role = body.role;
 
-        const response: ApiResponse = {
-            statusMessage: {
-                message: "Role updated successfully",
-                type: StatusMessageType.SUCCESS,
-            },
-            payload: loadedProfile,
-        };
-        res.status(200).send(response);
-    } catch (err: any) {
-        handleServerError(err, res);
-    }
+    await em.flush();
+
+    const response: ApiResponse = {
+      statusMessage: {
+        message: "Role updated successfully",
+        type: StatusMessageType.SUCCESS,
+      },
+      payload: loadedProfile,
+    };
+    res.status(200).send(response);
+  } catch (err: any) {
+    handleServerError(err, res);
+  }
 }

users/src/entities/Profile.ts

@@ -22,7 +22,7 @@ export class Profile {
   @Property({ nullable: true })
   imageUrl?: string;
 
-  @Enum({ items: () => Language, nullable: true})
+  @Enum({ items: () => Language, nullable: true })
   preferredLang?: Language;
 
   @Enum({ items: () => Role, default: Role.USER })

users/src/index.ts

@@ -1,6 +1,6 @@
 import Express, { Request, Response, NextFunction } from "express";
 import { MikroORM, type PostgreSqlDriver } from "@mikro-orm/postgresql";
-import "dotenv/config"
+import "dotenv/config";
 
 import { App, applicationDefault, initializeApp } from "firebase-admin/app";
 import { DecodedIdToken, getAuth } from "firebase-admin/auth";
@@ -44,7 +44,7 @@ initDatabase().then((orm) => {
 
   const firebaseApp = initializeApp({
     credential: applicationDefault(),
-    storageBucket: process.env.BUCKET_NAME
+    storageBucket: process.env.BUCKET_NAME,
   });
 
   const firebaseAuth = getAuth(firebaseApp);
@@ -66,7 +66,11 @@ initDatabase().then((orm) => {
     }
   };
 
-  const injectDependencies = (req: Request, res: Response, next: NextFunction) => {
+  const injectDependencies = (
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) => {
     req.orm = orm;
     req.firebaseApp = firebaseApp;
     next();