definecoder · shawon-majid · Mar 27, 2024 · Mar 27, 2024 · Mar 27, 2024
diff --git a/server/src/controllers/bills.ts b/server/src/controllers/bills.ts
@@ -1,4 +1,4 @@
-import { Bill, PrismaClient } from "@prisma/client";
+import { Bill, Prisma, PrismaClient } from "@prisma/client";
 import { Request, Response } from "express";
 import errorWrapper from "../middlewares/errorWrapper";
 import {
@@ -8,6 +8,8 @@ import {
   getBills,
   updateBill,
 } from "../services/billServices";
+import { getTripById } from "../services/tripServices";
+import CustomError from "../services/CustomError";
 
 const prisma = new PrismaClient();
 
@@ -61,4 +63,78 @@ const removeBill = errorWrapper(
   { statusCode: 500, message: "Couldn't delete bill" }
 );
 
-export { createBill, fetchBills, fetchBill, editBill, removeBill };
+const createBillFromTrip = errorWrapper(
+  async (req: Request, res: Response) => {
+    const { tripId, allocatedFuelCost } = req.body;
+
+    const trip = await getTripById(tripId);
+
+    if (!trip) {
+      throw new CustomError("No such trip found", 404);
+    }
+
+    const bill = await prisma.bill.create({
+      data: {
+        vehicleId: trip.vehicleId,
+        stsId: trip.stsId,
+        landfillId: trip.landfillId,
+        tripId: trip.id,
+        weightOfWaste: trip.weightOfWaste,
+        allocatedFuelCost,
+      },
+      include: {
+        trip: true,
+        vehicle: true,
+        sts: true,
+        landfill: true,
+      },
+    });
+
+    res.status(201).json(bill);
+  },
+  { statusCode: 500, message: "Couldn't create bill" }
+);
+
+const getListOfBills = errorWrapper(async (req: Request, res: Response) => {
+  const { landfillId, day } = req.query;
+
+  let where: Prisma.BillWhereInput | undefined = undefined;
+
+  if (landfillId || day) {
+    where = {};
+    if (landfillId) {
+      where.landfillId = landfillId as string;
+    }
+    if (day) {
+      const days = parseInt(day as string, 10);
+
+      const thresholdDate = new Date();
+      thresholdDate.setDate(thresholdDate.getDate() - days);
+
+      where.createdAt = {
+        gte: thresholdDate.toISOString(),
+      };
+    }
+  }
+
+  const bills = await prisma.bill.findMany({
+    where,
+    include: {
+      trip: true,
+      vehicle: true,
+      sts: true,
+      landfill: true,
+    },
+  });
+  res.json(bills);
+});
+
+export {
+  createBill,
+  fetchBills,
+  fetchBill,
+  editBill,
+  removeBill,
+  createBillFromTrip,
+  getListOfBills,
+};
diff --git a/server/src/controllers/trip.ts b/server/src/controllers/trip.ts
@@ -10,6 +10,7 @@ import {
   getStsVehicleEntryById,
   updateStsVehicleEntry,
 } from "../services/stsVehicle";
+import { TripStatus } from "../types/tripStatus";
 
 const prisma = new PrismaClient();
 
@@ -50,23 +51,28 @@ const createTrip = errorWrapper(async (req: Request, res: Response) => {
     weightOfWaste,
     distance,
     estimatedDuration,
+    tripStartTime: exitTime,
     estimatedFuelCost: new Prisma.Decimal(estimatedCost),
-    tripStatus: "PENDING",
+    tripStatus: TripStatus.PENDING,
   };
 
   const newTrip = await addTrip(trip as Trip);
   res.status(201).json(newTrip);
 });
 
 const getListOfTrips = errorWrapper(async (req: Request, res: Response) => {
-  const { tripStatus } = req.query;
+  const { tripStatus, landfillId } = req.query;
 
   let where: Prisma.TripWhereInput | undefined = undefined;
 
-  if (tripStatus) {
-    where = {
-      tripStatus: tripStatus as string,
-    };
+  if (tripStatus || landfillId) {
+    where = {};
+    if (tripStatus) {
+      where.tripStatus = tripStatus as string;
+    }
+    if (landfillId) {
+      where.landfillId = landfillId as string;
+    }
   }
 
   const trips = await prisma.trip.findMany({
@@ -95,16 +101,23 @@ const completeTrip = errorWrapper(async (req: Request, res: Response) => {
 
   const shortage = Number(trip.weightOfWaste) - weightOfWaste;
 
-  // calculate actual duration
+  const tripStartTime = new Date(trip.tripStartTime as Date);
+
+  const entryTimeConverted = new Date(entryTime);
+
+  let duration =
+    (entryTimeConverted.getTime() - tripStartTime.getTime()) / (1000 * 60);
 
   const completedTrip = await prisma.trip.update({
     where: {
       id: tripId,
     },
     data: {
-      tripStatus: "COMPLETED",
+      tripStatus: TripStatus.DELIVERED,
       weightOfWaste,
       shortage,
+      tripEndTime: entryTime,
+      actualDuration: duration,
     },
   });
 

diff --git a/server/src/prisma/schema.prisma b/server/src/prisma/schema.prisma
@@ -159,8 +159,8 @@ model Bill {
     landfill   Landfill @relation(fields: [landfillId], references: [id])
     landfillId String
 
-    Trip   Trip?   @relation(fields: [TripId], references: [id])
-    TripId String?
+    trip   Trip?   @relation(fields: [tripId], references: [id])
+    tripId String?
 
     weightOfWaste     Decimal?
     allocatedFuelCost Decimal?
@@ -178,6 +178,8 @@ model Trip {
     vehicle    Vehicle  @relation(fields: [vehicleId], references: [id])
     vehicleId  String
 
+    tripStartTime     DateTime?
+    tripEndTime       DateTime?
     weightOfWaste     Decimal?
     shortage          Decimal?
     estimatedFuelCost Decimal?

diff --git a/server/src/routes/bills.ts b/server/src/routes/bills.ts
@@ -3,16 +3,20 @@ const router = express.Router();
 
 import {
   createBill,
+  createBillFromTrip,
   editBill,
   fetchBill,
   fetchBills,
+  getListOfBills,
   removeBill,
 } from "../controllers/bills";
 
 router.route("/").get(fetchBills);
+router.route("/search").get(getListOfBills);
 router.route("/create").post(createBill);
 router.route("/:billId").get(fetchBill);
 router.route("/:billId").put(editBill);
 router.route("/:billId").delete(removeBill);
+router.route("/create-from-trip/").post(createBillFromTrip);
 
 export default router;