Service schedule model

README.md

@@ -6,7 +6,7 @@
 
 A simple booking system built with NestJS 11 & Prisma. This project was created to test the NestJS framework, and additional changes or new features may appear over time.
 
-The project uses a PostgreSQL database running in Docker. Athentication has been implemented using the Google Auth0 with the JWT tokens. Each module features multiple unit and e2e tests.
+The project uses a PostgreSQL database running in Docker. Authentication has been implemented using the Google Auth0 with the JWT tokens. Each module features multiple unit and e2e tests.
 
 ## Requirements
 
@@ -22,6 +22,10 @@ This project requires [Node.js 20+](https://nodejs.org/en), [pnpm 9+](https://pn
 6. If necessary, run prisma studio to check the db data `pnpm run prisma:studio`
 7. You can also populate the database with test data using `pnpm run prisma:seed`
 
+## Database diagram
+
+Each time you run the `prisma:gen` command, a new DBML diagram will be generated in the `prisma/schema.dbml` file. You can use [dbdiagram.io](https://dbdiagram.io/home) to visualize the database schema as an Entity-Relationship diagram.
+
 ## License
 
 This project is under the MIT license.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nestjs-booking-system",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "license": "MIT",
   "author": "Michał Strumpf",
   "private": true,
@@ -26,15 +26,15 @@
     "test:e2e:watch": "jest --config ./test/jest-e2e.json --watch"
   },
   "dependencies": {
-    "@nestjs/common": "^11.1.2",
+    "@nestjs/common": "^11.1.3",
     "@nestjs/config": "^4.0.2",
-    "@nestjs/core": "^11.1.2",
+    "@nestjs/core": "^11.1.3",
     "@nestjs/jwt": "^11.0.0",
     "@nestjs/mapped-types": "^2.1.0",
     "@nestjs/passport": "^11.0.5",
-    "@nestjs/platform-express": "^11.1.2",
+    "@nestjs/platform-express": "^11.1.3",
     "@nestjs/swagger": "^11.2.0",
-    "@prisma/client": "6.8.2",
+    "@prisma/client": "6.10.1",
     "bcrypt": "^6.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
@@ -50,32 +50,33 @@
     "@faker-js/faker": "^9.8.0",
     "@nestjs/cli": "^11.0.7",
     "@nestjs/schematics": "^11.0.5",
-    "@nestjs/testing": "^11.1.2",
+    "@nestjs/testing": "^11.1.3",
     "@types/bcrypt": "^5.0.2",
-    "@types/compression": "^1.8.0",
-    "@types/cookie-parser": "^1.4.8",
-    "@types/express": "^5.0.2",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.15.21",
+    "@types/compression": "^1.8.1",
+    "@types/cookie-parser": "^1.4.9",
+    "@types/express": "^5.0.3",
+    "@types/jest": "^30.0.0",
+    "@types/node": "^24.0.3",
     "@types/passport": "^1.0.17",
     "@types/passport-google-oauth20": "^2.0.16",
     "@types/passport-jwt": "^4.0.1",
     "@types/supertest": "^6.0.3",
-    "eslint": "^9.27.0",
+    "eslint": "^9.29.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "4.1.4",
-    "jest": "^29.7.0",
+    "jest": "^30.0.1",
     "prettier": "^3.5.3",
-    "prisma": "^6.8.2",
+    "prisma": "^6.10.1",
+    "prisma-dbml-generator": "^0.12.0",
     "source-map-support": "^0.5.21",
     "supertest": "^7.1.1",
-    "ts-jest": "^29.3.4",
+    "ts-jest": "^29.4.0",
     "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1"
+    "typescript-eslint": "^8.34.1"
   },
   "prisma": {
     "seed": "ts-node prisma/seed.ts"

prisma/migrations/20250530170913_service_schedule_model/migration.sql

@@ -0,0 +1,22 @@
+-- CreateEnum
+CREATE TYPE "ServiceStatus" AS ENUM ('ACTIVE', 'INACTIVE', 'UNAVAILABLE', 'DRAFT', 'ARCHIVED');
+
+-- AlterTable
+ALTER TABLE "Service" ADD COLUMN     "status" "ServiceStatus" NOT NULL DEFAULT 'ACTIVE';
+
+-- CreateTable
+CREATE TABLE "ServiceSchedule" (
+    "id" SERIAL NOT NULL,
+    "day" INTEGER NOT NULL,
+    "startTime" TEXT,
+    "endTime" TEXT,
+    "serviceId" INTEGER NOT NULL,
+
+    CONSTRAINT "ServiceSchedule_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "ServiceSchedule_serviceId_day_key" ON "ServiceSchedule"("serviceId", "day");
+
+-- AddForeignKey
+ALTER TABLE "ServiceSchedule" ADD CONSTRAINT "ServiceSchedule_serviceId_fkey" FOREIGN KEY ("serviceId") REFERENCES "Service"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/migration_lock.toml

@@ -1,3 +1,3 @@
 # Please do not edit this file manually
-# It should be added in your version-control system (i.e. Git)
-provider = "postgresql"
+# It should be added in your version-control system (e.g., Git)
+provider = "postgresql"

prisma/schema.dbml

@@ -0,0 +1,106 @@
+//// ------------------------------------------------------
+//// THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY)
+//// ------------------------------------------------------
+
+Table Account {
+  id Int [pk, increment]
+  userId Int [not null]
+  provider String [not null]
+  providerAccountId String [not null]
+  user User [not null]
+
+  indexes {
+    (provider, providerAccountId) [unique]
+  }
+}
+
+Table User {
+  id Int [pk, increment]
+  name String [not null]
+  email String [unique, not null]
+  phone String
+  role UserRole [not null]
+  refreshToken String
+  accounts Account [not null]
+  Booking Booking [not null]
+}
+
+Table Booking {
+  id Int [pk, increment]
+  from DateTime [not null]
+  to DateTime [not null]
+  createdAt DateTime [default: `now()`, not null]
+  updatedAt DateTime [default: `now()`, not null]
+  status BookingStatus [not null]
+  userId Int [not null]
+  serviceId Int [not null]
+  service Service [not null]
+  user User [not null]
+}
+
+Table Service {
+  id Int [pk, increment]
+  name String [not null]
+  description String [not null]
+  price Int [not null]
+  createdAt DateTime [default: `now()`, not null]
+  updatedAt DateTime [default: `now()`, not null]
+  status ServiceStatus [not null, default: 'ACTIVE']
+  locationId Int
+  Booking Booking [not null]
+  location Location
+  ServiceSchedule ServiceSchedule [not null]
+}
+
+Table ServiceSchedule {
+  id Int [pk, increment]
+  day Int [not null]
+  startTime String
+  endTime String
+  serviceId Int [not null]
+  service Service [not null]
+
+  indexes {
+    (serviceId, day) [unique]
+  }
+}
+
+Table Location {
+  id Int [pk, increment]
+  city String [not null]
+  address String [not null]
+  country String [not null]
+  lat Float
+  lng Float
+  Service Service [not null]
+}
+
+Enum UserRole {
+  ADMIN
+  MANAGER
+  USER
+}
+
+Enum BookingStatus {
+  CONFIRMED
+  PENDING
+  CANCELLED
+}
+
+Enum ServiceStatus {
+  ACTIVE
+  INACTIVE
+  UNAVAILABLE
+  DRAFT
+  ARCHIVED
+}
+
+Ref: Account.userId > User.id [delete: Cascade]
+
+Ref: Booking.serviceId > Service.id [delete: Cascade]
+
+Ref: Booking.userId > User.id [delete: Cascade]
+
+Ref: Service.locationId > Location.id
+
+Ref: ServiceSchedule.serviceId > Service.id [delete: Cascade]

prisma/schema.prisma

@@ -2,6 +2,11 @@ generator client {
   provider = "prisma-client-js"
 }
 
+generator dbml {
+  provider = "prisma-dbml-generator"
+  output   = "./"
+}
+
 datasource db {
   provider = "postgresql"
   url      = env("DATABASE_URL")
@@ -34,23 +39,36 @@ model Booking {
   to        DateTime
   createdAt DateTime      @default(now())
   updatedAt DateTime      @default(now())
+  status    BookingStatus
   userId    Int
   serviceId Int
-  status    BookingStatus
   service   Service       @relation(fields: [serviceId], references: [id], onDelete: Cascade)
   user      User          @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 model Service {
-  id          Int       @id @default(autoincrement())
-  name        String
-  description String
-  price       Int
-  locationId  Int?
-  createdAt   DateTime  @default(now())
-  updatedAt   DateTime  @default(now())
-  Booking     Booking[]
-  location    Location? @relation(fields: [locationId], references: [id])
+  id              Int               @id @default(autoincrement())
+  name            String
+  description     String
+  price           Int
+  createdAt       DateTime          @default(now())
+  updatedAt       DateTime          @default(now())
+  status          ServiceStatus     @default(ACTIVE)
+  locationId      Int?
+  Booking         Booking[]
+  location        Location?         @relation(fields: [locationId], references: [id])
+  ServiceSchedule ServiceSchedule[]
+}
+
+model ServiceSchedule {
+  id        Int     @id @default(autoincrement())
+  day       Int
+  startTime String?
+  endTime   String?
+  serviceId Int
+  service   Service @relation(fields: [serviceId], references: [id], onDelete: Cascade)
+
+  @@unique([serviceId, day])
 }
 
 model Location {
@@ -74,3 +92,11 @@ enum BookingStatus {
   PENDING
   CANCELLED
 }
+
+enum ServiceStatus {
+  ACTIVE
+  INACTIVE
+  UNAVAILABLE
+  DRAFT
+  ARCHIVED
+}

prisma/seed.ts

@@ -1,17 +1,20 @@
-import { PrismaClient } from "@prisma/client";
-
+import { prisma } from "./seed.utils";
 import { seedBookings } from "./seed/booking.seed";
 import { seedLocations } from "./seed/location.seed";
+import { seedSchedules } from "./seed/schedule.seed";
 import { seedServices } from "./seed/service.seed";
 import { seedUsers } from "./seed/user.seed";
 
-const prisma = new PrismaClient();
-
 async function seed() {
-  await seedUsers(prisma);
-  await seedLocations(prisma);
-  await seedServices(prisma);
-  await seedBookings(prisma);
+  console.time("Seeding database");
+
+  await seedUsers();
+  await seedLocations();
+  await seedServices();
+  await seedSchedules();
+  await seedBookings();
+
+  console.timeEnd("Seeding database");
 }
 
 seed()

prisma/seed.utils.ts

@@ -1,6 +1,11 @@
+import { PrismaClient } from "@prisma/client";
+
+/** Prisma client instance used for the seed operations. */
+export const prisma = new PrismaClient();
+
 export const SEED_RECORDS = {
   USER: 10,
-  LOCATION: 2,
-  SERVICE: 3,
-  BOOKING: 10
+  LOCATION: 4,
+  SERVICE: 8,
+  BOOKING: 20
 };

prisma/seed/booking.seed.ts

@@ -1,7 +1,7 @@
 import { faker } from "@faker-js/faker";
-import { BookingStatus, type Prisma, PrismaClient } from "@prisma/client";
+import { BookingStatus, type Prisma } from "@prisma/client";
 
-import { SEED_RECORDS } from "../seed.utils";
+import { prisma, SEED_RECORDS } from "../seed.utils";
 
 function createBooking(): Prisma.BookingCreateManyInput {
   return {
@@ -13,7 +13,7 @@ function createBooking(): Prisma.BookingCreateManyInput {
   };
 }
 
-export async function seedBookings(prisma: PrismaClient) {
+export async function seedBookings() {
   console.log("Seeding bookings...");
 
   await prisma.booking.deleteMany();

prisma/seed/location.seed.ts

@@ -1,7 +1,7 @@
 import { faker } from "@faker-js/faker";
-import { type Prisma, PrismaClient } from "@prisma/client";
+import { type Prisma } from "@prisma/client";
 
-import { SEED_RECORDS } from "../seed.utils";
+import { prisma, SEED_RECORDS } from "../seed.utils";
 
 function createLocation(): Prisma.LocationCreateManyInput {
   return {
@@ -13,7 +13,7 @@ function createLocation(): Prisma.LocationCreateManyInput {
   };
 }
 
-export async function seedLocations(prisma: PrismaClient) {
+export async function seedLocations() {
   console.log("Seeding locations...");
 
   await prisma.location.deleteMany();