@studyportals/fawkes 7.2.1-0 → 7.2.2-0

package/dist/src/enums/FilterCombinations.d.ts

@@ -22,6 +22,10 @@ export declare enum FilterCombinations {
     DISCIPLINE_TUITION_FEE_ATTENDANCE = "disciplineTuitionFeeAttendance",
     DISCIPLINE_COUNTRY_EDUCATIONAL_FORM = "disciplineCountryEducationalForm",
     DISCIPLINE_COUNTRY_DEGREE = "disciplineCountryDegree",
+    DEGREE_COUNTRY_DISCIPLINE = "degreeCountryDiscipline",
+    DEGREE_ATTENDANCE_DISCIPLINE = "degreeAttendanceDiscipline",
+    DEGREE_COUNTRY_TUITION_FEE = "degreeCountryTuitionFee",
+    DEGREE_COUNTRY_ATTENDANCE = "degreeCountryAttendance",
     DISCIPLINE = "discipline",
     UNFILTERED = "unfiltered",
     UNIVERSITY_COUNTRY = "universityCountry",

package/dist/src/enums/FilterCombinations.js

@@ -23,6 +23,10 @@ export var FilterCombinations;
     FilterCombinations["DISCIPLINE_TUITION_FEE_ATTENDANCE"] = "disciplineTuitionFeeAttendance";
     FilterCombinations["DISCIPLINE_COUNTRY_EDUCATIONAL_FORM"] = "disciplineCountryEducationalForm";
     FilterCombinations["DISCIPLINE_COUNTRY_DEGREE"] = "disciplineCountryDegree";
+    FilterCombinations["DEGREE_COUNTRY_DISCIPLINE"] = "degreeCountryDiscipline";
+    FilterCombinations["DEGREE_ATTENDANCE_DISCIPLINE"] = "degreeAttendanceDiscipline";
+    FilterCombinations["DEGREE_COUNTRY_TUITION_FEE"] = "degreeCountryTuitionFee";
+    FilterCombinations["DEGREE_COUNTRY_ATTENDANCE"] = "degreeCountryAttendance";
     FilterCombinations["DISCIPLINE"] = "discipline";
     FilterCombinations["UNFILTERED"] = "unfiltered";
     FilterCombinations["UNIVERSITY_COUNTRY"] = "universityCountry";

package/dist/src/programmes/SearchIndexabilityManager.js

@@ -1,4 +1,4 @@
-import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, CountryAttendanceDegree, CountryDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, Discipline, DisciplineArea, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryDegree, DisciplineCountryEducationalForm, DisciplineDegree, 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, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, SpecialProgrammes, TuitionFee, Unfiltered } from './policies';
 import { DependencyTypes } from '../enums/DependencyTypes';
 export class SearchIndexabilityManager {
     policies;
@@ -13,26 +13,24 @@ export class SearchIndexabilityManager {
         this.policies = [
             new Area(dependencies),
             new Attendance(dependencies),
-            new AttendanceDegree(dependencies),
             new Continent(dependencies),
             new ContinentTuitionFee(dependencies),
             new Country(dependencies),
             new CountryAttendance(dependencies),
-            new CountryAttendanceDegree(dependencies),
-            new CountryDegree(dependencies),
             new CountryDuration(dependencies),
-            new CountryDurationDegree(dependencies),
             new CountryEducationalForm(dependencies),
             new CountryFormat(dependencies),
             new CountryTuitionFee(dependencies),
+            new DegreeAttendanceDiscipline(dependencies),
+            new DegreeCountryAttendance(dependencies),
+            new DegreeCountryDiscipline(dependencies),
+            new DegreeCountryTuitionFee(dependencies),
             new Discipline(dependencies),
             new DisciplineArea(dependencies),
             new DisciplineAttendance(dependencies),
             new DisciplineContinent(dependencies),
             new DisciplineCountry(dependencies),
-            new DisciplineCountryDegree(dependencies),
             new DisciplineCountryEducationalForm(dependencies),
-            new DisciplineDegree(dependencies),
             new DisciplineDuration(dependencies),
             new DisciplineEducationalForm(dependencies),
             new DisciplineFormat(dependencies),

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

@@ -33,7 +33,6 @@ export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const paths = [];
-        // Get degree fragments
         const mba = degreeFragments.find(d => d.id === 'master-of-business-administration');
         const llm = degreeFragments.find(d => d.id === 'master-of-laws');
         const mphil = degreeFragments.find(d => d.id === 'master-of-philosophy');
@@ -41,11 +40,9 @@ export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
         if (!onlineAttendance) {
             return paths;
         }
-        // Allowed countries for specific degrees
-        const llmAllowedCountryIds = ['82', '30', '32', '108']; // USA, UK, Canada, India
-        const mphilAllowedCountryIds = ['82', '30', '108']; // USA, UK, India
+        const llmAllowedCountryIds = ['82', '30', '32', '108'];
+        const mphilAllowedCountryIds = ['82', '30', '108'];
         for (const pageNumber of this.indexablePageNumbers) {
-            // MBA + online attendance accepts all countries
             if (mba) {
                 for (const country of countryFragments) {
                     const filterKeyValues = new Map([
@@ -59,7 +56,6 @@ export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
                     }
                 }
             }
-            // Master of Laws + online attendance accepts specific countries
             if (llm) {
                 const llmCountries = countryFragments.filter(c => llmAllowedCountryIds.includes(c.id));
                 for (const country of llmCountries) {
@@ -74,7 +70,6 @@ export class DegreeCountryAttendance extends ProgrammesBaseIndexabilityPolicy {
                     }
                 }
             }
-            // Master of Philosophy + online attendance accepts specific countries
             if (mphil) {
                 const mphilCountries = countryFragments.filter(c => mphilAllowedCountryIds.includes(c.id));
                 for (const country of mphilCountries) {

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

@@ -29,13 +29,11 @@ export class DegreeCountryDiscipline extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = [];
-        // Define allowed degrees and their corresponding country IDs
         const degreeCountryMap = {
-            'master-of-science': ['82', '32', '11', '30'], // USA, Canada, Germany, UK
-            'master-of-business-administration': ['82', '30'], // USA, UK
-            'master-of-education': ['202', '32'] // Australia, Canada
+            'master-of-science': ['82', '32', '11', '30'],
+            'master-of-business-administration': ['82', '30'],
+            'master-of-education': ['202', '32']
         };
-        // Education discipline IDs for Master of Education
         const educationDisciplineIds = [
             '289', '290', '360', '291', '292', '333', '8', '349',
             '293', '98', '371', '363', '355', '370', '348', '97',
@@ -47,7 +45,6 @@ export class DegreeCountryDiscipline extends ProgrammesBaseIndexabilityPolicy {
                 if (!degree)
                     continue;
                 const allowedCountries = countryFragments.filter(c => allowedCountryIds.includes(c.id));
-                // Filter disciplines based on degree type
                 let allowedDisciplines = disciplineFragments;
                 if (degreeId === 'master-of-education') {
                     allowedDisciplines = disciplineFragments.filter(d => educationDisciplineIds.includes(d.id));

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

@@ -32,18 +32,14 @@ export class DegreeCountryTuitionFee extends ProgrammesBaseIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const tuitionFeeFragments = TuitionFeePresenter.getInstance().getFragments();
         const paths = [];
-        // Process MBA with affordable tuition fee (all countries)
         const mba = degreeFragments.find(d => d.id === 'master-of-business-administration');
-        // Process Master of Laws with affordable tuition fee (specific countries)
         const llm = degreeFragments.find(d => d.id === 'master-of-laws');
         const affordableTuition = tuitionFeeFragments.find(t => t.id === TuitionFeeFilterOptionValue.ZERO_TO_TWO_THOUSAND_FIVE_HUNDRED);
         if (!affordableTuition) {
             return paths;
         }
-        // Allowed countries for Master of Laws
-        const llmAllowedCountryIds = ['82', '30', '32', '108']; // USA, UK, Canada, India
+        const llmAllowedCountryIds = ['82', '30', '32', '108'];
         for (const pageNumber of this.indexablePageNumbers) {
-            // MBA + affordable tuition accepts all countries
             if (mba) {
                 for (const country of countryFragments) {
                     const filterKeyValues = new Map([
@@ -57,7 +53,6 @@ export class DegreeCountryTuitionFee extends ProgrammesBaseIndexabilityPolicy {
                     }
                 }
             }
-            // Master of Laws + affordable tuition accepts specific countries
             if (llm) {
                 const llmCountries = countryFragments.filter(c => llmAllowedCountryIds.includes(c.id));
                 for (const country of llmCountries) {

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

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

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

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

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

@@ -12,6 +12,10 @@ export * from './CountryDurationDegree';
 export * from './CountryEducationalForm';
 export * from './CountryFormat';
 export * from './CountryTuitionFee';
+export * from './DegreeAttendanceDiscipline';
+export * from './DegreeCountryAttendance';
+export * from './DegreeCountryDiscipline';
+export * from './DegreeCountryTuitionFee';
 export * from './Discipline';
 export * from './DisciplineArea';
 export * from './DisciplineAttendance';

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

@@ -12,6 +12,10 @@ export * from './CountryDurationDegree';
 export * from './CountryEducationalForm';
 export * from './CountryFormat';
 export * from './CountryTuitionFee';
+export * from './DegreeAttendanceDiscipline';
+export * from './DegreeCountryAttendance';
+export * from './DegreeCountryDiscipline';
+export * from './DegreeCountryTuitionFee';
 export * from './Discipline';
 export * from './DisciplineArea';
 export * from './DisciplineAttendance';

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

@@ -1,7 +1,6 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeAttendanceDisciplineRule extends BaseProgrammeRule {
-    // Degrees with online attendance that accept all disciplines
     allowedDegrees = ['master-of-arts', 'master-of-science', 'master-of-business-administration'];
     attendanceValue = 'online';
     getName() {
@@ -15,15 +14,12 @@ export class DegreeAttendanceDisciplineRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const attendanceValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DELIVERY_METHOD, filterState);
         const disciplineValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
-        // This rule only applies to allowed degrees + online
         if (!degreeTypeValue || !attendanceValue || !this.allowedDegrees.includes(degreeTypeValue) || attendanceValue !== this.attendanceValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other combinations
+            return Promise.resolve(true);
         }
-        // Must have a discipline selected
         if (!disciplineValue) {
             return Promise.resolve(false);
         }
-        // Allowed degrees + online accept all disciplines
         return Promise.resolve(true);
     }
     forSitemapGenerator(filterKeyValues) {
@@ -35,11 +31,9 @@ export class DegreeAttendanceDisciplineRule extends BaseProgrammeRule {
         }
         const degreeTypeValue = degreeTypeValues[0];
         const attendanceValue = attendanceValues[0];
-        // This rule only applies to allowed degrees + online
         if (!degreeTypeValue || !attendanceValue || !this.allowedDegrees.includes(degreeTypeValue) || attendanceValue !== this.attendanceValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other combinations
+            return Promise.resolve(true);
         }
-        // Allowed degrees + online accept all disciplines
         return Promise.resolve(true);
     }
 }

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

@@ -1,13 +1,11 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeAttendanceDisciplineSpecificRule extends BaseProgrammeRule {
-    // Only specific degree types are allowed for this policy
     allowedDegrees = [
         'master-of-science',
         'master-of-arts',
         'master-of-business-administration'
     ];
-    // Only online attendance is allowed
     allowedAttendance = 'online';
     getName() {
         return 'DegreeAttendanceDisciplineSpecificRule';
@@ -22,7 +20,6 @@ export class DegreeAttendanceDisciplineSpecificRule extends BaseProgrammeRule {
         if (!degreeTypeValue || !attendanceValue) {
             return Promise.resolve(false);
         }
-        // Only allow specific degrees with online attendance
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue) &&
             attendanceValue === this.allowedAttendance);
     }
@@ -34,7 +31,6 @@ export class DegreeAttendanceDisciplineSpecificRule extends BaseProgrammeRule {
         }
         const degreeTypeValue = degreeTypeValues[0];
         const attendanceValue = attendanceValues[0];
-        // Only allow specific degrees with online attendance
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue) &&
             attendanceValue === this.allowedAttendance);
     }

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

@@ -1,7 +1,6 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
-    // Only specific degree types are allowed for this policy
     allowedDegrees = [
         'master-of-business-administration',
         'master-of-laws',
@@ -19,7 +18,6 @@ export class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
         if (!degreeTypeValue) {
             return Promise.resolve(false);
         }
-        // Only allow specific degrees
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue));
     }
     forSitemapGenerator(filterKeyValues) {
@@ -28,7 +26,6 @@ export class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
             return Promise.resolve(false);
         }
         const degreeTypeValue = degreeTypeValues[0];
-        // Only allow specific degrees
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue));
     }
 }

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

@@ -2,9 +2,9 @@ import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountrySpecificRule extends BaseProgrammeRule {
     validCombinations = {
-        'master-of-science': ['82', '32', '11', '30'], // USA, Canada, Germany, UK
-        'master-of-business-administration': ['82', '30'], // USA, UK
-        'master-of-education': ['202', '32'] // Australia, Canada
+        'master-of-science': ['82', '32', '11', '30'],
+        'master-of-business-administration': ['82', '30'],
+        'master-of-education': ['202', '32']
     };
     getName() {
         return 'DegreeCountrySpecificRule';

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

@@ -2,7 +2,6 @@ import { FilterKey } from '@studyportals/search-filters';
 import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryTuitionFeeRule extends BaseProgrammeRule {
-    // MBA accepts all countries with affordable tuition fee
     degreeValue = 'master-of-business-administration';
     tuitionFeeValue = TuitionFeeFilterOptionValue.ZERO_TO_TWO_THOUSAND_FIVE_HUNDRED;
     getName() {
@@ -16,14 +15,12 @@ export class DegreeCountryTuitionFeeRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
         const tuitionFeeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.TUITION_FEE, filterState);
-        // This rule only applies to MBA
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
         if (!countryValue || !tuitionFeeValue) {
             return Promise.resolve(false);
         }
-        // MBA must have affordable tuition, reject all other tuition levels
         return Promise.resolve(tuitionFeeValue === this.tuitionFeeValue);
     }
     forSitemapGenerator(filterKeyValues) {
@@ -35,11 +32,9 @@ export class DegreeCountryTuitionFeeRule extends BaseProgrammeRule {
         }
         const degreeTypeValue = degreeTypeValues[0];
         const tuitionFeeValue = tuitionFeeValues[0];
-        // This rule only applies to MBA
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
-        // MBA must have affordable tuition, reject all other tuition levels
         return Promise.resolve(tuitionFeeValue === this.tuitionFeeValue);
     }
 }

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

@@ -1,7 +1,6 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryTuitionFeeSpecificRule extends BaseProgrammeRule {
-    // Only specific degree types are allowed for this policy
     allowedDegrees = [
         'master-of-business-administration',
         'master-of-laws'
@@ -18,7 +17,6 @@ export class DegreeCountryTuitionFeeSpecificRule extends BaseProgrammeRule {
         if (!degreeTypeValue) {
             return Promise.resolve(false);
         }
-        // Only allow specific degrees
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue));
     }
     forSitemapGenerator(filterKeyValues) {
@@ -27,7 +25,6 @@ export class DegreeCountryTuitionFeeSpecificRule extends BaseProgrammeRule {
             return Promise.resolve(false);
         }
         const degreeTypeValue = degreeTypeValues[0];
-        // Only allow specific degrees
         return Promise.resolve(this.allowedDegrees.includes(degreeTypeValue));
     }
 }

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

@@ -1,15 +1,12 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeDisciplineRule extends BaseProgrammeRule {
-    // Degrees that accept all disciplines
     degreesAcceptingAllDisciplines = [
         'master-of-arts',
         'master-of-science',
         'master-of-business-administration'
     ];
-    // Master of Laws accepts only law-related disciplines
     masterOfLawsDegree = 'master-of-laws';
-    // Law discipline IDs (including law and law subdisciplines)
     lawDisciplineIds = [
         '6', // Law (main discipline)
         '219', // Business Law
@@ -23,17 +20,13 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         '49', // Patent & Intellectual Property Law
         '115' // Public Law
     ];
-    // Master of Philosophy accepts only specific disciplines
     masterOfPhilosophyDegree = 'master-of-philosophy';
-    // Master of Philosophy discipline IDs
     masterOfPhilosophyDisciplineIds = [
         '118', '23', '335', '71', '281', '4', '8', '293',
         '272', '330', '87', '111', '6', '332', '40', '308',
         '224', '113', '84', '38', '79', '278', '80'
     ];
-    // Master of Education accepts only education & training disciplines
     masterOfEducationDegree = 'master-of-education';
-    // Education & Training discipline IDs
     educationDisciplineIds = [
         '289', // Education & Training (main discipline)
         '290', // Adult Education
@@ -56,9 +49,7 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         '295', // Teaching
         '358' // Teaching English as a Foreign Language
     ];
-    // Master of Engineering accepts only engineering & technology disciplines
     masterOfEngineeringDegree = 'master-of-engineering';
-    // Engineering & Technology discipline IDs
     engineeringDisciplineIds = [
         '7', // Engineering & Technology (main discipline)
         '24', // Computer Science & IT
@@ -87,9 +78,7 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         '397', // Production and Manufacturing Engineering
         '399' // Structural Engineering
     ];
-    // Postgraduate Diploma accepts only specific disciplines
     postgraduateDiplomaDegree = 'postgraduate-diploma';
-    // Postgraduate Diploma discipline IDs
     postgraduateDiplomaDisciplineIds = [
         '362', '241', '108', '133', '373', '356', '282', '311', '113', '79'
     ];
@@ -106,31 +95,24 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         if (!degreeTypeValue || !disciplineValue) {
             return Promise.resolve(false);
         }
-        // Handle Master of Laws - only accepts law disciplines
         if (degreeTypeValue === this.masterOfLawsDegree) {
             return Promise.resolve(this.lawDisciplineIds.includes(disciplineValue));
         }
-        // Handle Master of Philosophy - only accepts specific disciplines
         if (degreeTypeValue === this.masterOfPhilosophyDegree) {
             return Promise.resolve(this.masterOfPhilosophyDisciplineIds.includes(disciplineValue));
         }
-        // Handle Master of Education - only accepts education & training disciplines
         if (degreeTypeValue === this.masterOfEducationDegree) {
             return Promise.resolve(this.educationDisciplineIds.includes(disciplineValue));
         }
-        // Handle Master of Engineering - only accepts engineering & technology disciplines
         if (degreeTypeValue === this.masterOfEngineeringDegree) {
             return Promise.resolve(this.engineeringDisciplineIds.includes(disciplineValue));
         }
-        // Handle Postgraduate Diploma - only accepts specific disciplines
         if (degreeTypeValue === this.postgraduateDiplomaDegree) {
             return Promise.resolve(this.postgraduateDiplomaDisciplineIds.includes(disciplineValue));
         }
-        // Handle degrees that accept all disciplines
         if (this.degreesAcceptingAllDisciplines.includes(degreeTypeValue)) {
             return Promise.resolve(true);
         }
-        // Rule doesn't apply to other degrees
         return Promise.resolve(true);
     }
     forSitemapGenerator(filterKeyValues) {
@@ -141,31 +123,24 @@ export class DegreeDisciplineRule extends BaseProgrammeRule {
         }
         const degreeTypeValue = degreeTypeValues[0];
         const disciplineValue = disciplineValues[0];
-        // Handle Master of Laws - only accepts law disciplines
         if (degreeTypeValue === this.masterOfLawsDegree) {
             return Promise.resolve(this.lawDisciplineIds.includes(disciplineValue));
         }
-        // Handle Master of Philosophy - only accepts specific disciplines
         if (degreeTypeValue === this.masterOfPhilosophyDegree) {
             return Promise.resolve(this.masterOfPhilosophyDisciplineIds.includes(disciplineValue));
         }
-        // Handle Master of Education - only accepts education & training disciplines
         if (degreeTypeValue === this.masterOfEducationDegree) {
             return Promise.resolve(this.educationDisciplineIds.includes(disciplineValue));
         }
-        // Handle Master of Engineering - only accepts engineering & technology disciplines
         if (degreeTypeValue === this.masterOfEngineeringDegree) {
             return Promise.resolve(this.engineeringDisciplineIds.includes(disciplineValue));
         }
-        // Handle Postgraduate Diploma - only accepts specific disciplines
         if (degreeTypeValue === this.postgraduateDiplomaDegree) {
             return Promise.resolve(this.postgraduateDiplomaDisciplineIds.includes(disciplineValue));
         }
-        // Handle degrees that accept all disciplines
         if (this.degreesAcceptingAllDisciplines.includes(degreeTypeValue)) {
             return Promise.resolve(true);
         }
-        // Rule doesn't apply to other degrees
         return Promise.resolve(true);
     }
 }

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

@@ -1,7 +1,6 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class MBACountryAttendanceRule extends BaseProgrammeRule {
-    // MBA with online attendance accepts all countries
     degreeValue = 'master-of-business-administration';
     attendanceValue = 'online';
     getName() {
@@ -15,14 +14,12 @@ export class MBACountryAttendanceRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
         const attendanceValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DELIVERY_METHOD, filterState);
-        // This rule only applies to MBA
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
         if (!countryValue || !attendanceValue) {
             return Promise.resolve(false);
         }
-        // MBA must have online attendance, reject all other attendance types
         return Promise.resolve(attendanceValue === this.attendanceValue);
     }
     forSitemapGenerator(filterKeyValues) {
@@ -34,11 +31,9 @@ export class MBACountryAttendanceRule extends BaseProgrammeRule {
         }
         const degreeTypeValue = degreeTypeValues[0];
         const attendanceValue = attendanceValues[0];
-        // This rule only applies to MBA
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
-        // MBA must have online attendance, reject all other attendance types
         return Promise.resolve(attendanceValue === this.attendanceValue);
     }
 }

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

@@ -1,7 +1,6 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class MasterOfEducationCountryDisciplineRule extends BaseProgrammeRule {
-    // Education & Training discipline IDs
     educationDisciplineIds = [
         '289', // Education & Training (main discipline)
         '290', // Adult Education
@@ -37,18 +36,15 @@ export class MasterOfEducationCountryDisciplineRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
         const disciplineValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
-        // This rule only applies to Master of Education
         if (degreeTypeValue !== 'master-of-education') {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
         if (!countryValue || !disciplineValue) {
             return Promise.resolve(false);
         }
-        // Must be in allowed countries (Australia or Canada)
         if (!this.allowedCountryIds.includes(countryValue)) {
             return Promise.resolve(false);
         }
-        // Must be an education discipline
         return Promise.resolve(this.educationDisciplineIds.includes(disciplineValue));
     }
     forSitemapGenerator(filterKeyValues) {
@@ -61,15 +57,12 @@ export class MasterOfEducationCountryDisciplineRule extends BaseProgrammeRule {
         const degreeTypeValue = degreeTypeValues[0];
         const countryValue = countryValues[0];
         const disciplineValue = disciplineValues[0];
-        // This rule only applies to Master of Education
         if (degreeTypeValue !== 'master-of-education') {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
-        // Must be in allowed countries (Australia or Canada)
         if (!this.allowedCountryIds.includes(countryValue)) {
             return Promise.resolve(false);
         }
-        // Must be an education discipline
         return Promise.resolve(this.educationDisciplineIds.includes(disciplineValue));
     }
 }

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

@@ -1,10 +1,9 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class MasterOfLawsCountryAttendanceRule extends BaseProgrammeRule {
-    // Master of Laws with online attendance and specific countries
     degreeValue = 'master-of-laws';
     attendanceValue = 'online';
-    allowedCountryIds = ['82', '30', '32', '108']; // USA, UK, Canada, India
+    allowedCountryIds = ['82', '30', '32', '108'];
     getName() {
         return 'MasterOfLawsCountryAttendanceRule';
     }
@@ -16,14 +15,12 @@ export class MasterOfLawsCountryAttendanceRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
         const attendanceValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DELIVERY_METHOD, filterState);
-        // This rule only applies to Master of Laws
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
         if (!countryValue || !attendanceValue) {
             return Promise.resolve(false);
         }
-        // Must be in allowed countries and have online attendance
         return Promise.resolve(this.allowedCountryIds.includes(countryValue) &&
             attendanceValue === this.attendanceValue);
     }
@@ -37,11 +34,9 @@ export class MasterOfLawsCountryAttendanceRule extends BaseProgrammeRule {
         const degreeTypeValue = degreeTypeValues[0];
         const countryValue = countryValues[0];
         const attendanceValue = attendanceValues[0];
-        // This rule only applies to Master of Laws
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
-        // Must be in allowed countries and have online attendance
         return Promise.resolve(this.allowedCountryIds.includes(countryValue) &&
             attendanceValue === this.attendanceValue);
     }

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

@@ -2,7 +2,6 @@ import { FilterKey } from '@studyportals/search-filters';
 import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class MasterOfLawsCountryTuitionFeeRule extends BaseProgrammeRule {
-    // Master of Laws with specific countries and affordable tuition fee
     degreeValue = 'master-of-laws';
     allowedCountryIds = ['82', '30', '32', '108']; // USA, UK, Canada, India
     tuitionFeeValue = TuitionFeeFilterOptionValue.ZERO_TO_TWO_THOUSAND_FIVE_HUNDRED;
@@ -17,14 +16,12 @@ export class MasterOfLawsCountryTuitionFeeRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
         const tuitionFeeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.TUITION_FEE, filterState);
-        // This rule only applies to Master of Laws
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
         if (!countryValue || !tuitionFeeValue) {
             return Promise.resolve(false);
         }
-        // Must be in allowed countries and have affordable tuition
         return Promise.resolve(this.allowedCountryIds.includes(countryValue) &&
             tuitionFeeValue === this.tuitionFeeValue);
     }

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

@@ -1,7 +1,6 @@
 import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class MasterOfPhilosophyCountryAttendanceRule extends BaseProgrammeRule {
-    // Master of Philosophy with online attendance and specific countries
     degreeValue = 'master-of-philosophy';
     attendanceValue = 'online';
     allowedCountryIds = ['82', '30', '108']; // USA, UK, India
@@ -16,14 +15,12 @@ export class MasterOfPhilosophyCountryAttendanceRule extends BaseProgrammeRule {
         const degreeTypeValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         const countryValue = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
         const attendanceValue = seoInfoBase.getFilterOptionValueBy(FilterKey.DELIVERY_METHOD, filterState);
-        // This rule only applies to Master of Philosophy
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
         if (!countryValue || !attendanceValue) {
             return Promise.resolve(false);
         }
-        // Must be in allowed countries and have online attendance
         return Promise.resolve(this.allowedCountryIds.includes(countryValue) &&
             attendanceValue === this.attendanceValue);
     }
@@ -37,11 +34,9 @@ export class MasterOfPhilosophyCountryAttendanceRule extends BaseProgrammeRule {
         const degreeTypeValue = degreeTypeValues[0];
         const countryValue = countryValues[0];
         const attendanceValue = attendanceValues[0];
-        // This rule only applies to Master of Philosophy
         if (degreeTypeValue !== this.degreeValue) {
-            return Promise.resolve(true); // Rule doesn't apply to other degrees
+            return Promise.resolve(true);
         }
-        // Must be in allowed countries and have online attendance
         return Promise.resolve(this.allowedCountryIds.includes(countryValue) &&
             attendanceValue === this.attendanceValue);
     }

package/package.json

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