fix merge conflicts

server/src/data-layer/models/firebase.ts

@@ -148,6 +148,10 @@ export interface EventReservation {
    * @example true
    */
   is_member: boolean
+  /**
+   * This is the timestamp of when the reservation was made
+   */
+  timestamp: Timestamp
 }
 
 export interface Event {

server/src/data-layer/services/EventService.test.ts

@@ -10,26 +10,28 @@ import { Timestamp } from "firebase-admin/firestore"
 
 const eventService = new EventService()
 
-const startDate = dateToFirestoreTimeStamp(new Date(2024, 1, 1))
-const endDate = dateToFirestoreTimeStamp(new Date(2024, 1, 2))
+const startDate = new Date(2024, 1, 1)
+const endDate = new Date(2024, 1, 2)
+const startTimestamp = dateToFirestoreTimeStamp(startDate)
+const endTimestamp = dateToFirestoreTimeStamp(endDate)
 
 const laterStartDate = dateToFirestoreTimeStamp(new Date(2024, 2, 2))
 
 const event1: Event = {
   title: "UASC new event",
   description: "Grand opening of the website.",
   location: "Virtual pizza event",
-  physical_start_date: startDate,
-  start_date: startDate,
-  end_date: endDate
+  physical_start_date: startTimestamp,
+  start_date: startTimestamp,
+  end_date: endTimestamp
 }
 const event2: Event = {
   title: "Snowboard racing",
   description: "Race and see who's the fastest!",
   location: "Snowsport club",
-  physical_start_date: startDate,
-  start_date: startDate,
-  end_date: endDate
+  physical_start_date: startTimestamp,
+  start_date: startTimestamp,
+  end_date: endTimestamp
 }
 const now = new Date(Date.now())
 const futureEvent: Event = {
@@ -46,13 +48,15 @@ const reservation1: EventReservation = {
   first_name: "John",
   last_name: "Appleseed",
   email: "[email protected]",
-  is_member: true
+  is_member: true,
+  timestamp: Timestamp.fromDate(startDate)
 }
 const reservation2: EventReservation = {
   first_name: "Jane",
   last_name: "Pearseed",
   email: "[email protected]",
-  is_member: false
+  is_member: false,
+  timestamp: Timestamp.fromDate(startDate)
 }
 
 describe("EventService integration tests", () => {

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

@@ -27,7 +27,7 @@ const event2: Event = {
   start_date: startDate,
   end_date: endDate
 }
-const reservation1: EventReservation = {
+const reservation1: Omit<EventReservation, "timestamp"> = {
   first_name: "John",
   last_name: "Doe",
   email: "[email protected]",
@@ -88,7 +88,10 @@ describe("EventController endpoint tests", () => {
 
     it("should return 400 if already signed up to event", async () => {
       const event = await eventService.createEvent(event1)
-      await eventService.addReservation(event.id, reservation1)
+      await eventService.addReservation(event.id, {
+        ...reservation1,
+        timestamp: Timestamp.now()
+      })
       const res = await request.post("/events/signup").send({
         event_id: event.id,
         reservation: reservation1

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

@@ -15,6 +15,7 @@ import {
   SuccessResponse
 } from "tsoa"
 import express from "express"
+import { Timestamp } from "firebase-admin/firestore"
 
 @Route("events")
 export class EventController extends Controller {
@@ -56,7 +57,10 @@ export class EventController extends Controller {
     }
     // Sign up the user
     try {
-      await eventService.addReservation(event_id, reservation)
+      await eventService.addReservation(event_id, {
+        ...reservation,
+        timestamp: Timestamp.now()
+      })
       this.setStatus(200)
       return {
         message: "Successfully signed up for event.",

server/src/service-layer/request-models/EventRequests.ts

@@ -2,7 +2,7 @@ import { EventReservation, Event } from "data-layer/models/firebase"
 
 export interface EventSignupBody {
   event_id: string
-  reservation: EventReservation
+  reservation: Omit<EventReservation, "timestamp">
 }
 
 export interface CreateEventBody {