@studyportals/search-api-interface 1.2.3-1 → 1.2.3-12

package/index.d.ts

@@ -5,10 +5,12 @@ import { IOrganisationSearchResponse } from "./src/organisations/IOrganisationSe
 import { OrganisationSearchFilters } from "./src/organisations/OrganisationSearchFilters";
 import { OrganisationSearchInput } from "./src/organisations/OrganisationSearchInput";
 import { SearchApiOrganisationClient } from "./src/organisations/SearchApiOrganisationClient";
+import { IProgrammeResult } from "./src/programmes/IProgrammeResult";
 import { IProgrammeSearchFilters } from "./src/programmes/IProgrammeSearchFilters";
 import { IProgrammeSearchResponse } from "./src/programmes/IProgrammeSearchResponse";
 import { ProgrammeSearchFilters } from "./src/programmes/ProgrammeSearchFilters";
 import { ProgrammeSearchInput } from "./src/programmes/ProgrammeSearchInput";
-import { RangeDTO } from "./src/programmes/RangeDTO";
 import { SearchApiProgrammeClient } from "./src/programmes/SearchApiProgrammeClient";
-export { SearchApiOrganisationClient, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationSearchFilters, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, DegreeTypeEnum, DeliveryMethodEnum, RangeDTO };
+import { FacetOptionValue } from "./src/facets/FacetOptionValue";
+import { FacetResponseType } from "./src/facets/FacetResponseType";
+export { SearchApiOrganisationClient, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationSearchFilters, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, IProgrammeResult, DegreeTypeEnum, DeliveryMethodEnum, FacetOptionValue, FacetResponseType };

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeliveryMethodEnum = exports.DegreeTypeEnum = exports.ProgrammeSearchFilters = exports.IProgrammeSearchFilters = exports.SearchApiProgrammeClient = exports.OrganisationSearchFilters = exports.IOrganisationSearchFilters = exports.SearchApiOrganisationClient = void 0;
+exports.FacetOptionValue = exports.DeliveryMethodEnum = exports.DegreeTypeEnum = exports.IProgrammeResult = exports.ProgrammeSearchFilters = exports.IProgrammeSearchFilters = exports.SearchApiProgrammeClient = exports.OrganisationSearchFilters = exports.IOrganisationSearchFilters = exports.SearchApiOrganisationClient = void 0;
 const DegreeTypeEnum_1 = require("./src/organisations/DegreeTypeEnum");
 Object.defineProperty(exports, "DegreeTypeEnum", { enumerable: true, get: function () { return DegreeTypeEnum_1.DegreeTypeEnum; } });
 const DeliveryMethodEnum_1 = require("./src/organisations/DeliveryMethodEnum");
@@ -11,10 +11,14 @@ const OrganisationSearchFilters_1 = require("./src/organisations/OrganisationSea
 Object.defineProperty(exports, "OrganisationSearchFilters", { enumerable: true, get: function () { return OrganisationSearchFilters_1.OrganisationSearchFilters; } });
 const SearchApiOrganisationClient_1 = require("./src/organisations/SearchApiOrganisationClient");
 Object.defineProperty(exports, "SearchApiOrganisationClient", { enumerable: true, get: function () { return SearchApiOrganisationClient_1.SearchApiOrganisationClient; } });
+const IProgrammeResult_1 = require("./src/programmes/IProgrammeResult");
+Object.defineProperty(exports, "IProgrammeResult", { enumerable: true, get: function () { return IProgrammeResult_1.IProgrammeResult; } });
 const IProgrammeSearchFilters_1 = require("./src/programmes/IProgrammeSearchFilters");
 Object.defineProperty(exports, "IProgrammeSearchFilters", { enumerable: true, get: function () { return IProgrammeSearchFilters_1.IProgrammeSearchFilters; } });
 const ProgrammeSearchFilters_1 = require("./src/programmes/ProgrammeSearchFilters");
 Object.defineProperty(exports, "ProgrammeSearchFilters", { enumerable: true, get: function () { return ProgrammeSearchFilters_1.ProgrammeSearchFilters; } });
 const SearchApiProgrammeClient_1 = require("./src/programmes/SearchApiProgrammeClient");
 Object.defineProperty(exports, "SearchApiProgrammeClient", { enumerable: true, get: function () { return SearchApiProgrammeClient_1.SearchApiProgrammeClient; } });
+const FacetOptionValue_1 = require("./src/facets/FacetOptionValue");
+Object.defineProperty(exports, "FacetOptionValue", { enumerable: true, get: function () { return FacetOptionValue_1.FacetOptionValue; } });
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AA4BnE,+FA5BQ,+BAAc,OA4BR;AA3Bf,+EAA4E;AA4B3E,mGA5BQ,uCAAkB,OA4BR;AA3BnB,+FAA4F;AAe3F,2GAfQ,uDAA0B,OAeR;AAb3B,6FAA0F;AAczF,0GAdQ,qDAAyB,OAcR;AAZ1B,iGAA8F;AAS7F,4GATQ,yDAA2B,OASR;AAR5B,sFAAmF;AAelF,wGAfQ,iDAAuB,OAeR;AAbxB,oFAAiF;AAchF,uGAdQ,+CAAsB,OAcR;AAXvB,wFAAqF;AAQpF,yGARQ,mDAAwB,OAQR"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AA+BnE,+FA/BQ,+BAAc,OA+BR;AA9Bf,+EAA4E;AA+B3E,mGA/BQ,uCAAkB,OA+BR;AA9BnB,+FAA4F;AAiB3F,2GAjBQ,uDAA0B,OAiBR;AAf3B,6FAA0F;AAgBzF,0GAhBQ,qDAAyB,OAgBR;AAd1B,iGAA8F;AAW7F,4GAXQ,yDAA2B,OAWR;AAV5B,wEAAqE;AAsBpE,iGAtBQ,mCAAgB,OAsBR;AArBjB,sFAAmF;AAgBlF,wGAhBQ,iDAAuB,OAgBR;AAdxB,oFAAiF;AAehF,uGAfQ,+CAAsB,OAeR;AAbvB,wFAAqF;AAUpF,yGAVQ,mDAAwB,OAUR;AATzB,oEAAiE;AAqBhE,iGArBQ,mCAAgB,OAqBR"}

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@studyportals/search-api-interface",
-	"version": "1.2.3-1",
+	"version": "1.2.3-12",
 	"description": "Typescript library containing resources that facilitate integration with SearchApi",
-	"main": "bin/index.js",
+	"main": "index.js",
 	"scripts": {
 		"compile": "rm -fR bin && npx tsc",
 		"deploy-patch": "npm version patch && npm run deploy",

package/src/facets/FacetOptionValue.d.ts

@@ -1,14 +1,13 @@
 export declare enum FacetOptionValue {
-    ATTENDANCE = "attendances",
-    DEGREE_TYPE = "degreeTypes",
+    METHODS = "methods",
+    LEVELS = "level",
     DISCIPLINES = "disciplines",
-    DURATIONS = "durations",
-    EDUCATIONAL_LEVELS = "educationalLevels",
-    EDUCATIONAL_FORMS = "educationalForms",
-    AREAS_IDS = "areaIds",
-    REGION_IDS = "regionIds",
-    COUNTRY_ISO_CODES = "countryIsoCodes",
-    ORGANISATIONS_IDS = "organisationIds",
-    SPECIAL_PROGRAMMES = "specialProgrammes",
-    NATIONALITY_ISO_CODE = "nationalityIsoCode"
+    EDUCATIONAL_FORMS = "educational_forms",
+    AREAS = "areas",
+    REGIONS = "regions",
+    DEGREE = "degree",
+    SPECIAL_STUDY = "special_study",
+    COUNTRY_CODES = "countryCodes",
+    ORGANISATIONS_ID = "organisationId",
+    DURATIONS = "durations"
 }

package/src/facets/FacetResponseType.d.ts

@@ -0,0 +1,5 @@
+export type FacetResponseType = {
+    filter: string;
+    count: number;
+    value: string;
+};

package/src/{programmes/RangeDTO.js → facets/FacetResponseType.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=RangeDTO.js.map
+//# sourceMappingURL=FacetResponseType.js.map

package/src/facets/FacetResponseType.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FacetResponseType.js","sourceRoot":"","sources":["../../../src/facets/FacetResponseType.ts"],"names":[],"mappings":""}

package/src/facets/IFacetFilters.d.ts

@@ -1,5 +1,7 @@
-import { RangeDTO } from "../programmes/RangeDTO";
 export interface IFacetFilters {
     facets: string[];
-    durations?: RangeDTO[];
+    durations?: {
+        min: number;
+        max: number;
+    }[];
 }

package/src/programmes/IProgrammeResult.d.ts

@@ -0,0 +1,4 @@
+export declare class IProgrammeResult<T> {
+    is_premium: boolean;
+    card: T;
+}

package/src/programmes/IProgrammeResult.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IProgrammeResult = void 0;
+class IProgrammeResult {
+}
+exports.IProgrammeResult = IProgrammeResult;
+//# sourceMappingURL=IProgrammeResult.js.map

package/src/programmes/IProgrammeResult.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IProgrammeResult.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeResult.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAgB;CAG5B;AAHD,4CAGC"}

package/src/programmes/IProgrammeSearchFilters.d.ts

@@ -1,11 +1,9 @@
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
-import { RangeDTO } from "./RangeDTO";
-import { IFacetFilters } from "../facets/IFacetFilters";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue, DurationFilterOptionValue } from "@studyportals/search-filters/server";
 export declare class IProgrammeSearchFilters {
     readonly attendances?: AttendanceFilterOptionValue[];
     readonly degreeTypes?: DegreeTypeFilterOptionValue[];
     readonly disciplines?: string[];
-    readonly durations?: RangeDTO[];
+    readonly durations?: DurationFilterOptionValue[];
     readonly educationalLevels?: EducationLevelFilterOptionValue[];
     readonly educationalForms?: EducationalFormFilterOptionValue[];
     readonly keyword?: string;
@@ -14,7 +12,9 @@ export declare class IProgrammeSearchFilters {
     readonly countryIsoCodes?: string[];
     readonly organisationIds?: string[];
     readonly specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    readonly tuitionFee?: RangeDTO;
-    readonly nationalityIsoCode?: string;
-    readonly facets: IFacetFilters;
+    readonly tuitionFeeMin?: number;
+    readonly tuitionFeeMax?: number;
+    readonly nationalityCountryIso?: string;
+    readonly facets?: string[];
+    readonly facetsDurations?: DurationFilterOptionValue[];
 }

package/src/programmes/IProgrammeSearchFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAWA,MAAa,uBAAuB;CAoBnC;AApBD,0DAoBC"}
+{"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AASA,MAAa,uBAAuB;CAuBnC;AAvBD,0DAuBC"}

package/src/programmes/IProgrammeSearchResponse.d.ts

@@ -1,5 +1,7 @@
+import { FacetResponseType } from "../facets/FacetResponseType";
 export interface IProgrammeSearchResponse<T> {
     readonly programmes: readonly T[];
     readonly hitsTotal: number;
     readonly hitsTotalRelation: "more than" | "exactly";
+    readonly aggregations?: readonly FacetResponseType[];
 }

package/src/programmes/ProgrammeSearchFilters.d.ts

@@ -1,13 +1,11 @@
 import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters";
 import { ProgrammeSearchInput } from "./ProgrammeSearchInput";
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
-import { RangeDTO } from "./RangeDTO";
-import { IFacetFilters } from "../facets/IFacetFilters";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue, DurationFilterOptionValue } from "@studyportals/search-filters/server";
 export declare class ProgrammeSearchFilters implements IProgrammeSearchFilters {
     attendances?: AttendanceFilterOptionValue[];
     degreeTypes?: DegreeTypeFilterOptionValue[];
     disciplines?: string[];
-    durations?: RangeDTO[];
+    durations?: DurationFilterOptionValue[];
     educationalLevels?: EducationLevelFilterOptionValue[];
     educationalForms?: EducationalFormFilterOptionValue[];
     keyword?: string;
@@ -16,13 +14,11 @@ export declare class ProgrammeSearchFilters implements IProgrammeSearchFilters {
     countryIsoCodes?: string[];
     organisationIds?: string[];
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    tuitionFee?: RangeDTO;
-    nationalityIsoCode?: string;
-    facets: IFacetFilters;
+    tuitionFeeMin?: number;
+    tuitionFeeMax?: number;
+    nationalityCountryIso?: string;
+    facets?: string[];
+    facetDurations?: DurationFilterOptionValue[];
     from(input: ProgrammeSearchInput): IProgrammeSearchFilters;
-    private parseDurations;
-    private parseTuitionFee;
     private numbersToStringsOrUndefined;
-    private parseFacets;
-    private parseFacetDurations;
 }

package/src/programmes/ProgrammeSearchFilters.js

@@ -5,6 +5,7 @@ class ProgrammeSearchFilters {
     from(input) {
         this.attendances = input.attendances;
         this.degreeTypes = input.degreeTypes;
+        this.durations = input.durations;
         this.disciplines = this.numbersToStringsOrUndefined(input.disciplines);
         this.educationalLevels = input.educationalLevels;
         this.educationalForms = input.educationalForms;
@@ -14,47 +15,18 @@ class ProgrammeSearchFilters {
         this.countryIsoCodes = input.countryIsoCodes;
         this.organisationIds = input.organisationIds ? input.organisationIds.map(id => id.toString()) : undefined;
         this.specialProgrammes = input.specialProgrammes;
-        this.nationalityIsoCode = input.nationalityIsoCode;
-        this.parseDurations(input);
-        this.parseTuitionFee(input);
-        this.parseFacets(input);
+        this.nationalityCountryIso = input.nationalityCountryIso;
+        this.tuitionFeeMin = input.tuitionFeeMin;
+        this.tuitionFeeMax = input.tuitionFeeMax;
+        this.facets = input.facets;
+        this.facetDurations = input.facetsDurations;
         return this;
     }
-    parseDurations(input) {
-        if (!input.durations)
-            return;
-        this.durations = [];
-        for (const duration of input.durations) {
-            const [min, max] = JSON.parse(duration);
-            this.durations.push({ min, max });
-        }
-    }
-    parseTuitionFee(input) {
-        if (input.tuitionFeeMin || input.tuitionFeeMax) {
-            this.tuitionFee = {
-                min: input.tuitionFeeMin,
-                max: input.tuitionFeeMax,
-            };
-        }
-    }
     numbersToStringsOrUndefined(values) {
         if (values === undefined)
             return;
         return values.map(value => value.toString());
     }
-    parseFacets(input) {
-        this.facets.facets = input.facets.facets;
-        this.parseFacetDurations(input);
-    }
-    parseFacetDurations(input) {
-        if (!input.facets.durations)
-            return;
-        this.facets.durations = [];
-        for (const duration of input.facets.durations) {
-            const [min, max] = JSON.parse(duration);
-            this.facets.durations.push({ min, max });
-        }
-    }
 }
 exports.ProgrammeSearchFilters = ProgrammeSearchFilters;
 //# sourceMappingURL=ProgrammeSearchFilters.js.map

package/src/programmes/ProgrammeSearchFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAcA,MAAa,sBAAsB;IAqB3B,IAAI,CAAC,KAA2B;QACtC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAE7C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,CAAC;QAEnD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAExB,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,cAAc,CAAC,KAA2B;QACjD,IAAI,CAAC,KAAK,CAAC,SAAS;YAAE,OAAO;QAE7B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QAEpB,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAC,CAAC,CAAA;QAChC,CAAC;IACF,CAAC;IAEO,eAAe,CAAC,KAA2B;QAClD,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YAChD,IAAI,CAAC,UAAU,GAAG;gBACjB,GAAG,EAAE,KAAK,CAAC,aAAa;gBACxB,GAAG,EAAE,KAAK,CAAC,aAAa;aACxB,CAAC;QACH,CAAC;IACF,CAAC;IAEO,2BAA2B,CAAC,MAA4B;QAC/D,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QACjC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;IAEO,WAAW,CAAC,KAA2B;QAC9C,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;QACzC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAEO,mBAAmB,CAAC,KAA2B;QACtD,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS;YAAE,OAAO;QAEpC,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;QAE3B,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC/C,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAC,CAAC,CAAA;QACvC,CAAC;IACF,CAAC;CACD;AArFD,wDAqFC"}
+{"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAcA,MAAa,sBAAsB;IAwB3B,IAAI,CAAC,KAA2B;QACtC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAE7C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC;QAEzD,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QACzC,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC;QAEzC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,eAAe,CAAC;QAE5C,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,2BAA2B,CAAC,MAA4B;QAC/D,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QACjC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;CAYD;AAjED,wDAiEC"}

package/src/programmes/ProgrammeSearchInput.d.ts

@@ -1,15 +1,12 @@
 import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
-import { IFacetValues } from "../facets/IFacetValues";
 export type ProgrammeSearchInput = {
-    resultSize: number;
-    resultOffset: number;
     attendances?: AttendanceFilterOptionValue[];
     degreeTypes?: DegreeTypeFilterOptionValue[];
     disciplines?: number[];
     durations?: DurationFilterOptionValue[];
     educationalLevels?: EducationLevelFilterOptionValue[];
     educationalForms?: EducationalFormFilterOptionValue[];
-    keyword: string;
+    keyword?: string;
     areaIds?: number[];
     regionIds?: number[];
     countryIsoCodes?: string[];
@@ -17,6 +14,7 @@ export type ProgrammeSearchInput = {
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
     tuitionFeeMin?: number;
     tuitionFeeMax?: number;
-    nationalityIsoCode: string;
-    facets: IFacetValues;
+    nationalityCountryIso?: string;
+    facets?: string[];
+    facetsDurations?: DurationFilterOptionValue[];
 };

package/src/programmes/SearchApiProgrammeClient.d.ts

@@ -2,11 +2,13 @@ import { SearchApiClientBase } from "../SearchApiClientBase";
 import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-platform-http-requests";
 import { IProgrammeCard } from "@studyportals/domain-client";
 import { IProgrammeSearchResponse } from "./IProgrammeSearchResponse";
+import { IProgrammeResult } from "./IProgrammeResult";
+import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters";
 export declare class SearchApiProgrammeClient extends SearchApiClientBase {
     private readonly requestFactory;
     private readonly requestSender;
-    private readonly organisationCardFactory;
+    private readonly programmeCardFactory;
     constructor(apiUriBase: string, requestFactory: ISuperAgentRequestFactory, requestSender: IRequestSender);
-    searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeCard>>;
+    searchCards(filters: IProgrammeSearchFilters, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<IProgrammeCard>>>;
     searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<string>>;
 }

package/src/programmes/SearchApiProgrammeClient.js

@@ -14,18 +14,23 @@ const SearchApiClientBase_1 = require("../SearchApiClientBase");
 const domain_client_1 = require("@studyportals/domain-client");
 class SearchApiProgrammeClient extends SearchApiClientBase_1.SearchApiClientBase {
     constructor(apiUriBase, requestFactory, requestSender) {
-        super("organisations", apiUriBase);
-        this.organisationCardFactory = new domain_client_1.ProgrammeCardClient();
+        super("programmes", apiUriBase);
+        this.programmeCardFactory = new domain_client_1.ProgrammeCardClient();
         this.requestFactory = requestFactory;
         this.requestSender = requestSender;
-        this.organisationCardFactory = new domain_client_1.ProgrammeCardClient("N/A", "N/A", 1);
+        this.programmeCardFactory = new domain_client_1.ProgrammeCardClient("N/A", "N/A", 1);
     }
     searchCards(filters, resultSize, resultOffset) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const request = this.requestFactory.get(this.constructUri("search"))
                 .query(Object.assign(Object.assign({}, filters), { resultSize, resultOffset }));
             const result = yield this.requestSender.sendAndExtractBody(request);
-            return Object.assign(Object.assign({}, result), { programmes: this.organisationCardFactory.fromDescriptions([...result.programmes]) });
+            const programmeResults = result.programmes.map(result => ({
+                card: this.programmeCardFactory.fromDescription(result.card),
+                is_premium: result.is_premium
+            }));
+            return Object.assign(Object.assign({}, result), { programmes: programmeResults, aggregations: (_a = result.aggregations) !== null && _a !== void 0 ? _a : [] });
         });
     }
     searchIds(filters, resultSize, resultOffset) {

package/src/programmes/SearchApiProgrammeClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchApiProgrammeClient.js","sourceRoot":"","sources":["../../../src/programmes/SearchApiProgrammeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA6D;AAG7D,+DAAkF;AAGlF,MAAa,wBAAyB,SAAQ,yCAAmB;IAMhE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QANnB,4BAAuB,GAAG,IAAI,mCAAmB,EAAE,CAAC;QAQpE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,uBAAuB,GAAG,IAAI,mCAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;IAEY,WAAW,CAAC,OAAY,EAAE,UAAkB,EAAE,YAAoB;;YAC9E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBAClE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAA8C,OAAO,CAAC,CAAC;YAEjH,uCACI,MAAM,KACT,UAAU,EAAE,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,IACjF;QACF,CAAC;KAAA;IAEY,SAAS,CAAC,OAAY,EAAE,UAAkB,EAAE,YAAoB;;YAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;iBACtE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAmC,OAAO,CAAC,CAAC;QAC/F,CAAC;KAAA;CACD;AAnCD,4DAmCC"}
+{"version":3,"file":"SearchApiProgrammeClient.js","sourceRoot":"","sources":["../../../src/programmes/SearchApiProgrammeClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAA6D;AAE7D,+DAAkF;AAMlF,MAAa,wBAAyB,SAAQ,yCAAmB;IAMhE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QANhB,yBAAoB,GAAG,IAAI,mCAAmB,EAAE,CAAC;QAQjE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,oBAAoB,GAAG,IAAI,mCAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAEY,WAAW,CAAC,OAAgC,EAAE,UAAkB,EAAE,YAAoB;;;YAClG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;iBAClE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAgE,OAAO,CAAC,CAAC;YACnI,MAAM,gBAAgB,GAAgD,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACtG,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC;gBAC5D,UAAU,EAAE,MAAM,CAAC,UAAU;aAC7B,CAAC,CAAC,CAAC;YAEJ,uCACI,MAAM,KACT,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,EAAE,IACvC;QACF,CAAC;KAAA;IAEY,SAAS,CAAC,OAAY,EAAE,UAAkB,EAAE,YAAoB;;YAC5E,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;iBACtE,KAAK,iCAAM,OAAO,KAAE,UAAU,EAAE,YAAY,IAAG,CAAC;YAElD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAmC,OAAO,CAAC,CAAC;QAC/F,CAAC;KAAA;CACD;AAxCD,4DAwCC"}

package/src/programmes/RangeDTO.d.ts

@@ -1,4 +0,0 @@
-export interface RangeDTO {
-    min?: number;
-    max?: number;
-}

package/src/programmes/RangeDTO.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RangeDTO.js","sourceRoot":"","sources":["../../../src/programmes/RangeDTO.ts"],"names":[],"mappings":""}