Fix major issues for employees and cafes in the frontend

Author: fsabado00

backend/README.md

@@ -1,5 +1,5 @@
 
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
+# Backend 
 
 ## Installation
 
@@ -39,12 +39,61 @@ Use Prisma CLI to apply migrations and generate the Prisma client:
 ```bash
 npx prisma migrate dev
 npx prisma generate
+```
+
+### Seed the Cafes and Employees (add dummy data)
+
+
+While the docker container/db server is running run the following:
+```bash
+npx prisma db seed
 
+or 
+
+pnpm run seed
+```
+
+Then just to be sure run again...
+
+```prisma
+npx prisma migrate dev
 ```
 
+Afterwards, seed data is in db already.
+
+
 ## API
 
-Default service api url
+
+
+### Schema (Entity Relationship)
+```prisma
+model Cafes {
+  id          Int         @id @default(autoincrement())
+  name        String      @unique
+  createdAt   DateTime    @default(now())
+  updatedAt   DateTime    @updatedAt
+  description String
+  logo        String
+  location    String
+  employees   Employees[]
+}
+
+model Employees {
+  id            Int      @id @default(autoincrement())
+  createdAt     DateTime @default(now())
+  updatedAt     DateTime @updatedAt
+  name          String
+  email_address String
+  phone_number  String
+  days_worked   Int
+  cafe          Cafes    @relation(fields: [cafesId], references: [id])
+  cafesId       Int
+}
+
+```
+
+### Default service api url
 http://location:8888
 
 > CRUD Operations:

backend/docker-compose.yaml

@@ -7,8 +7,8 @@ services:
     ports:
       - '3306:3306'
     environment:
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_DATABASE: cedb
+      - MYSQL_ROOT_PASSWORD=password
+      - MYSQL_DATABASE=cedb
 
 
   backend:
@@ -20,5 +20,6 @@ services:
     volumes:
       - .:/app
     environment:
-      DATABASE_URL: mysql://root:password@db:3306/cedb
+      - DATABASE_URL=mysql://root:password@db:3306/cedb
+      - NODE_DOCKER_PORT=8888
 

backend/package.json

@@ -20,7 +20,11 @@
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "docker:build": "docker build -f Dockerfile -t app .",
     "docker:run": "docker run -it -p 80:80 app",
-    "docker:prune": "docker system prune -a"
+    "docker:prune": "docker system prune -a",
+    "seed": "npx prisma db seed"
+  },
+  "prisma": {
+    "seed": "ts-node prisma/seed.ts"
   },
   "dependencies": {
     "@nestjs/common": "^10.0.0",

backend/prisma/migrations/20240919175845_init/migration.sql

@@ -0,0 +1,31 @@
+-- CreateTable
+CREATE TABLE `Cafes` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(191) NOT NULL,
+    `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    `updatedAt` DATETIME(3) NOT NULL,
+    `description` VARCHAR(191) 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,
+    `createdAt` DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    `updatedAt` DATETIME(3) NOT NULL,
+    `name` VARCHAR(191) NOT NULL,
+    `cafesId` INTEGER NOT NULL,
+    `days` INTEGER NOT NULL,
+    `email` VARCHAR(191) NOT NULL,
+    `phone` VARCHAR(191) NOT NULL,
+    `gender` ENUM('M', 'F') NOT NULL,
+
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddForeignKey
+ALTER TABLE `Employees` ADD CONSTRAINT `Employees_cafesId_fkey` FOREIGN KEY (`cafesId`) REFERENCES `Cafes`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;

backend/prisma/migrations/20240919180751_add_seed/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `gender` on the `Employees` table. The data in that column could be lost. The data in that column will be cast from `Enum(EnumId(0))` to `VarChar(191)`.
+
+*/
+-- AlterTable
+ALTER TABLE `Employees` MODIFY `gender` VARCHAR(191) NOT NULL;

backend/prisma/migrations/20231011220759_init/migration.sql renamed to backend/prisma/old-migs/20231011220759_init/migration.sql

@@ -9,19 +9,25 @@ datasource db {
 }
 
 model Cafes {
-  id          Int    @id @default(autoincrement())
-  name        String @unique
+  id          Int         @id @default(autoincrement())
+  name        String      @unique
+  createdAt   DateTime    @default(now())
+  updatedAt   DateTime    @updatedAt
   description String
   logo        String
   location    String
-  employees   Int
+  employees   Employees[]
 }
 
 model Employees {
-  id            Int    @id @default(autoincrement())
-  name          String
-  email_address String
-  phone_number  String
-  days_worked   Int
-  cafe          String @unique
+  id        Int      @id @default(autoincrement())
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+  name      String
+  cafesId   Int
+  days      Int
+  email     String
+  phone     String
+  gender    String
+  cafe      Cafes    @relation(fields: [cafesId], references: [id])
 }

backend/prisma/migrations/20231015213738_relations/migration.sql renamed to backend/prisma/old-migs/20231015213738_relations/migration.sql

@@ -0,0 +1,88 @@
+import { PrismaClient } from '@prisma/client';
+const prisma = new PrismaClient();
+async function main() {
+  console.log(`Start seeding ...`);
+
+  const caf1 = await prisma.cafes.create({
+    data: {
+      id: 1,
+      name: 'Digong Cafe',
+      description: 'Lorem ipsum dolor sit amet',
+      location: 'Tampines',
+      logo: 'https://gravatar.com/avatar/ef7b90c86c01dea8b4313dbb1cd0d015?s=400&d=robohash&r=x',
+    },
+  });
+  const caf2 = await prisma.cafes.create({
+    data: {
+      id: 2,
+      name: 'Farm Cafe',
+      description: 'Lorem ipsum dolor sit amet',
+      location: 'Jurong',
+      logo: 'https://gravatar.com/avatar/24f7432224dd89ca643bec40d21861a7?s=400&d=robohash&r=x',
+    },
+  });
+
+  const caf3 = await prisma.cafes.create({
+    data: {
+      id: 3,
+      name: 'Pogo Cafe',
+      description: 'Lorem ipsum dolor sit amet',
+      logo: 'https://gravatar.com/avatar/1db0c9ee9a6da87ee2416ea23dfab10d?s=400&d=robohash&r=x',
+      location: 'Raffles',
+    },
+  });
+
+  const emp1 = await prisma.employees.create({
+    data: {
+      email: 'alice.guo@prisma.io',
+      name: 'Alice Guo',
+      phone: '+6588888888',
+      days: 7,
+      cafesId: 1,
+      gender: 'F',
+    },
+  });
+  const emp2 = await prisma.employees.create({
+    data: {
+      email: 'cass.ong@prisma.io',
+      name: 'Cassandra Ong',
+      phone: '+6588888888',
+      days: 7,
+      cafesId: 1,
+      gender: 'F',
+    },
+  });
+
+  const emp3 = await prisma.employees.create({
+    data: {
+      email: 'sd@prisma.io',
+      name: 'Bratanila SD',
+      phone: '+6588888888',
+      days: 365,
+      cafesId: 3,
+      gender: 'F',
+    },
+  });
+
+  const emp4 = await prisma.employees.create({
+    data: {
+      email: '1piece@prisma.io',
+      name: 'Monkey D. Luffy',
+      phone: '+6588888888',
+      days: 7,
+      cafesId: 2,
+      gender: 'M',
+    },
+  });
+
+  console.log('Creates: ', { emp1, emp2, emp3, emp4, caf1, caf2, caf3 });
+}
+main()
+  .then(async () => {
+    await prisma.$disconnect();
+  })
+  .catch(async (e) => {
+    console.error(e);
+    await prisma.$disconnect();
+    process.exit(1);
+  });

backend/prisma/migrations/20240919030844_cafe_emp/migration.sql renamed to backend/prisma/old-migs/20240919030844_cafe_emp/migration.sql

@@ -11,14 +11,21 @@ export class CafesService {
   }
 
   async findAll() {
-    return this.databaseService.cafes.findMany({});
+    return this.databaseService.cafes.findMany({
+      include: {
+        employees: true,
+      },
+    });
   }
 
   async findOne(id: number) {
     return this.databaseService.cafes.findUnique({
       where: {
         id,
       },
+      include: {
+        employees: true,
+      },
     });
   }
 

backend/prisma/migrations/20240919031931_again/migration.sql renamed to backend/prisma/old-migs/20240919031931_again/migration.sql

@@ -11,14 +11,21 @@ export class EmployeesService {
   }
 
   async findAll() {
-    return this.databaseService.employees.findMany({});
+    return this.databaseService.employees.findMany({
+      include: {
+        cafe: true,
+      },
+    });
   }
 
   async findOne(id: number) {
     return this.databaseService.employees.findUnique({
       where: {
         id,
       },
+      include: {
+        cafe: true,
+      },
     });
   }
 

backend/prisma/migrations/20240919033817_update_cafe_employees/migration.sql renamed to backend/prisma/old-migs/20240919033817_update_cafe_employees/migration.sql

@@ -13,6 +13,6 @@ async function bootstrap() {
   };
 
   app.enableCors(options);
-  await app.listen(8888);
+  await app.listen(port);
 }
 bootstrap();

backend/prisma/migrations/20240919034312_clean_up_schema/migration.sql renamed to backend/prisma/old-migs/20240919034312_clean_up_schema/migration.sql

@@ -11,9 +11,8 @@
     "lint": "eslint . --ext js,ts,tsx",
     "format": "prettier --write **/*.{js,ts,tsx} && eslint . --ext js,ts,tsx --fix",
     "preview": "vite preview",
-    "prepare": "husky install",
-    "docker:build": "docker build -f Dockerfile -t frontend .",
-    "docker:run": "docker run -it -p 80:80 frontend"
+    "postinstall": "bash postinstall.sh",
+    "prepare": "husky install"
   },
   "dependencies": {
     "@emotion/babel-plugin": "^11.11.0",
@@ -30,6 +29,7 @@
     "clsx": "^2.0.0",
     "lodash": "^4.17.21",
     "lucide-react": "^0.279.0",
+    "moment": "^2.30.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-error-boundary": "^4.0.11",

backend/prisma/schema.prisma

@@ -1,16 +1,23 @@
 import axiosClient from '@/api/clients/axios-client.ts';
 import { ResponseDataType, CafeDataType, CafeDataMutationType } from '@/api/services';
+import { omit } from 'lodash';
 
 const baseUrl = 'cafes';
 
 const methodsApi = {
   getList: (): Promise<ResponseDataType> => axiosClient.get(baseUrl),
+
   getDetail: (id: string): Promise<{ code: number; data: CafeDataType }> =>
     axiosClient.get(`${baseUrl}/${id}`),
+
   add: (body: CafeDataMutationType): Promise<{ code: number; data: CafeDataType }> =>
-    axiosClient.post(baseUrl, { ...body, employees: parseInt(body.employees as string) }),
+    axiosClient.post(baseUrl, { ...omit(body, 'employees') }),
+
   update: (body: { id: string; data: CafeDataMutationType }): Promise<{ code: number; data: CafeDataType }> =>
-    axiosClient.put(baseUrl, body),
+    axiosClient.patch(baseUrl + `/${body.id}`, {
+      ...omit(body?.data, ['employees', 'id', 'updatedAt', 'createdAt']),
+    }),
+
   delete: (id: string): Promise<{ code: number; message: string }> => axiosClient.delete(baseUrl + `/${id}`),
 };