functional Crud

unknowncoder05 · unknowncoder05 · commit d12426436c42 · 2021-06-13T12:50:45.000-05:00
diff --git a/src/controllers/projects/projects.controller.ts b/src/controllers/projects/projects.controller.ts
@@ -6,35 +6,35 @@ export class ProjectsController {
     constructor(private databaseService: DatabaseService) { }
     @Get(":projectID")
     @HttpCode(HttpStatus.FOUND)
-    get(@Param("projectID") projectID: string): object {
-        return { data: "maintenance" }//AppService.getProject(projectID);
+    async get(@Param("projectID") projectID: number): Promise<object> {
+        return { data: await this.databaseService.getProject(projectID) }//AppService.getProject(projectID);
     }
     @Get()
     @HttpCode(HttpStatus.FOUND)
-    list(@Query() params: any): object {
-        return this.databaseService.getProjects(params);
+    async list(@Query() params: any): Promise<object> {
+        return { data: await this.databaseService.getProjects(params) }
     }
     @Post()
     @HttpCode(HttpStatus.CREATED)
-    async create(@Body() payload: any) {
+    async create(@Body() payload: any): Promise<object> {
         const { name, description, location } = payload
         let newProduct = await this.databaseService.createProject(name, description, location)
 
         return { msg: "created", data: newProduct };
     }
     @Put(":projectID")
     @HttpCode(HttpStatus.ACCEPTED)
-    update(@Param("projectID") projectID: string, @Body() payload: any): object {
-        return this.databaseService.updateProject(projectID, payload);
+    async update(@Param("projectID") projectID: number, @Body() payload: any): Promise<object> {
+        return { msg: "updated", data: await this.databaseService.updateProject(projectID, payload) }
     }
     @Delete(":projectID")
-    delete(@Res() response: Response, @Param("projectID") projectID: string) {
-        let deleted = this.databaseService.deleteProject(projectID)
+    async delete(@Res() response: Response, @Param("projectID") projectID: number) {
+        let deleted = await this.databaseService.deleteProject(projectID)
         let status = HttpStatus.OK,
             res = { msg: "deleted" }
-        if (projectID != "1") {
+        if (!deleted) {
+            res.msg = "not found"
             status = HttpStatus.NOT_FOUND
-            res = { msg: "project not found" }
         }
         response.status(status).send(res)
     }
diff --git a/src/services/database/database.service.ts b/src/services/database/database.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, Inject } from '@nestjs/common';
+import { Injectable, Inject, NotFoundException } from '@nestjs/common';
 import { Client } from 'pg';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm'; // 👈 import
@@ -33,26 +33,32 @@ export class DatabaseService {
             "2": "rust"
         }
     }
-    async createProject(name: string, description: string, location: string) {
+    async createProject(name: string, description: string, location: string): Promise<object> {
         let poject = this.projectRepo.create({ name, description, location })
         await this.projectRepo.save(poject)
         return { id: poject.id };
     }
-    getProject(id): object {
-        return {
-            data: this.projectRepo.findOne(id)
-        };
+    async getProject(id: number): Promise<object> {
+        const project = await this.projectRepo.findOne(id);
+        if (!project) {
+            throw new NotFoundException(`Product #${id} not found`);
+        }
+        return project;
     }
-    getProjects(params): object {
-        //this.clientPg.query("SELECT * FROM projects")
-        return {
-            data: this.projectRepo.find()
-        };
+    async getProjects(params): Promise<object> {
+        let data = await this.projectRepo.find()
+        return data;
     }
-    updateProject(id, payload): object {
-        return { data: this.db.projects[id] };
+    async updateProject(id: number, payload: object): Promise<object> {
+        const project = await this.projectRepo.findOne(id);
+        this.projectRepo.merge(project, payload);
+        return await this.projectRepo.save(project);
     }
-    deleteProject(id): object {
-        return { data: this.db.projects[id] };
+    async deleteProject(id: number): Promise<boolean> {
+        let deleted = await this.projectRepo.delete(id)
+        if (deleted.affected != 1) {
+            return false
+        }
+        return true
     }
 }
