Skip to content

MOBILE-3269 filter: Fix memory cache issue with contextLevels #2321

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 1 commit into from
Mar 17, 2020
Merged

MOBILE-3269 filter: Fix memory cache issue with contextLevels #2321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions src/core/filter/providers/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ export class CoreFilterHelperProvider {
protected moduleContextsCache: {
[siteId: string]: {
[courseId: number]: {
contexts: CoreFilterClassifiedFilters,
time: number
}
}
[contextLevel: string]: {
contexts: CoreFilterClassifiedFilters,
time: number,
},
},
},
} = {};

constructor(logger: CoreLoggerProvider,
Expand Down Expand Up @@ -110,7 +112,7 @@ export class CoreFilterHelperProvider {
return getFilters().then((contexts) => {

return this.filterProvider.getAvailableInContexts(contexts, siteId).then((filters) => {
this.storeInMemoryCache(options.courseId, filters, siteId);
this.storeInMemoryCache(options.courseId, contextLevel, filters, siteId);

return filters[contextLevel][instanceId] || [];
});
Expand Down Expand Up @@ -278,14 +280,16 @@ export class CoreFilterHelperProvider {
const siteId = site.getId();

// Check if we have the context in the memory cache.
if (this.moduleContextsCache[siteId] && this.moduleContextsCache[siteId][courseId]) {
const cachedCourse = this.moduleContextsCache[siteId][courseId];
if (this.moduleContextsCache[siteId] && this.moduleContextsCache[siteId][courseId] &&
this.moduleContextsCache[siteId][courseId][contextLevel]) {

const cachedData = this.moduleContextsCache[siteId][courseId][contextLevel];

if (!this.appProvider.isOnline() ||
Date.now() <= cachedCourse.time + site.getExpirationDelay(CoreSite.FREQUENCY_RARELY)) {
Date.now() <= cachedData.time + site.getExpirationDelay(CoreSite.FREQUENCY_RARELY)) {

// We can use cache, return the filters if found.
return cachedCourse.contexts[contextLevel] && cachedCourse.contexts[contextLevel][instanceId];
return cachedData.contexts[contextLevel] && cachedData.contexts[contextLevel][instanceId];
}
}
}
Expand Down Expand Up @@ -316,11 +320,14 @@ export class CoreFilterHelperProvider {
* @param contexts Filters to store, classified by contextlevel and instanceid
* @param siteId Site ID.
*/
protected storeInMemoryCache(courseId: number, contexts: CoreFilterClassifiedFilters, siteId: string): void {
protected storeInMemoryCache(courseId: number, contextLevel: string, contexts: CoreFilterClassifiedFilters, siteId: string)
: void {

this.moduleContextsCache[siteId] = this.moduleContextsCache[siteId] || {};
this.moduleContextsCache[siteId][courseId] = {
this.moduleContextsCache[siteId][courseId] = this.moduleContextsCache[siteId][courseId] || {};
this.moduleContextsCache[siteId][courseId][contextLevel] = {
contexts: contexts,
time: Date.now()
time: Date.now(),
};
}
}