EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2321 from dpalou/MOBILE-3269 

MOBILE-3269 filter: Fix memory cache issue with contextLevels
main
Juan Leyva 2020-03-17 16:46:47 +01:00 committed by GitHub
parent e41762e5ea 02173db1b1
commit c81e669e95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/filter/providers/helper.ts
View File

@ -38,10 +38,12 @@ export class CoreFilterHelperProvider {
protected moduleContextsCache: { protected moduleContextsCache: {
[siteId: string]: { [siteId: string]: {
[courseId: number]: { [courseId: number]: {
[contextLevel: string]: {
contexts: CoreFilterClassifiedFilters, contexts: CoreFilterClassifiedFilters,
time: number time: number,
} },
} },
},
} = {}; } = {};
constructor(logger: CoreLoggerProvider, constructor(logger: CoreLoggerProvider,
@ -110,7 +112,7 @@ export class CoreFilterHelperProvider {
return getFilters().then((contexts) => { return getFilters().then((contexts) => {
return this.filterProvider.getAvailableInContexts(contexts, siteId).then((filters) => { 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] || []; return filters[contextLevel][instanceId] || [];
}); });
@ -278,14 +280,16 @@ export class CoreFilterHelperProvider {
const siteId = site.getId(); const siteId = site.getId();
// Check if we have the context in the memory cache. // Check if we have the context in the memory cache.
if (this.moduleContextsCache[siteId] && this.moduleContextsCache[siteId][courseId]) { if (this.moduleContextsCache[siteId] && this.moduleContextsCache[siteId][courseId] &&
const cachedCourse = this.moduleContextsCache[siteId][courseId]; this.moduleContextsCache[siteId][courseId][contextLevel]) {
const cachedData = this.moduleContextsCache[siteId][courseId][contextLevel];
if (!this.appProvider.isOnline() || 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. // 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];
} }
} }
} }
@ -316,11 +320,14 @@ export class CoreFilterHelperProvider {
* @param contexts Filters to store, classified by contextlevel and instanceid * @param contexts Filters to store, classified by contextlevel and instanceid
* @param siteId Site ID. * @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] = this.moduleContextsCache[siteId] || {};
this.moduleContextsCache[siteId][courseId] = { this.moduleContextsCache[siteId][courseId] = this.moduleContextsCache[siteId][courseId] || {};
this.moduleContextsCache[siteId][courseId][contextLevel] = {
contexts: contexts, contexts: contexts,
time: Date.now() time: Date.now(),
}; };
} }
} }