@studyportals/fawkes 4.0.2-2 → 4.0.2-21

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

@@ -7,4 +7,5 @@ import { OrganisationsSitemapUrlGeneratorManager } from '../src/sitemap-generato
 import { ScholarshipsSitemapUrlGeneratorManager } from '../src/sitemap-generator/ScholarshipsSitemapUrlGeneratorManager';
 import { FilterCombinations } from '../src/enums/FilterCombinations';
 import { FilterKeyValuesMap } from '../src/common/FilterKeyValuesMap';
-export { IOrganisationsClient, IOrganisation, IRankingApiClient, ISearchApiClient, ISitemapUrlGeneratorManager, OrganisationsSitemapUrlGeneratorManager, ScholarshipsSitemapUrlGeneratorManager, FilterCombinations, FilterKeyValuesMap };
+import { IPresenter } from '../src/common';
+export { IOrganisationsClient, IOrganisation, IRankingApiClient, ISearchApiClient, ISitemapUrlGeneratorManager, OrganisationsSitemapUrlGeneratorManager, ScholarshipsSitemapUrlGeneratorManager, FilterCombinations, FilterKeyValuesMap, IPresenter };

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

@@ -13,5 +13,16 @@ export declare enum FilterCombinations {
     CONTINENT_ATTENDANCE = "continentAttendance",
     COUNTRY_ATTENDANCE = "countryAttendance",
     ATTENDANCE = "attendance",
-    CONTINENT = "continent"
+    CONTINENT = "continent",
+    RANKED_AREA = "rankedArea",
+    RANKED_AREA_DISCIPLINE = "rankedAreaDiscipline",
+    RANKED_ATTENDANCE = "rankedAttendance",
+    RANKED_ATTENDANCE_DISCIPLINE = "rankedAttendancedDiscipline",
+    RANKED_CONTINENT = "rankedContinent",
+    RANKED_CONTINENT_ATTENDANCE = "rankedContinentAttendance",
+    RANKED_COUNTRY = "rankedCountry",
+    RANKED_COUNTRY_ATTENDANCE = "rankedCountryAttendance",
+    RANKED_DISCIPLINE_COUNTRY = "rankedDisciplineCountry",
+    RANKED_DISCIPLINE = "rankedDiscipline",
+    RANKED_UNFILTERED = "rankedUnfiltered"
 }

package/dist/src/enums/FilterCombinations.js

@@ -15,4 +15,15 @@ export var FilterCombinations;
     FilterCombinations["COUNTRY_ATTENDANCE"] = "countryAttendance";
     FilterCombinations["ATTENDANCE"] = "attendance";
     FilterCombinations["CONTINENT"] = "continent";
+    FilterCombinations["RANKED_AREA"] = "rankedArea";
+    FilterCombinations["RANKED_AREA_DISCIPLINE"] = "rankedAreaDiscipline";
+    FilterCombinations["RANKED_ATTENDANCE"] = "rankedAttendance";
+    FilterCombinations["RANKED_ATTENDANCE_DISCIPLINE"] = "rankedAttendancedDiscipline";
+    FilterCombinations["RANKED_CONTINENT"] = "rankedContinent";
+    FilterCombinations["RANKED_CONTINENT_ATTENDANCE"] = "rankedContinentAttendance";
+    FilterCombinations["RANKED_COUNTRY"] = "rankedCountry";
+    FilterCombinations["RANKED_COUNTRY_ATTENDANCE"] = "rankedCountryAttendance";
+    FilterCombinations["RANKED_DISCIPLINE_COUNTRY"] = "rankedDisciplineCountry";
+    FilterCombinations["RANKED_DISCIPLINE"] = "rankedDiscipline";
+    FilterCombinations["RANKED_UNFILTERED"] = "rankedUnfiltered";
 })(FilterCombinations || (FilterCombinations = {}));

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

@@ -1,8 +1,6 @@
-import { PortalType } from '@studyportals/domain-client';
 import { SortingOptions } from '../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from './OrganisationsSeoIndexabilityPolicy';
 export declare abstract class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
-    protected readonly indexablePortalTypes: PortalType[];
     protected readonly sortingOption: SortingOptions;
     protected addRankedResultsCountRule(): void;
 }

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

@@ -1,9 +1,7 @@
-import { PortalType } from '@studyportals/domain-client';
 import { SortingOptions } from '../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from './OrganisationsSeoIndexabilityPolicy';
 import { AtLeastTwoRankedResultsRule } from '../rules/AtLeastTwoRankedResultsRule';
 export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
-    indexablePortalTypes = [PortalType.MASTER];
     sortingOption = SortingOptions.UNIVERSITY_META_RANKING;
     addRankedResultsCountRule() {
         let rankedResultsCountRule;

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

@@ -23,6 +23,7 @@ export class RankedArea extends RankedOrganisationsSeoIndexabilityPolicy {
                 [FilterKey.COUNTRY, [area.countryId]]
             ]);
             const result = await this.checkRulesForSitemap(filterKeyValues);
+            console.log(`Result for area ${area.id} is ${result}`); // eslint-disable-line no-console
             if (result) {
                 paths.push(this.getPathWithSortingOption(area.path));
             }
@@ -30,6 +31,6 @@ export class RankedArea extends RankedOrganisationsSeoIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.AREA;
+        return FilterCombinations.RANKED_AREA;
     }
 }

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

@@ -19,7 +19,7 @@ export class RankedAreaDiscipline extends RankedOrganisationsSeoIndexabilityPoli
         this.addRankedResultsCountRule();
     }
     get filterCombination() {
-        return FilterCombinations.AREA_DISCIPLINE;
+        return FilterCombinations.RANKED_AREA_DISCIPLINE;
     }
     async generateUrls() {
         const areaFragments = AreaPresenter.getInstance().getFragments();

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

@@ -28,6 +28,6 @@ export class RankedAttendance extends RankedOrganisationsSeoIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.ATTENDANCE;
+        return FilterCombinations.RANKED_ATTENDANCE;
     }
 }

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

@@ -18,7 +18,7 @@ export class RankedAttendanceDiscipline extends RankedOrganisationsSeoIndexabili
         this.addRankedResultsCountRule();
     }
     get filterCombination() {
-        return FilterCombinations.ATTENDANCE_DISCIPLINE;
+        return FilterCombinations.RANKED_ATTENDANCE_DISCIPLINE;
     }
     async generateUrls() {
         const attendanceFragments = AttendancePresenter.getInstance().getFragments();

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

@@ -26,6 +26,6 @@ export class RankedContinent extends RankedOrganisationsSeoIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.CONTINENT;
+        return FilterCombinations.RANKED_CONTINENT;
     }
 }

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

@@ -38,6 +38,6 @@ export class RankedContinentAttendance extends RankedOrganisationsSeoIndexabilit
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.CONTINENT_ATTENDANCE;
+        return FilterCombinations.RANKED_CONTINENT_ATTENDANCE;
     }
 }

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

@@ -23,6 +23,6 @@ export class RankedCountry extends RankedOrganisationsSeoIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.COUNTRY;
+        return FilterCombinations.RANKED_COUNTRY;
     }
 }

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

@@ -36,6 +36,6 @@ export class RankedCountryAttendance extends RankedOrganisationsSeoIndexabilityP
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.COUNTRY_ATTENDANCE;
+        return FilterCombinations.RANKED_COUNTRY_ATTENDANCE;
     }
 }

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

@@ -34,6 +34,6 @@ export class RankedCountryDiscipline extends RankedOrganisationsSeoIndexabilityP
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.DISCIPLINE_COUNTRY;
+        return FilterCombinations.RANKED_DISCIPLINE_COUNTRY;
     }
 }

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

@@ -26,6 +26,6 @@ export class RankedDiscipline extends RankedOrganisationsSeoIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.DISCIPLINE;
+        return FilterCombinations.RANKED_DISCIPLINE;
     }
 }

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

@@ -15,6 +15,6 @@ export class RankedUnfiltered extends RankedOrganisationsSeoIndexabilityPolicy {
         return [];
     }
     get filterCombination() {
-        return FilterCombinations.UNFILTERED;
+        return FilterCombinations.RANKED_UNFILTERED;
     }
 }

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

@@ -5,7 +5,7 @@ import { IPresenter } from '../common';
 import { FilterKey } from '@studyportals/search-filters';
 export declare abstract class BaseSitemapUrlGeneratorManager implements ISitemapUrlGeneratorManager {
     abstract readonly policies: ISitemapUrlGenerator[];
-    protected abstract readonly presenters: IPresenter[];
+    abstract readonly presenters: Map<FilterKey, IPresenter>;
     protected readonly filterKeyValueCounts: Map<FilterKey, number>;
     generateUrls(): Promise<Map<FilterCombinations, string[]>>;
     getFilterKeyValueCounts(): Map<FilterKey, number>;

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

@@ -2,18 +2,29 @@ export class BaseSitemapUrlGeneratorManager {
     filterKeyValueCounts = new Map();
     async generateUrls() {
         const map = new Map();
-        await Promise.all(this.policies.map(async (policy) => {
+        for (const policy of this.policies) {
+            console.debug(`Generating sitemap urls for policy: ${policy.filterCombination}`); // eslint-disable-line no-console
             const filterCombination = policy.filterCombination;
             const urls = await policy.generateSitemapUrls();
+            console.debug(`Generated ${urls.length} urls for policy: ${filterCombination}`); // eslint-disable-line no-console
             map.set(filterCombination, urls);
-        }));
+        }
+        // await Promise.all(
+        // 	this.policies.map(async (policy) => {
+        // 		console.debug(`Generating sitemap urls for policy: ${policy.filterCombination}`); // eslint-disable-line no-console
+        // 		const filterCombination = policy.filterCombination;
+        // 		const urls = await policy.generateSitemapUrls();
+        // 		console.debug(`Generated ${urls.length} urls for policy: ${filterCombination}`); // eslint-disable-line no-console
+        // 		map.set(filterCombination, urls);
+        // 	})
+        // );
         return map;
     }
     getFilterKeyValueCounts() {
         return this.filterKeyValueCounts;
     }
     setFilterKeyValueCounts() {
-        for (const presenter of this.presenters) {
+        for (const presenter of this.presenters.values()) {
             const count = presenter.getFragments().length;
             this.filterKeyValueCounts.set(presenter.filterKey, count);
         }

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

@@ -1,6 +1,8 @@
 import { FilterCombinations } from '../enums/FilterCombinations';
+import { IPresenter } from '../common';
 import { FilterKey } from '@studyportals/search-filters';
 export interface ISitemapUrlGeneratorManager {
+    readonly presenters: Map<FilterKey, IPresenter>;
     generateUrls(): Promise<Map<FilterCombinations, string[]>>;
     getFilterKeyValueCounts(): Map<FilterKey, number>;
 }

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

@@ -4,14 +4,11 @@ import { ISearchApiClient } from '../sitemap-generator/ISearchApiClient';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 import { PortalType } from '@studyportals/domain-client';
 import { IRankingApiClient } from './IRankingApiClient';
-import { AreaPresenter } from '../presenters/AreaPresenter';
-import { AttendancePresenter } from '../presenters/AttendancePresenter';
-import { ContinentPresenter } from '../presenters/ContinentPresenter';
-import { CountryPresenter } from '../presenters/CountryPresenter';
-import { DisciplinePresenter } from '../presenters/DisciplinePresenter';
+import { FilterKey } from '@studyportals/search-filters';
+import { IPresenter } from '../common';
 export declare class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     readonly portalType: PortalType;
     readonly policies: ISitemapUrlGenerator[];
-    protected readonly presenters: (AreaPresenter | AttendancePresenter | ContinentPresenter | CountryPresenter | DisciplinePresenter)[];
+    readonly presenters: Map<FilterKey, IPresenter>;
     constructor(portalType: PortalType, searchApiClient: ISearchApiClient, organisationsClient: IOrganisationsClient, rankingApiClient: IRankingApiClient);
 }

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

@@ -6,16 +6,11 @@ import { AttendancePresenter } from '../presenters/AttendancePresenter';
 import { ContinentPresenter } from '../presenters/ContinentPresenter';
 import { CountryPresenter } from '../presenters/CountryPresenter';
 import { DisciplinePresenter } from '../presenters/DisciplinePresenter';
+import { FilterKey } from '@studyportals/search-filters';
 export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     portalType;
     policies;
-    presenters = [
-        AreaPresenter.getInstance(),
-        AttendancePresenter.getInstance(),
-        ContinentPresenter.getInstance(),
-        CountryPresenter.getInstance(),
-        DisciplinePresenter.getInstance()
-    ];
+    presenters = new Map();
     constructor(portalType, searchApiClient, organisationsClient, rankingApiClient) {
         super();
         this.portalType = portalType;
@@ -46,5 +41,11 @@ export class OrganisationsSitemapUrlGeneratorManager extends BaseSitemapUrlGener
             new RankedDiscipline(dependencies),
             new RankedUnfiltered(dependencies)
         ];
+        this.presenters.set(FilterKey.AREA, AreaPresenter.getInstance());
+        this.presenters.set(FilterKey.DELIVERY_METHOD, AttendancePresenter.getInstance());
+        this.presenters.set(FilterKey.CONTINENT, ContinentPresenter.getInstance());
+        this.presenters.set(FilterKey.COUNTRY, CountryPresenter.getInstance());
+        this.presenters.set(FilterKey.DISCIPLINES, DisciplinePresenter.getInstance());
+        this.setFilterKeyValueCounts();
     }
 }

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

@@ -4,6 +4,6 @@ import { ISearchApiClient } from '../sitemap-generator/ISearchApiClient';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 export declare class ScholarshipsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     readonly policies: ISitemapUrlGenerator[];
-    protected readonly presenters: never[];
+    readonly presenters: Map<any, any>;
     constructor(searchApiClient: ISearchApiClient, organisationsClient: IOrganisationsClient);
 }

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

@@ -8,7 +8,7 @@ import { Unfiltered } from '../scholarships/policies/Unfiltered';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
 export class ScholarshipsSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     policies;
-    presenters = [];
+    presenters = new Map();
     constructor(searchApiClient, organisationsClient) {
         super();
         const dependencies = {

package/package.json

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