@studyportals/search-api-interface 5.5.0 → 5.5.1-0

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/index.d.ts CHANGED
@@ -35,9 +35,10 @@ import { ICitySearchFilters } from "./src/cities/ICitySearchFilters.js";
35
35
  import { ICitySearchResponse } from "./src/cities/ICitySearchResponse.js";
36
36
  import { ICity } from "./src/cities/ICity.js";
37
37
  import { ProgrammeCardType } from "./src/programmes/ProgrammeCardType.js";
38
+ import { DataTargetTypeOrder } from "./src/enums/DataTargetTypeOrder.js";
38
39
  import { IOrganisationIdAndName } from './src/organisations/IOrganisationIdAndName.js';
39
40
  import { OrganisationSortType } from './src/organisations/OrganisationSortType.js';
40
41
  import { IOrganisationResult } from "./src/organisations/IOrganisationResult.js";
41
42
  import { mapDegreeToEducationalLevel, mapEducationalLevelToDegree } from "./src/maps/DegreeToEducationalLevelMap.js";
42
- export { SearchApiOrganisationClient, IOrganisationIdAndName, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationInsightValues, OrganisationSearchFilters, OrganisationSortType, IOrganisationResult, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, IProgrammeResult, mapDegreeToEducationalLevel, mapEducationalLevelToDegree, DegreeTypeEnum, DeliveryMethodEnum, HitsTotalRelation, ProgrammeSortType, ProgrammeCardType, FacetResponseType, FacetValues, FacetProgrammesByOrganisationIdsItem, FacetProgrammesByOrganisationIdsResponse, InsightValues, TextSearchAlgorithmType, ProgrammeFilterType, ISuggestionResult, SearchApiScholarshipClient, IScholarshipSearchResponse, IScholarshipSearchFilters, ScholarshipSearchFilters, ScholarshipSearchInput, IScholarshipSearchCountResponse, ScholarshipFormat, ScholarshipType, SearchApiCityClient, ICitySearchResponse, ICitySearchFilters, CitySearchFilters, CitySearchInput, ICity, };
43
+ export { SearchApiOrganisationClient, IOrganisationIdAndName, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationInsightValues, OrganisationSearchFilters, OrganisationSortType, IOrganisationResult, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, IProgrammeResult, mapDegreeToEducationalLevel, mapEducationalLevelToDegree, DegreeTypeEnum, DeliveryMethodEnum, HitsTotalRelation, ProgrammeSortType, ProgrammeCardType, DataTargetTypeOrder, FacetResponseType, FacetValues, FacetProgrammesByOrganisationIdsItem, FacetProgrammesByOrganisationIdsResponse, InsightValues, TextSearchAlgorithmType, ProgrammeFilterType, ISuggestionResult, SearchApiScholarshipClient, IScholarshipSearchResponse, IScholarshipSearchFilters, ScholarshipSearchFilters, ScholarshipSearchInput, IScholarshipSearchCountResponse, ScholarshipFormat, ScholarshipType, SearchApiCityClient, ICitySearchResponse, ICitySearchFilters, CitySearchFilters, CitySearchInput, ICity, };
43
44
  export * from "./src/enums/index.js";
package/index.js CHANGED
@@ -18,8 +18,9 @@ import { SearchApiScholarshipClient } from "./src/scholarships/SearchApiScholars
18
18
  import { SearchApiCityClient } from "./src/cities/SearchApiCityClient.js";
19
19
  import { CitySearchFilters } from "./src/cities/CitySearchFilters.js";
20
20
  import { ProgrammeCardType } from "./src/programmes/ProgrammeCardType.js";
21
+ import { DataTargetTypeOrder } from "./src/enums/DataTargetTypeOrder.js";
21
22
  import { OrganisationSortType } from './src/organisations/OrganisationSortType.js';
22
23
  import { mapDegreeToEducationalLevel, mapEducationalLevelToDegree } from "./src/maps/DegreeToEducationalLevelMap.js";
23
- export { SearchApiOrganisationClient, IOrganisationSearchFilters, OrganisationSearchFilters, OrganisationSortType, SearchApiProgrammeClient, IProgrammeSearchFilters, ProgrammeSearchFilters, IProgrammeResult, mapDegreeToEducationalLevel, mapEducationalLevelToDegree, DegreeTypeEnum, DeliveryMethodEnum, HitsTotalRelation, ProgrammeSortType, ProgrammeCardType, TextSearchAlgorithmType, ProgrammeFilterType, SearchApiScholarshipClient, ScholarshipSearchFilters, ScholarshipFormat, ScholarshipType, SearchApiCityClient, CitySearchFilters, };
24
+ export { SearchApiOrganisationClient, IOrganisationSearchFilters, OrganisationSearchFilters, OrganisationSortType, SearchApiProgrammeClient, IProgrammeSearchFilters, ProgrammeSearchFilters, IProgrammeResult, mapDegreeToEducationalLevel, mapEducationalLevelToDegree, DegreeTypeEnum, DeliveryMethodEnum, HitsTotalRelation, ProgrammeSortType, ProgrammeCardType, DataTargetTypeOrder, TextSearchAlgorithmType, ProgrammeFilterType, SearchApiScholarshipClient, ScholarshipSearchFilters, ScholarshipFormat, ScholarshipType, SearchApiCityClient, CitySearchFilters, };
24
25
  export * from "./src/enums/index.js";
25
26
  //# sourceMappingURL=index.js.map
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAG5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAE1F,OAAO,EAAE,2BAA2B,EAAE,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAIrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAI3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AAGvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAElH,OAAO,EACN,2BAA2B,EAG3B,0BAA0B,EAE1B,yBAAyB,EACzB,oBAAoB,EAGpB,wBAAwB,EAExB,uBAAuB,EACvB,sBAAsB,EAItB,gBAAgB,EAEhB,2BAA2B,EAC3B,2BAA2B,EAE3B,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EAEjB,iBAAiB,EACjB,iBAAiB,EAUjB,uBAAuB,EACvB,mBAAmB,EAInB,0BAA0B,EAG1B,wBAAwB,EAGxB,iBAAiB,EACjB,eAAe,EAEf,mBAAmB,EAGnB,iBAAiB,GAGjB,CAAA;AAED,cAAc,aAAa,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAG5F,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAE1F,OAAO,EAAE,2BAA2B,EAAE,MAAM,iDAAiD,CAAC;AAC9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AAEnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AAEjF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AAIrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAI3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,6CAA6C,CAAC;AAGvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,0BAA0B,EAAE,MAAM,gDAAgD,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAEvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAInE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAEhF,OAAO,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AAElH,OAAO,EACN,2BAA2B,EAG3B,0BAA0B,EAE1B,yBAAyB,EACzB,oBAAoB,EAGpB,wBAAwB,EAExB,uBAAuB,EACvB,sBAAsB,EAItB,gBAAgB,EAEhB,2BAA2B,EAC3B,2BAA2B,EAE3B,cAAc,EACd,kBAAkB,EAClB,iBAAiB,EAEjB,iBAAiB,EACjB,iBAAiB,EAChB,mBAAmB,EAUpB,uBAAuB,EACvB,mBAAmB,EAInB,0BAA0B,EAG1B,wBAAwB,EAGxB,iBAAiB,EACjB,eAAe,EAEf,mBAAmB,EAGnB,iBAAiB,GAGjB,CAAA;AAED,cAAc,aAAa,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@studyportals/search-api-interface",
3
- "version": "5.5.0",
3
+ "version": "5.5.1-0",
4
4
  "description": "Typescript library containing resources that facilitate integration with SearchApi",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -0,0 +1,5 @@
1
+ export declare enum DataTargetTypeOrder {
2
+ INTERNATIONAL = "INTERNATIONAL",
3
+ EEA = "EEA",
4
+ NATIONAL = "NATIONAL"
5
+ }
@@ -0,0 +1,7 @@
1
+ export var DataTargetTypeOrder;
2
+ (function (DataTargetTypeOrder) {
3
+ DataTargetTypeOrder["INTERNATIONAL"] = "INTERNATIONAL";
4
+ DataTargetTypeOrder["EEA"] = "EEA";
5
+ DataTargetTypeOrder["NATIONAL"] = "NATIONAL";
6
+ })(DataTargetTypeOrder || (DataTargetTypeOrder = {}));
7
+ //# sourceMappingURL=DataTargetTypeOrder.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DataTargetTypeOrder.js","sourceRoot":"","sources":["../../../src/enums/DataTargetTypeOrder.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC9B,sDAA+B,CAAA;IAC/B,kCAAW,CAAA;IACX,4CAAqB,CAAA;AACtB,CAAC,EAJW,mBAAmB,KAAnB,mBAAmB,QAI9B"}
@@ -8,3 +8,4 @@ export * from "./InsightFilterType.js";
8
8
  export * from "./DensitiesFilterValue.js";
9
9
  export * from "./SpecialProgrammesFilterValue.js";
10
10
  export * from "./TuitionFeeFilterValue.js";
11
+ export * from "./DataTargetTypeOrder.js";
@@ -8,4 +8,5 @@ export * from "./InsightFilterType.js";
8
8
  export * from "./DensitiesFilterValue.js";
9
9
  export * from "./SpecialProgrammesFilterValue.js";
10
10
  export * from "./TuitionFeeFilterValue.js";
11
+ export * from "./DataTargetTypeOrder.js";
11
12
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enums/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enums/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC"}
@@ -1,4 +1,5 @@
1
1
  import { AttendanceFilterValue, DegreeTypeFilterValue, DurationFilterValue, EducationalFormFilterValue, EducationLevelFilterValue, DensitiesFilterValue, SpecialProgrammesFilterValue, FacetFilterType, InsightFilterType } from "../enums/index.js";
2
+ import { DataTargetTypeOrder } from "../enums/DataTargetTypeOrder.js";
2
3
  import { ProgrammeSortType } from "./ProgrammeSortType.js";
3
4
  import { TextSearchAlgorithmType } from "../TextSearchAlgorithmType.js";
4
5
  import { ProgrammeCardType } from "./ProgrammeCardType.js";
@@ -16,6 +17,7 @@ export declare class IProgrammeSearchFilters {
16
17
  readonly countryIsoCodes?: string[];
17
18
  readonly organisationIds?: string[];
18
19
  readonly specialProgrammes?: SpecialProgrammesFilterValue[];
20
+ readonly dataTargetTypeOrder?: DataTargetTypeOrder[];
19
21
  readonly tuitionFeeMin?: number;
20
22
  readonly tuitionFeeMax?: number;
21
23
  readonly nationalityCountryIso?: string;
@@ -12,6 +12,7 @@ export class IProgrammeSearchFilters {
12
12
  countryIsoCodes;
13
13
  organisationIds;
14
14
  specialProgrammes;
15
+ dataTargetTypeOrder;
15
16
  tuitionFeeMin;
16
17
  tuitionFeeMax;
17
18
  nationalityCountryIso;
@@ -1 +1 @@
1
- {"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":"AAWA,MAAM,OAAO,uBAAuB;IAC1B,WAAW,CAA2B;IACtC,WAAW,CAA2B;IACtC,WAAW,CAAY;IACvB,SAAS,CAAyB;IAClC,iBAAiB,CAA+B;IAChD,gBAAgB,CAAgC;IAEhD,SAAS,CAA0B;IACnC,IAAI,CAAU;IAEd,OAAO,CAAY;IACnB,SAAS,CAAY;IACrB,eAAe,CAAY;IAC3B,eAAe,CAAY;IAE3B,iBAAiB,CAAkC;IAEnD,aAAa,CAAU;IACvB,aAAa,CAAU;IAEvB,qBAAqB,CAAU;IAE/B,MAAM,CAAoB;IAE1B,cAAc,CAAU;IACxB,MAAM,CAAqB;IAC3B,eAAe,CAAyB;IAExC,QAAQ,CAAuB;IAE/B,aAAa,CAAY;IAClC,QAAQ,CAAoB;IACnB,mBAAmB,CAA2B;IAC9C,UAAU,CAAW;CAC9B"}
1
+ {"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":"AAYA,MAAM,OAAO,uBAAuB;IAC1B,WAAW,CAA2B;IACtC,WAAW,CAA2B;IACtC,WAAW,CAAY;IACvB,SAAS,CAAyB;IAClC,iBAAiB,CAA+B;IAChD,gBAAgB,CAAgC;IAEhD,SAAS,CAA0B;IACnC,IAAI,CAAU;IAEd,OAAO,CAAY;IACnB,SAAS,CAAY;IACrB,eAAe,CAAY;IAC3B,eAAe,CAAY;IAE3B,iBAAiB,CAAkC;IACnD,mBAAmB,CAAyB;IAE5C,aAAa,CAAU;IACvB,aAAa,CAAU;IAEvB,qBAAqB,CAAU;IAE/B,MAAM,CAAoB;IAE1B,cAAc,CAAU;IACxB,MAAM,CAAqB;IAC3B,eAAe,CAAyB;IAExC,QAAQ,CAAuB;IAE/B,aAAa,CAAY;IAClC,QAAQ,CAAoB;IACnB,mBAAmB,CAA2B;IAC9C,UAAU,CAAW;CAC9B"}
@@ -1,6 +1,7 @@
1
1
  import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters.js";
2
2
  import { ProgrammeSearchInput } from "./ProgrammeSearchInput.js";
3
3
  import { AttendanceFilterValue, DegreeTypeFilterValue, DurationFilterValue, EducationalFormFilterValue, EducationLevelFilterValue, DensitiesFilterValue, SpecialProgrammesFilterValue, FacetFilterType, InsightFilterType } from "../enums/index.js";
4
+ import { DataTargetTypeOrder } from "../enums/DataTargetTypeOrder.js";
4
5
  import { ProgrammeSortType } from "./ProgrammeSortType.js";
5
6
  import { TextSearchAlgorithmType } from "../TextSearchAlgorithmType.js";
6
7
  import { ProgrammeCardType } from "./ProgrammeCardType.js";
@@ -18,6 +19,7 @@ export declare class ProgrammeSearchFilters implements IProgrammeSearchFilters {
18
19
  countryIsoCodes?: string[];
19
20
  organisationIds?: string[];
20
21
  specialProgrammes?: SpecialProgrammesFilterValue[];
22
+ dataTargetTypeOrder?: DataTargetTypeOrder[];
21
23
  tuitionFeeMin?: number;
22
24
  tuitionFeeMax?: number;
23
25
  nationalityCountryIso?: string;
@@ -13,6 +13,7 @@ export class ProgrammeSearchFilters {
13
13
  countryIsoCodes;
14
14
  organisationIds;
15
15
  specialProgrammes;
16
+ dataTargetTypeOrder;
16
17
  tuitionFeeMin;
17
18
  tuitionFeeMax;
18
19
  nationalityCountryIso;
@@ -39,6 +40,7 @@ export class ProgrammeSearchFilters {
39
40
  this.countryIsoCodes = input.countryIsoCodes;
40
41
  this.organisationIds = input.organisationIds ? input.organisationIds.map(id => id.toString()) : undefined;
41
42
  this.specialProgrammes = input.specialProgrammes;
43
+ this.dataTargetTypeOrder = input.dataTargetTypeOrder;
42
44
  this.nationalityCountryIso = input.nationalityCountryIso;
43
45
  this.tuitionFeeMin = input.tuitionFeeMin;
44
46
  this.tuitionFeeMax = input.tuitionFeeMax;
@@ -1 +1 @@
1
- {"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { ProgrammeSortType } from "./ProgrammeSortType.js";
2
2
  import { TextSearchAlgorithmType } from "../TextSearchAlgorithmType.js";
3
3
  import { ProgrammeCardType } from "./ProgrammeCardType.js";
4
4
  import { AttendanceFilterValue, DegreeTypeFilterValue, DurationFilterValue, EducationalFormFilterValue, EducationLevelFilterValue, DensitiesFilterValue, SpecialProgrammesFilterValue, FacetFilterType, InsightFilterType } from "../enums/index.js";
5
+ import { DataTargetTypeOrder } from "../enums/DataTargetTypeOrder.js";
5
6
  export type ProgrammeSearchInput = {
6
7
  attendances?: AttendanceFilterValue[];
7
8
  degreeTypes?: DegreeTypeFilterValue[];
@@ -16,6 +17,7 @@ export type ProgrammeSearchInput = {
16
17
  countryIsoCodes?: string[];
17
18
  organisationIds?: number[];
18
19
  specialProgrammes?: SpecialProgrammesFilterValue[];
20
+ dataTargetTypeOrder?: DataTargetTypeOrder[];
19
21
  tuitionFeeMin?: number;
20
22
  tuitionFeeMax?: number;
21
23
  nationalityCountryIso?: string;
@@ -12,6 +12,7 @@ export declare class SearchApiProgrammeClient extends SearchApiClientBase {
12
12
  constructor(apiUriBase: string, requestFactory: ISuperAgentRequestFactory, requestSender: IRequestSender, portalMap?: PortalMap);
13
13
  searchCards(filters: IProgrammeSearchFilters, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<IProgrammeCard>>>;
14
14
  searchCardsV2(filters: IProgrammeSearchFilters, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<ProgrammeCard>>>;
15
+ searchCardsPartner(filters: IProgrammeSearchFilters, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<ProgrammeCard>>>;
15
16
  searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<string>>;
16
17
  facetProgrammesByOrganisationIds(filters: any, facets: any): Promise<FacetProgrammesByOrganisationIdsResponse>;
17
18
  }
@@ -40,6 +40,21 @@ export class SearchApiProgrammeClient extends SearchApiClientBase {
40
40
  facets: result.facets ?? []
41
41
  };
42
42
  }
43
+ async searchCardsPartner(filters, resultSize, resultOffset) {
44
+ filters.cardType = ProgrammeCardType.V2;
45
+ const request = this.requestFactory.get(this.constructUri("search/partner"))
46
+ .query({ ...filters, resultSize, resultOffset });
47
+ const result = await this.requestSender.sendAndExtractBody(request);
48
+ const programmeResults = result.programmes.map(result => ({
49
+ card: ProgrammeCard.fromJSON(result.card),
50
+ is_premium: result.is_premium
51
+ }));
52
+ return {
53
+ ...result,
54
+ programmes: programmeResults,
55
+ facets: result.facets ?? []
56
+ };
57
+ }
43
58
  async searchIds(filters, resultSize, resultOffset) {
44
59
  const request = this.requestFactory.get(this.constructUri("search/ids"))
45
60
  .query({ ...filters, resultSize, resultOffset });
@@ -1 +1 @@
1
- {"version":3,"file":"SearchApiProgrammeClient.js","sourceRoot":"","sources":["../../../src/programmes/SearchApiProgrammeClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SearchApiProgrammeClient.js","sourceRoot":"","sources":["../../../src/programmes/SearchApiProgrammeClient.ts"],"names":[],"mappings":"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"}