@studyportals/fawkes 8.7.1-1 → 8.7.2-0

package/dist/src/organisations/SearchIndexabilityManager.js

@@ -1,5 +1,5 @@
 import { DependencyTypes } from '../enums/DependencyTypes';
-import { Area, AreaAttendance, Attendance, Continent, Country, CountryAttendance, Unfiltered, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, CountryCity, CountryAreaCity } from '../organisations/policies';
+import { Area, AreaAttendance, Attendance, Continent, Country, CountryAttendance, Unfiltered, RankedArea, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, CountryCity, CountryAreaCity } from '../organisations/policies';
 export class SearchIndexabilityManager {
     policies;
     constructor(portalType, seoInfoBase, filterState, sortingState, applicationState) {
@@ -22,7 +22,6 @@ export class SearchIndexabilityManager {
             new CountryAttendance(dependencies),
             new Unfiltered(dependencies),
             new RankedArea(dependencies),
-            new RankedAreaDiscipline(dependencies),
             new RankedAttendance(dependencies),
             new RankedAttendanceDiscipline(dependencies),
             new RankedContinent(dependencies),

package/dist/src/organisations/policies/index.d.ts

@@ -8,7 +8,6 @@ export * from './our-picks/CountryAreaCity';
 export * from './our-picks/CountryAttendance';
 export * from './our-picks/Unfiltered';
 export * from './ranked/RankedArea';
-export * from './ranked/RankedAreaDiscipline';
 export * from './ranked/RankedAttendance';
 export * from './ranked/RankedAttendanceDiscipline';
 export * from './ranked/RankedContinent';

package/dist/src/organisations/policies/index.js

@@ -8,7 +8,6 @@ export * from './our-picks/CountryAreaCity';
 export * from './our-picks/CountryAttendance';
 export * from './our-picks/Unfiltered';
 export * from './ranked/RankedArea';
-export * from './ranked/RankedAreaDiscipline';
 export * from './ranked/RankedAttendance';
 export * from './ranked/RankedAttendanceDiscipline';
 export * from './ranked/RankedContinent';

package/dist/src/programmes/policies/AttendanceTuitionFee.d.ts

@@ -0,0 +1,17 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+export declare class AttendanceTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OnlineAttendanceRule | AffordableTuitionFeeRule)[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,51 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+import { AttendancePresenter } from '../../presenters/AttendancePresenter';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+export class AttendanceTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Tuition Fee Attendance Policy';
+    description = 'Determines indexing rules for pages filtered by tuition fee and attendance.';
+    filterKeys = [FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
+        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+        new OnlyFiltersSelectedRule([FilterKey.DELIVERY_METHOD, FilterKey.TUITION_FEE]),
+        new OnlineAttendanceRule(),
+        new AffordableTuitionFeeRule()
+    ];
+    constructor(dependencies) {
+        super(dependencies);
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const attendanceFragments = AttendancePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        const affordableTuition = tuitionFeeFragments.find(t => t.id === TuitionFeeFilterOptionValue.ZERO_TO_TWO_THOUSAND_FIVE_HUNDRED);
+        if (!affordableTuition) {
+            return paths;
+        }
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const attendance of attendanceFragments) {
+                const filterKeyValues = new Map([
+                    [FilterKey.DELIVERY_METHOD, [attendance.id]],
+                    [FilterKey.TUITION_FEE, [affordableTuition.id]]
+                ]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(`${affordableTuition.path}/${attendance.path}`, pageNumber));
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.ATTENDANCE_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/ContinentTuitionFee.d.ts

@@ -0,0 +1,16 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+export declare class ContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | AffordableTuitionFeeRule)[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,46 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { ContinentPresenter } from '../../presenters/ContinentPresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+export class ContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Continent Tuition Fee Policy';
+    description = 'Determines indexing rules for pages filtered by both continent, and tuition fee, priotizing combinations with affordable tuition fees.';
+    filterKeys = [FilterKey.CONTINENT, FilterKey.TUITION_FEE];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
+        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+        new OnlyFiltersSelectedRule([FilterKey.CONTINENT, FilterKey.TUITION_FEE]),
+        new AffordableTuitionFeeRule()
+    ];
+    constructor(dependencies) {
+        super(dependencies);
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const continentFragments = ContinentPresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        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));
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.CONTINENT_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/CountryTuitionFee.d.ts

@@ -0,0 +1,16 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+export declare class CountryTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | AffordableTuitionFeeRule)[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,46 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { CountryPresenter } from '../../presenters/CountryPresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+export class CountryTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Country Tuition Fee Policy';
+    description = 'Determines indexing rules for pages filtered by both country, and tuition fee.';
+    filterKeys = [FilterKey.COUNTRY, FilterKey.TUITION_FEE];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
+        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+        new OnlyFiltersSelectedRule([FilterKey.COUNTRY, FilterKey.TUITION_FEE]),
+        new AffordableTuitionFeeRule()
+    ];
+    constructor(dependencies) {
+        super(dependencies);
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const countryFragments = CountryPresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        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));
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.COUNTRY_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/DegreeAreaTuitionFee.d.ts

@@ -0,0 +1,16 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+export declare class DegreeAreaTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | AffordableTuitionFeeRule)[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,54 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { AreaPresenter } from '../../presenters/AreaPresenter';
+import { DegreePresenter } from '../../presenters/DegreePresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+export class DegreeAreaTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Degree Area Tuition fee Policy';
+    description = 'Controls indexing of pages filtered by geographic areas and tuition fees.';
+    filterKeys = [FilterKey.AREA, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.COUNTRY];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.AREA),
+        new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
+        new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+        new OnlyFiltersSelectedRule([FilterKey.AREA, FilterKey.COUNTRY, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
+        new AffordableTuitionFeeRule()
+    ];
+    constructor(dependencies) {
+        super(dependencies);
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const areaFragments = AreaPresenter.getInstance().getFragments();
+        const degreeFragments = DegreePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const degree of degreeFragments) {
+                for (const area of areaFragments) {
+                    for (const tuitionFee of tuitionFeeFragments) {
+                        const filterKeyValues = new Map([
+                            [FilterKey.AREA, [area.id]],
+                            [FilterKey.COUNTRY, [area.countryId]],
+                            [FilterKey.DEGREE_TYPE, [degree.id]],
+                            [FilterKey.TUITION_FEE, [tuitionFee.id]]
+                        ]);
+                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                        if (result) {
+                            paths.push(this.getPathWithPageNumber(`${degree.path}/${tuitionFee.path}/${area.path}`, pageNumber));
+                        }
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.DEGREE_AREA_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/DegreeAttendanceTuitionFee.d.ts

@@ -0,0 +1,14 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { IRule } from '../../common/IRule';
+export declare class DegreeTuitionFeeAttendance extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: IRule[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,61 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { DegreePresenter } from '../../presenters/DegreePresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+import { AttendancePresenter } from '../../presenters/AttendancePresenter';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+export class DegreeTuitionFeeAttendance extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Tuition Fee Attendance Degree Policy';
+    description = 'Determines indexing rules for pages filtered by tuition fee, attendance, and degree type.';
+    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD];
+    rules;
+    constructor(dependencies) {
+        super(dependencies);
+        const portalType = dependencies.portalType;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+            new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
+            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD]),
+            new IndexableDegreeRule(portalType),
+            new OnlineAttendanceRule(),
+            new AffordableTuitionFeeRule()
+        ];
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const degreeFragments = DegreePresenter.getInstance().getFragments();
+        const attendanceFragments = AttendancePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        const affordableTuition = tuitionFeeFragments.find(t => t.id === TuitionFeeFilterOptionValue.ZERO_TO_TWO_THOUSAND_FIVE_HUNDRED);
+        if (!affordableTuition) {
+            return paths;
+        }
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const degree of degreeFragments) {
+                for (const attendance of attendanceFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.DEGREE_TYPE, [degree.id]],
+                        [FilterKey.TUITION_FEE, [affordableTuition.id]],
+                        [FilterKey.DELIVERY_METHOD, [attendance.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${degree.path}/${affordableTuition.path}/${attendance.path}`, pageNumber));
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.DEGREE_ATTENDANCE_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/DegreeContinentTuitionFee.d.ts

@@ -0,0 +1,14 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { IRule } from '../../common/IRule';
+export declare class DegreeTuitionFeeContinent extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: IRule[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,54 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { DegreePresenter } from '../../presenters/DegreePresenter';
+import { ContinentPresenter } from '../../presenters/ContinentPresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+export class DegreeTuitionFeeContinent extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Degree Tuition Fee Continent Policy';
+    description = 'Determines indexing rules for pages filtered by degree type, tuition fee, and continent.';
+    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.CONTINENT];
+    rules;
+    constructor(dependencies) {
+        super(dependencies);
+        const portalType = dependencies.portalType;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.CONTINENT]),
+            new IndexableDegreeRule(portalType)
+        ];
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const continentFragments = ContinentPresenter.getInstance().getFragments();
+        const degreeFragments = DegreePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const continent of continentFragments) {
+                for (const degree of degreeFragments) {
+                    for (const tuitionFee of tuitionFeeFragments) {
+                        const filterKeyValues = new Map([
+                            [FilterKey.DEGREE_TYPE, [degree.id]],
+                            [FilterKey.TUITION_FEE, [tuitionFee.id]],
+                            [FilterKey.CONTINENT, [continent.id]],
+                        ]);
+                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                        if (result) {
+                            paths.push(this.getPathWithPageNumber(`${degree.path}/${tuitionFee.path}/${continent.path}`, pageNumber));
+                        }
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.DEGREE_CONTINENT_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/DegreeFormatTuitionFee.d.ts

@@ -0,0 +1,14 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { IRule } from '../../common/IRule';
+export declare class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: IRule[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,58 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { DegreePresenter } from '../../presenters/DegreePresenter';
+import { FormatPresenter } from '../../presenters/FormatPresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
+export class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Degree Format Tuition Fee Policy';
+    description = 'Determines indexing rules for pages filtered by degree type, format and tuition fee.';
+    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.ATTENDANCE];
+    rules;
+    constructor(dependencies) {
+        super(dependencies);
+        const portalType = dependencies.portalType;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+            new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
+            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.ATTENDANCE]),
+            new IndexableDegreeRule(portalType),
+            new AffordableTuitionFeeRule(),
+            new PartTimeFormatRule()
+        ];
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const formatFragments = FormatPresenter.getInstance().getFragments();
+        const degreeFragments = DegreePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const format of formatFragments) {
+                for (const degree of degreeFragments) {
+                    for (const tuitionFee of tuitionFeeFragments) {
+                        const filterKeyValues = new Map([
+                            [FilterKey.DEGREE_TYPE, [degree.id]],
+                            [FilterKey.TUITION_FEE, [tuitionFee.id]],
+                            [FilterKey.ATTENDANCE, [format.id]],
+                        ]);
+                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                        if (result) {
+                            paths.push(this.getPathWithPageNumber(`${degree.path}/${tuitionFee.path}/${format.path}`, pageNumber));
+                        }
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.DEGREE_FORMAT_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/DisciplineTuitionFee.d.ts

@@ -0,0 +1,16 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+export declare class DisciplineTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | AffordableTuitionFeeRule)[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,46 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+export class DisciplineTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Discipline Tuition Fee Policy';
+    description = 'Determines indexing rules for pages filtered by both discipline, and tuition fee.';
+    filterKeys = [FilterKey.DISCIPLINES, FilterKey.TUITION_FEE];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
+        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+        new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.TUITION_FEE]),
+        new AffordableTuitionFeeRule()
+    ];
+    constructor(dependencies) {
+        super(dependencies);
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const discipline of disciplineFragments) {
+                for (const tuitionFee of tuitionFeeFragments) {
+                    const filterKeyValues = new Map([
+                        [FilterKey.DISCIPLINES, [discipline.id]],
+                        [FilterKey.TUITION_FEE, [tuitionFee.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${discipline.path}/${tuitionFee.path}`, pageNumber));
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.DISCIPLINE_TUITION_FEE;
+    }
+}

package/dist/src/programmes/policies/DisciplineTuitionFeeAttendance.d.ts

@@ -0,0 +1,17 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+export declare class DisciplineTuitionFeeAttendance extends ProgrammesBaseIndexabilityPolicy {
+    readonly name: string;
+    readonly description: string;
+    readonly filterKeys: FilterKey[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OnlineAttendanceRule | AffordableTuitionFeeRule)[];
+    constructor(dependencies: IProgrammeSeoDependencies);
+    protected generateUrls(): Promise<string[]>;
+    get filterCombination(): FilterCombinations;
+}

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

@@ -0,0 +1,54 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
+import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
+import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
+import { AttendancePresenter } from '../../presenters/AttendancePresenter';
+import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+export class DisciplineTuitionFeeAttendance extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Discipline Tuition Fee Attendance Policy';
+    description = 'Determines indexing rules for pages filtered by discipline, tuition fee and study format (online, on-campus, etc.).';
+    filterKeys = [FilterKey.DISCIPLINES, FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD];
+    rules = [
+        new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
+        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+        new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
+        new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD]),
+        new AffordableTuitionFeeRule(),
+        new OnlineAttendanceRule()
+    ];
+    constructor(dependencies) {
+        super(dependencies);
+        this.initateBaseRules();
+    }
+    async generateUrls() {
+        const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
+        const attendanceFragments = AttendancePresenter.getInstance().getFragments();
+        const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
+        const paths = [];
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const discipline of disciplineFragments) {
+                for (const attendance of attendanceFragments) {
+                    for (const tuitionFee of tuitionFeeFragments) {
+                        const filterKeyValues = new Map([
+                            [FilterKey.DISCIPLINES, [discipline.id]],
+                            [FilterKey.DELIVERY_METHOD, [attendance.id]],
+                            [FilterKey.TUITION_FEE, [tuitionFee.id]]
+                        ]);
+                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                        if (result) {
+                            paths.push(this.getPathWithPageNumber(`${tuitionFee.path}/${attendance.path}/${discipline.path}`, pageNumber));
+                        }
+                    }
+                }
+            }
+        }
+        return paths;
+    }
+    get filterCombination() {
+        return FilterCombinations.DISCIPLINE_TUITION_FEE_ATTENDANCE;
+    }
+}

package/dist/src/sitemap-generator/OrganisationsSitemapUrlGeneratorManager.js

@@ -1,6 +1,6 @@
 import { DependencyTypes } from '../enums/DependencyTypes';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
-import { Area, AreaAttendance, Attendance, Continent, Country, CountryCity, CountryAttendance, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, Unfiltered } from '../organisations/policies';
+import { Area, AreaAttendance, Attendance, Continent, Country, CountryCity, CountryAttendance, RankedArea, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, Unfiltered } from '../organisations/policies';
 import { AreaPresenter } from '../presenters/AreaPresenter';
 import { AttendancePresenter } from '../presenters/AttendancePresenter';
 import { ContinentPresenter } from '../presenters/ContinentPresenter';
@@ -33,7 +33,6 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
             new CountryAttendance(dependencies),
             new Unfiltered(dependencies),
             new RankedArea(dependencies),
-            new RankedAreaDiscipline(dependencies),
             new RankedAttendance(dependencies),
             new RankedAttendanceDiscipline(dependencies),
             new RankedContinent(dependencies),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "8.7.1-1",
+	"version": "8.7.2-0",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"