Stringify filter[tags] (#421)

axshani · ilyamerman · web-flow · commit 063b67e7b216 · 2023-12-28T14:05:40.000+02:00
* JSON.stringify(params.tags)

* create customStringify function

* Remove console.log

---------

Co-authored-by: ilyamerman &lt;ilya@unit.co&gt;
diff --git a/package-lock.json b/package-lock.json
diff --git a/resources/account.ts b/resources/account.ts
@@ -52,7 +52,7 @@ export class Accounts extends BaseResource {
             "page[limit]": (params?.limit ? params.limit : 100),
             "page[offset]": (params?.offset ? params.offset : 0),
             ...(params?.customerId && {"filter[customerId]": params.customerId}),
-            ...(params?.tags && {"filter[tags]": JSON.stringify(params.tags)}),
+            ...(params?.tags && {"filter[tags]": this.customStringify(params.tags, ":")}),
             ...(params?.include && {"include": params.include}),
             ...(params?.fromBalance && {"filter[fromBalance]": params.fromBalance}),
             ...(params?.toBalance && {"filter[toBalance]": params.toBalance}),
diff --git a/resources/application.ts b/resources/application.ts
@@ -17,7 +17,7 @@ export class Applications extends BaseResource {
             "page[offset]": (params?.offset ? params?.offset : 0),
             ...(params?.query && { "filter[query]": params?.query }),
             ...(params?.email && { "filter[email]": params?.email }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":")}),
             "sort": params?.sort ? params.sort : "-createdAt"
         }
 
diff --git a/resources/applicationForm.ts b/resources/applicationForm.ts
@@ -20,7 +20,7 @@ export class ApplicationForms extends BaseResource {
         const parameters = {
             "page[limit]": (params?.limit ? params?.limit : 100),
             "page[offset]": (params?.offset ? params?.offset : 0),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             ...(params?.sort && { "sort": params.sort })
         }
         return this.httpGet<UnitResponse<ApplicationForm[]>>("", { params: parameters })
diff --git a/resources/baseResource.ts b/resources/baseResource.ts
@@ -130,6 +130,12 @@ export class BaseResource {
     private mergeHeaders(configHeaders: object | undefined) {
         return configHeaders ? { ...this.headers, ...configHeaders } : this.headers
     }
+
+    protected customStringify(obj:any , separator: string) {
+        return "{" + Object.keys(obj)
+          .map(key => `"${key}"${separator}"${obj[key]}"`)
+          .join(", ") + "}"
+      }
 }
 
 type DataPayload = {
diff --git a/resources/cards.ts b/resources/cards.ts
@@ -70,7 +70,7 @@ export class Cards extends BaseResource {
             ...(params?.accountId && { "filter[accountId]": params.accountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
             ...(params?.include && { "include": params.include }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             "sort": params?.sort ? params.sort : "-createdAt"
         }
 
diff --git a/resources/chargeback.ts b/resources/chargeback.ts
@@ -32,7 +32,7 @@ export class Chargebacks extends BaseResource {
             ...(params?.customerId && {"filter[customerId]": params.customerId}),
             ...(params?.since && {"filter[since]": params.since}),
             ...(params?.until && {"filter[until]": params.until}),
-            ...(params?.tags && {"filter[tags]": JSON.stringify(params.tags)}),
+            ...(params?.tags && {"filter[tags]": this.customStringify(params.tags, ":")}),
             ...(params?.include && {"include": params.include}),
             ...(params?.sort && {"sort": params.sort})
         }
diff --git a/resources/checkDeposit.ts b/resources/checkDeposit.ts
@@ -16,7 +16,7 @@ export class CheckDeposits extends BaseResource {
             "page[offset]": (params?.offset ? params.offset : 0),
             ...(params?.accountId && { "filter[accountId]": params.accountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             "sort": params?.sort ? params.sort : "-createdAt",
             "include": params?.include ? params.include : "include"
         }
diff --git a/resources/counterparty.ts b/resources/counterparty.ts
@@ -25,7 +25,7 @@ export class Counterparties extends BaseResource {
             "page[limit]": (params?.limit ? params?.limit : 100),
             "page[offset]": (params?.offset ? params?.offset : 0),
             ...(params?.customerId && { "filter[customerId]": params?.customerId }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
         }
 
         return this.httpGet<UnitResponse<AchCounterparty[]>>("", { params: parameters })
diff --git a/resources/customer.ts b/resources/customer.ts
@@ -23,7 +23,7 @@ export class Customers extends BaseResource {
             "page[offset]": (params?.offset ? params.offset : 0),
             ...(params?.query && { "filter[query]": params.query }),
             ...(params?.email && { "filter[email]": params.email }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             "sort": params?.sort ? params.sort : "-createdAt"
         }
 
diff --git a/resources/payments.ts b/resources/payments.ts
@@ -41,7 +41,7 @@ export class Payments extends BaseResource {
             "page[offset]": (params?.offset ? params.offset : 0),
             ...(params?.accountId && { "filter[accountId]": params.accountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             ...(params?.since && { "filter[since]": params.since }),
             ...(params?.until && { "filter[until]": params.until }),
             ...(params?.counterpartyAccountId && { "filter[counterpartyAccountId]": params.counterpartyAccountId }),
diff --git a/resources/receivedPayments.ts b/resources/receivedPayments.ts
@@ -34,7 +34,7 @@ export class ReceivedPayments extends BaseResource {
             "page[offset]": (params?.offset ? params.offset : 0),
             ...(params?.accountId && { "filter[accountId]": params.accountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             ...(params?.includeCompleted && { "filter[includeCompleted]": params.includeCompleted }),
             "sort": params?.sort ? params.sort : "-createdAt",
             "include": params?.include ? params.include : ""
diff --git a/resources/recurringPayments.ts b/resources/recurringPayments.ts
@@ -45,7 +45,7 @@ export class RecurringPayments extends BaseResource {
             "page[offset]": (params?.offset ? params.offset : 0),
             ...(params?.accountId && { "filter[accountId]": params.accountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             ...(params?.fromStartTime && { "filter[fromStartTime]": params.fromStartTime }),
             ...(params?.toStartTime && { "filter[toStartTime]": params.toStartTime }),
             ...(params?.fromEndTime && { "filter[fromEndTime]": params.fromEndTime }),
diff --git a/resources/rewards.ts b/resources/rewards.ts
@@ -30,7 +30,7 @@ export class Rewards extends BaseResource {
             ...(params?.receivingAccountId && { "filter[receivingAccountId]": params.receivingAccountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
             ...(params?.cardId && { "filter[cardId]": params.cardId }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             ...(params?.since && { "filter[since]": params.since }),
             ...(params?.until && { "filter[until]": params.until }),
             "sort": params?.sort ? params.sort : "-createdAt",
diff --git a/resources/transactions.ts b/resources/transactions.ts
@@ -35,7 +35,7 @@ export class Transactions extends BaseResource {
             ...(params?.accountId && { "filter[accountId]": params.accountId }),
             ...(params?.customerId && { "filter[customerId]": params.customerId }),
             ...(params?.query && { "filter[query]": params.query }),
-            ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),
+            ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),
             ...(params?.since && { "filter[since]": params.since }),
             ...(params?.until && { "filter[until]": params.until }),
             ...(params?.cardId && { "filter[cardId]": params.cardId }),

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export class Applications extends BaseResource {`
`17`	`17`	`"page[offset]": (params?.offset ? params?.offset : 0),`
`18`	`18`	`...(params?.query && { "filter[query]": params?.query }),`
`19`	`19`	`...(params?.email && { "filter[email]": params?.email }),`
`20`		`- ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),`
	`20`	`+ ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":")}),`
`21`	`21`	`"sort": params?.sort ? params.sort : "-createdAt"`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ export class ApplicationForms extends BaseResource {`
`20`	`20`	`const parameters = {`
`21`	`21`	`"page[limit]": (params?.limit ? params?.limit : 100),`
`22`	`22`	`"page[offset]": (params?.offset ? params?.offset : 0),`
`23`		`- ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),`
	`23`	`+ ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),`
`24`	`24`	`...(params?.sort && { "sort": params.sort })`
`25`	`25`	`}`
`26`	`26`	`return this.httpGet<UnitResponse<ApplicationForm[]>>("", { params: parameters })`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,12 @@ export class BaseResource {`
`130`	`130`	`private mergeHeaders(configHeaders: object \| undefined) {`
`131`	`131`	`return configHeaders ? { ...this.headers, ...configHeaders } : this.headers`
`132`	`132`	`}`
	`133`	`+`
	`134`	`+ protected customStringify(obj:any , separator: string) {`
	`135`	`+ return "{" + Object.keys(obj)`
	`136`	+ .map(key => `"${key}"${separator}"${obj[key]}"`)
	`137`	`+ .join(", ") + "}"`
	`138`	`+ }`
`133`	`139`	`}`
`134`	`140`
`135`	`141`	`type DataPayload = {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export class Cards extends BaseResource {`
`70`	`70`	`...(params?.accountId && { "filter[accountId]": params.accountId }),`
`71`	`71`	`...(params?.customerId && { "filter[customerId]": params.customerId }),`
`72`	`72`	`...(params?.include && { "include": params.include }),`
`73`		`- ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),`
	`73`	`+ ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),`
`74`	`74`	`"sort": params?.sort ? params.sort : "-createdAt"`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export class Chargebacks extends BaseResource {`
`32`	`32`	`...(params?.customerId && {"filter[customerId]": params.customerId}),`
`33`	`33`	`...(params?.since && {"filter[since]": params.since}),`
`34`	`34`	`...(params?.until && {"filter[until]": params.until}),`
`35`		`- ...(params?.tags && {"filter[tags]": JSON.stringify(params.tags)}),`
	`35`	`+ ...(params?.tags && {"filter[tags]": this.customStringify(params.tags, ":")}),`
`36`	`36`	`...(params?.include && {"include": params.include}),`
`37`	`37`	`...(params?.sort && {"sort": params.sort})`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export class CheckDeposits extends BaseResource {`
`16`	`16`	`"page[offset]": (params?.offset ? params.offset : 0),`
`17`	`17`	`...(params?.accountId && { "filter[accountId]": params.accountId }),`
`18`	`18`	`...(params?.customerId && { "filter[customerId]": params.customerId }),`
`19`		`- ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),`
	`19`	`+ ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),`
`20`	`20`	`"sort": params?.sort ? params.sort : "-createdAt",`
`21`	`21`	`"include": params?.include ? params.include : "include"`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ export class Counterparties extends BaseResource {`
`25`	`25`	`"page[limit]": (params?.limit ? params?.limit : 100),`
`26`	`26`	`"page[offset]": (params?.offset ? params?.offset : 0),`
`27`	`27`	`...(params?.customerId && { "filter[customerId]": params?.customerId }),`
`28`		`- ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),`
	`28`	`+ ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`return this.httpGet<UnitResponse<AchCounterparty[]>>("", { params: parameters })`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export class Customers extends BaseResource {`
`23`	`23`	`"page[offset]": (params?.offset ? params.offset : 0),`
`24`	`24`	`...(params?.query && { "filter[query]": params.query }),`
`25`	`25`	`...(params?.email && { "filter[email]": params.email }),`
`26`		`- ...(params?.tags && { "filter[tags]": JSON.stringify(params.tags) }),`
	`26`	`+ ...(params?.tags && { "filter[tags]": this.customStringify(params.tags, ":") }),`
`27`	`27`	`"sort": params?.sort ? params.sort : "-createdAt"`
`28`	`28`	`}`
`29`	`29`