@studyportals/fawkes 2.0.1-8 → 3.0.0

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

@@ -0,0 +1,7 @@
+import { IOrganisationsClient } from "../src/sitemap-generator/IOrganisationsClient";
+import { IOrganisation } from "../src/sitemap-generator/IOrganisation";
+import { ISearchApiClient } from "../src/sitemap-generator/ISearchApiClient";
+import { ISitemapUrlGeneratorManager } from "../src/sitemap-generator/ISitemapUrlGeneratorManager";
+import { SitemapUrlGeneratorManager } from "../src/sitemap-generator/SitemapUrlGeneratorManager";
+import { FilterCombinations } from "../src/enums/FilterCombinations";
+export { IOrganisationsClient, IOrganisation, ISearchApiClient, ISitemapUrlGeneratorManager, SitemapUrlGeneratorManager, FilterCombinations };

package/dist/sitemap-generator-seo/index.js

@@ -1 +1,3 @@
-"use strict";
+import { SitemapUrlGeneratorManager } from "../src/sitemap-generator/SitemapUrlGeneratorManager";
+import { FilterCombinations } from "../src/enums/FilterCombinations";
+export { SitemapUrlGeneratorManager, FilterCombinations };

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

@@ -1,16 +1,16 @@
 import { ISitemapUrlGenerator } from "./ISitemapUrlGenerator";
 import { ISeoIndexabilityPolicy } from "./ISeoIndexabilityPolicy";
-import { FilterCombinations } from "@/enums/FilterCombinations";
 import { IDependencies } from "./IDependencies";
-import { SeoDependencies } from "@/types/SeoDependencies";
+import { SeoDependencies } from "../types/SeoDependencies";
+import { FilterCombinations } from "../enums/FilterCombinations";
 export declare abstract class BaseSeoIndexabilityPolicy implements ISeoIndexabilityPolicy, ISitemapUrlGenerator {
     protected dependencies: IDependencies;
     constructor(dependencies: SeoDependencies);
     shouldIndex(): Promise<boolean>;
-    generateSitemapUrls(): string[];
+    generateSitemapUrls(): Promise<string[]>;
     protected abstract matchesFilters(): Promise<boolean>;
     private isIndexabilityPolicyDependencies;
     private isSitemapUrlGeneratorDependencies;
-    protected abstract generateUrls(): string[];
+    protected abstract generateUrls(): Promise<string[]>;
     abstract get filterCombination(): FilterCombinations;
 }

package/dist/src/common/BaseSeoIndexabilityPolicy.js

@@ -1,4 +1,4 @@
-import { DependencyTypes } from "@/enums/DependencyTypes";
+import { DependencyTypes } from "../enums/DependencyTypes";
 export class BaseSeoIndexabilityPolicy {
     dependencies;
     constructor(dependencies) {
@@ -10,11 +10,11 @@ export class BaseSeoIndexabilityPolicy {
         }
         return this.matchesFilters();
     }
-    generateSitemapUrls() {
+    async generateSitemapUrls() {
         if (!this.isSitemapUrlGeneratorDependencies()) {
             throw new Error('Dependency type is incorrect.');
         }
-        return this.generateUrls();
+        return await this.generateUrls();
     }
     isIndexabilityPolicyDependencies() {
         return this.dependencies.dependencyType === DependencyTypes.SEARCH;

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

@@ -1,6 +1,6 @@
 import { IFilterKeyValues } from "./IFilterKeyValues";
 export interface ICustomRule {
     forSearch(filterKeyValues: IFilterKeyValues): boolean;
-    forSitemapGenerator(filterId?: string, additionalFilterId?: string): boolean;
+    forSitemapGenerator(filterKeyValues: IFilterKeyValues): boolean;
     getName(): string;
 }

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

@@ -1,4 +1,4 @@
-import { DependencyTypes } from "@/enums/DependencyTypes";
+import { DependencyTypes } from "../enums/DependencyTypes";
 export interface IDependencies {
     dependencyType: DependencyTypes;
 }

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

@@ -1,4 +1,4 @@
-import { ISeoInfoBase, ISeoFilterState, ISeoFilterOptions, ISeoSearchApplicationState } from "@/common";
+import { ISeoInfoBase, ISeoFilterState, ISeoFilterOptions, ISeoSearchApplicationState } from "../common";
 import { IDependencies } from "./IDependencies";
 export interface IIndexabilityPolicyDependencies extends IDependencies {
     seoInfoBase: ISeoInfoBase;

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

@@ -0,0 +1,8 @@
+import { ISeoInfoBase, ISeoFilterState, ISeoFilterOptions, ISeoSearchApplicationState } from "../common";
+import { IDependencies } from "./IDependencies";
+export interface ISearchDependencies extends IDependencies {
+    seoInfoBase: ISeoInfoBase;
+    filterState: ISeoFilterState;
+    filterOptions?: ISeoFilterOptions;
+    applicationState?: ISeoSearchApplicationState;
+}

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

@@ -1,5 +1,5 @@
-import { FilterCombinations } from "@/enums/FilterCombinations";
+import { FilterCombinations } from "../enums/FilterCombinations";
 export interface ISitemapUrlGenerator {
     filterCombination: FilterCombinations;
-    generateSitemapUrls(): string[];
+    generateSitemapUrls(): Promise<string[]>;
 }

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

@@ -1,10 +1,9 @@
 import { BaseSeoIndexabilityPolicy } from "./BaseSeoIndexabilityPolicy";
-import { SeoDependencies } from "@/types/SeoDependencies";
-import { ICustomRule } from "./ICustomRule";
+import { SeoDependencies } from "../types/SeoDependencies";
+import { ISearchDependencies } from "./ISearchDependencies";
 import { IFilterKeyValues } from "./IFilterKeyValues";
 export declare abstract class RuleBasedIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
-    protected abstract rules: ICustomRule[];
     constructor(dependencies: SeoDependencies);
-    protected checksEveryRuleForSearch(filterKeyValues: IFilterKeyValues): boolean;
-    protected checksEveryRuleForSitemap(subjectId: string, additionalId?: string): boolean;
+    protected abstract checksRulesForSearch(searchDependencies: ISearchDependencies): boolean;
+    protected abstract checksRulesForSitemap(filters?: IFilterKeyValues): boolean;
 }

package/dist/src/common/RuleBasedIndexabilityPolicy.js

@@ -3,10 +3,4 @@ export class RuleBasedIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
     constructor(dependencies) {
         super(dependencies);
     }
-    checksEveryRuleForSearch(filterKeyValues) {
-        return this.rules.every(rule => rule.forSearch(filterKeyValues));
-    }
-    checksEveryRuleForSitemap(subjectId, additionalId) {
-        return this.rules.every(rule => rule.forSitemapGenerator(subjectId, additionalId));
-    }
 }

package/dist/src/organisations/ISeoInfoBaseOrganisations.d.ts

@@ -1,4 +1,4 @@
-import { ISeoInfoBase } from "@/common/ISeoInfoBase";
+import { ISeoInfoBase } from "../common/ISeoInfoBase";
 import { ISortState } from "./ISortState";
 import { SortingOptions } from "./SortingOptions";
 export interface ISeoInfoBaseOrganisations<T> extends ISeoInfoBase {

package/dist/src/organisations/SearchIndexabilityManager.d.ts

@@ -1,5 +1,5 @@
-import { ISearchIndexabilityManager } from "@/common/ISearchIndexabilityManager";
-import { ISeoIndexabilityPolicy } from "@/common/ISeoIndexabilityPolicy";
+import { ISearchIndexabilityManager } from "../common/ISearchIndexabilityManager";
+import { ISeoIndexabilityPolicy } from "../common/ISeoIndexabilityPolicy";
 export declare class SearchIndexabilityManager implements ISearchIndexabilityManager {
     policies: ISeoIndexabilityPolicy[];
     shouldIndex(): Promise<boolean>;

package/dist/src/organisations/SeoIndexabilityPolicy.d.ts

@@ -1,8 +1,8 @@
-import { BaseSeoIndexabilityPolicy } from "@/common/BaseSeoIndexabilityPolicy";
+import { BaseSeoIndexabilityPolicy } from "../common/BaseSeoIndexabilityPolicy";
 import { IOrganisationsProvider } from "./IOrganisationsProvider";
-import { IRankingApiClient } from "@/common/IRankingApiClient";
+import { IRankingApiClient } from "../common/IRankingApiClient";
 import { ISortState } from "./ISortState";
-import { SeoDependencies } from "@/types/SeoDependencies";
+import { SeoDependencies } from "../types/SeoDependencies";
 export declare abstract class SeoIndexabilityPolicy<T> extends BaseSeoIndexabilityPolicy {
     protected readonly organisationsProvider: IOrganisationsProvider<T>;
     protected readonly rankingApiClient: IRankingApiClient;

package/dist/src/organisations/SeoIndexabilityPolicy.js

@@ -1,4 +1,4 @@
-import { BaseSeoIndexabilityPolicy } from "@/common/BaseSeoIndexabilityPolicy";
+import { BaseSeoIndexabilityPolicy } from "../common/BaseSeoIndexabilityPolicy";
 export class SeoIndexabilityPolicy extends BaseSeoIndexabilityPolicy {
     organisationsProvider;
     rankingApiClient;

package/dist/src/organisations/SeoRuleBasedIndexabilityPolicy.d.ts

@@ -1,9 +1,9 @@
-import { SeoIndexabilityPolicy } from "@/organisations/SeoIndexabilityPolicy";
-import { IOrganisationsProvider } from "@/organisations/IOrganisationsProvider";
-import { IRankingApiClient } from "@/common/IRankingApiClient";
-import { FilterKeyValuePairs } from "@/organisations/FilterKeyValuePairs";
-import { ISortState } from "@/organisations/ISortState";
-import { SeoDependencies } from "@/types/SeoDependencies";
+import { SeoIndexabilityPolicy } from "../organisations/SeoIndexabilityPolicy";
+import { IOrganisationsProvider } from "../organisations/IOrganisationsProvider";
+import { IRankingApiClient } from "../common/IRankingApiClient";
+import { FilterKeyValuePairs } from "../organisations/FilterKeyValuePairs";
+import { ISortState } from "../organisations/ISortState";
+import { SeoDependencies } from "../types/SeoDependencies";
 export declare abstract class SeoRuleBasedIndexabilityPolicy<T> extends SeoIndexabilityPolicy<T> {
     constructor(dependencies: SeoDependencies, organisationsProvider: IOrganisationsProvider<T>, rankingApiClient: IRankingApiClient, sortState: ISortState);
     protected abstract matchesRule(pairs: FilterKeyValuePairs, ...values: []): boolean;

package/dist/src/organisations/SeoRuleBasedIndexabilityPolicy.js

@@ -1,4 +1,4 @@
-import { SeoIndexabilityPolicy } from "@/organisations/SeoIndexabilityPolicy";
+import { SeoIndexabilityPolicy } from "../organisations/SeoIndexabilityPolicy";
 // TODO: Remove this class
 export class SeoRuleBasedIndexabilityPolicy extends SeoIndexabilityPolicy {
     constructor(dependencies, organisationsProvider, rankingApiClient, sortState) {

package/dist/src/presenters/CountryPresenter.d.ts

@@ -1,9 +1,9 @@
-import { IFragment } from './fragments/IFragment';
+import { ICountryFragment } from './fragments/ICountryFragment';
 export declare class CountryPresenter {
     private static instance;
     private fragments;
     private constructor();
     static getInstance(): CountryPresenter;
     private generatePaths;
-    getFragments(): IFragment[];
+    getFragments(): ICountryFragment[];
 }

package/dist/src/presenters/CountryPresenter.js

@@ -22,7 +22,11 @@ export class CountryPresenter {
             if (path === null) {
                 return;
             }
-            countries.push({ id: country.id, path });
+            countries.push({
+                id: country.id,
+                iso: country.iso,
+                path
+            });
         });
         return countries;
     }

package/dist/src/presenters/fragments/ICountryFragment.d.ts

@@ -0,0 +1,4 @@
+import { IFragment } from "./IFragment";
+export interface ICountryFragment extends IFragment {
+    readonly iso: string;
+}

package/dist/src/scholarships/SearchIndexabilityManager.d.ts

@@ -1,8 +1,8 @@
-import { ISeoInfoBase } from "@/common/ISeoInfoBase";
-import { ISeoFilterState } from "@/common/ISeoFilterState";
-import { ISeoSearchApplicationState } from "@/common/ISeoSearchApplicationState";
-import { ISeoFilterOptions } from "@/common/ISeoFilterOptions";
-import { ISearchIndexabilityManager } from "@/common/ISearchIndexabilityManager";
+import { ISeoInfoBase } from "../common/ISeoInfoBase";
+import { ISeoFilterState } from "../common/ISeoFilterState";
+import { ISeoSearchApplicationState } from "../common/ISeoSearchApplicationState";
+import { ISeoFilterOptions } from "../common/ISeoFilterOptions";
+import { ISearchIndexabilityManager } from "../common/ISearchIndexabilityManager";
 export declare class SearchIndexabilityManager implements ISearchIndexabilityManager {
     private policies;
     constructor(seoInfoBase: ISeoInfoBase, filterState: ISeoFilterState, applicationState: ISeoSearchApplicationState, filterOptions: ISeoFilterOptions);

package/dist/src/scholarships/SearchIndexabilityManager.js

@@ -4,7 +4,7 @@ import { DisciplineCountryPolicy } from "./policies/DisciplineCountryPolicy";
 import { DisciplinePolicy } from "./policies/DisciplinePolicy";
 import { UniversityCountryPolicy } from "./policies/UniversityCountryPolicy";
 import { UnfilteredPolicy } from "./policies/UnfilteredPolicy";
-import { DependencyTypes } from "@/enums/DependencyTypes";
+import { DependencyTypes } from "../enums/DependencyTypes";
 export class SearchIndexabilityManager {
     policies;
     constructor(seoInfoBase, filterState, applicationState, filterOptions) {

package/dist/src/scholarships/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./SearchIndexabilityManager";
 import { SearchIndexabilityManager } from "./SearchIndexabilityManager";
 import { types } from "./types";
 export { SearchIndexabilityManager, types };

package/dist/src/scholarships/index.js

@@ -1,4 +1,3 @@
-export * from "./SearchIndexabilityManager";
 import { SearchIndexabilityManager } from "./SearchIndexabilityManager";
 import { types } from "./types";
 export { SearchIndexabilityManager, types };

package/dist/src/scholarships/policies/AreaPolicy.d.ts

@@ -1,12 +1,14 @@
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { SeoDependencies } from '@/types/SeoDependencies';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
-import { ICustomRule } from '@/common/ICustomRule';
-import { ISeoIndexabilityPolicy } from '@/common/ISeoIndexabilityPolicy';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { SeoDependencies } from '../../types/SeoDependencies';
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
+import { ISeoIndexabilityPolicy } from '../../common/ISeoIndexabilityPolicy';
+import { IFilterKeyValues } from '../../common/IFilterKeyValues';
 export declare class AreaPolicy extends RuleBasedIndexabilityPolicy implements ISeoIndexabilityPolicy {
-    protected rules: ICustomRule[];
     constructor(dependencies: SeoDependencies);
     protected matchesFilters(): Promise<boolean>;
-    generateUrls(): string[];
+    generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;
+    protected checksRulesForSearch(dependencies: ISearchDependencies): boolean;
+    protected checksRulesForSitemap(filterKeyValues: IFilterKeyValues): boolean;
 }

package/dist/src/scholarships/policies/AreaPolicy.js

@@ -1,14 +1,10 @@
 import { FilterKey } from '@studyportals/search-filters';
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
 import { ExceptAustraliaAreasRule } from '../rules/ExceptAustaliaAreasRule';
 import { SearchVolumeAreasRule } from '../rules/SearchVolumeAreasRule';
-import { AreaPresenter } from '@/presenters/AreaPresenter';
+import { AreaPresenter } from '../../presenters/AreaPresenter';
 export class AreaPolicy extends RuleBasedIndexabilityPolicy {
-    rules = [
-        SearchVolumeAreasRule.getInstance(),
-        ExceptAustraliaAreasRule.getInstance()
-    ];
     constructor(dependencies) {
         super(dependencies);
     }
@@ -23,23 +19,43 @@ export class AreaPolicy extends RuleBasedIndexabilityPolicy {
             FilterKey.AREA,
             FilterKey.COUNTRY
         ], filterState);
-        const areaSelected = seoInfoBase.getFilterOptionValueBy(FilterKey.AREA, filterState);
-        const hasSearchVolumeAndNotAustralia = this.checksEveryRuleForSearch({
-            [FilterKey.AREA]: areaSelected ?? undefined
-        });
+        const hasSearchVolumeAndNotAustralia = this.checksRulesForSearch(this.dependencies);
         return singleAreaSelected
             && singleCountrySelected
             && onlyAreaAndCountrySelected
             && hasSearchVolumeAndNotAustralia;
     }
-    generateUrls() {
+    async generateUrls() {
         const areaFragments = AreaPresenter.getInstance().getFragments();
         const paths = areaFragments
-            .filter(area => this.checksEveryRuleForSitemap(area.id))
+            .filter(area => this.checksRulesForSitemap({
+            [FilterKey.COUNTRY]: area.countryId,
+            [FilterKey.AREA]: area.id
+        }))
             .map(area => area.path);
-        return paths;
+        return Promise.resolve(paths);
     }
     get filterCombination() {
         return FilterCombinations.AREA;
     }
+    checksRulesForSearch(dependencies) {
+        const { seoInfoBase, filterState } = dependencies;
+        const exceptAustraliaAreasRule = ExceptAustraliaAreasRule.getInstance();
+        const areaSelected = seoInfoBase.getFilterOptionValueBy(FilterKey.AREA, filterState);
+        const notInAustralia = exceptAustraliaAreasRule.forSearch({
+            [FilterKey.AREA]: areaSelected ?? undefined
+        });
+        const searchVolumeAreasRule = SearchVolumeAreasRule.getInstance();
+        const hasSearchVolume = searchVolumeAreasRule.forSearch({
+            [FilterKey.AREA]: areaSelected ?? undefined
+        });
+        return notInAustralia && hasSearchVolume;
+    }
+    checksRulesForSitemap(filterKeyValues) {
+        const exceptAustraliaAreasRule = ExceptAustraliaAreasRule.getInstance();
+        const notInAustralia = exceptAustraliaAreasRule.forSitemapGenerator(filterKeyValues);
+        const searchVolumeAreasRule = SearchVolumeAreasRule.getInstance();
+        const hasSearchVolume = searchVolumeAreasRule.forSitemapGenerator(filterKeyValues);
+        return notInAustralia && hasSearchVolume;
+    }
 }

package/dist/src/scholarships/policies/CountryPolicy.d.ts

@@ -1,12 +1,14 @@
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { ICustomRule } from '@/common/ICustomRule';
-import { SeoDependencies } from '@/types/SeoDependencies';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
-import { ISeoIndexabilityPolicy } from '@/common/ISeoIndexabilityPolicy';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { SeoDependencies } from '../../types/SeoDependencies';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
+import { ISeoIndexabilityPolicy } from '../../common/ISeoIndexabilityPolicy';
+import { IFilterKeyValues } from '../../common/IFilterKeyValues';
 export declare class CountryPolicy extends RuleBasedIndexabilityPolicy implements ISeoIndexabilityPolicy {
-    protected rules: ICustomRule[];
     constructor(dependencies: SeoDependencies);
     protected matchesFilters(): Promise<boolean>;
-    generateUrls(): string[];
+    generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;
+    protected checksRulesForSearch(dependencies: ISearchDependencies): boolean;
+    protected checksRulesForSitemap(filters: IFilterKeyValues): boolean;
 }

package/dist/src/scholarships/policies/CountryPolicy.js

@@ -1,12 +1,9 @@
 import { FilterKey } from '@studyportals/search-filters';
-import { FilterCombinations } from '@/enums/FilterCombinations';
+import { FilterCombinations } from '../../enums/FilterCombinations';
 import { SearchVolumeCountriesRule } from '../rules/SearchVolumeCountriesRule';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
-import { CountryPresenter } from '@/presenters/CountryPresenter';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
+import { CountryPresenter } from '../../presenters/CountryPresenter';
 export class CountryPolicy extends RuleBasedIndexabilityPolicy {
-    rules = [
-        SearchVolumeCountriesRule.getInstance()
-    ];
     constructor(dependencies) {
         super(dependencies);
     }
@@ -16,10 +13,7 @@ export class CountryPolicy extends RuleBasedIndexabilityPolicy {
         const onlyCountrySelected = await seoInfoBase.selectionOnlyFor([
             FilterKey.COUNTRY
         ], filterState);
-        const countrySelected = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
-        const hasSearchVolume = this.checksEveryRuleForSearch({
-            [FilterKey.COUNTRY]: countrySelected ?? undefined
-        });
+        const hasSearchVolume = this.checksRulesForSearch(this.dependencies);
         return singleCountrySelected
             && onlyCountrySelected
             && hasSearchVolume;
@@ -27,11 +21,26 @@ export class CountryPolicy extends RuleBasedIndexabilityPolicy {
     generateUrls() {
         const countryFragments = CountryPresenter.getInstance().getFragments();
         const paths = countryFragments
-            .filter(country => this.checksEveryRuleForSitemap(country.id))
+            .filter(country => this.checksRulesForSitemap({
+            [FilterKey.COUNTRY]: country.id
+        }))
             .map(country => country.path);
-        return paths;
+        return Promise.resolve(paths);
     }
     get filterCombination() {
         return FilterCombinations.COUNTRY;
     }
+    checksRulesForSearch(dependencies) {
+        const { seoInfoBase, filterState } = dependencies;
+        const hasSearchVolumeRule = SearchVolumeCountriesRule.getInstance();
+        const countrySelected = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
+        const hasSearchVolume = hasSearchVolumeRule.forSearch({
+            [FilterKey.COUNTRY]: countrySelected ?? undefined
+        });
+        return hasSearchVolume;
+    }
+    checksRulesForSitemap(filters) {
+        const hasSearchVolumeRule = SearchVolumeCountriesRule.getInstance();
+        return hasSearchVolumeRule.forSitemapGenerator(filters);
+    }
 }

package/dist/src/scholarships/policies/DisciplineCountryPolicy.d.ts

@@ -1,12 +1,14 @@
-import { ISeoIndexabilityPolicy } from '@/common/ISeoIndexabilityPolicy';
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { SeoDependencies } from '@/types/SeoDependencies';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
-import { ICustomRule } from '@/common/ICustomRule';
+import { ISeoIndexabilityPolicy } from '../../common/ISeoIndexabilityPolicy';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { SeoDependencies } from '../../types/SeoDependencies';
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
+import { IFilterKeyValues } from '../../common/IFilterKeyValues';
 export declare class DisciplineCountryPolicy extends RuleBasedIndexabilityPolicy implements ISeoIndexabilityPolicy {
-    protected rules: ICustomRule[];
     constructor(dependencies: SeoDependencies);
     protected matchesFilters(): Promise<boolean>;
-    generateUrls(): string[];
+    generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;
+    protected checksRulesForSearch(dependencies: ISearchDependencies): boolean;
+    protected checksRulesForSitemap(filters: IFilterKeyValues): boolean;
 }

package/dist/src/scholarships/policies/DisciplineCountryPolicy.js

@@ -1,12 +1,10 @@
 import { FilterKey } from '@studyportals/search-filters';
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
 import { SearchVolumeCountriesDisciplinesRule } from '../rules/SearchVolumeCountryDisciplineRule';
-import { CountryPresenter } from '@/presenters/CountryPresenter';
+import { CountryPresenter } from '../../presenters/CountryPresenter';
+import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
 export class DisciplineCountryPolicy extends RuleBasedIndexabilityPolicy {
-    rules = [
-        SearchVolumeCountriesDisciplinesRule.getInstance()
-    ];
     constructor(dependencies) {
         super(dependencies);
     }
@@ -21,12 +19,7 @@ export class DisciplineCountryPolicy extends RuleBasedIndexabilityPolicy {
             FilterKey.DISCIPLINES,
             FilterKey.COUNTRY
         ], filterState);
-        const countrySelected = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
-        const disciplineSelected = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
-        const hasSearchVolume = this.checksEveryRuleForSearch({
-            [FilterKey.COUNTRY]: countrySelected ?? undefined,
-            [FilterKey.DISCIPLINES]: disciplineSelected ?? undefined
-        });
+        const hasSearchVolume = this.checksRulesForSearch(this.dependencies);
         return singleDisciplineSelected
             && singleCountrySelected
             && onlyDisciplineAndCountrySelected
@@ -35,17 +28,35 @@ export class DisciplineCountryPolicy extends RuleBasedIndexabilityPolicy {
     generateUrls() {
         const paths = [];
         const countryFragments = CountryPresenter.getInstance().getFragments();
-        const disciplineFragments = CountryPresenter.getInstance().getFragments();
+        const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         countryFragments.forEach(country => {
             disciplineFragments.forEach(discipline => {
-                if (this.checksEveryRuleForSitemap(country.id, discipline.id)) {
+                if (this.checksRulesForSitemap({
+                    [FilterKey.COUNTRY]: country.id,
+                    [FilterKey.DISCIPLINES]: discipline.id
+                })) {
                     paths.push(`${country.path}/${discipline.path}`);
                 }
             });
         });
-        return paths;
+        return Promise.resolve(paths);
     }
     get filterCombination() {
         return FilterCombinations.DISCIPLINE_COUNTRY;
     }
+    checksRulesForSearch(dependencies) {
+        const { seoInfoBase, filterState } = dependencies;
+        const countrySelected = seoInfoBase.getFilterOptionValueBy(FilterKey.COUNTRY, filterState);
+        const disciplineSelected = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
+        const searchVolumeRule = SearchVolumeCountriesDisciplinesRule.getInstance();
+        const hasSearchVolume = searchVolumeRule.forSearch({
+            [FilterKey.COUNTRY]: countrySelected ?? undefined,
+            [FilterKey.DISCIPLINES]: disciplineSelected ?? undefined
+        });
+        return hasSearchVolume;
+    }
+    checksRulesForSitemap(filters) {
+        const searchVolumeRule = SearchVolumeCountriesDisciplinesRule.getInstance();
+        return searchVolumeRule.forSitemapGenerator(filters);
+    }
 }

package/dist/src/scholarships/policies/DisciplinePolicy.d.ts

@@ -1,12 +1,14 @@
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { SeoDependencies } from '@/types/SeoDependencies';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
-import { ICustomRule } from '@/common/ICustomRule';
-import { ISeoIndexabilityPolicy } from '@/common/ISeoIndexabilityPolicy';
+import { SeoDependencies } from '../../types/SeoDependencies';
+import { ISearchDependencies } from '../../common/ISearchDependencies';
+import { ISeoIndexabilityPolicy } from '../../common/ISeoIndexabilityPolicy';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
+import { IFilterKeyValues } from '../../common/IFilterKeyValues';
 export declare class DisciplinePolicy extends RuleBasedIndexabilityPolicy implements ISeoIndexabilityPolicy {
-    protected rules: ICustomRule[];
     constructor(dependencies: SeoDependencies);
     protected matchesFilters(): Promise<boolean>;
-    generateUrls(): string[];
+    generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;
+    protected checksRulesForSearch(dependencies: ISearchDependencies): boolean;
+    protected checksRulesForSitemap(filters: IFilterKeyValues): boolean;
 }

package/dist/src/scholarships/policies/DisciplinePolicy.js

@@ -1,12 +1,9 @@
 import { FilterKey } from '@studyportals/search-filters';
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { RuleBasedIndexabilityPolicy } from '@/common/RuleBasedIndexabilityPolicy';
-import { SearchVolumeDisciplinesRule } from '../rules/SearchVolumeDisciplinesRule';
-import { DisciplinePresenter } from '@/presenters/DisciplinePresenter';
+import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
+import { SearchVolumeDisciplinesRule } from '../../scholarships/rules/SearchVolumeDisciplinesRule';
+import { FilterCombinations } from '../../enums/FilterCombinations';
+import { RuleBasedIndexabilityPolicy } from '../../common/RuleBasedIndexabilityPolicy';
 export class DisciplinePolicy extends RuleBasedIndexabilityPolicy {
-    rules = [
-        SearchVolumeDisciplinesRule.getInstance()
-    ];
     constructor(dependencies) {
         super(dependencies);
     }
@@ -16,10 +13,7 @@ export class DisciplinePolicy extends RuleBasedIndexabilityPolicy {
         const onlyDisciplineSelected = await seoInfoBase.selectionOnlyFor([
             FilterKey.DISCIPLINES
         ], filterState);
-        const disciplineSelected = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
-        const hasSearchVolume = this.checksEveryRuleForSearch({
-            [FilterKey.DISCIPLINES]: disciplineSelected ?? undefined
-        });
+        const hasSearchVolume = this.checksRulesForSearch(this.dependencies);
         return singleDisciplineSelected
             && onlyDisciplineSelected
             && hasSearchVolume;
@@ -27,11 +21,26 @@ export class DisciplinePolicy extends RuleBasedIndexabilityPolicy {
     generateUrls() {
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = disciplineFragments
-            .filter(discipline => this.checksEveryRuleForSitemap(discipline.id))
+            .filter(discipline => this.checksRulesForSitemap({
+            [FilterKey.DISCIPLINES]: discipline.id
+        }))
             .map(discipline => discipline.path);
-        return paths;
+        return Promise.resolve(paths);
     }
     get filterCombination() {
         return FilterCombinations.DISCIPLINE;
     }
+    checksRulesForSearch(dependencies) {
+        const { seoInfoBase, filterState } = dependencies;
+        const hasSearchVolumeRule = SearchVolumeDisciplinesRule.getInstance();
+        const disciplineSelected = seoInfoBase.getFilterOptionValueBy(FilterKey.DISCIPLINES, filterState);
+        const hasSearchVolume = hasSearchVolumeRule.forSearch({
+            [FilterKey.DISCIPLINES]: disciplineSelected ?? undefined
+        });
+        return hasSearchVolume;
+    }
+    checksRulesForSitemap(filters) {
+        const hasSearchVolumeRule = SearchVolumeDisciplinesRule.getInstance();
+        return hasSearchVolumeRule.forSitemapGenerator(filters);
+    }
 }

package/dist/src/scholarships/policies/UnfilteredPolicy.d.ts

@@ -1,9 +1,9 @@
-import { BaseSeoIndexabilityPolicy } from '@/common/BaseSeoIndexabilityPolicy';
-import { FilterCombinations } from '@/enums/FilterCombinations';
-import { SeoDependencies } from '@/types/SeoDependencies';
+import { BaseSeoIndexabilityPolicy } from '../../common/BaseSeoIndexabilityPolicy';
+import { SeoDependencies } from '../../types/SeoDependencies';
+import { FilterCombinations } from '../../enums/FilterCombinations';
 export declare class UnfilteredPolicy extends BaseSeoIndexabilityPolicy {
     constructor(dependencies: SeoDependencies);
     protected matchesFilters(): Promise<boolean>;
-    generateUrls(): string[];
+    generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;
 }