@studyportals/fawkes 7.2.2-6 → 7.2.2-9

package/dist/src/programmes/SearchIndexabilityManager.js

@@ -1,4 +1,4 @@
-import { Area, Attendance, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryDuration, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Discipline, DisciplineArea, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, SpecialProgrammes, TuitionFee, Unfiltered } from './policies';
+import { Area, Attendance, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryDuration, 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';
 export class SearchIndexabilityManager {
     policies;
@@ -31,6 +31,7 @@ export class SearchIndexabilityManager {
             new DisciplineContinent(dependencies),
             new DisciplineCountry(dependencies),
             new DisciplineCountryEducationalForm(dependencies),
+            new DisciplineDegree(dependencies),
             new DisciplineDuration(dependencies),
             new DisciplineEducationalForm(dependencies),
             new DisciplineFormat(dependencies),

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

@@ -2,7 +2,6 @@ import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { DegreeAttendanceDisciplineRule } from '../rules/DegreeAttendanceDisciplineRule';
 import { DegreeAttendanceDisciplineSpecificRule } from '../rules/DegreeAttendanceDisciplineSpecificRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
@@ -10,7 +9,7 @@ export declare class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabili
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | DegreeAttendanceDisciplineRule | DegreeAttendanceDisciplineSpecificRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | DegreeAttendanceDisciplineSpecificRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -3,7 +3,6 @@ import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { DegreeAttendanceDisciplineRule } from '../rules/DegreeAttendanceDisciplineRule';
 import { DegreeAttendanceDisciplineSpecificRule } from '../rules/DegreeAttendanceDisciplineSpecificRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
@@ -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 DegreeAttendanceDisciplineRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

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

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

@@ -3,14 +3,12 @@ import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
-import { MbaCountryAttendanceRule } from '../rules/MbaCountryAttendanceRule';
-import { MasterOfLawsCountryAttendanceRule } from '../rules/MasterOfLawsCountryAttendanceRule';
-import { MasterOfPhilosophyCountryAttendanceRule } from '../rules/MasterOfPhilosophyCountryAttendanceRule';
 import { DegreeCountryAttendanceSpecificRule } from '../rules/DegreeCountryAttendanceSpecificRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { AttendancePresenter } from '../../presenters/AttendancePresenter';
+import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
 export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Country Attendance Policy';
     description = 'Determines indexing rules for pages filtered by degree type, country, and attendance.';
@@ -20,10 +18,8 @@ export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
         new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.COUNTRY, FilterKey.DELIVERY_METHOD]),
+        new OnlineAttendanceRule(),
         new DegreeCountryAttendanceSpecificRule(),
-        new MbaCountryAttendanceRule(),
-        new MasterOfLawsCountryAttendanceRule(),
-        new MasterOfPhilosophyCountryAttendanceRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -41,7 +37,7 @@ export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
         if (!onlineAttendance) {
             return paths;
         }
-        const llmAllowedCountryIds = ['82', '30', '32', '108'];
+        const llmAllowedCountryIds = ['82', '30', '56', '108'];
         const mphilAllowedCountryIds = ['82', '30', '108'];
         for (const pageNumber of this.indexablePageNumbers) {
             if (mba) {

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

@@ -16,6 +16,7 @@ export * from './DegreeAttendanceDiscipline';
 export * from './DegreeCountryAttendance';
 export * from './DegreeCountryDiscipline';
 export * from './DegreeCountryTuitionFee';
+export * from './DisciplineDegree';
 export * from './Discipline';
 export * from './DisciplineArea';
 export * from './DisciplineAttendance';

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

@@ -16,6 +16,7 @@ export * from './DegreeAttendanceDiscipline';
 export * from './DegreeCountryAttendance';
 export * from './DegreeCountryDiscipline';
 export * from './DegreeCountryTuitionFee';
+export * from './DisciplineDegree';
 export * from './Discipline';
 export * from './DisciplineArea';
 export * from './DisciplineAttendance';

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

@@ -2,9 +2,13 @@ import { ISearchDependencies } from '../../common/ISearchDependencies';
 import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export declare class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
-    private readonly allowedDegrees;
+    private mba;
+    private readonly countryIdsByDegree;
     getName(): string;
     getDescription(): string;
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
+    private isValidForMbaDegree;
+    private isValidForMphillDegree;
+    private isValidForLlmDegree;
 }

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

@@ -2,11 +2,11 @@ import { FilterKey } from '@studyportals/search-filters';
 import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
-    allowedDegrees = [
-        DegreeTypeFilterOptionValue.MBA,
-        DegreeTypeFilterOptionValue.LLM,
-        DegreeTypeFilterOptionValue.MPHIL
-    ].map(id => id.valueOf());
+    mba = DegreeTypeFilterOptionValue.MBA.valueOf();
+    countryIdsByDegree = {
+        [DegreeTypeFilterOptionValue.LLM.valueOf()]: ['82', '30', '56', '108'],
+        [DegreeTypeFilterOptionValue.MPHIL.valueOf()]: ['82', '30', '108'],
+    };
     getName() {
         return 'DegreeCountryAttendanceSpecificRule';
     }
@@ -16,17 +16,58 @@ export class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
-        if (!degreeTypeValue) {
+        const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
+        const attendanceValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DELIVERY_METHOD, filterState);
+        if (!degreeTypeValue || !countryValue || !attendanceValue) {
             return Promise.resolve(false);
         }
-        return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue));
+        if (attendanceValue !== 'online') {
+            return Promise.resolve(false);
+        }
+        if (this.isValidForMbaDegree(degreeTypeValue)) {
+            return Promise.resolve(true);
+        }
+        if (this.isValidForMphillDegree(degreeTypeValue, countryValue)) {
+            return Promise.resolve(true);
+        }
+        if (this.isValidForLlmDegree(degreeTypeValue, countryValue)) {
+            return Promise.resolve(true);
+        }
+        return Promise.resolve(false);
     }
     forSitemapGenerator(filterKeyValues) {
         const degreeTypeValues = filterKeyValues.get(FilterKey.DEGREE_TYPE);
-        if (!degreeTypeValues?.length) {
+        const countryValues = filterKeyValues.get(FilterKey.COUNTRY);
+        const attendanceValues = filterKeyValues.get(FilterKey.DELIVERY_METHOD);
+        if (!degreeTypeValues?.length || !countryValues?.length || !attendanceValues?.length) {
             return Promise.resolve(false);
         }
         const degreeTypeValue = degreeTypeValues[0];
-        return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue));
+        const countryValue = countryValues[0];
+        const attendanceValue = attendanceValues[0];
+        if (attendanceValue !== 'online') {
+            return Promise.resolve(false);
+        }
+        if (this.isValidForMbaDegree(degreeTypeValue)) {
+            return Promise.resolve(true);
+        }
+        if (this.isValidForMphillDegree(degreeTypeValue, countryValue)) {
+            return Promise.resolve(true);
+        }
+        if (this.isValidForLlmDegree(degreeTypeValue, countryValue)) {
+            return Promise.resolve(true);
+        }
+        return Promise.resolve(false);
+    }
+    isValidForMbaDegree(degreeTypeValue) {
+        return degreeTypeValue === this.mba;
+    }
+    isValidForMphillDegree(degreeTypeValue, countryValue) {
+        return degreeTypeValue === DegreeTypeFilterOptionValue.MPHIL.valueOf() &&
+            this.countryIdsByDegree[DegreeTypeFilterOptionValue.MPHIL.valueOf()].includes(countryValue);
+    }
+    isValidForLlmDegree(degreeTypeValue, countryValue) {
+        return degreeTypeValue === DegreeTypeFilterOptionValue.LLM.valueOf() &&
+            this.countryIdsByDegree[DegreeTypeFilterOptionValue.LLM.valueOf()].includes(countryValue);
     }
 }

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

@@ -3,9 +3,9 @@ import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountrySpecificRule extends BaseProgrammeRule {
     validCombinations = {
-        [DegreeTypeFilterOptionValue.MSC]: ['82', '32', '11', '30'],
+        [DegreeTypeFilterOptionValue.MSC]: ['82', '56', '11', '30'],
         [DegreeTypeFilterOptionValue.MBA]: ['82', '30'],
-        [DegreeTypeFilterOptionValue.MED]: ['202', '32']
+        [DegreeTypeFilterOptionValue.MED]: ['202', '56']
     };
     getName() {
         return 'DegreeCountrySpecificRule';

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

@@ -93,8 +93,6 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         const { seoInfoBase, filterState } = dependencies;
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const disciplineValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
-        // eslint-disable-next-line no-console
-        console.log("For search - Degree Type:", degreeTypeValue, "Discipline:", disciplineValue);
         if (!degreeTypeValue || !disciplineValue) {
             return Promise.resolve(false);
         }

package/package.json

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