@studyportals/fawkes 7.2.2-14 → 7.2.2-15

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

@@ -2,15 +2,14 @@ import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { DegreeCountrySpecificRule } from '../rules/DegreeCountrySpecificRule';
-import { MasterOfEducationCountryDisciplineRule } from '../rules/MasterOfEducationCountryDisciplineRule';
+import { DegreeCountryDisciplineSpecificRule } from '../rules/DegreeCountryDisciplineSpecificRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 export declare class DegreeCountryDiscipline extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | DegreeCountrySpecificRule | MasterOfEducationCountryDisciplineRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | DegreeCountryDisciplineSpecificRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -3,8 +3,7 @@ import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { DegreeCountrySpecificRule } from '../rules/DegreeCountrySpecificRule';
-import { MasterOfEducationCountryDisciplineRule } from '../rules/MasterOfEducationCountryDisciplineRule';
+import { DegreeCountryDisciplineSpecificRule } from '../rules/DegreeCountryDisciplineSpecificRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { CountryPresenter } from '../../presenters/CountryPresenter';
@@ -18,8 +17,7 @@ export class DegreeCountryDiscipline extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
         new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.COUNTRY, FilterKey.DISCIPLINES]),
-        new DegreeCountrySpecificRule(),
-        new MasterOfEducationCountryDisciplineRule()
+        new DegreeCountryDisciplineSpecificRule(),
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -0,0 +1,11 @@
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export declare class DegreeCountryDisciplineSpecificRule extends BaseProgrammeRule {
+    private readonly educationDisciplineIds;
+    private readonly validCombinations;
+    getName(): string;
+    getDescription(): string;
+    forSearch(dependencies: ISearchDependencies): Promise<boolean>;
+    forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+}

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

@@ -0,0 +1,70 @@
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
+import { BaseProgrammeRule } from '../BaseProgrammeRule';
+export class DegreeCountryDisciplineSpecificRule extends BaseProgrammeRule {
+    educationDisciplineIds = [
+        '289', // Education & Training (main discipline)
+        '290', // Adult Education
+        '360', // Art Education
+        '291', // Coaching
+        '292', // School Counselling
+        '333', // Early Childhood Education
+        '8', // Education
+        '349', // Educational Leadership
+        '293', // Educational Psychology
+        '98', // Educational Research
+        '371', // Health Education
+        '363', // Higher Education
+        '355', // Instructional Design
+        '370', // Literacy Education
+        '348', // Primary Education
+        '97', // Special Education
+        '359', // Secondary Education
+        '345', // STEM Education
+        '295', // Teaching
+        '358' // Teaching English as a Foreign Language
+    ];
+    validCombinations = {
+        [DegreeTypeFilterOptionValue.MSC]: ['82', '56', '11', '30'],
+        [DegreeTypeFilterOptionValue.MBA]: ['82', '30'],
+        [DegreeTypeFilterOptionValue.MED]: ['202', '56']
+    };
+    getName() {
+        return 'DegreeCountrySpecificRule';
+    }
+    getDescription() {
+        return 'Indexes: master-of-science (USA, Canada, Germany, UK); master-of-business-administration (USA, UK); master-of-education (Australia, Canada)';
+    }
+    forSearch(dependencies) {
+        const { seoInfoBase, filterState } = dependencies;
+        const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
+        const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
+        const disciplineValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
+        if (!degreeTypeValue || !countryValue || !disciplineValue) {
+            return Promise.resolve(false);
+        }
+        const allowedCountries = this.validCombinations[degreeTypeValue];
+        if (!allowedCountries) {
+            return Promise.resolve(false);
+        }
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MED) {
+            return Promise.resolve(allowedCountries.includes(countryValue) &&
+                this.educationDisciplineIds.includes(disciplineValue));
+        }
+        return Promise.resolve(allowedCountries.includes(countryValue));
+    }
+    forSitemapGenerator(filterKeyValues) {
+        const degreeTypeValues = filterKeyValues.get(FilterKey.DEGREE_TYPE);
+        const countryValues = filterKeyValues.get(FilterKey.COUNTRY);
+        if (!degreeTypeValues?.length || !countryValues?.length) {
+            return Promise.resolve(false);
+        }
+        const degreeTypeValue = degreeTypeValues[0];
+        const countryValue = countryValues[0];
+        const allowedCountries = this.validCombinations[degreeTypeValue];
+        if (!allowedCountries) {
+            return Promise.resolve(false);
+        }
+        return Promise.resolve(allowedCountries.includes(countryValue));
+    }
+}

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

@@ -40,7 +40,7 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
     ];
     masterOfPhilosophyDisciplineIds = [
         '118',
-        '3',
+        '23',
         '335',
         '71',
         '281',

package/package.json

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