Merge pull request #13 from PBL6-team-CATS/feat/backend/branch-and-menu

backend/src/modules/branch/branch.controller.ts

@@ -8,34 +8,46 @@ import {
   Delete,
 } from '@nestjs/common';
 import { BranchService } from './branch.service.js';
-import { BranchDto } from './dto/create-branch.dto.js';
+import { CreateBranchDto } from './dto/create-branch.dto.js';
+import { UpdateBranchDto } from './dto/update-branch.dto.js';
 
 @Controller('branch')
 export class BranchController {
   constructor(private readonly branchService: BranchService) {}
 
   @Post()
-  create(@Body() createBranchDto: BranchDto) {
+  create(@Body() createBranchDto: CreateBranchDto) {
     return this.branchService.create(createBranchDto);
   }
 
   @Get()
-  findAll() {
+  async findAll() {
     return this.branchService.findAll();
   }
 
   @Get(':id')
-  findOne(@Param('id') id: string) {
-    return this.branchService.findOne(+id);
+  async findOne(@Param('id') id: string) {
+    return this.branchService.findOne(id);
   }
 
   @Patch(':id')
-  update(@Param('id') id: string, @Body() updateBranchDto: BranchDto) {
-    return this.branchService.update(+id, updateBranchDto);
+  async update(
+    @Param('id') id: string,
+    @Body() updateBranchDto: UpdateBranchDto,
+  ) {
+    return this.branchService.update(id, updateBranchDto);
   }
 
   @Delete(':id')
-  remove(@Param('id') id: string) {
-    return this.branchService.remove(+id);
+  async remove(@Param('id') id: string) {
+    return this.branchService.remove(id);
+  }
+
+  @Post(':id/menu-items')
+  async addMenuItemToBranch(@Param('id') id: string) {}
+
+  @Get(':id/menu-items')
+  async getMenuItemWithBranchId(@Param('id') id: string) {
+    
   }
 }

backend/src/modules/branch/branch.service.ts

@@ -1,25 +1,44 @@
-import { Injectable } from '@nestjs/common';
-import { BranchDto } from './dto/create-branch.dto';
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { CreateBranchDto } from './dto/create-branch.dto.js';
+import { BranchEntity } from '../../entities/branch.entity.js';
+import { Public } from '../authentication/authentication.decorator.js';
+import { UpdateBranchDto } from './dto/update-branch.dto.js';
+import { plainToClass } from 'class-transformer';
 
+@Public()
 @Injectable()
 export class BranchService {
-  create(createBranchDto: BranchDto) {
-    return 'This action adds a new branch';
+  async create(createBranchDto: CreateBranchDto) {
+    return await BranchEntity.create({ ...createBranchDto }).save();
   }
 
-  findAll() {
-    return `This action returns all branch`;
+  async findAll() {
+    return await BranchEntity.find();
   }
 
-  findOne(id: number) {
-    return `This action returns a #${id} branch`;
+  async findOne(id: string) {
+    return await BranchEntity.findOneBy({ id: id });
   }
 
-  update(id: number, updateBranchDto: BranchDto) {
-    return `This action updates a #${id} branch`;
+  async getBranchOrError(id: string) {
+    const branch = await BranchEntity.findOneBy({ id });
+    if (!branch) {
+      throw new NotFoundException('Menu item not found');
+    }
+    return branch;
   }
 
-  remove(id: number) {
-    return `This action removes a #${id} branch`;
+  async update(id: string, updateBranchDto: UpdateBranchDto) {
+    let branch = await this.getBranchOrError(id);
+    branch = plainToClass(BranchEntity, {
+      ...branch,
+      ...updateBranchDto,
+    });
+    return await branch.save();
+  }
+
+  async remove(id: string) {
+    let menuItem = await this.getBranchOrError(id);
+    return await menuItem.remove();
   }
 }

backend/src/modules/branch/dto/create-branch.dto.ts

@@ -1,7 +1,12 @@
-export interface BranchDto {
-  id: string;
+import { IsString } from 'class-validator';
+
+export class CreateBranchDto {
+  @IsString()
   name: string;
+
+  @IsString()
   location: string;
+
+  @IsString()
   phone_number: string;
-  owner_id: string;
 }

backend/src/modules/branch/dto/update-branch.dto.ts

@@ -0,0 +1,19 @@
+import { IsOptional, IsString } from 'class-validator';
+
+export class UpdateBranchDto {
+  @IsString()
+  @IsOptional()
+  name?: string;
+
+  @IsString()
+  @IsOptional()
+  location?: string;
+
+  @IsString()
+  @IsOptional()
+  phone_number?: string;
+
+  @IsString()
+  @IsOptional()
+  owner_id?: string;
+}