Merge pull request #93 from definecoder/contractor-bill

sts-conttactor entry

Author: shawon-majid

server/src/controllers/stsContractorEntry.ts

@@ -1,6 +1,51 @@
 import { PrismaClient } from "@prisma/client";
 import { Request, Response } from "express";
+import { adminLog } from "../services/logdata";
+import errorWrapper from "../middlewares/errorWrapper";
 
 const prisma = new PrismaClient();
 
-// const addSTSContractorEntry = async (req: Request, res: Response) => {
+const addContractorEntry = errorWrapper(
+  async (req: Request, res: Response) => {
+    const payload = req.body;
+    const newContractorEntry = await prisma.sTSContractorEntry.create({
+      data: payload,
+    });
+
+    await adminLog(
+      "Contractor Entry",
+      `${newContractorEntry.vehicleNumber} has entered STS ${newContractorEntry.stsId}`
+    );
+
+    res.status(201).json(newContractorEntry);
+  },
+  { statusCode: 400, message: "Contractor Entry not created" }
+);
+
+const getAllContractorEntries = errorWrapper(
+  async (req: Request, res: Response) => {
+    const contractorEntries = await prisma.sTSContractorEntry.findMany();
+    res.status(200).json(contractorEntries);
+  },
+  { statusCode: 404, message: "Contractor Entries not found" }
+);
+
+const getContractorEntryById = errorWrapper(
+  async (req: Request, res: Response) => {
+    const { contractorEntryId } = req.params;
+    const contractorEntry = await prisma.sTSContractorEntry.findUnique({
+      where: {
+        id: contractorEntryId,
+      },
+    });
+
+    if (!contractorEntry) {
+      res.status(404).json({ message: "Contractor Entry not found" });
+    }
+
+    res.status(200).json(contractorEntry);
+  },
+  { statusCode: 404, message: "Contractor Entry not found" }
+);
+
+export { addContractorEntry, getAllContractorEntries, getContractorEntryById };

server/src/prisma/schema.prisma

@@ -155,8 +155,9 @@ model Contractor {
 
     manager User[]
 
-    createdAt DateTime @default(now())
-    updatedAt DateTime @updatedAt
+    createdAt          DateTime             @default(now())
+    updatedAt          DateTime             @updatedAt
+    STSContractorEntry STSContractorEntry[]
 }
 
 model Vehicle {
@@ -201,14 +202,15 @@ model STS {
     manager         User[]
     Trip            Trip[]
 
-    createdAt      DateTime         @default(now())
-    updatedAt      DateTime         @updatedAt
-    Bill           Bill[]
-    Schedule       Schedule[]
-    Contractor     Contractor[]
-    Route          Route[]
-    Area           Area[]
-    CollectionPlan CollectionPlan[]
+    createdAt          DateTime             @default(now())
+    updatedAt          DateTime             @updatedAt
+    Bill               Bill[]
+    Schedule           Schedule[]
+    Contractor         Contractor[]
+    Route              Route[]
+    Area               Area[]
+    CollectionPlan     CollectionPlan[]
+    STSContractorEntry STSContractorEntry[]
 }
 
 model Landfill {
@@ -248,6 +250,24 @@ model STSVehicleEntry {
     updatedAt DateTime @updatedAt
 }
 
+model STSContractorEntry {
+    id           String     @id @default(uuid())
+    sts          STS        @relation(fields: [stsId], references: [id], onDelete: Cascade)
+    stsId        String
+    contractor   Contractor @relation(fields: [contractorId], references: [id], onDelete: Cascade)
+    contractorId String
+
+    wasteType   String?
+    wasteWeight Decimal?  @db.Decimal(10, 2)
+    entryTime   DateTime?
+    exitTime    DateTime?
+
+    vehicleNumber String?
+
+    createdAt DateTime @default(now())
+    updatedAt DateTime @updatedAt
+}
+
 model LandfillVehicleEntry {
     id            String    @id @default(uuid())
     landfill      Landfill  @relation(fields: [landfillId], references: [id], onDelete: Cascade)

server/src/routes/index.ts

@@ -20,6 +20,7 @@ import routeAreaRouter from "./routeArea";
 import employeeRoute from "./employee";
 import collectionPlanRoute from "./collectionPlans";
 import issueRoute from "./issue";
+import stsContractorRoute from "./stsContractor";
 
 router.use("/auth", authRoute);
 router.use("/users", userRoute);
@@ -41,5 +42,6 @@ router.use("/route-areas", routeAreaRouter);
 router.use("/employees", employeeRoute);
 router.use("/collection-plans", collectionPlanRoute);
 router.use("/issues", issueRoute);
+router.use("/sts-contractor-entry", stsContractorRoute);
 
 export default router;

server/src/routes/stsContractor.ts

@@ -0,0 +1,14 @@
+import express from "express";
+const router = express.Router();
+
+import {
+  addContractorEntry,
+  getAllContractorEntries,
+  getContractorEntryById,
+} from "../controllers/stsContractorEntry";
+
+router.route("/create").post(addContractorEntry);
+router.route("/all").get(getAllContractorEntries);
+router.route("/:id").get(getContractorEntryById);
+
+export default router;