@studyportals/fawkes 8.5.3-1 → 8.5.3-3

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

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

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

@@ -10,14 +10,18 @@ export class DegreeContinent extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Continent Policy';
     description = 'Determines indexing rules for pages filtered by both degree type, and continent.';
     filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.CONTINENT];
-    rules = [
-        new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
-        new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
-        new OnlyFiltersSelectedRule([FilterKey.CONTINENT, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new OnlyFiltersSelectedRule([FilterKey.CONTINENT, FilterKey.DEGREE_TYPE]),
+            new IndexableDegreeRule(portalType)
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

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

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

@@ -11,15 +11,19 @@ export class DegreeContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy
     name = 'Degree Continent Tuition Fee Policy';
     description = 'Determines indexing rules for pages filtered by degree type, continent, and tuition fee.';
     filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.CONTINENT, FilterKey.TUITION_FEE];
-    rules = [
-        new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
-        new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
-        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
-        new OnlyFiltersSelectedRule([FilterKey.CONTINENT, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
-        new IndexableDegreeRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+            new OnlyFiltersSelectedRule([FilterKey.CONTINENT, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
+            new IndexableDegreeRule(portalType)
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

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

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

@@ -11,15 +11,19 @@ export class DegreeDuration extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Duration Policy';
     description = 'Determines indexing rules for pages filtered by degree type and duration (2 years).';
     filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.DURATION];
-    rules = [
-        new SingleValueSelectedForFilterRule(FilterKey.DURATION),
-        new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
-        new OnlyFiltersSelectedRule([FilterKey.DURATION, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule(),
-        new OneOrTwoYearDurationRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.DURATION),
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new OnlyFiltersSelectedRule([FilterKey.DURATION, FilterKey.DEGREE_TYPE]),
+            new IndexableDegreeRule(portalType),
+            new OneOrTwoYearDurationRule()
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

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

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

@@ -10,14 +10,18 @@ export class DegreeFormat extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Format Policy';
     description = 'Determines indexing rules for pages filtered by degree type and format.';
     filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.ATTENDANCE];
-    rules = [
-        new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
-        new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
-        new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.DEGREE_TYPE]),
+            new IndexableDegreeRule(portalType)
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

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

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

@@ -13,17 +13,21 @@ export class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Format Tuition Fee Policy';
     description = 'Determines indexing rules for pages filtered by degree type, format and tuition fee.';
     filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.ATTENDANCE, FilterKey.TUITION_FEE];
-    rules = [
-        new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
-        new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
-        new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
-        new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
-        new IndexableDegreeRule(),
-        new AffordableTuitionFeeRule(),
-        new PartTimeFormatRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
+            new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
+            new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
+            new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
+            new IndexableDegreeRule(portalType),
+            new AffordableTuitionFeeRule(),
+            new PartTimeFormatRule()
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

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

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

@@ -9,18 +9,22 @@ 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 = [
-        new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
-        new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
-        new SingleValueSelectedForFilterRule(FilterKey.EDUCATIONAL_FORM),
-        new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM]),
-        new IndexableEducationalFormRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
+            new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
+            new SingleValueSelectedForFilterRule(FilterKey.EDUCATIONAL_FORM),
+            new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM]),
+            new IndexableEducationalFormRule(portalType)
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

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

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

@@ -8,17 +8,21 @@ 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 = [
-        new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
-        new SingleValueSelectedForFilterRule(FilterKey.EDUCATIONAL_FORM),
-        new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.EDUCATIONAL_FORM]),
-        new IndexableEducationalFormRule()
-    ];
+    rules;
     constructor(dependencies) {
         super(dependencies);
+        const portalType = this.isSitemapUrlGeneratorDependencies()
+            ? dependencies.portalType
+            : undefined;
+        this.rules = [
+            new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
+            new SingleValueSelectedForFilterRule(FilterKey.EDUCATIONAL_FORM),
+            new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.EDUCATIONAL_FORM]),
+            new IndexableEducationalFormRule(portalType)
+        ];
         this.initateBaseRules();
     }
     async generateUrls() {

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

@@ -1,10 +1,13 @@
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
+import { PortalType } from '@studyportals/domain-client';
 export declare class IndexableDegreeRule extends BaseProgrammeRule {
+    private readonly portalType;
+    constructor(portalType?: PortalType);
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;
     getDescription(): string;
-    private get indexableDegreeTypes();
+    private getIndexableDegreeTypes;
 }

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

@@ -1,53 +1,79 @@
 import { FilterKey } from '@studyportals/search-filters/server-side';
 import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/server-side';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
+import { PortalType } from '@studyportals/domain-client';
+import { DependencyMissingError } from '../../errors/DependencyMissingError';
 export class IndexableDegreeRule extends BaseProgrammeRule {
+    portalType;
+    constructor(portalType) {
+        super();
+        this.portalType = portalType;
+    }
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
+        const programmeSearchDependencies = dependencies;
+        const portalType = programmeSearchDependencies.portalType;
         const selectedDegree = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         if (!selectedDegree) {
             return Promise.resolve(false);
         }
-        const isIndexable = this.indexableDegreeTypes.includes(selectedDegree);
+        const isIndexable = this.getIndexableDegreeTypes(portalType).includes(selectedDegree);
         return Promise.resolve(isIndexable);
     }
     forSitemapGenerator(filterKeyValues) {
+        if (!this.portalType) {
+            throw new DependencyMissingError('PortalType');
+        }
         const [selectedDegree] = filterKeyValues.get(FilterKey.DEGREE_TYPE);
         if (!selectedDegree) {
             return Promise.resolve(false);
         }
-        const isIndexable = this.indexableDegreeTypes.includes(selectedDegree);
+        const isIndexable = this.getIndexableDegreeTypes(this.portalType).includes(selectedDegree);
         return Promise.resolve(isIndexable);
     }
     getName() {
         return 'IndexableDegreeRule';
     }
     getDescription() {
-        return `Indexable if the selected degree type is one of the following: ${this.indexableDegreeTypes.join(', ')}`;
+        return `Indexable if the selected degree type is one of the indexable degrees for the portal type`;
     }
-    get indexableDegreeTypes() {
-        return [
-            DegreeTypeFilterOptionValue.DOCTORATE,
-            DegreeTypeFilterOptionValue.DBA,
-            DegreeTypeFilterOptionValue.PHD,
-            DegreeTypeFilterOptionValue.MSC,
-            DegreeTypeFilterOptionValue.MA,
-            DegreeTypeFilterOptionValue.MBA,
-            DegreeTypeFilterOptionValue.LLM,
-            DegreeTypeFilterOptionValue.MPHIL,
-            DegreeTypeFilterOptionValue.MED,
-            DegreeTypeFilterOptionValue.MENG,
-            DegreeTypeFilterOptionValue.POSTGRADIP,
-            DegreeTypeFilterOptionValue.POSTGRADCERT,
-            DegreeTypeFilterOptionValue.PREMASTER,
-            DegreeTypeFilterOptionValue.BSC,
-            DegreeTypeFilterOptionValue.BA,
-            DegreeTypeFilterOptionValue.BBA,
-            DegreeTypeFilterOptionValue.ASSOCIATE_DEGREE,
-            DegreeTypeFilterOptionValue.GRADUATE_CERTTIFICATE,
-            DegreeTypeFilterOptionValue.GRADUATE_DIPLOMA,
-            DegreeTypeFilterOptionValue.PREBACHELOR,
-            DegreeTypeFilterOptionValue.CERTIFICATE
-        ];
+    getIndexableDegreeTypes(portalType) {
+        switch (portalType) {
+            case PortalType.MASTER:
+                return [
+                    DegreeTypeFilterOptionValue.MSC,
+                    DegreeTypeFilterOptionValue.MA,
+                    DegreeTypeFilterOptionValue.MBA,
+                    DegreeTypeFilterOptionValue.LLM,
+                    DegreeTypeFilterOptionValue.MPHIL,
+                    DegreeTypeFilterOptionValue.MED,
+                    DegreeTypeFilterOptionValue.MENG,
+                    DegreeTypeFilterOptionValue.POSTGRADIP,
+                    DegreeTypeFilterOptionValue.POSTGRADCERT,
+                    DegreeTypeFilterOptionValue.PREMASTER
+                ];
+            case PortalType.BACHELOR:
+                return [
+                    DegreeTypeFilterOptionValue.BSC,
+                    DegreeTypeFilterOptionValue.BA,
+                    DegreeTypeFilterOptionValue.BBA,
+                    DegreeTypeFilterOptionValue.ASSOCIATE_DEGREE,
+                    DegreeTypeFilterOptionValue.GRADUATE_CERTTIFICATE,
+                    DegreeTypeFilterOptionValue.GRADUATE_DIPLOMA,
+                    DegreeTypeFilterOptionValue.PREBACHELOR
+                ];
+            case PortalType.PHD:
+                return [
+                    DegreeTypeFilterOptionValue.PHD,
+                    DegreeTypeFilterOptionValue.DBA,
+                    DegreeTypeFilterOptionValue.DOCTORATE
+                ];
+            case PortalType.SHORT:
+                return [
+                    DegreeTypeFilterOptionValue.CERTIFICATE
+                ];
+            default:
+                return [];
+        }
     }
 }

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

@@ -1,7 +1,10 @@
 import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
+import { PortalType } from '@studyportals/domain-client';
 export declare class IndexableEducationalFormRule extends BaseProgrammeRule {
+    private readonly portalType;
+    constructor(portalType?: PortalType);
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

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

@@ -1,22 +1,33 @@
-import { FilterKey } from '@studyportals/search-filters/server-side';
-import { EducationalFormFilterOptionValue } from '@studyportals/search-filters/server-side';
+import { EducationalFormFilterOptionValue, FilterKey } from '@studyportals/search-filters/server-side';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
+import { PortalType } from '@studyportals/domain-client';
+import { DependencyMissingError } from '../../errors/DependencyMissingError';
 export class IndexableEducationalFormRule extends BaseProgrammeRule {
+    portalType;
+    constructor(portalType) {
+        super();
+        this.portalType = portalType;
+    }
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
+        const programmeSearchDependencies = dependencies;
+        const portalType = programmeSearchDependencies.portalType;
         const selectedEducationalForm = seoInfoBase.getFilterOptionValueBy(FilterKey.EDUCATIONAL_FORM, filterState);
         if (!selectedEducationalForm) {
             return Promise.resolve(false);
         }
-        const isIndexable = this.isIndexable(selectedEducationalForm);
+        const isIndexable = this.isIndexable(portalType, selectedEducationalForm);
         return Promise.resolve(isIndexable);
     }
     forSitemapGenerator(filterKeyValues) {
+        if (!this.portalType) {
+            throw new DependencyMissingError('PortalType');
+        }
         const [selectedEducationalForm] = filterKeyValues.get(FilterKey.EDUCATIONAL_FORM);
         if (!selectedEducationalForm) {
             return Promise.resolve(false);
         }
-        const isIndexable = this.isIndexable(selectedEducationalForm);
+        const isIndexable = this.isIndexable(this.portalType, selectedEducationalForm);
         return Promise.resolve(isIndexable);
     }
     getName() {
@@ -25,7 +36,9 @@ export class IndexableEducationalFormRule extends BaseProgrammeRule {
     getDescription() {
         return `Indexable if educational form is Academic Course, Summer School, Semester Study Abroad, or Skill Professional Course.`;
     }
-    isIndexable(value) {
+    isIndexable(portalType, value) {
+        if (portalType !== PortalType.SHORT)
+            return false;
         return (value === EducationalFormFilterOptionValue.ACADEMIC_COURSE ||
             value === EducationalFormFilterOptionValue.SUMMER_SCHOOL ||
             value === EducationalFormFilterOptionValue.SEMESTER_STUDY_ABROAD ||

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

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