Cleanup

Author: Sam0711er

WWDCScholars.xcodeproj/project.pbxproj

@@ -140,7 +140,6 @@
 		7BB4F80A1EDCB02500B0EE7A /* CloudKitManager+Scholar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB4F8091EDCB02500B0EE7A /* CloudKitManager+Scholar.swift */; };
 		7BB4F80C1EDCB03000B0EE7A /* CloudKitManager+Batch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB4F80B1EDCB03000B0EE7A /* CloudKitManager+Batch.swift */; };
 		7BB4F8101EDCB36500B0EE7A /* Sync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB4F80F1EDCB36500B0EE7A /* Sync.swift */; };
-		7BB4F8121EDCB43100B0EE7A /* ScholarStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB4F8111EDCB43100B0EE7A /* ScholarStatus.swift */; };
 		7BB4F8141EDCB4A800B0EE7A /* Scholar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB4F8131EDCB4A800B0EE7A /* Scholar.swift */; };
 		7BB4F8181EDCC82B00B0EE7A /* CKAsset+WWDCScholars.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7BB4F8171EDCC82B00B0EE7A /* CKAsset+WWDCScholars.swift */; };
 		7BD91F8A1ED2153E00439718 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BD91F881ED2153E00439718 /* Fabric.framework */; };
@@ -322,7 +321,6 @@
 		7BB4F8091EDCB02500B0EE7A /* CloudKitManager+Scholar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CloudKitManager+Scholar.swift"; sourceTree = "<group>"; };
 		7BB4F80B1EDCB03000B0EE7A /* CloudKitManager+Batch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CloudKitManager+Batch.swift"; sourceTree = "<group>"; };
 		7BB4F80F1EDCB36500B0EE7A /* Sync.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sync.swift; sourceTree = "<group>"; };
-		7BB4F8111EDCB43100B0EE7A /* ScholarStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScholarStatus.swift; sourceTree = "<group>"; };
 		7BB4F8131EDCB4A800B0EE7A /* Scholar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Scholar.swift; sourceTree = "<group>"; };
 		7BB4F8171EDCC82B00B0EE7A /* CKAsset+WWDCScholars.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CKAsset+WWDCScholars.swift"; sourceTree = "<group>"; };
 		7BD91F881ED2153E00439718 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
@@ -945,7 +943,6 @@
 				7BD91F9F1ED33F7A00439718 /* ActivityTimelineFilter.swift */,
 				7BB4F8001EDCA02D00B0EE7A /* ApplicantType.swift */,
 				7BB4F7FA1EDC9E9000B0EE7A /* WWDCYearInfo.swift */,
-				7BB4F8111EDCB43100B0EE7A /* ScholarStatus.swift */,
 				7BB4F7FC1EDC9F5C00B0EE7A /* CloudKitInitializable.swift */,
 				7BB4F8041EDCA18100B0EE7A /* AppType.swift */,
 				7B8DDF241EE29EF0002D2A9A /* SocialMedia.swift */,
@@ -1268,7 +1265,6 @@
 				6EE999ED1EC509B600F13809 /* HeaderFooterView.swift in Sources */,
 				6E3C55601EA03C6D008F9AC9 /* ScholarsViewController.swift in Sources */,
 				6E6B50431EDA0E63006B28A3 /* LocationStatusManager.swift in Sources */,
-				7BB4F8121EDCB43100B0EE7A /* ScholarStatus.swift in Sources */,
 				6E7D17411EBD290200C93E89 /* String+WWDCScholars.swift in Sources */,
 				8E3897E420C450AF00D53113 /* UIImage+Named.swift in Sources */,
 				6EE999EB1EC509B600F13809 /* CollectionViewContentController.swift in Sources */,

WWDCScholars/CKDataController.swift

@@ -25,12 +25,11 @@ class CKDataController: ScholarDataController {
 //        self.database = self.container.publicCloudDatabase
     }
 
-    func scholars(for year: WWDCYear, with status: Scholar.Status?) -> [Scholar] {
+    func scholars(for year: WWDCYear) -> [Scholar] {
         var loadedScholars: [Scholar] = []
 
         let sync = SyncBlock.init()
         let yearRef = CKRecord.Reference(recordID: CKRecord.ID.init(recordName: year.recordName), action: .none)
-        //let statusPredicate = (status != nil) ? "status = '\(status!.rawValue)' AND" : ""
         let predicate = NSPredicate(format: "wwdcYears CONTAINS %@", yearRef)
 
         let query = CKQuery(recordType: "Scholar", predicate: predicate)
@@ -166,8 +165,6 @@ extension Scholar {
             let socialMediaId = UUID.init(uuidString: socialMedia.recordID.recordName),
             let wwdcYears = record["wwdcYears"] as? [CKRecord.Reference],
             let wwdcYearInfos = record["wwdcYearInfos"] as? [CKRecord.Reference],
-            //let statusStr = record["status"] as? String,
-            //let status = Scholar.Status.init(rawValue: statusStr),
             let picUrl = URL.init(string: picStr) {
 
             var wwdcInfo: [WWDCYear: UUID] = [:]
@@ -190,7 +187,6 @@ extension Scholar {
                          biography: biography,
                          socialMediaId: socialMediaId,
                          wwdcYearInfos: wwdcInfo,
-                         //status: status,
                          createdAt: creationDate,
                          updatedAt: modifyDate,
                          profilePictureUrl: picUrl)

WWDCScholars/CloudKit/CloudKitManager+Scholar.swift

@@ -141,12 +141,12 @@ internal extension CloudKitManager {
         //        testData["profilePictureUrl"] = (record["profilePicture"] as? CKAsset)?.fileURL ?? URL.init(string: "https://wwdcscholars.com")
 
 
-        if let statusStr = record["status"] as? String,
+        /*if let statusStr = record["status"] as? String,
             let status = Scholar.Status.init(rawValue: statusStr) {
             testData["status"] = status
         } else {
             return completion(nil)
-        }
+        }*/
 
         //        if let approvedOn = record["approvedOn"] as? Date {
 

WWDCScholars/Scholar.swift

@@ -45,9 +45,6 @@ internal struct Scholar {
     /** The list of (submission) information per WWDC */
     var wwdcYearInfos: [WWDCYear : UUID]
 
-    /** The current status of the Scholar */
-    //var status : Status
-
     /** The date when the Scholar got created */
     var createdAt: Date
 
@@ -82,8 +79,7 @@ extension Scholar {
                 let familyName        = record["familyName"] as? String,
                 let profilePictureUrl = record["profilePictureUrl"] as? URL,
                 let socialMedia       = record["socialMedia"] as? UUID,
-                let wwdcYearInfos     = record["wwdcYearInfos"] as? [WWDCYear : UUID]/*,
-                let status            = record["status"] as? Status*/ else {
+                let wwdcYearInfos     = record["wwdcYearInfos"] as? [WWDCYear : UUID] else {
                     return nil
             }
 
@@ -99,7 +95,6 @@ extension Scholar {
             self.socialMediaId = socialMedia
             self.biography = biography
             self.wwdcYearInfos = wwdcYearInfos
-            //self.status = status
             self.profilePictureUrl = profilePictureUrl
             self.createdAt = creationDate
             self.updatedAt  = updatedAt

WWDCScholars/ScholarDataController.swift

@@ -9,13 +9,12 @@
 import Foundation
 
 protocol ScholarDataController {
-    /// Returns all scholars for a given year with a given status
+    /// Returns all scholars for a given year
     ///
     /// - Parameters:
     ///   - year: WWDC year to get the scholars for
-    ///   - status: Optional status of the scholars returned
-    /// - Returns: An array of scholars with given year and status
-    func scholars(`for` year: WWDCYear, with status: Scholar.Status?) -> [Scholar]
+    /// - Returns: An array of scholars with given year
+    func scholars(`for` year: WWDCYear) -> [Scholar]
 
     /// Gets a scholar identified by the id
     ///

WWDCScholars/ScholarStatus.swift

@@ -32,7 +32,7 @@ internal final class ScholarsViewControllerProxy {
 
     internal func loadListScholars(batchInfo: WWDCYear) {
         DispatchQueue.global(qos: .background).async {
-            let scholars = CKDataController.shared.scholars(for: batchInfo, with: .approved)
+            let scholars = CKDataController.shared.scholars(for: batchInfo)
             DispatchQueue.main.async {
                 self.delegate?.didLoad(scholars: scholars)
                 self.delegate?.didLoadWWDCYearInfo()

WWDCScholars/ScholarsViewControllerProxy.swift

@@ -29,7 +29,6 @@ class ScholarTests: XCTestCase {
         testData["profilePictureUrl"] = URL.init(string: "https://wwdcscholars.com")
         testData["socialMedia"] = UUID.init(uuidString: "E621E1F8-C36C-495A-93FC-0C247A3E6E55")
         testData["wwdcYearInfos"] = [WWDCYear.wwdc2019: UUID.init(uuidString: "E621E1F8-C36C-495A-93FC-0C247A3E6E51")]
-        testData["status"]  = Scholar.Status.pending
     }
 
     override func tearDown() {
@@ -55,7 +54,6 @@ class ScholarTests: XCTestCase {
         XCTAssertEqual(instance?.wwdcYearInfos.count ?? 0, 1)
         XCTAssertNotNil(instance?.wwdcYearInfos[WWDCYear.wwdc2019])
         XCTAssertEqual(instance?.wwdcYearInfos[WWDCYear.wwdc2019]?.uuidString, "E621E1F8-C36C-495A-93FC-0C247A3E6E51")
-        XCTAssertEqual(instance?.status, Scholar.Status.pending)
     }
 
     func testConstructorError() {