Skip to content
This repository was archived by the owner on Jan 15, 2021. It is now read-only.

Commit a26659a

Browse files
isabellaioatamanroman
isabellaio
authored and
atamanroman
committed
Set payment status from ACSP to ACSC
1 parent b2c3671 commit a26659a

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

‎docs/de/developer-portal-page.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ Der nachfolgende Code stellt eine beispielhafte Antwort für eine erfolgreiche Z
186186

187187
| PSU-ID | Iban | SCA Status | Transaction Status |
188188
| :---------------- | :--------------------- | :-------------------------- | :---------------------------------- |
189-
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSP\* |
189+
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSC\* |
190190
| PSU-Rejected\*\* | DE06760365689827461249 | failed | RJCT |
191191
| PSU-Blocked | DE13760365681209386222 | _(SCA Status nicht verfügbar)_ | _(Transaction Status nicht verfügbar)_ |
192192
| PSU-InternalLimit | DE91760365683491763002 | finalised | RJCT |
@@ -223,7 +223,7 @@ Um den Transaction Status eines Payments abzufragen, fügen Sie Ihre Payment-Id
223223

224224
| PSU-ID | Iban | SCA Status | Transaction Status |
225225
| :------------- | :--------------------- | :--------- | :----------------- |
226-
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSP |
226+
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSC |
227227

228228

229229
### Confirmation of Funds

‎docs/en/developer-portal-page.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ The following code snippet is an example response for a successful payment:
222222

223223
| PSU-ID | Iban | SCA Status | Transaction Status |
224224
| :---------------- | :--------------------- | :-------------------------- | :---------------------------------- |
225-
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSP\* |
225+
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSC\* |
226226
| PSU-Rejected\*\* | DE06760365689827461249 | failed | RJCT |
227227
| PSU-Blocked | DE13760365681209386222 | _(no SCA Status available)_ | _(no Transaction Status available)_ |
228228
| PSU-InternalLimit | DE91760365683491763002 | finalised | RJCT |
@@ -269,7 +269,7 @@ Payment Status Endpoint.
269269

270270
| PSU-ID | Iban | SCA Status | Transaction Status |
271271
| :------------- | :--------------------- | :--------- | :----------------- |
272-
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSP |
272+
| PSU-Successful | DE11760365688833114935 | finalised | ACTC/ACSC |
273273

274274
### Confirmation of Funds
275275

‎service/src/main/java/de/adorsys/psd2/sandbox/xs2a/service/redirect/RedirectService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public void handlePaymentRedirectRequest(String externalId, String psuId,
158158
TransactionStatus newTxStatus = TransactionStatus
159159
.getByValue(psu.get().getTransactionStatusAfterSca().xs2aValue());
160160

161-
if (newTxStatus.equals(TransactionStatus.ACSP)
161+
if (newTxStatus.equals(TransactionStatus.ACSC)
162162
&& isFutureOrPeriodicPayment(pisPaymentData)) {
163163
newTxStatus = TransactionStatus.ACTC;
164164
}

‎service/src/main/java/de/adorsys/psd2/sandbox/xs2a/testdata/TestDataService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static de.adorsys.psd2.sandbox.xs2a.testdata.ConsentStatus.Valid;
77
import static de.adorsys.psd2.sandbox.xs2a.testdata.ScaStatus.Failed;
88
import static de.adorsys.psd2.sandbox.xs2a.testdata.ScaStatus.Finalised;
9-
import static de.adorsys.psd2.sandbox.xs2a.testdata.TransactionStatus.AcceptedSettlementInProcess;
9+
import static de.adorsys.psd2.sandbox.xs2a.testdata.TransactionStatus.AcceptedSettlementCompleted;
1010
import static de.adorsys.psd2.sandbox.xs2a.testdata.TransactionStatus.AcceptedTechnicalValidation;
1111
import static de.adorsys.psd2.sandbox.xs2a.testdata.TransactionStatus.Canceled;
1212
import static de.adorsys.psd2.sandbox.xs2a.testdata.TransactionStatus.Pending;
@@ -434,7 +434,7 @@ private TestPsu initPsuSuccessfull() {
434434
GLOBAL_PASSWORD,
435435
GLOBAL_TAN,
436436
accounts,
437-
AcceptedSettlementInProcess,
437+
AcceptedSettlementCompleted,
438438
Valid,
439439
Finalised,
440440
Canceled,
@@ -523,7 +523,7 @@ private TestPsu initPsuCancellationRejected() {
523523
GLOBAL_TAN,
524524
initSingleAccount(accountId, iban, BigDecimal.valueOf(592.59), BigDecimal.valueOf(592.59),
525525
transaction),
526-
AcceptedSettlementInProcess,
526+
AcceptedSettlementCompleted,
527527
Valid,
528528
Finalised,
529529
AcceptedTechnicalValidation,
@@ -692,7 +692,7 @@ private TestPsu initPsuConsentExpired() {
692692
GLOBAL_TAN,
693693
initSingleAccount(accountId, iban, BigDecimal.valueOf(9.21), BigDecimal.valueOf(9.21),
694694
transaction),
695-
AcceptedSettlementInProcess,
695+
AcceptedSettlementCompleted,
696696
Expired,
697697
Finalised,
698698
Canceled,
@@ -734,7 +734,7 @@ private TestPsu initPsuConsentRevokedByPsu() {
734734
GLOBAL_TAN,
735735
initSingleAccount(accountId, iban, BigDecimal.valueOf(9.21), BigDecimal.valueOf(9.21),
736736
transaction),
737-
AcceptedSettlementInProcess,
737+
AcceptedSettlementCompleted,
738738
RevokedByPsu,
739739
Finalised,
740740
Canceled,

‎service/src/main/java/de/adorsys/psd2/sandbox/xs2a/testdata/TransactionStatus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
public enum TransactionStatus {
44
Received("Received"),
55
Pending("Pending"),
6-
AcceptedSettlementInProcess("AcceptedSettlementInProcess"),
6+
AcceptedSettlementCompleted("AcceptedSettlementCompleted"),
77
AcceptedTechnicalValidation("AcceptedTechnicalValidation"),
88
Rejected("Rejected"),
99
Canceled("Canceled");

‎service/src/test/java/de/adorsys/psd2/sandbox/xs2a/pis/PIS.feature‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Feature: PIS
2929
Then the transaction status <status> is received
3030
Examples:
3131
| payment-type | iban | payment-product | psu-id | password | sca-method | tan | status |
32-
| single | DE11760365688833114935 | sepa-credit-transfers | PSU-Successful | 12345 | SMS_OTP | 54321 | ACSP |
32+
| single | DE11760365688833114935 | sepa-credit-transfers | PSU-Successful | 12345 | SMS_OTP | 54321 | ACSC |
3333
| future-dated | DE11760365688833114935 | sepa-credit-transfers | PSU-Successful | 12345 | SMS_OTP | 54321 | ACTC |
3434
| periodic | DE11760365688833114935 | sepa-credit-transfers | PSU-Successful | 12345 | SMS_OTP | 54321 | ACTC |
3535

@@ -75,7 +75,7 @@ Feature: PIS
7575
Then the transaction status <status> is received
7676
Examples:
7777
| payment-type | iban | payment-product | psu-id | password | sca-method | tan | status |
78-
| single | DE11760365688833114935 | sepa-credit-transfers | PSU-Successful | 12345 | SMS_OTP | 54321 | ACSP |
78+
| single | DE11760365688833114935 | sepa-credit-transfers | PSU-Successful | 12345 | SMS_OTP | 54321 | ACSC |
7979

8080
################################################################################################
8181
# #
@@ -126,5 +126,5 @@ Feature: PIS
126126
Then the transaction status <status> is received
127127
Examples:
128128
| iban | amount | psu-id | password | sca-method | tan | status |
129-
| DE11760365688833114935 | 1500.00 | PSU-Successful | 12345 | SMS_OTP | 54321 | ACSP |
129+
| DE11760365688833114935 | 1500.00 | PSU-Successful | 12345 | SMS_OTP | 54321 | ACSC |
130130
| DE11760365688833114935 | 1500.01 | PSU-Successful | 12345 | SMS_OTP | 54321 | RJCT |

‎service/src/test/java/de/adorsys/psd2/sandbox/xs2a/service/redirect/RedirectServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ public void shouldReturnUnsuccessfulScaUri() {
146146
@Test
147147
public void shouldReturnSuccessfulScaUri() {
148148
when(pisAuth.getScaStatus()).thenReturn(ScaStatus.FINALISED);
149-
when(pisAuth.getPaymentData().getTransactionStatus()).thenReturn(TransactionStatus.ACSP);
149+
when(pisAuth.getPaymentData().getTransactionStatus()).thenReturn(TransactionStatus.ACSC);
150150
when(tppInfo.getNokRedirectUri()).thenReturn(UNSUCCESSFUL_SCA_URI);
151151
when(tppInfo.getRedirectUri()).thenReturn(SUCCESSFUL_SCA_URI);
152152

153153
OnlineBankingData data = redirectService.getOnlineBankingData(EXTERNAL_ID).get();
154154

155155
assertEquals("http://tpp.de/success", data.getTppRedirectUri());
156-
assertEquals("AcceptedSettlementInProcess", data.getResourceStatus());
156+
assertEquals("AcceptedSettlementCompleted", data.getResourceStatus());
157157
}
158158

159159
@Test

0 commit comments

Comments
 (0)