seed updated and logout logging implemented

Author: shawon-majid

server/src/controllers/auth.ts

@@ -1,6 +1,6 @@
 import { Request, Response } from "express";
 import errorWrapper from "../middlewares/errorWrapper";
-import { PrismaClient, User } from "@prisma/client";
+import { PrismaClient } from "@prisma/client";
 import bcrypt from "bcrypt";
 import {
   generateToken,
@@ -212,6 +212,19 @@ const logout = errorWrapper(
     const token = getToken(req) || "no token";
     invalidateToken(token);
     console.log("Logged Out Successfully");
+
+    if (req.user?.roleName === RoleName.CONTRACTOR_EMPLOYEE) {
+      await contractorLog(
+        `Logout`,
+        `User ${req.user.username}, Role: ${req.user.roleName} logged out`
+      );
+    }
+
+    await adminLog(
+      `Logout`,
+      `User ${req.user?.username}, Role: ${req.user?.roleName} logged out`
+    );
+
     res.json({ msg: "Logged Out Successfully" });
   },
   { statusCode: 500, message: `Logout Failed` }

server/src/prisma/seed.ts

@@ -280,26 +280,6 @@ 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",
@@ -550,6 +530,26 @@ const tripData: Prisma.TripCreateInput[] = [
   },
 ];
 
+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",
+      },
+    },
+  },
+];
+
 async function main() {
   console.log("Seeding roles...");
   for (const role of roleData) {
@@ -599,14 +599,6 @@ 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({
@@ -655,6 +647,14 @@ async function main() {
     console.log(newTrip);
   }
 
+  console.log("Seeding contractors...");
+  for (const contractor of contractorData) {
+    const newContractor = await prisma.contractor.create({
+      data: contractor,
+    });
+    console.log(newContractor);
+  }
+
   console.log("Seeding completed!");
 }