Skip to content

Commit 424f42f

Browse files
ParaskP7ParaskP7
authored
Merge pull request #14680 from woocommerce/migrate/wc-revenue-stats-model-to-room
[WellSQL Migration] Migrate `WCRevenueStatsModel` to Room
2 parents 38975a1 + 1a9768c commit 424f42f

File tree

60 files changed

+4751
-516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+4751
-516
lines changed

‎WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/datasource/StatsRepository.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import com.woocommerce.android.wear.util.DateUtils
2121
import com.woocommerce.commons.DataParameters.ORDERS_COUNT
2222
import com.woocommerce.commons.DataParameters.TOTAL_REVENUE
2323
import com.woocommerce.commons.DataParameters.VISITORS_TOTAL
24+
import com.woocommerce.commons.stats.StatsTimeRange
25+
import com.woocommerce.commons.stats.StatsUtils.toRevenueRangeId
2426
import kotlinx.coroutines.flow.map
2527
import kotlinx.coroutines.flow.mapNotNull
2628
import org.wordpress.android.fluxc.model.SiteModel
@@ -61,7 +63,8 @@ class StatsRepository @Inject constructor(
6163
site = selectedSite,
6264
granularity = StatsGranularity.DAYS,
6365
startDate = todayRange.start.formatToYYYYmmDDhhmmss(),
64-
endDate = todayRange.end.formatToYYYYmmDDhhmmss()
66+
endDate = todayRange.end.formatToYYYYmmDDhhmmss(),
67+
revenueRangeId = StatsTimeRange(todayRange.start, todayRange.end).toRevenueRangeId("Wear")
6568
)
6669
)
6770

‎WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/range/StatsTimeRangeData.kt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
package com.woocommerce.android.wear.ui.stats.range
22

3-
import android.os.Parcelable
4-
import kotlinx.parcelize.Parcelize
3+
import com.woocommerce.commons.stats.StatsTimeRange
54
import java.util.Calendar
6-
import java.util.Date
7-
8-
@Parcelize
9-
data class StatsTimeRange(
10-
val start: Date,
11-
val end: Date
12-
) : Parcelable
135

146
abstract class StatsTimeRangeData(
157
referenceCalendar: Calendar

‎WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/range/TodayRangeData.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.woocommerce.android.wear.extensions.formatToMMMddYYYY
55
import com.woocommerce.android.wear.extensions.oneDayAgo
66
import com.woocommerce.android.wear.extensions.startOfCurrentDay
77
import com.woocommerce.android.wear.util.DateUtils
8+
import com.woocommerce.commons.stats.StatsTimeRange
89
import java.util.Calendar
910
import java.util.Locale
1011

‎WooCommerce/src/main/kotlin/com/woocommerce/android/background/BackgroundUpdateAnalyticsRepository.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.woocommerce.android.ui.analytics.ranges.revenueStatsGranularity
1111
import com.woocommerce.android.ui.analytics.ranges.visitorStatsGranularity
1212
import com.woocommerce.android.ui.analytics.ranges.visitorSummaryStatsGranularity
1313
import com.woocommerce.android.ui.dashboard.data.StatsRepository
14-
import com.woocommerce.android.ui.dashboard.data.asRevenueRangeId
14+
import com.woocommerce.commons.stats.StatsUtils.asRevenueRangeId
1515
import kotlinx.coroutines.async
1616
import kotlinx.coroutines.awaitAll
1717
import kotlinx.coroutines.coroutineScope

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/hub/sync/AnalyticsRepository.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import com.woocommerce.android.ui.analytics.hub.sync.AnalyticsRepository.Product
2121
import com.woocommerce.android.ui.analytics.hub.sync.AnalyticsRepository.RevenueResult.RevenueData
2222
import com.woocommerce.android.ui.analytics.hub.sync.AnalyticsRepository.RevenueResult.RevenueError
2323
import com.woocommerce.android.ui.analytics.ranges.NotSupportedGranularity
24-
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
2524
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection
2625
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeSelection.SelectionType
2726
import com.woocommerce.android.ui.analytics.ranges.revenueStatsGranularity
2827
import com.woocommerce.android.ui.analytics.ranges.visitorStatsGranularity
2928
import com.woocommerce.android.ui.analytics.ranges.visitorSummaryStatsGranularity
3029
import com.woocommerce.android.ui.dashboard.data.StatsRepository
31-
import com.woocommerce.android.ui.dashboard.data.asRevenueRangeId
30+
import com.woocommerce.commons.stats.StatsTimeRange
31+
import com.woocommerce.commons.stats.StatsUtils.asRevenueRangeId
3232
import kotlinx.coroutines.Deferred
3333
import kotlinx.coroutines.async
3434
import kotlinx.coroutines.coroutineScope

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/ranges/StatsTimeRangeData.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.woocommerce.android.ui.analytics.ranges
22

3+
import com.woocommerce.commons.stats.StatsTimeRange
34
import java.util.Calendar
45

56
abstract class StatsTimeRangeData(

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/ranges/StatsTimeRangeSelection.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,13 @@ import com.woocommerce.android.ui.analytics.ranges.data.TodayRangeData
2525
import com.woocommerce.android.ui.analytics.ranges.data.WeekToDateRangeData
2626
import com.woocommerce.android.ui.analytics.ranges.data.YearToDateRangeData
2727
import com.woocommerce.android.ui.analytics.ranges.data.YesterdayRangeData
28+
import com.woocommerce.commons.stats.StatsTimeRange
2829
import kotlinx.parcelize.Parcelize
2930
import org.wordpress.android.fluxc.store.WCStatsStore.StatsGranularity
3031
import java.util.Calendar
3132
import java.util.Date
3233
import java.util.Locale
3334

34-
@Parcelize
35-
data class StatsTimeRange(
36-
val start: Date,
37-
val end: Date
38-
) : Parcelable
39-
4035
/**
4136
* This class represents the date range selection for the Analytics Hub and the Stats screen
4237
*

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/ranges/data/CustomRangeData.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.woocommerce.android.extensions.endOfCurrentDay
44
import com.woocommerce.android.extensions.formatAsRangeWith
55
import com.woocommerce.android.extensions.oneDayAgo
66
import com.woocommerce.android.extensions.startOfCurrentDay
7-
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
87
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeData
8+
import com.woocommerce.commons.stats.StatsTimeRange
99
import java.util.Calendar
1010
import java.util.Date
1111
import java.util.Locale

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/ranges/data/LastMonthRangeData.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.woocommerce.android.extensions.endOfCurrentMonth
44
import com.woocommerce.android.extensions.formatAsRangeWith
55
import com.woocommerce.android.extensions.oneMonthAgo
66
import com.woocommerce.android.extensions.startOfCurrentMonth
7-
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
87
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeData
8+
import com.woocommerce.commons.stats.StatsTimeRange
99
import java.util.Calendar
1010
import java.util.Date
1111
import java.util.Locale

‎WooCommerce/src/main/kotlin/com/woocommerce/android/ui/analytics/ranges/data/LastQuarterRangeData.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.woocommerce.android.extensions.endOfCurrentQuarter
44
import com.woocommerce.android.extensions.formatAsRangeWith
55
import com.woocommerce.android.extensions.oneQuarterAgo
66
import com.woocommerce.android.extensions.startOfCurrentQuarter
7-
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRange
87
import com.woocommerce.android.ui.analytics.ranges.StatsTimeRangeData
8+
import com.woocommerce.commons.stats.StatsTimeRange
99
import java.util.Calendar
1010
import java.util.Date
1111
import java.util.Locale

0 commit comments

Comments
 (0)