API Calls for Events

Spawn-App-iOS-SwiftUI/Models/ChatMessage.swift

@@ -10,7 +10,7 @@ import Foundation
 class ChatMessage: Identifiable, Codable {
     var id: UUID
     var content: String
-    var timestamp: String // TODO: change data type alter
+    var timestamp: Date
     var userSender: User
 	var eventId: UUID
     // do I even need an `event` var here, if each `Event` has a list of chats?
@@ -19,7 +19,7 @@ class ChatMessage: Identifiable, Codable {
     // tech note: in user's view of event, check if that user is in
     // the `ChatMessage`'s `likedBy` array (`[User]`)
 
-	init(id: UUID, content: String, timestamp: String, userSender: User, eventId: UUID, likedBy: [User]? = nil) {
+	init(id: UUID, content: String, timestamp: Date, userSender: User, eventId: UUID, likedBy: [User]? = nil) {
 		self.id = id
         self.content = content
 		self.timestamp = timestamp
@@ -30,12 +30,18 @@ class ChatMessage: Identifiable, Codable {
 }
 
 extension ChatMessage {
-    static let guysWya: ChatMessage = ChatMessage(
-        id: UUID(),
-        content: "yo guys, wya?",
-        timestamp: "2 minutes ago",
+	static let dateFormatter: DateFormatter = {
+		let formatter = DateFormatter()
+		formatter.dateStyle = .short
+		formatter.timeStyle = .short
+		return formatter
+	}()
+	static let guysWya: ChatMessage = ChatMessage(
+		id: UUID(),
+		content: "yo guys, wya?",
+		timestamp: Date().addingTimeInterval(-120), // 2 minutes ago
 		userSender: User.michael,
 		eventId: Event.mockDinnerEvent.id,
-        likedBy: User.mockUsers
-    )
+		likedBy: User.mockUsers
+	)
 }

Spawn-App-iOS-SwiftUI/Models/Event.swift

@@ -11,15 +11,15 @@ class Event: Identifiable, Codable {
     var id: UUID
 
     // MARK: Info
-    var title: String
-    var startTime: String? // TODO: change to proper time later
-    var endTime: String? // TODO: change to proper time later
-    var location: Location? 
+    var startTime: Date? // TODO: change to proper time later
+    var endTime: Date? // TODO: change to proper time later
+    var title: String?
+    var location: Location?
     var note: String? // this corresponds to Figma design "my place at 10? I'm cooking guys" note in event
 
     // MARK: Relations
-    var creator: User
-    
+    var creator: User?
+
     // tech note: I'll be able to check if current user is in an event's partipants to determine which symbol to show in feed
     var participants: [User]?
 
@@ -31,12 +31,12 @@ class Event: Identifiable, Codable {
 
 	init(
 		id: UUID,
-		title: String,
-		startTime: String? = nil,
-		endTime: String? = nil,
+		title: String? = nil,
+		startTime: Date? = nil,
+		endTime: Date? = nil,
 		location: Location? = nil,
 		note: String? = nil,
-		creator: User,
+		creator: User? = User.danielAgapov,
 		participants: [User]? = nil,
 		chatMessages: [ChatMessage]? = nil,
 		invited: [User]? = nil
@@ -55,11 +55,17 @@ class Event: Identifiable, Codable {
 }
 
 extension Event {
+	static let iso8601DateFormatter: ISO8601DateFormatter = {
+		let formatter = ISO8601DateFormatter()
+		formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+		return formatter
+	}()
+
 	static let mockDinnerEvent: Event = Event(
 		id: UUID(),
 		title: "Dinner time!!!!!!",
-		startTime: "10:00 PM",
-		endTime: "11:30 PM",
+		startTime: iso8601DateFormatter.date(from: "2025-01-10T22:00:00Z"),
+		endTime: iso8601DateFormatter.date(from: "2025-01-10T23:30:00Z"),
 		location: Location(id: UUID(), name: "Gather - Place Vanier", latitude: 49.26468617023799, longitude: -123.25859833051356),
 		note: "let's eat!",
 		creator: User.jennifer,
@@ -70,75 +76,73 @@ extension Event {
 			User.michael
 		]
 	)
-    static let mockEvents: [Event] = [
-        mockDinnerEvent,
-        Event(
-            id: UUID(),
-            title: "wanna run 5k with me?",
-            startTime: "04:00 PM",
-            location: Location(id: UUID(), name: "Wesbrook Mall", latitude: 49.25997722657244, longitude: -123.23986523529379),
-            creator: User.danielAgapov,
-            participants: [User.danielAgapov, User.jennifer, User.shannon, User.haley, User.danielLee],
-            chatMessages: [
-                ChatMessage(
-                    id: UUID(),
+
+	static let mockEvents: [Event] = [
+		mockDinnerEvent,
+		Event(
+			id: UUID(),
+			title: "wanna run 5k with me?",
+			startTime: iso8601DateFormatter.date(from: "2025-01-11T16:00:00Z"),
+			location: Location(id: UUID(), name: "Wesbrook Mall", latitude: 49.25997722657244, longitude: -123.23986523529379),
+			creator: User.danielAgapov,
+			participants: [User.danielAgapov, User.jennifer, User.shannon, User.haley, User.danielLee],
+			chatMessages: [
+				ChatMessage(
+					id: UUID(),
 					content: "yo guys, wya?",
-                    timestamp: "2 minutes ago",
+					timestamp: iso8601DateFormatter.date(from: "2025-01-11T16:02:00Z")!,
 					userSender: User.danielAgapov,
-					eventId: Event.mockDinnerEvent.id
-                ),
+					eventId: mockDinnerEvent.id
+				),
 				ChatMessage(
 					id: UUID(),
 					content: "I just saw you",
-					timestamp: "30 seconds ago",
+					timestamp: iso8601DateFormatter.date(from: "2025-01-11T16:02:30Z")!,
 					userSender: User.danielLee,
-					eventId: mockDinnerEvent
-						.id)
-            ]
-        ),
-        Event(
-            id: UUID(),
-            title: "playing basketball!!!",
-            endTime: "07:00 PM",
-            location: Location(id: UUID(), name: "UBC Student Recreation Centre", latitude: 49.2687302352351, longitude: -123.24897582888525),
-            note: "let's play basketball!",
-            creator: User.danielAgapov
-        ),
-        Event(
-            id: UUID(),
-            title: "Im painting rn lol",
-            startTime: "10:00 AM",
-            endTime: "11:30 AM",
-            location: Location(id: UUID(), name: "Ross Drive - Wesbrook Mall", latitude: 49.25189587512135, longitude: -123.237051932404),
-            creator: User.shannon,
-            participants: [User.danielLee]
-
-        ),
-        // commenting this one out, since its location messes with the map zoom level (zooms it way out)
-        // TODO: we should find a system to handle this better
-//        Event(
-//            id: UUID(),
-//            title: "Grabbing Udon",
-//            startTime: "12:00 PM",
-//            endTime: "02:30 PM",
-//            location: Location(id: UUID(), name: "Marugame Udon", latitude: 49.28032597998406, longitude: -123.11026665974741),
-//            creator: User.danielAgapov
-//        ),
-        Event(
-            id: UUID(),
-            title: "Calendar Party",
-            startTime: "11:00 PM",
-            endTime: "02:30 AM",
-            location: Location(id: UUID(), name: "The Pit - Nest", latitude: 49.26694140754859, longitude: -123.25036565366581),
-            creator: User.danielLee
-        ),
-        Event(
-            id: UUID(),
-            title: "Gym - Leg Day",
-            startTime: "10:00 AM",
-            endTime: "11:30 AM",
-            location: Location(id: UUID(), name: "UBC Student Recreation Centre", latitude: 49.2687302352351, longitude: -123.24897582888525),
-            creator: User.michael
-        )
-    ]
+					eventId: mockDinnerEvent.id
+				)
+			]
+		),
+		Event(
+			id: UUID(),
+			title: "playing basketball!!!",
+			endTime: iso8601DateFormatter.date(from: "2025-01-11T19:00:00Z"),
+			location: Location(id: UUID(), name: "UBC Student Recreation Centre", latitude: 49.2687302352351, longitude: -123.24897582888525),
+			note: "let's play basketball!",
+			creator: User.danielAgapov
+		),
+		Event(
+			id: UUID(),
+			title: "Im painting rn lol",
+			startTime: iso8601DateFormatter.date(from: "2025-01-11T10:00:00Z"),
+			endTime: iso8601DateFormatter.date(from: "2025-01-11T11:30:00Z"),
+			location: Location(id: UUID(), name: "Ross Drive - Wesbrook Mall", latitude: 49.25189587512135, longitude: -123.237051932404),
+			creator: User.shannon,
+			participants: [User.danielLee]
+		),
+		Event(
+			id: UUID(),
+			title: "Grabbing Udon",
+			startTime: iso8601DateFormatter.date(from: "2025-01-11T12:00:00Z"),
+			endTime: iso8601DateFormatter.date(from: "2025-01-11T14:30:00Z"),
+			location: Location(id: UUID(), name: "Marugame Udon", latitude: 49.28032597998406, longitude: -123.11026665974741),
+			creator: User.danielAgapov
+		),
+		Event(
+			id: UUID(),
+			title: "Calendar Party",
+			startTime: iso8601DateFormatter.date(from: "2025-01-11T23:00:00Z"),
+			endTime: iso8601DateFormatter.date(from: "2025-01-12T02:30:00Z"),
+			location: Location(id: UUID(), name: "The Pit - Nest", latitude: 49.26694140754859, longitude: -123.25036565366581),
+			creator: User.danielLee
+		),
+		Event(
+			id: UUID(),
+			title: "Gym - Leg Day",
+			startTime: iso8601DateFormatter.date(from: "2025-01-11T10:00:00Z"),
+			endTime: iso8601DateFormatter.date(from: "2025-01-11T11:30:00Z"),
+			location: Location(id: UUID(), name: "UBC Student Recreation Centre", latitude: 49.2687302352351, longitude: -123.24897582888525),
+			creator: User.michael
+		)
+	]
 }

Spawn-App-iOS-SwiftUI/Models/FriendRequest.swift

@@ -0,0 +1,25 @@
+//
+//  FriendRequest.swift
+//  Spawn-App-iOS-SwiftUI
+//
+//  Created by Daniel Agapov on 2025-01-20.
+//
+
+import Foundation
+
+/// as defined in the back-end `FriendRequestDTO.java`
+struct FriendRequest: Identifiable, Codable, Hashable {
+	static func == (lhs: FriendRequest, rhs: FriendRequest) -> Bool {
+		return lhs.id == rhs.id
+	}
+
+	var id: UUID
+	var senderUserId: UUID
+	var receiverUserId: UUID
+
+	init (id: UUID, senderUserId: UUID, receiverUserId: UUID) {
+		self.id = id
+		self.senderUserId = senderUserId
+		self.receiverUserId = receiverUserId
+	}
+}

Spawn-App-iOS-SwiftUI/Services/API/APIError.swift

@@ -7,22 +7,28 @@
 
 import Foundation
 
-enum APIError: Error {
+enum APIError: LocalizedError {
 	case failedHTTPRequest(description: String)
 	case invalidStatusCode(statusCode: Int)
 	case failedJSONParsing
 	case invalidData
 	case URLError
 	case unknownError(error: Error)
 
-	var errorDescription: String {
+	var errorDescription: String? {
 		switch self {
-			case let .failedHTTPRequest(description): return "\(description)"
-			case let .invalidStatusCode(statusCode): return "Invalid Status Code: \(statusCode)"
-			case .failedJSONParsing: return "Failed to properly parse JSON received from request"
-			case .invalidData: return "Invalid data"
-			case .URLError: return "URL Error: Please check which URL you're trying to access, or if it's potentially down at the moment."
-			case let .unknownError(error): return "An Unknown Error Occurred Fetching Data: \(error)"
+			case let .failedHTTPRequest(description):
+				return description
+			case let .invalidStatusCode(statusCode):
+				return "Invalid Status Code: \(statusCode)"
+			case .failedJSONParsing:
+				return "Failed to properly parse JSON received from request."
+			case .invalidData:
+				return "Invalid data received."
+			case .URLError:
+				return "URL Error: Please check the URL or if the server is currently down."
+			case let .unknownError(error):
+				return "An unknown error occurred: \(error.localizedDescription)"
 		}
 	}
 }

Spawn-App-iOS-SwiftUI/Services/API/APIService.swift

@@ -10,7 +10,44 @@ import Foundation
 class APIService: IAPIService {
 	static var baseURL: String = "https://spawn-app-back-end-production.up.railway.app/api/v1/"
 
-	private var errorMessage: String? // TODO: currently not being accessed; maybe use in alert to user
+	var errorMessage: String? // TODO: currently not being accessed; maybe use in alert to user
+
+	// Shared JSONDecoder for decoding data from the backend
+	private static func makeDecoder() -> JSONDecoder {
+		let decoder = JSONDecoder()
+
+		// Custom date decoding strategy
+		decoder.dateDecodingStrategy = .custom { decoder -> Date in
+			let container = try decoder.singleValueContainer()
+			let dateString = try container.decode(String.self)
+
+			let formatter = ISO8601DateFormatter()
+			formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+			if let date = formatter.date(from: dateString) {
+				return date
+			} else {
+				throw DecodingError.dataCorruptedError(in: container,
+													   debugDescription: "Invalid date format: \(dateString)")
+			}
+		}
+		return decoder
+	}
+
+	// Shared JSONEncoder for encoding data to send to the backend
+	private static func makeEncoder() -> JSONEncoder {
+		let encoder = JSONEncoder()
+		encoder.dateEncodingStrategy = .custom { date, encoder in
+			var container = encoder.singleValueContainer()
+
+			let formatter = ISO8601DateFormatter()
+			formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
+
+			let dateString = formatter.string(from: date)
+			try container.encode(dateString)
+		}
+		return encoder
+	}
 
 	internal func fetchData<T: Decodable>(from url: URL) async throws -> T where T: Decodable {
 		let (data, response) = try await URLSession.shared.data(from: url)
@@ -23,7 +60,7 @@ class APIService: IAPIService {
 		}
 
 		guard httpResponse.statusCode == 200 else {
-			errorMessage = "invalid status code for \(url)"
+			errorMessage = "invalid status code \(httpResponse.statusCode) for \(url)"
 			print(errorMessage ?? "no error message to log")
 
 			throw APIError.invalidStatusCode(statusCode: httpResponse.statusCode)
@@ -38,4 +75,30 @@ class APIService: IAPIService {
 			throw APIError.failedJSONParsing
 		}
 	}
+
+	internal func sendData<T: Encodable>(_ object: T, to url: URL) async throws {
+		let encoder = APIService.makeEncoder()
+		let encodedData = try encoder.encode(object)
+
+		var request = URLRequest(url: url)
+		request.httpMethod = "POST"
+		request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+		request.httpBody = encodedData
+
+		let (_, response) = try await URLSession.shared.data(for: request)
+
+		guard let httpResponse = response as? HTTPURLResponse else {
+			errorMessage = "HTTP request failed for \(url)"
+			print(errorMessage ?? "no error message to log")
+
+			throw APIError.failedHTTPRequest(description: "The HTTP request has failed.")
+		}
+
+		guard httpResponse.statusCode == 200 else {
+			errorMessage = "invalid status code \(httpResponse.statusCode) for \(url)"
+			print(errorMessage ?? "no error message to log")
+
+			throw APIError.invalidStatusCode(statusCode: httpResponse.statusCode)
+		}
+	}
 }

Spawn-App-iOS-SwiftUI/Services/API/IAPIService.swift

@@ -8,6 +8,9 @@
 import Foundation
 
 protocol IAPIService {
+	var errorMessage: String? { get set }
 	/// generic function for fetching data from API, given a model of type, T
 	func fetchData<T: Decodable>(from url: URL) async throws -> T where T: Decodable
+	/// generic function for sending data to an API, given a model of type, T
+	func sendData<T: Encodable>(_ object: T, to url: URL) async throws
 }