From b43ed1204fc109fc2c6e8cda3c5103d24b4a450c Mon Sep 17 00:00:00 2001
From: Alex <alxford45@gmail.com>
Date: Sat, 28 Nov 2020 19:17:23 -0600
Subject: [PATCH 1/2] updated GET /api/ticket/id to return CombinedDTO

---
 api/src/ticket/ticket.service.ts | 81 ++++++++++++++++++++++++++++++--
 1 file changed, 77 insertions(+), 4 deletions(-)

diff --git a/api/src/ticket/ticket.service.ts b/api/src/ticket/ticket.service.ts
index ca257b3..332951b 100644
--- a/api/src/ticket/ticket.service.ts
+++ b/api/src/ticket/ticket.service.ts
@@ -300,30 +300,103 @@ export class TicketService {
 
   /* WORKING implementation */
   async findOne(ticket_id: number) {
+    let response: CombinedDTO;
+
     /* Query ticket by ticket_id */
-    const query: QueryConfig = {
+    const ticketQuery: QueryConfig = {
       name: 'select_ticket_by_ticket_id',
       text: 'SELECT * FROM ticket WHERE ticket_id = $1',
       values: [ticket_id],
     };
     try {
-      const res = await this.connection.query<TicketDTO>(query);
+      const res = await this.connection.query<TicketDTO>(ticketQuery);
 
       /* If no ticket found return empty object*/
       if (res.rows.length === 0) {
         return {};
       }
+      /* Accumulate ticket into response */
+      const ticket = res.rows[0];
+      response = { ...response, ...ticket };
+    } catch (error) {
+      throw new HttpException(
+        {
+          query: ticketQuery,
+          error: error,
+        },
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
 
-      return res.rows[0];
+    /* Query user by ticket_id */
+    const userQuery: QueryConfig = {
+      name: 'select_user_by_lsu_id',
+      text: 'SELECT * FROM "user" WHERE lsu_id = $1',
+      values: [response.lsu_id],
+    };
+    try {
+      const res = await this.connection.query<UserDTO>(userQuery);
+
+      /* If no ticket throw custom error*/
+      if (res.rows.length === 0) {
+        throw new Error('BAD_REQUEST');
+      }
+      /* Accumulate ticket into response */
+      const user = res.rows[0];
+      response = { ...response, ...user };
+    } catch (error) {
+      if ((error.message = 'BAD_REQUEST')) {
+        throw new HttpException(
+          {
+            query: ticketQuery,
+            error: `Could not find user with lsu_id: ${userQuery.values[0]}`,
+          },
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
+      throw new HttpException(
+        {
+          query: ticketQuery,
+          error: error,
+        },
+        HttpStatus.INTERNAL_SERVER_ERROR,
+      );
+    }
+    /* Query device by ticket_id */
+    const deviceQuery: QueryConfig = {
+      name: 'select_device_by_ticket_id',
+      text: 'SELECT * FROM "device" WHERE ticket_id = $1',
+      values: [ticket_id],
+    };
+    try {
+      const res = await this.connection.query<DeviceDTO>(deviceQuery);
+
+      /* If no device found throw custom error*/
+      if (res.rows.length === 0) {
+        throw new Error('BAD_REQUEST');
+      }
+      /* Accumulate device into response */
+      const device = res.rows[0];
+      response = { ...response, ...device };
     } catch (error) {
+      if (error.message === 'BAD_REQUEST') {
+        throw new HttpException(
+          {
+            query: deviceQuery,
+            error: `Could not find device with ticket_id: ${deviceQuery.values[0]}`,
+          },
+          HttpStatus.INTERNAL_SERVER_ERROR,
+        );
+      }
       throw new HttpException(
         {
-          query: query,
+          query: ticketQuery,
           error: error,
         },
         HttpStatus.INTERNAL_SERVER_ERROR,
       );
     }
+    return response;
   }
 
   /* WORKING Implementation */

From deae680ff7b85a673fd3bc33f17b25da4f9db9f7 Mon Sep 17 00:00:00 2001
From: Alex <alxford45@gmail.com>
Date: Sat, 28 Nov 2020 19:20:15 -0600
Subject: [PATCH 2/2] updated endpoints on README

---
 api/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/api/README.md b/api/README.md
index 35c332e..c543990 100644
--- a/api/README.md
+++ b/api/README.md
@@ -110,6 +110,14 @@ req: none
 res: body: {CombineDTO}
 ```
 
+Get one ticket by lsu_id with user/ticket/device info
+
+```
+GET /api​/ticket​/user/{lsu_id}
+req: none
+res: body: {CombineDTO}
+```
+
 Updates one ticket by ticket_id; Does NOT update user or device
 
 ```