@studyportals/fawkes 6.0.1-9 → 7.0.1-0

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -24,15 +24,17 @@ export class DisciplineTuitionFee extends ProgrammesBaseIndexabilityPolicy {
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
         const paths = [];
-        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.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(`${tuitionFee.path}/${discipline.path}`);
+        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(`${tuitionFee.path}/${discipline.path}`, pageNumber));
+                    }
                 }
             }
         }

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

@@ -29,17 +29,19 @@ export class DisciplineTuitionFeeAttendance extends ProgrammesBaseIndexabilityPo
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
         const paths = [];
-        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.checkRulesForSitemap(filterKeyValues);
-                    if (result) {
-                        paths.push(`${tuitionFee.path}/${attendance.path}/${discipline.path}`);
+        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));
+                        }
                     }
                 }
             }

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

@@ -21,11 +21,13 @@ export class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const specialProgrammeFragments = SpecialProgrammesPresenter.getInstance().getFragments();
         const paths = [];
-        for (const specialProgramme of specialProgrammeFragments) {
-            const filterKeyValues = new Map([[FilterKey.SPECIAL_PROGRAMMES, [specialProgramme.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(`${specialProgramme.path}`);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const specialProgramme of specialProgrammeFragments) {
+                const filterKeyValues = new Map([[FilterKey.SPECIAL_PROGRAMMES, [specialProgramme.id]]]);
+                const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                if (result) {
+                    paths.push(this.getPathWithPageNumber(specialProgramme.path, pageNumber));
+                }
             }
         }
         return paths;

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

@@ -19,14 +19,12 @@ export class TuitionFee extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
         const paths = [];
-        for (const tuitionFee of tuitionFeeFragments) {
-            const filterKeyValues = new Map([[FilterKey.TUITION_FEE, [tuitionFee.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(tuitionFee.path);
+        for (const pageNumber of this.indexablePageNumbers) {
+            for (const tuitionFee of tuitionFeeFragments) {
+                paths.push(this.getPathWithPageNumber(tuitionFee.path, pageNumber));
             }
         }
-        return paths;
+        return Promise.resolve(paths);
     }
     get filterCombination() {
         return FilterCombinations.TUITION_FEE;

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

@@ -1,5 +1,5 @@
-import { BaseFilterKeyValueRule } from '../../common/rules/BaseFilterKeyValueRule';
-export declare class AffordableTuitionFeeRule extends BaseFilterKeyValueRule {
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class AffordableTuitionFeeRule extends BaseProgrammeFilterKeyValueRule {
     constructor();
     getName(): string;
     getDescription(): string;

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

@@ -1,7 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters';
-import { BaseFilterKeyValueRule } from '../../common/rules/BaseFilterKeyValueRule';
-export class AffordableTuitionFeeRule extends BaseFilterKeyValueRule {
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class AffordableTuitionFeeRule extends BaseProgrammeFilterKeyValueRule {
     constructor() {
         const filterKeyValues = new Map([
             [FilterKey.TUITION_FEE, [TuitionFeeFilterOptionValue.ZERO_TO_TWO_THOUSAND_FIVE_HUNDRED]]

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

@@ -1,13 +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 {
+import { IProgrammeRule } from '../IProgrammeRule';
+export declare class AtLeastSevenResultsRule implements IProgrammeRule {
     private readonly minimumResultsCount;
+    private readonly maximumPageSize;
     private readonly searchApiClient?;
     constructor(searchApiClient?: ISearchApiClient);
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
-    forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+    forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap, pageNumber: number): Promise<boolean>;
+    forSitemapGenerator(): Promise<boolean>;
     getName(): string;
     getDescription(): string;
 }

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

@@ -1,6 +1,7 @@
 import { DependencyMissingError } from '../../errors/DependencyMissingError';
 export class AtLeastSevenResultsRule {
     minimumResultsCount = 7;
+    maximumPageSize = 20;
     searchApiClient;
     constructor(searchApiClient) {
         this.searchApiClient = searchApiClient;
@@ -10,12 +11,15 @@ export class AtLeastSevenResultsRule {
         const resultCount = applicationState.getNumberOfResults();
         return Promise.resolve(resultCount >= this.minimumResultsCount);
     }
-    async forSitemapGenerator(filterKeyValues) {
+    async forSitemapGeneratorWithPageNumber(filterKeyValues, pageNumber) {
         if (!this.searchApiClient) {
             throw new DependencyMissingError('SearchApiClient');
         }
         const count = await this.searchApiClient.getProgrammeCount(filterKeyValues);
-        return count >= this.minimumResultsCount;
+        return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
+    }
+    forSitemapGenerator() {
+        throw new Error('Method not implemented.');
     }
     getName() {
         return 'AtLeastSevenResultsRule';

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

@@ -1,7 +1,7 @@
-import { IRule } from '../../common/IRule';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
-export declare class ErasmusOrJointSpecialProgrammesRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class ErasmusOrJointSpecialProgrammesRule extends BaseProgrammeRule {
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

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

@@ -1,6 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { SpecialProgrammesFilterOptionValue } from '@studyportals/search-filters';
-export class ErasmusOrJointSpecialProgrammesRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class ErasmusOrJointSpecialProgrammesRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
         const selectedSpecialProgramme = seoInfoBase.getFilterOptionValueBy(FilterKey.SPECIAL_PROGRAMMES, filterState);

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

@@ -1,7 +1,7 @@
-import { IRule } from '../../common/IRule';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
-export declare class IndexableDegreeRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class IndexableDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

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

@@ -1,6 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
-export class IndexableDegreeRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class IndexableDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
         const selectedDegree = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);

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

@@ -1,7 +1,7 @@
-import { IRule } from '../../common/IRule';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
-export declare class IndexableDurationRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class IndexableDurationRule extends BaseProgrammeRule {
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

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

@@ -1,6 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { DurationFilterOptionValue } from '@studyportals/search-filters';
-export class IndexableDurationRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class IndexableDurationRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
         const selectedDuration = seoInfoBase.getFilterOptionValueBy(FilterKey.DURATION, filterState);

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

@@ -1,7 +1,7 @@
-import { IRule } from '../../common/IRule';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
-export declare class IndexableEducationalFormRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class IndexableEducationalFormRule extends BaseProgrammeRule {
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

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

@@ -1,6 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { EducationalFormFilterOptionValue } from '@studyportals/search-filters';
-export class IndexableEducationalFormRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class IndexableEducationalFormRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
         const selectedEducationalForm = seoInfoBase.getFilterOptionValueBy(FilterKey.EDUCATIONAL_FORM, filterState);

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

@@ -1,6 +1,6 @@
-import { IRule } from '../../common/IRule';
 import { IProgrammeSearchDependencies } from '../types/IProgrammeSearchDependencies';
-export declare class IndexablePageNumberRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class IndexablePageNumberRule extends BaseProgrammeRule {
     private readonly minimumPageNumber;
     forSearch(dependencies: IProgrammeSearchDependencies): Promise<boolean>;
     forSitemapGenerator(): Promise<boolean>;

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

@@ -1,4 +1,5 @@
-export class IndexablePageNumberRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class IndexablePageNumberRule extends BaseProgrammeRule {
     minimumPageNumber = 2;
     forSearch(dependencies) {
         const { applicationState } = dependencies;

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

@@ -1,5 +1,5 @@
-import { BaseFilterKeyValueRule } from '../../common/rules/BaseFilterKeyValueRule';
-export declare class MbaDegreeRule extends BaseFilterKeyValueRule {
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export declare class MbaDegreeRule extends BaseProgrammeFilterKeyValueRule {
     constructor();
     getName(): string;
     getDescription(): string;

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

@@ -1,7 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
-import { BaseFilterKeyValueRule } from '../../common/rules/BaseFilterKeyValueRule';
-export class MbaDegreeRule extends BaseFilterKeyValueRule {
+import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
+export class MbaDegreeRule extends BaseProgrammeFilterKeyValueRule {
     constructor() {
         const filterKeyValues = new Map([[FilterKey.DEGREE_TYPE, [DegreeTypeFilterOptionValue.MBA]]]);
         super(filterKeyValues);

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

@@ -1,7 +1,7 @@
-import { IRule } from '../../common/IRule';
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
-export declare class MbaOrMscDegreeRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class MbaOrMscDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

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

@@ -1,6 +1,7 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
-export class MbaOrMscDegreeRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class MbaOrMscDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
         const selectedDegree = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);

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

@@ -1,7 +1,7 @@
-import { IRule } from '../../common/IRule';
 import { IProgrammeSearchDependencies } from '../types/IProgrammeSearchDependencies';
 import { PortalType } from '@studyportals/domain-client';
-export declare class NotDistanceLearningPortalRule implements IRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class NotDistanceLearningPortalRule extends BaseProgrammeRule {
     private readonly portalType;
     constructor(portalType?: PortalType);
     forSearch(dependencies: IProgrammeSearchDependencies): Promise<boolean>;

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

@@ -1,8 +1,10 @@
 import { PortalType } from '@studyportals/domain-client';
 import { DependencyMissingError } from '../../errors/DependencyMissingError';
-export class NotDistanceLearningPortalRule {
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class NotDistanceLearningPortalRule extends BaseProgrammeRule {
     portalType;
     constructor(portalType) {
+        super();
         this.portalType = portalType;
     }
     forSearch(dependencies) {