Scope get event id endpoint to admins only

* Updated endpoint

* Updated interfaces

* Updated tests

* Generate swagger

server/src/middleware/tests/AdminController.test.ts

@@ -850,4 +850,29 @@ describe("AdminController endpoint tests", () => {
       ).toEqual(newDate)
     })
   })
+  describe("GET /events/:id", () => {
+    const event1: Event = {
+      title: "UASC New event",
+      physical_start_date: dateToFirestoreTimeStamp(new Date()),
+      location: "UASC",
+      sign_up_start_date: dateToFirestoreTimeStamp(new Date()),
+      sign_up_end_date: dateToFirestoreTimeStamp(new Date())
+    }
+    const eventService = new EventService()
+
+    it("should return the event details for a valid event ID", async () => {
+      const { id: id1 } = await eventService.createEvent(event1)
+      const res = await request.get(`/events/${id1}`).send()
+      expect(res.status).toEqual(200)
+      expect(res.body.data).toBeDefined()
+      expect(res.body.data.title).toEqual("UASC New event")
+      expect(res.body.data.location).toEqual("UASC")
+    })
+
+    it("should return 404 if the event does not exist", async () => {
+      const res = await request.get("/events/random-event").send()
+      expect(res.status).toEqual(404)
+      expect(res.body.error).toEqual("Event not found.")
+    })
+  })
 })

server/src/middleware/tests/EventController.test.ts

@@ -93,21 +93,4 @@ describe("EventController endpoint tests", () => {
       )
     })
   })
-
-  describe("GET /events/:id", () => {
-    it("should return the event details for a valid event ID", async () => {
-      const { id: id1 } = await eventService.createEvent(event1)
-      const res = await request.get(`/events/${id1}`).send()
-      expect(res.status).toEqual(200)
-      expect(res.body.data).toBeDefined()
-      expect(res.body.data.title).toEqual("UASC New event")
-      expect(res.body.data.location).toEqual("UASC")
-    })
-
-    it("should return 404 if the event does not exist", async () => {
-      const res = await request.get("/events/random-event").send()
-      expect(res.status).toEqual(404)
-      expect(res.body.error).toEqual("Event not found.")
-    })
-  })
 })

server/src/service-layer/controllers/AdminController.ts

@@ -58,7 +58,10 @@ import BookingUtils, {
   CHECK_OUT_TIME
 } from "business-layer/utils/BookingUtils"
 import BookingHistoryService from "data-layer/services/BookingHistoryService"
-import { FetchLatestBookingHistoryEventResponse } from "service-layer/response-models/AdminResponse"
+import {
+  FetchLatestBookingHistoryEventResponse,
+  GetEventResponse
+} from "service-layer/response-models/AdminResponse"
 import { CreateEventBody } from "service-layer/request-models/EventRequests"
 import EventService from "data-layer/services/EventService"
 
@@ -788,4 +791,25 @@ export class AdminController extends Controller {
     }
     this.setStatus(200)
   }
+
+  @Get("{id}")
+  @SuccessResponse("200", "Successfully fetched the event")
+  public async getEventById(@Path() id: string): Promise<GetEventResponse> {
+    try {
+      const eventService = new EventService()
+      const event = await eventService.getEventById(id)
+
+      if (!event) {
+        this.setStatus(404)
+        return { error: "Event not found." }
+      }
+
+      return { data: event }
+    } catch (e) {
+      this.setStatus(500)
+      return {
+        error: "Something went wrong when fetching the event, please try again"
+      }
+    }
+  }
 }

server/src/service-layer/controllers/EventController.ts

@@ -1,9 +1,6 @@
 import EventService from "data-layer/services/EventService"
-import {
-  GetAllEventsResponse,
-  GetEventResponse
-} from "service-layer/response-models/EventResponse"
-import { Controller, Get, Path, Query, Route, SuccessResponse } from "tsoa"
+import { GetAllEventsResponse } from "service-layer/response-models/EventResponse"
+import { Controller, Get, Query, Route, SuccessResponse } from "tsoa"
 import { ONE_MINUTE_IN_MS } from "../../business-layer/utils/EventConstants"
 import { Timestamp } from "firebase-admin/firestore"
 
@@ -48,25 +45,4 @@ export class EventController extends Controller {
       }
     }
   }
-
-  @Get("{id}")
-  @SuccessResponse("200", "Successfully fetched the event")
-  public async getEventById(@Path() id: string): Promise<GetEventResponse> {
-    try {
-      const eventService = new EventService()
-      const event = await eventService.getEventById(id)
-
-      if (!event) {
-        this.setStatus(404)
-        return { error: "Event not found." }
-      }
-
-      return { data: event }
-    } catch (e) {
-      this.setStatus(500)
-      return {
-        error: "Something went wrong when fetching the event, please try again"
-      }
-    }
-  }
 }

server/src/service-layer/response-models/AdminResponse.ts

@@ -1,8 +1,12 @@
-import { BookingHistoryEvent } from "data-layer/models/firebase"
+import { BookingHistoryEvent, Event } from "data-layer/models/firebase"
 import { CommonResponse, CursorPaginatedResponse } from "./CommonResponse"
 
 export interface FetchLatestBookingHistoryEventResponse
   extends CursorPaginatedResponse,
     CommonResponse {
   historyEvents?: BookingHistoryEvent[]
 }
+
+export interface GetEventResponse extends CommonResponse {
+  data?: Event
+}

server/src/service-layer/response-models/EventResponse.ts

@@ -7,7 +7,3 @@ export interface GetAllEventsResponse
     CursorPaginatedResponse {
   data?: DocumentDataWithUid<Event>[]
 }
-
-export interface GetEventResponse extends CommonResponse {
-  data?: Event
-}