@studyportals/fawkes 6.0.1-9 → 7.0.1-0

package/dist/src/presenters/DegreePresenter.d.ts

@@ -8,4 +8,5 @@ export declare class DegreePresenter implements IPresenter {
     private constructor();
     static getInstance(): DegreePresenter;
     getFragments(): IFragment[];
+    private formatDegreePath;
 }

package/dist/src/presenters/DegreePresenter.js

@@ -7,7 +7,7 @@ export class DegreePresenter {
         this.fragments = Object.values(DegreeTypeFilterOptionValue).map((degree) => {
             return {
                 id: degree,
-                path: degree
+                path: this.formatDegreePath(degree)
             };
         });
     }
@@ -20,4 +20,31 @@ export class DegreePresenter {
     getFragments() {
         return this.fragments;
     }
+    formatDegreePath(degree) {
+        const formattedDegree = degree.toLowerCase().replace(/_/g, '-');
+        const pathById = new Map([
+            ['phd', 'ph-d'],
+            ['dba', 'dba'],
+            ['doct', 'doctorate'],
+            ['msc', 'msc'],
+            ['ma', 'ma'],
+            ['mba', 'mba'],
+            ['llm', 'llm'],
+            ['mphil', 'mphil'],
+            ['med', 'med'],
+            ['meng', 'meng'],
+            ['postgraddip', 'postgraduate-diploma'],
+            ['postgradcert', 'postgraduate-certificate'],
+            ['premaster', 'pre-master'],
+            ['bsc', 'bsc'],
+            ['ba', 'ba'],
+            ['bba', 'bba'],
+            ['ad', 'associate-degree'],
+            ['gcertificate', 'graduate-certificate'],
+            ['gdiploma', 'graduate-diploma'],
+            ['prebachelor', 'prebachelor'],
+            ['certificate', 'certificate']
+        ]);
+        return pathById.get(degree) || formattedDegree;
+    }
 }

package/dist/src/presenters/EducationalFormPresenter.js

@@ -24,7 +24,20 @@ export class EducationalFormPresenter {
         return EducationalFormPresenter.instance;
     }
     formatEducationalFormPath(form) {
-        return form.toLowerCase().replace(/_/g, '-');
+        switch (form) {
+            case EducationalFormFilterOptionValue.ACADEMIC_COURSE:
+                return 'academic-course';
+            case EducationalFormFilterOptionValue.CONFERENCE_SEMINAR:
+                return 'conference';
+            case EducationalFormFilterOptionValue.SUMMER_SCHOOL:
+                return 'summer-school';
+            case EducationalFormFilterOptionValue.WINTER_SCHOOL:
+                return 'winter-school';
+            case EducationalFormFilterOptionValue.SEMESTER_STUDY_ABROAD:
+                return 'semester-abroad';
+            case EducationalFormFilterOptionValue.SKILL_PROFESSIONAL_COURSE:
+                return 'skill';
+        }
     }
     getFragments() {
         return this.fragments;

package/dist/src/programmes/BaseProgrammeFilterKeyValueRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseFilterKeyValueRule } from '../common/rules/BaseFilterKeyValueRule';
+import { FilterKeyValuesMap } from '../common/FilterKeyValuesMap';
+import { IProgrammeRule } from './IProgrammeRule';
+export declare abstract class BaseProgrammeFilterKeyValueRule extends BaseFilterKeyValueRule implements IProgrammeRule {
+    forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+}

package/dist/src/programmes/BaseProgrammeFilterKeyValueRule.js

@@ -0,0 +1,6 @@
+import { BaseFilterKeyValueRule } from '../common/rules/BaseFilterKeyValueRule';
+export class BaseProgrammeFilterKeyValueRule extends BaseFilterKeyValueRule {
+    forSitemapGeneratorWithPageNumber(filterKeyValues) {
+        return this.forSitemapGenerator(filterKeyValues);
+    }
+}

package/dist/src/programmes/BaseProgrammeRule.d.ts

@@ -0,0 +1,10 @@
+import { FilterKeyValuesMap } from '../common/FilterKeyValuesMap';
+import { IProgrammeRule } from './IProgrammeRule';
+import { ISearchDependencies } from '../common/ISearchDependencies';
+export declare abstract class BaseProgrammeRule implements IProgrammeRule {
+    forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+    abstract forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+    abstract forSearch(dependencies: ISearchDependencies): Promise<boolean>;
+    abstract getName(): string;
+    abstract getDescription(): string;
+}

package/dist/src/programmes/BaseProgrammeRule.js

@@ -0,0 +1,5 @@
+export class BaseProgrammeRule {
+    forSitemapGeneratorWithPageNumber(filterKeyValues) {
+        return this.forSitemapGenerator(filterKeyValues);
+    }
+}

package/dist/src/programmes/IProgrammeRule.d.ts

@@ -0,0 +1,5 @@
+import { IRule } from '../common/IRule';
+import { FilterKeyValuesMap } from '../common/FilterKeyValuesMap';
+export interface IProgrammeRule extends IRule {
+    forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap, pageNumber: number): Promise<boolean>;
+}

package/dist/src/programmes/IProgrammeRule.js

@@ -0,0 +1 @@
+export {};

package/dist/src/programmes/ProgrammesBaseIndexabilityPolicy.d.ts

@@ -2,7 +2,14 @@ import { BaseSeoIndexabilityPolicy } from '../common/policies/BaseSeoIndexabilit
 import { IProgrammeSeoDependencies } from './types/IProgrammeSeoDependencies';
 import { IProgrammeSitemapUrlGenerator } from './types/IProgrammeSitemapUrlGenerator';
 import { FilterKey } from '@studyportals/search-filters';
+import { FilterKeyValuesMap } from '../../sitemap-generator-seo';
+import { IProgrammeRule } from './IProgrammeRule';
+import { IRule } from '../common/IRule';
 export declare abstract class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy<IProgrammeSeoDependencies> implements IProgrammeSitemapUrlGenerator {
     abstract readonly filterKeys: FilterKey[];
+    protected readonly indexablePageNumbers: number[];
+    protected abstract readonly rules: IProgrammeRule[] | IRule[];
     protected initateBaseRules(): void;
+    checkRulesForSitemapWithPageNumber(filterKeyValues: FilterKeyValuesMap, pageNumber: number): Promise<boolean>;
+    protected getPathWithPageNumber(path: string, pageNumber: number): string;
 }

package/dist/src/programmes/ProgrammesBaseIndexabilityPolicy.js

@@ -3,6 +3,7 @@ import { IndexablePageNumberRule } from './rules/IndexablePageNumberRule';
 import { NotDistanceLearningPortalRule } from './rules/NotDistanceLearningPortalRule';
 import { BaseSeoIndexabilityPolicy } from '../common/policies/BaseSeoIndexabilityPolicy';
 export class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
+    indexablePageNumbers = [1, 2];
     initateBaseRules() {
         const indexablePageNumberRule = new IndexablePageNumberRule();
         let atLeastSevenResultsRule;
@@ -18,4 +19,24 @@ export class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy
         }
         this.rules.push(atLeastSevenResultsRule, notDistanceLearningPortalRule, indexablePageNumberRule);
     }
+    async checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber) {
+        for (const rule of this.rules) {
+            let result;
+            if ('forSitemapGeneratorWithPageNumber' in rule) {
+                result = await rule.forSitemapGeneratorWithPageNumber(filterKeyValues, pageNumber);
+            }
+            else {
+                result = await rule.forSitemapGenerator(filterKeyValues);
+            }
+            if (!result) {
+                return false;
+            }
+        }
+        return true;
+    }
+    getPathWithPageNumber(path, pageNumber) {
+        if (pageNumber === 2)
+            return `${path}/page-${pageNumber}`;
+        return path;
+    }
 }

package/dist/src/programmes/policies/Area.js

@@ -20,14 +20,16 @@ export class Area extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const areaFragments = AreaPresenter.getInstance().getFragments();
         const paths = [];
-        for (const area of areaFragments) {
-            const filterKeyValues = new Map([
-                [FilterKey.AREA, [area.id]],
-                [FilterKey.COUNTRY, [area.countryId]]
-            ]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(area.path);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const area of areaFragments) {
+                const filterKeyValues = new Map([
+                    [FilterKey.AREA, [area.id]],
+                    [FilterKey.COUNTRY, [area.countryId]]
+                ]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(area.path, pageNumber));
+                }
             }
         }
         return paths;

package/dist/src/programmes/policies/Attendance.js

@@ -21,11 +21,13 @@ export class Attendance extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const paths = [];
-        for (const attendance of attendanceFragments) {
-            const filterKeyValues = new Map([[FilterKey.DELIVERY_METHOD, [attendance.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(attendance.path);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const attendance of attendanceFragments) {
+                const filterKeyValues = new Map([[FilterKey.DELIVERY_METHOD, [attendance.id]]]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(attendance.path, pageNumber));
+                }
             }
         }
         return paths;

package/dist/src/programmes/policies/AttendanceDegree.js

@@ -26,15 +26,17 @@ export class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const degreeFragments = DegreePresenter.getInstance().getFragments();
         const paths = [];
-        for (const attendance of attendanceFragments) {
-            for (const degree of degreeFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.DELIVERY_METHOD, [attendance.id]],
-                    [FilterKey.DEGREE_TYPE, [degree.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${attendance.path}/${degree.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const attendance of attendanceFragments) {
+                for (const degree of degreeFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.DELIVERY_METHOD, [attendance.id]],
+                        [FilterKey.DEGREE_TYPE, [degree.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${degree.path}/${attendance.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/Continent.js

@@ -19,11 +19,13 @@ export class Continent extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const continentFragments = ContinentPresenter.getInstance().getFragments();
         const paths = [];
-        for (const continent of continentFragments) {
-            const filterKeyValues = new Map([[FilterKey.CONTINENT, [continent.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(continent.path);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const continent of continentFragments) {
+                const filterKeyValues = new Map([[FilterKey.CONTINENT, [continent.id]]]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(continent.path, pageNumber));
+                }
             }
         }
         return paths;

package/dist/src/programmes/policies/ContinentTuitionFee.js

@@ -24,15 +24,17 @@ export class ContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy {
         const continentFragments = ContinentPresenter.getInstance().getFragments();
         const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
         const paths = [];
-        for (const continent of continentFragments) {
-            for (const tuitionFee of tuitionFeeFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.CONTINENT, [continent.id]],
-                    [FilterKey.TUITION_FEE, [tuitionFee.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${tuitionFee.path}/${continent.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const continent of continentFragments) {
+                for (const tuitionFee of tuitionFeeFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.CONTINENT, [continent.id]],
+                        [FilterKey.TUITION_FEE, [tuitionFee.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${tuitionFee.path}/${continent.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/Country.js

@@ -16,11 +16,13 @@ export class Country extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            const filterKeyValues = new Map([[FilterKey.COUNTRY, [country.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(country.path);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                const filterKeyValues = new Map([[FilterKey.COUNTRY, [country.id]]]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(country.path, pageNumber));
+                }
             }
         }
         return paths;

package/dist/src/programmes/policies/CountryAttendance.js

@@ -24,15 +24,17 @@ export class CountryAttendance extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const attendance of attendanceFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.DELIVERY_METHOD, [attendance.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${attendance.path}/${country.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const attendance of attendanceFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.DELIVERY_METHOD, [attendance.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${attendance.path}/${country.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/CountryAttendanceDegree.js

@@ -30,17 +30,19 @@ export class CountryAttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const degreeFragments = DegreePresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const attendance of attendanceFragments) {
-                for (const degree of degreeFragments) {
-                    const filterKeyValues = new Map([
-                        [FilterKey.COUNTRY, [country.id]],
-                        [FilterKey.DELIVERY_METHOD, [attendance.id]],
-                        [FilterKey.DEGREE_TYPE, [degree.id]]
-                    ]);
-                    const result = await this.checkRulesForSitemap(filterKeyValues);
-                    if (result) {
-                        paths.push(`${degree.path}/${attendance.path}/${country.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const attendance of attendanceFragments) {
+                    for (const degree of degreeFragments) {
+                        const filterKeyValues = new Map([
+                            [FilterKey.COUNTRY, [country.id]],
+                            [FilterKey.DELIVERY_METHOD, [attendance.id]],
+                            [FilterKey.DEGREE_TYPE, [degree.id]]
+                        ]);
+                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                        if (result) {
+                            paths.push(this.getPathWithPageNumber(`${degree.path}/${attendance.path}/${country.path}`, pageNumber));
+                        }
                     }
                 }
             }

package/dist/src/programmes/policies/CountryDegree.js

@@ -24,15 +24,17 @@ export class CountryDegree extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const degreeFragments = DegreePresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const degree of degreeFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.DEGREE_TYPE, [degree.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${degree.path}/${country.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const degree of degreeFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.DEGREE_TYPE, [degree.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${degree.path}/${country.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/CountryDuration.js

@@ -24,15 +24,17 @@ export class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const durationFragments = DurationPresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const duration of durationFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.DURATION, [duration.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${duration.path}/${country.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const duration of durationFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.DURATION, [duration.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${duration.path}/${country.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/CountryDurationDegree.js

@@ -30,17 +30,19 @@ export class CountryDurationDegree extends ProgrammesBaseIndexabilityPolicy {
         const degreeFragments = DegreePresenter.getInstance().getFragments();
         const durationFragments = DurationPresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const duration of durationFragments) {
-                for (const degree of degreeFragments) {
-                    const filterKeyValues = new Map([
-                        [FilterKey.COUNTRY, [country.id]],
-                        [FilterKey.DURATION, [duration.id]],
-                        [FilterKey.DEGREE_TYPE, [degree.id]]
-                    ]);
-                    const result = await this.checkRulesForSitemap(filterKeyValues);
-                    if (result) {
-                        paths.push(`${degree.path}/${duration.path}/${country.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const duration of durationFragments) {
+                    for (const degree of degreeFragments) {
+                        const filterKeyValues = new Map([
+                            [FilterKey.COUNTRY, [country.id]],
+                            [FilterKey.DURATION, [duration.id]],
+                            [FilterKey.DEGREE_TYPE, [degree.id]]
+                        ]);
+                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                        if (result) {
+                            paths.push(this.getPathWithPageNumber(`${degree.path}/${duration.path}/${country.path}`, pageNumber));
+                        }
                     }
                 }
             }

package/dist/src/programmes/policies/CountryEducationalForm.js

@@ -25,15 +25,17 @@ export class CountryEducationalForm extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const educationalFormFragments = EducationalFormPresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const form of educationalFormFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.EDUCATIONAL_FORM, [form.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${country.path}/${form.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const form of educationalFormFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.EDUCATIONAL_FORM, [form.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${country.path}/${form.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/CountryFormat.js

@@ -24,15 +24,17 @@ export class CountryFormat extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const formatFragments = FormatPresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const format of formatFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.ATTENDANCE, [format.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${country.path}/${format.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const format of formatFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.ATTENDANCE, [format.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${country.path}/${format.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/CountryTuitionFee.js

@@ -24,15 +24,17 @@ export class CountryTuitionFee extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
         const paths = [];
-        for (const country of countryFragments) {
-            for (const tuitionFee of tuitionFeeFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.TUITION_FEE, [tuitionFee.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${tuitionFee.path}/${country.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const country of countryFragments) {
+                for (const tuitionFee of tuitionFeeFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.TUITION_FEE, [tuitionFee.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${tuitionFee.path}/${country.path}`, pageNumber));
+                    }
                 }
             }
         }

package/dist/src/programmes/policies/Discipline.js

@@ -19,11 +19,13 @@ export class Discipline extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = [];
-        for (const discipline of disciplineFragments) {
-            const filterKeyValues = new Map([[FilterKey.DISCIPLINES, [discipline.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(discipline.path);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const discipline of disciplineFragments) {
+                const filterKeyValues = new Map([[FilterKey.DISCIPLINES, [discipline.id]]]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(discipline.path, pageNumber));
+                }
             }
         }
         return paths;

package/dist/src/programmes/policies/DisciplineArea.js

@@ -23,16 +23,18 @@ export class DisciplineArea extends ProgrammesBaseIndexabilityPolicy {
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const areaFragments = AreaPresenter.getInstance().getFragments();
         const paths = [];
-        for (const discipline of disciplineFragments) {
-            for (const area of areaFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.DISCIPLINES, [discipline.id]],
-                    [FilterKey.AREA, [area.id]],
-                    [FilterKey.COUNTRY, [area.countryId]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${discipline.path}/${area.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const discipline of disciplineFragments) {
+                for (const area of areaFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.DISCIPLINES, [discipline.id]],
+                        [FilterKey.AREA, [area.id]],
+                        [FilterKey.COUNTRY, [area.countryId]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${discipline.path}/${area.path}`, pageNumber));
+                    }
                 }
             }
         }