Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

Commit 03f3d9c

Browse files
kidinovkidinov
authored
Merge pull request #2944 from wordpress-mobile/10533-deposit-summary-remove-fields-that-are-no-longer-returned-from-the-api
Woo: Removed fields that are no longer returned by the API from "deposits/overview-all"
2 parents c78d940 + f28fb79 commit 03f3d9c

File tree

13 files changed

+1657
-131
lines changed

13 files changed

+1657
-131
lines changed

‎example/src/androidTest/java/org/wordpress/android/fluxc/release/ReleaseStack_WooPaymentsTest.kt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class ReleaseStack_WooPaymentsTest : ReleaseStack_WCBase() {
3636
assertEquals(2, result.result?.account?.depositsSchedule?.delayDays)
3737
assertEquals("daily", result.result?.account?.depositsSchedule?.interval)
3838
assertEquals(0L, result.result?.balance?.available?.get(0)?.amount)
39-
assertEquals(null, result.result?.balance?.available?.get(0)?.depositsCount)
4039
assertEquals("usd", result.result?.balance?.available?.get(0)?.currency)
4140
assertEquals(0, result.result?.balance?.available?.get(0)?.sourceTypes?.card)
4241
assertEquals(0, result.result?.balance?.instant?.size)
@@ -45,7 +44,6 @@ class ReleaseStack_WooPaymentsTest : ReleaseStack_WCBase() {
4544
assertEquals(null, result.result?.balance?.pending?.get(0)?.fee)
4645
assertEquals(null, result.result?.balance?.pending?.get(0)?.feePercentage)
4746
assertEquals(null, result.result?.balance?.pending?.get(0)?.net)
48-
assertEquals(0, result.result?.balance?.pending?.get(0)?.depositsCount)
4947
assertEquals(0, result.result?.balance?.pending?.get(0)?.sourceTypes?.card)
5048
assertEquals(0, result.result?.deposit?.lastManualDeposits?.size)
5149
assertEquals(1, result.result?.deposit?.lastPaid?.size)
@@ -60,7 +58,6 @@ class ReleaseStack_WooPaymentsTest : ReleaseStack_WCBase() {
6058
assertEquals("po_1KQLho2HswaZkMX3M9Qhzf4W", result.result?.deposit?.lastPaid?.get(0)?.depositId)
6159
assertEquals("paid", result.result?.deposit?.lastPaid?.get(0)?.status)
6260
assertEquals("deposit", result.result?.deposit?.lastPaid?.get(0)?.type)
63-
assertEquals(0, result.result?.deposit?.nextScheduled?.size)
6461
}
6562

6663
@Test
@@ -80,7 +77,6 @@ class ReleaseStack_WooPaymentsTest : ReleaseStack_WCBase() {
8077
assertEquals(2, getResult?.account?.depositsSchedule?.delayDays)
8178
assertEquals("daily", getResult?.account?.depositsSchedule?.interval)
8279
assertEquals(0L, getResult?.balance?.available?.get(0)?.amount)
83-
assertEquals(null, getResult?.balance?.available?.get(0)?.depositsCount)
8480
assertEquals("usd", getResult?.balance?.available?.get(0)?.currency)
8581
assertEquals(0, getResult?.balance?.available?.get(0)?.sourceTypes?.card)
8682
assertEquals(0, getResult?.balance?.instant?.size)
@@ -89,7 +85,6 @@ class ReleaseStack_WooPaymentsTest : ReleaseStack_WCBase() {
8985
assertEquals(null, getResult?.balance?.pending?.get(0)?.fee)
9086
assertEquals(null, getResult?.balance?.pending?.get(0)?.feePercentage)
9187
assertEquals(null, getResult?.balance?.pending?.get(0)?.net)
92-
assertEquals(0, getResult?.balance?.pending?.get(0)?.depositsCount)
9388
assertEquals(0, getResult?.balance?.pending?.get(0)?.sourceTypes?.card)
9489
assertEquals(0, getResult?.deposit?.lastManualDeposits?.size)
9590
assertEquals(1, getResult?.deposit?.lastPaid?.size)
@@ -104,7 +99,6 @@ class ReleaseStack_WooPaymentsTest : ReleaseStack_WCBase() {
10499
assertEquals("po_1KQLho2HswaZkMX3M9Qhzf4W", getResult?.deposit?.lastPaid?.get(0)?.depositId)
105100
assertEquals("paid", getResult?.deposit?.lastPaid?.get(0)?.status)
106101
assertEquals("deposit", getResult?.deposit?.lastPaid?.get(0)?.type)
107-
assertEquals(0, getResult?.deposit?.nextScheduled?.size)
108102
}
109103

110104
@Test

‎example/src/test/java/org/wordpress/android/fluxc/persistence/mappers/WooPaymentsDepositsOverviewMapperTest.kt‎

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,6 @@ class WooPaymentsDepositsOverviewMapperTest {
4747
created = 1L
4848
)
4949
),
50-
nextScheduled = listOf(
51-
WooPaymentsDeposit(
52-
id = "id",
53-
date = 1L,
54-
type = "type",
55-
amount = 1L,
56-
status = "status",
57-
bankAccount = "bankAccount",
58-
currency = "currency",
59-
automatic = true,
60-
fee = 1L,
61-
feePercentage = 1.0,
62-
created = 1L
63-
)
64-
),
6550
lastManualDeposits = listOf(
6651
WooPaymentsManualDeposit(
6752
currency = "currency",
@@ -77,10 +62,8 @@ class WooPaymentsDepositsOverviewMapperTest {
7762
sourceTypes = WooPaymentsSourceTypes(
7863
card = 1
7964
),
80-
depositsCount = 1,
8165
feePercentage = 1.0,
8266
net = 1L,
83-
transactionIds = listOf("transactionIds1"),
8467
fee = 1L
8568
)
8669
),
@@ -91,10 +74,8 @@ class WooPaymentsDepositsOverviewMapperTest {
9174
sourceTypes = WooPaymentsSourceTypes(
9275
card = 1
9376
),
94-
depositsCount = 1,
9577
feePercentage = 1.0,
9678
net = 1L,
97-
transactionIds = listOf("transactionIds2"),
9879
fee = 1L
9980
)
10081
),
@@ -105,10 +86,8 @@ class WooPaymentsDepositsOverviewMapperTest {
10586
sourceTypes = WooPaymentsSourceTypes(
10687
card = 1
10788
),
108-
depositsCount = 1,
10989
feePercentage = 1.0,
11090
net = 1L,
111-
transactionIds = listOf("transactionIds3"),
11291
fee = 1L
11392
)
11493
)
@@ -143,41 +122,24 @@ class WooPaymentsDepositsOverviewMapperTest {
143122
assertThat(result.deposit?.lastPaid?.get(0)?.feePercentage).isEqualTo(1.0)
144123
assertThat(result.deposit?.lastPaid?.get(0)?.status).isEqualTo("status")
145124
assertThat(result.deposit?.lastPaid?.get(0)?.type).isEqualTo("type")
146-
assertThat(result.deposit?.nextScheduled?.get(0)?.amount).isEqualTo(1L)
147-
assertThat(result.deposit?.nextScheduled?.get(0)?.automatic).isEqualTo(true)
148-
assertThat(result.deposit?.nextScheduled?.get(0)?.bankAccount).isEqualTo("bankAccount")
149-
assertThat(result.deposit?.nextScheduled?.get(0)?.created).isEqualTo(1L)
150-
assertThat(result.deposit?.nextScheduled?.get(0)?.currency).isEqualTo("currency")
151-
assertThat(result.deposit?.nextScheduled?.get(0)?.date).isEqualTo(1L)
152-
assertThat(result.deposit?.nextScheduled?.get(0)?.depositId).isEqualTo("id")
153-
assertThat(result.deposit?.nextScheduled?.get(0)?.fee).isEqualTo(1L)
154-
assertThat(result.deposit?.nextScheduled?.get(0)?.feePercentage).isEqualTo(1.0)
155-
assertThat(result.deposit?.nextScheduled?.get(0)?.status).isEqualTo("status")
156-
assertThat(result.deposit?.nextScheduled?.get(0)?.type).isEqualTo("type")
157125
assertThat(result.balance?.available?.get(0)?.amount).isEqualTo(1L)
158126
assertThat(result.balance?.available?.get(0)?.currency).isEqualTo("usd")
159-
assertThat(result.balance?.available?.get(0)?.depositsCount).isEqualTo(1)
160127
assertThat(result.balance?.available?.get(0)?.fee).isEqualTo(1L)
161128
assertThat(result.balance?.available?.get(0)?.feePercentage).isEqualTo(1.0)
162129
assertThat(result.balance?.available?.get(0)?.net).isEqualTo(1L)
163130
assertThat(result.balance?.available?.get(0)?.sourceTypes?.card).isEqualTo(1)
164-
assertThat(result.balance?.available?.get(0)?.transactionIds?.get(0)).isEqualTo("transactionIds2")
165131
assertThat(result.balance?.instant?.get(0)?.amount).isEqualTo(1L)
166132
assertThat(result.balance?.instant?.get(0)?.currency).isEqualTo("eur")
167-
assertThat(result.balance?.instant?.get(0)?.depositsCount).isEqualTo(1)
168133
assertThat(result.balance?.instant?.get(0)?.fee).isEqualTo(1L)
169134
assertThat(result.balance?.instant?.get(0)?.feePercentage).isEqualTo(1.0)
170135
assertThat(result.balance?.instant?.get(0)?.net).isEqualTo(1L)
171136
assertThat(result.balance?.instant?.get(0)?.sourceTypes?.card).isEqualTo(1)
172-
assertThat(result.balance?.instant?.get(0)?.transactionIds?.get(0)).isEqualTo("transactionIds3")
173137
assertThat(result.balance?.pending?.get(0)?.amount).isEqualTo(1L)
174138
assertThat(result.balance?.pending?.get(0)?.currency).isEqualTo("rub")
175-
assertThat(result.balance?.pending?.get(0)?.depositsCount).isEqualTo(1)
176139
assertThat(result.balance?.pending?.get(0)?.fee).isEqualTo(1L)
177140
assertThat(result.balance?.pending?.get(0)?.feePercentage).isEqualTo(1.0)
178141
assertThat(result.balance?.pending?.get(0)?.net).isEqualTo(1L)
179142
assertThat(result.balance?.pending?.get(0)?.sourceTypes?.card).isEqualTo(1)
180-
assertThat(result.balance?.pending?.get(0)?.transactionIds?.get(0)).isEqualTo("transactionIds1")
181143
assertThat(result.account?.defaultCurrency).isEqualTo("defaultCurrency")
182144
assertThat(result.account?.depositsBlocked).isEqualTo(true)
183145
assertThat(result.account?.depositsEnabled).isEqualTo(true)
@@ -223,23 +185,6 @@ class WooPaymentsDepositsOverviewMapperTest {
223185
depositType = DepositType.LAST_PAID
224186
)
225187
),
226-
nextScheduledDeposits = listOf(
227-
WooPaymentsDepositEntity(
228-
localSiteId = LocalId(1),
229-
depositId = "id",
230-
date = 1L,
231-
type = "type",
232-
amount = 1L,
233-
status = "status2",
234-
bankAccount = "bankAccount2",
235-
currency = "rub",
236-
automatic = true,
237-
fee = 1L,
238-
feePercentage = 1.0,
239-
created = 1L,
240-
depositType = DepositType.NEXT_SCHEDULED
241-
)
242-
),
243188
lastManualDeposits = listOf(
244189
WooPaymentsManualDepositEntity(
245190
localSiteId = LocalId(1),
@@ -255,10 +200,8 @@ class WooPaymentsDepositsOverviewMapperTest {
255200
sourceTypes = WooPaymentsSourceTypesEntity(
256201
card = 1
257202
),
258-
depositsCount = 1,
259203
feePercentage = 1.0,
260204
net = 1L,
261-
transactionIds = listOf("transactionIds1"),
262205
fee = 1L,
263206
balanceType = BalanceType.AVAILABLE,
264207
)
@@ -271,10 +214,8 @@ class WooPaymentsDepositsOverviewMapperTest {
271214
sourceTypes = WooPaymentsSourceTypesEntity(
272215
card = 1
273216
),
274-
depositsCount = 1,
275217
feePercentage = 1.0,
276218
net = 1L,
277-
transactionIds = listOf("transactionIds2"),
278219
fee = 1L,
279220
balanceType = BalanceType.AVAILABLE,
280221
)
@@ -287,10 +228,8 @@ class WooPaymentsDepositsOverviewMapperTest {
287228
sourceTypes = WooPaymentsSourceTypesEntity(
288229
card = 1
289230
),
290-
depositsCount = 1,
291231
feePercentage = 1.0,
292232
net = 1L,
293-
transactionIds = listOf("transactionIds3"),
294233
fee = 1L,
295234
balanceType = BalanceType.AVAILABLE,
296235
)
@@ -314,41 +253,24 @@ class WooPaymentsDepositsOverviewMapperTest {
314253
assertThat(result.deposit?.lastPaid?.get(0)?.feePercentage).isEqualTo(1.0)
315254
assertThat(result.deposit?.lastPaid?.get(0)?.status).isEqualTo("status1")
316255
assertThat(result.deposit?.lastPaid?.get(0)?.type).isEqualTo("type")
317-
assertThat(result.deposit?.nextScheduled?.get(0)?.amount).isEqualTo(1L)
318-
assertThat(result.deposit?.nextScheduled?.get(0)?.automatic).isEqualTo(true)
319-
assertThat(result.deposit?.nextScheduled?.get(0)?.bankAccount).isEqualTo("bankAccount2")
320-
assertThat(result.deposit?.nextScheduled?.get(0)?.created).isEqualTo(1L)
321-
assertThat(result.deposit?.nextScheduled?.get(0)?.currency).isEqualTo("rub")
322-
assertThat(result.deposit?.nextScheduled?.get(0)?.date).isEqualTo(1L)
323-
assertThat(result.deposit?.nextScheduled?.get(0)?.depositId).isEqualTo("id")
324-
assertThat(result.deposit?.nextScheduled?.get(0)?.fee).isEqualTo(1L)
325-
assertThat(result.deposit?.nextScheduled?.get(0)?.feePercentage).isEqualTo(1.0)
326-
assertThat(result.deposit?.nextScheduled?.get(0)?.status).isEqualTo("status2")
327-
assertThat(result.deposit?.nextScheduled?.get(0)?.type).isEqualTo("type")
328256
assertThat(result.balance?.available?.get(0)?.amount).isEqualTo(1L)
329257
assertThat(result.balance?.available?.get(0)?.currency).isEqualTo("usd")
330-
assertThat(result.balance?.available?.get(0)?.depositsCount).isEqualTo(1)
331258
assertThat(result.balance?.available?.get(0)?.fee).isEqualTo(1L)
332259
assertThat(result.balance?.available?.get(0)?.feePercentage).isEqualTo(1.0)
333260
assertThat(result.balance?.available?.get(0)?.net).isEqualTo(1L)
334261
assertThat(result.balance?.available?.get(0)?.sourceTypes?.card).isEqualTo(1)
335-
assertThat(result.balance?.available?.get(0)?.transactionIds?.get(0)).isEqualTo("transactionIds2")
336262
assertThat(result.balance?.instant?.get(0)?.amount).isEqualTo(1L)
337263
assertThat(result.balance?.instant?.get(0)?.currency).isEqualTo("eur")
338-
assertThat(result.balance?.instant?.get(0)?.depositsCount).isEqualTo(1)
339264
assertThat(result.balance?.instant?.get(0)?.fee).isEqualTo(1L)
340265
assertThat(result.balance?.instant?.get(0)?.feePercentage).isEqualTo(1.0)
341266
assertThat(result.balance?.instant?.get(0)?.net).isEqualTo(1L)
342267
assertThat(result.balance?.instant?.get(0)?.sourceTypes?.card).isEqualTo(1)
343-
assertThat(result.balance?.instant?.get(0)?.transactionIds?.get(0)).isEqualTo("transactionIds3")
344268
assertThat(result.balance?.pending?.get(0)?.amount).isEqualTo(1L)
345269
assertThat(result.balance?.pending?.get(0)?.currency).isEqualTo("rub")
346-
assertThat(result.balance?.pending?.get(0)?.depositsCount).isEqualTo(1)
347270
assertThat(result.balance?.pending?.get(0)?.fee).isEqualTo(1L)
348271
assertThat(result.balance?.pending?.get(0)?.feePercentage).isEqualTo(1.0)
349272
assertThat(result.balance?.pending?.get(0)?.net).isEqualTo(1L)
350273
assertThat(result.balance?.pending?.get(0)?.sourceTypes?.card).isEqualTo(1)
351-
assertThat(result.balance?.pending?.get(0)?.transactionIds?.get(0)).isEqualTo("transactionIds1")
352274
assertThat(result.account?.defaultCurrency).isEqualTo("defaultCurrency")
353275
assertThat(result.account?.depositsBlocked).isEqualTo(true)
354276
assertThat(result.account?.depositsEnabled).isEqualTo(true)

0 commit comments

Comments
 (0)