@studyportals/fawkes 8.0.2-0 → 8.1.1-1

package/dist/src/enums/FilterCombinations.d.ts

@@ -4,8 +4,6 @@ export declare enum FilterCombinations {
     AREA_DISCIPLINE = "areaDiscipline",
     COUNTRY = "country",
     DEGREE = "degree",
-    DURATION = "duration",
-    FORMAT = "format",
     COUNTRY_DEGREE = "countryDegree",
     COUNTRY_DURATION = "countryDuration",
     COUNTRY_FORMAT = "countryFormat",
@@ -13,8 +11,6 @@ export declare enum FilterCombinations {
     COUNTRY_EDUCATIONAL_FORM = "countryEducationalForm",
     COUNTRY_ATTENDANCE_DEGREE = "countryAttendanceDegree",
     COUNTRY_DURATION_DEGREE = "countryDurationDegree",
-    COUNTRY_SPECIAL_PROGRAMMES = "countrySpecialProgrammes",
-    CONTINENT_FORMAT = "continentFormat",
     DISCIPLINE_AREA = "disciplineArea",
     DISCIPLINE_ATTENDANCE = "disciplineAttendance",
     DISCIPLINE_COUNTRY = "disciplineCountry",
@@ -26,34 +22,16 @@ export declare enum FilterCombinations {
     DISCIPLINE_EDUCATIONAL_FORM = "disciplineEducationalForm",
     DISCIPLINE_TUITION_FEE_ATTENDANCE = "disciplineTuitionFeeAttendance",
     DISCIPLINE_COUNTRY_EDUCATIONAL_FORM = "disciplineCountryEducationalForm",
-    DISCIPLINE_CONTINENT_ATTENDANCE = "disciplineContinentAttendance",
-    DISCIPLINE_SPECIAL_PROGRAMMES = "disciplineSpecialProgrammes",
-    DISCIPLINE_COUNTRY_ATTENDANCE = "disciplineCountryAttendance",
     DEGREE_COUNTRY_DISCIPLINE = "degreeCountryDiscipline",
     DEGREE_ATTENDANCE_DISCIPLINE = "degreeAttendanceDiscipline",
     DEGREE_COUNTRY_TUITION_FEE = "degreeCountryTuitionFee",
     DEGREE_COUNTRY_ATTENDANCE = "degreeCountryAttendance",
-    DEGREE_TUITION_FEE = "degreeTuitionFee",
-    DEGREE_ATTENDANCE_TUITION_FEE = "degreeAttendanceTuitionFee",
-    DEGREE_ATTENDANCE_FORMAT = "degreeAttendanceFormat",
-    DEGREE_AREA = "degreeArea",
-    DEGREE_FORMAT = "degreeFormat",
-    DEGREE_CONTINENT = "degreeContinent",
-    DEGREE_AREA_TUITION_FEE = "degreeAreaTuitionFee",
-    DEGREE_CONTINENT_TUITION_FEE = "degreeContinentTuitionFee",
-    DEGREE_DURATION = "degreeDuration",
-    DEGREE_FORMAT_TUITION_FEE = "degreeFormatTuitionFee",
-    DEGREE_SPECIAL_PROGRAMMES = "degreeSpecialProgrammes",
     DISCIPLINE = "discipline",
     UNFILTERED = "unfiltered",
     UNIVERSITY_COUNTRY = "universityCountry",
     ATTENDANCE_DISCIPLINE = "attendancedDiscipline",
     ATTENDANCE_DEGREE = "attendanceDegree",
-    ATTENDANCE_TUITION_FEE = "attendanceTuitionFee",
-    ATTENDANCE_DURATION = "attendanceDuration",
-    ATTENDANCE_FORMAT = "attendanceFormat",
-    ATTENDANCE_AREA = "attendanceArea",
-    ATTENDANCE_CONTINENT = "attendanceContinent",
+    CONTINENT_ATTENDANCE = "continentAttendance",
     COUNTRY_ATTENDANCE = "countryAttendance",
     ATTENDANCE = "attendance",
     CONTINENT = "continent",

package/dist/src/enums/FilterCombinations.js

@@ -5,8 +5,6 @@ export var FilterCombinations;
     FilterCombinations["AREA_DISCIPLINE"] = "areaDiscipline";
     FilterCombinations["COUNTRY"] = "country";
     FilterCombinations["DEGREE"] = "degree";
-    FilterCombinations["DURATION"] = "duration";
-    FilterCombinations["FORMAT"] = "format";
     FilterCombinations["COUNTRY_DEGREE"] = "countryDegree";
     FilterCombinations["COUNTRY_DURATION"] = "countryDuration";
     FilterCombinations["COUNTRY_FORMAT"] = "countryFormat";
@@ -14,8 +12,6 @@ export var FilterCombinations;
     FilterCombinations["COUNTRY_EDUCATIONAL_FORM"] = "countryEducationalForm";
     FilterCombinations["COUNTRY_ATTENDANCE_DEGREE"] = "countryAttendanceDegree";
     FilterCombinations["COUNTRY_DURATION_DEGREE"] = "countryDurationDegree";
-    FilterCombinations["COUNTRY_SPECIAL_PROGRAMMES"] = "countrySpecialProgrammes";
-    FilterCombinations["CONTINENT_FORMAT"] = "continentFormat";
     FilterCombinations["DISCIPLINE_AREA"] = "disciplineArea";
     FilterCombinations["DISCIPLINE_ATTENDANCE"] = "disciplineAttendance";
     FilterCombinations["DISCIPLINE_COUNTRY"] = "disciplineCountry";
@@ -27,34 +23,16 @@ export var FilterCombinations;
     FilterCombinations["DISCIPLINE_EDUCATIONAL_FORM"] = "disciplineEducationalForm";
     FilterCombinations["DISCIPLINE_TUITION_FEE_ATTENDANCE"] = "disciplineTuitionFeeAttendance";
     FilterCombinations["DISCIPLINE_COUNTRY_EDUCATIONAL_FORM"] = "disciplineCountryEducationalForm";
-    FilterCombinations["DISCIPLINE_CONTINENT_ATTENDANCE"] = "disciplineContinentAttendance";
-    FilterCombinations["DISCIPLINE_SPECIAL_PROGRAMMES"] = "disciplineSpecialProgrammes";
-    FilterCombinations["DISCIPLINE_COUNTRY_ATTENDANCE"] = "disciplineCountryAttendance";
     FilterCombinations["DEGREE_COUNTRY_DISCIPLINE"] = "degreeCountryDiscipline";
     FilterCombinations["DEGREE_ATTENDANCE_DISCIPLINE"] = "degreeAttendanceDiscipline";
     FilterCombinations["DEGREE_COUNTRY_TUITION_FEE"] = "degreeCountryTuitionFee";
     FilterCombinations["DEGREE_COUNTRY_ATTENDANCE"] = "degreeCountryAttendance";
-    FilterCombinations["DEGREE_TUITION_FEE"] = "degreeTuitionFee";
-    FilterCombinations["DEGREE_ATTENDANCE_TUITION_FEE"] = "degreeAttendanceTuitionFee";
-    FilterCombinations["DEGREE_ATTENDANCE_FORMAT"] = "degreeAttendanceFormat";
-    FilterCombinations["DEGREE_AREA"] = "degreeArea";
-    FilterCombinations["DEGREE_FORMAT"] = "degreeFormat";
-    FilterCombinations["DEGREE_CONTINENT"] = "degreeContinent";
-    FilterCombinations["DEGREE_AREA_TUITION_FEE"] = "degreeAreaTuitionFee";
-    FilterCombinations["DEGREE_CONTINENT_TUITION_FEE"] = "degreeContinentTuitionFee";
-    FilterCombinations["DEGREE_DURATION"] = "degreeDuration";
-    FilterCombinations["DEGREE_FORMAT_TUITION_FEE"] = "degreeFormatTuitionFee";
-    FilterCombinations["DEGREE_SPECIAL_PROGRAMMES"] = "degreeSpecialProgrammes";
     FilterCombinations["DISCIPLINE"] = "discipline";
     FilterCombinations["UNFILTERED"] = "unfiltered";
     FilterCombinations["UNIVERSITY_COUNTRY"] = "universityCountry";
     FilterCombinations["ATTENDANCE_DISCIPLINE"] = "attendancedDiscipline";
     FilterCombinations["ATTENDANCE_DEGREE"] = "attendanceDegree";
-    FilterCombinations["ATTENDANCE_TUITION_FEE"] = "attendanceTuitionFee";
-    FilterCombinations["ATTENDANCE_DURATION"] = "attendanceDuration";
-    FilterCombinations["ATTENDANCE_FORMAT"] = "attendanceFormat";
-    FilterCombinations["ATTENDANCE_AREA"] = "attendanceArea";
-    FilterCombinations["ATTENDANCE_CONTINENT"] = "attendanceContinent";
+    FilterCombinations["CONTINENT_ATTENDANCE"] = "continentAttendance";
     FilterCombinations["COUNTRY_ATTENDANCE"] = "countryAttendance";
     FilterCombinations["ATTENDANCE"] = "attendance";
     FilterCombinations["CONTINENT"] = "continent";

package/dist/src/organisations/rules/AtLeastSevenResultsRule.d.ts

@@ -0,0 +1,15 @@
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
+import { ISearchApiClient } from '../../sitemap-generator/ISearchApiClient';
+import { IRule } from '../../common/IRule';
+export declare class AtLeastSevenResultsRule implements IRule {
+    private readonly minimumResultsCount;
+    private readonly maximumPageSize;
+    private readonly searchApiClient?;
+    constructor(searchApiClient?: ISearchApiClient);
+    forSearch(dependencies: ISearchDependencies): Promise<boolean>;
+    forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap, pageNumber: number): Promise<boolean>;
+    forSitemapGenerator(): Promise<boolean>;
+    getName(): string;
+    getDescription(): string;
+}

package/dist/src/organisations/rules/AtLeastSevenResultsRule.js

@@ -0,0 +1,30 @@
+import { DependencyMissingError } from '../../errors/DependencyMissingError';
+export class AtLeastSevenResultsRule {
+    minimumResultsCount = 7;
+    maximumPageSize = 20;
+    searchApiClient;
+    constructor(searchApiClient) {
+        this.searchApiClient = searchApiClient;
+    }
+    forSearch(dependencies) {
+        const { applicationState } = dependencies;
+        const resultCount = applicationState.getNumberOfResults();
+        return Promise.resolve(resultCount >= this.minimumResultsCount);
+    }
+    async forSitemapGeneratorWithPageNumber(filterKeyValues, pageNumber) {
+        if (!this.searchApiClient) {
+            throw new DependencyMissingError('SearchApiClient');
+        }
+        const count = await this.searchApiClient.getCount(filterKeyValues);
+        return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
+    }
+    forSitemapGenerator() {
+        throw new Error('Method not implemented.');
+    }
+    getName() {
+        return 'AtLeastSevenResultsRule';
+    }
+    getDescription() {
+        return 'Is indexable if there are at least 2 results.';
+    }
+}

package/dist/src/presenters/AttendancePresenter.js

@@ -8,10 +8,6 @@ export class AttendancePresenter {
             {
                 id: 'online',
                 path: 'online'
-            },
-            {
-                id: 'blended',
-                path: 'blended'
             }
         ];
     }

package/dist/src/presenters/FormatPresenter.js

@@ -4,14 +4,11 @@ export class FormatPresenter {
     static instance;
     fragments;
     constructor() {
+        // Part-time is the only indexable format according to PartTimeFormatRule
         this.fragments = [
             {
                 id: FormatFilterOptionValue.PART_TIME,
                 path: 'part-time'
-            },
-            {
-                id: FormatFilterOptionValue.FULL_TIME,
-                path: 'full-time'
             }
         ];
     }

package/dist/src/presenters/SpecialProgrammesPresenter.js

@@ -12,10 +12,6 @@ export class SpecialProgrammesPresenter {
             {
                 id: SpecialProgrammesFilterOptionValue.ERASMUS_MUNDUS,
                 path: 'erasmus-mundus'
-            },
-            {
-                id: SpecialProgrammesFilterOptionValue.EXECUTIVE_PROGRAMMES,
-                path: 'executive-programmes'
             }
         ];
     }

package/dist/src/programmes/ProgrammesBaseIndexabilityPolicy.js

@@ -28,7 +28,6 @@ export class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy
             else {
                 result = await rule.forSitemapGenerator(filterKeyValues);
             }
-            // console.log("RuleName: " + rule.getName() + " Rule result: " + result); // eslint-disable-line
             if (!result) {
                 return false;
             }

package/dist/src/programmes/SearchIndexabilityManager.js

@@ -1,4 +1,4 @@
-import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryAttendanceDegree, CountryDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Discipline, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, SpecialProgrammes, TuitionFee, Unfiltered, AttendanceArea, AttendanceContinent, AttendanceDuration, AttendanceFormat, AttendanceTuitionFee, ContinentDuration, ContinentFormat, ContinentSpecialProgrammes, CountrySpecialProgrammes, DegreeArea, DegreeAreaTuitionFee, DegreeAttendanceFormat, DegreeAttendanceTuitionFee, DegreeContinent, DegreeContinentTuitionFee, DegreeDuration, DegreeFormat, DegreeFormatTuitionFee, DegreeSpecialProgrammes, DegreeTuitionFee, DisciplineContinentAttendance, DisciplineCountryAttendance, DisciplineCountryFormat, Duration, Format } from './policies';
+import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryAttendanceDegree, CountryDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Discipline, DisciplineArea, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, SpecialProgrammes, TuitionFee, Unfiltered } from './policies';
 import { DependencyTypes } from '../enums/DependencyTypes';
 import { Degree } from './policies/Degree';
 export class SearchIndexabilityManager {
@@ -32,6 +32,7 @@ export class SearchIndexabilityManager {
             new DegreeCountryDiscipline(dependencies),
             new DegreeCountryTuitionFee(dependencies),
             new Discipline(dependencies),
+            new DisciplineArea(dependencies),
             new DisciplineAttendance(dependencies),
             new DisciplineContinent(dependencies),
             new DisciplineCountry(dependencies),
@@ -44,32 +45,7 @@ export class SearchIndexabilityManager {
             new DisciplineTuitionFeeAttendance(dependencies),
             new SpecialProgrammes(dependencies),
             new TuitionFee(dependencies),
-            new Unfiltered(dependencies),
-            new CountrySpecialProgrammes(dependencies),
-            new DegreeArea(dependencies),
-            new DegreeAreaTuitionFee(dependencies),
-            new DegreeAttendanceFormat(dependencies),
-            new DegreeAttendanceTuitionFee(dependencies),
-            new DegreeContinent(dependencies),
-            new DegreeContinentTuitionFee(dependencies),
-            new DegreeDuration(dependencies),
-            new DegreeFormat(dependencies),
-            new DegreeFormatTuitionFee(dependencies),
-            new DegreeSpecialProgrammes(dependencies),
-            new DegreeTuitionFee(dependencies),
-            new DisciplineContinentAttendance(dependencies),
-            new DisciplineCountryAttendance(dependencies),
-            new DisciplineCountryFormat(dependencies),
-            new Duration(dependencies),
-            new Format(dependencies),
-            new AttendanceArea(dependencies),
-            new AttendanceContinent(dependencies),
-            new AttendanceDuration(dependencies),
-            new AttendanceFormat(dependencies),
-            new AttendanceTuitionFee(dependencies),
-            new ContinentDuration(dependencies),
-            new ContinentFormat(dependencies),
-            new ContinentSpecialProgrammes(dependencies),
+            new Unfiltered(dependencies)
         ];
     }
     getPolicies() {

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

@@ -2,14 +2,15 @@ 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 { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
-import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 export declare class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDegreeRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OnlineAttendanceRule | IndexableDegreeRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -2,19 +2,21 @@ 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 { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
+import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
-import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 export class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Attendance Degree Type Policy';
-    description = 'Determines indexing rules for pages filtered by both study format (online, blended, on-campus, etc.), and degree type prioritizing degrees and formats with demonstrated search demand.';
+    description = 'Determines indexing rules for pages filtered by both study format (online, on-campus, etc.), and degree type prioritizing degrees and formats with demonstrated search demand.';
     filterKeys = [FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new OnlyFiltersSelectedRule([FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule()
+        new IndexableDegreeRule(),
+        new OnlineAttendanceRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -23,12 +25,9 @@ export class AttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const degreeFragments = DegreePresenter.getInstance().getFragments();
-        // Allow online and blended learning formats
-        const allowedAttendanceIds = ["online", "blended"];
-        const allowedAttendances = attendanceFragments.filter(attendance => allowedAttendanceIds.includes(attendance.id));
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {
-            for (const attendance of allowedAttendances) {
+            for (const attendance of attendanceFragments) {
                 for (const degree of degreeFragments) {
                     const filterKeyValues = new Map([
                         [FilterKey.DELIVERY_METHOD, [attendance.id]],

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

@@ -10,7 +10,7 @@ import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 export class CountryAttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Attendance Degree Policy';
-    description = `Determines indexing rules for pages filtered by country,
+    description = `Determines indexing rules for pages filtered by country,
 		study format (online, on-campus, etc.), and degree type.`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE];
     rules = [

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

@@ -2,14 +2,14 @@ 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 { OneYearOnlyRule } from '../rules/OneYearOnlyRule';
+import { IndexableDurationRule } from '../rules/IndexableDurationRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 export declare class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | OneYearOnlyRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDurationRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -2,19 +2,19 @@ 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 { OneYearOnlyRule } from '../rules/OneYearOnlyRule';
+import { IndexableDurationRule } from '../rules/IndexableDurationRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
 export class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Duration Policy';
-    description = 'Determines indexing rules for pages filtered by both country, and duration (1 year only).';
+    description = 'Determines indexing rules for pages filtered by both country, and duration (1 year, 2 years, etc.).';
     filterKeys = [FilterKey.COUNTRY, FilterKey.DURATION];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.DURATION),
         new OnlyFiltersSelectedRule([FilterKey.COUNTRY, FilterKey.DURATION]),
-        new OneYearOnlyRule()
+        new IndexableDurationRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -23,12 +23,10 @@ export class CountryDuration extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const durationFragments = DurationPresenter.getInstance().getFragments();
-        const allowedDurationIds = ["[360,360]"];
-        const allowedDurations = durationFragments.filter(duration => allowedDurationIds.includes(duration.id));
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {
             for (const country of countryFragments) {
-                for (const duration of allowedDurations) {
+                for (const duration of durationFragments) {
                     const filterKeyValues = new Map([
                         [FilterKey.COUNTRY, [country.id]],
                         [FilterKey.DURATION, [duration.id]]

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

@@ -10,7 +10,7 @@ import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
 export class CountryDurationDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Duration Degree Policy';
-    description = `Determines indexing rules for pages filtered by country,
+    description = `Determines indexing rules for pages filtered by country,
 		duration (1 year, 2 years, etc.), and degree type.`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.DURATION, FilterKey.DEGREE_TYPE];
     rules = [

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

@@ -8,7 +8,7 @@ import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class CountryEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by both country,
+    description = `Determines indexing rules for pages filtered by both country,
 		and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM];
     rules = [

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

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

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

@@ -8,7 +8,6 @@ import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityP
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
-import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
 export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Attendance Discipline Policy';
     description = 'Determines indexing rules for pages filtered by degree type, attendance, and discipline.';
@@ -19,7 +18,6 @@ export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy
         new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
         new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.DELIVERY_METHOD, FilterKey.DISCIPLINES]),
         new DegreeAttendanceDisciplineSpecificRule(),
-        new OnlineAttendanceRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -35,22 +33,24 @@ export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy
             DegreeTypeFilterOptionValue.MSC,
             DegreeTypeFilterOptionValue.MBA
         ];
+        const onlineAttendance = attendanceFragments.find(a => a.id === 'online');
+        if (!onlineAttendance) {
+            return paths;
+        }
         for (const pageNumber of this.indexablePageNumbers) {
             for (const degreeId of allowedDegreeIds) {
                 const degree = degreeFragments.find(d => d.id === degreeId);
                 if (!degree)
                     continue;
                 for (const discipline of disciplineFragments) {
-                    for (const attendance of attendanceFragments) {
-                        const filterKeyValues = new Map([
-                            [FilterKey.DEGREE_TYPE, [degree.id]],
-                            [FilterKey.DELIVERY_METHOD, [attendance.id]],
-                            [FilterKey.DISCIPLINES, [discipline.id]]
-                        ]);
-                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
-                        if (result) {
-                            paths.push(this.getPathWithPageNumber(`${degree.path}/${attendance.path}/${discipline.path}`, pageNumber));
-                        }
+                    const filterKeyValues = new Map([
+                        [FilterKey.DEGREE_TYPE, [degree.id]],
+                        [FilterKey.DELIVERY_METHOD, [onlineAttendance.id]],
+                        [FilterKey.DISCIPLINES, [discipline.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${degree.path}/${onlineAttendance.path}/${discipline.path}`, pageNumber));
                     }
                 }
             }

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters';
+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';

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters';
+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';

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

@@ -9,7 +9,7 @@ import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class DisciplineCountryEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Country Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by discipline,
+    description = `Determines indexing rules for pages filtered by discipline,
 		country, and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.DISCIPLINES, FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM];
     rules = [

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

@@ -8,7 +8,7 @@ import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class DisciplineEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by both discipline,
+    description = `Determines indexing rules for pages filtered by both discipline,
 		and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.DISCIPLINES, FilterKey.EDUCATIONAL_FORM];
     rules = [

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

@@ -2,13 +2,14 @@ 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 { ErasmusOrJointSpecialProgrammesRule } from '../rules/ErasmusOrJointSpecialProgrammesRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 export declare class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | ErasmusOrJointSpecialProgrammesRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -2,6 +2,7 @@ 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 { ErasmusOrJointSpecialProgrammesRule } from '../rules/ErasmusOrJointSpecialProgrammesRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { SpecialProgrammesPresenter } from '../../presenters/SpecialProgrammesPresenter';
 export class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
@@ -10,7 +11,8 @@ 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]),
+        new ErasmusOrJointSpecialProgrammesRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -18,6 +18,7 @@ export * from './DegreeCountryDiscipline';
 export * from './DegreeCountryTuitionFee';
 export * from './DisciplineDegree';
 export * from './Discipline';
+export * from './DisciplineArea';
 export * from './DisciplineAttendance';
 export * from './DisciplineContinent';
 export * from './DisciplineCountry';
@@ -31,29 +32,3 @@ export * from './DisciplineTuitionFeeAttendance';
 export * from './SpecialProgrammes';
 export * from './TuitionFee';
 export * from './Unfiltered';
-export * from './Format';
-export * from './DegreeFormat';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeArea';
-export * from './DegreeTuitionFee';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeContinent';
-export * from './AttendanceTuitionFee';
-export * from './Duration';
-export * from './AttendanceDuration';
-export * from './DegreeAreaTuitionFee';
-export * from './DisciplineContinentAttendance';
-export * from './DegreeContinentTuitionFee';
-export * from './AttendanceFormat';
-export * from './ContinentFormat';
-export * from './AttendanceContinent';
-export * from './DegreeDuration';
-export * from './ContinentSpecialProgrammes';
-export * from './CountrySpecialProgrammes';
-export * from './AttendanceArea';
-export * from './DegreeFormatTuitionFee';
-export * from './ContinentDuration';
-export * from './DegreeAttendanceFormat';
-export * from './DisciplineCountryAttendance';
-export * from './DisciplineCountryFormat';
-export * from './DegreeSpecialProgrammes';

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

@@ -18,6 +18,7 @@ export * from './DegreeCountryDiscipline';
 export * from './DegreeCountryTuitionFee';
 export * from './DisciplineDegree';
 export * from './Discipline';
+export * from './DisciplineArea';
 export * from './DisciplineAttendance';
 export * from './DisciplineContinent';
 export * from './DisciplineCountry';
@@ -31,29 +32,3 @@ export * from './DisciplineTuitionFeeAttendance';
 export * from './SpecialProgrammes';
 export * from './TuitionFee';
 export * from './Unfiltered';
-export * from './Format';
-export * from './DegreeFormat';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeArea';
-export * from './DegreeTuitionFee';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeContinent';
-export * from './AttendanceTuitionFee';
-export * from './Duration';
-export * from './AttendanceDuration';
-export * from './DegreeAreaTuitionFee';
-export * from './DisciplineContinentAttendance';
-export * from './DegreeContinentTuitionFee';
-export * from './AttendanceFormat';
-export * from './ContinentFormat';
-export * from './AttendanceContinent';
-export * from './DegreeDuration';
-export * from './ContinentSpecialProgrammes';
-export * from './CountrySpecialProgrammes';
-export * from './AttendanceArea';
-export * from './DegreeFormatTuitionFee';
-export * from './ContinentDuration';
-export * from './DegreeAttendanceFormat';
-export * from './DisciplineCountryAttendance';
-export * from './DisciplineCountryFormat';
-export * from './DegreeSpecialProgrammes';

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

@@ -15,7 +15,7 @@ export class AtLeastSevenResultsRule {
         if (!this.searchApiClient) {
             throw new DependencyMissingError('SearchApiClient');
         }
-        const count = await this.searchApiClient.getProgrammeCount(filterKeyValues);
+        const count = await this.searchApiClient.getCount(filterKeyValues);
         return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
     }
     forSitemapGenerator() {