WIP

Werkout_ios/Models/Equipment.swift

@@ -0,0 +1,21 @@
+//
+//  Equipment.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 6/15/23.
+//
+
+import Foundation
+
+struct Equipment: Codable {
+    let id: Int
+    let createdAt, updatedAt: String
+    let category, name: String?
+    
+    enum CodingKeys: String, CodingKey {
+        case id
+        case createdAt = "created_at"
+        case updatedAt = "updated_at"
+        case category, name
+    }
+}

Werkout_ios/Models/Exercise.swift

@@ -13,9 +13,9 @@ struct ExerciseElement: Codable {
     let weight: Int?
     let reps: Int?
     let duration: Int?
-    let durationAudio: String?
+    let durationAudio: String
     let weightAudio: String?
-    let createdAt: String?
+    let createdAt: String
     
     enum CodingKeys: String, CodingKey {
         case workout, exercise, weight, reps, duration
@@ -34,18 +34,19 @@ struct ExerciseElement: Codable {
 
 struct ExerciseExercise: Codable {
     let id: Int
-    let muscles, equipment: [String]?
-    let videoURL, audioURL, createdAt, updatedAt, name: String?
-    let description, side: String?
-    let isTwoDumbbells, isTrackableDistance, isAlternating, isWeight: Bool?
-    let isDistance, isDuration, isReps: Bool?
-    let jointsUsed, movementPatterns, equipmentRequired, muscleGroups: String?
+    let muscles: [ExerciseMuscle]
+    let equipment: [Equipment]
+    let audioURL, videoURL, createdAt, updatedAt: String
+    let name, description, side: String
+    let isTwoDumbbells, isTrackableDistance, isAlternating, isWeight: Bool
+    let isDistance, isDuration, isReps: Bool
+    let jointsUsed, movementPatterns, equipmentRequired, muscleGroups: String
     let synonyms: String?
     
     enum CodingKeys: String, CodingKey {
         case id, muscles, equipment
-        case videoURL = "video_url"
         case audioURL = "audio_url"
+        case videoURL = "video_url"
         case createdAt = "created_at"
         case updatedAt = "updated_at"
         case name, description, side

Werkout_ios/Models/Muscle.swift

@@ -0,0 +1,26 @@
+//
+//  Muscle.swift
+//  Werkout_ios
+//
+//  Created by Trey Tartt on 6/15/23.
+//
+
+import Foundation
+
+struct Muscle: Codable {
+    let id: Int
+    let name: String
+}
+
+struct ExerciseMuscle: Codable {
+    let id: Int
+    let createdAt, updatedAt: String
+    let exercise, muscle: Int
+    
+    enum CodingKeys: String, CodingKey {
+        case id
+        case createdAt = "created_at"
+        case updatedAt = "updated_at"
+        case exercise, muscle
+    }
+}

Werkout_ios/Models/Workout.swift

@@ -11,13 +11,26 @@ struct Workout: Codable {
     let name: String
     let description: String?
     let exercises: [ExerciseElement]
-    let registeredUser: [RegisteredUser]
+    let registeredUser: RegisteredUser
     
     enum CodingKeys: String, CodingKey {
         case name, description, exercises
         case registeredUser = "registered_user"
     }
     
+    init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        if let exercises = try container.decodeIfPresent([ExerciseElement].self, forKey: .exercises) {
+            self.exercises = exercises
+        } else {
+            self.exercises = [ExerciseElement]()
+        }
+        
+        self.name = try container.decode(String.self, forKey: .name)
+        self.description = try container.decodeIfPresent(String.self, forKey: .description)
+        self.registeredUser = try container.decode(RegisteredUser.self, forKey: .registeredUser)
+    }
+    
     var exercisesSortedByCreated_at: [ExerciseElement] {
         return self.exercises.sorted(by: {
             $0.createdAtDate < $1.createdAtDate