fixed which staff events show up in staff button view controller

HackIllinois · Feb 15, 2024 · 61a655a · 61a655a
1 parent 745e010
commit 61a655a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/HIAPI/Models/Event.swift b/HIAPI/Models/Event.swift
@@ -81,6 +81,7 @@ public struct Event: Codable {
         case points
         case isAsync
         case mapImageUrl
+        case displayOnStaffCheckIn
     }
 
     public let id: String
@@ -95,6 +96,7 @@ public struct Event: Codable {
     public let points: Int
     public let isAsync: Bool
     public let mapImageUrl: String?
+    public let displayOnStaffCheckIn: Bool?
 }
 
 public struct Location: Codable {

diff --git a/HIAPI/Services/EventService.swift b/HIAPI/Services/EventService.swift
@@ -48,10 +48,10 @@ public class EventService: BaseService {
         return APIRequest<Attendance>(service: self, endpoint: "staff/attendance/", body: body, headers: headers, method: .POST)
     }
 
-    public static func getStaffCheckInEvents(authToken: String) -> APIRequest<StaffEventContainer> {
+    public static func getStaffCheckInEvents(authToken: String) -> APIRequest<EventContainer> {
         var header = HTTPHeaders()
         header["Authorization"] = authToken
-        return APIRequest<StaffEventContainer>(service: self, endpoint: "event/staff/", headers: header, method: .GET)
+        return APIRequest<EventContainer>(service: self, endpoint: "event/", headers: header, method: .GET)
     }
 
     public static func create(event: Event) -> APIRequest<EventContainer> {

diff --git a/HackIllinois/ViewControllers/HIStaffButtonView.swift b/HackIllinois/ViewControllers/HIStaffButtonView.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import HIAPI
 
 struct HIStaffButtonView: View {
-    @State var events = [HIAPI.StaffEvent]()
+    @State var events = [HIAPI.Event]()
     @State var highlightedID = ""
     @ObservedObject var observable: HIStaffButtonViewObservable
 
@@ -51,13 +51,13 @@ struct HIStaffButtonView: View {
     }
 
     func getStaffEvents() {
-        HIAPI.EventService.getStaffCheckInEvents(authToken: HIApplicationStateController.shared.user?.token ?? "")
+        guard let user = HIApplicationStateController.shared.user else { return }
+        HIAPI.EventService.getStaffCheckInEvents(authToken: user.token)
             .onCompletion { result in
                 do {
                     let (containedEvents, _) = try result.get()
                     DispatchQueue.main.async {
-                        self.events = containedEvents.events
-                        print(self.events)
+                        self.events = containedEvents.events.filter { $0.displayOnStaffCheckIn == true }
                     }
                 } catch {
                     print("An error has occurred \(error)")