Release v3.0.1 (#113)

* [13091] [13092] Move schedule from attendee to member (#111)

* [CoreSummit] [13091] Moves schedule from attendee to member model.

* [CoreSummit] [13091] Fixes core data relationships types.

* [CoreSummit] [13091] Fixes member json parsing.

* [CoreSummit] [13091] Updates unit tests.

* [CoreSummit] [13091] Changes member schedule endpoints.

* [iOS] [13091] Moves schedule from attendee to schedule.

* [iOS] [13092] Fixes member schedule UI logics.

* [iOS] [13092] Fixes attendee order confirmation message.

* [CoreSummit] [13204] Fixes VenueRoom data update. (#112)

* [CoreSummit] [13204] Adds failing VenueRoom dataupdate unit test.

* [CoreSummit] [13204] Makes VenueRoom floor optional.

* [CoreSummit] [13224] Fixes empty schedule on Member managed object save.

* [iOS] [13232] Always checks for latest summit on load.

* [13258] Fixes schedule dates calculations using summit time zone.

* [13269] Updates aerogear-ios-http dependency.

OpenStack-mobile/aerogear-ios-http@60ed79d

* Version bump.

* [13258] Fixes tokens expiration date truncation on keychain save.

OpenStack-mobile/aerogear-ios-oauth2@4bea335

Author: gcutrini

Cartfile.resolved

@@ -13,5 +13,5 @@ github "OpenStack-Mobile/SlackTextViewController" "v1.9.5"
 github "OpenStack-Mobile/XCDYouTubeKit" "2.5.3"
 github "xmartlabs/XLPagerTabStrip" "7.0.0"
 github "OpenStack-Mobile/AFHorizontalDayPicker" "74c3521f935039b2b6e945380ecd06752076ec8a"
-github "OpenStack-Mobile/aerogear-ios-http" "baeeaf6947d1afb58e3235a732b50c5a58923cad"
-github "OpenStack-Mobile/aerogear-ios-oauth2" "6a134a2e68ea612960ba10e18524280aa69ca356"
+github "OpenStack-Mobile/aerogear-ios-http" "60ed79d74e53127efef9ba49fe5d777f40bf2719"
+github "OpenStack-Mobile/aerogear-ios-oauth2" "4bea335d4a9720d0f051eb59ff455a32bb87bb74"

OpenStack Summit/CoreSummit/Attendee.swift

@@ -12,8 +12,6 @@ public struct Attendee: Unique {
 
     public var member: Identifier
 
-    public var schedule: Set<Identifier>
-    
     public var tickets: Set<Identifier>
 }
 
@@ -23,6 +21,5 @@ public func == (lhs: Attendee, rhs: Attendee) -> Bool {
 
     return lhs.identifier == rhs.identifier
         && lhs.member == rhs.member
-        && lhs.schedule == rhs.schedule
         && lhs.tickets == rhs.tickets
 }

OpenStack Summit/CoreSummit/AttendeeJSON.swift

@@ -23,15 +23,12 @@ extension Attendee: JSONDecodable {
         guard let JSONObject = JSONValue.objectValue,
             let identifier = JSONObject[JSONKey.id.rawValue]?.integerValue,
             let member = JSONObject[JSONKey.member_id.rawValue]?.integerValue,
-            let scheduledEventsJSONArray = JSONObject[JSONKey.schedule.rawValue]?.arrayValue,
-            let scheduledEvents = Identifier.from(json: scheduledEventsJSONArray),
             let ticketsJSONArray = JSONObject[JSONKey.tickets.rawValue]?.arrayValue,
             let tickets = Identifier.from(json: ticketsJSONArray)
             else { return nil }
 
         self.identifier = identifier
         self.member = member
-        self.schedule = Set(scheduledEvents)
         self.tickets = Set(tickets)
     }
 }

OpenStack Summit/CoreSummit/AttendeeManagedObject.swift

@@ -13,8 +13,6 @@ public final class AttendeeManagedObject: Entity {
 
     @NSManaged public var member: MemberManagedObject
 
-    @NSManaged public var schedule: Set<EventManagedObject>
-    
     @NSManaged public var tickets: Set<TicketTypeManagedObject>
 }
 
@@ -25,7 +23,6 @@ extension Attendee: CoreDataDecodable {
         self.identifier = managedObject.id
         self.member = managedObject.member.id
         self.tickets = managedObject.tickets.identifiers
-        self.schedule = managedObject.schedule.identifiers
     }
 }
 
@@ -37,7 +34,6 @@ extension Attendee: CoreDataEncodable {
 
         managedObject.member = try context.relationshipFault(member)
         managedObject.tickets = try context.relationshipFault(tickets)
-        managedObject.schedule = try context.relationshipFault(schedule)
 
         managedObject.didCache()
 

OpenStack Summit/CoreSummit/DataUpdate.swift

@@ -145,7 +145,7 @@ public extension Store {
             guard dataUpdate.className != .MySchedule else {
 
                 // should only get for authenticated requests
-                guard let attendeeRole = authenticatedMember?.attendeeRole
+                guard let member = authenticatedMember
                     else { return false }
 
                 switch dataUpdate.operation {
@@ -159,7 +159,7 @@ public extension Store {
 
                     let eventManagedObject = try event.write(context, summit: summit) as! EventManagedObject
 
-                    attendeeRole.schedule.insert(eventManagedObject)
+                    member.schedule.insert(eventManagedObject)
 
                     return true
 
@@ -171,7 +171,7 @@ public extension Store {
 
                     if let eventManagedObject = try EventManagedObject.find(identifier, context: context) {
 
-                        attendeeRole.schedule.remove(eventManagedObject)
+                        member.schedule.remove(eventManagedObject)
                     }
 
                     return true

OpenStack Summit/CoreSummit/EventManagedObject.swift

@@ -58,7 +58,7 @@ public final class EventManagedObject: Entity {
 
     // MARK: - Inverse Relationhips
 
-    @NSManaged public var attendees: Set<AttendeeManagedObject>
+    @NSManaged public var members: Set<MemberManagedObject>
 }
 
 // MARK: - Encoding
@@ -205,14 +205,6 @@ public extension EventManagedObject {
 
         switch date {
 
-        case .now:
-            
-            let now = Date()
-            
-            //datePredicate = NSPredicate(format: "start <= %@ AND end >= %@", now, now)
-            datePredicate = #keyPath(EventManagedObject.start) <= now
-                && #keyPath(EventManagedObject.end) >= now
-            
         case let .interval(start, end):
 
             //datePredicate = NSPredicate(format: "end >= %@ AND end <= %@", start, end)
@@ -288,7 +280,6 @@ public extension EventManagedObject {
 
     public enum DateFilter {
 
-        case now
         case interval(start: Date, end: Date)
     }
 }

OpenStack Summit/CoreSummit/EventScheduleRequest.swift

@@ -26,7 +26,7 @@ public extension Store {
             summitID = "current"
         }
 
-        let uri = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)"
+        let uri = "/api/v1/summits/\(summitID)/members/me/schedule/\(event)"
 
         let url = environment.configuration.serverURL + uri
 
@@ -43,10 +43,10 @@ public extension Store {
             // cache
             try! context.performErrorBlockAndWait {
 
-                if let attendee = try self.authenticatedMember(context)?.attendeeRole,
+                if let member = try self.authenticatedMember(context),
                     let eventManagedObject = try EventManagedObject.find(event, context: context) {
 
-                    attendee.schedule.insert(eventManagedObject)
+                    member.schedule.insert(eventManagedObject)
 
                     try context.save()
                 }
@@ -69,7 +69,7 @@ public extension Store {
             summitID = "current"
         }
 
-        let uri = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)"
+        let uri = "/api/v1/summits/\(summitID)/members/me/schedule/\(event)"
 
         let url = environment.configuration.serverURL + uri
 
@@ -86,10 +86,10 @@ public extension Store {
             // cache
             try! context.performErrorBlockAndWait {
 
-                if let attendee = try self.authenticatedMember(context)?.attendeeRole,
+                if let member = try self.authenticatedMember(context),
                     let eventManagedObject = try EventManagedObject.find(event, context: context) {
 
-                    attendee.schedule.remove(eventManagedObject)
+                    member.schedule.remove(eventManagedObject)
 
                     try context.save()
                 }
@@ -112,7 +112,7 @@ public extension Store {
             summitID = "current"
         }
 
-        let uri = "/api/v1/summits/\(summitID)/attendees/me/schedule/\(event)/rsvp"
+        let uri = "/api/v1/summits/\(summitID)/members/me/schedule/\(event)/rsvp"
 
         let url = environment.configuration.serverURL + uri
 
@@ -129,10 +129,10 @@ public extension Store {
             // cache
             try! context.performErrorBlockAndWait {
 
-                if let attendee = try self.authenticatedMember(context)?.attendeeRole,
+                if let member = try self.authenticatedMember(context),
                     let eventManagedObject = try EventManagedObject.find(event, context: context) {
 
-                    attendee.schedule.remove(eventManagedObject)
+                    member.schedule.remove(eventManagedObject)
 
                     try context.save()
                 }

OpenStack Summit/CoreSummit/Member.swift

@@ -32,6 +32,8 @@ public struct Member: Named {
 
     public let attendeeRole: Attendee?
 
+    public var schedule: Set<Identifier>
+    
     public let groupEvents: Set<Identifier>
 
     public let favoriteEvents: Set<Identifier>
@@ -56,6 +58,7 @@ public func == (lhs: Member, rhs: Member) -> Bool {
         && lhs.linkedIn == rhs.linkedIn
         && lhs.speakerRole == rhs.speakerRole
         && lhs.attendeeRole == rhs.attendeeRole
+        && lhs.schedule == rhs.schedule
         && lhs.groups == rhs.groups
         && lhs.groupEvents == rhs.groupEvents
         && lhs.favoriteEvents == rhs.favoriteEvents

OpenStack Summit/CoreSummit/MemberJSON.swift

@@ -13,7 +13,7 @@ private extension Member {
 
     enum JSONKey: String {
 
-        case id, first_name, last_name, gender, title, bio, irc, twitter, linked_in, member_id, pic, speaker, schedule, groups_events, groups, attendee, feedback, favorite_summit_events, affiliations
+        case id, first_name, last_name, gender, title, bio, irc, twitter, linked_in, member_id, pic, speaker, schedule_summit_events, groups_events, groups, attendee, feedback, favorite_summit_events, affiliations
     }
 }
 
@@ -79,6 +79,7 @@ extension Member: JSONDecodable {
 
         // not in this JSON response
         self.attendeeRole = nil
+        self.schedule = []
         self.feedback = []
         self.groupEvents = []
         self.favoriteEvents = []
@@ -96,6 +97,8 @@ extension MemberResponse.Member: JSONDecodable {
             let firstName = JSONObject[JSONKey.first_name.rawValue]?.rawValue as? String,
             let lastName = JSONObject[JSONKey.last_name.rawValue]?.rawValue as? String,
             let picture = JSONObject[JSONKey.pic.rawValue]?.urlValue,
+            let scheduledEventsJSONArray = JSONObject[JSONKey.schedule_summit_events.rawValue]?.arrayValue,
+            let scheduledEvents = Identifier.from(json: scheduledEventsJSONArray),
             let groupsJSONArray = JSONObject[JSONKey.groups.rawValue]?.arrayValue,
             let groups = Group.from(json: groupsJSONArray),
             let groupEventsJSONArray = JSONObject[JSONKey.groups_events.rawValue]?.arrayValue,
@@ -110,6 +113,7 @@ extension MemberResponse.Member: JSONDecodable {
         self.firstName = firstName
         self.lastName = lastName
         self.picture = picture
+        self.schedule = Set(scheduledEvents)
         self.groups = groups
         self.groupEvents = groupEvents
         self.feedback = feedback

OpenStack Summit/CoreSummit/MemberManagedObject.swift

@@ -32,6 +32,8 @@ public final class MemberManagedObject: Entity {
 
     @NSManaged public var attendeeRole: AttendeeManagedObject?
 
+    @NSManaged public var schedule: Set<EventManagedObject>
+    
     @NSManaged public var groups: Set<GroupManagedObject>
 
     @NSManaged public var groupEvents: Set<EventManagedObject>
@@ -58,6 +60,7 @@ extension Member: CoreDataDecodable {
         self.linkedIn = managedObject.linkedIn
         self.biography = managedObject.biography
         self.gender = managedObject.gender
+        self.schedule = managedObject.schedule.identifiers
         self.groups = Group.from(managedObjects: managedObject.groups)
         self.feedback = managedObject.feedback.identifiers
         self.groupEvents = managedObject.groupEvents.identifiers
@@ -98,6 +101,7 @@ extension Member: CoreDataEncodable {
         managedObject.linkedIn = linkedIn
         managedObject.biography = biography
         managedObject.gender = gender
+        managedObject.schedule = try context.relationshipFault(schedule)
         managedObject.groups = try context.relationshipFault(groups)
         managedObject.affiliations = try context.relationshipFault(affiliations)
 
@@ -134,6 +138,7 @@ extension MemberResponse.Member: CoreDataEncodable {
         managedObject.biography = biography
         managedObject.gender = gender
 
+        managedObject.schedule = try context.relationshipFault(schedule)
         managedObject.speakerRole = try context.relationshipFault(speakerRole)
         managedObject.attendeeRole = try context.relationshipFault(attendeeRole)
         managedObject.groups = try context.relationshipFault(Set(groups))
@@ -155,7 +160,7 @@ public extension MemberManagedObject {
     @inline(__always)
     func isScheduled(event: Identifier) -> Bool {
 
-        return attendeeRole?.schedule.contains(where: { $0.id == event }) ?? false
+        return schedule.contains(where: { $0.id == event }) 
     }
 
     @inline(__always)
@@ -204,6 +209,6 @@ public extension Store {
     @inline(__always)
     func isEventScheduledByLoggedMember(event eventID: Identifier) -> Bool {
 
-        return self.authenticatedMember?.attendeeRole?.schedule.contains(where: { $0.id == eventID }) ?? false
+        return self.authenticatedMember?.schedule.contains(where: { $0.id == eventID }) ?? false
     }
 }