Merge branch 'main' of https://github.com/definecoder/CS24-p2-define-coders

Author: codermehraj

server/src/controllers/collectionPlans.ts

@@ -67,15 +67,18 @@ const getAllCollectionPlans = errorWrapper(
   }
 );
 
-const getCollectionPlansBySTS = async (req: Request, res: Response) => {
-  const stsId = req.params.stsId;
-  const collectionPlans = await prisma.collectionPlan.findMany({
-    where: {
-      stsId: stsId,
-    },
-  });
+const getCollectionPlansBySTS = errorWrapper(
+  async (req: Request, res: Response) => {
+    const stsId = req.params.stsId;
+    const collectionPlans = await prisma.collectionPlan.findMany({
+      where: {
+        stsId: stsId,
+      },
+    });
 
-  res.json(collectionPlans);
-};
+    res.json(collectionPlans);
+  },
+  { statusCode: 404, message: "Collection Plans not found" }
+);
 
 export { addCollectionPlan, getAllCollectionPlans, getCollectionPlansBySTS };

server/src/controllers/issue.ts

@@ -0,0 +1,30 @@
+import { PrismaClient } from "@prisma/client";
+import { Request, Response } from "express";
+import errorWrapper from "../middlewares/errorWrapper";
+import { adminLog } from "../services/logdata";
+
+const prisma = new PrismaClient();
+
+const addIssue = errorWrapper(
+  async (req: Request, res: Response) => {
+    const payload = req.body;
+    const newIssue = await prisma.issue.create({
+      data: payload,
+    });
+
+    await adminLog("Issue Entry", `Issue ${newIssue.issueType} created`);
+
+    res.status(201).json(newIssue);
+  },
+  { statusCode: 400, message: "Issue not created" }
+);
+
+const getAllIssues = errorWrapper(
+  async (req: Request, res: Response) => {
+    const issues = await prisma.issue.findMany();
+    res.status(200).json(issues);
+  },
+  { statusCode: 404, message: "Issues not found" }
+);
+
+export { addIssue, getAllIssues };

server/src/prisma/schema.prisma

@@ -73,6 +73,18 @@ model ContractorLogs {
     updatedAt   DateTime @updatedAt
 }
 
+model Issue {
+    id          String   @id @default(uuid())
+    issueType   String
+    description String
+    latitude    Decimal
+    longitude   Decimal
+    isAnonymous Boolean
+    issuePic    String   @default("https://thumbs.dreamstime.com/b/pile-garbage-home-junk-left-front-house-street-plastic-bags-dumper-truck-to-collect-pile-115303584.jpg")
+    createdAt   DateTime @default(now())
+    updatedAt   DateTime @updatedAt
+}
+
 model AdminLogs {
     id          String   @id @default(uuid())
     type        String

server/src/prisma/seed.ts

@@ -161,37 +161,90 @@ const roleAssignments = [
   },
 ];
 
+const areaData: Prisma.AreaCreateInput[] = [
+  {
+    id: "area1",
+    name: "Mohakhali",
+  },
+  {
+    id: "area2",
+    name: "Gulshan",
+  },
+  {
+    id: "area3",
+    name: "Bonani",
+  },
+  {
+    id: "area4",
+    name: "Badda",
+  },
+  {
+    id: "area5",
+    name: "Jatrabari",
+  },
+];
+
 const routeData: Prisma.RouteCreateInput[] = [
   {
     id: "route1",
     name: "Mohakhali to Amin Bazar",
     description: "Route from Mohakhali to Amin Bazar",
+    area: {
+      connect: {
+        id: "area1",
+      },
+    },
   },
   // add 5 more routes
   {
     id: "route2",
     name: "Gulshan to Amin Bazar",
     description: "Route from Gulshan to Amin Bazar",
+    area: {
+      connect: {
+        id: "area1",
+      },
+    },
   },
   {
     id: "route3",
     name: "Bonani to Amin Bazar",
     description: "Route from Bonani to Amin Bazar",
+    area: {
+      connect: {
+        id: "area1",
+      },
+    },
   },
   {
     id: "route4",
     name: "Badda to Amin Bazar",
     description: "Route from Badda to Amin Bazar",
+    area: {
+      connect: {
+        id: "area2",
+      },
+    },
   },
   {
     id: "route5",
     name: "Jatrabari to Amin Bazar",
     description: "Route from Jatrabari to Amin Bazar",
+    area: {
+      connect: {
+        id: "area2",
+      },
+    },
   },
   {
     id: "route6",
     name: "Mohakhali to Gulshan",
     description: "Route from Mohakhali to Gulshan",
+    area: {
+      connect: {
+        id: "area2",
+      },
+    },
   },
 ];
 
@@ -532,6 +585,7 @@ const tripData: Prisma.TripCreateInput[] = [
 
 const contractorData: Prisma.ContractorCreateInput[] = [
   {
+    id: "con1",
     name: "Contractor 2 Name",
     registrationId: "ABSDC123456",
     registrationDate: "2024-05-10T00:00:00Z",
@@ -550,6 +604,50 @@ const contractorData: Prisma.ContractorCreateInput[] = [
   },
 ];
 
+const employeeData: Prisma.UserCreateInput[] = [
+  {
+    username: "employee4",
+    email: "employee4@example.com",
+    hashedPassword: hashedP,
+    role: {
+      connect: {
+        name: RoleName.CONTRACTOR_EMPLOYEE,
+      },
+    },
+    dateOfBirth: "1990-01-01T00:00:00Z",
+    contactNumber: "012321312",
+    dateOfHire: "2024-05-10T00:00:00Z",
+    jobTitle: "E Job Title",
+    paymentRatePerHour: 20.0,
+    Contractor: {
+      connect: {
+        id: "con1",
+      },
+    },
+  },
+  // add 5 more employees
+  ...Array.from({ length: 5 }, (_, i) => ({
+    username: `employee${i + 5}`,
+    email: `employee${i + 5}@example.com`,
+    hashedPassword: hashedP,
+    role: {
+      connect: {
+        name: RoleName.CONTRACTOR_EMPLOYEE,
+      },
+    },
+    dateOfBirth: "1990-01-01T00:00:00Z",
+    contactNumber: "012321312",
+    dateOfHire: "2024-05-10T00:00:00Z",
+    jobTitle: "E Job Title",
+    paymentRatePerHour: 20.0,
+    Contractor: {
+      connect: {
+        id: "con1",
+      },
+    },
+  })),
+];
+
 async function main() {
   console.log("Seeding roles...");
   for (const role of roleData) {
@@ -591,6 +689,14 @@ async function main() {
     }
   }
 
+  console.log("Seeding areas...");
+  for (const area of areaData) {
+    const newArea = await prisma.area.create({
+      data: area,
+    });
+    console.log(newArea);
+  }
+
   console.log("Seeding routes...");
   for (const route of routeData) {
     const newRoute = await prisma.route.create({
@@ -655,6 +761,14 @@ async function main() {
     console.log(newContractor);
   }
 
+  console.log("Seeding employees...");
+  for (const employee of employeeData) {
+    const newEmployee = await prisma.user.create({
+      data: employee,
+    });
+    console.log(newEmployee);
+  }
+
   console.log("Seeding completed!");
 }
 

server/src/routes/index.ts

@@ -19,6 +19,7 @@ import logRouter from "./logs";
 import routeAreaRouter from "./routeArea";
 import employeeRoute from "./employee";
 import collectionPlanRoute from "./collectionPlans";
+import issueRoute from "./issue";
 
 router.use("/auth", authRoute);
 router.use("/users", userRoute);
@@ -39,5 +40,6 @@ router.use("/logs", logRouter);
 router.use("/route-areas", routeAreaRouter);
 router.use("/employees", employeeRoute);
 router.use("/collection-plans", collectionPlanRoute);
+router.use("/issues", issueRoute);
 
 export default router;

server/src/routes/issue.ts

@@ -0,0 +1,9 @@
+import express from "express";
+const router = express.Router();
+
+import { addIssue, getAllIssues } from "../controllers/issue";
+
+router.route("/create").post(addIssue);
+router.route("/all").get(getAllIssues);
+
+export default router;