@studyportals/fawkes 8.7.2 → 9.0.0

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

@@ -5,6 +5,7 @@ import { OnlyFiltersSelectedRule } from '../../../common/rules/OnlyFiltersSelect
 import { CountryPresenter } from '../../../presenters/CountryPresenter';
 import { DisciplinePresenter } from '../../../presenters/DisciplinePresenter';
 import { RankedOrganisationsSeoIndexabilityPolicy } from '../RankedOrganisationsSeoIndexabilityPolicy';
+const DEFAULT_CONCURRENT_REQUESTS = 20; // Maximum number of concurrent requests to avoid rate limiting
 export class RankedCountryDiscipline extends RankedOrganisationsSeoIndexabilityPolicy {
     name = 'Ranked Country Discipline Policy';
     description = 'Determines which ranking-sorted pages at the intersection of country and discipline filters qualify for indexing based on search value.';
@@ -17,22 +18,37 @@ export class RankedCountryDiscipline extends RankedOrganisationsSeoIndexabilityP
         super(dependencies);
     }
     async generateUrls() {
-        const countryFragments = CountryPresenter.getInstance().getFragments();
-        const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
-        const paths = [];
-        for (const country of countryFragments) {
-            for (const discipline of disciplineFragments) {
-                const filterKeyValues = new Map([
-                    [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.DISCIPLINES, [discipline.id]]
-                ]);
-                const result = await this.checkRulesForSitemap(filterKeyValues);
-                if (result) {
-                    paths.push(this.getPathWithSortingOption(`${country.path}/${discipline.path}`));
-                }
+        try {
+            const countryFragments = CountryPresenter.getInstance().getFragments();
+            const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
+            const paths = [];
+            const configuredConcurrency = Number.parseInt(process.env.SITEMAP_COMBINATION_CONCURRENCY
+                || DEFAULT_CONCURRENT_REQUESTS.toString(), 10);
+            const concurrencyLimit = Math.max(1, configuredConcurrency); // Ensure at least 1
+            // Create all combinations
+            const combinations = countryFragments.flatMap(country => disciplineFragments.map(discipline => ({ country, discipline })));
+            // Process in batches to respect API rate limits
+            for (let i = 0; i < combinations.length; i += concurrencyLimit) {
+                const batch = combinations.slice(i, i + concurrencyLimit);
+                const results = await Promise.all(batch.map(async ({ country, discipline }) => {
+                    const filterKeyValues = new Map([
+                        [FilterKey.COUNTRY, [country.id]],
+                        [FilterKey.DISCIPLINES, [discipline.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemap(filterKeyValues);
+                    if (result) {
+                        return this.getPathWithSortingOption(`${country.path}/${discipline.path}`);
+                    }
+                    return null;
+                }));
+                paths.push(...results.filter((path) => path !== null));
             }
+            return paths;
+        }
+        catch (error) {
+            console.error('Error generating URLs for RankedCountryDiscipline:', error);
+            return [];
         }
-        return paths;
     }
     get filterCombination() {
         return FilterCombinations.RANKED_DISCIPLINE_COUNTRY;

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

@@ -15,16 +15,22 @@ export class RankedDiscipline extends RankedOrganisationsSeoIndexabilityPolicy {
         super(dependencies);
     }
     async generateUrls() {
-        const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
-        const paths = [];
-        for (const discipline of disciplineFragments) {
-            const filterKeyValues = new Map([[FilterKey.DISCIPLINES, [discipline.id]]]);
-            const result = await this.checkRulesForSitemap(filterKeyValues);
-            if (result) {
-                paths.push(this.getPathWithSortingOption(discipline.path));
+        try {
+            const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
+            const paths = [];
+            for (const discipline of disciplineFragments) {
+                const filterKeyValues = new Map([[FilterKey.DISCIPLINES, [discipline.id]]]);
+                const result = await this.checkRulesForSitemap(filterKeyValues);
+                if (result) {
+                    paths.push(this.getPathWithSortingOption(discipline.path));
+                }
             }
+            return paths;
+        }
+        catch (error) {
+            console.error('Error generating URLs for RankedDiscipline:', error);
+            return [];
         }
-        return paths;
     }
     get filterCombination() {
         return FilterCombinations.RANKED_DISCIPLINE;

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

@@ -9,11 +9,17 @@ export class RankedUnfiltered extends RankedOrganisationsSeoIndexabilityPolicy {
         super(dependencies);
     }
     async generateUrls() {
-        const filterKeyValues = new Map([]);
-        if (await this.checkRulesForSitemap(filterKeyValues)) {
-            return [this.getPathWithSortingOption('')];
+        try {
+            const filterKeyValues = new Map([]);
+            if (await this.checkRulesForSitemap(filterKeyValues)) {
+                return [this.getPathWithSortingOption('')];
+            }
+            return [];
+        }
+        catch (error) {
+            console.error('Error generating URLs for RankedUnfiltered:', error);
+            return [];
         }
-        return [];
     }
     get filterCombination() {
         return FilterCombinations.RANKED_UNFILTERED;

package/dist/src/organisations/rules/MinimumAmountOfRankedResultsRule.d.ts

@@ -1,11 +1,10 @@
 import { IRule } from '../../common/IRule';
 import { IOrganisationSearchDependencies } from '../types/IOrganisationSearchDependencies';
-import { FilterKeyValuesMap } from '../../common/FilterKeyValuesMap';
-import { IRankingApiClient } from '../../sitemap-generator/IRankingApiClient';
+import { FilterKeyValuesMap, ISearchApiClient } from '../../../sitemap-generator-seo';
 export declare class MinimumAmountOfRankedResultsRule implements IRule {
     private readonly minimumRankedResultsCount;
-    private readonly rankingApiClient?;
-    constructor(rankingApiClient?: IRankingApiClient);
+    private readonly searchApiClient?;
+    constructor(searchApiClient?: ISearchApiClient);
     forSearch(dependencies: IOrganisationSearchDependencies): Promise<boolean>;
     forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;

package/dist/src/organisations/rules/MinimumAmountOfRankedResultsRule.js

@@ -1,9 +1,9 @@
 import { DependencyMissingError } from '../../errors/DependencyMissingError';
 export class MinimumAmountOfRankedResultsRule {
-    minimumRankedResultsCount = 7;
-    rankingApiClient;
-    constructor(rankingApiClient) {
-        this.rankingApiClient = rankingApiClient;
+    minimumRankedResultsCount = 4;
+    searchApiClient;
+    constructor(searchApiClient) {
+        this.searchApiClient = searchApiClient;
     }
     forSearch(dependencies) {
         const { applicationState } = dependencies;
@@ -11,14 +11,18 @@ export class MinimumAmountOfRankedResultsRule {
         return Promise.resolve(rankedResultsCount >= this.minimumRankedResultsCount);
     }
     async forSitemapGenerator(filterKeyValues) {
-        if (!this.rankingApiClient) {
-            throw new DependencyMissingError('RankingApiClient');
+        if (!this.searchApiClient) {
+            throw new DependencyMissingError('SearchApiClient');
         }
-        const rankedResultsCount = await this.rankingApiClient.getRankedOrganisationCount(filterKeyValues);
+        if (!this.searchApiClient.getCountWithRankings) {
+            const filterKeys = [...filterKeyValues.keys()];
+            throw new DependencyMissingError(`CountwithRankings ${filterKeys.join(',')}`);
+        }
+        const rankedResultsCount = await this.searchApiClient.getCountWithRankings(filterKeyValues);
         return rankedResultsCount >= this.minimumRankedResultsCount;
     }
     getName() {
-        return 'AtLeastTwoRankedResultsRule';
+        return 'AtLeastFourRankedResultsRule';
     }
     getDescription() {
         return `At least ${this.minimumRankedResultsCount} ranked results are available`;

package/dist/src/organisations/types/IOrganisationsSitemapDependencies.d.ts

@@ -1,9 +1,7 @@
 import { ISitemapDependencies } from '../../common/ISitemapDependencies';
-import { IRankingApiClient } from '../../sitemap-generator/IRankingApiClient';
 import { PortalType } from '@studyportals/domain-client';
 import { IOrganisationsClient } from '../../sitemap-generator/IOrganisationsClient';
 export interface IOrganisationsSitemapDependencies extends ISitemapDependencies {
     organisationsClient: IOrganisationsClient;
     portalType: PortalType;
-    rankingApiClient: IRankingApiClient;
 }

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

@@ -3,7 +3,7 @@ import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 import { IRule } from '../../common/IRule';
-export declare class DegreeAttendanceTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+export declare class DegreeTuitionFeeAttendance extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];

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

@@ -10,19 +10,19 @@ import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
 import { IndexableDegreeRule } from '../rules/IndexableDegreeRule';
 import { AffordableTuitionFeeRule } from '../rules/AffordableTuitionFeeRule';
-export class DegreeAttendanceTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+export class DegreeTuitionFeeAttendance extends ProgrammesBaseIndexabilityPolicy {
     name = 'Tuition Fee Attendance Degree Policy';
     description = 'Determines indexing rules for pages filtered by tuition fee, attendance, and degree type.';
-    filterKeys = [FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD, FilterKey.DEGREE_TYPE];
+    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD];
     rules;
     constructor(dependencies) {
         super(dependencies);
         const portalType = dependencies.portalType;
         this.rules = [
             new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
-            new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
             new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
-            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.DELIVERY_METHOD, FilterKey.TUITION_FEE]),
+            new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
+            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.DELIVERY_METHOD]),
             new IndexableDegreeRule(portalType),
             new OnlineAttendanceRule(),
             new AffordableTuitionFeeRule()
@@ -42,9 +42,9 @@ export class DegreeAttendanceTuitionFee extends ProgrammesBaseIndexabilityPolicy
             for (const degree of degreeFragments) {
                 for (const attendance of attendanceFragments) {
                     const filterKeyValues = new Map([
-                        [FilterKey.DELIVERY_METHOD, [attendance.id]],
                         [FilterKey.DEGREE_TYPE, [degree.id]],
-                        [FilterKey.TUITION_FEE, [affordableTuition.id]]
+                        [FilterKey.TUITION_FEE, [affordableTuition.id]],
+                        [FilterKey.DELIVERY_METHOD, [attendance.id]]
                     ]);
                     const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
                     if (result) {

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

@@ -3,7 +3,7 @@ import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 import { IRule } from '../../common/IRule';
-export declare class DegreeContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy {
+export declare class DegreeTuitionFeeContinent extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];

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

@@ -7,10 +7,10 @@ import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityP
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { ContinentPresenter } from '../../presenters/ContinentPresenter';
 import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
-export class DegreeContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy {
-    name = 'Degree Continent Tuition Fee Policy';
-    description = 'Determines indexing rules for pages filtered by degree type, continent, and tuition fee.';
-    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.CONTINENT, FilterKey.TUITION_FEE];
+export class DegreeTuitionFeeContinent extends ProgrammesBaseIndexabilityPolicy {
+    name = 'Degree Tuition Fee Continent Policy';
+    description = 'Determines indexing rules for pages filtered by degree type, tuition fee, and continent.';
+    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.CONTINENT];
     rules;
     constructor(dependencies) {
         super(dependencies);
@@ -19,7 +19,7 @@ export class DegreeContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy
             new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
             new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
             new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
-            new OnlyFiltersSelectedRule([FilterKey.CONTINENT, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
+            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.CONTINENT]),
             new IndexableDegreeRule(portalType)
         ];
         this.initateBaseRules();
@@ -34,9 +34,9 @@ export class DegreeContinentTuitionFee extends ProgrammesBaseIndexabilityPolicy
                 for (const degree of degreeFragments) {
                     for (const tuitionFee of tuitionFeeFragments) {
                         const filterKeyValues = new Map([
-                            [FilterKey.CONTINENT, [continent.id]],
                             [FilterKey.DEGREE_TYPE, [degree.id]],
                             [FilterKey.TUITION_FEE, [tuitionFee.id]],
+                            [FilterKey.CONTINENT, [continent.id]],
                         ]);
                         const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
                         if (result) {

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

@@ -12,16 +12,16 @@ import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
 export class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Format Tuition Fee Policy';
     description = 'Determines indexing rules for pages filtered by degree type, format and tuition fee.';
-    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.ATTENDANCE, FilterKey.TUITION_FEE];
+    filterKeys = [FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.ATTENDANCE];
     rules;
     constructor(dependencies) {
         super(dependencies);
         const portalType = dependencies.portalType;
         this.rules = [
-            new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
             new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
             new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
-            new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE]),
+            new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
+            new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.ATTENDANCE]),
             new IndexableDegreeRule(portalType),
             new AffordableTuitionFeeRule(),
             new PartTimeFormatRule()
@@ -38,9 +38,9 @@ export class DegreeFormatTuitionFee extends ProgrammesBaseIndexabilityPolicy {
                 for (const degree of degreeFragments) {
                     for (const tuitionFee of tuitionFeeFragments) {
                         const filterKeyValues = new Map([
-                            [FilterKey.ATTENDANCE, [format.id]],
                             [FilterKey.DEGREE_TYPE, [degree.id]],
-                            [FilterKey.TUITION_FEE, [tuitionFee.id]]
+                            [FilterKey.TUITION_FEE, [tuitionFee.id]],
+                            [FilterKey.ATTENDANCE, [format.id]],
                         ]);
                         const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
                         if (result) {

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/sitemap-generator/ISearchApiClient.d.ts

@@ -11,4 +11,5 @@ export interface ISearchApiClient {
     }[]>;
     getProgrammeCount?(filterKeyValues: FilterKeyValuesMap): Promise<number>;
     getCount(filterKeyValues: FilterKeyValuesMap): Promise<number>;
+    getCountWithRankings?(filterKeyValues: FilterKeyValuesMap): Promise<number>;
 }

package/dist/src/sitemap-generator/OrganisationsSitemapUrlGeneratorManager.d.ts

@@ -3,12 +3,11 @@ import { IOrganisationsClient } from '../sitemap-generator/IOrganisationsClient'
 import { ISearchApiClient } from '../sitemap-generator/ISearchApiClient';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 import { PortalType } from '@studyportals/domain-client';
-import { IRankingApiClient } from './IRankingApiClient';
 import { FilterKey } from '@studyportals/search-filters/server-side';
 import { IPresenter } from '../common';
 export declare class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     readonly portalType: PortalType;
     readonly policies: ISitemapUrlGenerator[];
     readonly presenters: Map<FilterKey, IPresenter>;
-    constructor(portalType: PortalType, searchApiClient: ISearchApiClient, organisationsClient: IOrganisationsClient, rankingApiClient: IRankingApiClient);
+    constructor(portalType: PortalType, searchApiClient: ISearchApiClient, organisationsClient: IOrganisationsClient);
 }

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 } from '../organisations/policies';
+import { Area, AreaAttendance, Attendance, Continent, Country, CountryCity, CountryAttendance, RankedArea, 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';
@@ -12,7 +12,7 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
     portalType;
     policies;
     presenters = new Map();
-    constructor(portalType, searchApiClient, organisationsClient, rankingApiClient) {
+    constructor(portalType, searchApiClient, organisationsClient) {
         super();
         this.portalType = portalType;
         const dependencies = {
@@ -20,7 +20,6 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
             portalType,
             searchApiClient,
             organisationsClient,
-            rankingApiClient
         };
         this.policies = [
             new CountryCity(dependencies),
@@ -33,7 +32,6 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
             new CountryAttendance(dependencies),
             new Unfiltered(dependencies),
             new RankedArea(dependencies),
-            new RankedAreaDiscipline(dependencies),
             new RankedAttendance(dependencies),
             new RankedAttendanceDiscipline(dependencies),
             new RankedContinent(dependencies),

package/package.json

@@ -1,105 +1,106 @@
-{
-	"name": "@studyportals/fawkes",
-	"version": "8.7.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": "^8.2.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": "9.0.0",
+	"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": "^8.1.0",
+		"@studyportals/ranking-api-interface": "^2.4.0",
+		"@studyportals/search-api-interface": "5.9.3-0",
+		"@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"
+	}
+}