Remove out of context changes

Author: ThomazFB

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsHubViewModel.swift

@@ -15,7 +15,7 @@ final class AnalyticsHubViewModel: ObservableObject {
     init(siteID: Int64,
          statsTimeRange: StatsTimeRangeV4,
          stores: StoresManager = ServiceLocator.stores) {
-        let selectedType = AnalyticsHubTimeRangeSelectionType(statsTimeRange)
+        let selectedType = AnalyticsHubTimeRangeSelection.SelectionType(statsTimeRange)
         let timeRangeSelection = AnalyticsHubTimeRangeSelection(selectionType: selectedType)
 
         self.siteID = siteID
@@ -41,7 +41,7 @@ final class AnalyticsHubViewModel: ObservableObject {
 
     /// Time Range Selection Type
     ///
-    @Published var timeRangeSelectionType: AnalyticsHubTimeRangeSelectionType
+    @Published var timeRangeSelectionType: AnalyticsHubTimeRangeSelection.SelectionType
 
     /// Time Range ViewModel
     ///

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/AnalyticsTimeRangeCard.swift

@@ -7,11 +7,11 @@ struct AnalyticsTimeRangeCard: View {
     let timeRangeTitle: String
     let currentRangeDescription: String
     let previousRangeDescription: String
-    @Binding var selectionType: AnalyticsHubTimeRangeSelectionType
+    @Binding var selectionType: AnalyticsHubTimeRangeSelection.SelectionType
 
     @State private var showTimeRangeSelectionView: Bool = false
 
-    init(viewModel: AnalyticsTimeRangeCardViewModel, selectionType: Binding<AnalyticsHubTimeRangeSelectionType>) {
+    init(viewModel: AnalyticsTimeRangeCardViewModel, selectionType: Binding<AnalyticsHubTimeRangeSelection.SelectionType>) {
         self.timeRangeTitle = viewModel.selectedRangeTitle
         self.currentRangeDescription = viewModel.currentRangeSubtitle
         self.previousRangeDescription = viewModel.previousRangeSubtitle
@@ -22,7 +22,7 @@ struct AnalyticsTimeRangeCard: View {
         createTimeRangeContent()
             .sheet(isPresented: $showTimeRangeSelectionView) {
                 SelectionList(title: Localization.timeRangeSelectionTitle,
-                              items: AnalyticsHubTimeRangeSelectionType.allCases,
+                              items: AnalyticsHubTimeRangeSelection.SelectionType.allCases,
                               contentKeyPath: \.description,
                               selected: $selectionType)
             }

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRangeSelection.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Yosemite
 
 /// Main source of time ranges of the Analytics Hub, responsible for providing the current and previous dates
 /// for a given Date and range Type alongside their UI descriptions
@@ -9,7 +10,6 @@ public class AnalyticsHubTimeRangeSelection {
     private let formattedCurrentRangeText: String?
     private let formattedPreviousRangeText: String?
     let rangeSelectionDescription: String
-
     /// Provide a date description of the current time range set internally.
     /// - Returns the Time range in a UI friendly format. If the current time range is not available,
     /// then returns an presentable error message.
@@ -19,7 +19,6 @@ public class AnalyticsHubTimeRangeSelection {
         }
         return currentTimeRangeDescription
     }
-
     /// Generates a date description of the previous time range set internally.
     /// - Returns the Time range in a UI friendly format. If the previous time range is not available,
     /// then returns an presentable error message.
@@ -31,24 +30,36 @@ public class AnalyticsHubTimeRangeSelection {
     }
 
     //TODO: abandon usage of the ISO 8601 Calendar and build one based on the Site calendar configuration
-    init(selectionType: AnalyticsHubTimeRangeSelectionType,
+    init(selectionType: SelectionType,
          currentDate: Date = Date(),
          timezone: TimeZone = TimeZone.autoupdatingCurrent,
          calendar: Calendar = Calendar(identifier: .iso8601)) {
-        let selectionData = selectionType.mapToRangeData(referenceDate: currentDate, timezone: timezone, calendar: calendar)
+        var selectionData: AnalyticsHubTimeRangeData
+
+        switch selectionType {
+        case .today:
+            selectionData = AnalyticsHubDayRangeData(referenceDate: currentDate, timezone: timezone, calendar: calendar)
+        case .weekToDate:
+            selectionData = AnalyticsHubWeekRangeData(referenceDate: currentDate, timezone: timezone, calendar: calendar)
+        case .monthToDate:
+            selectionData = AnalyticsHubMonthRangeData(referenceDate: currentDate, timezone: timezone, calendar: calendar)
+        case .yearToDate:
+            selectionData = AnalyticsHubYearRangeData(referenceDate: currentDate, timezone: timezone, calendar: calendar)
+        }
+
         let currentTimeRange = selectionData.currentTimeRange
         let previousTimeRange = selectionData.previousTimeRange
-        let simplifiedDescription = selectionType == .today || selectionType == .yesterday
-
         self.currentTimeRange = currentTimeRange
         self.previousTimeRange = previousTimeRange
-        self.rangeSelectionDescription = selectionType.description
+
+        let simplifiedDescription = selectionType == .today
         self.formattedCurrentRangeText = currentTimeRange?.formatToString(simplified: simplifiedDescription,
                                                                           timezone: timezone,
                                                                           calendar: calendar)
         self.formattedPreviousRangeText = previousTimeRange?.formatToString(simplified: simplifiedDescription,
                                                                             timezone: timezone,
                                                                             calendar: calendar)
+        self.rangeSelectionDescription = selectionType.description
     }
 
     /// Unwrap the generated selected `AnalyticsHubTimeRange` based on the `selectedTimeRange`
@@ -60,7 +71,6 @@ public class AnalyticsHubTimeRangeSelection {
         }
         return currentTimeRange
     }
-
     /// Unwrap the generated previous `AnalyticsHubTimeRange`relative to the selected one
     /// based on the `selectedTimeRange` provided during initialization.
     /// - throws a `.previousRangeGenerationFailed` error if the unwrap fails.
@@ -72,33 +82,53 @@ public class AnalyticsHubTimeRangeSelection {
     }
 }
 
-// MARK: - Data creation utility
-private extension AnalyticsHubTimeRangeSelectionType {
-    func mapToRangeData(referenceDate: Date, timezone: TimeZone, calendar: Calendar) -> AnalyticsHubTimeRangeData {
-        switch self {
-        case .today:
-            return AnalyticsHubTodayRangeData(referenceDate: referenceDate, timezone: timezone, calendar: calendar)
-        case .yesterday:
-            return AnalyticsHubYesterdayRangeData(referenceDate: referenceDate, timezone: timezone, calendar: calendar)
-        case .weekToDate:
-            return AnalyticsHubWeekToDateRangeData(referenceDate: referenceDate, timezone: timezone, calendar: calendar)
-        case .monthToDate:
-            return AnalyticsHubMonthToDateRangeData(referenceDate: referenceDate, timezone: timezone, calendar: calendar)
-        case .yearToDate:
-            return AnalyticsHubYearToDateRangeData(referenceDate: referenceDate, timezone: timezone, calendar: calendar)
+// MARK: - Time Range Selection Type
+extension AnalyticsHubTimeRangeSelection {
+    enum SelectionType: CaseIterable {
+        case today
+        case weekToDate
+        case monthToDate
+        case yearToDate
+
+        var description: String {
+            switch self {
+            case .today:
+                return Localization.today
+            case .weekToDate:
+                return Localization.weekToDate
+            case .monthToDate:
+                return Localization.monthToDate
+            case .yearToDate:
+                return Localization.yearToDate
+            }
+        }
+
+        init(_ statsTimeRange: StatsTimeRangeV4) {
+            switch statsTimeRange {
+            case .today:
+                self = .today
+            case .thisWeek:
+                self = .weekToDate
+            case .thisMonth:
+                self = .monthToDate
+            case .thisYear:
+                self = .yearToDate
+            }
         }
     }
 }
-
 // MARK: - Constants
 extension AnalyticsHubTimeRangeSelection {
-
     enum TimeRangeGeneratorError: Error {
         case selectedRangeGenerationFailed
         case previousRangeGenerationFailed
     }
 
     enum Localization {
+        static let today = NSLocalizedString("Today", comment: "Title of the Analytics Hub Today's selection range")
+        static let weekToDate = NSLocalizedString("Week to Date", comment: "Title of the Analytics Hub Week to Date selection range")
+        static let monthToDate = NSLocalizedString("Month to Date", comment: "Title of the Analytics Hub Month to Date selection range")
+        static let yearToDate = NSLocalizedString("Year to Date", comment: "Title of the Analytics Hub Year to Date selection range")
         static let selectionTitle = NSLocalizedString("Date Range", comment: "Title of the range selection list")
         static let noCurrentPeriodAvailable = NSLocalizedString("No current period available",
                                                                 comment: "A error message when it's not possible to acquire"

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/AnalyticsHubTimeRangeSelectionType.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-struct AnalyticsHubTodayRangeData: AnalyticsHubTimeRangeData {
+struct AnalyticsHubDayRangeData: AnalyticsHubTimeRangeData {
     let currentDateStart: Date?
     let currentDateEnd: Date?
     let previousDateStart: Date?

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/Range Data Generation/AnalyticsHubTodayRangeData.swift renamed to WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/Range Data Generation/AnalyticsHubDayRangeData.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-struct AnalyticsHubMonthToDateRangeData: AnalyticsHubTimeRangeData {
+struct AnalyticsHubMonthRangeData: AnalyticsHubTimeRangeData {
     let currentDateStart: Date?
     let currentDateEnd: Date?
     let previousDateStart: Date?

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/Range Data Generation/AnalyticsHubMonthToDateRangeData.swift renamed to WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/Range Data Generation/AnalyticsHubMonthRangeData.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-struct AnalyticsHubWeekToDateRangeData: AnalyticsHubTimeRangeData {
+struct AnalyticsHubWeekRangeData: AnalyticsHubTimeRangeData {
     let currentDateStart: Date?
     let currentDateEnd: Date?
     let previousDateStart: Date?

WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/Range Data Generation/AnalyticsHubWeekToDateRangeData.swift renamed to WooCommerce/Classes/ViewRelated/Dashboard/Analytics Hub/Time Range/Range Data Generation/AnalyticsHubWeekRangeData.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-struct AnalyticsHubYearToDateRangeData: AnalyticsHubTimeRangeData {
+struct AnalyticsHubYearRangeData: AnalyticsHubTimeRangeData {
     let currentDateStart: Date?
     let currentDateEnd: Date?
     let previousDateStart: Date?