Merge pull request #21 from codeRIT/staging

Merge staging v1.0.1

Author: peterkos

BrickHack-Mobile/AlertMessage.swift

@@ -23,7 +23,14 @@ class MessageHandler {
     static func showAlertMessage(withTitle title: String, body: String, type: MessageType ) {
 
         let view = MessageView.viewFromNib(layout: .tabView)
-        view.configureTheme(.error)
+
+        // Map our fake type to their type
+        switch type {
+        case .error: view.configureTheme(.error)
+        case .warning: view.configureTheme(.warning)
+        case .info: view.configureTheme(.info)
+        }
+        
         view.button?.isHidden = true
         view.configureContent(title: title,
                               body: body,
@@ -103,4 +110,18 @@ class MessageHandler {
                          body: "Please try again later.",
                          type: .error)
     }
+
+    static func showUnknownUserDataError() {
+        print("ERROR: Could not find questionnaire for user.")
+        showAlertMessage(withTitle: "User name unknown!",
+                         body: "Setting a placeholder name in the meantime...",
+                         type: .info)
+    }
+
+    static func showScheduleParsingError() {
+        print("ERROR: Unable to get latest schedule")
+        showAlertMessage(withTitle: "Unable to get latest schedule!",
+                         body: "Please try again later, by restarting the app.",
+                         type: .error)
+    }
 }

BrickHack-Mobile/Controllers/LoginViewController.swift

@@ -136,23 +136,6 @@ class LoginViewController: UIViewController {
                 print("passed user object")
                 eventsVC.currentUser = self.currentUser
             }
-
-
-            // Check for MainTabBarController (skip through nav controller)
-            // Note: not used!
-            /*
-            if let tabVC = segue.destination.children.first as? MainTabBarController {
-
-                // Check if valid user (on error, user will reauth)
-                guard userID != 0 else {
-                    MessageHandler.showInvalidUserError()
-                    return
-                }
-
-                // Pass data to the tab bar controller, which will handle passing its own children
-                tabVC.userID = userID
-                tabVC.oauthGrant = oauthGrant
-            } */
         }
     }
 
@@ -176,13 +159,15 @@ class LoginViewController: UIViewController {
             SVProgressHUD.show()
         }
 
+        // MARK: User data request
         URLSession.shared.dataTask(with: signedNameRequest) { (data, response, error) in
 
             // MARK: Error checking
             guard error == nil else {
                 DispatchQueue.main.async {
                     MessageHandler.showNetworkError(withText: error!.localizedDescription)
                     SVProgressHUD.dismiss()
+                    self.logout()
                 }
                 return
             }
@@ -191,6 +176,7 @@ class LoginViewController: UIViewController {
                 DispatchQueue.main.async {
                     MessageHandler.showUserDataParsingError()
                     SVProgressHUD.dismiss()
+                    self.logout()
                 }
                 return
             }
@@ -200,6 +186,7 @@ class LoginViewController: UIViewController {
                 DispatchQueue.main.async {
                     MessageHandler.showNetworkError(withText: "Invalid response code")
                     SVProgressHUD.dismiss()
+                    self.logout()
                 }
                 return
             }
@@ -208,30 +195,50 @@ class LoginViewController: UIViewController {
                 DispatchQueue.main.async {
                     MessageHandler.showNetworkError(withText: "User account not found")
                     SVProgressHUD.dismiss()
+                    self.logout()
                 }
                 return
             }
 
-
             // MARK: Data conversion
 
+            var unknownErrorOccured = false
+
             // Convert server data to our User object
             do {
                 self.currentUser = try JSONDecoder().decode(User.self, from: data)
-            } catch (let error) {
+            } catch {
+
+                print("Got in error")
+
+                // This error might be fixable!
+                // Admin accounts don't have a questionnaire, and if the user was
+                // able to login, then this is almost certainly an admin account.
+                // (Or their questionnaire doesn't exist).
+
+                unknownErrorOccured = true
                 DispatchQueue.main.async {
-                    print("parsing error: \(error)")
-                    MessageHandler.showUserDataParsingError(withText: "Unable to convert JSON")
-                    SVProgressHUD.dismiss()
+                    MessageHandler.showUnknownUserDataError()
                 }
-                return
+
+                // In this case, we just assign some blank data.
+                self.currentUser = User(firstName: "Mystery", lastName: "User", major: "Bachelors of codeRIT")
             }
 
-            // Now that we have the user data, go to the main screen,
-            // passing the data forward!
-            DispatchQueue.main.async {
-                SVProgressHUD.dismiss()
-                self.performSegue(withIdentifier: "authSuccessSegue", sender: self)
+            // Now that we have the user data (or fake admin data),
+            // go to the main screen, and pass the data forward!
+
+            // If error occured, give user like three seconds to read it before moving on
+            if unknownErrorOccured {
+                DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(3)) {
+                    SVProgressHUD.dismiss()
+                    self.performSegue(withIdentifier: "authSuccessSegue", sender: self)
+                }
+            } else {
+                DispatchQueue.main.async {
+                    SVProgressHUD.dismiss()
+                    self.performSegue(withIdentifier: "authSuccessSegue", sender: self)
+                }
             }
 
             return

BrickHack-Mobile/Models/ScheduleParser.swift

@@ -29,7 +29,7 @@ struct Event: CustomDebugStringConvertible {
     var timeString: String {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "E hh:mm a"
-        dateFormatter.timeZone = TimeZone(identifier: "UTC") // Already in ET, dont convert again
+        dateFormatter.timeZone = TimeZone(identifier: "America/New_York")
         return dateFormatter.string(from: time)
     }
     var title: String
@@ -152,13 +152,17 @@ class ScheduleParser {
         let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
 
             guard error == nil else {
-                // @TODO: Error handle
+                DispatchQueue.main.async {
+                    MessageHandler.showScheduleParsingError()
+                }
                 print(error!)
                 return
             }
 
             guard let data = data else {
-                // @TODO: Error handle
+                DispatchQueue.main.async {
+                    MessageHandler.showScheduleParsingError()
+                }
                 print("no data")
                 return
             }
@@ -175,7 +179,9 @@ class ScheduleParser {
 
             } catch let error {
                 // @TODO: Error handle (JSON parse error)
-                print("it broke")
+                DispatchQueue.main.async {
+                    MessageHandler.showScheduleParsingError()
+                }
                 print(error)
             }
         }
@@ -241,7 +247,6 @@ class ScheduleParser {
                 case 0:
 
                     guard rowIndex > 1 || !currentEvent.title.isEmpty else {
-                        print("broken like me right now")
                         break
                     }
 
@@ -271,7 +276,7 @@ class ScheduleParser {
                 case 1: currentEvent.time = stringToDate(cellText) ?? Date()
                 case 2: currentEvent.title = cellText
                 case 3: currentEvent.location = cellText
-                case 4: currentEvent.description = cellText
+                case 4: currentEvent.description = filterDescription(cellText)
                 case 5: currentEvent.uuid = cellText
                 default: break
                 }
@@ -281,6 +286,21 @@ class ScheduleParser {
 
     }
 
+    // Strips the description of any HTML
+    private static func filterDescription(_ text: String) -> String {
+
+        var result = String(text)
+
+        while result.contains("<") && result.contains(">") {
+            let htmlStart = result.firstIndex(of: "<")!
+            let htmlEnd = result.firstIndex(of: ">")!
+
+            result.removeSubrange(htmlStart...htmlEnd)
+        }
+
+        print("Converted \(text) to \(result)")
+        return result
+    }
 
     private static func stringToDate(_ text: String) -> Date? {
 
@@ -297,7 +317,7 @@ class ScheduleParser {
 
         // Build the final date
         var dateComponents = DateComponents()
-        dateComponents.timeZone = TimeZone(identifier: "America/New_York") // Might not be req'd but works
+        dateComponents.timeZone = TimeZone(identifier: "America/New_York")
         dateComponents.year = 2020
         dateComponents.month = 2
         dateComponents.hour = Calendar.current.component(.hour, from: convertedTime!)