Docker is working, clean up backend

Author: fsabado00

.env

@@ -0,0 +1,16 @@
+
+DATABASE_URL=mysql://root:password@db:3306/cedb
+MYSQL_DATABASE=cedb
+MYSQL_ROOT_PASSWORD=password
+
+MYSQLDB_LOCAL_PORT=3306
+MYSQLDB_DOCKER_PORT=3306
+
+NODE_LOCAL_PORT=8888
+NODE_DOCKER_PORT=8888
+
+CLIENT_ORIGIN=http://127.0.0.1:8888
+CLIENT_API_BASE_URL=http://127.0.0.1:6868/api
+
+REACT_LOCAL_PORT=8080
+REACT_DOCKER_PORT=8080

.gitignore

@@ -17,7 +17,6 @@ dist
 dist-ssr
 *.local
 
-.env
 *docs
 
 
@@ -33,3 +32,8 @@ frontend/docs
 
 backend/.idea
 frontend/.idea
+
+backend/dbdata
+
+# TODO: For demo purposes we allow .env to be pushed
+# .env

README.md

@@ -0,0 +1,77 @@
+<p align="center">
+  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="200" alt="Nest Logo" /></a>
+</p>
+
+[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
+[circleci-url]: https://circleci.com/gh/nestjs/nest
+
+  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
+    <p align="center">
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
+<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
+<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
+<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
+<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
+<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
+<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
+  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg"/></a>
+    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
+  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow"></a>
+</p>
+  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
+  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
+
+## Description
+
+[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+
+## Installation
+
+```bash
+$ pnpm install
+```
+
+## Running the app
+
+```bash
+# development
+$ pnpm run start
+
+# watch mode
+$ pnpm run start:dev
+
+# production mode
+$ pnpm run start:prod
+```
+
+## Test
+
+```bash
+# unit tests
+$ pnpm run test
+
+# e2e tests
+$ pnpm run test:e2e
+
+# test coverage
+$ pnpm run test:cov
+```
+
+##
+Use Prisma CLI to apply migrations and generate the Prisma client:
+
+```bash
+npx prisma migrate dev
+npx prisma generate
+
+
+# Docker commands
+docker system prune -a
+docker-compose up db
+
+```
+
+## License
+
+Nest is [MIT licensed](LICENSE).

backend/.env

@@ -0,0 +1,10 @@
+# Environment variables declared in this file are automatically made available to Prisma.
+# See the documentation for more detail: https://pris.ly/d/prisma-schema#accessing-environment-variables-from-the-schema
+
+# Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
+# See the documentation for all the connection string options: https://pris.ly/d/connection-strings
+
+DATABASE_URL=mysql://root:password@localhost:3306/cedb
+
+NODE_LOCAL_PORT=8888
+NODE_DOCKER_PORT=8888

backend/Dockerfile

@@ -25,7 +25,8 @@ EXPOSE $NODE_DOCKER_PORT
 
 
 CMD ["./waitForIt.sh", "db:3306", "--", "./migratePrisma.sh"]
-CMD ["npx","prisma", "migrate", "dev"]
 
+CMD ["npx","prisma", "migrate", "dev"]
 CMD ["pnpm", "run", "start"]
+
 #CMD ["node","dist/main.js"]

backend/prisma/migrations/20240919030844_cafe_emp/migration.sql

@@ -0,0 +1,31 @@
+-- AlterTable
+ALTER TABLE `Review` ADD COLUMN `cafesId` INTEGER NULL;
+
+-- AlterTable
+ALTER TABLE `Tag` ADD COLUMN `cafesId` INTEGER NULL;
+
+-- CreateTable
+CREATE TABLE `Cafes` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(191) NOT NULL,
+    `description` VARCHAR(191) NOT NULL,
+    `employeees` INTEGER NOT NULL,
+    `logo` VARCHAR(191) NOT NULL,
+    `location` VARCHAR(191) NOT NULL,
+
+    UNIQUE INDEX `Cafes_name_key`(`name`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateTable
+CREATE TABLE `Employees` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(191) NOT NULL,
+    `email_address` VARCHAR(191) NOT NULL,
+    `phone_number` VARCHAR(191) NOT NULL,
+    `days_worked` INTEGER NOT NULL,
+    `cafe` VARCHAR(191) NOT NULL,
+
+    UNIQUE INDEX `Employees_name_key`(`name`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

backend/prisma/migrations/20240919031931_again/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX `Employees_name_key` ON `Employees`;

backend/prisma/migrations/20240919033817_update_cafe_employees/migration.sql

@@ -0,0 +1,14 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `employeees` on the `Cafes` table. All the data in the column will be lost.
+  - A unique constraint covering the columns `[cafe]` on the table `Employees` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `employees` to the `Cafes` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE `Cafes` DROP COLUMN `employeees`,
+    ADD COLUMN `employees` INTEGER NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX `Employees_cafe_key` ON `Employees`(`cafe`);

backend/prisma/migrations/20240919034312_clean_up_schema/migration.sql

@@ -0,0 +1,36 @@
+/*
+  Warnings:
+
+  - You are about to drop the `Description` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the `Product` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the `Review` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the `Tag` table. If the table is not empty, all the data it contains will be lost.
+  - You are about to drop the `_ProductToTag` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropForeignKey
+ALTER TABLE `Description` DROP FOREIGN KEY `Description_productId_fkey`;
+
+-- DropForeignKey
+ALTER TABLE `Review` DROP FOREIGN KEY `Review_productId_fkey`;
+
+-- DropForeignKey
+ALTER TABLE `_ProductToTag` DROP FOREIGN KEY `_ProductToTag_A_fkey`;
+
+-- DropForeignKey
+ALTER TABLE `_ProductToTag` DROP FOREIGN KEY `_ProductToTag_B_fkey`;
+
+-- DropTable
+DROP TABLE `Description`;
+
+-- DropTable
+DROP TABLE `Product`;
+
+-- DropTable
+DROP TABLE `Review`;
+
+-- DropTable
+DROP TABLE `Tag`;
+
+-- DropTable
+DROP TABLE `_ProductToTag`;

backend/prisma/schema.prisma

@@ -10,42 +10,20 @@ datasource db {
   url      = env("DATABASE_URL")
 }
 
-model Product {
-  id           Int          @id @default(autoincrement())
-  name         String       @unique
-  createdAt    DateTime     @default(now())
-  updatedAt    DateTime     @updatedAt
-  price        Float
-  sale         Boolean      @default(false)
-  availibility Availibility
-  reviews      Review[]
-  tags         Tag[]
-  description  Description?
+model Cafes {
+  id          Int    @id @default(autoincrement())
+  name        String @unique
+  description String
+  employees   Int
+  logo        String
+  location    String
 }
 
-model Description {
-  id        Int     @id @default(autoincrement())
-  content   String
-  product   Product @relation(fields: [productId], references: [id])
-  productId Int     @unique
-}
-
-model Review {
-  id        Int     @id @default(autoincrement())
-  title     String
-  content   String
-  rating    Int
-  product   Product @relation(fields: [productId], references: [id])
-  productId Int
-}
-
-model Tag {
-  id       Int       @id @default(autoincrement())
-  content  String
-  products Product[]
-}
-
-enum Availibility {
-  IN_STORE
-  ONLINE
+model Employees {
+  id            Int    @id @default(autoincrement())
+  name          String
+  email_address String
+  phone_number  String
+  days_worked   Int
+  cafe          String @unique
 }

backend/src/app.controller.spec.ts

@@ -15,8 +15,8 @@ describe('AppController', () => {
   });
 
   describe('root', () => {
-    it('should return "Hello World!"', () => {
-      expect(appController.getHello()).toBe('Hello World!');
+    it('should return "'Café Page!'"', () => {
+      expect(appController.getHello()).toBe(''Café Page!'');
     });
   });
 });

backend/src/app.service.ts

@@ -3,6 +3,6 @@ import { Injectable } from '@nestjs/common';
 @Injectable()
 export class AppService {
   getHello(): string {
-    return 'Hello World!';
+    return 'Café Page!';
   }
 }

backend/src/cafes/cafes.controller.ts

@@ -1,14 +1,21 @@
-import { Controller, Get, Post, Body, Patch, Param, Delete } from '@nestjs/common';
+import {
+  Controller,
+  Get,
+  Post,
+  Body,
+  Patch,
+  Param,
+  Delete,
+} from '@nestjs/common';
+import { Prisma } from '@prisma/client';
 import { CafesService } from './cafes.service';
-import { CreateCafeDto } from './dto/create-cafe.dto';
-import { UpdateCafeDto } from './dto/update-cafe.dto';
 
 @Controller('cafes')
 export class CafesController {
   constructor(private readonly cafesService: CafesService) {}
 
   @Post()
-  create(@Body() createCafeDto: CreateCafeDto) {
+  create(@Body() createCafeDto: Prisma.CafesCreateInput) {
     return this.cafesService.create(createCafeDto);
   }
 
@@ -23,7 +30,10 @@ export class CafesController {
   }
 
   @Patch(':id')
-  update(@Param('id') id: string, @Body() updateCafeDto: UpdateCafeDto) {
+  update(
+    @Param('id') id: string,
+    @Body() updateCafeDto: Prisma.CafesUpdateInput,
+  ) {
     return this.cafesService.update(+id, updateCafeDto);
   }
 

backend/src/cafes/cafes.service.ts

@@ -1,26 +1,41 @@
 import { Injectable } from '@nestjs/common';
-import { CreateCafeDto } from './dto/create-cafe.dto';
-import { UpdateCafeDto } from './dto/update-cafe.dto';
+import { Prisma } from '@prisma/client';
+import { DatabaseService } from '../database/database.service';
 
 @Injectable()
 export class CafesService {
-  create(createCafeDto: CreateCafeDto) {
-    return 'This action adds a new cafe';
+  constructor(private readonly databaseService: DatabaseService) {}
+
+  async create(createCafeDto: Prisma.CafesCreateInput) {
+    return this.databaseService.cafes.create({ data: createCafeDto });
   }
 
-  findAll() {
-    return `This action returns all cafes`;
+  async findAll() {
+    return this.databaseService.cafes.findMany({});
   }
 
-  findOne(id: number) {
-    return `This action returns a #${id} cafe`;
+  async findOne(id: number) {
+    return this.databaseService.cafes.findUnique({
+      where: {
+        id,
+      },
+    });
   }
 
-  update(id: number, updateCafeDto: UpdateCafeDto) {
-    return `This action updates a #${id} cafe`;
+  async update(id: number, updateCafeDto: Prisma.CafesUpdateInput) {
+    return this.databaseService.cafes.update({
+      where: {
+        id,
+      },
+      data: updateCafeDto,
+    });
   }
 
-  remove(id: number) {
-    return `This action removes a #${id} cafe`;
+  async remove(id: number) {
+    return this.databaseService.cafes.delete({
+      where: {
+        id,
+      },
+    });
   }
 }