@studyportals/search-api-interface 1.2.2-12 → 1.2.2-13

package/package.json

@@ -1,8 +1,8 @@
 {
 	"name": "@studyportals/search-api-interface",
-	"version": "1.2.2-12",
+	"version": "1.2.2-13",
 	"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/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/ProgrammeSearchInput.d.ts

@@ -8,7 +8,7 @@ export type ProgrammeSearchInput = {
     durations?: DurationFilterOptionValue[];
     educationalLevels?: EducationLevelFilterOptionValue[];
     educationalForms?: EducationalFormFilterOptionValue[];
-    keyword: string;
+    keyword?: string;
     areaIds?: number[];
     regionIds?: number[];
     countryIsoCodes?: string[];
@@ -16,5 +16,5 @@ export type ProgrammeSearchInput = {
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
     tuitionFeeMin?: number;
     tuitionFeeMax?: number;
-    nationalityCountryIso: string;
+    nationalityCountryIso?: string;
 };

package/src/programmes/SearchApiProgrammeClient.d.ts

@@ -2,11 +2,12 @@ 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";
 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: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<IProgrammeCard>>>;
     searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<string>>;
 }

package/src/programmes/SearchApiProgrammeClient.js

@@ -15,17 +15,21 @@ 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();
+        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* () {
             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 });
         });
     }
     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;AAKlF,MAAa,wBAAyB,SAAQ,yCAAmB;IAMhE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QANnB,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,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,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,CAAA;YAEH,uCACI,MAAM,KACT,UAAU,EAAE,gBAAgB,IAC5B;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;AAvCD,4DAuCC"}