@studyportals/fawkes 8.0.2-1 → 8.0.2-11

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

@@ -15,6 +15,8 @@ export declare enum FilterCombinations {
     COUNTRY_DURATION_DEGREE = "countryDurationDegree",
     COUNTRY_SPECIAL_PROGRAMMES = "countrySpecialProgrammes",
     CONTINENT_FORMAT = "continentFormat",
+    CONTINENT_DURATION = "continentDuration",
+    CONTINENT_SPECIAL_PROGRAMMES = "continentSpecialProgrammes",
     DISCIPLINE_AREA = "disciplineArea",
     DISCIPLINE_ATTENDANCE = "disciplineAttendance",
     DISCIPLINE_COUNTRY = "disciplineCountry",

package/dist/src/enums/FilterCombinations.js

@@ -16,6 +16,8 @@ export var FilterCombinations;
     FilterCombinations["COUNTRY_DURATION_DEGREE"] = "countryDurationDegree";
     FilterCombinations["COUNTRY_SPECIAL_PROGRAMMES"] = "countrySpecialProgrammes";
     FilterCombinations["CONTINENT_FORMAT"] = "continentFormat";
+    FilterCombinations["CONTINENT_DURATION"] = "continentDuration";
+    FilterCombinations["CONTINENT_SPECIAL_PROGRAMMES"] = "continentSpecialProgrammes";
     FilterCombinations["DISCIPLINE_AREA"] = "disciplineArea";
     FilterCombinations["DISCIPLINE_ATTENDANCE"] = "disciplineAttendance";
     FilterCombinations["DISCIPLINE_COUNTRY"] = "disciplineCountry";

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/AttendanceArea.js

@@ -14,7 +14,7 @@ export class AttendanceArea extends ProgrammesBaseIndexabilityPolicy {
         new SingleValueSelectedForFilterRule(FilterKey.AREA),
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.DELIVERY_METHOD),
-        new OnlyFiltersSelectedRule([FilterKey.AREA, FilterKey.DELIVERY_METHOD]),
+        new OnlyFiltersSelectedRule([FilterKey.AREA, FilterKey.DELIVERY_METHOD, FilterKey.COUNTRY]),
         new OnlineAttendanceRule()
     ];
     constructor(dependencies) {

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/server-side';
+import { DurationFilterOptionValue, FilterKey } from '@studyportals/search-filters/server-side';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -22,7 +22,7 @@ export class ContinentDuration extends ProgrammesBaseIndexabilityPolicy {
         const durationFragments = DurationPresenter.getInstance().getFragments();
         const continentFragments = ContinentPresenter.getInstance().getFragments();
         const paths = [];
-        const allowedDurationIds = ["[360,360]"];
+        const allowedDurationIds = [DurationFilterOptionValue.ONE_YEAR];
         const allowedDurations = durationFragments.filter(duration => allowedDurationIds.includes(duration.id));
         for (const pageNumber of this.indexablePageNumbers) {
             for (const duration of allowedDurations) {
@@ -41,6 +41,6 @@ export class ContinentDuration extends ProgrammesBaseIndexabilityPolicy {
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.CONTINENT_FORMAT;
+        return FilterCombinations.CONTINENT_DURATION;
     }
 }

package/dist/src/programmes/policies/ContinentFormat.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';
@@ -24,7 +24,7 @@ export class ContinentFormat extends ProgrammesBaseIndexabilityPolicy {
         const formatFragments = FormatPresenter.getInstance().getFragments();
         const continentFragments = ContinentPresenter.getInstance().getFragments();
         const paths = [];
-        const allowedFormatIds = ['parttime'];
+        const allowedFormatIds = [FormatFilterOptionValue.PART_TIME];
         const allowedFormats = formatFragments.filter(format => allowedFormatIds.includes(format.id));
         for (const pageNumber of this.indexablePageNumbers) {
             for (const format of allowedFormats) {

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

@@ -41,6 +41,6 @@ export class ContinentSpecialProgrammes extends ProgrammesBaseIndexabilityPolicy
         return paths;
     }
     get filterCombination() {
-        return FilterCombinations.CONTINENT_FORMAT;
+        return FilterCombinations.CONTINENT_SPECIAL_PROGRAMMES;
     }
 }

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

@@ -9,13 +9,13 @@ import { TuitionFeePresenter } from '../../presenters/TuitionFeePresenter';
 export class DegreeAreaTuitionFee extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Area Tuition fee Policy';
     description = 'Controls indexing of pages filtered by geographic areas and tuition fees.';
-    filterKeys = [FilterKey.AREA, FilterKey.TUITION_FEE];
+    filterKeys = [FilterKey.AREA, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.AREA),
         new SingleValueSelectedForFilterRule(FilterKey.COUNTRY),
         new SingleValueSelectedForFilterRule(FilterKey.DEGREE_TYPE),
         new SingleValueSelectedForFilterRule(FilterKey.TUITION_FEE),
-        new OnlyFiltersSelectedRule([FilterKey.AREA, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE])
+        new OnlyFiltersSelectedRule([FilterKey.AREA, FilterKey.DEGREE_TYPE, FilterKey.TUITION_FEE, FilterKey.COUNTRY])
     ];
     constructor(dependencies) {
         super(dependencies);

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

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/server-side';
+import { FilterKey, SpecialProgrammesFilterOptionValue } from '@studyportals/search-filters/server-side';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -22,7 +22,7 @@ export class DisciplineSpecialProgrammes extends ProgrammesBaseIndexabilityPolic
         const specialProgrammesFragments = SpecialProgrammesPresenter.getInstance().getFragments();
         const disciplineFragments = DisciplinePresenter.getInstance().getFragments();
         const paths = [];
-        const validSpecialProgrammesIds = ['erasmus'];
+        const validSpecialProgrammesIds = [SpecialProgrammesFilterOptionValue.ERASMUS_MUNDUS];
         const validSpecialProgrammes = specialProgrammesFragments.filter(specialProgramme => validSpecialProgrammesIds.includes(specialProgramme.id));
         for (const pageNumber of this.indexablePageNumbers) {
             for (const specialProgramme of validSpecialProgrammes) {

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 (filterKeyValues.has(FilterKey.DURATION)) {
+            const filterKey = FilterKey.DURATION;
+            const filterValue = filterKeyValues.get(filterKey);
+            console.log(`DEBUG: Duration filter applied alone, filter key: ${filterKey}, filter value: ${filterValue} found results: ${count}`); // eslint-disable-line no-console
+        }
         return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
     }
     forSitemapGenerator() {

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

@@ -3,7 +3,6 @@ export class BaseSitemapUrlGeneratorManager {
     async generateUrls() {
         const map = new Map();
         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

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

@@ -1,6 +1,64 @@
 import { DependencyTypes } from '../enums/DependencyTypes';
 import { BaseSitemapUrlGeneratorManager } from './BaseSitemapUrlGeneratorManager';
-import { Area, Attendance, AttendanceDegree, Continent, ContinentTuitionFee, Country, CountryAttendance, Discipline, SpecialProgrammes, TuitionFee, Unfiltered, CountryAttendanceDegree, CountryDuration, CountryDurationDegree, CountryEducationalForm, CountryFormat, CountryTuitionFee, DegreeAttendanceDiscipline, DegreeCountryAttendance, DegreeCountryDiscipline, DegreeCountryTuitionFee, Format, DisciplineAttendance, DisciplineContinent, DisciplineCountry, DisciplineCountryEducationalForm, DisciplineDegree, DisciplineDuration, DisciplineEducationalForm, DisciplineFormat, DisciplineTuitionFee, DisciplineTuitionFeeAttendance, CountryDegree, DegreeFormat, DegreeContinent, DegreeAttendanceTuitionFee, DegreeArea, DegreeTuitionFee, AttendanceTuitionFee, Duration, AttendanceDuration, DegreeAreaTuitionFee, DisciplineContinentAttendance, DegreeContinentTuitionFee, AttendanceFormat, ContinentFormat, AttendanceContinent, DegreeDuration, ContinentSpecialProgrammes, CountrySpecialProgrammes, AttendanceArea, DegreeFormatTuitionFee, ContinentDuration, DegreeAttendanceFormat, DisciplineCountryAttendance, DisciplineCountryFormat, DegreeSpecialProgrammes } from '../programmes/policies';
+import { 
+// Area,
+// Attendance,
+// AttendanceDegree,
+Continent, 
+// ContinentTuitionFee,
+// Country,
+// CountryAttendance,
+// Discipline,
+// SpecialProgrammes,
+// TuitionFee,
+// Unfiltered,
+// CountryAttendanceDegree,
+// CountryDuration,
+// CountryDurationDegree,
+// CountryEducationalForm,
+// CountryFormat,
+// CountryTuitionFee,
+// DegreeAttendanceDiscipline,
+// DegreeCountryAttendance,
+// DegreeCountryDiscipline,
+// DegreeCountryTuitionFee,
+Format, 
+// DisciplineAttendance,
+// DisciplineContinent,
+// DisciplineCountry,
+// DisciplineCountryEducationalForm,
+// DisciplineDegree,
+// DisciplineDuration,
+// DisciplineEducationalForm,
+// DisciplineFormat,
+// DisciplineTuitionFee,
+// DisciplineTuitionFeeAttendance,
+// CountryDegree,
+// DegreeFormat,
+// DegreeContinent,
+// DegreeAttendanceTuitionFee,
+// DegreeArea,
+// DegreeTuitionFee,
+// AttendanceTuitionFee,
+Duration, 
+// AttendanceDuration,
+DegreeAreaTuitionFee, 
+// DisciplineContinentAttendance,
+// DegreeContinentTuitionFee,
+// AttendanceFormat,
+// ContinentFormat,
+// AttendanceContinent,
+// DegreeDuration,
+ContinentSpecialProgrammes,
+// CountrySpecialProgrammes,
+// AttendanceArea,
+// DegreeFormatTuitionFee,
+// ContinentDuration,
+// DegreeAttendanceFormat,
+// DisciplineCountryAttendance,
+// DisciplineCountryFormat,
+// DegreeSpecialProgrammes,
+ } from '../programmes/policies';
 import { FilterKey } from '@studyportals/search-filters/server-side';
 import { AreaPresenter } from '../presenters/AreaPresenter';
 import { AttendancePresenter } from '../presenters/AttendancePresenter';
@@ -13,7 +71,7 @@ import { SpecialProgrammesPresenter } from '../presenters/SpecialProgrammesPrese
 import { DurationPresenter } from '../presenters/DurationPresenter';
 import { EducationalFormPresenter } from '../presenters/EducationalFormPresenter';
 import { FormatPresenter } from '../presenters/FormatPresenter';
-import { Degree } from '../programmes/policies/Degree';
+// import { Degree } from '../programmes/policies/Degree';
 export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGeneratorManager {
     portalType;
     policies;
@@ -27,64 +85,64 @@ export class ProgrammesSitemapUrlGeneratorManager extends BaseSitemapUrlGenerato
             portalType
         };
         this.policies = [
-            new Area(dependencies),
-            new Attendance(dependencies),
-            new AttendanceDegree(dependencies),
-            new AttendanceDuration(dependencies),
-            new AttendanceContinent(dependencies),
+            // new Area(dependencies),
+            // new Attendance(dependencies),
+            // new AttendanceDegree(dependencies),
+            // new AttendanceDuration(dependencies),
+            // new AttendanceContinent(dependencies),
             new Continent(dependencies),
-            new ContinentTuitionFee(dependencies),
-            new Country(dependencies),
-            new CountryAttendance(dependencies),
-            new Discipline(dependencies),
-            new Degree(dependencies),
-            new SpecialProgrammes(dependencies),
-            new TuitionFee(dependencies),
-            new Unfiltered(dependencies),
+            // new ContinentTuitionFee(dependencies),
+            // new Country(dependencies),
+            // new CountryAttendance(dependencies),
+            // new Discipline(dependencies),
+            // new Degree(dependencies),
+            // new SpecialProgrammes(dependencies),
+            // new TuitionFee(dependencies),
+            // new Unfiltered(dependencies),
             new Duration(dependencies),
-            new CountryAttendanceDegree(dependencies),
-            new CountryDegree(dependencies),
-            new CountryDuration(dependencies),
-            new CountryDurationDegree(dependencies),
-            new CountryEducationalForm(dependencies),
-            new CountryFormat(dependencies),
-            new CountryTuitionFee(dependencies),
-            new CountrySpecialProgrammes(dependencies),
-            new ContinentFormat(dependencies),
+            // new CountryAttendanceDegree(dependencies),
+            // new CountryDegree(dependencies),
+            // new CountryDuration(dependencies),
+            // new CountryDurationDegree(dependencies),
+            // new CountryEducationalForm(dependencies),
+            // new CountryFormat(dependencies),
+            // new CountryTuitionFee(dependencies),
+            // new CountrySpecialProgrammes(dependencies),
+            // new ContinentFormat(dependencies),
             new ContinentSpecialProgrammes(dependencies),
-            new ContinentDuration(dependencies),
-            new DegreeAttendanceDiscipline(dependencies),
-            new DegreeCountryAttendance(dependencies),
-            new DegreeCountryDiscipline(dependencies),
-            new DegreeCountryTuitionFee(dependencies),
-            new DegreeFormat(dependencies),
-            new DegreeContinent(dependencies),
-            new DegreeAttendanceTuitionFee(dependencies),
-            new DegreeArea(dependencies),
-            new DegreeTuitionFee(dependencies),
+            // new ContinentDuration(dependencies),
+            // new DegreeAttendanceDiscipline(dependencies),
+            // new DegreeCountryAttendance(dependencies),
+            // new DegreeCountryDiscipline(dependencies),
+            // new DegreeCountryTuitionFee(dependencies),
+            // new DegreeFormat(dependencies),
+            // new DegreeContinent(dependencies),
+            // new DegreeAttendanceTuitionFee(dependencies),
+            // new DegreeArea(dependencies),
+            // new DegreeTuitionFee(dependencies),
             new DegreeAreaTuitionFee(dependencies),
-            new DegreeContinentTuitionFee(dependencies),
-            new DegreeDuration(dependencies),
-            new DegreeFormatTuitionFee(dependencies),
-            new DegreeAttendanceFormat(dependencies),
-            new DegreeSpecialProgrammes(dependencies),
+            // new DegreeContinentTuitionFee(dependencies),
+            // new DegreeDuration(dependencies),
+            // new DegreeFormatTuitionFee(dependencies),
+            // new DegreeAttendanceFormat(dependencies),
+            // new DegreeSpecialProgrammes(dependencies),
             new Format(dependencies),
-            new DisciplineAttendance(dependencies),
-            new DisciplineContinent(dependencies),
-            new DisciplineCountry(dependencies),
-            new DisciplineCountryEducationalForm(dependencies),
-            new DisciplineDegree(dependencies),
-            new DisciplineDuration(dependencies),
-            new DisciplineEducationalForm(dependencies),
-            new DisciplineFormat(dependencies),
-            new DisciplineTuitionFee(dependencies),
-            new DisciplineTuitionFeeAttendance(dependencies),
-            new DisciplineContinentAttendance(dependencies),
-            new DisciplineCountryAttendance(dependencies),
-            new DisciplineCountryFormat(dependencies),
-            new AttendanceTuitionFee(dependencies),
-            new AttendanceFormat(dependencies),
-            new AttendanceArea(dependencies)
+            // new DisciplineAttendance(dependencies),
+            // new DisciplineContinent(dependencies),
+            // new DisciplineCountry(dependencies),
+            // new DisciplineCountryEducationalForm(dependencies),
+            // new DisciplineDegree(dependencies),
+            // new DisciplineDuration(dependencies),
+            // new DisciplineEducationalForm(dependencies),
+            // new DisciplineFormat(dependencies),
+            // new DisciplineTuitionFee(dependencies),
+            // new DisciplineTuitionFeeAttendance(dependencies),
+            // new DisciplineContinentAttendance(dependencies),
+            // new DisciplineCountryAttendance(dependencies),
+            // new DisciplineCountryFormat(dependencies),
+            // new AttendanceTuitionFee(dependencies),
+            // new AttendanceFormat(dependencies),
+            // new AttendanceArea(dependencies)
         ];
         this.presenters.set(FilterKey.AREA, AreaPresenter.getInstance());
         this.presenters.set(FilterKey.DELIVERY_METHOD, AttendancePresenter.getInstance());

package/package.json

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