Merge branch 'master' into react-frontend

cdalton713 · Nov 29, 2020 · ee2b78e · ee2b78e
2 parents ba87554 + 40b7ea2
commit ee2b78e
Show file tree

Hide file tree

Showing 30 changed files with 600 additions and 294 deletions.
diff --git a/api/README.md b/api/README.md
@@ -110,11 +110,12 @@ req: none
 res: body: {CombineDTO}
 ```
 
-Update ticket
+Updates one ticket by ticket_id; Does NOT update user or device
 
 ```
-/* NOT WORKING */
-PUT /api/ticket/{id}
+PUT /api/ticket/{ticket_id}
+req: body: {UpdateTicketDTO}
+res: body: {TicketDTO}
 ```
 
 ## User
@@ -155,16 +156,51 @@ GET /api/user/{lsu_id}
 res: body: {UserDTO}
 ```
 
-Update user
+Update user by lsu_id
 
 ```
-/* NOT WORKING */
 PUT /api/user/{lsu_id}
+req: body: {UpdateUserDTO}
+res: body: {UserDTO}
 ```
 
-## Assign
+## Assignment
 
-TODO
+Get all assignments
+
+```
+GET /api/assignment
+res: body: {AssignmentDTO}
+```
+
+Get all assignments assigned to admin by lsu_id
+
+```
+GET /api/assignment/user/{lsu_id}
+res: body: {AssignmentDTO[]}
+```
+
+Get all assignments assigned to ticket by ticket_id
+
+```
+GET /api/assignment/ticket/{ticket_id}
+res: body: {AssignmentDTO[]}
+```
+
+Get one assignment by assignment_id
+
+```
+GET /api/assignment/{assignment_id}
+res: body: {AssignmentDTO}
+```
+
+Post new assignment
+
+```
+POST /api/assignment
+req: body: {CreateAssignmentDTO}
+res: body: {AssignmentDTO}
+```
 
 ## Work
 

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/dto/create-ticketassign.dto.ts b/api/src/assign/dto/create-ticketassign.dto.ts
diff --git a/api/src/assign/dto/update-ticketassign.dto.ts b/api/src/assign/dto/update-ticketassign.dto.ts
diff --git a/api/src/assign/entities/ticketassign.entity.ts b/api/src/assign/entities/ticketassign.entity.ts
diff --git a/api/src/assign/ticketassign.controller.ts b/api/src/assign/ticketassign.controller.ts
diff --git a/api/src/assign/ticketassign.module.ts b/api/src/assign/ticketassign.module.ts
diff --git a/api/src/assign/ticketassign.service.ts b/api/src/assign/ticketassign.service.ts
diff --git a/api/src/assignment/assignment.controller.ts b/api/src/assignment/assignment.controller.ts
@@ -0,0 +1,45 @@
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import { AssignmentService } from './assignment.service';
+import { AssignmentType } from './dto/assignment.dto';
+import { CreateAssignmentDTO } from './dto/create-assignment.dto';
+
+@ApiTags('assignment')
+@Controller('/api/assign')
+export class AssignmentController {
+  constructor(private readonly ticketAssignService: AssignmentService) {}
+
+  /* WORKING Implementation */
+  /* TODO: fix date formatting */
+  @Post()
+  async create(@Body() createAssignmentDTO: CreateAssignmentDTO) {
+    return await this.ticketAssignService.create(createAssignmentDTO);
+  }
+
+  /* WORKING Implementation */
+  @Get()
+  findAll() {
+    return this.ticketAssignService.findAll();
+  }
+
+  /* WORKING Implementation */
+  @Get('user/:lsu_id')
+  findAllByLsuId(@Param('lsu_id') lsu_id: number) {
+    return this.ticketAssignService.findAllById(AssignmentType.LSU_ID, lsu_id);
+  }
+
+  /* WORKING Implementation */
+  @Get('ticket/:ticket_id')
+  findAllByTicketId(@Param('ticket_id') ticket_id: number) {
+    return this.ticketAssignService.findAllById(
+      AssignmentType.TICKET_ID,
+      ticket_id,
+    );
+  }
+
+  /* WORKING Implementation */
+  @Get(':assignment_id')
+  findOne(@Param('assignment_id') assignment_id: string) {
+    return this.ticketAssignService.findOne(+assignment_id);
+  }
+}
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 {}