@studyportals/fawkes 8.0.2-0 → 8.0.2-2

package/dist/src/programmes/ProgrammesBaseIndexabilityPolicy.js

@@ -28,7 +28,6 @@ export class ProgrammesBaseIndexabilityPolicy extends BaseSeoIndexabilityPolicy
             else {
                 result = await rule.forSitemapGenerator(filterKeyValues);
             }
-            // console.log("RuleName: " + rule.getName() + " Rule result: " + result); // eslint-disable-line
             if (!result) {
                 return false;
             }

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

@@ -4,11 +4,12 @@ import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValue
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
+import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
 export declare class ContinentFormat extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | PartTimeFormatRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

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

@@ -5,6 +5,7 @@ import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { ContinentPresenter } from '../../presenters/ContinentPresenter';
 import { FormatPresenter } from '../../presenters/FormatPresenter';
+import { PartTimeFormatRule } from '../rules/PartTimeFormatRule';
 export class ContinentFormat extends ProgrammesBaseIndexabilityPolicy {
     name = 'Continent Format Policy';
     description = 'Determines indexing rules for pages filtered by continent and format.';
@@ -13,6 +14,7 @@ export class ContinentFormat extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.ATTENDANCE),
         new SingleValueSelectedForFilterRule(FilterKey.CONTINENT),
         new OnlyFiltersSelectedRule([FilterKey.ATTENDANCE, FilterKey.CONTINENT]),
+        new PartTimeFormatRule()
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterKey, FormatFilterOptionValue } from '@studyportals/search-filters/server-side';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -23,8 +23,7 @@ export class DegreeFormat extends ProgrammesBaseIndexabilityPolicy {
     async generateUrls() {
         const formatFragments = FormatPresenter.getInstance().getFragments();
         const degreeFragments = DegreePresenter.getInstance().getFragments();
-        // Only allow fulltime and parttime formats for degree combinations
-        const allowedFormatIds = ["fulltime", "parttime"];
+        const allowedFormatIds = [FormatFilterOptionValue.PART_TIME, FormatFilterOptionValue.FULL_TIME];
         const allowedFormats = formatFragments.filter(format => allowedFormatIds.includes(format.id));
         const paths = [];
         for (const pageNumber of this.indexablePageNumbers) {

package/dist/src/programmes/rules/MinimumAmountOfResultsRule.js

@@ -1,4 +1,5 @@
 import { DependencyMissingError } from '../../errors/DependencyMissingError';
+import { FilterKey } from '@studyportals/search-filters/server-side';
 export class MinimumAmountOfResultsRule {
     minimumResultsCount = 7;
     maximumPageSize = 20;
@@ -16,6 +17,11 @@ export class MinimumAmountOfResultsRule {
             throw new DependencyMissingError('SearchApiClient');
         }
         const count = await this.searchApiClient.getCount(filterKeyValues);
+        if (Object.keys(filterKeyValues).includes(FilterKey.DURATION) && Object.keys(filterKeyValues).length === 1) {
+            const filterKey = FilterKey.DURATION;
+            const filterValue = filterKeyValues.get(filterKey);
+            console.log(`DEBUG: Duration filter applied alone, filter: ${filterValue} found results: ${count}`); // eslint-disable-line no-console
+        }
         return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
     }
     forSitemapGenerator() {

package/package.json

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