closed #38

Shared/Models/ContentModeViewModel.swift

@@ -10,7 +10,8 @@ import CoreData
 
 class ContentModeViewModel: ObservableObject {
     @Published var grouped = [Int: [Int: [MoodEntry]]]()
-    
+    @Published public private(set) var savedOnboardingData = UserDefaultsStore.getOnboarding()
+
     init() {
         updateData()
     }
@@ -19,18 +20,30 @@ class ContentModeViewModel: ObservableObject {
         grouped = PersistenceController.shared.splitIntoYearMonth()
     }
     
-    public func shouldShowTodayInput() -> Bool {
+    public func shouldShowVotingHeader() -> Bool {
+        isMissingCurrentVote() && savedOnboardingData.ableToVoteBasedOnCurentTime() ? true : false
+    }
+    
+    public func updateOnboardingData(onboardingData: OnboardingData) {
+        self.savedOnboardingData = UserDefaultsStore.saveOnboarding(onboardingData: onboardingData)
+    }
+    
+    private func isMissingCurrentVote() -> Bool {
         let fetchRequest = NSFetchRequest<MoodEntry>(entityName: "MoodEntry")
         
         var calendar = Calendar.current
         calendar.timeZone = NSTimeZone.local
         
-        // Get today's beginning & end
-        let dateFrom = calendar.startOfDay(for: Date()) // eg. 2016-10-10 00:00:00
+        var dateFrom: Date
+        switch savedOnboardingData.inputDay {
+        case .Today:
+            dateFrom = calendar.startOfDay(for: Date())
+        case .Previous:
+            dateFrom = calendar.startOfDay(for: Date())
+            dateFrom = calendar.date(byAdding: .day, value: -1, to: dateFrom)!
+        }
         let dateTo = calendar.date(byAdding: .day, value: 1, to: dateFrom)!
-        // Note: Times are printed in UTC. Depending on where you live it won't print 00:00:00 but it will work with UTC times which can be converted to local time
         
-        // Set predicate as date being today's date
         let fromPredicate = NSPredicate(format: "%@ <= %K", dateFrom as NSDate, #keyPath(MoodEntry.forDate))
         let toPredicate = NSPredicate(format: "%K < %@", #keyPath(MoodEntry.forDate), dateTo as NSDate)
         let datePredicate = NSCompoundPredicate(andPredicateWithSubpredicates: [fromPredicate, toPredicate])
@@ -45,7 +58,7 @@ class ContentModeViewModel: ObservableObject {
     }
     
     public func add(mood: Mood, forDate date: Date) {
-        PersistenceController.shared.add(mood: mood, forDate: Date())
+        PersistenceController.shared.add(mood: mood, forDate: date)
         getGroupedData()
     }
     

Shared/Models/OnboardingData.swift

@@ -1,80 +0,0 @@
-//
-//  OnboardingData.swift
-//  Feels (iOS)
-//
-//  Created by Trey Tartt on 1/22/22.
-//
-
-import Foundation
-
-// this is getting passed around and filled out
-// class and vars
-final class OnboardingData: NSObject, ObservableObject, Codable {
-    @Published var date: Date = Date()
-    @Published var inputDay: DayOptions = .Today
-    @Published var title: String = OnboardingTitle.titleOptions[0]
-    
-    enum CodingKeys: CodingKey {
-        case date, inputDay, title
-    }
-    
-    func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-
-        try container.encode(date, forKey: .date)
-        try container.encode(inputDay, forKey: .inputDay)
-        try container.encode(title, forKey: .title)
-    }
-    
-    required init(from decoder: Decoder) throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
-        date = try container.decode(Date.self, forKey: .date)
-        inputDay = try container.decode(DayOptions.self, forKey: .inputDay)
-        title = try container.decode(String.self, forKey: .title)
-    }
-    
-    func ableToVoteBasedOnCurentTime() -> Bool {
-        let currentDateComp = Calendar.current.dateComponents([.hour, .minute], from: Date())
-        let savedDateComp = Calendar.current.dateComponents([.hour, .minute], from: self.date)
-
-        if let currentHour = currentDateComp.hour,
-           let currentMin = currentDateComp.minute,
-           let savedHour = savedDateComp.hour,
-           let savedMin = savedDateComp.minute {
-            if currentHour >= savedHour &&
-                currentMin >= savedMin {
-                return true
-            }
-        }
-        
-        
-        return false
-    }
-    
-    override init() { }
-}
-
-extension OnboardingData: RawRepresentable {
-    convenience init?(rawValue: String) {
-        guard let data = rawValue.data(using: .utf8),
-            let result = try? JSONDecoder().decode(OnboardingData.self, from: data)
-        else {
-            return nil
-        }
-        self.init()
-        
-        self.date = result.date
-        self.inputDay = result.inputDay
-        self.title = result.title
-    }
-
-    public var rawValue: String {
-        guard let data = try? JSONEncoder().encode(self),
-            let result = String(data: data, encoding: .utf8)
-        else {
-            return "[]"
-        }
-        return result
-    }
-}

Shared/Models/UserDefaultsStore.swift

@@ -0,0 +1,29 @@
+//
+//  UserDefaultsStore.swift
+//  Feels (iOS)
+//
+//  Created by Trey Tartt on 1/22/22.
+//
+
+import Foundation
+
+class UserDefaultsStore {
+    static func getOnboarding() -> OnboardingData {
+        if let data = UserDefaults.standard.object(forKey: "savedOnboardingData") as? Data,
+           let model = try? JSONDecoder().decode(OnboardingData.self, from: data) {
+            return model
+        } else {
+            return OnboardingData()
+        }
+    }
+    
+    static func saveOnboarding(onboardingData: OnboardingData) -> OnboardingData {
+        do {
+            let data = try JSONEncoder().encode(onboardingData)
+            UserDefaults.standard.set(data, forKey: "savedOnboardingData")
+            return UserDefaultsStore.getOnboarding()
+        } catch {
+            fatalError("error saving")
+        }
+    }
+}