@studyportals/fawkes 7.2.1 → 7.2.2-4

package/README.md

@@ -1,176 +1,176 @@
-# fawkes
-
-This project is used to centralize indexability logic for our Search
-microservices and Sitemap Generator. The main purpose is to completely remove
-discrepancies between pages indexed by Search and page URLs stored in Sitemap.
-
-Link to documentation: https://studyportals.atlassian.net/wiki/x/BwAdvw
-
-## Base structure
-
-- organisations-seo (used by Organisation Search)
-- scholarships-seo (used by Scholarship Search)
-- sitemap-generator-seo (used by Sitemap Generator)
-- src
-  - common
-  - organisations
-  - scholarships
-  - sitemap-generator
-
-# Automatic Documentation System
-
-## Overview
-
-This system automatically generates and maintains documentation for Fawkes
-indexing rules across multiple projects. It creates a hierarchical structure of
-Confluence pages that document all indexing policies and rules, ensuring that
-the documentation is always up-to-date with the actual codebase.
-
-Link to documentation:
-[Fawkes Indexing Rules Documentation](https://studyportals.atlassian.net/wiki/spaces/T/pages/3494969354/Fawkes+Indexing+Rules+Documentation)
-
-## Features
-
-- **Dynamic Documentation**: Automatically extracts indexing rules and policies
-  directly from the codebase
-- **Multi-Page Structure**: Creates a main index page with separate pages for
-  each project
-- **Hierarchical Organization**: Structures content as Projects → Policies →
-  Rules
-- **Automatic Page Creation**: Intelligently creates or updates pages as needed
-- **Cross-Page Navigation**: Provides intuitive navigation between all pages
-
-## Architecture
-
-The system follows SOLID design principles to ensure maintainability and
-extensibility:
-
-- **Single Responsibility**: Each class has one specific responsibility
-- **Open/Closed**: Easily extendable without modifying existing code
-- **Liskov Substitution**: Interchangeable components through well-defined
-  interfaces
-- **Interface Segregation**: Clean, focused interfaces
-- **Dependency Inversion**: High-level modules depend on abstractions
-
-### Key Components
-
-1. **Content Builder**: Extracts project, policy, and rule data from the Fawkes
-   system
-2. **Policy Fetchers**: Project-specific components that fetch and format policy
-   data
-3. **Document Builder**: Generates structured HTML content for Confluence pages
-4. **Confluence Updater**: Handles creation and updating of Confluence pages
-5. **Token Retriever**: Securely retrieves API token for Confluence access
-
-## How It Works
-
-1. The system starts by collecting all project data using the `ContentBuilder`
-2. For each project, it extracts policies and rules using project-specific
-   fetchers
-3. The `DocumentBuilder` generates the content for the main index page and each
-   project page
-4. The `ConfluenceUpdater` creates or updates pages in Confluence as needed
-5. Each project page links back to the main index, and the main index links to
-   all project pages
-
-## Setup and Configuration
-
-### Environment Variables
-
-The system requires the following environment variables:
-
-```
-CONFLUENCE_EMAIL=your-email@example.com
-CONFLUENCE_API_TOKEN=your-api-token
-CONFLUENCE_BASE_URL=https://your-instance.atlassian.net
-CONFLUENCE_SPACE_KEY=YOUR_SPACE_KEY
-CONFLUENCE_MAIN_PAGE_TITLE=Fawkes Indexing Rules Documentation
-```
-
-> **Important Note on Credentials**: Currently, the system uses personal
-> credentials (email and API token) for Confluence access. This is a temporary
-> solution and should be replaced with a team or service account in the future
-> to avoid dependency on a specific individual's account.
-
-### Deployment and Triggering
-
-The system runs as an AWS Lambda function and is automatically triggered as part
-of the CI/CD pipeline. This ensures documentation is always updated whenever new
-code is deployed:
-
-```yaml
-# buildspec.yml (excerpt)
-post_build:
-  commands:
-    - |
-      if [ -z "$PR_ID" ]; then
-        LAMBDA_NAME="FawkesConfluenceUpdater-$STAGE"
-        echo "Invoking Lambda function $LAMBDA_NAME"
-        echo '{"source":"cicd-pipeline","timestamp":"'$(date -u +"%Y-%m-%dT%H:%M:%SZ")'"}' > payload.json
-        aws lambda invoke --function-name $LAMBDA_NAME --invocation-type Event --payload fileb://payload.json response.json || echo "Lambda invocation failed, but continuing"
-      fi
-```
-
-**Trigger Flow:**
-
-1. When code is pushed to the `main` branch, the CI/CD pipeline is triggered
-2. After successful deployment of a new Fawkes version, the post-build phase
-   executes
-3. The Lambda function is invoked with a simple payload containing the source
-   and timestamp
-4. The Lambda function authenticates with Confluence and executes the
-   documentation generation process
-5. This only happens for production deployments (not PR builds)
-
-This automated approach ensures documentation stays in sync with the actual
-codebase without manual intervention.
-
-## Scalability and Extension
-
-### Adding New Projects
-
-To add documentation for a new project:
-
-1. Create a new class that implements the `IPolicyFetcher` interface
-2. Implement the `getProjectName()` and `fetchPolicies()` methods
-3. Register the new fetcher in the `ContentBuilder` constructor
-
-Example:
-
-```typescript
-export class NewProjectPolicyFetcher implements IPolicyFetcher {
-  getProjectName(): string {
-    return 'New Project Name';
-  }
-
-  fetchPolicies(): IPolicy[] {
-    // Implement policy fetching logic
-    return [...policies];
-  }
-}
-
-// Then update ContentBuilder:
-constructor(fetchers?: IPolicyFetcher[]) {
-  this.policyFetchers = fetchers || [
-    // Existing fetchers
-    new NewProjectPolicyFetcher()
-  ];
-}
-```
-
-### Customizing Page Content
-
-The `DocumentBuilder` class contains methods for generating page content. To
-customize the format:
-
-1. Modify the `buildMainDocument()` method for changes to the main index page
-2. Modify the `buildProjectDocument()` method for changes to project pages
-3. Modify the `buildPolicySection()` and `buildRulesTable()` methods for changes
-   to policy and rule sections
-
-## Conclusion
-
-This documentation system ensures that Fawkes indexing rules are always
-well-documented and accessible to the team. By automatically generating
-documentation directly from the codebase, it eliminates the risk of
-documentation becoming outdated or inconsistent with the actual implementation.
+# fawkes
+
+This project is used to centralize indexability logic for our Search
+microservices and Sitemap Generator. The main purpose is to completely remove
+discrepancies between pages indexed by Search and page URLs stored in Sitemap.
+
+Link to documentation: https://studyportals.atlassian.net/wiki/x/BwAdvw
+
+## Base structure
+
+- organisations-seo (used by Organisation Search)
+- scholarships-seo (used by Scholarship Search)
+- sitemap-generator-seo (used by Sitemap Generator)
+- src
+  - common
+  - organisations
+  - scholarships
+  - sitemap-generator
+
+# Automatic Documentation System
+
+## Overview
+
+This system automatically generates and maintains documentation for Fawkes
+indexing rules across multiple projects. It creates a hierarchical structure of
+Confluence pages that document all indexing policies and rules, ensuring that
+the documentation is always up-to-date with the actual codebase.
+
+Link to documentation:
+[Fawkes Indexing Rules Documentation](https://studyportals.atlassian.net/wiki/spaces/T/pages/3494969354/Fawkes+Indexing+Rules+Documentation)
+
+## Features
+
+- **Dynamic Documentation**: Automatically extracts indexing rules and policies
+  directly from the codebase
+- **Multi-Page Structure**: Creates a main index page with separate pages for
+  each project
+- **Hierarchical Organization**: Structures content as Projects → Policies →
+  Rules
+- **Automatic Page Creation**: Intelligently creates or updates pages as needed
+- **Cross-Page Navigation**: Provides intuitive navigation between all pages
+
+## Architecture
+
+The system follows SOLID design principles to ensure maintainability and
+extensibility:
+
+- **Single Responsibility**: Each class has one specific responsibility
+- **Open/Closed**: Easily extendable without modifying existing code
+- **Liskov Substitution**: Interchangeable components through well-defined
+  interfaces
+- **Interface Segregation**: Clean, focused interfaces
+- **Dependency Inversion**: High-level modules depend on abstractions
+
+### Key Components
+
+1. **Content Builder**: Extracts project, policy, and rule data from the Fawkes
+   system
+2. **Policy Fetchers**: Project-specific components that fetch and format policy
+   data
+3. **Document Builder**: Generates structured HTML content for Confluence pages
+4. **Confluence Updater**: Handles creation and updating of Confluence pages
+5. **Token Retriever**: Securely retrieves API token for Confluence access
+
+## How It Works
+
+1. The system starts by collecting all project data using the `ContentBuilder`
+2. For each project, it extracts policies and rules using project-specific
+   fetchers
+3. The `DocumentBuilder` generates the content for the main index page and each
+   project page
+4. The `ConfluenceUpdater` creates or updates pages in Confluence as needed
+5. Each project page links back to the main index, and the main index links to
+   all project pages
+
+## Setup and Configuration
+
+### Environment Variables
+
+The system requires the following environment variables:
+
+```
+CONFLUENCE_EMAIL=your-email@example.com
+CONFLUENCE_API_TOKEN=your-api-token
+CONFLUENCE_BASE_URL=https://your-instance.atlassian.net
+CONFLUENCE_SPACE_KEY=YOUR_SPACE_KEY
+CONFLUENCE_MAIN_PAGE_TITLE=Fawkes Indexing Rules Documentation
+```
+
+> **Important Note on Credentials**: Currently, the system uses personal
+> credentials (email and API token) for Confluence access. This is a temporary
+> solution and should be replaced with a team or service account in the future
+> to avoid dependency on a specific individual's account.
+
+### Deployment and Triggering
+
+The system runs as an AWS Lambda function and is automatically triggered as part
+of the CI/CD pipeline. This ensures documentation is always updated whenever new
+code is deployed:
+
+```yaml
+# buildspec.yml (excerpt)
+post_build:
+  commands:
+    - |
+      if [ -z "$PR_ID" ]; then
+        LAMBDA_NAME="FawkesConfluenceUpdater-$STAGE"
+        echo "Invoking Lambda function $LAMBDA_NAME"
+        echo '{"source":"cicd-pipeline","timestamp":"'$(date -u +"%Y-%m-%dT%H:%M:%SZ")'"}' > payload.json
+        aws lambda invoke --function-name $LAMBDA_NAME --invocation-type Event --payload fileb://payload.json response.json || echo "Lambda invocation failed, but continuing"
+      fi
+```
+
+**Trigger Flow:**
+
+1. When code is pushed to the `main` branch, the CI/CD pipeline is triggered
+2. After successful deployment of a new Fawkes version, the post-build phase
+   executes
+3. The Lambda function is invoked with a simple payload containing the source
+   and timestamp
+4. The Lambda function authenticates with Confluence and executes the
+   documentation generation process
+5. This only happens for production deployments (not PR builds)
+
+This automated approach ensures documentation stays in sync with the actual
+codebase without manual intervention.
+
+## Scalability and Extension
+
+### Adding New Projects
+
+To add documentation for a new project:
+
+1. Create a new class that implements the `IPolicyFetcher` interface
+2. Implement the `getProjectName()` and `fetchPolicies()` methods
+3. Register the new fetcher in the `ContentBuilder` constructor
+
+Example:
+
+```typescript
+export class NewProjectPolicyFetcher implements IPolicyFetcher {
+  getProjectName(): string {
+    return 'New Project Name';
+  }
+
+  fetchPolicies(): IPolicy[] {
+    // Implement policy fetching logic
+    return [...policies];
+  }
+}
+
+// Then update ContentBuilder:
+constructor(fetchers?: IPolicyFetcher[]) {
+  this.policyFetchers = fetchers || [
+    // Existing fetchers
+    new NewProjectPolicyFetcher()
+  ];
+}
+```
+
+### Customizing Page Content
+
+The `DocumentBuilder` class contains methods for generating page content. To
+customize the format:
+
+1. Modify the `buildMainDocument()` method for changes to the main index page
+2. Modify the `buildProjectDocument()` method for changes to project pages
+3. Modify the `buildPolicySection()` and `buildRulesTable()` methods for changes
+   to policy and rule sections
+
+## Conclusion
+
+This documentation system ensures that Fawkes indexing rules are always
+well-documented and accessible to the team. By automatically generating
+documentation directly from the codebase, it eliminates the risk of
+documentation becoming outdated or inconsistent with the actual implementation.

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/CountryAttendanceDegree.js

@@ -10,7 +10,7 @@ import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 export class CountryAttendanceDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Attendance Degree Policy';
-    description = `Determines indexing rules for pages filtered by country,
+    description = `Determines indexing rules for pages filtered by country,
 		study format (online, on-campus, etc.), and degree type.`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE];
     rules = [

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

@@ -10,7 +10,7 @@ import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
 export class CountryDurationDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Duration Degree Policy';
-    description = `Determines indexing rules for pages filtered by country,
+    description = `Determines indexing rules for pages filtered by country,
 		duration (1 year, 2 years, etc.), and degree type.`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.DURATION, FilterKey.DEGREE_TYPE];
     rules = [

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

@@ -8,7 +8,7 @@ import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class CountryEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Country Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by both country,
+    description = `Determines indexing rules for pages filtered by both country,
 		and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM];
     rules = [

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/DisciplineCountryDegree.js

@@ -9,7 +9,7 @@ import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 export class DisciplineCountryDegree extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Country Degree Policy';
-    description = `Determines indexing rules for pages filtered by discipline,
+    description = `Determines indexing rules for pages filtered by discipline,
 		country, and degree type.`;
     filterKeys = [FilterKey.DISCIPLINES, FilterKey.COUNTRY, FilterKey.DEGREE_TYPE];
     rules = [

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

@@ -9,7 +9,7 @@ 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 = [

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/DisciplineEducationalForm.js

@@ -8,7 +8,7 @@ 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 = [

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';