@studyportals/search-api-interface 5.2.7-1 → 5.2.8-n

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@studyportals/search-api-interface",
3
- "version": "5.2.7-1",
3
+ "version": "5.2.8n",
4
4
  "description": "Typescript library containing resources that facilitate integration with SearchApi",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -1,15 +1,17 @@
1
1
  import { SearchApiClientBase } from "../SearchApiClientBase";
2
2
  import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-platform-http-requests";
3
- import { IOrganisationCard } from "@studyportals/domain-client";
3
+ import { IOrganisationCard, OrganisationCard } from "@studyportals/domain-client";
4
4
  import { IOrganisationSearchResponse } from "./IOrganisationSearchResponse";
5
5
  import { IOrganisationSearchFilters } from "./IOrganisationSearchFilters";
6
6
  import { IOrganisationIdAndName } from "./IOrganisationIdAndName";
7
+ import { IOrganisationResult } from "./IOrganisationResult";
7
8
  export declare class SearchApiOrganisationClient extends SearchApiClientBase {
8
9
  private readonly requestFactory;
9
10
  private readonly requestSender;
10
11
  private readonly organisationCardFactory;
11
12
  constructor(apiUriBase: string, requestFactory: ISuperAgentRequestFactory, requestSender: IRequestSender);
12
13
  searchCards(filters: IOrganisationSearchFilters, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<IOrganisationCard>>;
14
+ searchCardsV2(filters: IOrganisationSearchFilters, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<IOrganisationResult<OrganisationCard>>>;
13
15
  searchIds(filters: IOrganisationSearchFilters, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<string>>;
14
16
  searchNames(filters: IOrganisationSearchFilters, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<IOrganisationIdAndName>>;
15
17
  }
@@ -1,5 +1,5 @@
1
1
  import { SearchApiClientBase } from "../SearchApiClientBase";
2
- import { OrganisationCardClient } from "@studyportals/domain-client";
2
+ import { OrganisationCardClient, OrganisationCard } from "@studyportals/domain-client";
3
3
  export class SearchApiOrganisationClient extends SearchApiClientBase {
4
4
  requestFactory;
5
5
  requestSender;
@@ -19,6 +19,19 @@ export class SearchApiOrganisationClient extends SearchApiClientBase {
19
19
  organisations: this.organisationCardFactory.fromDescriptions([...result.organisations])
20
20
  };
21
21
  }
22
+ async searchCardsV2(filters, resultSize, resultOffset) {
23
+ const request = this.requestFactory.get(this.constructUri("search/v2"))
24
+ .query({ ...filters, resultSize, resultOffset });
25
+ const result = await this.requestSender.sendAndExtractBody(request);
26
+ const organisations = result.organisations.map(org => ({
27
+ ...org,
28
+ card: OrganisationCard.fromJSON(org.card)
29
+ }));
30
+ return {
31
+ ...result,
32
+ organisations
33
+ };
34
+ }
22
35
  async searchIds(filters, resultSize, resultOffset) {
23
36
  const request = this.requestFactory.get(this.constructUri("search/ids"))
24
37
  .query({ ...filters, resultSize, resultOffset });
@@ -1 +1 @@
1
- {"version":3,"file":"SearchApiOrganisationClient.js","sourceRoot":"","sources":["../../../src/organisations/SearchApiOrganisationClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAqB,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAMxF,MAAM,OAAO,2BAA4B,SAAQ,mBAAmB;IAElD,cAAc,CAA4B;IAC1C,aAAa,CAAiB;IAC9B,uBAAuB,GAAG,IAAI,sBAAsB,EAAE,CAAC;IAExE,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;QACnC,IAAI,CAAC,uBAAuB,GAAG,IAAI,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACrG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aAClE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAiD,OAAO,CAAC,CAAC;QAEpH,OAAO;YACN,GAAG,MAAM;YACT,aAAa,EAAE,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;SACvF,CAAA;IACF,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACnG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;aACtE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAsC,OAAO,CAAC,CAAC;IAClG,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACrG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;aACxE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAsD,OAAO,CAAC,CAAC;QAEzH,OAAO,MAAM,CAAC;IACf,CAAC;CACD"}
1
+ {"version":3,"file":"SearchApiOrganisationClient.js","sourceRoot":"","sources":["../../../src/organisations/SearchApiOrganisationClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,EAAqB,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAO1G,MAAM,OAAO,2BAA4B,SAAQ,mBAAmB;IAElD,cAAc,CAA4B;IAC1C,aAAa,CAAiB;IAC9B,uBAAuB,GAAG,IAAI,sBAAsB,EAAE,CAAC;IAExE,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;QACnC,IAAI,CAAC,uBAAuB,GAAG,IAAI,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACrG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;aAClE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAiD,OAAO,CAAC,CAAC;QAEpH,OAAO;YACN,GAAG,MAAM;YACT,aAAa,EAAE,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;SACvF,CAAA;IACF,CAAC;IAEM,KAAK,CAAC,aAAa,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACvG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;aACrE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAqE,OAAO,CAAC,CAAC;QAExI,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACtD,GAAG,GAAG;YACN,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC;SACzC,CAAC,CAAC,CAAC;QAEJ,OAAO;YACN,GAAG,MAAM;YACT,aAAa;SACb,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACnG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;aACtE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAElD,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAsC,OAAO,CAAC,CAAC;IAClG,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAmC,EAAE,UAAkB,EAAE,YAAoB;QACrG,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;aACxE,KAAK,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAsD,OAAO,CAAC,CAAC;QAEzH,OAAO,MAAM,CAAC;IACf,CAAC;CACD"}