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

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": "1.2.3-1",
3
+ "version": "1.2.3-4",
4
4
  "description": "Typescript library containing resources that facilitate integration with SearchApi",
5
5
  "main": "bin/index.js",
6
6
  "scripts": {
@@ -1,14 +1,13 @@
1
1
  export declare enum FacetOptionValue {
2
- ATTENDANCE = "attendances",
3
- DEGREE_TYPE = "degreeTypes",
2
+ METHODS = "methods",
3
+ LEVELS = "level",
4
4
  DISCIPLINES = "disciplines",
5
- DURATIONS = "durations",
6
- EDUCATIONAL_LEVELS = "educationalLevels",
7
- EDUCATIONAL_FORMS = "educationalForms",
8
- AREAS_IDS = "areaIds",
9
- REGION_IDS = "regionIds",
10
- COUNTRY_ISO_CODES = "countryIsoCodes",
11
- ORGANISATIONS_IDS = "organisationIds",
12
- SPECIAL_PROGRAMMES = "specialProgrammes",
13
- NATIONALITY_ISO_CODE = "nationalityIsoCode"
5
+ EDUCATIONAL_FORMS = "educational_forms",
6
+ AREAS = "areas",
7
+ REGIONS = "regions",
8
+ DEGREE = "degree",
9
+ SPECIAL_STUDY = "special_study",
10
+ COUNTRY_CODES = "countryCodes",
11
+ ORGANISATIONS_ID = "organisationId",
12
+ DURATIONS = "durations"
14
13
  }
@@ -0,0 +1,5 @@
1
+ export type FacetResponseType = {
2
+ filter: string;
3
+ count: number;
4
+ value: string;
5
+ };
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=FacetResponseType.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"FacetResponseType.js","sourceRoot":"","sources":["../../../src/facets/FacetResponseType.ts"],"names":[],"mappings":""}
@@ -0,0 +1,4 @@
1
+ export declare class IProgrammeResult<T> {
2
+ is_premium: boolean;
3
+ card: T;
4
+ }
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.IProgrammeResult = void 0;
4
+ class IProgrammeResult {
5
+ }
6
+ exports.IProgrammeResult = IProgrammeResult;
7
+ //# sourceMappingURL=IProgrammeResult.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IProgrammeResult.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeResult.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAgB;CAG5B;AAHD,4CAGC"}
@@ -15,6 +15,6 @@ export declare class IProgrammeSearchFilters {
15
15
  readonly organisationIds?: string[];
16
16
  readonly specialProgrammes?: SpecialProgrammesFilterOptionValue[];
17
17
  readonly tuitionFee?: RangeDTO;
18
- readonly nationalityIsoCode?: string;
18
+ readonly nationalityCountryIso?: string;
19
19
  readonly facets: IFacetFilters;
20
20
  }
@@ -2,4 +2,5 @@ export interface IProgrammeSearchResponse<T> {
2
2
  readonly programmes: readonly T[];
3
3
  readonly hitsTotal: number;
4
4
  readonly hitsTotalRelation: "more than" | "exactly";
5
+ readonly aggregations?: readonly T[];
5
6
  }
@@ -17,7 +17,7 @@ export declare class ProgrammeSearchFilters implements IProgrammeSearchFilters {
17
17
  organisationIds?: string[];
18
18
  specialProgrammes?: SpecialProgrammesFilterOptionValue[];
19
19
  tuitionFee?: RangeDTO;
20
- nationalityIsoCode?: string;
20
+ nationalityCountryIso?: string;
21
21
  facets: IFacetFilters;
22
22
  from(input: ProgrammeSearchInput): IProgrammeSearchFilters;
23
23
  private parseDurations;
@@ -14,7 +14,7 @@ class ProgrammeSearchFilters {
14
14
  this.countryIsoCodes = input.countryIsoCodes;
15
15
  this.organisationIds = input.organisationIds ? input.organisationIds.map(id => id.toString()) : undefined;
16
16
  this.specialProgrammes = input.specialProgrammes;
17
- this.nationalityIsoCode = input.nationalityIsoCode;
17
+ this.nationalityCountryIso = input.nationalityCountryIso;
18
18
  this.parseDurations(input);
19
19
  this.parseTuitionFee(input);
20
20
  this.parseFacets(input);
@@ -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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"}
@@ -17,6 +17,6 @@ export type ProgrammeSearchInput = {
17
17
  specialProgrammes?: SpecialProgrammesFilterOptionValue[];
18
18
  tuitionFeeMin?: number;
19
19
  tuitionFeeMax?: number;
20
- nationalityIsoCode: string;
20
+ nationalityCountryIso: string;
21
21
  facets: IFacetValues;
22
22
  };
@@ -2,11 +2,12 @@ import { SearchApiClientBase } from "../SearchApiClientBase";
2
2
  import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-platform-http-requests";
3
3
  import { IProgrammeCard } from "@studyportals/domain-client";
4
4
  import { IProgrammeSearchResponse } from "./IProgrammeSearchResponse";
5
+ import { IProgrammeResult } from "./IProgrammeResult";
5
6
  export declare class SearchApiProgrammeClient extends SearchApiClientBase {
6
7
  private readonly requestFactory;
7
8
  private readonly requestSender;
8
- private readonly organisationCardFactory;
9
+ private readonly programmeCardFactory;
9
10
  constructor(apiUriBase: string, requestFactory: ISuperAgentRequestFactory, requestSender: IRequestSender);
10
- searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeCard>>;
11
+ searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeResult<IProgrammeCard>>>;
11
12
  searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<string>>;
12
13
  }
@@ -14,18 +14,27 @@ const SearchApiClientBase_1 = require("../SearchApiClientBase");
14
14
  const domain_client_1 = require("@studyportals/domain-client");
15
15
  class SearchApiProgrammeClient extends SearchApiClientBase_1.SearchApiClientBase {
16
16
  constructor(apiUriBase, requestFactory, requestSender) {
17
- super("organisations", apiUriBase);
18
- this.organisationCardFactory = new domain_client_1.ProgrammeCardClient();
17
+ super("programmes", apiUriBase);
18
+ this.programmeCardFactory = new domain_client_1.ProgrammeCardClient();
19
19
  this.requestFactory = requestFactory;
20
20
  this.requestSender = requestSender;
21
- this.organisationCardFactory = new domain_client_1.ProgrammeCardClient("N/A", "N/A", 1);
21
+ this.programmeCardFactory = new domain_client_1.ProgrammeCardClient("N/A", "N/A", 1);
22
22
  }
23
23
  searchCards(filters, resultSize, resultOffset) {
24
24
  return __awaiter(this, void 0, void 0, function* () {
25
+ var _a;
25
26
  const request = this.requestFactory.get(this.constructUri("search"))
26
27
  .query(Object.assign(Object.assign({}, filters), { resultSize, resultOffset }));
27
28
  const result = yield this.requestSender.sendAndExtractBody(request);
28
- return Object.assign(Object.assign({}, result), { programmes: this.organisationCardFactory.fromDescriptions([...result.programmes]) });
29
+ const programmeResults = result.programmes.map(result => ({
30
+ card: this.programmeCardFactory.fromDescription(result.card),
31
+ is_premium: result.is_premium
32
+ }));
33
+ const aggregationResults = (_a = result.aggregations) === null || _a === void 0 ? void 0 : _a.map(aggregation => ({
34
+ card: this.programmeCardFactory.fromDescription(aggregation.card),
35
+ is_premium: aggregation.is_premium
36
+ }));
37
+ return Object.assign(Object.assign({}, result), { programmes: programmeResults, aggregations: aggregationResults });
29
38
  });
30
39
  }
31
40
  searchIds(filters, resultSize, resultOffset) {
@@ -1 +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"}
1
+ {"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,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,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,MAAM,kBAAkB,GAAG,MAAA,MAAM,CAAC,YAAY,0CAAE,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;gBACnE,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC;gBACjE,UAAU,EAAE,WAAW,CAAC,UAAU;aAClC,CAAC,CAAC,CAAA;YAEH,uCACI,MAAM,KACT,UAAU,EAAE,gBAAgB,EAC5B,YAAY,EAAE,kBAAkB,IAChC;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;AA7CD,4DA6CC"}