jlengrand/dialogflow-fun
1
0
Fork 0
mirror of https://github.com/jlengrand/dialogflow-fun.git synced 2026-03-10 08:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle error cases in payment requests

Browse Source
This commit is contained in:
Julien Lengrand-Lambert
2019-11-08 09:57:47 +01:00
parent 1f997522ef
commit f0b6a970bc
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dialogflow-fun-api/src/main/java/fr/lengrand/dialogflowfunapi/dialogflow/DialogFlowService.java
View File

@@ -22,9 +22,9 @@ public class DialogFlowService {
public DialogFlowResponse getLastTransactionRequest() throws IOException, InterruptedException {
Optional<Transaction> transaction = this.getLastTransaction();
return transaction.isPresent() ?
new DialogFlowResponse(createTransactionDialogResponse(transaction.get()))
: new DialogFlowResponse("You appear to have no transactions!");
return transaction
.map(value -> new DialogFlowResponse(createTransactionDialogResponse(value)))
.orElseGet(() -> new DialogFlowResponse("You appear to have no transactions!"));
}
public DialogFlowResponse createPaymentRequest(DialogFlowWebHookRequest request) throws IOException, InterruptedException {
@@ -51,15 +51,14 @@ public class DialogFlowService {
if (transactionsObject.getTransactions().isEmpty()) return Optional.empty();
return transactionsObject.getTransactions().stream()
.sorted(Comparator.comparing(t -> t.getDetails().getCompleted(), Comparator.reverseOrder()) )
.findFirst();
.max(Comparator.comparing(t -> t.getDetails().getCompleted()));
}
private DialogFlowResponse createPaymentRequest(String contact, UnitCurrency unitCurrency) throws IOException, InterruptedException {
Optional<BankAccount> userAccount = UserAccountLookup.getBankAccountFromContact(contact);
if (userAccount.isEmpty())
return new DialogFlowResponse("Sorry, We have not found any bank account for " + contact + ". Cancelling.");
return new DialogFlowResponse("Sorry, We have not found any bank account for " + contact + ". Cancelling the payment request.");
PaymentRequest paymentRequest = openBankClient.createPaymentRequest(UserAccountLookup.getCurrentUserAccount()
, new PaymentRequestDetails(
@@ -68,9 +67,10 @@ public class DialogFlowService {
contact + " at " + getCurrentTime())
);
return paymentRequest.getStatus().equalsIgnoreCase("completed") ?
new DialogFlowResponse("Created a payment for a value of " + unitCurrency.getAmount() + unitCurrency.getCurrency() + " to " + contact)
: new DialogFlowResponse("Sorry, the creation of the payment failed. Please try again later!");
if (paymentRequest == null || paymentRequest.getStatus() == null || paymentRequest.getStatus().equalsIgnoreCase("completed"))
return new DialogFlowResponse("Sorry, the creation of the payment failed. Please try again later! Make sure to use your bank account's currency!");
return new DialogFlowResponse("Created a payment for a value of " + unitCurrency.getAmount() + unitCurrency.getCurrency() + " to " + contact);
}
private String getCurrentTime() {

4
dialogflow-fun-api/src/main/java/fr/lengrand/dialogflowfunapi/openbankproject/auth/JSONBodyHandler.java
View File

@@ -33,9 +33,9 @@ public class JSONBodyHandler<T> implements HttpResponse.BodyHandler<T> {
}
private Function<String, T> stringToJSON() {
return byteArray -> {
return string -> {
try {
return objectMapper.readValue(byteArray, this.type);
return objectMapper.readValue(string, this.type);
} catch (IOException e) {
throw new UncheckedIOException(e);
}