Fixed event service issues

HackIllinois · Oct 29, 2023 · bd5fd72 · bd5fd72
1 parent 968ff96
commit bd5fd72
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/src/database/event-db.ts b/src/database/event-db.ts
@@ -90,7 +90,7 @@ export class PublicEvent extends BaseEvent {
     @prop({ required: true })
     public displayOnStaffCheckIn: boolean;
 
-    @prop({ required: true })
+    @prop()
     public sponsor: string;
 
     @prop({ required: true })
@@ -101,7 +101,7 @@ export class PublicEvent extends BaseEvent {
         this.eventType = baseEvent.publicEventType ?? "OTHER";
         this.isPrivate = baseEvent.isPrivate ?? false;
         this.displayOnStaffCheckIn = baseEvent.displayOnStaffCheckIn ?? false;
-        this.sponsor = baseEvent.sponsor ?? "None";
+        this.sponsor = baseEvent.sponsor ?? "";
         this.points = baseEvent.points ?? Constants.DEFAULT_POINT_VALUE;
     }
 }

diff --git a/src/services/auth/auth-models.ts b/src/services/auth/auth-models.ts
@@ -6,12 +6,6 @@ export interface ProfileData {
     name?: string;
 }
 
-export interface RoleData {
-    id: string;
-    provider: Provider | string;
-    roles: Role[];
-}
-
 export interface JwtPayload {
     id: string;
     email: string;

diff --git a/src/services/event/event-formats.ts b/src/services/event/event-formats.ts
@@ -105,8 +105,11 @@ export function isValidPublicFormat(baseEvent: BaseEventFormat): boolean {
     // Cast the object to AttendeeEventFormat
     const obj: PublicEventFormat = baseEvent as PublicEventFormat;
 
+    if (obj.sponsor && typeof obj.sponsor !== "string") {
+        return false;
+    }
+
     if (
-        typeof obj.sponsor !== "string" ||
         typeof obj.publicEventType !== "string" ||
         !Object.values(PUBLIC_EVENT_TYPE).includes(obj.publicEventType) ||
         typeof obj.points !== "number" ||

diff --git a/src/services/event/event-lib.ts b/src/services/event/event-lib.ts
@@ -10,7 +10,7 @@ import { PublicEvent } from "../../database/event-db.js";
  */
 export function createFilteredEventView(baseEvent: PublicEvent): FilteredEventView {
     const publicEvent: FilteredEventView = {
-        id: baseEvent.eventId,
+        eventId: baseEvent.eventId,
         name: baseEvent.name,
         description: baseEvent.description,
         startTime: baseEvent.startTime,

diff --git a/src/services/event/event-models.ts b/src/services/event/event-models.ts
@@ -19,13 +19,13 @@ export enum STAFF_EVENT_TYPE {
 }
 
 export interface FilteredEventView {
-    id: string;
+    eventId: string;
     name: string;
     description: string;
     startTime: number;
     endTime: number;
     locations: Location[];
-    sponsor: string;
+    sponsor?: string;
     eventType: PUBLIC_EVENT_TYPE;
     points: number;
     isAsync: boolean;

diff --git a/src/services/event/event-router.ts b/src/services/event/event-router.ts
@@ -240,7 +240,11 @@ eventsRouter.get("/", weakJwtVerification, async (_: Request, res: Response) =>
     if (hasStaffPerms(payload)) {
         return res.status(StatusCode.SuccessOK).send({ events: publicEvents });
     } else {
-        const filteredEvents: FilteredEventView[] = publicEvents.map(createFilteredEventView);
+        const filteredEvents: FilteredEventView[] = publicEvents
+            .filter((event: PublicEvent) => {
+                return !event.isPrivate;
+            })
+            .map(createFilteredEventView);
         return res.status(StatusCode.SuccessOK).send({ events: filteredEvents });
     }
 });