Merge pull request #440 from pennlabs/widget/dining-analytics

Add Dining Analytics widget

Author: anli5005

PennMobile.xcodeproj/project.pbxproj

@@ -81,7 +81,7 @@ struct DiningAnalyticsView: View {
                 showMissingDiningTokenAlert = true
                 return
             }
-            await diningAnalyticsViewModel.refresh()
+            await diningAnalyticsViewModel.refresh(refreshWidgets: true)
         }
         .alert(isPresented: $showMissingDiningTokenAlert) {
             showCorrectAlert()
@@ -97,7 +97,7 @@ extension DiningAnalyticsView {
     func getSmoothedData(from trans: [DiningAnalyticsBalance]) -> [PredictionsGraphView.YXDataPoint] {
         let sos = Date.startOfSemester
         let eos = Date.endOfSemester
-        
+
         let totalLength = eos.distance(to: sos)
         let maxDollarValue = trans.max(by: { $0.balance < $1.balance })?.balance ?? 1.0
         let yxPoints: [PredictionsGraphView.YXDataPoint] = trans.map { (t) -> PredictionsGraphView.YXDataPoint in

PennMobile/Dining/SwiftUI/DiningAnalyticsView.swift

@@ -32,7 +32,7 @@ struct DiningLoginViewSwiftUI: UIViewControllerRepresentable {
 
         func dismissDiningLoginController() {
             parent.presentationMode.wrappedValue.dismiss()
-            Task.init() {
+            Task.init {
                 await DiningViewModelSwiftUI.instance.refreshBalance()
                 await parent.diningAnalyticsViewModel.refresh()
             }

PennMobile/Dining/SwiftUI/DiningLoginViewSwiftUI.swift

@@ -18,7 +18,7 @@ class DiningViewModelSwiftUI: ObservableObject {
     @Published var diningVenuesIsLoading = false
     @Published var alertType: NetworkingError?
 
-    @Published var diningBalance = UserDefaults.standard.getDiningBalance() ?? DiningBalance(date: Date.dayOfMonthFormatter.string(from: Date()), diningDollars: "0.0", regularVisits: 0, guestVisits: 0, addOnVisits: 0)
+    @Published var diningBalance = (try? Storage.retrieveThrowing(DiningBalance.directory, from: .groupCaches, as: DiningBalance.self)) ?? DiningBalance(date: Date.dayOfMonthFormatter.string(from: Date()), diningDollars: "0.0", regularVisits: 0, guestVisits: 0, addOnVisits: 0)
     // MARK: - Venue Methods
     let ordering: [VenueType] = [.dining, .retail]
 
@@ -80,7 +80,7 @@ class DiningViewModelSwiftUI: ObservableObject {
         let result = await DiningAPI.instance.getDiningBalance(diningToken: diningToken)
         switch result {
         case .success(let balance):
-            UserDefaults.standard.setdiningBalance(balance)
+            Storage.store(balance, to: .groupCaches, as: DiningBalance.directory)
             self.diningBalance = balance
         case .failure:
             return

PennMobile/Dining/SwiftUI/DiningViewModelSwiftUI.swift

@@ -72,7 +72,7 @@ struct CustomHeader: View {
                         showMissingDiningTokenAlert = true
                         return
                     }
-                    Task.init() {
+                    Task.init {
                         await DiningViewModelSwiftUI.instance.refreshBalance()
                     }
                 }, label: {

PennMobile/Dining/SwiftUI/Views/Venue/DiningVenueView.swift

@@ -0,0 +1,52 @@
+//
+//  KeychainAccessibleExtensions.swift
+//  PennMobile
+//
+//  Created by Anthony Li on 11/5/22.
+//  Copyright © 2022 PennLabs. All rights reserved.
+//
+
+extension KeychainAccessible {
+
+    func savePennKey(_ pennkey: String) {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.setValue(pennkey, for: pennkeyKeychainKey)
+    }
+
+    func removePennKey() {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.removeValue(for: pennkeyKeychainKey)
+    }
+
+    func savePassword(_ password: String) {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.setValue(password, for: passwordKeychainKey)
+    }
+
+    func removePassword() {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.removeValue(for: passwordKeychainKey)
+    }
+
+    func savePacCode(_ pacCode: String) {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.setValue(pacCode, for: pacCodeKeychainKey)
+    }
+
+    func removePacCode() {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.removeValue(for: pacCodeKeychainKey)
+    }
+
+    func saveDiningToken(_ diningToken: String) {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.setValue(diningToken, for: diningTokenKeychainKey)
+    }
+
+    func removeDiningToken() {
+        let secureStore = getWebLoginSecureStore()
+        try? secureStore.removeValue(for: diningTokenKeychainKey)
+        UserDefaults.standard.clearDiningBalance()
+    }
+
+}

PennMobile/General/KeychainAccessible+Extensions.swift

@@ -19,16 +19,6 @@ public enum Method {
     case other(method: String)
 }
 
-enum NetworkingError: String, Error {
-    case noInternet
-    case parsingError
-    case serverError
-    case jsonError = "JSON error"
-    case authenticationError = "Unable to authenticate"
-    case other
-    var localizedDescription: String { self.rawValue }
-}
-
 extension Method {
     public init(_ rawValue: String) {
         let method = rawValue.uppercased()

PennMobile/General/KeychainAccessible.swift

@@ -46,7 +46,7 @@ class UserDBManager: NSObject, Requestable, SHA256Hashable {
             task.resume()
         }
     }
-    
+
     /**
       Returns a URLRequest configured for making anonymous requests. The server matches either the pennkey-password hash or the private UUID in the DB to find the anonymous account ID, updating the identifiers if the password of device changes.
 

PennMobile/General/Networking + Analytics/Networking.swift

@@ -542,13 +542,15 @@ extension UserDefaults {
 
 // MARK: - Current Dining Balance Object
 extension UserDefaults {
+    @available(*, deprecated)
     func setdiningBalance(_ diningBalance: DiningBalance) {
         let encoder = JSONEncoder()
         if let encoded = try? encoder.encode(diningBalance) {
             UserDefaults.standard.set(encoded, forKey: UserDefaultsKeys.diningBalance.rawValue)
         }
         synchronize()
     }
+    @available(*, deprecated)
     func getDiningBalance() -> DiningBalance? {
         let decoder = JSONDecoder()
         if let decodedData = UserDefaults.standard.data(forKey: UserDefaultsKeys.diningBalance.rawValue) {
@@ -561,23 +563,6 @@ extension UserDefaults {
     }
 }
 
-// MARK: - Last dining analytics end date called
-extension UserDefaults {
-    func setNextAnalyticsStartDate(_ date: String) {
-        set(date, forKey: UserDefaultsKeys.nextAnalyticsStartDate.rawValue)
-        synchronize()
-    }
-
-    func getNextAnalyticsStartDate() -> String? {
-        return string(forKey: UserDefaultsKeys.nextAnalyticsStartDate.rawValue)
-    }
-
-    func clearNextAnalyticsStartDateDate() {
-        removeObject(forKey: UserDefaultsKeys.nextAnalyticsStartDate.rawValue)
-    }
-
-}
-
 extension UserDefaults {
     func setFirstDollarsBalance(_ balance: Double) {
         set(balance, forKey: UserDefaultsKeys.firstDollarsBalance.rawValue)