@studyportals/fawkes 8.0.1-4 → 8.0.1-6

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

@@ -1,7 +1,7 @@
 import { PortalType } from '@studyportals/domain-client';
 import { SortingOptions } from '../../enums/SortingOptions';
 import { OrganisationsSeoIndexabilityPolicy } from './OrganisationsSeoIndexabilityPolicy';
-import { AtLeastTwoRankedResultsRule } from '../rules/AtLeastTwoRankedResultsRule';
+import { AtLeastSevenRankedResultsRule } from '../rules/AtLeastSevenRankedResultsRule';
 export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIndexabilityPolicy {
     indexablePortalTypes = [PortalType.MASTER];
     sortingOption = SortingOptions.UNIVERSITY_META_RANKING;
@@ -9,10 +9,10 @@ export class RankedOrganisationsSeoIndexabilityPolicy extends OrganisationsSeoIn
         let rankedResultsCountRule;
         if (super.isSitemapUrlGeneratorDependencies()) {
             const dependencies = this.dependencies;
-            rankedResultsCountRule = new AtLeastTwoRankedResultsRule(dependencies.rankingApiClient);
+            rankedResultsCountRule = new AtLeastSevenRankedResultsRule(dependencies.rankingApiClient);
         }
         else {
-            rankedResultsCountRule = new AtLeastTwoRankedResultsRule();
+            rankedResultsCountRule = new AtLeastSevenRankedResultsRule();
         }
         this.addRule(rankedResultsCountRule);
     }

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

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

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

@@ -0,0 +1,26 @@
+import { DependencyMissingError } from '../../errors/DependencyMissingError';
+export class AtLeastSevenRankedResultsRule {
+    minimumRankedResultsCount = 7;
+    rankingApiClient;
+    constructor(rankingApiClient) {
+        this.rankingApiClient = rankingApiClient;
+    }
+    forSearch(dependencies) {
+        const { applicationState } = dependencies;
+        const rankedResultsCount = applicationState.getRankedResultsCount();
+        return Promise.resolve(rankedResultsCount >= this.minimumRankedResultsCount);
+    }
+    async forSitemapGenerator(filterKeyValues) {
+        if (!this.rankingApiClient) {
+            throw new DependencyMissingError('RankingApiClient');
+        }
+        const rankedResultsCount = await this.rankingApiClient.getRankedOrganisationCount(filterKeyValues);
+        return rankedResultsCount >= this.minimumRankedResultsCount;
+    }
+    getName() {
+        return 'AtLeastTwoRankedResultsRule';
+    }
+    getDescription() {
+        return `At least ${this.minimumRankedResultsCount} ranked results are available`;
+    }
+}

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

@@ -9,7 +9,7 @@ export declare class AtLeastSevenResultsRule implements IRule {
     constructor(searchApiClient?: ISearchApiClient);
     forSearch(dependencies: ISearchDependencies): Promise<boolean>;
     forSitemapGeneratorWithPageNumber(filterKeyValues: FilterKeyValuesMap, pageNumber: number): Promise<boolean>;
-    forSitemapGenerator(): Promise<boolean>;
+    forSitemapGenerator(filterKeyValues: FilterKeyValuesMap): Promise<boolean>;
     getName(): string;
     getDescription(): string;
 }

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

@@ -18,13 +18,17 @@ export class AtLeastSevenResultsRule {
         const count = await this.searchApiClient.getCount(filterKeyValues);
         return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
     }
-    forSitemapGenerator() {
-        throw new Error('Method not implemented.');
+    async forSitemapGenerator(filterKeyValues) {
+        if (!this.searchApiClient) {
+            throw new DependencyMissingError('SearchApiClient');
+        }
+        const resultsCount = await this.searchApiClient?.getCount(filterKeyValues);
+        return resultsCount >= this.minimumResultsCount;
     }
     getName() {
         return 'AtLeastSevenResultsRule';
     }
     getDescription() {
-        return 'Is indexable if there are at least 2 results.';
+        return 'Is indexable if there are at least 6 results.';
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/fawkes",
-	"version": "8.0.1-4",
+	"version": "8.0.1-6",
 	"description": "A package to centralize SEO related logic for SBLP and Sitemap Generator.",
 	"files": [
 		"./dist"
@@ -11,7 +11,7 @@
 		"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 build",
+		"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",
@@ -92,7 +92,7 @@
 	"dependencies": {
 		"@studyportals/domain-client": "^6.3.0",
 		"@studyportals/ranking-api-interface": "^1.3.12",
-		"@studyportals/search-filters": "^6.0.0",
+		"@studyportals/search-filters": "^6.1.0",
 		"@studyportals/static-domain-data": "^6.1.0"
 	},
 	"optionalDependencies": {