From ef1ae9d784d6b61ebfff80ceda13dc8d4e3ea829 Mon Sep 17 00:00:00 2001 From: Kyle Vann Date: Mon, 8 Jul 2024 13:01:30 +0100 Subject: [PATCH 1/2] need to fix errors --- .env.example | 6 - package-lock.json | 134 +++++++++++++- package.json | 3 +- .../20240708112245_init/migration.sql | 29 ++++ prisma/schema.prisma | 84 +++++---- prisma/seed.js | 164 ++++++++++-------- src/controllers/customer.js | 76 ++++---- src/controllers/movies.js | 68 ++++++++ src/controllers/reviews.js | 27 +++ src/controllers/screens.js | 29 ++++ src/controllers/tickets.js | 28 +++ src/domains/customer.js | 77 ++++++-- src/domains/movies.js | 133 ++++++++++++++ src/domains/reviews.js | 42 +++++ src/domains/screens.js | 36 ++++ src/domains/tickets.js | 52 ++++++ src/routers/customer.js | 46 ++++- src/routers/movies.js | 16 ++ src/routers/reviews.js | 8 + src/routers/screens.js | 8 + src/routers/tickets.js | 8 + src/server.js | 33 ++-- test/setupTests.js | 38 ++-- 23 files changed, 917 insertions(+), 228 deletions(-) delete mode 100644 .env.example create mode 100644 prisma/migrations/20240708112245_init/migration.sql create mode 100644 src/controllers/movies.js create mode 100644 src/controllers/reviews.js create mode 100644 src/controllers/screens.js create mode 100644 src/controllers/tickets.js create mode 100644 src/domains/movies.js create mode 100644 src/domains/reviews.js create mode 100644 src/domains/screens.js create mode 100644 src/domains/tickets.js create mode 100644 src/routers/movies.js create mode 100644 src/routers/reviews.js create mode 100644 src/routers/screens.js create mode 100644 src/routers/tickets.js diff --git a/.env.example b/.env.example deleted file mode 100644 index 60f3a816..00000000 --- a/.env.example +++ /dev/null @@ -1,6 +0,0 @@ -DATABASE_URL="YOUR_DB_URL" - -# We need the following URL environment variable for test purposes: -# - TEST_DATABASE_URL must be a **completely separate** database from any other used in this file - -TEST_DATABASE_URL="YOUR_TEST_DB_URL" diff --git a/package-lock.json b/package-lock.json index 0fc727e5..32009cbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,9 @@ "license": "ISC", "dependencies": { "@prisma/client": "^5.16.1", + "@supabase/supabase-js": "^2.44.3", "cors": "^2.8.5", - "dotenv": "^16.3.1", + "dotenv": "^16.4.5", "express": "^4.18.2", "morgan": "^1.10.0" }, @@ -1094,6 +1095,73 @@ "@sinonjs/commons": "^3.0.0" } }, + "node_modules/@supabase/auth-js": { + "version": "2.64.2", + "resolved": "https://registry.npmjs.org/@supabase/auth-js/-/auth-js-2.64.2.tgz", + "integrity": "sha512-s+lkHEdGiczDrzXJ1YWt2y3bxRi+qIUnXcgkpLSrId7yjBeaXBFygNjTaoZLG02KNcYwbuZ9qkEIqmj2hF7svw==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/functions-js": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.4.1.tgz", + "integrity": "sha512-8sZ2ibwHlf+WkHDUZJUXqqmPvWQ3UHN0W30behOJngVh/qHHekhJLCFbh0AjkE9/FqqXtf9eoVvmYgfCLk5tNA==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/node-fetch": { + "version": "2.6.15", + "resolved": "https://registry.npmjs.org/@supabase/node-fetch/-/node-fetch-2.6.15.tgz", + "integrity": "sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + } + }, + "node_modules/@supabase/postgrest-js": { + "version": "1.15.8", + "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-1.15.8.tgz", + "integrity": "sha512-YunjXpoQjQ0a0/7vGAvGZA2dlMABXFdVI/8TuVKtlePxyT71sl6ERl6ay1fmIeZcqxiuFQuZw/LXUuStUG9bbg==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/realtime-js": { + "version": "2.10.2", + "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.10.2.tgz", + "integrity": "sha512-qyCQaNg90HmJstsvr2aJNxK2zgoKh9ZZA8oqb7UT2LCh3mj9zpa3Iwu167AuyNxsxrUE8eEJ2yH6wLCij4EApA==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14", + "@types/phoenix": "^1.5.4", + "@types/ws": "^8.5.10", + "ws": "^8.14.2" + } + }, + "node_modules/@supabase/storage-js": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.6.0.tgz", + "integrity": "sha512-REAxr7myf+3utMkI2oOmZ6sdplMZZ71/2NEIEMBZHL9Fkmm3/JnaOZVSRqvG4LStYj2v5WhCruCzuMn6oD/Drw==", + "dependencies": { + "@supabase/node-fetch": "^2.6.14" + } + }, + "node_modules/@supabase/supabase-js": { + "version": "2.44.3", + "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.44.3.tgz", + "integrity": "sha512-3tYf5ojKSL0RJIpnkwYSdLPdRcza8KMTdRx2SyF9YA6PWnuUfqzmqjZohAHJuGql2CaPMWd9BLPOHupPuGq0lQ==", + "dependencies": { + "@supabase/auth-js": "2.64.2", + "@supabase/functions-js": "2.4.1", + "@supabase/node-fetch": "2.6.15", + "@supabase/postgrest-js": "1.15.8", + "@supabase/realtime-js": "2.10.2", + "@supabase/storage-js": "2.6.0" + } + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -1172,17 +1240,29 @@ "version": "20.10.5", "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz", "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==", - "dev": true, "dependencies": { "undici-types": "~5.26.4" } }, + "node_modules/@types/phoenix": { + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/@types/phoenix/-/phoenix-1.6.5.tgz", + "integrity": "sha512-xegpDuR+z0UqG9fwHqNoy3rI7JDlvaPh2TY47Fl80oq6g+hXT+c/LEuE43X48clZ6lOfANl5WrPur9fYO1RJ/w==" + }, "node_modules/@types/stack-utils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==", "dev": true }, + "node_modules/@types/ws": { + "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/yargs": { "version": "17.0.32", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", @@ -1957,14 +2037,14 @@ } }, "node_modules/dotenv": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" + "url": "https://dotenvx.com" } }, "node_modules/ee-first": { @@ -4705,6 +4785,11 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -4747,8 +4832,7 @@ "node_modules/undici-types": { "version": "5.26.5", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", - "dev": true + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" }, "node_modules/unpipe": { "version": "1.0.0", @@ -4827,6 +4911,20 @@ "makeerror": "1.0.12" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -4878,6 +4976,26 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/ws": { + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", diff --git a/package.json b/package.json index ebaf03be..cd0c1205 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,9 @@ }, "dependencies": { "@prisma/client": "^5.16.1", + "@supabase/supabase-js": "^2.44.3", "cors": "^2.8.5", - "dotenv": "^16.3.1", + "dotenv": "^16.4.5", "express": "^4.18.2", "morgan": "^1.10.0" } diff --git a/prisma/migrations/20240708112245_init/migration.sql b/prisma/migrations/20240708112245_init/migration.sql new file mode 100644 index 00000000..a1d92175 --- /dev/null +++ b/prisma/migrations/20240708112245_init/migration.sql @@ -0,0 +1,29 @@ +/* + Warnings: + + - A unique constraint covering the columns `[title]` on the table `Movie` will be added. If there are existing duplicate values, this will fail. + - A unique constraint covering the columns `[number]` on the table `Screen` will be added. If there are existing duplicate values, this will fail. + +*/ +-- CreateTable +CREATE TABLE "Review" ( + "id" SERIAL NOT NULL, + "movieId" INTEGER NOT NULL, + "customerId" INTEGER NOT NULL, + "rating" INTEGER NOT NULL, + "content" TEXT NOT NULL, + + CONSTRAINT "Review_pkey" PRIMARY KEY ("id") +); + +-- CreateIndex +CREATE UNIQUE INDEX "Movie_title_key" ON "Movie"("title"); + +-- CreateIndex +CREATE UNIQUE INDEX "Screen_number_key" ON "Screen"("number"); + +-- AddForeignKey +ALTER TABLE "Review" ADD CONSTRAINT "Review_movieId_fkey" FOREIGN KEY ("movieId") REFERENCES "Movie"("id") ON DELETE RESTRICT ON UPDATE CASCADE; + +-- AddForeignKey +ALTER TABLE "Review" ADD CONSTRAINT "Review_customerId_fkey" FOREIGN KEY ("customerId") REFERENCES "Customer"("id") ON DELETE RESTRICT ON UPDATE CASCADE; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index dd9b27f1..636ed80a 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -12,59 +12,71 @@ datasource db { // https://www.prisma.io/docs/concepts/components/prisma-schema/data-model model Customer { - id Int @id @default(autoincrement()) - name String - contact Contact? - tickets Ticket[] - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + id Int @id @default(autoincrement()) + name String + contact Contact? + tickets Ticket[] + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + reviews Review[] } model Contact { - id Int @id @default(autoincrement()) - customer Customer @relation(fields: [customerId], references: [id]) - customerId Int @unique - phone String - email String @unique - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + id Int @id @default(autoincrement()) + customer Customer @relation(fields: [customerId], references: [id]) + customerId Int @unique + phone String + email String @unique + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model Movie { id Int @id @default(autoincrement()) screenings Screening[] - title String + title String @unique runtimeMins Int createdAt DateTime @default(now()) updatedAt DateTime @updatedAt + reviews Review[] +} + +model Review { + id Int @id @default(autoincrement()) + movieId Int + movie Movie? @relation(fields: [movieId], references: [id]) + customerId Int + customer Customer? @relation(fields: [customerId], references: [id]) + rating Int + content String } model Screen { - id Int @id @default(autoincrement()) - number Int - screenings Screening[] - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + id Int @id @default(autoincrement()) + number Int @unique + screenings Screening[] + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model Screening { - id Int @id @default(autoincrement()) - tickets Ticket[] - movie Movie @relation(fields: [movieId], references: [id]) - movieId Int - screen Screen @relation(fields: [screenId], references: [id]) - screenId Int - startsAt DateTime - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + id Int @id @default(autoincrement()) + tickets Ticket[] + movie Movie @relation(fields: [movieId], references: [id]) + movieId Int + screen Screen @relation(fields: [screenId], references: [id]) + screenId Int + startsAt DateTime + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model Ticket { - id Int @id @default(autoincrement()) - screening Screening @relation(fields: [screeningId], references: [id]) - screeningId Int - customer Customer @relation(fields: [customerId], references: [id]) - customerId Int - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt -} + id Int @id @default(autoincrement()) + screening Screening @relation(fields: [screeningId], references: [id]) + screeningId Int + customer Customer @relation(fields: [customerId], references: [id]) + customerId Int + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt +} \ No newline at end of file diff --git a/prisma/seed.js b/prisma/seed.js index 31e28bfa..05463715 100644 --- a/prisma/seed.js +++ b/prisma/seed.js @@ -2,104 +2,114 @@ const { PrismaClient } = require('@prisma/client'); const prisma = new PrismaClient(); async function seed() { - await createCustomer(); - const movies = await createMovies(); - const screens = await createScreens(); - await createScreenings(screens, movies); - - process.exit(0); + try { + const customer = await createCustomer(); + const movies = await createMovies(); + const screens = await createScreens(); + await createScreenings(screens, movies); + await createReviews(customer, movies); + + console.log('Seeding completed successfully'); + } catch (e) { + console.error('Error during seeding:', e); + } finally { + await prisma.$disconnect(); + process.exit(0); + } } async function createCustomer() { - const customer = await prisma.customer.create({ - data: { - name: 'Alice', - contact: { - create: { - email: 'alice@boolean.co.uk', - phone: '1234567890' - } - } - }, - include: { - contact: true - } - }); - - console.log('Customer created', customer); + const customer = await prisma.customer.create({ + data: { + name: 'Alice', + contact: { + create: { + email: 'alice@boolean.co.uk', + phone: '1234567890', + }, + }, + }, + include: { + contact: true, + }, + }); - return customer; + console.log('Customer created:', customer.name); + return customer; } async function createMovies() { - const rawMovies = [ - { title: 'The Matrix', runtimeMins: 120 }, - { title: 'Dodgeball', runtimeMins: 154 }, - ]; - - const movies = []; - - for (const rawMovie of rawMovies) { - const movie = await prisma.movie.create({ data: rawMovie }); - movies.push(movie); - } + const rawMovies = [ + { title: 'The Matrix', runtimeMins: 120 }, + { title: 'Dodgeball', runtimeMins: 154 }, + ]; - console.log('Movies created', movies); + const movies = await prisma.movie.createMany({ + data: rawMovies, + }); - return movies; + console.log('Movies created:', movies.map(movie => movie.title)); + return movies; } async function createScreens() { - const rawScreens = [ - { number: 1 }, { number: 2 } - ]; - - const screens = []; + const rawScreens = [{ number: 1 }, { number: 2 }]; - for (const rawScreen of rawScreens) { - const screen = await prisma.screen.create({ - data: rawScreen + const screens = await prisma.screen.createMany({ + data: rawScreens, }); - console.log('Screen created', screen); - - screens.push(screen); - } - - return screens; + console.log('Screens created:', screens.map(screen => screen.number)); + return screens; } async function createScreenings(screens, movies) { - const screeningDate = new Date(); + const screeningDate = new Date(); - for (const screen of screens) { - for (let i = 0; i < movies.length; i++) { - screeningDate.setDate(screeningDate.getDate() + i); + const screenings = []; - const screening = await prisma.screening.create({ - data: { - startsAt: screeningDate, - movie: { - connect: { - id: movies[i].id - } - }, - screen: { - connect: { - id: screen.id - } - } - } - }); + for (const screen of screens) { + for (let i = 0; i < movies.length; i++) { + screeningDate.setDate(screeningDate.getDate() + i); + + const screening = await prisma.screening.create({ + data: { + startsAt: screeningDate, + movieId: movies[i].id, + screenId: screen.id, + }, + }); - console.log('Screening created', screening); + console.log('Screening created:', { movie: movies[i].title, screen: screen.number, startsAt: screening.startsAt }); + screenings.push(screening); + } } - } + + return screenings; +} + +async function createReviews(customer, movies) { + const rawReviews = [ + { + customerId: customer.id, + movieId: movies[0].id, + rating: 5, + content: 'It was okay', + }, + { + customerId: customer.id, + movieId: movies[1].id, + rating: 9, + content: 'I liked this', + }, + ]; + + const reviews = await prisma.review.createMany({ + data: rawReviews, + }); + + console.log('Reviews created for movies:', movies.map(movie => movie.title)); + return reviews; } -seed() - .catch(async e => { - console.error(e); - await prisma.$disconnect(); - }) - .finally(() => process.exit(1)); +seed(); diff --git a/src/controllers/customer.js b/src/controllers/customer.js index 775cfb42..e944ebe2 100644 --- a/src/controllers/customer.js +++ b/src/controllers/customer.js @@ -1,48 +1,56 @@ -const { PrismaClientKnownRequestError } = require("@prisma/client") -const { createCustomerDb } = require('../domains/customer.js') +const { PrismaClientKnownRequestError } = require('@prisma/client'); +const { createCustomerDb, updateCustomerDb } = require('../domains/customer.js'); const createCustomer = async (req, res) => { - const { - name, - phone, - email - } = req.body + const { name, phone, email } = req.body; if (!name || !phone || !email) { return res.status(400).json({ - error: "Missing fields in request body" - }) + error: 'Missing fields in request body', + }); } - // Try-catch is a very common way to handle errors in JavaScript. - // It allows us to customise how we want errors that are thrown to be handled. - // Read more here: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch - - // Here, if Prisma throws an error in the process of trying to create a new customer, - // instead of the Prisma error being thrown (and the app potentially crashing) we exit the - // `try` block (bypassing the `res.status` code) and enter the `catch` block. try { - const createdCustomer = await createCustomerDb(name, phone, email) - - res.status(201).json({ customer: createdCustomer }) - } catch (e) { - // In this catch block, we are able to specify how different Prisma errors are handled. - // Prisma throws errors with its own codes. P2002 is the error code for - // "Unique constraint failed on the {constraint}". In our case, the {constraint} is the - // email field which we have set as needing to be unique in the prisma.schema. - // To handle this, we return a custom 409 (conflict) error as a response to the client. - // Prisma error codes: https://www.prisma.io/docs/orm/reference/error-reference#common - // HTTP error codes: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status#client_error_responses - if (e instanceof PrismaClientKnownRequestError) { - if (e.code === "P2002") { - return res.status(409).json({ error: "A customer with the provided email already exists" }) + const createdCustomer = await createCustomerDb(name, phone, email); + + res.status(201).json({ customer: createdCustomer }); + } catch (error) { + if (error instanceof PrismaClientKnownRequestError) { + if (error.code === 'P2002') { + return res.status(409).json({ + error: 'A customer with the provided email already exists', + }); } } - res.status(500).json({ error: e.message }) + res.status(500).json({ error: error.message }); + } +}; + +const updateCustomer = async (req, res) => { + const { name, contact } = req.body; + const id = Number(req.params.id); + + if (!name) { + return res.status(400).json({ + error: 'Missing fields in request body', + }); + } + + try { + const updatedCustomer = await updateCustomerDb(id, name, contact); + + res.status(200).json({ customer: updatedCustomer }); + } catch (error) { + if (error.code === 'P2025') { + return res.status(404).json({ error: error.message }); + } + + res.status(500).json({ error: error.message }); } -} +}; module.exports = { - createCustomer -} + createCustomer, + updateCustomer, +}; diff --git a/src/controllers/movies.js b/src/controllers/movies.js new file mode 100644 index 00000000..b7d3fe1e --- /dev/null +++ b/src/controllers/movies.js @@ -0,0 +1,68 @@ +const { + createMovieDb, + getAllMoviesDb, + findMovieByIdDb, + updateMovieByIdDb, + } = require('../domains/movies.js'); + const { NotFoundError } = require('@prisma/client'); + + const getAllMovies = async (req, res) => { + try { + const { runtimeLt, runtimeGt } = req.query; + const movies = await getAllMoviesDb(Number(runtimeLt), Number(runtimeGt)); + res.status(200).json({ movies }); + } catch (error) { + res.status(500).json({ error: error.message }); + } + }; + + const createMovie = async (req, res) => { + try { + const { title, runtimeMins } = req.body; + if (!title || !runtimeMins) { + return res.status(400).json({ error: 'Missing fields in request body' }); + } + const createdMovie = await createMovieDb(title, runtimeMins); + res.status(201).json({ movie: createdMovie }); + } catch (error) { + res.status(500).json({ error: error.message }); + } + }; + + const findMovieById = async (req, res) => { + try { + const { id } = req.params; + const searchedMovie = await findMovieByIdDb(id); + if (!searchedMovie) { + return res.status(404).json({ error: 'Movie not found' }); + } + res.status(200).json({ movie: searchedMovie }); + } catch (error) { + if (error instanceof NotFoundError) { + res.status(404).json({ error: error.message }); + } else { + res.status(500).json({ error: error.message }); + } + } + }; + + const updateMovieById = async (req, res) => { + try { + const { id } = req.params; + const { title, runtimeMins } = req.body; + if (!title || !runtimeMins) { + return res.status(400).json({ error: 'Missing fields in request body' }); + } + const updatedMovie = await updateMovieByIdDb(Number(id), title, runtimeMins); + res.status(200).json({ movie: updatedMovie }); + } catch (error) { + if (error.code === 'P2015') { + res.status(404).json({ error: 'Movie not found' }); + } else { + res.status(500).json({ error: error.message }); + } + } + }; + + module.exports = { getAllMovies, createMovie, findMovieById, updateMovieById }; + \ No newline at end of file diff --git a/src/controllers/reviews.js b/src/controllers/reviews.js new file mode 100644 index 00000000..0bf929dc --- /dev/null +++ b/src/controllers/reviews.js @@ -0,0 +1,27 @@ +const { createReviewDb } = require('../domains/reviews.js'); +const { PrismaClientKnownRequestError } = require('@prisma/client'); + +const createReview = async (req, res) => { + const { customerId, movieId, rating, content } = req.body; + + try { + if (!customerId || !movieId || !rating || !content) { + return res.status(400).json({ error: 'Missing fields in request body' }); + } + + const createdReview = await createReviewDb(customerId, movieId, rating, content); + + res.status(201).json({ review: createdReview }); + } catch (error) { + if (error instanceof PrismaClientKnownRequestError) { + if (error.code === 'P2025') { + return res.status(404).json({ error: 'Matching customer or movie not found' }); + } + } + + console.error('Error creating review:', error); + res.status(500).json({ error: 'Failed to create review' }); + } +}; + +module.exports = { createReview }; diff --git a/src/controllers/screens.js b/src/controllers/screens.js new file mode 100644 index 00000000..8ea9ed06 --- /dev/null +++ b/src/controllers/screens.js @@ -0,0 +1,29 @@ +const { createScreenDb } = require('../domains/screens.js'); +const { PrismaClientKnownRequestError } = require('@prisma/client'); + +const createScreen = async (req, res) => { + const { number, screenings } = req.body; + + try { + if (!number) { + return res.status(400).json({ error: 'Missing number field in request body' }); + } + + const screenNumber = Number(number); + + const createdScreen = await createScreenDb(screenNumber, screenings); + + res.status(201).json({ screen: createdScreen }); + } catch (error) { + if (error instanceof PrismaClientKnownRequestError) { + if (error.code === 'P2002') { + return res.status(409).json({ error: 'A screen with the provided number already exists' }); + } + } + + console.error('Error creating screen:', error); + res.status(500).json({ error: 'Failed to create screen' }); + } +}; + +module.exports = { createScreen }; diff --git a/src/controllers/tickets.js b/src/controllers/tickets.js new file mode 100644 index 00000000..4b4d0961 --- /dev/null +++ b/src/controllers/tickets.js @@ -0,0 +1,28 @@ +const { createTicketDb } = require('../domains/tickets.js'); +const { PrismaClientKnownRequestError } = require('@prisma/client'); + +const createTicket = async (req, res) => { + const { screeningId, customerId } = req.body; + + try { + if (!screeningId || !customerId) { + return res.status(400).json({ error: 'Missing fields in request body' }); + } + + const createdTicket = await createTicketDb(screeningId, customerId); + + res.status(201).json({ ticket: createdTicket }); + } catch (error) { + + if (error instanceof PrismaClientKnownRequestError) { + if (error.code === 'P2025') { + return res.status(404).json({ error: 'Matching customer or screening not found' }); + } + } + + console.error('Error creating ticket:', error); + res.status(500).json({ error: 'Failed to create ticket' }); + } +}; + +module.exports = { createTicket }; diff --git a/src/domains/customer.js b/src/domains/customer.js index c7f315fd..3fe38651 100644 --- a/src/domains/customer.js +++ b/src/domains/customer.js @@ -1,26 +1,65 @@ -const prisma = require('../utils/prisma') +const prisma = require('../utils/prisma'); /** - * This will create a Customer AND create a new Contact, then automatically relate them with each other + * Creates a new Customer along with a Contact, automatically associating them. * @tutorial https://www.prisma.io/docs/concepts/components/prisma-client/relation-queries#create-a-related-record */ -const createCustomerDb = async (name, phone, email) => await prisma.customer.create({ - data: { - name, - contact: { - create: { - phone, - email - } +const createCustomerDb = async (name, phone, email) => { + const newCustomer = await prisma.customer.create({ + data: { + name, + contact: { + create: { + phone, + email, + }, + }, + }, + include: { + contact: true, + }, + }); + + return newCustomer; +}; + +/** + * Updates a Customer's details and optionally updates the associated Contact. + * @param {string} id + * @param {string} name + * @param {object} contact + * @returns {Promise} + */ +const updateCustomerDb = async (id, name, contact) => { + let updateData = { + name, + }; + + if (contact) { + updateData.contact = { + update: { + data: { + email: contact.email, + phone: contact.phone, + }, + }, + }; } - }, - // We add an `include` outside of the `data` object to make sure the new contact is returned in the result - // This is like doing RETURNING in SQL - include: { - contact: true - } -}) + + const updatedCustomer = await prisma.customer.update({ + where: { + id, + }, + data: updateData, + include: { + contact: true, + }, + }); + + return updatedCustomer; +}; module.exports = { - createCustomerDb -} + createCustomerDb, + updateCustomerDb, +}; diff --git a/src/domains/movies.js b/src/domains/movies.js new file mode 100644 index 00000000..ded476be --- /dev/null +++ b/src/domains/movies.js @@ -0,0 +1,133 @@ +const prisma = require('../utils/prisma'); + +/** + * Creates a new movie with optional screenings. + * @param {string} title - Title of the movie. + * @param {number} runtimeMins - Runtime of the movie in minutes. + * @param {object[]} [screenings] - Array of screening objects (optional). + * @returns {Promise} Created movie record with included screenings. + */ +const createMovieDb = async (title, runtimeMins, screenings) => { + const data = { + title, + runtimeMins, + }; + + if (screenings) { + data.screenings = { + createMany: { + data: screenings, + }, + }; + } + + const createdMovie = await prisma.movie.create({ + data, + include: { + screenings: true, + }, + }); + + return createdMovie; +}; + +/** + * Retrieves all movies based on optional runtime filters. + * @param {number} [runtimeLt] - Maximum runtime filter (optional). + * @param {number} [runtimeGt] - Minimum runtime filter (optional). + * @returns {Promise} Array of movies that match the runtime filters. + */ +const getAllMoviesDb = async (runtimeLt, runtimeGt) => { + const where = { + screenings: { + some: { + startsAt: { gt: new Date().toISOString() }, + }, + }, + }; + + if (runtimeLt !== undefined) { + where.runtimeMins = { lt: runtimeLt }; + } + if (runtimeGt !== undefined) { + where.runtimeMins = { ...where.runtimeMins, gt: runtimeGt }; + } + + const movies = await prisma.movie.findMany({ + include: { + screenings: { + where: { + startsAt: { gt: new Date().toISOString() }, + }, + }, + reviews: true, + }, + where, + }); + + return movies; +}; + +/** + * Finds a movie by its ID. + * @param {string} id - ID of the movie to find. + * @returns {Promise} Movie record found by ID with included screenings. + */ +const findMovieByIdDb = async (id) => { + const parsedId = Number(id); + + if (isNaN(parsedId)) { + return findMovieByTitleDb(id); + } + + const movie = await prisma.movie.findUniqueOrThrow({ + where: { id: parsedId }, + include: { + screenings: true, + }, + }); + + return movie; +}; + +/** + * Finds a movie by its title. + * @param {string} title - Title of the movie to find. + * @returns {Promise} Movie record found by title with included screenings. + */ +const findMovieByTitleDb = async (title) => { + const movie = await prisma.movie.findUniqueOrThrow({ + where: { title }, + include: { + screenings: true, + }, + }); + + return movie; +}; + +/** + * Updates a movie's details by its ID. + * @param {string} id - ID of the movie to update. + * @param {string} title - Updated title of the movie. + * @param {number} runtimeMins - Updated runtime of the movie in minutes. + * @returns {Promise} Updated movie record with included screenings. + */ +const updateMovieByIdDb = async (id, title, runtimeMins) => { + const updatedMovie = await prisma.movie.update({ + where: { id }, + data: { title, runtimeMins }, + include: { + screenings: true, + }, + }); + + return updatedMovie; +}; + +module.exports = { + createMovieDb, + getAllMoviesDb, + findMovieByIdDb, + updateMovieByIdDb, +}; diff --git a/src/domains/reviews.js b/src/domains/reviews.js new file mode 100644 index 00000000..a60290e5 --- /dev/null +++ b/src/domains/reviews.js @@ -0,0 +1,42 @@ +const prisma = require('../utils/prisma'); + +/** + * Creates a new review for a movie by a customer. + * @param {number} customerId - ID of the customer who is creating the review. + * @param {number} movieId - ID of the movie for which the review is being created. + * @param {number} rating - Rating given by the customer for the movie. + * @param {string} content - Content of the review. + * @returns {Promise} Created review object with included movie and customer details. + */ +const createReviewDb = async (customerId, movieId, rating, content) => { + try { + const movie = await prisma.movie.findUniqueOrThrow({ + where: { id: movieId }, + }); + + const customer = await prisma.customer.findUniqueOrThrow({ + where: { id: customerId }, + include: { contact: true }, + }); + + + const review = await prisma.review.create({ + data: { + customerId, + movieId, + rating, + content, + }, + include: { + movie: true, + customer: true, + }, + }); + + return review; + } catch (error) { + throw new Error(`Failed to create review: ${error.message}`); + } +}; + +module.exports = { createReviewDb }; diff --git a/src/domains/screens.js b/src/domains/screens.js new file mode 100644 index 00000000..42d9cb3d --- /dev/null +++ b/src/domains/screens.js @@ -0,0 +1,36 @@ +const prisma = require('../utils/prisma'); + +/** + * Creates a new screen with optional screenings. + * @param {number} number - Number of the screen. + * @param {object[]} [screenings] - Array of screening objects (optional). + * @returns {Promise} Created screen record with included screenings. + */ +const createScreenDb = async (number, screenings) => { + const data = { + number, + }; + + if (screenings) { + data.screenings = { + createMany: { + data: screenings, + }, + }; + } + + try { + const createdScreen = await prisma.screen.create({ + data, + include: { + screenings: true, + }, + }); + + return createdScreen; + } catch (error) { + throw new Error(`Failed to create screen: ${error.message}`); + } +}; + +module.exports = { createScreenDb }; diff --git a/src/domains/tickets.js b/src/domains/tickets.js new file mode 100644 index 00000000..5dc3454a --- /dev/null +++ b/src/domains/tickets.js @@ -0,0 +1,52 @@ +const prisma = require('../utils/prisma'); + +/** + * Creates a new ticket for a screening by a customer. + * @param {number} screeningId - ID of the screening for which the ticket is being created. + * @param {number} customerId - ID of the customer who is purchasing the ticket. + * @returns {Promise} Created ticket object with included screening, movie, customer, and customer contact details. + */ +const createTicketDb = async (screeningId, customerId) => { + try { + const screening = await prisma.screening.findUniqueOrThrow({ + where: { id: screeningId }, + include: { + movie: true, + screen: true, + }, + }); + + const customer = await prisma.customer.findUniqueOrThrow({ + where: { id: customerId }, + include: { + contact: true, + }, + }); + + const ticket = await prisma.ticket.create({ + data: { + screeningId, + customerId, + }, + include: { + screening: { + include: { + movie: true, + screen: true, + }, + }, + customer: { + include: { + contact: true, + }, + }, + }, + }); + + return ticket; + } catch (error) { + throw new Error(`Failed to create ticket: ${error.message}`); + } +}; + +module.exports = { createTicketDb }; diff --git a/src/routers/customer.js b/src/routers/customer.js index f14a87fc..6a9f0807 100644 --- a/src/routers/customer.js +++ b/src/routers/customer.js @@ -1,13 +1,43 @@ -const express = require("express"); -const { - createCustomer -} = require('../controllers/customer'); +const express = require('express'); +const { PrismaClient } = require('@prisma/client'); +const prisma = new PrismaClient(); const router = express.Router(); -// In index.js, we told express that the /customer route should use this router file -// The below /register route extends that, so the end result will be a URL -// that looks like http://localhost:4040/customer/register -router.post("/register", createCustomer); +// Update customer endpoint +router.put('/:id', async (req, res) => { + const { id } = req.params; + const { name, contact } = req.body; + + if (!name && !contact) { + return res.status(400).json({ error: 'Request body must contain name or contact' }); + } + + try { + // Check if customer exists + const existingCustomer = await prisma.customer.findUnique({ where: { id: parseInt(id) } }); + + if (!existingCustomer) { + return res.status(404).json({ error: 'Customer not found' }); + } + + // Update customer data + const updatedCustomer = await prisma.customer.update({ + where: { id: parseInt(id) }, + data: { + name, + contact: contact ? { + update: contact + } : undefined, + }, + include: { contact: true } + }); + + return res.status(201).json({ customer: updatedCustomer }); + } catch (error) { + console.error(error); + return res.status(500).json({ error: 'Internal server error' }); + } +}); module.exports = router; diff --git a/src/routers/movies.js b/src/routers/movies.js new file mode 100644 index 00000000..a67ac852 --- /dev/null +++ b/src/routers/movies.js @@ -0,0 +1,16 @@ +const express = require('express') +const { + getAllMovies, + createMovie, + findMovieById, + updateMovieById, +} = require('../controllers/movies') + +const router = express.Router() + +router.get('/', getAllMovies) +router.post('/', createMovie) +router.get('/:id', findMovieById) +router.put('/:id', updateMovieById) + +module.exports = router \ No newline at end of file diff --git a/src/routers/reviews.js b/src/routers/reviews.js new file mode 100644 index 00000000..578d03bf --- /dev/null +++ b/src/routers/reviews.js @@ -0,0 +1,8 @@ +const express = require('express') +const { createReview } = require('../controllers/reviews') + +const router = express.Router() + +router.post('/', createReview) + +module.exports = router \ No newline at end of file diff --git a/src/routers/screens.js b/src/routers/screens.js new file mode 100644 index 00000000..f602dd6c --- /dev/null +++ b/src/routers/screens.js @@ -0,0 +1,8 @@ +const express = require('express') +const { createScreen } = require('../controllers/screens') + +const router = express.Router() + +router.post('/', createScreen) + +module.exports = router \ No newline at end of file diff --git a/src/routers/tickets.js b/src/routers/tickets.js new file mode 100644 index 00000000..f271fce3 --- /dev/null +++ b/src/routers/tickets.js @@ -0,0 +1,8 @@ +const express = require('express') +const { createTicket } = require('../controllers/tickets') + +const router = express.Router() + +router.post('/', createTicket) + +module.exports = router \ No newline at end of file diff --git a/src/server.js b/src/server.js index 93d47a16..20980c16 100644 --- a/src/server.js +++ b/src/server.js @@ -1,21 +1,24 @@ -const express = require('express'); -const app = express(); - -const cors = require('cors'); -const morgan = require('morgan'); +// src/server.js -app.disable('x-powered-by'); +const express = require('express'); +const movieRouter = require('./routers/movies'); // Assuming this file exists and handles movie routes +const customerRouter = require('./routers/customer'); // Assuming this file exists and handles customer routes +const screenRouter = require('./routers/screens'); // Assuming this file exists and handles screen routes -// Add middleware -app.use(cors()); -app.use(morgan('dev')); -app.use(express.json()); -app.use(express.urlencoded({ extended: true })); +const app = express(); +// Middleware +app.use(express.json()); // Middleware to parse JSON request bodies -// Tell express to use your routers here -const customerRouter = require('./routers/customer'); -app.use('/customers', customerRouter); +// Routes +app.use('/movies', movieRouter); // Mounting movieRouter to handle routes starting with '/movies' +app.use('/customer', customerRouter); // Mounting customerRouter to handle routes starting with '/customers' +app.use('/screens', screenRouter); // Mounting screenRouter to handle routes starting with '/screens' +// Error handling middleware +app.use((err, req, res, next) => { + console.error(err.stack); + res.status(500).json({ error: 'Internal Server Error' }); +}); -module.exports = app +module.exports = app; // Exporting the express app instance for testing purposes diff --git a/test/setupTests.js b/test/setupTests.js index 2be95321..bfc30625 100644 --- a/test/setupTests.js +++ b/test/setupTests.js @@ -1,28 +1,18 @@ -const prisma = require("../src/utils/prisma") +const { PrismaClient } = require('@prisma/client'); -const deleteTables = () => { - const deleteTables = [ - prisma.ticket.deleteMany(), - prisma.screening.deleteMany(), - prisma.movie.deleteMany(), - prisma.screen.deleteMany(), - prisma.contact.deleteMany(), - prisma.customer.deleteMany(), - ]; +const prisma = new PrismaClient(); - // Conditionally delete this table as this will only exist if "Extensions to the Extensions" bullet 2 is implemented - prisma.reviews && deleteTables.push(prisma.reviews.deleteMany()) - return prisma.$transaction(deleteTables) -} +// Setup function before tests +beforeAll(async () => { + await prisma.$connect(); + // Additional setup (e.g., seed test data) +}); -global.beforeAll(() => { - return deleteTables() -}) +// Teardown function after tests +afterAll(async () => { + await prisma.$disconnect(); +}); -global.afterEach(() => { - return deleteTables() -}) - -global.afterAll(() => { - return prisma.$disconnect() -}) +module.exports = { + prisma, +}; From 5c5c086dfa5961fc84cc216e3798adccb2678284 Mon Sep 17 00:00:00 2001 From: Kyle Vann Date: Thu, 11 Jul 2024 11:37:19 +0100 Subject: [PATCH 2/2] Complete --- .DS_Store | Bin 0 -> 8196 bytes prisma/schema.prisma | 82 ++++++++---------- prisma/seed.js | 164 +++++++++++++++++------------------- src/controllers/customer.js | 2 +- src/controllers/movies.js | 2 +- src/domains/movies.js | 23 +---- src/routers/customer.js | 41 ++------- src/server.js | 22 +++-- test/setupTests.js | 38 ++++++--- 9 files changed, 162 insertions(+), 212 deletions(-) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d4144b3b0acc5a89d8559b0b51fbd4253d831a7d GIT binary patch literal 8196 zcmeHM-EI;=82tv2E{KZ8L~cy>#yd(DYHGYNp-3-!VPeG83pI3?MY@IV5_T!Eh~eHR z&lX8sL z6@M;K%87}Y5l79;REEM-;=yb|CsvneYU6-$VATPhyJx6ET?*+$%inh}*8eSv5OQ9R z0!lRAH;h&;;(3#JsNM(s@P>mRP8{baOQkc{vKy9_xAHggZ(E1aq?NeIIBvM3*L?4} zn;d$o{W6LMi?-|S2i-}#c=u@(CT&s%C(E7 z>9p!>mF=xZwOQGoKCU@s`{CC1Y?ia`J*Ym}J2-xSI{h&F_*on(F?FAzTXKI^>OhZOSj$0c;H^q7ij9%_mKhC6{7+x|C3?aUF2K zFMSO@Vs=(|Up3xMIzqe{5i4LvSjjtl$vx~H>Dp95(-y?KedybC46Tpj9`I<(YfGJK zy4y6wk#wk!x(EIyRD7*{IV)d<7U7o`p`b+&t6kNl_cdJ>x)F{q#(Lf5IT##do97(N z(F@w89ct1uUy-Aweb5aiB=Yfr~#3(Y8V5n!3WdMD(DT7XiWsQyB-=>cAf@%u3M! literal 0 HcmV?d00001 diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 636ed80a..890c0d90 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -12,71 +12,59 @@ datasource db { // https://www.prisma.io/docs/concepts/components/prisma-schema/data-model model Customer { - id Int @id @default(autoincrement()) - name String - contact Contact? - tickets Ticket[] - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt - reviews Review[] + id Int @id @default(autoincrement()) + name String + contact Contact? + tickets Ticket[] + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model Contact { - id Int @id @default(autoincrement()) - customer Customer @relation(fields: [customerId], references: [id]) - customerId Int @unique - phone String - email String @unique - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + id Int @id @default(autoincrement()) + customer Customer @relation(fields: [customerId], references: [id]) + customerId Int @unique + phone String + email String @unique + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model Movie { id Int @id @default(autoincrement()) screenings Screening[] - title String @unique + title String runtimeMins Int createdAt DateTime @default(now()) updatedAt DateTime @updatedAt - reviews Review[] -} - -model Review { - id Int @id @default(autoincrement()) - movieId Int - movie Movie? @relation(fields: [movieId], references: [id]) - customerId Int - customer Customer? @relation(fields: [customerId], references: [id]) - rating Int - content String } model Screen { - id Int @id @default(autoincrement()) - number Int @unique - screenings Screening[] - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + id Int @id @default(autoincrement()) + number Int + screenings Screening[] + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } model Screening { - id Int @id @default(autoincrement()) - tickets Ticket[] - movie Movie @relation(fields: [movieId], references: [id]) - movieId Int - screen Screen @relation(fields: [screenId], references: [id]) - screenId Int - startsAt DateTime - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt -} - -model Ticket { id Int @id @default(autoincrement()) - screening Screening @relation(fields: [screeningId], references: [id]) - screeningId Int - customer Customer @relation(fields: [customerId], references: [id]) - customerId Int + tickets Ticket[] + movie Movie @relation(fields: [movieId], references: [id]) + movieId Int + screen Screen @relation(fields: [screenId], references: [id]) + screenId Int + startsAt DateTime createdAt DateTime @default(now()) updatedAt DateTime @updatedAt +} + +model Ticket { + id Int @id @default(autoincrement()) + screening Screening @relation(fields: [screeningId], references: [id]) + screeningId Int + customer Customer @relation(fields: [customerId], references: [id]) + customerId Int + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt } \ No newline at end of file diff --git a/prisma/seed.js b/prisma/seed.js index 05463715..ed9743b5 100644 --- a/prisma/seed.js +++ b/prisma/seed.js @@ -2,114 +2,104 @@ const { PrismaClient } = require('@prisma/client'); const prisma = new PrismaClient(); async function seed() { - try { - const customer = await createCustomer(); - const movies = await createMovies(); - const screens = await createScreens(); - await createScreenings(screens, movies); - await createReviews(customer, movies); - - console.log('Seeding completed successfully'); - } catch (e) { - console.error('Error during seeding:', e); - } finally { - await prisma.$disconnect(); - process.exit(0); - } + await createCustomer(); + const movies = await createMovies(); + const screens = await createScreens(); + await createScreenings(screens, movies); + + process.exit(0); } async function createCustomer() { - const customer = await prisma.customer.create({ - data: { - name: 'Alice', - contact: { - create: { - email: 'alice@boolean.co.uk', - phone: '1234567890', - }, - }, - }, - include: { - contact: true, - }, - }); + const customer = await prisma.customer.create({ + data: { + name: 'Alice', + contact: { + create: { + email: 'alice@boolean.co.uk', + phone: '1234567890' + } + } + }, + include: { + contact: true + } + }); - console.log('Customer created:', customer.name); - return customer; + console.log('Customer created', customer); + + return customer; } async function createMovies() { - const rawMovies = [ - { title: 'The Matrix', runtimeMins: 120 }, - { title: 'Dodgeball', runtimeMins: 154 }, - ]; + const rawMovies = [ + { title: 'The Matrix', runtimeMins: 120 }, + { title: 'Dodgeball', runtimeMins: 154 }, + ]; - const movies = await prisma.movie.createMany({ - data: rawMovies, - }); + const movies = []; + + for (const rawMovie of rawMovies) { + const movie = await prisma.movie.create({ data: rawMovie }); + movies.push(movie); + } - console.log('Movies created:', movies.map(movie => movie.title)); - return movies; + console.log('Movies created', movies); + + return movies; } async function createScreens() { - const rawScreens = [{ number: 1 }, { number: 2 }]; + const rawScreens = [ + { number: 1 }, { number: 2 } + ]; + + const screens = []; - const screens = await prisma.screen.createMany({ - data: rawScreens, + for (const rawScreen of rawScreens) { + const screen = await prisma.screen.create({ + data: rawScreen }); - console.log('Screens created:', screens.map(screen => screen.number)); - return screens; -} + console.log('Screen created', screen); -async function createScreenings(screens, movies) { - const screeningDate = new Date(); + screens.push(screen); + } - const screenings = []; + return screens; +} - for (const screen of screens) { - for (let i = 0; i < movies.length; i++) { - screeningDate.setDate(screeningDate.getDate() + i); +async function createScreenings(screens, movies) { + const screeningDate = new Date(); - const screening = await prisma.screening.create({ - data: { - startsAt: screeningDate, - movieId: movies[i].id, - screenId: screen.id, - }, - }); + for (const screen of screens) { + for (let i = 0; i < movies.length; i++) { + screeningDate.setDate(screeningDate.getDate() + i); - console.log('Screening created:', { movie: movies[i].title, screen: screen.number, startsAt: screening.startsAt }); - screenings.push(screening); + const screening = await prisma.screening.create({ + data: { + startsAt: screeningDate, + movie: { + connect: { + id: movies[i].id + } + }, + screen: { + connect: { + id: screen.id + } + } } - } + }); - return screenings; -} - -async function createReviews(customer, movies) { - const rawReviews = [ - { - customerId: customer.id, - movieId: movies[0].id, - rating: 5, - content: 'It was okay', - }, - { - customerId: customer.id, - movieId: movies[1].id, - rating: 9, - content: 'I liked this', - }, - ]; - - const reviews = await prisma.review.createMany({ - data: rawReviews, - }); - - console.log('Reviews created for movies:', movies.map(movie => movie.title)); - return reviews; + console.log('Screening created', screening); + } + } } -seed(); +seed() + .catch(async e => { + console.error(e); + await prisma.$disconnect(); + }) + .finally(() => process.exit(1)); \ No newline at end of file diff --git a/src/controllers/customer.js b/src/controllers/customer.js index e944ebe2..cf1ab789 100644 --- a/src/controllers/customer.js +++ b/src/controllers/customer.js @@ -40,7 +40,7 @@ const updateCustomer = async (req, res) => { try { const updatedCustomer = await updateCustomerDb(id, name, contact); - res.status(200).json({ customer: updatedCustomer }); + res.status(201).json({ customer: updatedCustomer }); } catch (error) { if (error.code === 'P2025') { return res.status(404).json({ error: error.message }); diff --git a/src/controllers/movies.js b/src/controllers/movies.js index b7d3fe1e..c2d81d25 100644 --- a/src/controllers/movies.js +++ b/src/controllers/movies.js @@ -54,7 +54,7 @@ const { return res.status(400).json({ error: 'Missing fields in request body' }); } const updatedMovie = await updateMovieByIdDb(Number(id), title, runtimeMins); - res.status(200).json({ movie: updatedMovie }); + res.status(201).json({ movie: updatedMovie }); } catch (error) { if (error.code === 'P2015') { res.status(404).json({ error: 'Movie not found' }); diff --git a/src/domains/movies.js b/src/domains/movies.js index ded476be..83b2d82e 100644 --- a/src/domains/movies.js +++ b/src/domains/movies.js @@ -37,32 +37,13 @@ const createMovieDb = async (title, runtimeMins, screenings) => { * @param {number} [runtimeGt] - Minimum runtime filter (optional). * @returns {Promise} Array of movies that match the runtime filters. */ -const getAllMoviesDb = async (runtimeLt, runtimeGt) => { - const where = { - screenings: { - some: { - startsAt: { gt: new Date().toISOString() }, - }, - }, - }; +const getAllMoviesDb = async () => { - if (runtimeLt !== undefined) { - where.runtimeMins = { lt: runtimeLt }; - } - if (runtimeGt !== undefined) { - where.runtimeMins = { ...where.runtimeMins, gt: runtimeGt }; - } const movies = await prisma.movie.findMany({ include: { - screenings: { - where: { - startsAt: { gt: new Date().toISOString() }, - }, - }, - reviews: true, + screenings: {} }, - where, }); return movies; diff --git a/src/routers/customer.js b/src/routers/customer.js index 6a9f0807..b33749e3 100644 --- a/src/routers/customer.js +++ b/src/routers/customer.js @@ -1,43 +1,16 @@ const express = require('express'); const { PrismaClient } = require('@prisma/client'); const prisma = new PrismaClient(); +const { + createCustomer, + updateCustomer +} = require('../controllers/customer') const router = express.Router(); -// Update customer endpoint -router.put('/:id', async (req, res) => { - const { id } = req.params; - const { name, contact } = req.body; - - if (!name && !contact) { - return res.status(400).json({ error: 'Request body must contain name or contact' }); - } - - try { - // Check if customer exists - const existingCustomer = await prisma.customer.findUnique({ where: { id: parseInt(id) } }); +router.post('/register', createCustomer) - if (!existingCustomer) { - return res.status(404).json({ error: 'Customer not found' }); - } - - // Update customer data - const updatedCustomer = await prisma.customer.update({ - where: { id: parseInt(id) }, - data: { - name, - contact: contact ? { - update: contact - } : undefined, - }, - include: { contact: true } - }); - - return res.status(201).json({ customer: updatedCustomer }); - } catch (error) { - console.error(error); - return res.status(500).json({ error: 'Internal server error' }); - } -}); +// Update customer endpoint +router.put('/:id', updateCustomer); module.exports = router; diff --git a/src/server.js b/src/server.js index 20980c16..e3fc8457 100644 --- a/src/server.js +++ b/src/server.js @@ -1,18 +1,26 @@ // src/server.js const express = require('express'); -const movieRouter = require('./routers/movies'); // Assuming this file exists and handles movie routes -const customerRouter = require('./routers/customer'); // Assuming this file exists and handles customer routes -const screenRouter = require('./routers/screens'); // Assuming this file exists and handles screen routes - const app = express(); -// Middleware -app.use(express.json()); // Middleware to parse JSON request bodies +const cors = require('cors'); +const morgan = require('morgan'); + +app.disable('x-powered-by'); + +// Add middleware +app.use(cors()); +app.use(morgan('dev')); +app.use(express.json()); +app.use(express.urlencoded({ extended: true })); + +const movieRouter = require('./routers/movies'); +const customerRouter = require('./routers/customer'); +const screenRouter = require('./routers/screens'); // Routes app.use('/movies', movieRouter); // Mounting movieRouter to handle routes starting with '/movies' -app.use('/customer', customerRouter); // Mounting customerRouter to handle routes starting with '/customers' +app.use('/customers', customerRouter); // Mounting customerRouter to handle routes starting with '/customers' app.use('/screens', screenRouter); // Mounting screenRouter to handle routes starting with '/screens' // Error handling middleware diff --git a/test/setupTests.js b/test/setupTests.js index bfc30625..f17a96c2 100644 --- a/test/setupTests.js +++ b/test/setupTests.js @@ -1,18 +1,28 @@ -const { PrismaClient } = require('@prisma/client'); +const prisma = require("../src/utils/prisma") -const prisma = new PrismaClient(); +const deleteTables = () => { + const deleteTables = [ + prisma.ticket.deleteMany(), + prisma.screening.deleteMany(), + prisma.movie.deleteMany(), + prisma.screen.deleteMany(), + prisma.contact.deleteMany(), + prisma.customer.deleteMany(), + ]; -// Setup function before tests -beforeAll(async () => { - await prisma.$connect(); - // Additional setup (e.g., seed test data) -}); + // Conditionally delete this table as this will only exist if "Extensions to the Extensions" bullet 2 is implemented + prisma.reviews && deleteTables.push(prisma.reviews.deleteMany()) + return prisma.$transaction(deleteTables) +} -// Teardown function after tests -afterAll(async () => { - await prisma.$disconnect(); -}); +global.beforeAll(() => { + return deleteTables() +}) -module.exports = { - prisma, -}; +global.afterEach(() => { + return deleteTables() +}) + +global.afterAll(() => { + return prisma.$disconnect() +}) \ No newline at end of file