Skip to content

Stats: PeriodStore + improve CoreData Persistence + Caching #19776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 2, 2023
Merged

Stats: PeriodStore + improve CoreData Persistence + Caching #19776

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
246e149
adding a barrierblock to end of fetchAsyncData in order to persistToC…
sla8c Dec 14, 2022
c51970f
changed to use DispatchGroup
sla8c Dec 21, 2022
ede2134
Refactor stats period store dispatch group
Dec 22, 2022
f2a8f24
Merge branch 'trunk' into issue/stats-period-core-data-persist
staskus Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 89 additions & 0 deletions WordPress/Classes/Stores/StatsPeriodStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,12 @@ private extension StatsPeriodStore {
return
}

let group = DispatchGroup()

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching likes summary.")
}
let likesOperation = PeriodOperation(service: service, for: period, date: date, limit: 14) { [weak self] (likes: StatsLikesSummaryTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching likes summary: \(String(describing: error?.localizedDescription))")
Expand All @@ -392,9 +398,17 @@ private extension StatsPeriodStore {
DDLogInfo("Stats Period: Finished fetching likes summary.")
DispatchQueue.main.async {
self?.receivedLikesSummary(likes, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching likes summary.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching posts.")
}
let topPostsOperation = PeriodOperation(service: service, for: period, date: date) { [weak self] (posts: StatsTopPostsTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching posts: \(String(describing: error?.localizedDescription))")
Expand All @@ -404,9 +418,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedPostsAndPages(posts, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching posts.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching referrers.")
}
let topReferrers = PeriodOperation(service: service, for: period, date: date) { [weak self] (referrers: StatsTopReferrersTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching referrers: \(String(describing: error?.localizedDescription))")
Expand All @@ -416,9 +438,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedReferrers(referrers, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching referrers.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching published.")
}
let topPublished = PublishedPostOperation(service: service, for: period, date: date) { [weak self] (published: StatsPublishedPostsTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching published: \(String(describing: error?.localizedDescription))")
Expand All @@ -428,9 +458,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedPublished(published, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching published.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching clicks.")
}
let topClicks = PeriodOperation(service: service, for: period, date: date) { [weak self] (clicks: StatsTopClicksTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching clicks: \(String(describing: error?.localizedDescription))")
Expand All @@ -440,9 +478,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedClicks(clicks, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching clicks.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching authors.")
}
let topAuthors = PeriodOperation(service: service, for: period, date: date) { [weak self] (authors: StatsTopAuthorsTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching authors: \(String(describing: error?.localizedDescription))")
Expand All @@ -452,9 +498,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedAuthors(authors, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching authors.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching search terms.")
}
let topSearchTerms = PeriodOperation(service: service, for: period, date: date) { [weak self] (searchTerms: StatsSearchTermTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching search terms: \(String(describing: error?.localizedDescription))")
Expand All @@ -464,9 +518,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedSearchTerms(searchTerms, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching search terms.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching countries.")
}
let topCountries = PeriodOperation(service: service, for: period, date: date, limit: 0) { [weak self] (countries: StatsTopCountryTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching countries: \(String(describing: error?.localizedDescription))")
Expand All @@ -476,9 +538,17 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedCountries(countries, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching countries.")
group.leave()
}
}
}

if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching videos.")
}
let topVideos = PeriodOperation(service: service, for: period, date: date) { [weak self] (videos: StatsTopVideosTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error fetching videos: \(String(describing: error?.localizedDescription))")
Expand All @@ -488,11 +558,19 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedVideos(videos, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching videos.")
group.leave()
}
}
}

// 'limit' in this context is used for the 'num' parameter for the 'file-downloads' endpoint.
// 'num' relates to the "number of periods to include in the query".
if FeatureFlag.statsNewAppearance.enabled {
group.enter()
DDLogInfo("Stats Period: Enter group fetching file downloads.")
}
let topFileDownloads = PeriodOperation(service: service, for: period, date: date, limit: 1) { [weak self] (downloads: StatsFileDownloadsTimeIntervalData?, error: Error?) in
if error != nil {
DDLogError("Stats Period: Error file downloads: \(String(describing: error?.localizedDescription))")
Expand All @@ -502,6 +580,10 @@ private extension StatsPeriodStore {

DispatchQueue.main.async {
self?.receivedFileDownloads(downloads, error)
if FeatureFlag.statsNewAppearance.enabled {
DDLogInfo("Stats Period: Leave group fetching file downloads.")
group.leave()
}
}
}

Expand All @@ -516,6 +598,13 @@ private extension StatsPeriodStore {
topVideos,
topFileDownloads],
waitUntilFinished: false)

if FeatureFlag.statsNewAppearance.enabled {
group.notify(queue: .main) { [weak self] in
DDLogInfo("Stats Period: Finished fetchAsyncData.")
self?.persistToCoreData()
}
}
}

func fetchSummaryLikesData(date: Date, period: StatsPeriodUnit) {
Expand Down