@studyportals/search-api-interface 1.0.0-beta.4 → 1.0.0-beta.6

package/bin/src/organisations/IOrganisationSearchResponse.d.ts

@@ -1,5 +1,5 @@
 export interface IOrganisationSearchResponse<T> {
-    readonly result: readonly T[];
+    readonly organisations: readonly T[];
     readonly hitsTotal: number;
     readonly hitsTotalRelation: "more than" | "exactly";
 }

package/bin/src/organisations/SearchApiOrganisationClient.d.ts

@@ -5,6 +5,7 @@ import { IOrganisationSearchResponse } from "./IOrganisationSearchResponse";
 export declare class SearchApiOrganisationClient extends SearchApiClientBase {
     private readonly requestFactory;
     private readonly requestSender;
+    private readonly organisationCardFactory;
     constructor(apiUriBase: string, requestFactory: ISuperAgentRequestFactory, requestSender: IRequestSender);
     searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<IOrganisationCard>>;
 }

package/bin/src/organisations/SearchApiOrganisationClient.js

@@ -11,9 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchApiOrganisationClient = void 0;
 const SearchApiClientBase_1 = require("./SearchApiClientBase");
+const domain_client_1 = require("@studyportals/domain-client");
 class SearchApiOrganisationClient extends SearchApiClientBase_1.SearchApiClientBase {
     constructor(apiUriBase, requestFactory, requestSender) {
         super("organisations", apiUriBase);
+        this.organisationCardFactory = new domain_client_1.OrganisationCardClient();
         this.requestFactory = requestFactory;
         this.requestSender = requestSender;
     }
@@ -21,7 +23,8 @@ class SearchApiOrganisationClient extends SearchApiClientBase_1.SearchApiClientB
         return __awaiter(this, void 0, void 0, function* () {
             const request = this.requestFactory.get(this.constructUri("search"))
                 .query(Object.assign(Object.assign({}, filters), { resultSize, resultOffset }));
-            return yield this.requestSender.sendAndExtractBody(request);
+            const result = yield this.requestSender.sendAndExtractBody(request);
+            return Object.assign(Object.assign({}, result), { organisations: this.organisationCardFactory.fromDescriptions([...result.organisations]) });
         });
     }
 }

package/bin/src/organisations/SearchApiOrganisationClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchApiOrganisationClient.js","sourceRoot":"","sources":["../../../src/organisations/SearchApiOrganisationClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4D;AAK5D,MAAa,2BAA4B,SAAQ,yCAAmB;IAKnE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QAEnC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACpC,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,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAiD,OAAO,CAAC,CAAC;QAC7G,CAAC;KAAA;CACD;AArBD,kEAqBC"}
+{"version":3,"file":"SearchApiOrganisationClient.js","sourceRoot":"","sources":["../../../src/organisations/SearchApiOrganisationClient.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+DAA4D;AAE5D,+DAAwF;AAIxF,MAAa,2BAA4B,SAAQ,yCAAmB;IAMnE,YAAmB,UAAkB,EACpC,cAAyC,EACzC,aAA6B;QAE7B,KAAK,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QANnB,4BAAuB,GAAG,IAAI,sCAAsB,EAAE,CAAC;QAQvE,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACpC,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,CAAiD,OAAO,CAAC,CAAC;YAEpH,uCACI,MAAM,KACT,aAAa,EAAE,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,IACvF;QACF,CAAC;KAAA;CACD;AA3BD,kEA2BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/search-api-interface",
-	"version": "1.0.0-beta.4",
+	"version": "1.0.0-beta.6",
 	"description": "Typescript library containing resources that facilitate integration with SearchApi",
 	"main": "bin/index.js",
 	"scripts": {

package/src/organisations/IOrganisationSearchResponse.ts

@@ -1,5 +1,5 @@
 export interface IOrganisationSearchResponse<T> {
-	readonly result: readonly T[];
+	readonly organisations: readonly T[];
 	readonly hitsTotal: number;
 	readonly hitsTotalRelation: "more than" | "exactly";
 }

package/src/organisations/SearchApiOrganisationClient.ts

@@ -1,12 +1,14 @@
 import { SearchApiClientBase } from "./SearchApiClientBase";
 import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-platform-http-requests";
-import { IOrganisationCard } from "@studyportals/domain-client";
+import { IOrganisationCard, OrganisationCardClient } from "@studyportals/domain-client";
 import { IOrganisationSearchResponse } from "./IOrganisationSearchResponse";
+import { IModelDescription } from "@studyportals/domain-client/src/i-model-description";
 
 export class SearchApiOrganisationClient extends SearchApiClientBase {
 
 	private readonly requestFactory: ISuperAgentRequestFactory;
 	private readonly requestSender: IRequestSender;
+	private readonly organisationCardFactory = new OrganisationCardClient();
 
 	public constructor(apiUriBase: string,
 		requestFactory: ISuperAgentRequestFactory,
@@ -22,6 +24,11 @@ export class SearchApiOrganisationClient extends SearchApiClientBase {
 		const request = this.requestFactory.get(this.constructUri("search"))
 			.query({ ...filters, resultSize, resultOffset });
 
-		return await this.requestSender.sendAndExtractBody<IOrganisationSearchResponse<IOrganisationCard>>(request);
+		const result = await this.requestSender.sendAndExtractBody<IOrganisationSearchResponse<IModelDescription>>(request);
+
+		return {
+			...result,
+			organisations: this.organisationCardFactory.fromDescriptions([...result.organisations])
+		}
 	}
 }