employeee list added and logging added

Author: shawon-majid

server/src/controllers/auth.ts

@@ -12,7 +12,8 @@ import CustomError from "../services/CustomError";
 import { randomOTPGenerator, randomPasswordGenerator } from "../services/utils";
 import { sendMail, sendOTPMail } from "../services/mailService";
 import { PERMISSIONS, getPermittedRoleNames } from "../permissions/permissions";
-import { adminLog } from "../services/logdata";
+import { adminLog, contractorLog } from "../services/logdata";
+import { RoleName } from "../types/rolesTypes";
 
 const prisma = new PrismaClient();
 
@@ -136,6 +137,7 @@ const createEmployee = errorWrapper(
     );
 
     await adminLog(`Employee Entry`, `Employee ${user.username} added`);
+    await contractorLog(`Employee Entry`, `Employee ${user.username} added`);
 
     res.status(201).json({ user, token });
   },
@@ -153,6 +155,7 @@ const login = errorWrapper(
       include: {
         landfill: true,
         sts: true,
+        Contractor: true,
       },
     });
 
@@ -171,6 +174,18 @@ const login = errorWrapper(
     // console.log(roles);
     // console.log(user.roleName);
 
+    adminLog(
+      `Login`,
+      `User ${user.username}, Role: ${user.roleName} logged in`
+    );
+
+    if (user.roleName === RoleName.CONTRACTOR_EMPLOYEE) {
+      contractorLog(
+        `Login`,
+        `User ${user.username}, Role: ${user.roleName} logged in`
+      );
+    }
+
     if (!roles.includes(user.roleName)) {
       throw new CustomError("You are not allowed to login", 403);
     }

server/src/controllers/employee.ts

@@ -0,0 +1,31 @@
+import { PrismaClient } from "@prisma/client";
+import { Request, Response } from "express";
+import { RoleName } from "../types/rolesTypes";
+
+const prisma = new PrismaClient();
+
+const getAllEmployees = async (req: Request, res: Response) => {
+  const employees = await prisma.user.findMany({
+    where: {
+      roleName: RoleName.CONTRACTOR_EMPLOYEE,
+    },
+  });
+  res.status(200).json(employees);
+};
+
+const getEmployeeById = async (req: Request, res: Response) => {
+  const { employeeId } = req.params;
+  const employee = await prisma.user.findUnique({
+    where: {
+      id: employeeId,
+    },
+  });
+
+  if (!employee) {
+    res.status(404).json({ message: "Employee not found" });
+  }
+
+  res.status(200).json(employee);
+};
+
+export { getAllEmployees, getEmployeeById };

server/src/controllers/logs.ts

@@ -15,6 +15,15 @@ const getAdminLogs = errorWrapper(
 );
 
 // get all sts manager logs
+
 // get all contractor manager logs
 
-export { getAdminLogs };
+const getContractorManagerLogs = errorWrapper(
+  async (req: Request, res: Response) => {
+    const logs = await prisma.contractorLogs.findMany();
+    res.status(200).json(logs);
+  },
+  { statusCode: 500, message: "Couldn't get contractor manager logs" }
+);
+
+export { getAdminLogs, getContractorManagerLogs };

server/src/controllers/routeArea.ts

@@ -0,0 +1,100 @@
+import { PrismaClient } from "@prisma/client";
+import { Request, Response } from "express";
+
+const prisma = new PrismaClient();
+
+const addRoute = async (req: Request, res: Response) => {
+  const { name, description } = req.body;
+  const newRoute = await prisma.route.create({
+    data: {
+      name,
+      description,
+    },
+  });
+
+  res.status(201).json(newRoute);
+};
+
+const getAllRoutes = async (req: Request, res: Response) => {
+  const routes = await prisma.route.findMany();
+  res.status(200).json(routes);
+};
+
+const getRouteById = async (req: Request, res: Response) => {
+  const { routeId } = req.params;
+  const route = await prisma.route.findUnique({
+    where: {
+      id: routeId,
+    },
+  });
+
+  if (!route) {
+    res.status(404).json({ message: "Route not found" });
+  }
+
+  res.status(200).json(route);
+};
+
+const addArea = async (req: Request, res: Response) => {
+  const { name, description } = req.body;
+  const newArea = await prisma.area.create({
+    data: {
+      name,
+    },
+  });
+
+  res.status(201).json(newArea);
+};
+
+const addRouteToArea = async (req: Request, res: Response) => {
+  const { areaId, routeId } = req.params;
+
+  const area = await prisma.area.findUnique({
+    where: {
+      id: areaId,
+    },
+  });
+
+  if (!area) {
+    res.status(404).json({ message: "Area not found" });
+  }
+
+  const route = await prisma.route.findUnique({
+    where: {
+      id: routeId,
+    },
+  });
+
+  if (!route) {
+    res.status(404).json({ message: "Route not found" });
+  }
+
+  const updatedArea = await prisma.area.update({
+    where: {
+      id: areaId,
+    },
+    data: {
+      routes: {
+        connect: {
+          id: routeId,
+        },
+      },
+    },
+  });
+
+  res.status(200).json(updatedArea);
+};
+
+const getAllAreas = async (req: Request, res: Response) => {
+  const areas = await prisma.area.findMany();
+  res.status(200).json(areas);
+};
+
+export {
+  addRoute,
+  getAllRoutes,
+  getRouteById,
+  addArea,
+  addRouteToArea,
+  getAllAreas,
+};

server/src/controllers/stsContractorEntry.ts

@@ -0,0 +1,6 @@
+import { PrismaClient } from "@prisma/client";
+import { Request, Response } from "express";
+
+const prisma = new PrismaClient();
+
+// const addSTSContractorEntry = async (req: Request, res: Response) => {

server/src/prisma/schema.prisma

@@ -189,6 +189,10 @@ model Landfill {
     Vehicle   Vehicle[]
 }
 
+// model STSContractorEntry{
+
+// }
+
 model STSVehicleEntry {
     id            String    @id @default(uuid())
     sts           STS       @relation(fields: [stsId], references: [id], onDelete: Cascade)

server/src/prisma/seed.ts

@@ -280,6 +280,26 @@ const userData: Prisma.UserCreateInput[] = [
   },
 ];
 
+const contractorData: Prisma.ContractorCreateInput[] = [
+  {
+    name: "Contractor 2 Name",
+    registrationId: "ABSDC123456",
+    registrationDate: "2024-05-10T00:00:00Z",
+    tinNumber: "34334",
+    contactNumber: "+929323",
+    workforceSize: 100,
+    paymentPerTon: 10.5,
+    requiredWastePerDay: 500.0,
+    contractDuration: "1 year",
+    area: "City XYZ",
+    assignedSTS: {
+      connect: {
+        id: "sts1",
+      },
+    },
+  },
+];
+
 const vehicleData: Prisma.VehicleCreateInput[] = [
   {
     id: "vid1",
@@ -579,6 +599,14 @@ async function main() {
     console.log(newRoute);
   }
 
+  console.log("Seeding contractors...");
+  for (const contractor of contractorData) {
+    const newContractor = await prisma.contractor.create({
+      data: contractor,
+    });
+    console.log(newContractor);
+  }
+
   console.log("Seeding users...");
   for (const user of userData) {
     const newUser = await prisma.user.create({

server/src/routes/index.ts

@@ -16,6 +16,7 @@ import scheduleRoute from "./schedule";
 import authChecker from "../middlewares/auth";
 import contractorRoute from "./contractor";
 import logRouter from "./logs";
+import routeAreaRouter from "./routeArea";
 
 router.use("/auth", authRoute);
 router.use("/users", userRoute);
@@ -33,5 +34,6 @@ router.use("/schedules", scheduleRoute);
 // auth checker needed
 router.use("/contractors", contractorRoute);
 router.use("/logs", logRouter);
+router.use("/route-areas", routeAreaRouter);
 
 export default router;

server/src/routes/routeArea.ts

@@ -0,0 +1,20 @@
+import express from "express";
+const router = express.Router();
+
+import {
+  addArea,
+  getAllAreas,
+  addRoute,
+  getAllRoutes,
+  getRouteById,
+  addRouteToArea,
+} from "../controllers/routeArea";
+
+router.route("/create").post(addRoute);
+router.route("/").get(getAllRoutes);
+router.route("/area").post(addArea);
+router.route("/area").get(getAllAreas);
+router.route("/:routeId").get(getRouteById);
+router.route("/area/:areaId/route/:routeId").post(addRouteToArea);
+
+export default router;

server/src/services/logdata.ts

@@ -10,3 +10,12 @@ export const adminLog = async (logType: string, description: string) => {
     },
   });
 };
+
+export const contractorLog = async (logType: string, description: string) => {
+  await prisma.contractorLogs.create({
+    data: {
+      type: logType,
+      description: description,
+    },
+  });
+};