Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JD-408: Fix test #98

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

JD-408: Fix test #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89f87d4
Fix test
inallyoung Jun 17, 2021
1234e8c
Added payout tool processing
inallyoung Jun 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<dependency>
<groupId>com.rbkmoney</groupId>
<artifactId>swag-claim-management</artifactId>
<version>1.30-eafa8b6-server</version>
<version>1.33-1a8ca72-server</version>
</dependency>
<dependency>
<groupId>com.rbkmoney</groupId>
Expand Down
7 changes: 3 additions & 4 deletions ...m/rbkmoney/dark/api/converter/claimmanagement/party/contract/PayoutToolInfoConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
package com.rbkmoney.dark.api.converter.claimmanagement.party.contract;

import com.rbkmoney.damsel.domain.InternationalBankAccount;
import com.rbkmoney.damsel.domain.PayoutToolInfo;
import com.rbkmoney.damsel.domain.RussianBankAccount;
import com.rbkmoney.damsel.domain.WalletInfo;
import com.rbkmoney.damsel.domain.*;
import com.rbkmoney.dark.api.converter.DarkApiConverter;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -68,6 +65,8 @@ public com.rbkmoney.swag.claim_management.model.PayoutToolInfo convertToSwag(Pay
swagWalletInfo.setPayoutToolType(WALLETINFO);
swagWalletInfo.setWalletID(walletInfo.getWalletId());
return swagWalletInfo;
} else if (payoutToolInfo.isSetPaymentInstitutionAccount()) {
return new com.rbkmoney.swag.claim_management.model.PaymentInstitutionAccount();
} else {
throw new IllegalArgumentException("Unknown payout tool type!");
}
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/com/rbkmoney/dark/api/claimmanagement/converter/claim/ClaimConvertersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ public void claimModificationConverterTest() throws IOException {
claimModification = new MockTBaseProcessor(MockMode.ALL)
.process(claimModification, new TBaseHandler<>(ClaimModification.class));

if (claimModification.isSetDocumentModification()) {
claimModification.getDocumentModification().setType(null);
}
thriftModification.setClaimModification(claimModification);
Modification resultThriftModification = converter.convertToThrift(
converter.convertToSwag(thriftModification)
Expand Down