Merge pull request #2177 from woocommerce/issue/956-fix-age-from

Fix Age.from returning `today` instead of `upcoming`

Author: shiki

WooCommerce/Classes/Model/Age.swift

@@ -53,7 +53,12 @@ extension Age {
             return .yesterday
         }
 
-        if let day = dateComponents.day, day == 0 {
+        if let month = dateComponents.month,
+           let weekOfYear = dateComponents.weekOfYear,
+           let day = dateComponents.day,
+           month == 0,
+           weekOfYear == 0,
+           day == 0 {
             return .today
         }
 

WooCommerce/Classes/ViewRelated/Orders/OrdersViewModel.swift

@@ -1,6 +1,7 @@
 
 import Foundation
 import Yosemite
+import class AutomatticTracks.CrashLogging
 import protocol Storage.StorageManagerType
 
 /// ViewModel for `OrdersViewController`.
@@ -89,7 +90,17 @@ final class OrdersViewModel {
     ///
     func activateAndForwardUpdates(to tableView: UITableView) {
         resultsController.startForwardingEvents(to: tableView)
-        try? resultsController.performFetch()
+        performFetch()
+    }
+
+    /// Execute the `resultsController` query, logging the error if there's any.
+    ///
+    private func performFetch() {
+        do {
+            try resultsController.performFetch()
+        } catch {
+            CrashLogging.logError(error)
+        }
     }
 
     /// Returns what `OrderAction` should be used when synchronizing.

WooCommerce/WooCommerceTests/Model/AgeTests.swift

@@ -122,4 +122,31 @@ final class AgeTests: XCTestCase {
 
         XCTAssertEqual(age, .upcoming)
     }
+
+    func testItReturnsUpcomingIfTheDateFromIsExactlyAMonthAfterDateTo() {
+        let dateFrom = dateFormatter.date(from: "2020-04-08T00:00:00Z")!
+        let dateTo = dateFormatter.date(from: "2020-03-08T00:00:00Z")!
+
+        let age = Age.from(startDate: dateFrom, toDate: dateTo, using: calendar)
+
+        XCTAssertEqual(age, .upcoming)
+    }
+
+    func testItReturnsUpcomingIfTheDateFromIsExactlyAWeekAfterDateTo() {
+        let dateFrom = dateFormatter.date(from: "2020-03-15T00:00:00Z")!
+        let dateTo = dateFormatter.date(from: "2020-03-08T00:00:00Z")!
+
+        let age = Age.from(startDate: dateFrom, toDate: dateTo, using: calendar)
+
+        XCTAssertEqual(age, .upcoming)
+    }
+
+    func testItReturnsUpcomingIfTheDateFromIsExactlyAYearAfterDateTo() {
+        let dateFrom = dateFormatter.date(from: "2021-03-08T00:00:00Z")!
+        let dateTo = dateFormatter.date(from: "2020-03-08T00:00:00Z")!
+
+        let age = Age.from(startDate: dateFrom, toDate: dateTo, using: calendar)
+
+        XCTAssertEqual(age, .upcoming)
+    }
 }