Projects

App/Entities/JiraUser.swift

@@ -0,0 +1,17 @@
+//
+//  JiraUser.swift
+//  Jirassic
+//
+//  Created by Cristian Baluta on 30/01/2020.
+//  Copyright © 2020 Imagin soft. All rights reserved.
+//
+
+import Foundation
+
+struct JiraUser {
+    var url: String
+    var user: String
+    var password: String
+    var project: String
+    var issue: String
+}

App/Entities/Project.swift

@@ -0,0 +1,25 @@
+//
+//  Project.swift
+//  Jirassic
+//
+//  Created by Cristian Baluta on 20/12/2018.
+//  Copyright © 2018 Imagin soft. All rights reserved.
+//
+
+import Foundation
+
+struct Project: Equatable {
+
+    var objectId: String?
+    var lastModifiedDate: Date?
+    var title: String
+    var jiraBaseUrl: String?
+    var jiraUser: String?
+    var jiraProject: String?
+    var jiraIssue: String?
+
+    var gitBaseUrls: [String]
+    var gitUsers: [String]
+    /// Git commits with this prefix are considered part of the project automatically
+    var taskNumberPrefix: String?
+}

App/Entities/Task.swift

@@ -8,9 +8,9 @@
 
 import Foundation
 
-// Never change the indexes because they are already stored in the database
 enum TaskType: Int {
-
+
+    /// Never change the indexes because they are already stored in the database
 	case issue = 0
 	case startDay = 1
 	case scrum = 2
@@ -22,35 +22,57 @@ enum TaskType: Int {
     case coderev = 8
     case endDay = 9
     case calendar = 10
+    case support = 11
 
     var defaultNotes: String {
         switch self {
-        case .startDay: return "Working day started"
-        case .endDay: return "Working day ended"
-        case .scrum: return "Scrum meeting"
-        case .lunch: return "Lunch break"
-        case .meeting: return "Meeting"
-        case .waste: return "Social & Media"
-        case .learning: return "Learning session"
-        case .coderev: return "Reviewing and fixing code"
-        case .calendar: return "Calendar event"
-        default: return ""
+            case .startDay: return "Working day started"
+            case .endDay: return "Working day ended"
+            case .scrum: return "Scrum meeting"
+            case .lunch: return "Lunch break 🥑🥑🥑"
+            case .meeting: return "Meeting"
+            case .waste: return "Social & Media 👤👤👤"
+            case .learning: return "Learning session"
+            case .coderev: return "Reviewing and fixing code"
+            case .calendar: return "Calendar event"
+            case .support: return "Support"
+            default: return ""
         }
     }
 
-    // Used to group reports
+    /// Used to group reports together
     var defaultTaskNumber: String? {
         switch self {
-        case .scrum: return "scrum"
-        case .lunch: return "lunch"
-        case .meeting: return "meeting"
-        case .waste: return "waste"
-        case .learning: return "learning"
-        case .coderev: return "coderev"
-        case .calendar: return "meeting"
-        default: return nil
+            case .scrum: return "scrum"
+            case .lunch: return "lunch"
+            case .meeting: return "meeting"
+            case .waste: return "waste"
+            case .learning: return "learning"
+            case .coderev: return "coderev"
+            case .calendar: return "meeting"
+            case .support: return "support"
+            default: return nil
         }
     }
+
+    var title: String {
+        switch self {
+            case .startDay: return "Start of day"
+            case .endDay: return "End of day"
+            case .issue: return "Task"
+            case .scrum: return "Scrum"
+            case .lunch: return "Food"
+            case .meeting: return "Meeting"
+            case .waste: return "Social & Media"
+            case .learning: return "Learning"
+            case .coderev: return "Code review"
+            case .support: return "Support"
+            case .gitCommit: return "Git commit"
+            default: return ""
+        }
+    }
+
+    static var allValues: [TaskType] = []
 }
 
 // Object representing a task
@@ -72,6 +94,7 @@ struct Task {
     /// Created locally and used for matching with the remote object
     /// If objectId is missing means the task is not saved to db nor to server (eg. unsaved git and calendar items)
     var objectId: String?
+    var projectId: String?
 }
 
 extension Task {
@@ -94,6 +117,10 @@ extension Task {
         self.taskType = type
         self.objectId = String.generateId()
     }
+
+    var isSaved: Bool {
+        return objectId != nil
+    }
 }
 
 /// Object used to pass task data to and from the cell, for displaying and editing
@@ -102,5 +129,6 @@ typealias TaskCreationData = (
     dateEnd: Date,
     taskNumber: String?,
     notes: String?,
-    taskType: TaskType
+    taskType: TaskType,
+    projectId: String?
 )

App/Extensions/DateExtension.swift

@@ -12,6 +12,7 @@ let ymdUnitFlags: Set<Calendar.Component> = [.year, .month, .day]
 let ymdhmsUnitFlags: Set<Calendar.Component> = [.year, .month, .weekday, .day, .hour, .minute, .second]
 let gregorian = Calendar(identifier: Calendar.Identifier.gregorian)
 
+/// Instantiate a date
 extension Date {
 
 	init (hour: Int, minute: Int, second: Int = 0) {
@@ -51,6 +52,7 @@ extension Date {
     }
 }
 
+/// Format the date
 extension Date {
 
 	func HHmmddMM() -> String {
@@ -90,6 +92,12 @@ extension Date {
 		return f.string(from: self)
 	}
 
+    func E() -> String {
+        let f = DateFormatter()
+        f.dateFormat = "E"
+        return f.string(from: self)
+    }
+
     // eg. Thursday, February 01
 	func EEEEMMMMdd() -> String {
 		let f = DateFormatter()
@@ -139,6 +147,12 @@ extension Date {
         f.dateFormat = "YYYY"
         return f.string(from: self)
     }
+
+    func MMMyyyy() -> String {
+        let f = DateFormatter()
+        f.dateFormat = "MMM yyyy"
+        return f.string(from: self)
+    }
 }
 
 extension Date {
@@ -182,10 +196,8 @@ extension Date {
     }
 
 	func daysInMonth() -> Int {
-
-		let daysRange = gregorian.range(of: Calendar.Component.day, in: Calendar.Component.month, for: self)
-
-		return daysRange!.count as Int
+		let daysRange = gregorian.range(of: .day, in: .month, for: self)
+		return daysRange?.count ?? 0
 	}
 
     func components() -> (hour: Int, minute: Int) {
@@ -234,10 +246,27 @@ extension Date {
 		return gregorian.date(from: comps)!
 	}
 
+    func dateByUpdating (day: Int) -> Date {
+
+        var comps = gregorian.dateComponents(ymdhmsUnitFlags, from: self)
+        comps.day = day
+
+        return gregorian.date(from: comps)!
+    }
+
     func dateByKeepingTime() -> Date {
         let comps = gregorian.dateComponents(ymdhmsUnitFlags, from: self)
         return Date().dateByUpdating(hour: comps.hour!, minute: comps.minute!)
     }
+
+    func dateByKeepingTime(from date: Date) -> Date {
+        let comps = gregorian.dateComponents(ymdhmsUnitFlags, from: date)
+        return self.dateByUpdating(hour: comps.hour!, minute: comps.minute!)
+    }
+
+    func dateByAddingMonths(_ numberOfMonths: Int) -> Date {
+        return Calendar.current.date(byAdding: .month, value: numberOfMonths, to: self) ?? self
+    }
 
 	static func parseHHmm (_ hhmm: String) -> (hour: Int, min: Int) {
 		let hm = hhmm.components(separatedBy: ":")

App/Extensions/TableViewCell.swift

@@ -45,7 +45,7 @@ extension TableViewCell {
 //            return UIStoryboard(name: name, bundle: nil).instantiateViewControllerWithIdentifier(self.className) as! T
         #else
             guard let cell = tableView.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: className), owner: self) as? T else {
-                fatalError("Cell \(className) might not be registered in thsi tableView")
+                fatalError("Cell \(className) might not be registered in this tableView")
             }
             return cell
         #endif

App/Metadata/ReadMetadataInteractor.swift

@@ -0,0 +1,44 @@
+//
+//  ReadMetadataInteractor.swift
+//  Jirassic
+//
+//  Created by Cristian Baluta on 17/01/2020.
+//  Copyright © 2020 Imagin soft. All rights reserved.
+//
+
+import Foundation
+import CloudKit
+
+class ReadMetadataInteractor: RepositoryInteractor {
+
+    init() {
+        super.init(repository: localRepository, remoteRepository: nil)
+    }
+
+    func tasksLastSyncDate() -> Date? {
+        return repository.tasksLastSyncDate()
+    }
+    func projectsLastSyncDate() -> Date? {
+        return repository.projectsLastSyncDate()
+    }
+
+    func tasksLastSyncToken() -> CKServerChangeToken? {
+        let stringToken = repository.tasksLastSyncToken()
+        return token(from: stringToken)
+    }
+    func projectsLastSyncToken() -> CKServerChangeToken? {
+        let stringToken = repository.projectsLastSyncToken()
+        return token(from: stringToken)
+    }
+
+    private func token (from stringToken: String?) -> CKServerChangeToken? {
+
+        guard let string = stringToken,
+            let data = Data(base64Encoded: string),
+            let token = NSKeyedUnarchiver.unarchiveObject(with: data) as? CKServerChangeToken else {
+            return nil
+        }
+
+        return token
+    }
+}

App/Metadata/WriteMetadataInteractor.swift

@@ -0,0 +1,41 @@
+//
+//  WriteMetadataInteractor.swift
+//  Jirassic
+//
+//  Created by Cristian Baluta on 17/01/2020.
+//  Copyright © 2020 Imagin soft. All rights reserved.
+//
+
+import Foundation
+import CloudKit
+
+class WriteMetadataInteractor: RepositoryInteractor {
+
+    init() {
+        super.init(repository: localRepository, remoteRepository: nil)
+    }
+
+    func set (tasksLastSyncDate: Date?) {
+        repository.set(tasksLastSyncDate: tasksLastSyncDate)
+    }
+    func set (projectsLastSyncDate: Date?) {
+        repository.set(tasksLastSyncDate: projectsLastSyncDate)
+    }
+
+    func set (tasksLastSyncToken: CKServerChangeToken?) {
+        repository.set(tasksLastSyncToken: string(from: tasksLastSyncToken))
+    }
+    func set (projectsLastSyncToken: CKServerChangeToken?) {
+        repository.set(tasksLastSyncToken: string(from: projectsLastSyncToken))
+    }
+
+    private func string (from token: CKServerChangeToken?) -> String? {
+
+        guard let token = token else {
+            return nil
+        }
+        let data = NSKeyedArchiver.archivedData(withRootObject: token)
+        let string = data.base64EncodedString()
+        return string
+    }
+}