@studyportals/fawkes 8.0.2-2 → 8.0.2-21

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

@@ -6,6 +6,7 @@ import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
+import { OneOrTwoYearDurationRule } from '../rules/OneOrTwoYearDurationRule';
 export class DegreeDuration extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Duration Policy';
     description = 'Determines indexing rules for pages filtered by degree type and duration (2 years).';
@@ -14,7 +15,8 @@ export class DegreeDuration extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.DURATION),
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new OnlyFiltersSelectedRule([FilterKey.DURATION, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule()
+        new IndexableDegreeRule(),
+        new OneOrTwoYearDurationRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -5,11 +5,13 @@ import { FilterCombinations } from '../../enums/FilterCombinations';
 import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
+import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
 export declare class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDegreeRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDegreeRule | AffordableTuitionFeeRule | PartTimeFormatRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -7,6 +7,8 @@ import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityP
 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.';
@@ -16,7 +18,9 @@ export class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
         new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
-        new IndexableDegreeRule()
+        new IndexableDegreeRule(),
+        new AffordableTuitionFeeRule(),
+        new PartTimeFormatRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -38,7 +42,7 @@ export class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
                         ]);
                         const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
                         if (result) {
-                            paths.push(this.getPathWithPageNumber(`${degree.path}/${format.path}/${tuitionFee.path}`, pageNumber));
+                            paths.push(this.getPathWithPageNumber(`${degree.path}/${tuitionFee.path}/${format.path}`, pageNumber));
                         }
                     }
                 }

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

@@ -4,11 +4,13 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { MbaDegreeRule } from '../rules/MbaDegreeRule';
+import { ExecutiveSpecialProgrammeRule } from '../rules/ExecutiveSpecialProgrammeRule';
 export declare class DegreeSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | MbaDegreeRule | ExecutiveSpecialProgrammeRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -5,6 +5,8 @@ import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { SpecialProgrammesPresenter } from '../../presenters/SpecialProgrammesPresenter';
+import { MbaDegreeRule } from '../rules/MbaDegreeRule';
+import { ExecutiveSpecialProgrammeRule } from '../rules/ExecutiveSpecialProgrammeRule';
 export class DegreeSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     name = 'Special Programmes Degree Policy';
     description = 'Determines indexing rules for pages filtered by special programmes and degree type.';
@@ -13,6 +15,8 @@ export class DegreeSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new SingleValueSelectedForFilterRule(FilterKey.SPECIAL_PROGRAMMES),
         new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.SPECIAL_PROGRAMMES]),
+        new ExecutiveSpecialProgrammeRule(),
+        new MbaDegreeRule(),
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -4,11 +4,12 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
 export declare class DegreeTuitionFee extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | AffordableTuitionFeeRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -6,6 +6,7 @@ import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
+import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
 export class DegreeTuitionFee extends ProgrammesBaseIndexabilityPolicy {
     name = 'Tuition Fee Degree Policy';
     description = 'Determines indexing rules for pages filtered by tuition fee and degree type.';
@@ -14,6 +15,7 @@ export class DegreeTuitionFee extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
         new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
+        new AffordableTuitionFeeRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -4,11 +4,12 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
 export declare class DisciplineCountryFormat extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | PartTimeFormatRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -6,6 +6,7 @@ import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityP
 import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
 import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { FormatPresenter } from '../../presenters/FormatPresenter';
+import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
 export class DisciplineCountryFormat extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Country Format Policy';
     description = 'Determines indexing rules for pages filtered by both discipline, country, and format.';
@@ -15,6 +16,7 @@ export class DisciplineCountryFormat extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
         new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.COUNTRY, FilterKey.ATTENDANCE]),
+        new PartTimeFormatRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -4,11 +4,12 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { ErasmusSpecialProgrammeRule } from '../rules/ErasmusSpecialProgrammeRule';
 export declare class DisciplineSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | ErasmusSpecialProgrammeRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -1,10 +1,11 @@
-import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterKey, SpecialProgrammesFilterOptionValue } 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 { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
 import { SpecialProgrammesPresenter } from '../../presenters/SpecialProgrammesPresenter';
+import { ErasmusSpecialProgrammeRule } from '../rules/ErasmusSpecialProgrammeRule';
 export class DisciplineSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Special Programmes Policy';
     description = 'Determines indexing rules for pages filtered by discipline and special programmes (Erasmus Mundus).';
@@ -13,6 +14,7 @@ export class DisciplineSpecialProgrammes extends ProgrammesBaseIndexabilityPolic
         new SingleValueSelectedForFilterRule(FilterKey.SPECIAL_PROGRAMMES),
         new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
         new OnlyFiltersSelectedRule([FilterKey.SPECIAL_PROGRAMMES, FilterKey.DISCIPLINES]),
+        new ErasmusSpecialProgrammeRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -22,7 +24,7 @@ export class DisciplineSpecialProgrammes extends ProgrammesBaseIndexabilityPolic
         const specialProgrammesFragments = SpecialProgrammesPresenter.getInstance().getFragments();
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = [];
-        const validSpecialProgrammesIds = ['erasmus'];
+        const validSpecialProgrammesIds = [SpecialProgrammesFilterOptionValue.ERASMUS_MUNDUS];
         const validSpecialProgrammes = specialProgrammesFragments.filter(specialProgramme => validSpecialProgrammesIds.includes(specialProgramme.id));
         for (const pageNumber of this.indexablePageNumbers) {
             for (const specialProgramme of validSpecialProgrammes) {

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

@@ -33,7 +33,7 @@ export class DisciplineTuitionFee extends ProgrammesBaseIndexabilityPolicy {
                     ]);
                     const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
                     if (result) {
-                        paths.push(this.getPathWithPageNumber(`${tuitionFee.path}/${discipline.path}`, pageNumber));
+                        paths.push(this.getPathWithPageNumber(`${discipline.path}/${tuitionFee.path}`, pageNumber));
                     }
                 }
             }

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

@@ -4,11 +4,12 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { OneOrTwoYearDurationRule } from '../rules/OneOrTwoYearDurationRule';
 export declare class Duration extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OneOrTwoYearDurationRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -4,13 +4,15 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
+import { OneOrTwoYearDurationRule } from '../rules/OneOrTwoYearDurationRule';
 export class Duration extends ProgrammesBaseIndexabilityPolicy {
     name = 'Duration Policy';
     description = 'Governs indexing of duration-level filtered pages. (1 year - 2 year)';
     filterKeys = [FilterKey.DURATION];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.DURATION),
-        new OnlyFiltersSelectedRule([FilterKey.DURATION])
+        new OnlyFiltersSelectedRule([FilterKey.DURATION]),
+        new OneOrTwoYearDurationRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -10,7 +10,7 @@ export class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     filterKeys = [FilterKey.SPECIAL_PROGRAMMES];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.SPECIAL_PROGRAMMES),
-        new OnlyFiltersSelectedRule([FilterKey.SPECIAL_PROGRAMMES])
+        new OnlyFiltersSelectedRule([FilterKey.SPECIAL_PROGRAMMES]),
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -57,3 +57,4 @@ export * from './DegreeAttendanceFormat';
 export * from './DisciplineCountryAttendance';
 export * from './DisciplineCountryFormat';
 export * from './DegreeSpecialProgrammes';
+export * from './Degree';

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

@@ -57,3 +57,4 @@ export * from './DegreeAttendanceFormat';
 export * from './DisciplineCountryAttendance';
 export * from './DisciplineCountryFormat';
 export * from './DegreeSpecialProgrammes';
+export * from './Degree';

package/dist/src/programmes/rules/BlendedOrOnlineAttendanceRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class BlendedOrOnlineAttendanceRule extends BaseProgrammeFilterKeyValueRule {
+    constructor();
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/programmes/rules/BlendedOrOnlineAttendanceRule.js

@@ -0,0 +1,18 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { AttendanceFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class BlendedOrOnlineAttendanceRule extends BaseProgrammeFilterKeyValueRule {
+    constructor() {
+        const filterKeyValues = new Map([[
+                FilterKey.DELIVERY_METHOD,
+                [AttendanceFilterOptionValue.BLENDED, AttendanceFilterOptionValue.ONLINE]
+            ]]);
+        super(filterKeyValues);
+    }
+    getName() {
+        return 'BlendedOrOnlineAttendanceRule';
+    }
+    getDescription() {
+        return 'Is indexable if the selected delivery method is blended or online.';
+    }
+}

package/dist/src/programmes/rules/ErasmusOrExecutiveSpecialProgrammeRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class ErasmusOrExecutiveSpecialProgrammeRule extends BaseProgrammeFilterKeyValueRule {
+    constructor();
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/programmes/rules/ErasmusOrExecutiveSpecialProgrammeRule.js

@@ -0,0 +1,19 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { SpecialProgrammesFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class ErasmusOrExecutiveSpecialProgrammeRule extends BaseProgrammeFilterKeyValueRule {
+    constructor() {
+        const filterKeyValues = new Map([[
+                FilterKey.SPECIAL_PROGRAMMES,
+                [SpecialProgrammesFilterOptionValue.ERASMUS_MUNDUS, SpecialProgrammesFilterOptionValue.EXECUTIVE_PROGRAMMES]
+            ]
+        ]);
+        super(filterKeyValues);
+    }
+    getName() {
+        return 'ErasmusOrExecutiveSpecialProgrammeRule';
+    }
+    getDescription() {
+        return 'Is indexable if the selected special programme is Erasmus Mundus or Executive Programmes.';
+    }
+}

package/dist/src/programmes/rules/ErasmusSpecialProgrammeRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class ErasmusSpecialProgrammeRule extends BaseProgrammeFilterKeyValueRule {
+    constructor();
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/programmes/rules/ErasmusSpecialProgrammeRule.js

@@ -0,0 +1,19 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { SpecialProgrammesFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class ErasmusSpecialProgrammeRule extends BaseProgrammeFilterKeyValueRule {
+    constructor() {
+        const filterKeyValues = new Map([[
+                FilterKey.SPECIAL_PROGRAMMES,
+                [SpecialProgrammesFilterOptionValue.ERASMUS_MUNDUS]
+            ]
+        ]);
+        super(filterKeyValues);
+    }
+    getName() {
+        return 'ErasmusSpecialProgrammeRule';
+    }
+    getDescription() {
+        return 'Is indexable if the selected special programme is Erasmus Mundus.';
+    }
+}

package/dist/src/programmes/rules/ExecutiveSpecialProgrammeRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class ExecutiveSpecialProgrammeRule extends BaseProgrammeFilterKeyValueRule {
+    constructor();
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/programmes/rules/ExecutiveSpecialProgrammeRule.js

@@ -0,0 +1,19 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { SpecialProgrammesFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class ExecutiveSpecialProgrammeRule extends BaseProgrammeFilterKeyValueRule {
+    constructor() {
+        const filterKeyValues = new Map([[
+                FilterKey.SPECIAL_PROGRAMMES,
+                [SpecialProgrammesFilterOptionValue.EXECUTIVE_PROGRAMMES]
+            ]
+        ]);
+        super(filterKeyValues);
+    }
+    getName() {
+        return 'ExecutiveSpecialProgrammeRule';
+    }
+    getDescription() {
+        return 'Is indexable if the selected special programme is Executive.';
+    }
+}

package/dist/src/programmes/rules/MinimumAmountOfResultsRule.js

@@ -1,5 +1,4 @@
 import { DependencyMissingError } from '../../errors/DependencyMissingError';
-import { FilterKey } from '@studyportals/search-filters/server-side';
 export class MinimumAmountOfResultsRule {
     minimumResultsCount = 7;
     maximumPageSize = 20;
@@ -17,11 +16,6 @@ export class MinimumAmountOfResultsRule {
             throw new DependencyMissingError('SearchApiClient');
         }
         const count = await this.searchApiClient.getCount(filterKeyValues);
-        if (Object.keys(filterKeyValues).includes(FilterKey.DURATION) && Object.keys(filterKeyValues).length === 1) {
-            const filterKey = FilterKey.DURATION;
-            const filterValue = filterKeyValues.get(filterKey);
-            console.log(`DEBUG: Duration filter applied alone, filter: ${filterValue} found results: ${count}`); // eslint-disable-line no-console
-        }
         return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
     }
     forSitemapGenerator() {

package/dist/src/programmes/rules/OneOrTwoYearDurationRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class OneOrTwoYearDurationRule extends BaseProgrammeFilterKeyValueRule {
+    constructor();
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/programmes/rules/OneOrTwoYearDurationRule.js

@@ -0,0 +1,19 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { DurationFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class OneOrTwoYearDurationRule extends BaseProgrammeFilterKeyValueRule {
+    constructor() {
+        const filterKeyValues = new Map([[
+                FilterKey.DURATION,
+                [DurationFilterOptionValue.ONE_YEAR, DurationFilterOptionValue.TWO_YEARS]
+            ]
+        ]);
+        super(filterKeyValues);
+    }
+    getName() {
+        return 'OneOrTwoYearDurationRule';
+    }
+    getDescription() {
+        return 'Is indexable if the selected duration is one or two years.';
+    }
+}

package/dist/src/programmes/rules/TwoYearDurationRule.d.ts

@@ -0,0 +1,6 @@
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class TwoYearDurationRule extends BaseProgrammeFilterKeyValueRule {
+    constructor();
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/programmes/rules/TwoYearDurationRule.js

@@ -0,0 +1,19 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { DurationFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class TwoYearDurationRule extends BaseProgrammeFilterKeyValueRule {
+    constructor() {
+        const filterKeyValues = new Map([[
+                FilterKey.DURATION,
+                [DurationFilterOptionValue.TWO_YEARS]
+            ]
+        ]);
+        super(filterKeyValues);
+    }
+    getName() {
+        return 'TwoYearDurationRule';
+    }
+    getDescription() {
+        return 'Is indexable if the selected duration is two years.';
+    }
+}

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

@@ -3,7 +3,6 @@ export class BaseSitemapUrlGeneratorManager {
     async generateUrls() {
         const map = new Map();
         for (const policy of this.policies) {
-            console.debug(`Generating sitemap urls for policy: ${policy.filterCombination}`); // eslint-disable-line no-console
             const filterCombination = policy.filterCombination;
             const urls = await policy.generateSitemapUrls();
             console.debug(`Generated ${urls.length} urls for policy: ${filterCombination}`); // eslint-disable-line no-console

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

@@ -1,6 +1,6 @@
 import { DependencyTypes } from '../enums/DependencyTypes';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
-import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, Discipline, SpecialProgrammes, TuitionFee, Unfiltered, CountryAttendanceDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Format, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, CountryDegree, DegreeFormat, DegreeContinent, DegreeAttendanceTuitionFee, DegreeArea, DegreeTuitionFee, AttendanceTuitionFee, Duration, AttendanceDuration, DegreeAreaTuitionFee, DisciplineContinentAttendance, DegreeContinentTuitionFee, AttendanceFormat, ContinentFormat, AttendanceContinent, DegreeDuration, ContinentSpecialProgrammes, CountrySpecialProgrammes, AttendanceArea, DegreeFormatTuitionFee, ContinentDuration, DegreeAttendanceFormat, DisciplineCountryAttendance, DisciplineCountryFormat, DegreeSpecialProgrammes } from '../programmes/policies';
+import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, Discipline, SpecialProgrammes, TuitionFee, Unfiltered, CountryAttendanceDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Format, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, CountryDegree, DegreeFormat, DegreeContinent, DegreeAttendanceTuitionFee, DegreeArea, DegreeTuitionFee, AttendanceTuitionFee, Duration, AttendanceDuration, DegreeAreaTuitionFee, DisciplineContinentAttendance, DegreeContinentTuitionFee, AttendanceFormat, ContinentFormat, AttendanceContinent, DegreeDuration, ContinentSpecialProgrammes, CountrySpecialProgrammes, AttendanceArea, DegreeFormatTuitionFee, ContinentDuration, DegreeAttendanceFormat, DisciplineCountryAttendance, DisciplineCountryFormat, DegreeSpecialProgrammes, Degree } from '../programmes/policies';
 import { FilterKey } from '@studyportals/search-filters/server-side';
 import { AreaPresenter } from '../presenters/AreaPresenter';
 import { AttendancePresenter } from '../presenters/AttendancePresenter';
@@ -13,7 +13,8 @@ import { SpecialProgrammesPresenter } from '../presenters/SpecialProgrammesPrese
 import { DurationPresenter } from '../presenters/DurationPresenter';
 import { EducationalFormPresenter } from '../presenters/EducationalFormPresenter';
 import { FormatPresenter } from '../presenters/FormatPresenter';
-import { Degree } from '../programmes/policies/Degree';
+import { DisciplineSpecialProgrammes } from '../programmes/policies/DisciplineSpecialProgrammes';
+import { DegreeAttendanceSpecialProgrammes } from '../programmes/policies/DegreeAttendanceSpecialProgrammes';
 export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     portalType;
     policies;
@@ -68,6 +69,7 @@ export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGenerato
             new DegreeFormatTuitionFee(dependencies),
             new DegreeAttendanceFormat(dependencies),
             new DegreeSpecialProgrammes(dependencies),
+            new DegreeAttendanceSpecialProgrammes(dependencies),
             new Format(dependencies),
             new DisciplineAttendance(dependencies),
             new DisciplineContinent(dependencies),
@@ -82,6 +84,7 @@ export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGenerato
             new DisciplineContinentAttendance(dependencies),
             new DisciplineCountryAttendance(dependencies),
             new DisciplineCountryFormat(dependencies),
+            new DisciplineSpecialProgrammes(dependencies),
             new AttendanceTuitionFee(dependencies),
             new AttendanceFormat(dependencies),
             new AttendanceArea(dependencies)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "8.0.2-2",
+	"version": "8.0.2-21",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"
@@ -92,7 +92,7 @@
 	"dependencies": {
 		"@studyportals/domain-client": "7.1.0",
 		"@studyportals/ranking-api-interface": "^1.3.12",
-		"@studyportals/search-filters": "^6.1.0",
+		"@studyportals/search-filters": "^6.3.1",
 		"@studyportals/static-domain-data": "^6.1.0"
 	},
 	"optionalDependencies": {