@studyportals/search-api-interface 1.2.2-1 → 1.2.2-10

package/{bin/index.d.ts → index.d.ts}

@@ -9,5 +9,6 @@ import { IProgrammeSearchFilters } from "./src/programmes/IProgrammeSearchFilter
 import { IProgrammeSearchResponse } from "./src/programmes/IProgrammeSearchResponse";
 import { ProgrammeSearchFilters } from "./src/programmes/ProgrammeSearchFilters";
 import { ProgrammeSearchInput } from "./src/programmes/ProgrammeSearchInput";
+import { RangeDTO } from "./src/programmes/RangeDTO";
 import { SearchApiProgrammeClient } from "./src/programmes/SearchApiProgrammeClient";
-export { SearchApiOrganisationClient, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationSearchFilters, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, DegreeTypeEnum, DeliveryMethodEnum };
+export { SearchApiOrganisationClient, IOrganisationSearchResponse, IOrganisationSearchFilters, OrganisationSearchFilters, SearchApiProgrammeClient, IProgrammeSearchResponse, IProgrammeSearchFilters, ProgrammeSearchFilters, OrganisationSearchInput, ProgrammeSearchInput, DegreeTypeEnum, DeliveryMethodEnum, RangeDTO };

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AA4BnE,+FA5BQ,+BAAc,OA4BR;AA3Bf,+EAA4E;AA4B3E,mGA5BQ,uCAAkB,OA4BR;AA3BnB,+FAA4F;AAe3F,2GAfQ,uDAA0B,OAeR;AAb3B,6FAA0F;AAczF,0GAdQ,qDAAyB,OAcR;AAZ1B,iGAA8F;AAS7F,4GATQ,yDAA2B,OASR;AAR5B,sFAAmF;AAelF,wGAfQ,iDAAuB,OAeR;AAbxB,oFAAiF;AAchF,uGAdQ,+CAAsB,OAcR;AAXvB,wFAAqF;AAQpF,yGARQ,mDAAwB,OAQR"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@studyportals/search-api-interface",
-	"version": "1.2.2-1",
+	"version": "1.2.2-10",
 	"description": "Typescript library containing resources that facilitate integration with SearchApi",
 	"main": "bin/index.js",
 	"scripts": {
@@ -22,10 +22,10 @@
 		"@typescript-eslint/eslint-plugin": "^5.27.0",
 		"@typescript-eslint/parser": "^5.27.0",
 		"eslint": "^8.17.0",
-		"typescript": "^4.7.3",
+		"typescript": "^5.5.4",
 		"typescript-transform-paths": "^3.4.6"
 	},
 	"dependencies": {
-		"@studyportals/search-filters": "^4.3.0"
+		"@studyportals/search-filters": "4.3.1-5"
 	}
 }

package/{bin/src → src}/organisations/DegreeTypeEnum.js

@@ -8,5 +8,5 @@ var DegreeTypeEnum;
     DegreeTypeEnum[DegreeTypeEnum["PHD"] = 2] = "PHD";
     DegreeTypeEnum[DegreeTypeEnum["DISTANCE_LEARNING"] = 3] = "DISTANCE_LEARNING";
     DegreeTypeEnum[DegreeTypeEnum["SHORT_COURSES"] = 4] = "SHORT_COURSES";
-})(DegreeTypeEnum = exports.DegreeTypeEnum || (exports.DegreeTypeEnum = {}));
+})(DegreeTypeEnum || (exports.DegreeTypeEnum = DegreeTypeEnum = {}));
 //# sourceMappingURL=DegreeTypeEnum.js.map

package/{bin/src → src}/organisations/DegreeTypeEnum.js.map

@@ -1 +1 @@
-{"version":3,"file":"DegreeTypeEnum.js","sourceRoot":"","sources":["../../../src/organisations/DegreeTypeEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAMX;AAND,WAAY,cAAc;IACzB,uDAAU,CAAA;IACV,2DAAY,CAAA;IACZ,iDAAO,CAAA;IACP,6EAAqB,CAAA;IACrB,qEAAiB,CAAA;AAClB,CAAC,EANW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAMzB"}
+{"version":3,"file":"DegreeTypeEnum.js","sourceRoot":"","sources":["../../../src/organisations/DegreeTypeEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAMX;AAND,WAAY,cAAc;IACzB,uDAAU,CAAA;IACV,2DAAY,CAAA;IACZ,iDAAO,CAAA;IACP,6EAAqB,CAAA;IACrB,qEAAiB,CAAA;AAClB,CAAC,EANW,cAAc,8BAAd,cAAc,QAMzB"}

package/{bin/src → src}/organisations/DeliveryMethodEnum.js

@@ -6,5 +6,5 @@ var DeliveryMethodEnum;
     DeliveryMethodEnum["ONLINE"] = "online";
     DeliveryMethodEnum["ON_CAMPUS"] = "oncampus";
     DeliveryMethodEnum["BLENDED"] = "blended";
-})(DeliveryMethodEnum = exports.DeliveryMethodEnum || (exports.DeliveryMethodEnum = {}));
+})(DeliveryMethodEnum || (exports.DeliveryMethodEnum = DeliveryMethodEnum = {}));
 //# sourceMappingURL=DeliveryMethodEnum.js.map

package/{bin/src → src}/organisations/DeliveryMethodEnum.js.map

@@ -1 +1 @@
-{"version":3,"file":"DeliveryMethodEnum.js","sourceRoot":"","sources":["../../../src/organisations/DeliveryMethodEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC7B,uCAAiB,CAAA;IACjB,4CAAsB,CAAA;IACtB,yCAAmB,CAAA;AACpB,CAAC,EAJW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAI7B"}
+{"version":3,"file":"DeliveryMethodEnum.js","sourceRoot":"","sources":["../../../src/organisations/DeliveryMethodEnum.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC7B,uCAAiB,CAAA;IACjB,4CAAsB,CAAA;IACtB,yCAAmB,CAAA;AACpB,CAAC,EAJW,kBAAkB,kCAAlB,kBAAkB,QAI7B"}

package/{bin/src → src}/programmes/IProgrammeSearchFilters.d.ts

@@ -1,17 +1,17 @@
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters";
-import { TuitionFeeFilterValueDTO } from "./TuitionFeeFilterValueDTO";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
+import { RangeDTO } from "./RangeDTO";
 export declare class IProgrammeSearchFilters {
     readonly attendances?: AttendanceFilterOptionValue[];
     readonly degreeTypes?: DegreeTypeFilterOptionValue[];
     readonly disciplines?: string[];
-    readonly durations?: DurationFilterOptionValue[];
+    readonly durations?: RangeDTO[];
     readonly educationalLevels?: EducationLevelFilterOptionValue[];
     readonly educationalForms?: EducationalFormFilterOptionValue[];
     readonly keyword?: string;
     readonly areaIds?: string[];
     readonly regionIds?: string[];
     readonly countryIsoCodes?: string[];
-    readonly organisationId?: string;
+    readonly organisationIds?: string[];
     readonly specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    readonly tuitionFee?: TuitionFeeFilterValueDTO;
+    readonly tuitionFee?: RangeDTO;
 }

package/{bin/src → src}/programmes/IProgrammeSearchFilters.js.map

@@ -1 +1 @@
-{"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAWA,MAAa,uBAAuB;CAgBnC;AAhBD,0DAgBC"}
+{"version":3,"file":"IProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/IProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAUA,MAAa,uBAAuB;CAgBnC;AAhBD,0DAgBC"}

package/{bin/src → src}/programmes/ProgrammeSearchFilters.d.ts

@@ -1,23 +1,23 @@
 import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters";
 import { ProgrammeSearchInput } from "./ProgrammeSearchInput";
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
+import { RangeDTO } from "./RangeDTO";
 export declare class ProgrammeSearchFilters implements IProgrammeSearchFilters {
     attendances?: AttendanceFilterOptionValue[];
     degreeTypes?: DegreeTypeFilterOptionValue[];
     disciplines?: string[];
-    durations?: DurationFilterOptionValue[];
+    durations?: RangeDTO[];
     educationalLevels?: EducationLevelFilterOptionValue[];
     educationalForms?: EducationalFormFilterOptionValue[];
     keyword?: string;
     areaIds?: string[];
     regionIds?: string[];
     countryIsoCodes?: string[];
-    organisationId?: string;
+    organisationIds?: string[];
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    tuitionFee?: {
-        min: number;
-        max: number;
-    };
+    tuitionFee?: RangeDTO;
     from(input: ProgrammeSearchInput): IProgrammeSearchFilters;
+    private parseDurations;
+    private parseTuitionFee;
     private numbersToStringsOrUndefined;
 }

package/{bin/src → src}/programmes/ProgrammeSearchFilters.js

@@ -6,18 +6,35 @@ class ProgrammeSearchFilters {
         this.attendances = input.attendances;
         this.degreeTypes = input.degreeTypes;
         this.disciplines = this.numbersToStringsOrUndefined(input.disciplines);
-        this.durations = input.durations;
         this.educationalLevels = input.educationalLevels;
         this.educationalForms = input.educationalForms;
         this.keyword = input.keyword;
         this.areaIds = this.numbersToStringsOrUndefined(input.areaIds);
         this.regionIds = this.numbersToStringsOrUndefined(input.regionIds);
         this.countryIsoCodes = input.countryIsoCodes;
-        this.organisationId = input.organisationId ? input.organisationId.toString() : undefined;
+        this.organisationIds = input.organisationIds ? input.organisationIds.map(id => id.toString()) : undefined;
         this.specialProgrammes = input.specialProgrammes;
-        this.tuitionFee = input.tuitionFee;
+        this.parseDurations(input);
+        this.parseTuitionFee(input);
         return this;
     }
+    parseDurations(input) {
+        if (!input.durations)
+            return;
+        this.durations = [];
+        for (const duration of input.durations) {
+            const [min, max] = JSON.parse(duration);
+            this.durations.push({ min, max });
+        }
+    }
+    parseTuitionFee(input) {
+        if (input.tuitionFeeMin || input.tuitionFeeMax) {
+            this.tuitionFee = {
+                min: input.tuitionFeeMin,
+                max: input.tuitionFeeMax,
+            };
+        }
+    }
     numbersToStringsOrUndefined(values) {
         if (values === undefined)
             return;

package/src/programmes/ProgrammeSearchFilters.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAaA,MAAa,sBAAsB;IAiB3B,IAAI,CAAC,KAA2B;QACtC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAE7C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAA;QAEhD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAC1B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,cAAc,CAAC,KAA2B;QACjD,IAAI,CAAC,KAAK,CAAC,SAAS;YAAE,OAAO;QAE7B,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QAEpB,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAC,GAAG,EAAE,GAAG,EAAC,CAAC,CAAA;QAChC,CAAC;IACF,CAAC;IAEO,eAAe,CAAC,KAA2B;QAClD,IAAI,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,aAAa,EAAE,CAAC;YAChD,IAAI,CAAC,UAAU,GAAG;gBACjB,GAAG,EAAE,KAAK,CAAC,aAAa;gBACxB,GAAG,EAAE,KAAK,CAAC,aAAa;aACxB,CAAC;QACH,CAAC;IACF,CAAC;IAEO,2BAA2B,CAAC,MAA4B;QAC/D,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QACjC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;CACD;AA9DD,wDA8DC"}

package/{bin/src → src}/programmes/ProgrammeSearchInput.d.ts

@@ -1,5 +1,4 @@
-import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters";
-import { TuitionFeeFilterValueDTO } from "./TuitionFeeFilterValueDTO";
+import { AttendanceFilterOptionValue, DegreeTypeFilterOptionValue, DurationFilterOptionValue, EducationLevelFilterOptionValue, EducationalFormFilterOptionValue, SpecialProgrammesFilterOptionValue } from "@studyportals/search-filters/server";
 export type ProgrammeSearchInput = {
     resultSize: number;
     resultOffset: number;
@@ -13,7 +12,8 @@ export type ProgrammeSearchInput = {
     areaIds?: number[];
     regionIds?: number[];
     countryIsoCodes?: string[];
-    organisationId?: number;
+    organisationIds?: number[];
     specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-    tuitionFee?: TuitionFeeFilterValueDTO;
+    tuitionFeeMin?: number;
+    tuitionFeeMax?: number;
 };

package/src/programmes/RangeDTO.d.ts

@@ -0,0 +1,4 @@
+export interface RangeDTO {
+    min?: number;
+    max?: number;
+}

package/{bin/src/programmes/TuitionFeeFilterValueDTO.js → src/programmes/RangeDTO.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=TuitionFeeFilterValueDTO.js.map
+//# sourceMappingURL=RangeDTO.js.map

package/src/programmes/RangeDTO.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RangeDTO.js","sourceRoot":"","sources":["../../../src/programmes/RangeDTO.ts"],"names":[],"mappings":""}

package/.eslintignore

@@ -1 +0,0 @@
-**/bin/**

package/.eslintrc.yml

@@ -1,4 +0,0 @@
-extends: ./node_modules/@studyportals/code-style/.eslintrc.js
-
-rules:
-  eol-last: 2

package/bin/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;AAAA,uEAAoE;AA2BnE,+FA3BQ,+BAAc,OA2BR;AA1Bf,+EAA4E;AA2B3E,mGA3BQ,uCAAkB,OA2BR;AA1BnB,+FAA4F;AAc3F,2GAdQ,uDAA0B,OAcR;AAZ3B,6FAA0F;AAazF,0GAbQ,qDAAyB,OAaR;AAX1B,iGAA8F;AAQ7F,4GARQ,yDAA2B,OAQR;AAP5B,sFAAmF;AAclF,wGAdQ,iDAAuB,OAcR;AAZxB,oFAAiF;AAahF,uGAbQ,+CAAsB,OAaR;AAXvB,wFAAqF;AAQpF,yGARQ,mDAAwB,OAQR"}

package/bin/package.json

@@ -1,31 +0,0 @@
-{
-	"name": "@studyportals/search-api-interface",
-	"version": "1.2.2-1",
-	"description": "Typescript library containing resources that facilitate integration with SearchApi",
-	"main": "bin/index.js",
-	"scripts": {
-		"compile": "rm -fR bin && npx tsc",
-		"deploy-patch": "npm version patch && npm run deploy",
-		"deploy-minor": "npm version minor && npm run deploy",
-		"deploy-major": "npm version major && npm run deploy",
-		"deploy-beta": "npm version prerelease && npm run prepare-deployment && npm publish ./bin --tag beta",
-		"deploy": "npm run prepare-deployment && npm publish ./bin",
-		"prepare-deployment": "npm run compile && cp package.json bin/package.json",
-		"lint": "eslint . --ext .ts",
-		"lint:fix": "eslint . --ext .ts --fix"
-	},
-	"author": "Seal Team Six",
-	"license": "BSD-3-Clause",
-	"devDependencies": {
-		"@studyportals/code-style": "^1.7.0",
-		"@types/superagent": "^4.1.15",
-		"@typescript-eslint/eslint-plugin": "^5.27.0",
-		"@typescript-eslint/parser": "^5.27.0",
-		"eslint": "^8.17.0",
-		"typescript": "^4.7.3",
-		"typescript-transform-paths": "^3.4.6"
-	},
-	"dependencies": {
-		"@studyportals/search-filters": "^4.3.0"
-	}
-}

package/bin/src/programmes/ProgrammeSearchFilters.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProgrammeSearchFilters.js","sourceRoot":"","sources":["../../../src/programmes/ProgrammeSearchFilters.ts"],"names":[],"mappings":";;;AAcA,MAAa,sBAAsB;IAoB3B,IAAI,CAAC,KAA2B;QACtC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QACjC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAE7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAE7C,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzF,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAA;QAEhD,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QAEnC,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,2BAA2B,CAAC,MAA4B;QAC/D,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO;QACjC,OAAO,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;CACD;AA7CD,wDA6CC"}

package/bin/src/programmes/TuitionFeeFilterValueDTO.d.ts

@@ -1,4 +0,0 @@
-export interface TuitionFeeFilterValueDTO {
-    min: number;
-    max: number;
-}

package/bin/src/programmes/TuitionFeeFilterValueDTO.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TuitionFeeFilterValueDTO.js","sourceRoot":"","sources":["../../../src/programmes/TuitionFeeFilterValueDTO.ts"],"names":[],"mappings":""}

package/index.ts

@@ -1,30 +0,0 @@
-import { DegreeTypeEnum } from "./src/organisations/DegreeTypeEnum";
-import { DeliveryMethodEnum } from "./src/organisations/DeliveryMethodEnum";
-import { IOrganisationSearchFilters } from "./src/organisations/IOrganisationSearchFilters";
-import { IOrganisationSearchResponse } from "./src/organisations/IOrganisationSearchResponse";
-import { OrganisationSearchFilters } from "./src/organisations/OrganisationSearchFilters";
-import { OrganisationSearchInput } from "./src/organisations/OrganisationSearchInput";
-import { SearchApiOrganisationClient } from "./src/organisations/SearchApiOrganisationClient";
-import { IProgrammeSearchFilters } from "./src/programmes/IProgrammeSearchFilters";
-import { IProgrammeSearchResponse } from "./src/programmes/IProgrammeSearchResponse";
-import { ProgrammeSearchFilters } from "./src/programmes/ProgrammeSearchFilters";
-import { ProgrammeSearchInput } from "./src/programmes/ProgrammeSearchInput";
-import { SearchApiProgrammeClient } from "./src/programmes/SearchApiProgrammeClient";
-
-export {
-	SearchApiOrganisationClient,
-	IOrganisationSearchResponse,
-	IOrganisationSearchFilters,
-	OrganisationSearchFilters,
-
-	SearchApiProgrammeClient,
-	IProgrammeSearchResponse,
-	IProgrammeSearchFilters,
-	ProgrammeSearchFilters,
-
-	OrganisationSearchInput,
-	ProgrammeSearchInput,
-
-	DegreeTypeEnum,
-	DeliveryMethodEnum
-}

package/src/SearchApiClientBase.ts

@@ -1,10 +0,0 @@
-export class SearchApiClientBase {
-	public constructor(private readonly domain: string,
-		private readonly apiUriBase: string
-	) {
-	}
-
-	protected constructUri(relativeUri: string): string {
-		return `${this.apiUriBase}/${this.domain}/${relativeUri}`;
-	}
-}

package/src/organisations/DegreeTypeEnum.ts

@@ -1,7 +0,0 @@
-export enum DegreeTypeEnum {
-	MASTER = 0,
-	BACHELOR = 1,
-	PHD = 2,
-	DISTANCE_LEARNING = 3,
-	SHORT_COURSES = 4,
-}

package/src/organisations/DeliveryMethodEnum.ts

@@ -1,5 +0,0 @@
-export enum DeliveryMethodEnum {
-	ONLINE = "online",
-	ON_CAMPUS = "oncampus",
-	BLENDED = "blended"
-}

package/src/organisations/IOrganisationSearchFilters.ts

@@ -1,12 +0,0 @@
-import { DegreeTypeEnum } from "./DegreeTypeEnum";
-import { DeliveryMethodEnum } from "./DeliveryMethodEnum";
-
-export class IOrganisationSearchFilters {
-	readonly organisationId: string | undefined;
-	readonly degree: DegreeTypeEnum | undefined;
-	readonly disciplines: string[] | undefined;
-	readonly deliveryMethods: DeliveryMethodEnum[] | undefined;
-	readonly countryIsoCodes: string[] | undefined;
-	readonly regionIds: string[] | undefined;
-	readonly areaIds: string[] | undefined;
-}

package/src/organisations/IOrganisationSearchResponse.ts

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

package/src/organisations/OrganisationSearchFilters.ts

@@ -1,65 +0,0 @@
-import { DegreeTypeEnum } from "./DegreeTypeEnum";
-import { DeliveryMethodEnum } from "./DeliveryMethodEnum";
-import { OrganisationSearchInput } from "./OrganisationSearchInput";
-import { IOrganisationSearchFilters } from "./IOrganisationSearchFilters";
-
-export class OrganisationSearchFilters implements IOrganisationSearchFilters {
-	public organisationId: string | undefined;
-	public degree: DegreeTypeEnum | undefined;
-	public disciplines: string[] | undefined;
-	public deliveryMethods: DeliveryMethodEnum[] | undefined;
-	public countryIsoCodes: string[] | undefined;
-	public regionIds: string[] | undefined;
-	public areaIds: string[] | undefined;
-
-	public from(input: OrganisationSearchInput): OrganisationSearchFilters {
-		this.organisationId = input.organisationId ? input.organisationId.toString() : undefined;
-		this.degree = input.degree;
-		this.deliveryMethods = input.deliveryMethods;
-		this.disciplines = this.numbersToStringsOrUndefined(input.disciplines);
-		this.countryIsoCodes = input.countryIsoCodes;
-		this.regionIds = this.numbersToStringsOrUndefined(input.regionIds);
-		this.areaIds = this.numbersToStringsOrUndefined(input.areaIds);
-		return this;
-	}
-
-	public consideringId(id: string): OrganisationSearchFilters {
-		this.organisationId = id;
-		return this;
-	}
-
-	public consideringDegree(degree: DegreeTypeEnum): OrganisationSearchFilters {
-		this.degree = degree;
-		return this;
-	}
-
-	public consideringDisciplines(disciplines: string[]): OrganisationSearchFilters {
-		this.disciplines = disciplines;
-		return this;
-	}
-
-	public consideringDeliveryMethods(deliveryMethods: DeliveryMethodEnum[]): OrganisationSearchFilters {
-		this.deliveryMethods = deliveryMethods;
-		return this;
-	}
-
-	public consideringCountryIsoCodes(countryIsoCodes: string[]): OrganisationSearchFilters {
-		this.countryIsoCodes = countryIsoCodes;
-		return this;
-	}
-
-	public consideringRegionIds(regionIds: string[]): OrganisationSearchFilters {
-		this.regionIds = regionIds;
-		return this;
-	}
-
-	public consideringAreaIds(areaIds: string[]): OrganisationSearchFilters {
-		this.areaIds = areaIds;
-		return this;
-	}
-
-	private numbersToStringsOrUndefined(values: number[] | undefined): string[] | undefined {
-		if (values === undefined) return;
-		return values.map(value => value.toString());
-	}
-}

package/src/organisations/OrganisationSearchInput.ts

@@ -1,14 +0,0 @@
-import { DegreeTypeEnum } from "./DegreeTypeEnum";
-import { DeliveryMethodEnum } from "./DeliveryMethodEnum";
-
-export type OrganisationSearchInput = {
-	resultSize: number,
-	resultOffset: number,
-	organisationId?: number,
-	disciplines?: number[],
-	countryIsoCodes?: string[],
-	regionIds?: number[],
-	areaIds?: number[],
-	degree?: DegreeTypeEnum,
-	deliveryMethods?: DeliveryMethodEnum[]
-};

package/src/organisations/SearchApiOrganisationClient.ts

@@ -1,42 +0,0 @@
-import { SearchApiClientBase } from "../SearchApiClientBase";
-import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-platform-http-requests";
-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,
-		requestSender: IRequestSender
-	) {
-		super("organisations", apiUriBase);
-
-		this.requestFactory = requestFactory;
-		this.requestSender = requestSender;
-		this.organisationCardFactory = new OrganisationCardClient("N/A", "N/A", 1);
-	}
-
-	public async searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<IOrganisationCard>> {
-		const request = this.requestFactory.get(this.constructUri("search"))
-			.query({ ...filters, resultSize, resultOffset });
-
-		const result = await this.requestSender.sendAndExtractBody<IOrganisationSearchResponse<IModelDescription>>(request);
-
-		return {
-			...result,
-			organisations: this.organisationCardFactory.fromDescriptions([...result.organisations])
-		}
-	}
-
-	public async searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IOrganisationSearchResponse<string>> {
-		const request = this.requestFactory.get(this.constructUri("search/ids"))
-			.query({ ...filters, resultSize, resultOffset });
-
-		return await this.requestSender.sendAndExtractBody<IOrganisationSearchResponse<string>>(request);
-	}
-}

package/src/programmes/IProgrammeSearchFilters.ts

@@ -1,28 +0,0 @@
-import {
-	AttendanceFilterOptionValue,
-	DegreeTypeFilterOptionValue,
-	DurationFilterOptionValue,
-	EducationLevelFilterOptionValue,
-	EducationalFormFilterOptionValue,
-	SpecialProgrammesFilterOptionValue
-} from "@studyportals/search-filters";
-
-import { TuitionFeeFilterValueDTO } from "./TuitionFeeFilterValueDTO";
-
-export class IProgrammeSearchFilters {
-	readonly attendances?: AttendanceFilterOptionValue[];
-	readonly degreeTypes?: DegreeTypeFilterOptionValue[];
-	readonly disciplines?: string[];
-	readonly durations?: DurationFilterOptionValue[];
-	readonly educationalLevels?: EducationLevelFilterOptionValue[];
-	readonly educationalForms?: EducationalFormFilterOptionValue[];
-	readonly keyword?: string;
-
-	readonly areaIds?: string[];
-	readonly regionIds?: string[];
-	readonly countryIsoCodes?: string[];
-	readonly organisationId?: string;
-
-	readonly specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-	readonly tuitionFee?: TuitionFeeFilterValueDTO
-}

package/src/programmes/IProgrammeSearchResponse.ts

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

package/src/programmes/ProgrammeSearchFilters.ts

@@ -1,60 +0,0 @@
-import { IProgrammeSearchFilters } from "./IProgrammeSearchFilters";
-import { ProgrammeSearchInput } from "./ProgrammeSearchInput";
-
-import {
-	AttendanceFilterOptionValue,
-	DegreeTypeFilterOptionValue,
-	DurationFilterOptionValue,
-	EducationLevelFilterOptionValue,
-	EducationalFormFilterOptionValue,
-	SpecialProgrammesFilterOptionValue
-} from "@studyportals/search-filters";
-
-import { TuitionFeeFilterValueDTO } from "./TuitionFeeFilterValueDTO";
-
-export class ProgrammeSearchFilters implements IProgrammeSearchFilters {
-	public attendances?: AttendanceFilterOptionValue[];
-	public degreeTypes?: DegreeTypeFilterOptionValue[];
-	public disciplines?: string[];
-	public durations?: DurationFilterOptionValue[];
-	public educationalLevels?: EducationLevelFilterOptionValue[];
-	public educationalForms?: EducationalFormFilterOptionValue[];
-	public keyword?: string;
-
-	public areaIds?: string[];
-	public regionIds?: string[];
-	public countryIsoCodes?: string[];
-	public organisationId?: string;
-
-	public specialProgrammes?: SpecialProgrammesFilterOptionValue[];
-	public tuitionFee?: {
-		min: number
-		max: number
-	}
-
-	public from(input: ProgrammeSearchInput): IProgrammeSearchFilters {
-		this.attendances = input.attendances;
-		this.degreeTypes = input.degreeTypes;
-		this.disciplines = this.numbersToStringsOrUndefined(input.disciplines);
-		this.durations = input.durations;
-		this.educationalLevels = input.educationalLevels;
-		this.educationalForms = input.educationalForms;
-		this.keyword = input.keyword;
-
-		this.areaIds = this.numbersToStringsOrUndefined(input.areaIds);
-		this.regionIds = this.numbersToStringsOrUndefined(input.regionIds);
-		this.countryIsoCodes = input.countryIsoCodes;
-
-		this.organisationId = input.organisationId ? input.organisationId.toString() : undefined;
-		this.specialProgrammes = input.specialProgrammes
-
-		this.tuitionFee = input.tuitionFee;
-
-		return this;
-	}
-
-	private numbersToStringsOrUndefined(values: number[] | undefined): string[] | undefined {
-		if (values === undefined) return;
-		return values.map(value => value.toString());
-	}
-}

package/src/programmes/ProgrammeSearchInput.ts

@@ -1,33 +0,0 @@
-import {
-	AttendanceFilterOptionValue,
-	DegreeTypeFilterOptionValue,
-	DurationFilterOptionValue,
-	EducationLevelFilterOptionValue,
-	EducationalFormFilterOptionValue,
-	SpecialProgrammesFilterOptionValue
-} from "@studyportals/search-filters";
-
-import { TuitionFeeFilterValueDTO } from "./TuitionFeeFilterValueDTO";
-
-export type ProgrammeSearchInput = {
-	resultSize: number,
-	resultOffset: number,
-
-	attendances?: AttendanceFilterOptionValue[],
-	degreeTypes?: DegreeTypeFilterOptionValue[],
-	disciplines?: number[],
-	durations?: DurationFilterOptionValue[],
-	educationalLevels?: EducationLevelFilterOptionValue[],
-	educationalForms?: EducationalFormFilterOptionValue[]
-
-	keyword: string
-
-	areaIds?: number[],
-	regionIds?: number[],
-	countryIsoCodes?: string[],
-	organisationId?: number,
-
-	specialProgrammes?: SpecialProgrammesFilterOptionValue[]
-	tuitionFee?: TuitionFeeFilterValueDTO
-
-};

package/src/programmes/SearchApiProgrammeClient.ts

@@ -1,42 +0,0 @@
-import { SearchApiClientBase } from "../SearchApiClientBase";
-import { IRequestSender, ISuperAgentRequestFactory } from "@studyportals/mb-platform-http-requests";
-import { IModelDescription } from "@studyportals/domain-client/src/i-model-description";
-import { IProgrammeCard, ProgrammeCardClient } from "@studyportals/domain-client";
-import { IProgrammeSearchResponse } from "./IProgrammeSearchResponse";
-
-export class SearchApiProgrammeClient extends SearchApiClientBase {
-
-	private readonly requestFactory: ISuperAgentRequestFactory;
-	private readonly requestSender: IRequestSender;
-	private readonly organisationCardFactory = new ProgrammeCardClient();
-
-	public constructor(apiUriBase: string,
-		requestFactory: ISuperAgentRequestFactory,
-		requestSender: IRequestSender
-	) {
-		super("organisations", apiUriBase);
-
-		this.requestFactory = requestFactory;
-		this.requestSender = requestSender;
-		this.organisationCardFactory = new ProgrammeCardClient("N/A", "N/A", 1);
-	}
-
-	public async searchCards(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<IProgrammeCard>> {
-		const request = this.requestFactory.get(this.constructUri("search"))
-			.query({ ...filters, resultSize, resultOffset });
-
-		const result = await this.requestSender.sendAndExtractBody<IProgrammeSearchResponse<IModelDescription>>(request);
-
-		return {
-			...result,
-			programmes: this.organisationCardFactory.fromDescriptions([...result.programmes])
-		}
-	}
-
-	public async searchIds(filters: any, resultSize: number, resultOffset: number): Promise<IProgrammeSearchResponse<string>> {
-		const request = this.requestFactory.get(this.constructUri("search/ids"))
-			.query({ ...filters, resultSize, resultOffset });
-
-		return await this.requestSender.sendAndExtractBody<IProgrammeSearchResponse<string>>(request);
-	}
-}

package/src/programmes/TuitionFeeFilterValueDTO.ts

@@ -1,4 +0,0 @@
-export interface TuitionFeeFilterValueDTO {
-	min: number;
-	max: number;
-}

package/tsconfig.json

@@ -1,47 +0,0 @@
-{
-	"compilerOptions": {
-		"outDir": "bin",
-		"declaration": true,
-		"rootDirs": [
-			"./"
-		],
-		"moduleResolution": "node",
-		"alwaysStrict": true,
-		"strictNullChecks": true,
-		"allowJs": false,
-		"allowUnreachableCode": false,
-		"allowUnusedLabels": false,
-		"noUnusedLocals": false,
-		"noUnusedParameters": false,
-		"noFallthroughCasesInSwitch": true,
-		"noImplicitAny": true,
-		"noImplicitReturns": true,
-		"noImplicitThis": true,
-		"sourceMap": true,
-		"target": "ES6",
-		"module": "commonjs",
-		"experimentalDecorators": true,
-		"paths": {
-			"@/*": [
-				"./*"
-			]
-		},
-		"plugins": [
-			{
-				"transform": "typescript-transform-paths"
-			},
-			{
-				"transform": "typescript-transform-paths",
-				"afterDeclarations": true
-			}
-		]
-	},
-	"typeRoots": [
-		"node_modules/@types/"
-	],
-	"exclude": [
-		"node_modules",
-		"bin",
-		".vscode"
-	]
-}