GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

MOBILE-4653 courses: Decouple deprecated functions on courses

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2024-11-06 14:07:15 +01:00
parent 1eb548e47b
commit 2485fb33b3
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/addons/enrol/guest/services/guest.ts
View File

@ -68,15 +68,11 @@ export class AddonEnrolGuestService {
* *
* @param instanceId Guest instance ID. * @param instanceId Guest instance ID.
* @param siteId Site Id. If not defined, use current site. * @param siteId Site Id. If not defined, use current site.
* @returns Promise resolved when the data is invalidated.
*/ */
async invalidateGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<void> { async invalidateGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<void> {
const site = await CoreSites.getSite(siteId); const site = await CoreSites.getSite(siteId);
await Promise.all([ await site.invalidateWsCacheForKey(this.getGuestEnrolmentInfoCacheKey(instanceId));
site.invalidateWsCacheForKey(this.getGuestEnrolmentInfoCacheKey(instanceId)),
site.invalidateWsCacheForKey(`mmCourses:guestinfo:${instanceId}`), // @todo Remove after 4.3 release.
]);
} }
/** /**

21
src/core/features/courses/services/courses.ts
View File

@ -22,9 +22,8 @@ import { CoreCourseAnyCourseDataWithExtraInfoAndOptions, CoreCourseWithImageAndC
import { asyncObservable, ignoreErrors, zipIncludingComplete } from '@/core/utils/rxjs'; import { asyncObservable, ignoreErrors, zipIncludingComplete } from '@/core/utils/rxjs';
import { of, firstValueFrom } from 'rxjs'; import { of, firstValueFrom } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { AddonEnrolGuest, AddonEnrolGuestInfo } from '@addons/enrol/guest/services/guest'; import { AddonEnrolGuestInfo } from '@addons/enrol/guest/services/guest';
import { AddonEnrolSelf } from '@addons/enrol/self/services/self'; import { CoreEnrolEnrolmentInfo, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol';
import { CoreEnrol, CoreEnrolEnrolmentInfo, CoreEnrolEnrolmentMethod } from '@features/enrol/services/enrol';
import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site'; import { CoreSiteWSPreSets, WSObservable } from '@classes/sites/authenticated-site';
import { CoreCacheUpdateFrequency } from '@/core/constants'; import { CoreCacheUpdateFrequency } from '@/core/constants';
import { import {
@ -347,6 +346,8 @@ export class CoreCoursesProvider {
* @deprecated since 4.3. Use CoreEnrol.getSupportedCourseEnrolmentMethods instead. * @deprecated since 4.3. Use CoreEnrol.getSupportedCourseEnrolmentMethods instead.
*/ */
async getCourseEnrolmentMethods(courseId: number, siteId?: string): Promise<CoreEnrolEnrolmentMethod[]> { async getCourseEnrolmentMethods(courseId: number, siteId?: string): Promise<CoreEnrolEnrolmentMethod[]> {
const { CoreEnrol } = await import('@features/enrol/services/enrol');
return CoreEnrol.getSupportedCourseEnrolmentMethods(courseId, { siteId }); return CoreEnrol.getSupportedCourseEnrolmentMethods(courseId, { siteId });
} }
@ -359,6 +360,8 @@ export class CoreCoursesProvider {
* @deprecated since 4.3 use AddonEnrolGuest.getCourseGuestEnrolmentInfo instead. * @deprecated since 4.3 use AddonEnrolGuest.getCourseGuestEnrolmentInfo instead.
*/ */
async getCourseGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<AddonEnrolGuestInfo> { async getCourseGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<AddonEnrolGuestInfo> {
const { AddonEnrolGuest } = await import('@addons/enrol/guest/services/guest');
return AddonEnrolGuest.getGuestEnrolmentInfo(instanceId, siteId); return AddonEnrolGuest.getGuestEnrolmentInfo(instanceId, siteId);
} }
@ -1062,11 +1065,12 @@ export class CoreCoursesProvider {
* *
* @param courseId Course ID. * @param courseId Course ID.
* @param siteId Site Id. If not defined, use current site. * @param siteId Site Id. If not defined, use current site.
* @returns Promise resolved when the data is invalidated.
* @deprecated since 4.3 use CoreEnrol.invalidateCourseEnrolmentMethods instead. * @deprecated since 4.3 use CoreEnrol.invalidateCourseEnrolmentMethods instead.
*/ */
async invalidateCourseEnrolmentMethods(courseId: number, siteId?: string): Promise<void> { async invalidateCourseEnrolmentMethods(courseId: number, siteId?: string): Promise<void> {
return CoreEnrol.invalidateCourseEnrolmentMethods(courseId, siteId); const { CoreEnrol } = await import('@features/enrol/services/enrol');
await CoreEnrol.invalidateCourseEnrolmentMethods(courseId, siteId);
} }
/** /**
@ -1074,11 +1078,12 @@ export class CoreCoursesProvider {
* *
* @param instanceId Guest instance ID. * @param instanceId Guest instance ID.
* @param siteId Site Id. If not defined, use current site. * @param siteId Site Id. If not defined, use current site.
* @returns Promise resolved when the data is invalidated.
* @deprecated since 4.3 use CoreEnrolDelegate.invalidate instead. * @deprecated since 4.3 use CoreEnrolDelegate.invalidate instead.
*/ */
async invalidateCourseGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<void> { async invalidateCourseGuestEnrolmentInfo(instanceId: number, siteId?: string): Promise<void> {
return AddonEnrolGuest.invalidateGuestEnrolmentInfo(instanceId, siteId); const { AddonEnrolGuest } = await import('@addons/enrol/guest/services/guest');
await AddonEnrolGuest.invalidateGuestEnrolmentInfo(instanceId, siteId);
} }
/** /**
@ -1274,6 +1279,8 @@ export class CoreCoursesProvider {
* @deprecated since 4.3 use CoreEnrolDelegate.enrol instead. * @deprecated since 4.3 use CoreEnrolDelegate.enrol instead.
*/ */
async selfEnrol(courseId: number, password: string = '', instanceId?: number, siteId?: string): Promise<boolean> { async selfEnrol(courseId: number, password: string = '', instanceId?: number, siteId?: string): Promise<boolean> {
const { AddonEnrolSelf } = await import('@addons/enrol/self/services/self');
return AddonEnrolSelf.selfEnrol(courseId, password, instanceId, siteId); return AddonEnrolSelf.selfEnrol(courseId, password, instanceId, siteId);
} }