refactored TicketAssign -> Assignment

cdalton713 · Nov 28, 2020 · 448eef3 · 448eef3
1 parent e404ab8
commit 448eef3
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 35 deletions.
diff --git a/api/src/app.module.ts b/api/src/app.module.ts
@@ -5,7 +5,7 @@ import { AppController } from './app.controller';
 import { AppService } from './app.service';
 import { TicketModule } from './ticket/ticket.module';
 import { TicketWorkModule } from './work/ticketwork.module';
-import { TicketAssignModule } from './assign/ticketassign.module';
+import { AssignmentModule } from './assignment/assignment.module.';
 import { UserModule } from './user/uer.module';
 
 /**
@@ -41,7 +41,7 @@ const configImports = (modules: ModuleMetadata['imports']) => {
   imports: configImports([
     TicketModule,
     TicketWorkModule,
-    TicketAssignModule,
+    AssignmentModule,
     UserModule,
   ]),
   controllers: [AppController],

diff --git a/api/src/assign/ticketassign.module.ts b/api/src/assign/ticketassign.module.ts
diff --git a/api/src/assign/ticketassign.controller.ts → api/src/assignment/assignment.controller.ts b/api/src/assign/ticketassign.controller.ts → api/src/assignment/assignment.controller.ts
@@ -7,18 +7,18 @@ import {
   Param,
   Delete,
 } from '@nestjs/common';
-import { TicketAssignService } from './ticketassign.service';
-import { CreateTicketAssignDto } from './dto/create-ticketassign.dto';
-import { UpdateTicketAssignDto } from './dto/update-ticketassign.dto';
+import { AssignmentService } from './assignment.service';
+import { CreateAssignmentDTO } from './dto/create-assignment.dto';
+import { UpdateAssignmentDTO } from './dto/update-assignment.dto';
 import { ApiTags } from '@nestjs/swagger';
 
 @ApiTags('ticket')
 @Controller('/api/ticket/assign')
-export class TicketAssignController {
-  constructor(private readonly ticketAssignService: TicketAssignService) {}
+export class AssignmentController {
+  constructor(private readonly ticketAssignService: AssignmentService) {}
   /* Working Implementation */
   @Post()
-  async create(@Body() createTicketAssignDto: CreateTicketAssignDto) {
+  async create(@Body() createTicketAssignDto: CreateAssignmentDTO) {
     return await this.ticketAssignService.create(createTicketAssignDto);
   }
   /* TODO */
@@ -35,7 +35,7 @@ export class TicketAssignController {
   @Put(':id')
   update(
     @Param('id') id: string,
-    @Body() updateTicketAssignDto: UpdateTicketAssignDto,
+    @Body() updateTicketAssignDto: UpdateAssignmentDTO,
   ) {
     return this.ticketAssignService.update(+id, updateTicketAssignDto);
   }

diff --git a/api/src/assignment/assignment.module..ts b/api/src/assignment/assignment.module..ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { AssignmentService } from './assignment.service';
+import { AssignmentController } from './assignment.controller';
+import { DbModule } from 'src/db/db.module';
+
+@Module({
+  imports: [DbModule],
+  controllers: [AssignmentController],
+  providers: [AssignmentService],
+})
+export class AssignmentModule {}
diff --git a/api/src/assign/ticketassign.service.ts → api/src/assignment/assignment.service.ts b/api/src/assign/ticketassign.service.ts → api/src/assignment/assignment.service.ts
@@ -1,25 +1,20 @@
 import { HttpException, HttpStatus, Inject, Injectable } from '@nestjs/common';
 import { Pool } from 'pg';
 import { PG_CONNECTION } from 'src/connection';
-import { CreateTicketAssignDto } from './dto/create-ticketassign.dto';
-import { UpdateTicketAssignDto } from './dto/update-ticketassign.dto';
-import { TicketAssign } from './entities/ticketassign.entity';
+import { CreateAssignmentDTO } from './dto/create-assignment.dto';
+import { UpdateAssignmentDTO } from './dto/update-assignment.dto';
+import { AssignmentDTO } from './dto/assignment.dto';
 
 /* TODO: 
    - Implement remaining methods
    - Find solution to abstract SQL
 */
 @Injectable()
-export class TicketAssignService {
+export class AssignmentService {
   constructor(@Inject(PG_CONNECTION) private connection: Pool) {}
 
-  async create(createTicketAssignDto: CreateTicketAssignDto) {
-    const {
-      assignedby,
-      assignedto,
-      comment,
-      assigndate,
-    } = createTicketAssignDto;
+  async create(createAssignmentDTO: CreateAssignmentDTO) {
+    const { assignedby, assignedto, comment, assigndate } = createAssignmentDTO;
 
     /* Insert new user into db 
          TODO: implement error handling for pg request
@@ -47,7 +42,7 @@ export class TicketAssignService {
     return `This action returns a #${id} user`;
   }
   /* TODO */
-  update(id: number, updateTicketAssignDto: UpdateTicketAssignDto) {
+  update(id: number, updateAssignmentDTO: UpdateAssignmentDTO) {
     return `This action updates a #${id} user`;
   }
   /* TODO */

diff --git a/...rc/assign/entities/ticketassign.entity.ts → api/src/assignment/dto/assignment.dto.ts b/...rc/assign/entities/ticketassign.entity.ts → api/src/assignment/dto/assignment.dto.ts
@@ -1,4 +1,4 @@
-export class TicketAssign {
+export class AssignmentDTO {
   assignedby: string;
   assignedto: string;
   comment: string;

diff --git a/...src/assign/dto/create-ticketassign.dto.ts → ...c/assignment/dto/create-assignment.dto.ts b/...src/assign/dto/create-ticketassign.dto.ts → ...c/assignment/dto/create-assignment.dto.ts
@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 
-export class CreateTicketAssignDto {
+export class CreateAssignmentDTO {
   @ApiProperty({ minLength: 3 })
   assignedby: string;
 

diff --git a/...src/assign/dto/update-ticketassign.dto.ts → ...c/assignment/dto/update-assignment.dto.ts b/...src/assign/dto/update-ticketassign.dto.ts → ...c/assignment/dto/update-assignment.dto.ts
@@ -1,4 +1,4 @@
-export class UpdateTicketAssignDto {
+export class UpdateAssignmentDTO {
   assignedby: string;
   assignedto: string;
   comment: string;