@studyportals/fawkes 7.2.2-11 → 7.2.2-13

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

@@ -28,12 +28,11 @@ export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = [];
-        // Process Master of Science, Master of Arts, and Master of Business Administration degrees with online attendance
         const allowedDegreeIds = [
             DegreeTypeFilterOptionValue.MA,
             DegreeTypeFilterOptionValue.MSC,
             DegreeTypeFilterOptionValue.MBA
-        ].map(id => id.valueOf());
+        ];
         const onlineAttendance = attendanceFragments.find(a => a.id === 'online');
         if (!onlineAttendance) {
             return paths;

package/dist/src/programmes/policies/DisciplineDegree.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 { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { DegreeDisciplineRule } from '../rules/DegreeDisciplineRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
@@ -10,7 +9,7 @@ export declare class DisciplineDegree extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | IndexableDegreeRule | DegreeDisciplineRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | DegreeDisciplineRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -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 { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { DegreeDisciplineRule } from '../rules/DegreeDisciplineRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
@@ -15,7 +14,6 @@ export class DisciplineDegree extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new OnlyFiltersSelectedRule([FilterKey.DISCIPLINES, FilterKey.DEGREE_TYPE]),
-        new IndexableDegreeRule(),
         new DegreeDisciplineRule()
     ];
     constructor(dependencies) {

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

@@ -6,7 +6,7 @@ export class DegreeAttendanceDisciplineSpecificRule extends BaseProgrammeRule {
         DegreeTypeFilterOptionValue.MSC,
         DegreeTypeFilterOptionValue.MA,
         DegreeTypeFilterOptionValue.MBA
-    ].map(id => id.valueOf());
+    ];
     allowedAttendance = 'online';
     getName() {
         return 'DegreeAttendanceDisciplineSpecificRule';
@@ -18,7 +18,8 @@ export class DegreeAttendanceDisciplineSpecificRule extends BaseProgrammeRule {
         const { seoInfoBase, filterState } = dependencies;
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const attendanceValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DELIVERY_METHOD, filterState);
-        if (!degreeTypeValue || !attendanceValue) {
+        const disciplineValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
+        if (!degreeTypeValue || !attendanceValue || !disciplineValue) {
             return Promise.resolve(false);
         }
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue) &&

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

@@ -3,15 +3,11 @@ import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export declare class DegreeDisciplineRule extends BaseProgrammeRule {
     private readonly degreesAcceptingAllDisciplines;
-    private readonly masterOfLawsDegree;
+    private readonly allIndexableDegrees;
     private readonly lawDisciplineIds;
-    private readonly masterOfPhilosophyDegree;
     private readonly masterOfPhilosophyDisciplineIds;
-    private readonly masterOfEducationDegree;
     private readonly educationDisciplineIds;
-    private readonly masterOfEngineeringDegree;
     private readonly engineeringDisciplineIds;
-    private readonly postgraduateDiplomaDegree;
     private readonly postgraduateDiplomaDisciplineIds;
     getName(): string;
     getDescription(): string;

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

@@ -6,8 +6,17 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         DegreeTypeFilterOptionValue.MA,
         DegreeTypeFilterOptionValue.MSC,
         DegreeTypeFilterOptionValue.MBA
-    ].map(id => id.valueOf());
-    masterOfLawsDegree = DegreeTypeFilterOptionValue.LLM.valueOf();
+    ];
+    allIndexableDegrees = [
+        DegreeTypeFilterOptionValue.MA,
+        DegreeTypeFilterOptionValue.MSC,
+        DegreeTypeFilterOptionValue.MBA,
+        DegreeTypeFilterOptionValue.LLM,
+        DegreeTypeFilterOptionValue.MPHIL,
+        DegreeTypeFilterOptionValue.MED,
+        DegreeTypeFilterOptionValue.MENG,
+        DegreeTypeFilterOptionValue.POSTGRADIP
+    ];
     lawDisciplineIds = [
         '6', // Law (main discipline)
         '219', // Business Law
@@ -19,15 +28,21 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         '220', // Legal Studies
         '221', // Master of Laws (LLM)
         '49', // Patent & Intellectual Property Law
-        '115' // Public Law
+        '115', // Public Law
+        '247',
+        '278',
+        '87',
+        '323',
+        '108',
+        '362',
+        '241',
+        '127'
     ];
-    masterOfPhilosophyDegree = DegreeTypeFilterOptionValue.MPHIL.valueOf();
     masterOfPhilosophyDisciplineIds = [
         '118', '23', '335', '71', '281', '4', '8', '293',
         '272', '330', '87', '111', '6', '332', '40', '308',
         '224', '113', '84', '38', '79', '278', '80'
     ];
-    masterOfEducationDegree = DegreeTypeFilterOptionValue.MED.valueOf();
     educationDisciplineIds = [
         '289', // Education & Training (main discipline)
         '290', // Adult Education
@@ -50,7 +65,6 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         '295', // Teaching
         '358' // Teaching English as a Foreign Language
     ];
-    masterOfEngineeringDegree = DegreeTypeFilterOptionValue.MENG.valueOf();
     engineeringDisciplineIds = [
         '7', // Engineering & Technology (main discipline)
         '24', // Computer Science & IT
@@ -79,7 +93,6 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         '397', // Production and Manufacturing Engineering
         '399' // Structural Engineering
     ];
-    postgraduateDiplomaDegree = DegreeTypeFilterOptionValue.POSTGRADIP.valueOf();
     postgraduateDiplomaDisciplineIds = [
         '362', '241', '108', '133', '373', '356', '282', '311', '113', '79'
     ];
@@ -96,19 +109,22 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         if (!degreeTypeValue || !disciplineValue) {
             return Promise.resolve(false);
         }
-        if (degreeTypeValue === this.masterOfLawsDegree) {
+        if (!this.allIndexableDegrees.includes(degreeTypeValue)) {
+            return Promise.resolve(false);
+        }
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.LLM) {
             return Promise.resolve(this.lawDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.masterOfPhilosophyDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MPHIL) {
             return Promise.resolve(this.masterOfPhilosophyDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.masterOfEducationDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MED) {
             return Promise.resolve(this.educationDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.masterOfEngineeringDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MENG) {
             return Promise.resolve(this.engineeringDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.postgraduateDiplomaDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.POSTGRADIP) {
             return Promise.resolve(this.postgraduateDiplomaDisciplineIds.includes(disciplineValue));
         }
         if (this.degreesAcceptingAllDisciplines.includes(degreeTypeValue)) {
@@ -124,19 +140,25 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         }
         const degreeTypeValue = degreeTypeValues[0];
         const disciplineValue = disciplineValues[0];
-        if (degreeTypeValue === this.masterOfLawsDegree) {
+        if (!degreeTypeValue || !disciplineValue) {
+            return Promise.resolve(false);
+        }
+        if (!this.allIndexableDegrees.includes(degreeTypeValue)) {
+            return Promise.resolve(false);
+        }
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.LLM) {
             return Promise.resolve(this.lawDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.masterOfPhilosophyDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MPHIL) {
             return Promise.resolve(this.masterOfPhilosophyDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.masterOfEducationDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MED) {
             return Promise.resolve(this.educationDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.masterOfEngineeringDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.MENG) {
             return Promise.resolve(this.engineeringDisciplineIds.includes(disciplineValue));
         }
-        if (degreeTypeValue === this.postgraduateDiplomaDegree) {
+        if (degreeTypeValue === DegreeTypeFilterOptionValue.POSTGRADIP) {
             return Promise.resolve(this.postgraduateDiplomaDisciplineIds.includes(disciplineValue));
         }
         if (this.degreesAcceptingAllDisciplines.includes(degreeTypeValue)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "7.2.2-11",
+	"version": "7.2.2-13",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"
@@ -18,7 +18,7 @@
 		"publish-minor": "npm run prepare-deployment && npm version minor && npm publish",
 		"prepare": "husky install",
 		"test": "vitest run --coverage",
-		"test:dev": "vitest --coverage tests/programmes",
+		"test:dev": "vitest --coverage tests/programmes/policies/DegreeAttendanceDiscipline.test.mts",
 		"lint": "eslint . --ext .ts",
 		"lint:fix": "eslint . --ext .ts --fix",
 		"prettier:fix": "npx prettier --use-tabs --ignore-path .gitignore --write ."