@pax2pay/client 0.3.52 → 0.3.53

package/Client/Organisations/index.ts

@@ -1,31 +1,23 @@
 import * as model from "../../model"
-import { Collection } from "../Collection"
 import { Connection } from "../Connection"
-import { Organisation } from "../Organisation"
-import { Resource } from "../Resource"
+import { List } from "../List"
 
-export class Organisations extends Collection<
-	model.OrganisationResponse,
-	Partial<model.OrganisationRequest>,
-	model.OrganisationRequest
-> {
+export class Organisations extends List<model.OrganisationResponse> {
 	protected readonly folder = "organisations"
 	constructor(connection: Connection) {
 		super(connection)
 	}
-	protected createResource(
-		response: model.OrganisationResponse
-	): Resource<model.OrganisationResponse, { [key: string]: any }> {
-		return new Organisation(this.connection, [this.folder, response.code].join("/"), response)
-	}
 	static create(connection: Connection) {
 		return new Organisations(connection)
 	}
+	async remove(code: string) {
+		return await this.connection.remove<model.OrganisationResponse>(`${this.folder}/${code}`)
+	}
 	async updateOrganisation(
 		code: string,
 		request: model.OrganisationUpdateRequest
 	): Promise<model.ErrorResponse | model.OrganisationResponse> {
-		return await this.connection.put<model.OrganisationResponse>(`organisations/${code}`, request)
+		return await this.connection.put<model.OrganisationResponse>(`${this.folder}/${code}`, request)
 	}
 
 	async getAllOrganisations(
@@ -35,7 +27,7 @@ export class Organisations extends Collection<
 		includeNonActive = false
 	): Promise<model.ErrorResponse | model.OrganisationResponse[]> {
 		const response = await this.connection.get<{ list: model.OrganisationResponse[]; totalCount: number }>(
-			`organisations`,
+			this.folder,
 			{
 				page: page,
 				size: size,

package/Client/Reports/index.spec.ignore.ts

@@ -32,11 +32,4 @@ describe("pax2pay.reports", () => {
 			},
 		})
 	})
-
-	it("attachPageable", async () => {
-		const result = await client?.reports.attachPageable("statement", 2, 10)
-		expect(result).toEqual("statement?page=2&size=10")
-		const result2 = await client?.reports.attachPageable("statement", 5, 30)
-		expect(result2).toEqual("statement?page=5&size=30")
-	})
 })

package/Client/Reports/index.ts

@@ -3,6 +3,7 @@ import * as model from "../../model"
 import { Connection } from "../Connection"
 
 export class Reports {
+	protected readonly folder = "reports"
 	constructor(private readonly connection: Connection) {}
 
 	async reconciliation(start: isoly.DateTime, end: isoly.DateTime) {
@@ -42,12 +43,15 @@ export class Reports {
 				status: 400 | 403 | 404 | 500 | 503
 		  })
 	> {
-		let path = `statement`
-		if (page || pageSize)
-			path = this.attachPageable(path, page, pageSize)
-
 		let result
-		result = await this.connection.post<{ list: model.StatementReportResponse; totalCount: number }>(path, request)
+		result = await this.connection.post<{ list: model.StatementReportResponse; totalCount: number }>(
+			`statement`,
+			request,
+			{
+				page: page,
+				size: pageSize,
+			}
+		)
 		if (!model.ErrorResponse.is(result) && "list" in result)
 			result = result.list
 		return result
@@ -63,45 +67,30 @@ export class Reports {
 				status: 400 | 403 | 404 | 500 | 503
 		  })
 	> {
-		let path = `reports/statement/summary`
-		if (page || pageSize || totalCount)
-			path = this.attachPageable(path, page, pageSize, totalCount)
-
-		const result = await this.connection.post<{ list: model.StatementSummaryReportResponse; totalCount: number }>(
-			path,
-			request
+		return await this.connection.post<{ list: model.StatementSummaryReportResponse; totalCount: number }>(
+			`reports/statement/summary`,
+			request,
+			{
+				page: page,
+				size: pageSize,
+				includeCount: totalCount,
+			}
 		)
-		return result
 	}
 	async getStatementForTable(rowId: string) {
-		const result = await this.connection.get<model.StatementReportResponseRow>(`statement/${rowId}`)
-		return result
-	}
-	attachPageable(base: string, page?: number, pageSize?: number, includeCount?: boolean) {
-		const params = []
-		if (page)
-			params.push("page=" + page)
-		if (pageSize)
-			params.push("size=" + pageSize)
-		if (includeCount != undefined)
-			params.push("includeCount=" + includeCount)
-		return base + "?" + params.join("&")
+		return await this.connection.get<model.StatementReportResponseRow>(`statement/${rowId}`)
 	}
 	async getStatementReportUrl(request: model.StatementReportUrlRequest) {
-		const result = await this.connection.post<model.ReportUrlResponse>(`statement/download`, request)
-		return result
+		return await this.connection.post<model.ReportUrlResponse>(`statement/download`, request)
 	}
 	async getUserReportUrl(request: model.UserReportUrlRequest) {
-		const result = await this.connection.post<model.ReportUrlResponse>(`reports/user/download`, request)
-		return result
+		return await this.connection.post<model.ReportUrlResponse>(`${this.folder}/user/download`, request)
 	}
 	async getCardReportUrl(request: model.CardReportUrlRequest) {
-		const result = await this.connection.post<model.ReportUrlResponse>(`reports/card/download`, request)
-		return result
+		return await this.connection.post<model.ReportUrlResponse>(`${this.folder}/card/download`, request)
 	}
 	async getReconciliationReportUrl(request: model.ReconciliationReportUrlRequest) {
-		const result = await this.connection.post<model.ReportUrlResponse>(`reports/reconciliation/download`, request)
-		return result
+		return await this.connection.post<model.ReportUrlResponse>(`${this.folder}/reconciliation/download`, request)
 	}
 	static create(connection: Connection) {
 		return new Reports(connection)

package/Client/Transfers/factory.ts

@@ -1,3 +1,4 @@
+import { Currency } from "isoly"
 import assert from "assert"
 import * as dotenv from "dotenv"
 import * as model from "../../model"
@@ -66,13 +67,14 @@ export function getExpectedForBeneficiary(request: model.TransferRequest): model
 		amount: request.amount,
 		beneficiary: {
 			transferDestination: {
-				currency: request.currency,
+				currency: request.currency as Currency,
 				fullName: expect.any(String),
 			},
+			name: expect.any(String),
 			defaultReference: expect.any(String),
 			status: expect.stringMatching(/(ACTIVE)|(DELETED)|(OUTDATED)/),
 			fullName: expect.any(String),
-			beneficiaryId: process.env.beneficiaryModulr,
+			beneficiaryId: process.env.beneficiaryModulr ?? "",
 			createdOn: expect.any(String),
 		},
 	}

package/Client/Transfers/index.ts

@@ -1,9 +1,8 @@
 import * as model from "../../model"
 import { Connection } from "../Connection"
 import { List } from "../List"
-import { Transfer } from "../Transfer"
 
-export class Transfers extends List<model.TransferResponse, model.TransferSearch, model.TransferRequest> {
+export class Transfers extends List<model.TransferResponse> {
 	protected folder = "transfers"
 	constructor(connection: Connection) {
 		super(connection)
@@ -11,33 +10,19 @@ export class Transfers extends List<model.TransferResponse, model.TransferSearch
 	static create(connection: Connection): Transfers {
 		return new Transfers(connection)
 	}
-	protected getResourcePath(resource: model.TransferResponse): string {
-		return [this.folder, resource.providerCode, resource.providerTransferId].join("/")
-	}
-	protected createResource(response: model.TransferResponse): Transfer {
-		return new Transfer(
-			this.connection,
-			[this.folder, response.providerCode, response.providerTransferId].join("/"),
-			response
-		)
-	}
 	async getAll(): Promise<model.ErrorResponse | model.TransferResponse[]> {
-		const response = await this.connection.get<{ list: model.TransferResponse[]; totalCount: number }>(`${this.folder}`)
+		const response = await this.connection.get<{ list: model.TransferResponse[]; totalCount: number }>(this.folder)
 		return this.extractResponse(response)
 	}
 	async getTransfer(provider: model.ProviderCode, transferId: string) {
 		return await this.connection.get<model.TransferResponse>([this.folder, provider, transferId].join("/"))
 	}
-	protected map(response: model.TransferResponse): Transfer & model.TransferResponse {
-		return Object.assign(new Transfer(this.connection, this.getResourcePath(response), response), response)
-	}
 	async create(request: model.TransferRequest) {
-		const result = await this.connection.post<model.TransferResponse>(`${this.folder}`, request)
-		return model.ErrorResponse.is(result) ? result : this.map(result)
+		return await this.connection.post<model.TransferResponse>(this.folder, request)
 	}
 	async createV2(request: model.TransferRequest, otp?: string) {
 		return await this.connection.post<model.TransferResponseV2>(
-			"v2/transfers",
+			`v2/${this.folder}`,
 			request,
 			undefined,
 			otp ? { "x-otp": otp } : {}

package/Client/Users/index.ts

@@ -1,70 +1,66 @@
 import * as model from "../../model"
-import { Collection } from "../Collection"
 import { Connection } from "../Connection"
+import { List } from "../List"
 import { Paginated } from "../Paginated"
-import { Resource } from "../Resource"
-import { User } from "../User"
 
-export class Users extends Collection<model.UserResponse, model.UserSearchRequest, model.UserRequest> {
+export class Users extends List<model.UserResponse> {
 	protected folder = "users"
 	private constructor(connection: Connection) {
 		super(connection)
 	}
-	protected createResource(response: model.UserResponse): Resource<model.UserResponse, { [key: string]: any }> {
-		return new User(this.connection, [this.folder, response.username].join("/"), response)
-	}
 	static create(connection: Connection) {
 		return new Users(connection)
 	}
 	async deleteUser(username: string): Promise<model.UserResponse | model.ErrorResponse> {
-		const result = await this.connection.remove<model.UserResponse>(`users/${username}`)
-		return result
+		return await this.connection.remove<model.UserResponse>(`${this.folder}/${username}`)
+	}
+	async create(request: model.UserRequest) {
+		return await this.connection.post<model.UserResponse>(this.folder, request)
 	}
 	async getAllUsers(): Promise<model.UserResponse[] | model.ErrorResponse> {
-		const response = await this.connection.get<{ list: model.UserResponse[]; totalCount: number }>(`users`, {
+		const response = await this.connection.get<{ list: model.UserResponse[]; totalCount: number }>(this.folder, {
 			size: 500,
 			sort: "username",
 		})
 		return this.extractResponse(response)
 	}
+	//Possibly should be moved to its own class
 	async getRolesets(): Promise<model.RolesetResponse[] | model.ErrorResponse> {
 		const response = await this.connection.get<{ list: model.RolesetResponse[]; totalCount: number }>(`rolesets`, {
 			size: 100,
 			sort: "name",
 		})
-		return this.extractResponse(response)
+		return this.extractResponse<model.RolesetResponse>(response)
 	}
 	async getUser(username: string): Promise<model.UserResponse | model.ErrorResponse> {
-		const result = await this.connection.get<model.UserResponse>(`users/${username}`)
-		return result
+		return await this.connection.get<model.UserResponse>(`${this.folder}/${username}`)
 	}
 	async getUsersActiveRoles(username: string): Promise<string[] | model.ErrorResponse> {
 		const response = await this.connection.get<{ list: string[]; totalCount: number }>(
-			`users/${username}/roles/minified`
+			`${this.folder}/${username}/roles/minified`
 		)
-		return this.extractResponse(response)
+		return this.extractResponse<string>(response)
 	}
 	async resetPassword(username: string): Promise<model.PasswordResetResponse | model.ErrorResponse> {
-		const result = await this.connection.post<model.PasswordResetResponse>(`auth/passwordreset`, { username: username })
-		return result
+		return await this.connection.post<model.PasswordResetResponse>(`auth/passwordreset`, { username: username })
 	}
 	async updateRolesetOnUser(username: string, roleset: string): Promise<model.UserRoleResponse | model.ErrorResponse> {
-		const result = await this.connection.put<model.UserRoleResponse>(`users/${username}/rolesets/${roleset}`, undefined)
-		return result
+		return await this.connection.put<model.UserRoleResponse>(
+			`${this.folder}/${username}/rolesets/${roleset}`,
+			undefined
+		)
 	}
 	async addRolesetOnUser(username: string, roleset: string): Promise<model.UserRoleResponse | model.ErrorResponse> {
-		const result = await this.connection.post<model.UserRoleResponse>(
-			`users/${username}/rolesets/${roleset}`,
+		return await this.connection.post<model.UserRoleResponse>(
+			`${this.folder}/${username}/rolesets/${roleset}`,
 			undefined
 		)
-		return result
 	}
 	async updateUser(
 		username: string,
 		request: model.UserChangeRequest
 	): Promise<model.UserResponse | model.ErrorResponse> {
-		const result = await this.connection.put<model.UserResponse>(`users/${username}`, request)
-		return result
+		return await this.connection.put<model.UserResponse>(`${this.folder}/${username}`, request)
 	}
 	async checkUsernameAvailability(username: string): Promise<model.UsernameAvailabilityResponse | model.ErrorResponse> {
 		return await this.connection.get<model.UsernameAvailabilityResponse>(`${this.folder}/username/${username}`)
@@ -72,14 +68,14 @@ export class Users extends Collection<model.UserResponse, model.UserSearchReques
 	async checkPassword(
 		request: model.PasswordValidateRequest
 	): Promise<model.PasswordValidateResponse | model.ErrorResponse> {
-		return await this.connection.post<model.PasswordValidateResponse>(`users/password/check`, request)
+		return await this.connection.post<model.PasswordValidateResponse>(`${this.folder}/password/check`, request)
 	}
 	async changePassword(
 		request: model.PasswordChangeRequest,
 		otp?: string
 	): Promise<model.UserResponse | model.ErrorResponse> {
 		return await this.connection.put<model.UserResponse>(
-			`users/password`,
+			`${this.folder}/password`,
 			request,
 			undefined,
 			otp ? { "x-otp": otp } : {}
@@ -89,19 +85,19 @@ export class Users extends Collection<model.UserResponse, model.UserSearchReques
 		username: string
 	): Promise<model.TwoFactorAuthenticationRegistrationResponse | model.ErrorResponse> {
 		return await this.connection.post<model.TwoFactorAuthenticationRegistrationResponse>(
-			`users/${username}/two-factor`,
+			`${this.folder}/${username}/two-factor`,
 			{}
 		)
 	}
 	async removeTwoFactorAuthentication(username: string, otp: string): Promise<void | model.ErrorResponse> {
-		return await this.connection.remove(`users/${username}/two-factor`, undefined, undefined, { "x-otp": otp })
+		return await this.connection.remove(`${this.folder}/${username}/two-factor`, undefined, undefined, { "x-otp": otp })
 	}
 	async searchUsers(
 		request: model.UserSearchRequest,
 		parameters?: Record<string, any>
 	): Promise<model.UserResponse[] | model.ErrorResponse> {
 		const result = await this.connection.post<{ list: model.UserResponse[]; totalCount: number }>(
-			`users/searches`,
+			`${this.folder}/searches`,
 			request,
 			parameters
 		)
@@ -114,11 +110,11 @@ export class Users extends Collection<model.UserResponse, model.UserSearchReques
 		size?: number,
 		sort = "username,asc"
 	): Promise<model.ErrorResponse | Paginated<model.UserResponse>> {
-		return await this.getNextPaginated<model.UserResponse>(
+		return await this.getNextPaginated(
 			previous,
 			(page, size, sort, request) =>
 				this.connection.post<{ list: model.UserResponse[]; totalCount: number } | model.UserResponse[]>(
-					`users/searches`,
+					`${this.folder}/searches`,
 					request,
 					{
 						page: page,
@@ -139,10 +135,10 @@ export class Users extends Collection<model.UserResponse, model.UserSearchReques
 		sort = "username,asc",
 		providerCode = "modulr"
 	): Promise<model.ErrorResponse | Paginated<model.UserResponse>> {
-		return await this.getNextPaginated<model.UserResponse>(
+		return await this.getNextPaginated(
 			previous,
 			(page, size, sort) =>
-				this.connection.get<{ list: model.UserResponse[]; totalCount: number } | model.UserResponse[]>(`users`, {
+				this.connection.get<{ list: model.UserResponse[]; totalCount: number } | model.UserResponse[]>(this.folder, {
 					page: page,
 					size: size,
 					sort: sort,

package/Client/index.ts

@@ -1,23 +1,17 @@
-import { Account as ClientAccount } from "./Account"
 import { Accounts as ClientAccounts } from "./Accounts"
 import { Auth as ClientAuth } from "./Auth"
 import { Beneficiaries as ClientBeneficiaries } from "./Beneficiaries"
-import { Card as ClientCard } from "./Card"
 import { Cards as ClientCards } from "./Cards"
 import { Categories as ClientCategories } from "./Categories"
-import { Collection as ClientCollection } from "./Collection"
 import { Configuration as ClientConfiguration } from "./Configuration"
 import { Connection } from "./Connection"
 import { Email as ClientEmail } from "./Email"
 import { List as ClientList } from "./List"
 import { Omnisetup as ClientOmnisetup } from "./Omnisetup"
-import { Organisation as ClientOrganisation } from "./Organisation"
 import { Organisations as ClientOrganisations } from "./Organisations"
 import { Paginated as ClientPaginated } from "./Paginated"
 import { Reports as ClientReports } from "./Reports"
-import { Resource as ClientResource } from "./Resource"
 import { Transfers as ClientTransfers } from "./Transfers"
-import { User as ClientUser } from "./User"
 import { Users as ClientUsers } from "./Users"
 
 type Authenticate = (client: Client) => Promise<boolean>
@@ -53,31 +47,18 @@ export class Client {
 }
 
 export namespace Client {
-	export type Account = ClientAccount
 	export type Accounts = ClientAccounts
 	export type Auth = ClientAuth
 	export type Beneficiaries = ClientBeneficiaries
-	export type Card = ClientCard
 	export type Cards = ClientCards
 	export type Categories = ClientCategories
 	export type Configuration = ClientConfiguration
 	export type Email = ClientEmail
 	export type Omnisetup = ClientOmnisetup
-	export type Organisation = ClientOrganisation
 	export type Organisations = ClientOrganisations
 	export type Reports = ClientReports
 	export type Transfers = ClientTransfers
-	export type User = ClientUser
 	export type Users = ClientUsers
-	export type Collection<
-		Response extends { [key: string]: any },
-		Search extends { [key: string]: any },
-		Request extends { [key: string]: any }
-	> = ClientCollection<Response, Search, Request>
-	export type List<Response extends { [key: string]: any }, Request extends { [key: string]: any }> = ClientList<
-		Response,
-		Request
-	>
-	export type Resource<Response, Request> = ClientResource<Response, Request>
+	export type List<Response extends { [key: string]: any }> = ClientList<Response>
 	export type Paginated<T> = ClientPaginated<T>
 }

package/dist/Client/Accounts/index.d.ts

@@ -2,14 +2,9 @@ import * as model from "../../model";
 import { Connection } from "../Connection";
 import { List } from "../List";
 import { Paginated } from "../Paginated";
-import { Resource } from "../Resource";
-export declare class Accounts extends List<model.AccountResponse, model.AccountSearchRequest> {
+export declare class Accounts extends List<model.AccountResponse> {
     protected folder: string;
     private constructor();
-    protected getResourcePath(resource: model.AccountResponse): string;
-    protected createResource(response: model.AccountResponse): Resource<model.AccountResponse, {
-        [key: string]: any;
-    }>;
     static create(connection: Connection): Accounts;
     getAccountSummary(providerCodes: model.ProviderCode[], accountId?: number, accountStates?: model.AccountState[], providerAccountId?: string): Promise<model.ErrorResponse | model.AccountSummary[]>;
     updateFundingAccount(providerCode: model.ProviderCode, providerAccountId: string, request: model.UpdateAccountRequest): Promise<model.AccountResponse | model.ErrorResponse | (model.ErrorResponse & {
@@ -26,4 +21,6 @@ export declare class Accounts extends List<model.AccountResponse, model.AccountS
     getFundingAccountV2Full(providerCode: model.ProviderCode, providerCodeId: string): Promise<model.FundingAccountResponseV2Full | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;
+    getFundingAccounts(searchRequest: model.FundingAccountSearchRequest): Promise<model.ErrorResponse | model.AccountResponse[]>;
+    getAllFundingAccounts(providerCode: model.ProviderCode, size?: number, sort?: string): Promise<model.ErrorResponse | model.AccountResponse[]>;
 }

package/dist/Client/Accounts/index.js

@@ -1,34 +1,30 @@
-import { Account } from "../Account";
 import { List } from "../List";
 export class Accounts extends List {
     constructor(connection) {
         super(connection);
         this.folder = "funding-accounts";
     }
-    getResourcePath(resource) {
-        return [this.folder, resource.provider, resource.providerAccountId].join("/");
-    }
-    createResource(response) {
-        return new Account(this.connection, [this.folder, response.provider, response.providerAccountId].join("/"), response);
-    }
     static create(connection) {
         return new Accounts(connection);
     }
     async getAccountSummary(providerCodes, accountId, accountStates, providerAccountId) {
-        const response = await this.connection.get(`account-summaries?refresh=false&providerCodes=${providerCodes}${accountId ? `&accountId=${accountId}` : ""}${accountStates ? `&accountStates=${accountStates}` : ""}${providerAccountId ? `&providerAccountId=${providerAccountId}` : ""}
-`);
+        const response = await this.connection.get(`account-summaries`, {
+            refresh: false,
+            providerCodes: providerCodes,
+            accountId: accountId,
+            accountStates: accountStates,
+            providerAccountId: providerAccountId,
+        });
         return this.extractResponse(response);
     }
     async updateFundingAccount(providerCode, providerAccountId, request) {
-        const response = await this.connection.put(`funding-accounts/${providerCode}/${providerAccountId}`, request);
-        return response;
+        return await this.connection.put(`${this.folder}/${providerCode}/${providerAccountId}`, request);
     }
     async cancelLimitAlert(providerCode, providerAccountId) {
-        const response = await this.connection.remove(`funding-accounts/${providerCode}/${providerAccountId}/limits`);
-        return response;
+        return await this.connection.remove(`${this.folder}/${providerCode}/${providerAccountId}/limits`);
     }
     async getAllFundingAccountsV2Paginated(previous, page, size, sort = undefined, provider = "modulr") {
-        return await this.getNextPaginated(previous, (page, size, sort) => this.connection.get(`v2/funding-accounts`, {
+        return await this.getNextPaginated(previous, (page, size, sort) => this.connection.get(`v2/${this.folder}`, {
             page: page,
             size: size,
             sort: sort,
@@ -36,7 +32,7 @@ export class Accounts extends List {
         }), undefined, page, size, sort);
     }
     async getAllFundingAccountsV2FullPaginated(previous, page, size, sort = undefined, provider = "modulr") {
-        return await this.getNextPaginated(previous, (page, size, sort) => this.connection.get(`v2/funding-accounts/info`, {
+        return await this.getNextPaginated(previous, (page, size, sort) => this.connection.get(`v2/${this.folder}/info`, {
             page: page,
             size: size,
             sort: sort,
@@ -44,12 +40,22 @@ export class Accounts extends List {
         }), undefined, page, size, sort);
     }
     async getFundingAccountV2(providerCode, providerCodeId) {
-        const response = await this.connection.get(`v2/funding-accounts/${providerCode}/${providerCodeId}`);
-        return response;
+        return await this.connection.get(`v2/${this.folder}/${providerCode}/${providerCodeId}`);
     }
     async getFundingAccountV2Full(providerCode, providerCodeId) {
-        const response = await this.connection.get(`v2/funding-accounts/${providerCode}/${providerCodeId}/info`);
-        return response;
+        return await this.connection.get(`v2/${this.folder}/${providerCode}/${providerCodeId}/info`);
+    }
+    async getFundingAccounts(searchRequest) {
+        const response = await this.connection.post(`${this.folder}/searches`, searchRequest);
+        return this.extractResponse(response);
+    }
+    async getAllFundingAccounts(providerCode, size = 500, sort = "friendlyName") {
+        const response = await this.connection.get(this.folder, {
+            provider: providerCode,
+            size: size,
+            sort: sort,
+        });
+        return this.extractResponse(response);
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/Client/Accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Accounts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Accounts/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAG9B,MAAM,OAAO,QAAS,SAAQ,IAA2B;IAExD,YAAoB,UAAsB;QACzC,KAAK,CAAC,UAAU,CAAC,CAAA;QAFR,WAAM,GAAG,kBAAkB,CAAA;IAGrC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,UAAsB;QACnC,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAA;IAChC,CAAC;IACD,KAAK,CAAC,iBAAiB,CACtB,aAAmC,EACnC,SAAkB,EAClB,aAAoC,EACpC,iBAA0B;QAE1B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAMxC,mBAAmB,EAAE;YACtB,OAAO,EAAE,KAAK;YACd,aAAa,EAAE,aAAa;YAC5B,SAAS,EAAE,SAAS;YACpB,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,iBAAiB;SACpC,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,eAAe,CAAuB,QAAQ,CAAC,CAAA;IAC5D,CAAC;IACD,KAAK,CAAC,oBAAoB,CACzB,YAAgC,EAChC,iBAAyB,EACzB,OAAmC;QAEnC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAC/B,GAAG,IAAI,CAAC,MAAM,IAAI,YAAY,IAAI,iBAAiB,EAAE,EACrD,OAAO,CACP,CAAA;IACF,CAAC;IACD,KAAK,CAAC,gBAAgB,CAAC,YAAgC,EAAE,iBAAyB;QACjF,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAClC,GAAG,IAAI,CAAC,MAAM,IAAI,YAAY,IAAI,iBAAiB,SAAS,CAC5D,CAAA;IACF,CAAC;IAED,KAAK,CAAC,gCAAgC,CACrC,QAAyD,EACzD,IAAa,EACb,IAAa,EACb,IAAI,GAAG,SAAS,EAChB,WAAsD,QAAQ;QAE9D,OAAO,MAAM,IAAI,CAAC,gBAAgB,CACjC,QAAQ,EACR,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAEjB,MAAM,IAAI,CAAC,MAAM,EAAE,EAAE;YACtB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;SAClB,CAAC,EACH,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,IAAI,CACJ,CAAA;IACF,CAAC;IACD,KAAK,CAAC,oCAAoC,CACzC,QAAwD,EACxD,IAAa,EACb,IAAa,EACb,IAAI,GAAG,SAAS,EAChB,WAAsD,QAAQ;QAE9D,OAAO,MAAM,IAAI,CAAC,gBAAgB,CACjC,QAAQ,EACR,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CACpB,IAAI,CAAC,UAAU,CAAC,GAAG,CAEjB,MAAM,IAAI,CAAC,MAAM,OAAO,EAAE;YAC3B,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,QAAQ;SAClB,CAAC,EACH,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,IAAI,CACJ,CAAA;IACF,CAAC;IACD,KAAK,CAAC,mBAAmB,CAAC,YAAgC,EAAE,cAAsB;QACjF,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAC/B,MAAM,IAAI,CAAC,MAAM,IAAI,YAAY,IAAI,cAAc,EAAE,CACrD,CAAA;IACF,CAAC;IACD,KAAK,CAAC,uBAAuB,CAAC,YAAgC,EAAE,cAAsB;QACrF,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAC/B,MAAM,IAAI,CAAC,MAAM,IAAI,YAAY,IAAI,cAAc,OAAO,CAC1D,CAAA;IACF,CAAC;IACD,KAAK,CAAC,kBAAkB,CACvB,aAAgD;QAEhD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAC1C,GAAG,IAAI,CAAC,MAAM,WAAW,EACzB,aAAa,CACb,CAAA;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IACD,KAAK,CAAC,qBAAqB,CAC1B,YAAgC,EAChC,IAAI,GAAG,GAAG,EACV,IAAI,GAAG,cAAc;QAErB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAwD,IAAI,CAAC,MAAM,EAAE;YAC9G,QAAQ,EAAE,YAAY;YACtB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACV,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;CACD"}

package/dist/Client/Beneficiaries/index.d.ts

@@ -1,22 +1,18 @@
 import * as model from "../../model";
-import { Beneficiary } from "../Beneficiary";
 import { Connection } from "../Connection";
 import { List } from "../List";
-export declare class Beneficiaries extends List<model.BeneficiaryResponse, model.BeneficiaryRequest> {
+export declare class Beneficiaries extends List<model.BeneficiaryResponse> {
     protected folder: string;
     constructor(connection: Connection);
     static create(connection: Connection): Beneficiaries;
-    protected getResourcePath(resource: model.BeneficiaryResponse): string;
-    protected createResource(response: model.BeneficiaryResponse): Beneficiary;
     getAll(sort?: string): Promise<model.ErrorResponse | model.BeneficiaryResponse[]>;
     getBeneficiary(beneficiaryId: string): Promise<model.BeneficiaryResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;
     searchBeneficiary(request: model.SearchBeneficiaryRequest, sort?: string): Promise<model.BeneficiaryResponse[] | model.ErrorResponse>;
-    protected map(response: model.BeneficiaryResponse): Beneficiary & model.BeneficiaryResponse;
-    create(request: model.BeneficiaryRequest): Promise<(model.ErrorResponse & {
+    create(request: model.BeneficiaryRequest): Promise<model.BeneficiaryResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
-    }) | (Beneficiary & model.BeneficiaryResponse)>;
+    })>;
     update(beneficiaryId: string, request: model.UpdateBeneficiaryRequest): Promise<model.BeneficiaryResponse | (model.ErrorResponse & {
         status: 400 | 404 | 500 | 403 | 503;
     })>;

package/dist/Client/Beneficiaries/index.js

@@ -1,5 +1,3 @@
-import * as model from "../../model";
-import { Beneficiary } from "../Beneficiary";
 import { List } from "../List";
 export class Beneficiaries extends List {
     constructor(connection) {
@@ -9,29 +7,27 @@ export class Beneficiaries extends List {
     static create(connection) {
         return new Beneficiaries(connection);
     }
-    getResourcePath(resource) {
-        return [this.folder, resource.beneficiaryId].join("/");
-    }
-    createResource(response) {
-        return new Beneficiary(this.connection, [this.folder, response.beneficiaryId].join("/"), response);
-    }
     async getAll(sort) {
-        const response = await this.connection.get(`${this.folder}?page=0&size=1500${sort ? "&sort=" + sort : ""}`);
+        const response = await this.connection.get(`${this.folder}`, {
+            page: 0,
+            size: 1500,
+            sort: sort,
+        });
         return this.extractResponse(response);
     }
     async getBeneficiary(beneficiaryId) {
         return await this.connection.get([this.folder, beneficiaryId].join("/"));
     }
     async searchBeneficiary(request, sort) {
-        const response = await this.connection.post(`${this.folder}/searches?page=0&size=1500${sort ? "&sort=" + sort : ""}`, request);
+        const response = await this.connection.post(`${this.folder}/searches`, request, {
+            page: 0,
+            size: 1500,
+            sort: sort,
+        });
         return this.extractResponse(response);
     }
-    map(response) {
-        return Object.assign(new Beneficiary(this.connection, this.getResourcePath(response), response), response);
-    }
     async create(request) {
-        const result = await this.connection.post(`${this.folder}`, request);
-        return model.ErrorResponse.is(result) ? result : this.map(result);
+        return await this.connection.post(`${this.folder}`, request);
     }
     async update(beneficiaryId, request) {
         return await this.connection.put(`${this.folder}/${beneficiaryId}`, request);

package/dist/Client/Beneficiaries/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Beneficiaries/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,MAAM,OAAO,aAAc,SAAQ,IAAyD;IAE3F,YAAY,UAAsB;QACjC,KAAK,CAAC,UAAU,CAAC,CAAA;QAFR,WAAM,GAAG,eAAe,CAAA;IAGlC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,UAAsB;QACnC,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAA;IACrC,CAAC;IACS,eAAe,CAAC,QAAmC;QAC5D,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACvD,CAAC;IACS,cAAc,CAAC,QAAmC;QAC3D,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAA;IACnG,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CACzC,GAAG,IAAI,CAAC,MAAM,oBAAoB,IAAI,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/D,CAAA;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,aAAqB;QACzC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACpG,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,OAAuC,EAAE,IAAa;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAC1C,GAAG,IAAI,CAAC,MAAM,6BAA6B,IAAI,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EACxE,OAAO,CACP,CAAA;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IACS,GAAG,CAAC,QAAmC;QAChD,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAC3G,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAiC;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAA4B,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;QAC/F,OAAO,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAClE,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,aAAqB,EAAE,OAAuC;QAC1E,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,EAAE,OAAO,CAAC,CAAA;IACxG,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,aAAqB;QACjC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAA4B,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC,CAAA;IAClG,CAAC;CACD"}
+{"version":3,"file":"index.js","sourceRoot":"../","sources":["Client/Beneficiaries/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAE9B,MAAM,OAAO,aAAc,SAAQ,IAA+B;IAEjE,YAAY,UAAsB;QACjC,KAAK,CAAC,UAAU,CAAC,CAAA;QAFR,WAAM,GAAG,eAAe,CAAA;IAGlC,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,UAAsB;QACnC,OAAO,IAAI,aAAa,CAAC,UAAU,CAAC,CAAA;IACrC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAAa;QACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CACzC,GAAG,IAAI,CAAC,MAAM,EAAE,EAChB;YACC,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACV,CACD,CAAA;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IACD,KAAK,CAAC,cAAc,CAAC,aAAqB;QACzC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;IACpG,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,OAAuC,EAAE,IAAa;QAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAC1C,GAAG,IAAI,CAAC,MAAM,WAAW,EACzB,OAAO,EACP;YACC,IAAI,EAAE,CAAC;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;SACV,CACD,CAAA;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACtC,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,OAAiC;QAC7C,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAA4B,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAA;IACxF,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,aAAqB,EAAE,OAAuC;QAC1E,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAA4B,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,EAAE,OAAO,CAAC,CAAA;IACxG,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,aAAqB;QACjC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAA4B,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC,CAAA;IAClG,CAAC;CACD"}