@studyportals/fawkes 8.5.3-1 → 8.5.3-2

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

@@ -73,8 +73,6 @@ export declare enum FilterCombinations {
     RANKED_CONTINENT = "rankedContinent",
     RANKED_CONTINENT_ATTENDANCE = "rankedContinentAttendance",
     RANKED_COUNTRY = "rankedCountry",
-    RANKED_COUNTRY_CITY = "rankedCountryCity",
-    RANKED_COUNTRY_AREA_CITY = "rankedCountryAreaCity",
     RANKED_COUNTRY_ATTENDANCE = "rankedCountryAttendance",
     RANKED_DISCIPLINE_COUNTRY = "rankedDisciplineCountry",
     RANKED_DISCIPLINE = "rankedDiscipline",

package/dist/src/enums/FilterCombinations.js

@@ -74,8 +74,6 @@ export var FilterCombinations;
     FilterCombinations["RANKED_CONTINENT"] = "rankedContinent";
     FilterCombinations["RANKED_CONTINENT_ATTENDANCE"] = "rankedContinentAttendance";
     FilterCombinations["RANKED_COUNTRY"] = "rankedCountry";
-    FilterCombinations["RANKED_COUNTRY_CITY"] = "rankedCountryCity";
-    FilterCombinations["RANKED_COUNTRY_AREA_CITY"] = "rankedCountryAreaCity";
     FilterCombinations["RANKED_COUNTRY_ATTENDANCE"] = "rankedCountryAttendance";
     FilterCombinations["RANKED_DISCIPLINE_COUNTRY"] = "rankedDisciplineCountry";
     FilterCombinations["RANKED_DISCIPLINE"] = "rankedDiscipline";

package/dist/src/organisations/SearchIndexabilityManager.js

@@ -1,5 +1,5 @@
 import { DependencyTypes } from '../enums/DependencyTypes';
-import { Area, AreaAttendance, Attendance, Continent, Country, CountryAttendance, Unfiltered, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, CountryCity, CountryAreaCity, RankedCountryCity, RankedCountryAreaCity } from '../organisations/policies';
+import { Area, AreaAttendance, Attendance, Continent, Country, CountryAttendance, Unfiltered, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, CountryCity, CountryAreaCity } from '../organisations/policies';
 export class SearchIndexabilityManager {
     policies;
     constructor(portalType, seoInfoBase, filterState, sortingState, applicationState) {
@@ -31,8 +31,6 @@ export class SearchIndexabilityManager {
             new RankedCountryAttendance(dependencies),
             new RankedCountryDiscipline(dependencies),
             new RankedDiscipline(dependencies),
-            new RankedCountryCity(dependencies),
-            new RankedCountryAreaCity(dependencies),
             new RankedUnfiltered(dependencies)
         ];
     }

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

@@ -18,5 +18,3 @@ export * from './ranked/RankedCountryAttendance';
 export * from './ranked/RankedCountryDiscipline';
 export * from './ranked/RankedDiscipline';
 export * from './ranked/RankedUnfiltered';
-export * from './ranked/RankedCountryCity';
-export * from './ranked/RankedCountryAreaCity';

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

@@ -18,5 +18,3 @@ export * from './ranked/RankedCountryAttendance';
 export * from './ranked/RankedCountryDiscipline';
 export * from './ranked/RankedDiscipline';
 export * from './ranked/RankedUnfiltered';
-export * from './ranked/RankedCountryCity';
-export * from './ranked/RankedCountryAreaCity';

package/dist/src/programmes/ProgrammesBaseIndexabilityPolicy.js

@@ -2,6 +2,7 @@ import { MinimumAmountOfResultsRule } from './rules/MinimumAmountOfResultsRule';
 import { IndexablePageNumberRule } from './rules/IndexablePageNumberRule';
 import { NotDistanceLearningPortalRule } from './rules/NotDistanceLearningPortalRule';
 import { BaseSeoIndexabilityPolicy } from '../common/policies/BaseSeoIndexabilityPolicy';
+import { FilterKey } from '@studyportals/search-filters/server-side';
 export class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
     indexablePageNumbers = [1];
     initateBaseRules() {
@@ -20,6 +21,10 @@ export class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy
         this.rules.push(atLeastSevenResultsRule, notDistanceLearningPortalRule, indexablePageNumberRule);
     }
     async checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber) {
+        const dependencies = this.dependencies;
+        if (!Object.keys(filterKeyValues).some(key => key === FilterKey.EDUCATION_LEVEL)) {
+            filterKeyValues[FilterKey.EDUCATION_LEVEL] = [dependencies.portalType];
+        }
         for (const rule of this.rules) {
             let result;
             if ('forSitemapGeneratorWithPageNumber' in rule) {

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/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/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/rules/IndexableDegreeRule.d.ts

@@ -6,5 +6,5 @@ export declare class IndexableDegreeRule extends BaseProgrammeRule {
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;
     getDescription(): string;
-    private get indexableDegreeTypes();
+    private getIndexableDegreeTypes;
 }

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

@@ -1,53 +1,71 @@
 import { FilterKey } from '@studyportals/search-filters/server-side';
 import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/server-side';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
+import { PortalType } from '@studyportals/domain-client';
 export class IndexableDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies) {
         const { seoInfoBase, filterState } = dependencies;
+        const programmeSearchDependencies = dependencies;
+        const portalType = programmeSearchDependencies.portalType;
         const selectedDegree = seoInfoBase.getFilterOptionValueBy(FilterKey.DEGREE_TYPE, filterState);
         if (!selectedDegree) {
             return Promise.resolve(false);
         }
-        const isIndexable = this.indexableDegreeTypes.includes(selectedDegree);
+        const isIndexable = this.getIndexableDegreeTypes(portalType).includes(selectedDegree);
         return Promise.resolve(isIndexable);
     }
     forSitemapGenerator(filterKeyValues) {
+        const portalType = filterKeyValues.get(FilterKey.EDUCATION_LEVEL)?.[0];
         const [selectedDegree] = filterKeyValues.get(FilterKey.DEGREE_TYPE);
-        if (!selectedDegree) {
+        if (!selectedDegree || !portalType) {
             return Promise.resolve(false);
         }
-        const isIndexable = this.indexableDegreeTypes.includes(selectedDegree);
+        const isIndexable = this.getIndexableDegreeTypes(portalType).includes(selectedDegree);
         return Promise.resolve(isIndexable);
     }
     getName() {
         return 'IndexableDegreeRule';
     }
     getDescription() {
-        return `Indexable if the selected degree type is one of the following: ${this.indexableDegreeTypes.join(', ')}`;
+        return `Indexable if the selected degree type is one of the indexable degrees for the portal type`;
     }
-    get indexableDegreeTypes() {
-        return [
-            DegreeTypeFilterOptionValue.DOCTORATE,
-            DegreeTypeFilterOptionValue.DBA,
-            DegreeTypeFilterOptionValue.PHD,
-            DegreeTypeFilterOptionValue.MSC,
-            DegreeTypeFilterOptionValue.MA,
-            DegreeTypeFilterOptionValue.MBA,
-            DegreeTypeFilterOptionValue.LLM,
-            DegreeTypeFilterOptionValue.MPHIL,
-            DegreeTypeFilterOptionValue.MED,
-            DegreeTypeFilterOptionValue.MENG,
-            DegreeTypeFilterOptionValue.POSTGRADIP,
-            DegreeTypeFilterOptionValue.POSTGRADCERT,
-            DegreeTypeFilterOptionValue.PREMASTER,
-            DegreeTypeFilterOptionValue.BSC,
-            DegreeTypeFilterOptionValue.BA,
-            DegreeTypeFilterOptionValue.BBA,
-            DegreeTypeFilterOptionValue.ASSOCIATE_DEGREE,
-            DegreeTypeFilterOptionValue.GRADUATE_CERTTIFICATE,
-            DegreeTypeFilterOptionValue.GRADUATE_DIPLOMA,
-            DegreeTypeFilterOptionValue.PREBACHELOR,
-            DegreeTypeFilterOptionValue.CERTIFICATE
-        ];
+    getIndexableDegreeTypes(portalType) {
+        switch (portalType) {
+            case PortalType.MASTER:
+                return [
+                    DegreeTypeFilterOptionValue.MSC,
+                    DegreeTypeFilterOptionValue.MA,
+                    DegreeTypeFilterOptionValue.MBA,
+                    DegreeTypeFilterOptionValue.LLM,
+                    DegreeTypeFilterOptionValue.MPHIL,
+                    DegreeTypeFilterOptionValue.MED,
+                    DegreeTypeFilterOptionValue.MENG,
+                    DegreeTypeFilterOptionValue.POSTGRADIP,
+                    DegreeTypeFilterOptionValue.POSTGRADCERT,
+                    DegreeTypeFilterOptionValue.PREMASTER
+                ];
+            case PortalType.BACHELOR:
+                return [
+                    DegreeTypeFilterOptionValue.BSC,
+                    DegreeTypeFilterOptionValue.BA,
+                    DegreeTypeFilterOptionValue.BBA,
+                    DegreeTypeFilterOptionValue.ASSOCIATE_DEGREE,
+                    DegreeTypeFilterOptionValue.GRADUATE_CERTTIFICATE,
+                    DegreeTypeFilterOptionValue.GRADUATE_DIPLOMA,
+                    DegreeTypeFilterOptionValue.PREBACHELOR
+                ];
+            case PortalType.PHD:
+                return [
+                    DegreeTypeFilterOptionValue.PHD,
+                    DegreeTypeFilterOptionValue.DBA,
+                    DegreeTypeFilterOptionValue.DOCTORATE
+                ];
+            case PortalType.SHORT:
+                return [
+                    DegreeTypeFilterOptionValue.CERTIFICATE
+                ];
+            default:
+                return [];
+        }
     }
 }

package/dist/src/sitemap-generator/OrganisationsSitemapUrlGeneratorManager.js

@@ -1,6 +1,6 @@
 import { DependencyTypes } from '../enums/DependencyTypes';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
-import { Area, AreaAttendance, Attendance, Continent, Country, CountryCity, CountryAttendance, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, Unfiltered, RankedCountryCity, RankedCountryAreaCity } from '../organisations/policies';
+import { Area, AreaAttendance, Attendance, Continent, Country, CountryCity, CountryAttendance, RankedArea, RankedAreaDiscipline, RankedAttendance, RankedAttendanceDiscipline, RankedContinent, RankedContinentAttendance, RankedCountry, RankedCountryAttendance, RankedCountryDiscipline, RankedDiscipline, RankedUnfiltered, Unfiltered } from '../organisations/policies';
 import { AreaPresenter } from '../presenters/AreaPresenter';
 import { AttendancePresenter } from '../presenters/AttendancePresenter';
 import { ContinentPresenter } from '../presenters/ContinentPresenter';
@@ -39,8 +39,6 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
             new RankedContinent(dependencies),
             new RankedContinentAttendance(dependencies),
             new RankedCountry(dependencies),
-            new RankedCountryCity(dependencies),
-            new RankedCountryAreaCity(dependencies),
             new RankedCountryAttendance(dependencies),
             new RankedCountryDiscipline(dependencies),
             new RankedDiscipline(dependencies),

package/package.json

@@ -1,105 +1,105 @@
-{
-	"name": "@studyportals/fawkes",
-	"version": "8.5.3-1",
-	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
-	"files": [
-		"./dist"
-	],
-	"scripts": {
-		"prepush": "npm run test",
-		"precommit": "npm run lint",
-		"compile": "npx tsc && tsc-alias && rm -r ./dist/tests",
-		"build": "npm run clean && npm run compile",
-		"clean": "rimraf \"!(node_modules)/**/dist\"",
-		"prepare-deployment": "npm run test && npm run build",
-		"publish-major": "npm run prepare-deployment && npm version major && npm publish",
-		"publish-beta": "npm run prepare-deployment && npm version prerelease && npm publish --tag beta --access=public",
-		"publish-patch": "npm run prepare-deployment && npm version patch && npm publish",
-		"publish-minor": "npm run prepare-deployment && npm version minor && npm publish",
-		"prepare": "husky install",
-		"test": "vitest run --coverage",
-		"test:dev": "vitest --coverage tests/programmes",
-		"lint": "eslint . --ext .ts",
-		"lint:fix": "eslint . --ext .ts --fix",
-		"prettier:fix": "npx prettier --use-tabs --ignore-path .gitignore --write ."
-	},
-	"exports": {
-		"./organisations-search-seo": {
-			"import": "./dist/organisations-seo/index.js",
-			"require": "./dist/organisations-seo/index.js",
-			"types": "./dist/organisations-seo/index.d.ts"
-		},
-		"./programmes-search-seo": {
-			"import": "./dist/programmes-seo/index.js",
-			"require": "./dist/programmes-seo/index.js",
-			"types": "./dist/programmes-seo/index.d.ts"
-		},
-		"./scholarships-search-seo": {
-			"import": "./dist/scholarships-seo/index.js",
-			"require": "./dist/scholarships-seo/index.js",
-			"types": "./dist/scholarships-seo/index.d.ts"
-		},
-		"./sitemap-generator-seo": {
-			"import": "./dist/sitemap-generator-seo/index.js",
-			"require": "./dist/sitemap-generator-seo/index.js",
-			"types": "./dist/sitemap-generator-seo/index.d.ts"
-		},
-		"./structured-data-seo": {
-			"import": "./dist/structured-data-seo/index.js",
-			"require": "./dist/structured-data-seo/index.js",
-			"types": "./dist/structured-data-seo/index.d.ts"
-		}
-	},
-	"typesVersions": {
-		"*": {
-			"organisations-search-seo": [
-				"dist/organisations-seo/index.d.ts"
-			],
-			"programmes-search-seo": [
-				"dist/programmes-seo/index.d.ts"
-			],
-			"scholarships-search-seo": [
-				"dist/scholarships-seo/index.d.ts"
-			],
-			"sitemap-generator-seo": [
-				"dist/sitemap-generator-seo/index.d.ts"
-			],
-			"structured-data-seo": [
-				"dist/structured-data-seo/index.d.ts"
-			],
-			"*": [
-				"dist/index.d.ts"
-			]
-		}
-	},
-	"author": "The Jedi Council",
-	"license": "ISC",
-	"devDependencies": {
-		"@adobe/structured-data-validator": "^1.4.1",
-		"@studyportals/code-style": "^2.2.1",
-		"@studyportals/webpack-helper": "^6.0.6",
-		"@vitest/coverage-istanbul": "^2.1.8",
-		"husky": "^8.0.3",
-		"jsdom": "^26.0.0",
-		"prettier": "^3.5.3",
-		"schema-dts": "^1.1.5",
-		"ts-loader": "^9.5.2",
-		"tsc-alias": "^1.8.11",
-		"typemoq": "^2.1.0",
-		"typescript": "^5.7.3",
-		"vitest": "^2.1.8"
-	},
-	"dependencies": {
-		"@studyportals/domain-client": "7.1.0",
-		"@studyportals/ranking-api-interface": "^1.3.12",
-		"@studyportals/search-filters": "^6.3.1",
-		"@studyportals/static-domain-data": "^6.1.0"
-	},
-	"optionalDependencies": {
-		"@rollup/rollup-linux-x64-gnu": "4.24.0"
-	},
-	"engines": {
-		"node": ">=18 <=24",
-		"npm": ">=8 <=11"
-	}
-}
+{
+	"name": "@studyportals/fawkes",
+	"version": "8.5.3-2",
+	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
+	"files": [
+		"./dist"
+	],
+	"scripts": {
+		"prepush": "npm run test",
+		"precommit": "npm run lint",
+		"compile": "npx tsc && tsc-alias && rm -r ./dist/tests",
+		"build": "npm run clean && npm run compile",
+		"clean": "rimraf \"!(node_modules)/**/dist\"",
+		"prepare-deployment": "npm run test && npm run build",
+		"publish-major": "npm run prepare-deployment && npm version major && npm publish",
+		"publish-beta": "npm run prepare-deployment && npm version prerelease && npm publish --tag beta --access=public",
+		"publish-patch": "npm run prepare-deployment && npm version patch && npm publish",
+		"publish-minor": "npm run prepare-deployment && npm version minor && npm publish",
+		"prepare": "husky install",
+		"test": "vitest run --coverage",
+		"test:dev": "vitest --coverage tests/programmes",
+		"lint": "eslint . --ext .ts",
+		"lint:fix": "eslint . --ext .ts --fix",
+		"prettier:fix": "npx prettier --use-tabs --ignore-path .gitignore --write ."
+	},
+	"exports": {
+		"./organisations-search-seo": {
+			"import": "./dist/organisations-seo/index.js",
+			"require": "./dist/organisations-seo/index.js",
+			"types": "./dist/organisations-seo/index.d.ts"
+		},
+		"./programmes-search-seo": {
+			"import": "./dist/programmes-seo/index.js",
+			"require": "./dist/programmes-seo/index.js",
+			"types": "./dist/programmes-seo/index.d.ts"
+		},
+		"./scholarships-search-seo": {
+			"import": "./dist/scholarships-seo/index.js",
+			"require": "./dist/scholarships-seo/index.js",
+			"types": "./dist/scholarships-seo/index.d.ts"
+		},
+		"./sitemap-generator-seo": {
+			"import": "./dist/sitemap-generator-seo/index.js",
+			"require": "./dist/sitemap-generator-seo/index.js",
+			"types": "./dist/sitemap-generator-seo/index.d.ts"
+		},
+		"./structured-data-seo": {
+			"import": "./dist/structured-data-seo/index.js",
+			"require": "./dist/structured-data-seo/index.js",
+			"types": "./dist/structured-data-seo/index.d.ts"
+		}
+	},
+	"typesVersions": {
+		"*": {
+			"organisations-search-seo": [
+				"dist/organisations-seo/index.d.ts"
+			],
+			"programmes-search-seo": [
+				"dist/programmes-seo/index.d.ts"
+			],
+			"scholarships-search-seo": [
+				"dist/scholarships-seo/index.d.ts"
+			],
+			"sitemap-generator-seo": [
+				"dist/sitemap-generator-seo/index.d.ts"
+			],
+			"structured-data-seo": [
+				"dist/structured-data-seo/index.d.ts"
+			],
+			"*": [
+				"dist/index.d.ts"
+			]
+		}
+	},
+	"author": "The Jedi Council",
+	"license": "ISC",
+	"devDependencies": {
+		"@adobe/structured-data-validator": "^1.4.1",
+		"@studyportals/code-style": "^2.2.1",
+		"@studyportals/webpack-helper": "^6.0.6",
+		"@vitest/coverage-istanbul": "^2.1.8",
+		"husky": "^8.0.3",
+		"jsdom": "^26.0.0",
+		"prettier": "^3.5.3",
+		"schema-dts": "^1.1.5",
+		"ts-loader": "^9.5.2",
+		"tsc-alias": "^1.8.11",
+		"typemoq": "^2.1.0",
+		"typescript": "^5.7.3",
+		"vitest": "^2.1.8"
+	},
+	"dependencies": {
+		"@studyportals/domain-client": "7.1.0",
+		"@studyportals/ranking-api-interface": "^1.3.12",
+		"@studyportals/search-filters": "^6.3.1",
+		"@studyportals/static-domain-data": "^6.1.0"
+	},
+	"optionalDependencies": {
+		"@rollup/rollup-linux-x64-gnu": "4.24.0"
+	},
+	"engines": {
+		"node": ">=18 <=24",
+		"npm": ">=8 <=11"
+	}
+}

package/dist/src/organisations/policies/ranked/RankedCountryAreaCity.d.ts

@@ -1,13 +0,0 @@
-import { RankedOrganisationsSeoIndexabilityPolicy } from "../RankedOrganisationsSeoIndexabilityPolicy";
-import { IOrganisationsSeoDependencies } from "../../../organisations/types/IOrganisationsSeoDependencies";
-import { OnlyFiltersSelectedRule } from "../../../common/rules/OnlyFiltersSelectedRule";
-import { SingleValueSelectedForFilterRule } from "../../../common/rules/SingleValueSelectedForFilterRule";
-import { FilterCombinations } from "../../../enums/FilterCombinations";
-export declare class RankedCountryAreaCity extends RankedOrganisationsSeoIndexabilityPolicy {
-    readonly name: string;
-    readonly description: string;
-    protected readonly baseRules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
-    constructor(dependencies: IOrganisationsSeoDependencies);
-    protected generateUrls(): Promise<string[]>;
-    get filterCombination(): FilterCombinations;
-}

package/dist/src/organisations/policies/ranked/RankedCountryAreaCity.js

@@ -1,43 +0,0 @@
-import { RankedOrganisationsSeoIndexabilityPolicy } from "../RankedOrganisationsSeoIndexabilityPolicy";
-import { OnlyFiltersSelectedRule } from "../../../common/rules/OnlyFiltersSelectedRule";
-import { FilterKey } from "@studyportals/search-filters/server-side";
-import { SingleValueSelectedForFilterRule } from "../../../common/rules/SingleValueSelectedForFilterRule";
-import { CityPresenter } from "../../../presenters/CityPresenter";
-import { FilterCombinations } from "../../../enums/FilterCombinations";
-export class RankedCountryAreaCity extends RankedOrganisationsSeoIndexabilityPolicy {
-    name = 'Ranked Country/Area/City Policy';
-    description = 'Regulates indexability of ranking-sorted country, area, and city-level filtered pages, prioritizing high-value geographic views with quality-based sorting.';
-    baseRules = [
-        new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
-        new OnlyFiltersSelectedRule([FilterKey.CONTINENT])
-    ];
-    constructor(dependencies) {
-        super(dependencies);
-    }
-    async generateUrls() {
-        const cityFragments = await CityPresenter
-            .getInstance(this.dependencies.searchApiClient)
-            .getFragments();
-        const paths = [];
-        const filteredFragmentsForCountryAreaCity = cityFragments.filter(city => city.areaId !== null && city.areaId !== undefined);
-        for (const city of filteredFragmentsForCountryAreaCity) {
-            const areaId = city.areaId?.toString() || '';
-            if (areaId === '') {
-                continue;
-            }
-            const filterKeyValues = new Map([
-                [FilterKey.CITY, [city.id]],
-                [FilterKey.AREA, [areaId]],
-                [FilterKey.COUNTRY, [city.countryId]]
-            ]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(this.getPathWithSortingOption(city.path));
-            }
-        }
-        return paths;
-    }
-    get filterCombination() {
-        return FilterCombinations.RANKED_COUNTRY_AREA_CITY;
-    }
-}

package/dist/src/organisations/policies/ranked/RankedCountryCity.d.ts

@@ -1,14 +0,0 @@
-import { RankedOrganisationsSeoIndexabilityPolicy } from "../RankedOrganisationsSeoIndexabilityPolicy";
-import { IOrganisationsSeoDependencies } from "../../../organisations/types/IOrganisationsSeoDependencies";
-import { OnlyFiltersSelectedRule } from "../../../common/rules/OnlyFiltersSelectedRule";
-import { SingleValueSelectedForFilterRule } from "../../../common/rules/SingleValueSelectedForFilterRule";
-import { ExcludeByIdForCitiesRule } from "../../../organisations/rules/ExcludeByIdForCitiesRule";
-import { FilterCombinations } from "../../../enums/FilterCombinations";
-export declare class RankedCountryCity extends RankedOrganisationsSeoIndexabilityPolicy {
-    readonly name: string;
-    readonly description: string;
-    protected readonly baseRules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | ExcludeByIdForCitiesRule)[];
-    constructor(dependencies: IOrganisationsSeoDependencies);
-    protected generateUrls(): Promise<string[]>;
-    get filterCombination(): FilterCombinations;
-}

package/dist/src/organisations/policies/ranked/RankedCountryCity.js

@@ -1,41 +0,0 @@
-import { RankedOrganisationsSeoIndexabilityPolicy } from "../RankedOrganisationsSeoIndexabilityPolicy";
-import { OnlyFiltersSelectedRule } from "../../../common/rules/OnlyFiltersSelectedRule";
-import { FilterKey } from "@studyportals/search-filters/server-side";
-import { SingleValueSelectedForFilterRule } from "../../../common/rules/SingleValueSelectedForFilterRule";
-import { ExcludeByIdForCitiesRule } from "../../../organisations/rules/ExcludeByIdForCitiesRule";
-import { CityPresenter } from "../../../presenters/CityPresenter";
-import { FilterCombinations } from "../../../enums/FilterCombinations";
-export class RankedCountryCity extends RankedOrganisationsSeoIndexabilityPolicy {
-    name = 'Ranked Country/City Policy';
-    description = 'Regulates indexability of ranking-sorted country, and city-level filtered pages, prioritizing high-value geographic views with quality-based sorting.';
-    baseRules = [
-        new SingleValueSelectedForFilterRule(FilterKey.CITY),
-        new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
-        new OnlyFiltersSelectedRule([FilterKey.CITY, FilterKey.COUNTRY]),
-        new ExcludeByIdForCitiesRule(FilterKey.CITY)
-    ];
-    constructor(dependencies) {
-        super(dependencies);
-    }
-    async generateUrls() {
-        const cityFragments = await CityPresenter
-            .getInstance(this.dependencies.searchApiClient)
-            .getFragments();
-        const paths = [];
-        const filteredFragmentsForCountryCity = cityFragments.filter(city => city.areaId === null || city.areaId === undefined);
-        for (const city of filteredFragmentsForCountryCity) {
-            const filterKeyValues = new Map([
-                [FilterKey.CITY, [city.id]],
-                [FilterKey.COUNTRY, [city.countryId]]
-            ]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(this.getPathWithSortingOption(city.path));
-            }
-        }
-        return paths;
-    }
-    get filterCombination() {
-        return FilterCombinations.RANKED_COUNTRY_CITY;
-    }
-}