npm - @studyportals/fawkes - Versions diffs - 7.4.2-4 → 8.0.1-1 - Mend

@studyportals/fawkes 7.4.2-4 → 8.0.1-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (256) hide show

package/dist/src/programmes/policies/DegreeAttendanceDiscipline.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -8,7 +8,6 @@ import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityP
 import { DegreePresenter } from '../../presenters/DegreePresenter';
 import { AttendancePresenter } from '../../presenters/AttendancePresenter';
 import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
-import { OnlineAttendanceRule } from '../../common/rules/OnlineAttendanceRule';
 export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy {
     name = 'Degree Attendance Discipline Policy';
     description = 'Determines indexing rules for pages filtered by degree type, attendance, and discipline.';
@@ -19,7 +18,6 @@ export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy
         new SingleValueSelectedForFilterRule(FilterKey.DISCIPLINES),
         new OnlyFiltersSelectedRule([FilterKey.DEGREE_TYPE, FilterKey.DELIVERY_METHOD, FilterKey.DISCIPLINES]),
         new DegreeAttendanceDisciplineSpecificRule(),
-        new OnlineAttendanceRule()
     ];
     constructor(dependencies) {
         super(dependencies);
@@ -35,22 +33,24 @@ export class DegreeAttendanceDiscipline extends ProgrammesBaseIndexabilityPolicy
             DegreeTypeFilterOptionValue.MSC,
             DegreeTypeFilterOptionValue.MBA
         ];
+        const onlineAttendance = attendanceFragments.find(a => a.id === 'online');
+        if (!onlineAttendance) {
+            return paths;
+        }
         for (const pageNumber of this.indexablePageNumbers) {
             for (const degreeId of allowedDegreeIds) {
                 const degree = degreeFragments.find(d => d.id === degreeId);
                 if (!degree)
                     continue;
                 for (const discipline of disciplineFragments) {
-                    for (const attendance of attendanceFragments) {
-                        const filterKeyValues = new Map([
-                            [FilterKey.DEGREE_TYPE, [degree.id]],
-                            [FilterKey.DELIVERY_METHOD, [attendance.id]],
-                            [FilterKey.DISCIPLINES, [discipline.id]]
-                        ]);
-                        const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
-                        if (result) {
-                            paths.push(this.getPathWithPageNumber(`${degree.path}/${attendance.path}/${discipline.path}`, pageNumber));
-                        }
+                    const filterKeyValues = new Map([
+                        [FilterKey.DEGREE_TYPE, [degree.id]],
+                        [FilterKey.DELIVERY_METHOD, [onlineAttendance.id]],
+                        [FilterKey.DISCIPLINES, [discipline.id]]
+                    ]);
+                    const result = await this.checkRulesForSitemapWithPageNumber(filterKeyValues, pageNumber);
+                    if (result) {
+                        paths.push(this.getPathWithPageNumber(`${degree.path}/${onlineAttendance.path}/${discipline.path}`, pageNumber));
                     }
                 }
             }

package/dist/src/programmes/policies/DegreeCountryAttendance.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DegreeCountryAttendance.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DegreeCountryDiscipline.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DegreeCountryDiscipline.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DegreeCountryTuitionFee.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DegreeCountryTuitionFee.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
-import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
+import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Discipline.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/Discipline.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineAttendance.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineAttendance.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineContinent.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineContinent.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineCountry.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineCountry.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineCountryEducationalForm.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineCountryEducationalForm.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -9,7 +9,7 @@ import { CountryPresenter } from '../../presenters/CountryPresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class DisciplineCountryEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Country Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by discipline,
+    description = `Determines indexing rules for pages filtered by discipline,
 		country, and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.DISCIPLINES, FilterKey.COUNTRY, FilterKey.EDUCATIONAL_FORM];
     rules = [

package/dist/src/programmes/policies/DisciplineDegree.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineDegree.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineDuration.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineDuration.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineEducationalForm.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineEducationalForm.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
@@ -8,7 +8,7 @@ import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
 import { EducationalFormPresenter } from '../../presenters/EducationalFormPresenter';
 export class DisciplineEducationalForm extends ProgrammesBaseIndexabilityPolicy {
     name = 'Discipline Educational Form Policy';
-    description = `Determines indexing rules for pages filtered by both discipline,
+    description = `Determines indexing rules for pages filtered by both discipline,
 		and educational form (academic, semester, summer school, etc.).`;
     filterKeys = [FilterKey.DISCIPLINES, FilterKey.EDUCATIONAL_FORM];
     rules = [

package/dist/src/programmes/policies/DisciplineFormat.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineFormat.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineTuitionFee.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineTuitionFee.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineTuitionFeeAttendance.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/DisciplineTuitionFeeAttendance.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/SpecialProgrammes.d.ts CHANGED Viewed

@@ -1,14 +1,15 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ErasmusOrJointSpecialProgrammesRule } from '../rules/ErasmusOrJointSpecialProgrammesRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { IProgrammeSeoDependencies } from '../types/IProgrammeSeoDependencies';
 export declare class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     readonly name: string;
     readonly description: string;
     readonly filterKeys: FilterKey[];
-    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule)[];
+    protected readonly rules: (SingleValueSelectedForFilterRule | OnlyFiltersSelectedRule | ErasmusOrJointSpecialProgrammesRule)[];
     constructor(dependencies: IProgrammeSeoDependencies);
     protected generateUrls(): Promise<string[]>;
     get filterCombination(): FilterCombinations;

package/dist/src/programmes/policies/SpecialProgrammes.js CHANGED Viewed

@@ -1,7 +1,8 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';
+import { ErasmusOrJointSpecialProgrammesRule } from '../rules/ErasmusOrJointSpecialProgrammesRule';
 import { ProgrammesBaseIndexabilityPolicy } from '../ProgrammesBaseIndexabilityPolicy';
 import { SpecialProgrammesPresenter } from '../../presenters/SpecialProgrammesPresenter';
 export class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
@@ -10,7 +11,8 @@ export class SpecialProgrammes extends ProgrammesBaseIndexabilityPolicy {
     filterKeys = [FilterKey.SPECIAL_PROGRAMMES];
     rules = [
         new SingleValueSelectedForFilterRule(FilterKey.SPECIAL_PROGRAMMES),
-        new OnlyFiltersSelectedRule([FilterKey.SPECIAL_PROGRAMMES])
+        new OnlyFiltersSelectedRule([FilterKey.SPECIAL_PROGRAMMES]),
+        new ErasmusOrJointSpecialProgrammesRule()
     ];
     constructor(dependencies) {
         super(dependencies);

package/dist/src/programmes/policies/TuitionFee.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/TuitionFee.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { OnlyFiltersSelectedRule } from '../../common/rules/OnlyFiltersSelectedRule';
 import { SingleValueSelectedForFilterRule } from '../../common/rules/SingleValueSelectedForFilterRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';

package/dist/src/programmes/policies/index.d.ts CHANGED Viewed

@@ -18,6 +18,7 @@ export * from './DegreeCountryDiscipline';
 export * from './DegreeCountryTuitionFee';
 export * from './DisciplineDegree';
 export * from './Discipline';
+export * from './DisciplineArea';
 export * from './DisciplineAttendance';
 export * from './DisciplineContinent';
 export * from './DisciplineCountry';
@@ -31,29 +32,3 @@ export * from './DisciplineTuitionFeeAttendance';
 export * from './SpecialProgrammes';
 export * from './TuitionFee';
 export * from './Unfiltered';
-export * from './Format';
-export * from './DegreeFormat';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeArea';
-export * from './DegreeTuitionFee';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeContinent';
-export * from './AttendanceTuitionFee';
-export * from './Duration';
-export * from './AttendanceDuration';
-export * from './DegreeAreaTuitionFee';
-export * from './DisciplineContinentAttendance';
-export * from './DegreeContinentTuitionFee';
-export * from './AttendanceFormat';
-export * from './ContinentFormat';
-export * from './AttendanceContinent';
-export * from './DegreeDuration';
-export * from './ContinentSpecialProgrammes';
-export * from './CountrySpecialProgrammes';
-export * from './AttendanceArea';
-export * from './DegreeFormatTuitionFee';
-export * from './ContinentDuration';
-export * from './DegreeAttendanceFormat';
-export * from './DisciplineCountryAttendance';
-export * from './DisciplineCountryFormat';
-export * from './DegreeSpecialProgrammes';

package/dist/src/programmes/policies/index.js CHANGED Viewed

@@ -18,6 +18,7 @@ export * from './DegreeCountryDiscipline';
 export * from './DegreeCountryTuitionFee';
 export * from './DisciplineDegree';
 export * from './Discipline';
+export * from './DisciplineArea';
 export * from './DisciplineAttendance';
 export * from './DisciplineContinent';
 export * from './DisciplineCountry';
@@ -31,29 +32,3 @@ export * from './DisciplineTuitionFeeAttendance';
 export * from './SpecialProgrammes';
 export * from './TuitionFee';
 export * from './Unfiltered';
-export * from './Format';
-export * from './DegreeFormat';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeArea';
-export * from './DegreeTuitionFee';
-export * from './DegreeAttendanceTuitionFee';
-export * from './DegreeContinent';
-export * from './AttendanceTuitionFee';
-export * from './Duration';
-export * from './AttendanceDuration';
-export * from './DegreeAreaTuitionFee';
-export * from './DisciplineContinentAttendance';
-export * from './DegreeContinentTuitionFee';
-export * from './AttendanceFormat';
-export * from './ContinentFormat';
-export * from './AttendanceContinent';
-export * from './DegreeDuration';
-export * from './ContinentSpecialProgrammes';
-export * from './CountrySpecialProgrammes';
-export * from './AttendanceArea';
-export * from './DegreeFormatTuitionFee';
-export * from './ContinentDuration';
-export * from './DegreeAttendanceFormat';
-export * from './DisciplineCountryAttendance';
-export * from './DisciplineCountryFormat';
-export * from './DegreeSpecialProgrammes';

package/dist/src/programmes/rules/AffordableTuitionFeeRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
 export class AffordableTuitionFeeRule extends BaseProgrammeFilterKeyValueRule {
     constructor() {

package/dist/src/programmes/rules/AtLeastSevenResultsRule.js CHANGED Viewed

@@ -15,7 +15,7 @@ export class AtLeastSevenResultsRule {
         if (!this.searchApiClient) {
             throw new DependencyMissingError('SearchApiClient');
         }
-        const count = await this.searchApiClient.getProgrammeCount(filterKeyValues);
+        const count = await this.searchApiClient.getCount(filterKeyValues);
         return count >= (pageNumber - 1) * this.maximumPageSize + this.minimumResultsCount;
     }
     forSitemapGenerator() {

package/dist/src/programmes/rules/DegreeAttendanceDisciplineRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeAttendanceDisciplineRule extends BaseProgrammeRule {
     allowedDegrees = [

package/dist/src/programmes/rules/DegreeAttendanceDisciplineSpecificRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeAttendanceDisciplineSpecificRule extends BaseProgrammeRule {
     allowedDegrees = [

package/dist/src/programmes/rules/DegreeCountryAttendanceSpecificRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { AttendanceFilterOptionValue, FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { AttendanceFilterOptionValue, FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryAttendanceSpecificRule extends BaseProgrammeRule {
     mba = DegreeTypeFilterOptionValue.MBA.valueOf();

package/dist/src/programmes/rules/DegreeCountryDisciplineSpecificRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryDisciplineSpecificRule extends BaseProgrammeRule {
     educationDisciplineIds = [

package/dist/src/programmes/rules/DegreeCountryTuitionFeeSpecificRule.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
-import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
+import { TuitionFeeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeCountryTuitionFeeSpecificRule extends BaseProgrammeRule {
     validDegreeValues = [DegreeTypeFilterOptionValue.MBA, DegreeTypeFilterOptionValue.LLM];

package/dist/src/programmes/rules/DegreeDisciplineRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class DegreeDisciplineRule extends BaseProgrammeRule {
     degreesAcceptingAllDisciplines = [

package/dist/src/programmes/rules/IndexableDegreeRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class IndexableDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies) {

package/dist/src/programmes/rules/IndexableDurationRule.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 import { DurationPresenter } from '../../presenters/DurationPresenter';
 export class IndexableDurationRule extends BaseProgrammeRule {

package/dist/src/programmes/rules/IndexableEducationalFormRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { EducationalFormFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { EducationalFormFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class IndexableEducationalFormRule extends BaseProgrammeRule {
     forSearch(dependencies) {

package/dist/src/programmes/rules/MbaDegreeRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
 export class MbaDegreeRule extends BaseProgrammeFilterKeyValueRule {
     constructor() {

package/dist/src/programmes/rules/MbaOrMscDegreeRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DegreeTypeFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeRule } from '../BaseProgrammeRule';
 export class MbaOrMscDegreeRule extends BaseProgrammeRule {
     forSearch(dependencies) {

package/dist/src/programmes/rules/OneYearDurationRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { DurationFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { DurationFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
 export class OneYearDurationRule extends BaseProgrammeFilterKeyValueRule {
     constructor() {

package/dist/src/programmes/rules/PartTimeFormatRule.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
-import { FormatFilterOptionValue } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
+import { FormatFilterOptionValue } from '@studyportals/search-filters';
 import { BaseProgrammeFilterKeyValueRule } from '../BaseProgrammeFilterKeyValueRule';
 export class PartTimeFormatRule extends BaseProgrammeFilterKeyValueRule {
     constructor() {

package/dist/src/programmes/types/IProgrammeSitemapUrlGenerator.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { ISitemapUrlGenerator } from '../../common/ISitemapUrlGenerator';
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 export interface IProgrammeSitemapUrlGenerator extends ISitemapUrlGenerator {
     readonly filterKeys: FilterKey[];
 }

package/dist/src/scholarships/policies/Area.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { ExceptAustraliaAreasRule } from '../rules/ExceptAustaliaAreasRule';
 import { SearchVolumeAreasRule } from '../rules/SearchVolumeAreasRule';

package/dist/src/scholarships/policies/Country.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { FilterCombinations } from '../../enums/FilterCombinations';
 import { SearchVolumeCountriesRule } from '../rules/SearchVolumeCountriesRule';
 import { CountryPresenter } from '../../presenters/CountryPresenter';

package/dist/src/scholarships/policies/Discipline.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FilterKey } from '@studyportals/search-filters/search_filters_interfaces';
+import { FilterKey } from '@studyportals/search-filters';
 import { DisciplinePresenter } from '../../presenters/DisciplinePresenter';
 import { SearchVolumeDisciplinesRule } from '../../scholarships/rules/SearchVolumeDisciplinesRule';
 import { FilterCombinations } from '../../enums/FilterCombinations';