Merge pull request #86 from definecoder/domestic

logs and employee api and schema update

Author: codermehraj

server/.DS_Store

@@ -90,6 +90,59 @@ const createManager = errorWrapper(
   { statusCode: 500, message: `Couldn't create user` }
 );
 
+const createEmployee = errorWrapper(
+  async (req: Request, res: Response) => {
+    const {
+      username,
+      password,
+      email,
+      roleName,
+      contractorId,
+      dateOfBirth,
+      dateOfHire,
+      jobTitle,
+      paymentRatePerHour,
+      routeId,
+    } = req.body;
+    const hashedPassword = await bcrypt.hash(password, 10);
+
+    const user = await prisma.user.create({
+      data: {
+        username,
+        email,
+        hashedPassword,
+        roleName,
+        dateOfBirth,
+        dateOfHire,
+        jobTitle,
+        paymentRatePerHour,
+        routeId,
+        contractorId,
+      },
+    });
+
+    const token = generateToken(
+      {
+        id: user.id,
+        role: user.roleName,
+      },
+      "10h"
+    );
+
+    sendMail(
+      user,
+      `Welcome To EcoSync!`,
+      `Your account has been created by Contractor Manager! Here are the Credentials:`,
+      `username: ${username}<br>email: ${email}<br> password: ${password}<br><br>Regards,<br>EcoSync Team`
+    );
+
+    await adminLog(`Employee Entry`, `Employee ${user.username} added`);
+
+    res.status(201).json({ user, token });
+  },
+  { statusCode: 500, message: `Couldn't create user` }
+);
+
 const login = errorWrapper(
   async (req: Request, res: Response) => {
     const { email, password } = req.body;
@@ -257,6 +310,7 @@ const resetPasswordConfirm = errorWrapper(
 export {
   createUser,
   createManager,
+  createEmployee,
   login,
   logout,
   resetPasswordInit,

server/src/.DS_Store

@@ -0,0 +1,20 @@
+// get all admin logs
+
+import { PrismaClient } from "@prisma/client";
+import errorWrapper from "../middlewares/errorWrapper";
+import { Request, Response } from "express";
+
+const prisma = new PrismaClient();
+
+const getAdminLogs = errorWrapper(
+  async (req: Request, res: Response) => {
+    const logs = await prisma.adminLogs.findMany();
+    res.status(200).json(logs);
+  },
+  { statusCode: 500, message: "Couldn't get admin logs" }
+);
+
+// get all sts manager logs
+// get all contractor manager logs
+
+export { getAdminLogs };

server/src/controllers/auth.ts

@@ -8,13 +8,19 @@ generator client {
 }
 
 model User {
-    id             String  @id @default(uuid())
-    username       String
-    email          String  @unique
-    hashedPassword String
-    profileName    String? // full name for contractor manager
-    profileImage   String?
-    accessLevel    String?
+    id                 String    @id @default(uuid())
+    username           String
+    email              String    @unique
+    hashedPassword     String
+    profileName        String? // full name for contractor manager, and employeee
+    profileImage       String?
+    accessLevel        String?
+    dateOfBirth        DateTime?
+    dateOfHire         DateTime?
+    jobTitle           String?
+    paymentRatePerHour Decimal?
+    assignedRoute      Route?    @relation(fields: [routeId], references: [id])
+    routeId            String?
 
     contactNumber String?
 
@@ -69,6 +75,33 @@ model AdminLogs {
     description String
 }
 
+model Route {
+    id          String  @id @default(uuid())
+    name        String
+    description String?
+    Area        Area?   @relation(fields: [areaId], references: [id])
+    areaId      String?
+    User        User[]
+}
+
+model Area {
+    id             String           @id @default(uuid())
+    name           String
+    routes         Route[]
+    CollectionPlan CollectionPlan[]
+}
+
+model CollectionPlan {
+    id                    String    @id @default(uuid())
+    area                  Area      @relation(fields: [areaId], references: [id])
+    areaId                String
+    collectionStartTime   DateTime?
+    durationForCollection Decimal?
+    numberOfLaborers      Decimal?
+    numberOfVans          Decimal?
+    expectedWaste         Decimal?
+}
+
 model Contractor {
     id                  String    @id @default(uuid()) // contractor id
     name                String

server/src/controllers/employee.ts

@@ -25,6 +25,14 @@ const roleData: Prisma.RoleCreateInput[] = [
     name: RoleName.UNASSIGNED,
     description: "Unassigned Role",
   },
+  {
+    name: RoleName.CONTRACTOR_MANAGER,
+    description: "Contractor Manager Role",
+  },
+  {
+    name: RoleName.CONTRACTOR_EMPLOYEE,
+    description: "Contractor Employee Role",
+  },
 ];
 
 const permissionData: Prisma.PermissionCreateInput[] = [
@@ -153,6 +161,40 @@ const roleAssignments = [
   },
 ];
 
+const routeData: Prisma.RouteCreateInput[] = [
+  {
+    id: "route1",
+    name: "Mohakhali to Amin Bazar",
+    description: "Route from Mohakhali to Amin Bazar",
+  },
+  // add 5 more routes
+  {
+    id: "route2",
+    name: "Gulshan to Amin Bazar",
+    description: "Route from Gulshan to Amin Bazar",
+  },
+  {
+    id: "route3",
+    name: "Bonani to Amin Bazar",
+    description: "Route from Bonani to Amin Bazar",
+  },
+  {
+    id: "route4",
+    name: "Badda to Amin Bazar",
+    description: "Route from Badda to Amin Bazar",
+  },
+  {
+    id: "route5",
+    name: "Jatrabari to Amin Bazar",
+    description: "Route from Jatrabari to Amin Bazar",
+  },
+  {
+    id: "route6",
+    name: "Mohakhali to Gulshan",
+    description: "Route from Mohakhali to Gulshan",
+  },
+];
+
 const userData: Prisma.UserCreateInput[] = [
   {
     username: "Admin",
@@ -529,6 +571,14 @@ async function main() {
     }
   }
 
+  console.log("Seeding routes...");
+  for (const route of routeData) {
+    const newRoute = await prisma.route.create({
+      data: route,
+    });
+    console.log(newRoute);
+  }
+
   console.log("Seeding users...");
   for (const user of userData) {
     const newUser = await prisma.user.create({

server/src/controllers/logs.ts

@@ -1,5 +1,6 @@
 import express from "express";
 import {
+  createEmployee,
   createManager,
   createUser,
   login,
@@ -15,6 +16,7 @@ import { PERMISSIONS } from "../permissions/permissions";
 
 const router = express.Router();
 
+router.route("/createempolyee").post(createEmployee);
 router.route("/createmanager").post(authChecker, createManager);
 router
   .route("/create")

server/src/prisma/schema.prisma

@@ -15,6 +15,7 @@ import tripRoute from "./trip";
 import scheduleRoute from "./schedule";
 import authChecker from "../middlewares/auth";
 import contractorRoute from "./contractor";
+import logRouter from "./logs";
 
 router.use("/auth", authRoute);
 router.use("/users", userRoute);
@@ -31,5 +32,6 @@ router.use("/schedules", scheduleRoute);
 
 // auth checker needed
 router.use("/contractors", contractorRoute);
+router.use("/logs", logRouter);
 
 export default router;

server/src/prisma/seed.ts

@@ -0,0 +1,7 @@
+import express from "express";
+import { getAdminLogs } from "../controllers/logs";
+const router = express.Router();
+
+router.route("/admin").get(getAdminLogs);
+
+export default router;