@studyportals/fawkes 8.7.2-1 → 8.7.2-3

package/dist/sitemap-generator-seo/index.d.ts

@@ -1,6 +1,5 @@
 export { IOrganisationsClient } from '../src/sitemap-generator/IOrganisationsClient';
 export { IOrganisation } from '../src/sitemap-generator/IOrganisation';
-export { IRankingApiClient } from '../src/sitemap-generator/IRankingApiClient';
 export { ISearchApiClient } from '../src/sitemap-generator/ISearchApiClient';
 export { ISitemapUrlGeneratorManager } from '../src/sitemap-generator/ISitemapUrlGeneratorManager';
 export { OrganisationsSitemapUrlGeneratorManager } from '../src/sitemap-generator/OrganisationsSitemapUrlGeneratorManager';

package/dist/src/common/FilterKeyToFilterTypeMap.d.ts

@@ -0,0 +1,2 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+export declare const FILTER_KEY_TO_FILTER_TYPE_MAP: Map<FilterKey, FilterType>;

package/dist/src/common/FilterKeyToFilterTypeMap.js

@@ -0,0 +1,14 @@
+import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterType } from '@studyportals/omnisearch-interfaces';
+export const FILTER_KEY_TO_FILTER_TYPE_MAP = new Map([
+    [FilterKey.COUNTRY, FilterType.COUNTRY],
+    [FilterKey.DISCIPLINES, FilterType.DISCIPLINES],
+    [FilterKey.CITY, FilterType.CITY],
+    [FilterKey.AREA, FilterType.AREA],
+    [FilterKey.ATTENDANCE, FilterType.DENSITIES],
+    [FilterKey.DELIVERY_METHOD, FilterType.ATTENDANCE],
+    [FilterKey.CAMPAIGN_TYPE, FilterType.CAMPAIGN_TYPE],
+    [FilterKey.DEGREE_TYPE, FilterType.DEGREE_TYPE],
+    [FilterKey.KEYWORD, FilterType.KEYWORD],
+    [FilterKey.CONTINENT, FilterType.CONTINENT],
+]);

package/dist/src/common/FilterTypeMap.d.ts

@@ -0,0 +1,2 @@
+import { FilterType } from '@studyportals/omnisearch-interfaces';
+export type FilterTypeMap = Map<FilterType, string[]>;

package/dist/src/common/FilterTypeMap.js

@@ -0,0 +1 @@
+export {};

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

@@ -9,7 +9,7 @@ export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIn
         let rankedResultsCountRule;
         if (super.isSitemapUrlGeneratorDependencies()) {
             const dependencies = this.dependencies;
-            rankedResultsCountRule = new MinimumAmountOfRankedResultsRule(dependencies.rankingApiClient);
+            rankedResultsCountRule = new MinimumAmountOfRankedResultsRule(dependencies.searchApiClient);
         }
         else {
             rankedResultsCountRule = new MinimumAmountOfRankedResultsRule();

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

@@ -21,7 +21,7 @@ export class RankedArea extends RankedOrganisationsSeoIndexabilityPolicy {
         for (const area of areaFragments) {
             const filterKeyValues = new Map([
                 [FilterKey.AREA, [area.id]],
-                [FilterKey.COUNTRY, [area.countryId]]
+                [FilterKey.COUNTRY, [area.countryId]],
             ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);
             if (result) {

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

@@ -20,7 +20,9 @@ export class RankedAttendance extends RankedOrganisationsSeoIndexabilityPolicy {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();
         const paths = [];
         for (const attendance of attendanceFragments) {
-            const filterKeyValues = new Map([[FilterKey.DELIVERY_METHOD, [attendance.id]]]);
+            const filterKeyValues = new Map([
+                [FilterKey.DELIVERY_METHOD, [attendance.id]],
+            ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);
             if (result) {
                 paths.push(this.getPathWithSortingOption(attendance.path));

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

@@ -29,7 +29,7 @@ export class RankedAttendanceDiscipline extends RankedOrganisationsSeoIndexabili
             for (const discipline of disciplineFragments) {
                 const filterKeyValues = new Map([
                     [FilterKey.DELIVERY_METHOD, [attendance.id]],
-                    [FilterKey.DISCIPLINES, [discipline.id]]
+                    [FilterKey.DISCIPLINES, [discipline.id]],
                 ]);
                 const result = await this.checkRulesForSitemap(filterKeyValues);
                 if (result) {

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

@@ -18,7 +18,9 @@ export class RankedContinent extends RankedOrganisationsSeoIndexabilityPolicy {
         const continentFragments = ContinentPresenter.getInstance().getFragments();
         const paths = [];
         for (const continent of continentFragments) {
-            const filterKeyValues = new Map([[FilterKey.CONTINENT, [continent.id]]]);
+            const filterKeyValues = new Map([
+                [FilterKey.CONTINENT, [continent.id]],
+            ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);
             if (result) {
                 paths.push(this.getPathWithSortingOption(continent.path));

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

@@ -28,7 +28,7 @@ export class RankedContinentAttendance extends RankedOrganisationsSeoIndexabilit
             for (const attendance of attendanceFragments) {
                 const filterKeyValues = new Map([
                     [FilterKey.CONTINENT, [continent.id]],
-                    [FilterKey.DELIVERY_METHOD, [attendance.id]]
+                    [FilterKey.DELIVERY_METHOD, [attendance.id]],
                 ]);
                 const result = await this.checkRulesForSitemap(filterKeyValues);
                 if (result) {

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

@@ -15,7 +15,9 @@ export class RankedCountry extends RankedOrganisationsSeoIndexabilityPolicy {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const paths = [];
         for (const country of countryFragments) {
-            const filterKeyValues = new Map([[FilterKey.COUNTRY, [country.id]]]);
+            const filterKeyValues = new Map([
+                [FilterKey.COUNTRY, [country.id]],
+            ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);
             if (result) {
                 paths.push(this.getPathWithSortingOption(country.path));

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

@@ -24,7 +24,7 @@ export class RankedCountryDiscipline extends RankedOrganisationsSeoIndexabilityP
             for (const discipline of disciplineFragments) {
                 const filterKeyValues = new Map([
                     [FilterKey.COUNTRY, [country.id]],
-                    [FilterKey.DISCIPLINES, [discipline.id]]
+                    [FilterKey.DISCIPLINES, [discipline.id]],
                 ]);
                 const result = await this.checkRulesForSitemap(filterKeyValues);
                 if (result) {

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

@@ -18,7 +18,9 @@ export class RankedDiscipline extends RankedOrganisationsSeoIndexabilityPolicy {
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = [];
         for (const discipline of disciplineFragments) {
-            const filterKeyValues = new Map([[FilterKey.DISCIPLINES, [discipline.id]]]);
+            const filterKeyValues = new Map([
+                [FilterKey.DISCIPLINES, [discipline.id]]
+            ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);
             if (result) {
                 paths.push(this.getPathWithSortingOption(discipline.path));

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 = 4;
-    rankingApiClient;
-    constructor(rankingApiClient) {
-        this.rankingApiClient = rankingApiClient;
+    searchApiClient;
+    constructor(searchApiClient) {
+        this.searchApiClient = searchApiClient;
     }
     forSearch(dependencies) {
         const { applicationState } = dependencies;
@@ -11,10 +11,10 @@ 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);
+        const rankedResultsCount = await this.searchApiClient.getCount(filterKeyValues, true);
         return rankedResultsCount >= this.minimumRankedResultsCount;
     }
     getName() {

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

@@ -10,5 +10,5 @@ export interface ISearchApiClient {
         countryIsoCode: string;
     }[]>;
     getProgrammeCount?(filterKeyValues: FilterKeyValuesMap): Promise<number>;
-    getCount(filterKeyValues: FilterKeyValuesMap): Promise<number>;
+    getCount(filterKeyValues: FilterKeyValuesMap, isRanking?: boolean): 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

@@ -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),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "8.7.2-1",
+	"version": "8.7.2-3",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"
@@ -91,7 +91,7 @@
 	},
 	"dependencies": {
 		"@studyportals/domain-client": "^8.1.0",
-		"@studyportals/ranking-api-interface": "^1.3.12",
+		"@studyportals/search-api-interface": "^5.9.2",
 		"@studyportals/search-filters": "^6.3.1",
 		"@studyportals/static-domain-data": "^6.1.0"
 	},