Fix event not returning event

COS301-SE-2023 · Sep 27, 2023 · fb56c94 · fb56c94
1 parent 400a9cd
commit fb56c94
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/libs/app/api/src/lib/app-api.ts b/libs/app/api/src/lib/app-api.ts
@@ -167,13 +167,14 @@ export class AppApiService {
   }
 
   async getEvent(eventId: IEventId): Promise<IEvent> {
-    return firstValueFrom(
-      this.http.get<IEvent>(`/api/event/getEvent?eventId=${eventId.eventId}`, {
+    const data = await firstValueFrom(
+      this.http.get<IGetEventResponse>(`/api/event/getEvent?eventId=${eventId.eventId}`, {
         headers: {
           'x-csrf-token': this.cookieService.get('csrf'),
         },
       })
     );
+    return data.event;
   }
 
   async getAllEvents(): Promise<IEvent[]> {

diff --git a/libs/app/components/src/lib/event-details-page/event-details-page.component.ts b/libs/app/components/src/lib/event-details-page/event-details-page.component.ts
@@ -73,8 +73,8 @@ export class EventDetailsPageComponent implements OnInit, AfterViewInit {
     }
 
     this.event = (
-      (await this.appApiService.getEvent({ eventId: this.id })) as any
-    ).event;
+      (await this.appApiService.getEvent({ eventId: this.id }))
+    );
 
     if (this.event === null) {
       this.ngZone.run(() => { this.router.navigate(['/home']); });

diff --git a/libs/app/components/src/lib/floorplan-editor-page/floorplan-editor-page.component.ts b/libs/app/components/src/lib/floorplan-editor-page/floorplan-editor-page.component.ts
@@ -2437,8 +2437,8 @@ export class FloorplanEditorPageComponent implements OnInit, AfterViewInit{
         }
 
         this.event = (
-          (await this.appApiService.getEvent({ eventId: this.id })) as any
-        ).event;
+          (await this.appApiService.getEvent({ eventId: this.id }))
+        );
 
         if (this.event === null) {
           this.ngZone.run(() => { this.router.navigate(['/home']); });

diff --git a/libs/app/components/src/lib/streaming/streaming.component.ts b/libs/app/components/src/lib/streaming/streaming.component.ts
@@ -114,8 +114,8 @@ export class StreamingComponent implements OnInit, AfterViewInit {
 
     if (role === 'admin') {
       this.event = (
-        (await this.appApiService.getEvent({ eventId: this.eventID })) as any
-      ).event;
+        (await this.appApiService.getEvent({ eventId: this.eventID }))
+      );
     } else {
       this.event = (
         (await this.appApiService.getSubscribedEvents()) as any