diff --git a/src/main/java/ci/bamba/regis/Collections.java b/src/main/java/ci/bamba/regis/Collections.java index 3e23e87..d4f57c3 100644 --- a/src/main/java/ci/bamba/regis/Collections.java +++ b/src/main/java/ci/bamba/regis/Collections.java @@ -1,10 +1,8 @@ package ci.bamba.regis; -import ci.bamba.regis.exceptions.RequestException; import ci.bamba.regis.models.AccountBalance; import ci.bamba.regis.models.AccountStatus; -import ci.bamba.regis.models.CollectionsRequestToPay; -import ci.bamba.regis.models.CollectionsRequestToPayBodyRequest; +import ci.bamba.regis.models.RequestToPay; import ci.bamba.regis.models.Token; import io.reactivex.Observable; @@ -28,32 +26,15 @@ public Observable requestToPay(float amount, String currency, String ext public Observable requestToPay(String token, float amount, String currency, String externalId, String payerPartyId, String payerMessage, String payeeNote) { - CollectionsRequestToPayBodyRequest body = new CollectionsRequestToPayBodyRequest(String.format("%s", amount), - currency, externalId, payerPartyId, payerMessage, payeeNote); - String referenceId = getUUID(); - return RestClient.getService(getBaseUrl()).collectionsCreateRequestToPay(getAuthHeader(token), - getSubscriptionKey(), referenceId, getEnvironment().getEnv(), body).map(response -> { - if (response.code() == 202) { - return referenceId; - } else { - throw new RequestException(response.code(), response.message()); - } - }); + return super.requestToPay(TYPE, token, amount, currency, externalId, payerPartyId, payerMessage, payeeNote); } - public Observable getRequestToPay(String referenceId) { + public Observable getRequestToPay(String referenceId) { return createToken().flatMap(token -> getRequestToPay(token.getAccessToken(), referenceId)); } - public Observable getRequestToPay(String token, String referenceId) { - return RestClient.getService(getBaseUrl()).collectionsGetRequestToPay(getAuthHeader(token), - getSubscriptionKey(), getEnvironment().getEnv(), referenceId).map(response -> { - if (response.code() == 200) { - return response.body(); - } else { - throw new RequestException(response.code(), response.message()); - } - }); + public Observable getRequestToPay(String token, String referenceId) { + return super.getRequestToPay(TYPE, token, referenceId); } public Observable getAccountBalance() { diff --git a/src/main/java/ci/bamba/regis/Disbursements.java b/src/main/java/ci/bamba/regis/Disbursements.java index 6783228..68710fc 100644 --- a/src/main/java/ci/bamba/regis/Disbursements.java +++ b/src/main/java/ci/bamba/regis/Disbursements.java @@ -1,11 +1,9 @@ package ci.bamba.regis; -import ci.bamba.regis.exceptions.RequestException; import ci.bamba.regis.models.AccountBalance; import ci.bamba.regis.models.AccountStatus; -import ci.bamba.regis.models.DisbursementsTransfer; -import ci.bamba.regis.models.DisbursementsTransferBodyRequest; import ci.bamba.regis.models.Token; +import ci.bamba.regis.models.Transfer; import io.reactivex.Observable; public class Disbursements extends Product { @@ -20,40 +18,23 @@ public Observable createToken() { return super.createToken(TYPE); } - public Observable transfer(float amount, String currency, String externalId, String payeePartyId, String payerMessage, String payeeNote) { - return createToken().flatMap(token -> transfer(token.getAccessToken(), amount, currency, externalId, payeePartyId, payerMessage, payeeNote)); + public Observable transfer(float amount, String currency, String externalId, String payeePartyId, + String payerMessage, String payeeNote) { + return createToken().flatMap(token -> transfer(token.getAccessToken(), amount, currency, externalId, + payeePartyId, payerMessage, payeeNote)); } - public Observable transfer(String token, float amount, String currency, String externalId, String payeePartyId, String payerMessage, String payeeNote) { - DisbursementsTransferBodyRequest body = new DisbursementsTransferBodyRequest(String.format("%s", amount), currency, externalId, payeePartyId, payerMessage, payeeNote); - String referenceId = getUUID(); - return RestClient - .getService(getBaseUrl()) - .disbursementsCreateTransfer(getAuthHeader(token), getSubscriptionKey(), referenceId, getEnvironment().getEnv(), body) - .map(response -> { - if (response.code() == 202) { - return referenceId; - } else { - throw new RequestException(response.code(), response.message()); - } - }); + public Observable transfer(String token, float amount, String currency, String externalId, + String payeePartyId, String payerMessage, String payeeNote) { + return super.transfer(TYPE, token, amount, currency, externalId, payeePartyId, payerMessage, payeeNote); } - public Observable getTransfer(String referenceId) { + public Observable getTransfer(String referenceId) { return createToken().flatMap(token -> getTransfer(token.getAccessToken(), referenceId)); } - public Observable getTransfer(String token, String referenceId) { - return RestClient - .getService(getBaseUrl()) - .disbursementsGetTransfer(getAuthHeader(token), getSubscriptionKey(), getEnvironment().getEnv(), referenceId) - .map(response -> { - if (response.code() == 200) { - return response.body(); - } else { - throw new RequestException(response.code(), response.message()); - } - }); + public Observable getTransfer(String token, String referenceId) { + return super.getTransfer(TYPE, token, referenceId); } public Observable getAccountBalance() { @@ -61,7 +42,7 @@ public Observable getAccountBalance() { } public Observable getAccountBalance(String token) { - return super.getAccountBalance(TYPE, token); + return super.getAccountBalance(TYPE, token); } public Observable getAccountStatus(String msisdn) { diff --git a/src/main/java/ci/bamba/regis/MoMo.java b/src/main/java/ci/bamba/regis/MoMo.java index 3c38ca1..842af79 100644 --- a/src/main/java/ci/bamba/regis/MoMo.java +++ b/src/main/java/ci/bamba/regis/MoMo.java @@ -3,7 +3,7 @@ public class MoMo { private static final String BASE_URL_SANDBOX = "https://ericssonbasicapi2.azure-api.net/"; - private static final String BASE_URL_PRODUCTION = "https://ericssonbasicapi1.azure-api.net"; + private static final String BASE_URL_PRODUCTION = "https://ericssonbasicapi1.azure-api.net/"; private Environment environment; diff --git a/src/main/java/ci/bamba/regis/Product.java b/src/main/java/ci/bamba/regis/Product.java index 0d8fba1..4be1895 100644 --- a/src/main/java/ci/bamba/regis/Product.java +++ b/src/main/java/ci/bamba/regis/Product.java @@ -7,7 +7,11 @@ import ci.bamba.regis.models.AccountBalance; import ci.bamba.regis.models.AccountStatus; import ci.bamba.regis.models.ApiCredentials; +import ci.bamba.regis.models.RequestToPay; +import ci.bamba.regis.models.RequestToPayBodyRequest; import ci.bamba.regis.models.Token; +import ci.bamba.regis.models.Transfer; +import ci.bamba.regis.models.TransferBodyRequest; import io.reactivex.Observable; public class Product { @@ -65,6 +69,59 @@ protected String getAuthHeader(String token) { return String.format("Bearer %s", token); } + public Observable transfer(String type, String token, float amount, String currency, + String externalId, String payeePartyId, String payerMessage, String payeeNote) { + TransferBodyRequest body = new TransferBodyRequest(String.format("%s", amount), currency, externalId, + payeePartyId, payerMessage, payeeNote); + String referenceId = getUUID(); + return RestClient.getService(getBaseUrl()).createTransfer(type, getAuthHeader(token), getSubscriptionKey(), + referenceId, getEnvironment().getEnv(), body).map(response -> { + if (response.code() == 202) { + return referenceId; + } else { + throw new RequestException(response.code(), response.message()); + } + }); + } + + public Observable getTransfer(String type, String token, String referenceId) { + return RestClient.getService(getBaseUrl()) + .getTransfer(type, getAuthHeader(token), getSubscriptionKey(), getEnvironment().getEnv(), referenceId) + .map(response -> { + if (response.code() == 200) { + return response.body(); + } else { + throw new RequestException(response.code(), response.message()); + } + }); + } + + public Observable requestToPay(String type, String token, float amount, String currency, String externalId, + String payerPartyId, String payerMessage, String payeeNote) { + RequestToPayBodyRequest body = new RequestToPayBodyRequest(String.format("%s", amount), currency, externalId, + payerPartyId, payerMessage, payeeNote); + String referenceId = getUUID(); + return RestClient.getService(getBaseUrl()).createRequestToPay(type, getAuthHeader(token), getSubscriptionKey(), + referenceId, getEnvironment().getEnv(), body).map(response -> { + if (response.code() == 202) { + return referenceId; + } else { + throw new RequestException(response.code(), response.message()); + } + }); + } + + public Observable getRequestToPay(String type, String token, String referenceId) { + return RestClient.getService(getBaseUrl()).getRequestToPay(type, getAuthHeader(token), getSubscriptionKey(), + getEnvironment().getEnv(), referenceId).map(response -> { + if (response.code() == 200) { + return response.body(); + } else { + throw new RequestException(response.code(), response.message()); + } + }); + } + protected Observable getAccountBalance(String type, String token) { return RestClient.getService(getBaseUrl()) .getAccountBalance(type, getAuthHeader(token), getSubscriptionKey(), getEnvironment().getEnv()) diff --git a/src/main/java/ci/bamba/regis/Remittances.java b/src/main/java/ci/bamba/regis/Remittances.java index 4d796c1..1cde6b5 100644 --- a/src/main/java/ci/bamba/regis/Remittances.java +++ b/src/main/java/ci/bamba/regis/Remittances.java @@ -1,11 +1,9 @@ package ci.bamba.regis; -import ci.bamba.regis.exceptions.RequestException; import ci.bamba.regis.models.AccountBalance; import ci.bamba.regis.models.AccountStatus; -import ci.bamba.regis.models.RemittancesTransfer; -import ci.bamba.regis.models.RemittancesTransferBodyRequest; import ci.bamba.regis.models.Token; +import ci.bamba.regis.models.Transfer; import io.reactivex.Observable; public class Remittances extends Product { @@ -28,32 +26,15 @@ public Observable transfer(float amount, String currency, String externa public Observable transfer(String token, float amount, String currency, String externalId, String payeePartyId, String payerMessage, String payeeNote) { - RemittancesTransferBodyRequest body = new RemittancesTransferBodyRequest(String.format("%s", amount), currency, - externalId, payeePartyId, payerMessage, payeeNote); - String referenceId = getUUID(); - return RestClient.getService(getBaseUrl()).remittancesCreateTransfer(getAuthHeader(token), getSubscriptionKey(), - referenceId, getEnvironment().getEnv(), body).map(response -> { - if (response.code() == 202) { - return referenceId; - } else { - throw new RequestException(response.code(), response.message()); - } - }); + return super.transfer(TYPE, token, amount, currency, externalId, payeePartyId, payerMessage, payeeNote); } - public Observable getTransfer(String referenceId) { + public Observable getTransfer(String referenceId) { return createToken().flatMap(token -> getTransfer(token.getAccessToken(), referenceId)); } - public Observable getTransfer(String token, String referenceId) { - return RestClient.getService(getBaseUrl()).remittancesGetTransfer(getAuthHeader(token), getSubscriptionKey(), - getEnvironment().getEnv(), referenceId).map(response -> { - if (response.code() == 200) { - return response.body(); - } else { - throw new RequestException(response.code(), response.message()); - } - }); + public Observable getTransfer(String token, String referenceId) { + return super.getTransfer(TYPE, token, referenceId); } public Observable getAccountBalance() { diff --git a/src/main/java/ci/bamba/regis/RestClient.java b/src/main/java/ci/bamba/regis/RestClient.java index b7b369e..cfe28a1 100644 --- a/src/main/java/ci/bamba/regis/RestClient.java +++ b/src/main/java/ci/bamba/regis/RestClient.java @@ -1,23 +1,21 @@ package ci.bamba.regis; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - import java.util.HashMap; import java.util.concurrent.TimeUnit; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + import ci.bamba.regis.models.AccountBalance; import ci.bamba.regis.models.AccountStatus; import ci.bamba.regis.models.ApiKey; import ci.bamba.regis.models.ApiUser; -import ci.bamba.regis.models.CollectionsRequestToPay; -import ci.bamba.regis.models.DisbursementsTransfer; -import ci.bamba.regis.models.DisbursementsTransferBodyRequest; -import ci.bamba.regis.models.RemittancesTransfer; -import ci.bamba.regis.models.RemittancesTransferBodyRequest; +import ci.bamba.regis.models.RequestToPay; +import ci.bamba.regis.models.RequestToPayBodyRequest; import ci.bamba.regis.models.Token; +import ci.bamba.regis.models.Transfer; +import ci.bamba.regis.models.TransferBodyRequest; import io.reactivex.Observable; -import ci.bamba.regis.models.CollectionsRequestToPayBodyRequest; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.logging.HttpLoggingInterceptor; @@ -96,51 +94,38 @@ Observable> createToken( @Path("type") String type ); - @POST("collection/v1_0/requesttopay") - Observable> collectionsCreateRequestToPay( - @Header("Authorization") String authorization, - @Header("Ocp-Apim-Subscription-Key") String subscriptionKey, - @Header("X-Reference-Id") String referenceId, - @Header("X-Target-Environment") String targetEnvironment, - @Body CollectionsRequestToPayBodyRequest body - ); - - @POST("disbursement/v1_0/transfer") - Observable> disbursementsCreateTransfer( + @POST("{type}/v1_0/requesttopay") + Observable> createRequestToPay( + @Path("type") String type, @Header("Authorization") String authorization, @Header("Ocp-Apim-Subscription-Key") String subscriptionKey, @Header("X-Reference-Id") String referenceId, @Header("X-Target-Environment") String targetEnvironment, - @Body DisbursementsTransferBodyRequest body + @Body RequestToPayBodyRequest body ); - @POST("remittance/v1_0/transfer") - Observable> remittancesCreateTransfer( + @POST("{type}/v1_0/transfer") + Observable> createTransfer( + @Path("type") String type, @Header("Authorization") String authorization, @Header("Ocp-Apim-Subscription-Key") String subscriptionKey, @Header("X-Reference-Id") String referenceId, @Header("X-Target-Environment") String targetEnvironment, - @Body RemittancesTransferBodyRequest body + @Body TransferBodyRequest body ); - @GET("collection/v1_0/requesttopay/{referenceId}") - Observable> collectionsGetRequestToPay( - @Header("Authorization") String authorization, - @Header("Ocp-Apim-Subscription-Key") String subscriptionKey, - @Header("X-Target-Environment") String targetEnvironment, - @Path("referenceId") String referenceId - ); - - @GET("disbursement/v1_0/transfer/{referenceId}") - Observable> disbursementsGetTransfer( + @GET("{type}/v1_0/requesttopay/{referenceId}") + Observable> getRequestToPay( + @Path("type") String type, @Header("Authorization") String authorization, @Header("Ocp-Apim-Subscription-Key") String subscriptionKey, @Header("X-Target-Environment") String targetEnvironment, @Path("referenceId") String referenceId ); - @GET("remittance/v1_0/transfer/{referenceId}") - Observable> remittancesGetTransfer( + @GET("{type}/v1_0/transfer/{referenceId}") + Observable> getTransfer( + @Path("type") String type, @Header("Authorization") String authorization, @Header("Ocp-Apim-Subscription-Key") String subscriptionKey, @Header("X-Target-Environment") String targetEnvironment, diff --git a/src/main/java/ci/bamba/regis/models/DisbursementsTransfer.java b/src/main/java/ci/bamba/regis/models/DisbursementsTransfer.java deleted file mode 100644 index 1d778bb..0000000 --- a/src/main/java/ci/bamba/regis/models/DisbursementsTransfer.java +++ /dev/null @@ -1,129 +0,0 @@ -package ci.bamba.regis.models; - -public class DisbursementsTransfer { - - private String reason; - private float amount; - private String status; - private String financialTransactionId; - private String currency; - private String externalId; - private Payee payee; - private String payerMessage; - private String payeeNote; - - - public float getAmount() { - return amount; - } - - public void setAmount(float amount) { - this.amount = amount; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - public String getExternalId() { - return externalId; - } - - public void setExternalId(String externalId) { - this.externalId = externalId; - } - - public Payee getPayee() { - return payee; - } - - public void setPayee(Payee payee) { - this.payee = payee; - } - - public String getPayerMessage() { - return payerMessage; - } - - public void setPayerMessage(String payerMessage) { - this.payerMessage = payerMessage; - } - - public String getPayeeNote() { - return payeeNote; - } - - public void setPayeeNote(String payeeNote) { - this.payeeNote = payeeNote; - } - - /** - * @return the status - */ - public String getStatus() { - return status; - } - - /** - * @param status the status to set - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * @return the financialTransactionId - */ - public String getFinancialTransactionId() { - return financialTransactionId; - } - - /** - * @param financialTransactionId the financialTransactionId to set - */ - public void setFinancialTransactionId(String financialTransactionId) { - this.financialTransactionId = financialTransactionId; - } - - /** - * @return the reason - */ - public String getReason() { - return reason; - } - - /** - * @param reason the reason to set - */ - public void setReason(String reason) { - this.reason = reason; - } - - public static class Payee { - private String partyIdType; - private String partyId; - - public Payee() { - } - - public String getPartyIdType() { - return partyIdType; - } - - public void setPartyIdType(String partyIdType) { - this.partyIdType = partyIdType; - } - - public String getPartyId() { - return partyId; - } - - public void setPartyId(String partyId) { - this.partyId = partyId; - } - } -} diff --git a/src/main/java/ci/bamba/regis/models/DisbursementsTransferBodyRequest.java b/src/main/java/ci/bamba/regis/models/DisbursementsTransferBodyRequest.java deleted file mode 100644 index f2606f5..0000000 --- a/src/main/java/ci/bamba/regis/models/DisbursementsTransferBodyRequest.java +++ /dev/null @@ -1,102 +0,0 @@ -package ci.bamba.regis.models; - -public class DisbursementsTransferBodyRequest { - - private String amount; - private String currency; - private String externalId; - private Payee payee; - private String payerMessage; - private String payeeNote; - - public DisbursementsTransferBodyRequest() { - - } - - public DisbursementsTransferBodyRequest(String amount, String currency, String externalId, String payerPartyId, String payerMessage, String payeeNote) { - this.amount = amount; - this.currency = currency; - this.externalId = externalId; - this.payee = new Payee(payerPartyId); - this.payerMessage = payerMessage; - this.payeeNote = payeeNote; - } - - public String getAmount() { - return amount; - } - - public void setAmount(String amount) { - this.amount = amount; - } - - public String getCurrency() { - return currency; - } - - public void setCurrency(String currency) { - this.currency = currency; - } - - public String getExternalId() { - return externalId; - } - - public void setExternalId(String externalId) { - this.externalId = externalId; - } - - public Payee getPayee() { - return payee; - } - - public void setPayee(Payee payee) { - this.payee = payee; - } - - public String getPayerMessage() { - return payerMessage; - } - - public void setPayerMessage(String payerMessage) { - this.payerMessage = payerMessage; - } - - public String getPayeeNote() { - return payeeNote; - } - - public void setPayeeNote(String payeeNote) { - this.payeeNote = payeeNote; - } - - public static class Payee { - private String partyIdType; - private String partyId; - - public Payee() { - - } - - Payee(String partyId) { - this.partyId = partyId; - this.partyIdType = "MSISDN"; - } - - public String getPartyIdType() { - return partyIdType; - } - - public void setPartyIdType(String partyIdType) { - this.partyIdType = partyIdType; - } - - public String getPartyId() { - return partyId; - } - - public void setPartyId(String partyId) { - this.partyId = partyId; - } - } -} diff --git a/src/main/java/ci/bamba/regis/models/CollectionsRequestToPay.java b/src/main/java/ci/bamba/regis/models/RequestToPay.java similarity index 98% rename from src/main/java/ci/bamba/regis/models/CollectionsRequestToPay.java rename to src/main/java/ci/bamba/regis/models/RequestToPay.java index 4c618c3..34c2ed0 100644 --- a/src/main/java/ci/bamba/regis/models/CollectionsRequestToPay.java +++ b/src/main/java/ci/bamba/regis/models/RequestToPay.java @@ -1,6 +1,6 @@ package ci.bamba.regis.models; -public class CollectionsRequestToPay { +public class RequestToPay { private String reason; private float amount; diff --git a/src/main/java/ci/bamba/regis/models/CollectionsRequestToPayBodyRequest.java b/src/main/java/ci/bamba/regis/models/RequestToPayBodyRequest.java similarity index 88% rename from src/main/java/ci/bamba/regis/models/CollectionsRequestToPayBodyRequest.java rename to src/main/java/ci/bamba/regis/models/RequestToPayBodyRequest.java index 421972e..d3c0baa 100644 --- a/src/main/java/ci/bamba/regis/models/CollectionsRequestToPayBodyRequest.java +++ b/src/main/java/ci/bamba/regis/models/RequestToPayBodyRequest.java @@ -1,6 +1,6 @@ package ci.bamba.regis.models; -public class CollectionsRequestToPayBodyRequest { +public class RequestToPayBodyRequest { private String amount; private String currency; @@ -9,11 +9,11 @@ public class CollectionsRequestToPayBodyRequest { private String payerMessage; private String payeeNote; - public CollectionsRequestToPayBodyRequest() { + public RequestToPayBodyRequest() { } - public CollectionsRequestToPayBodyRequest(String amount, String currency, String externalId, String payerPartyId, String payerMessage, String payeeNote) { + public RequestToPayBodyRequest(String amount, String currency, String externalId, String payerPartyId, String payerMessage, String payeeNote) { this.amount = amount; this.currency = currency; this.externalId = externalId; diff --git a/src/main/java/ci/bamba/regis/models/RemittancesTransfer.java b/src/main/java/ci/bamba/regis/models/Transfer.java similarity index 98% rename from src/main/java/ci/bamba/regis/models/RemittancesTransfer.java rename to src/main/java/ci/bamba/regis/models/Transfer.java index ebb7952..78f567a 100644 --- a/src/main/java/ci/bamba/regis/models/RemittancesTransfer.java +++ b/src/main/java/ci/bamba/regis/models/Transfer.java @@ -1,6 +1,6 @@ package ci.bamba.regis.models; -public class RemittancesTransfer { +public class Transfer { private String reason; private float amount; diff --git a/src/main/java/ci/bamba/regis/models/RemittancesTransferBodyRequest.java b/src/main/java/ci/bamba/regis/models/TransferBodyRequest.java similarity index 89% rename from src/main/java/ci/bamba/regis/models/RemittancesTransferBodyRequest.java rename to src/main/java/ci/bamba/regis/models/TransferBodyRequest.java index c634d42..eacfac6 100644 --- a/src/main/java/ci/bamba/regis/models/RemittancesTransferBodyRequest.java +++ b/src/main/java/ci/bamba/regis/models/TransferBodyRequest.java @@ -1,6 +1,6 @@ package ci.bamba.regis.models; -public class RemittancesTransferBodyRequest { +public class TransferBodyRequest { private String amount; private String currency; @@ -9,11 +9,11 @@ public class RemittancesTransferBodyRequest { private String payerMessage; private String payeeNote; - public RemittancesTransferBodyRequest() { + public TransferBodyRequest() { } - public RemittancesTransferBodyRequest(String amount, String currency, String externalId, String payerPartyId, String payerMessage, String payeeNote) { + public TransferBodyRequest(String amount, String currency, String externalId, String payerPartyId, String payerMessage, String payeeNote) { this.amount = amount; this.currency = currency; this.externalId = externalId; diff --git a/src/test/java/test/ci/bamba/regis/momoapi/UnitTests.java b/src/test/java/test/ci/bamba/regis/momoapi/UnitTests.java index 0712be6..2aa46f6 100644 --- a/src/test/java/test/ci/bamba/regis/momoapi/UnitTests.java +++ b/src/test/java/test/ci/bamba/regis/momoapi/UnitTests.java @@ -1,24 +1,23 @@ package test.ci.bamba.regis.momoapi; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import org.junit.Test; +import ci.bamba.regis.RestClient; import ci.bamba.regis.models.AccountBalance; import ci.bamba.regis.models.AccountStatus; import ci.bamba.regis.models.ApiCredentials; import ci.bamba.regis.models.ApiKey; import ci.bamba.regis.models.ApiUser; -import ci.bamba.regis.models.CollectionsRequestToPay; -import ci.bamba.regis.models.CollectionsRequestToPayBodyRequest; -import ci.bamba.regis.models.DisbursementsTransfer; -import ci.bamba.regis.models.DisbursementsTransferBodyRequest; -import ci.bamba.regis.models.RemittancesTransfer; -import ci.bamba.regis.models.RemittancesTransferBodyRequest; +import ci.bamba.regis.models.RequestToPay; +import ci.bamba.regis.models.RequestToPayBodyRequest; import ci.bamba.regis.models.Token; +import ci.bamba.regis.models.Transfer; +import ci.bamba.regis.models.TransferBodyRequest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import ci.bamba.regis.RestClient; public class UnitTests { @Test @@ -92,11 +91,11 @@ public void testCollectionsRequestToPay() { String reason = "reason"; String status = "status"; - CollectionsRequestToPay.Payer payer = new CollectionsRequestToPay.Payer(); + RequestToPay.Payer payer = new RequestToPay.Payer(); payer.setPartyId("id"); payer.setPartyIdType("type"); - CollectionsRequestToPay collectionsRequestToPay = new CollectionsRequestToPay(); + RequestToPay collectionsRequestToPay = new RequestToPay(); collectionsRequestToPay.setAmount(amount); collectionsRequestToPay.setCurrency(currency); collectionsRequestToPay.setExternalId(externalId); @@ -128,11 +127,11 @@ public void testCollectionsRequestToPayBodyRequest() { String payeeNote = "payee"; String payerMessage = "mes"; - CollectionsRequestToPayBodyRequest.Payer payer = new CollectionsRequestToPayBodyRequest.Payer(); + RequestToPayBodyRequest.Payer payer = new RequestToPayBodyRequest.Payer(); payer.setPartyId("id"); payer.setPartyIdType("type"); - CollectionsRequestToPayBodyRequest collectionsRequestToPay = new CollectionsRequestToPayBodyRequest(); + RequestToPayBodyRequest collectionsRequestToPay = new RequestToPayBodyRequest(); collectionsRequestToPay.setAmount(amount); collectionsRequestToPay.setCurrency(currency); collectionsRequestToPay.setExternalId(externalId); @@ -162,45 +161,6 @@ public void testToken() { assertEquals("type", token.getTokenType()); } - @Test - public void testDisbursementsTransfer() { - float amount = 9; - String currency = "USD"; - String externalId = "ext"; - String financialTransactionId = "fin"; - String payeeNote = "payee"; - String payerMessage = "mes"; - String reason = "reason"; - String status = "status"; - - DisbursementsTransfer.Payee payee = new DisbursementsTransfer.Payee(); - payee.setPartyId("id"); - payee.setPartyIdType("type"); - - DisbursementsTransfer disbursementsTransfer = new DisbursementsTransfer(); - disbursementsTransfer.setAmount(amount); - disbursementsTransfer.setCurrency(currency); - disbursementsTransfer.setExternalId(externalId); - disbursementsTransfer.setFinancialTransactionId(financialTransactionId); - disbursementsTransfer.setPayeeNote(payeeNote); - disbursementsTransfer.setPayerMessage(payerMessage); - disbursementsTransfer.setPayee(payee); - disbursementsTransfer.setReason(reason); - disbursementsTransfer.setStatus(status); - - assertEquals(amount, disbursementsTransfer.getAmount(), 0); - assertEquals(currency, disbursementsTransfer.getCurrency()); - assertEquals(externalId, disbursementsTransfer.getExternalId()); - assertEquals(financialTransactionId, disbursementsTransfer.getFinancialTransactionId()); - assertEquals(payeeNote, disbursementsTransfer.getPayeeNote()); - assertEquals(payerMessage, disbursementsTransfer.getPayerMessage()); - assertEquals(reason, disbursementsTransfer.getReason()); - assertEquals(status, disbursementsTransfer.getStatus()); - assertNotNull(payee); - assertEquals("id", disbursementsTransfer.getPayee().getPartyId()); - assertEquals("type", disbursementsTransfer.getPayee().getPartyIdType()); - } - @Test public void testDisbursementsTransferBodyRequest() { String amount = "9"; @@ -209,11 +169,11 @@ public void testDisbursementsTransferBodyRequest() { String payeeNote = "payee"; String payerMessage = "mes"; - DisbursementsTransferBodyRequest.Payee payee = new DisbursementsTransferBodyRequest.Payee(); + TransferBodyRequest.Payee payee = new TransferBodyRequest.Payee(); payee.setPartyId("id"); payee.setPartyIdType("type"); - DisbursementsTransferBodyRequest disbursementsTransfer = new DisbursementsTransferBodyRequest(); + TransferBodyRequest disbursementsTransfer = new TransferBodyRequest(); disbursementsTransfer.setAmount(amount); disbursementsTransfer.setCurrency(currency); disbursementsTransfer.setExternalId(externalId); @@ -231,9 +191,8 @@ public void testDisbursementsTransferBodyRequest() { assertEquals("type", disbursementsTransfer.getPayee().getPartyIdType()); } - @Test - public void testRemittancesTransfer() { + public void testTransfer() { float amount = 9; String currency = "USD"; String externalId = "ext"; @@ -243,47 +202,47 @@ public void testRemittancesTransfer() { String reason = "reason"; String status = "status"; - RemittancesTransfer.Payee payee = new RemittancesTransfer.Payee(); + Transfer.Payee payee = new Transfer.Payee(); payee.setPartyId("id"); payee.setPartyIdType("type"); - RemittancesTransfer remittancesTransfer = new RemittancesTransfer(); - remittancesTransfer.setAmount(amount); - remittancesTransfer.setCurrency(currency); - remittancesTransfer.setExternalId(externalId); - remittancesTransfer.setFinancialTransactionId(financialTransactionId); - remittancesTransfer.setPayeeNote(payeeNote); - remittancesTransfer.setPayerMessage(payerMessage); - remittancesTransfer.setPayee(payee); - remittancesTransfer.setReason(reason); - remittancesTransfer.setStatus(status); - - assertEquals(amount, remittancesTransfer.getAmount(), 0); - assertEquals(currency, remittancesTransfer.getCurrency()); - assertEquals(externalId, remittancesTransfer.getExternalId()); - assertEquals(financialTransactionId, remittancesTransfer.getFinancialTransactionId()); - assertEquals(payeeNote, remittancesTransfer.getPayeeNote()); - assertEquals(payerMessage, remittancesTransfer.getPayerMessage()); - assertEquals(reason, remittancesTransfer.getReason()); - assertEquals(status, remittancesTransfer.getStatus()); + Transfer transfer = new Transfer(); + transfer.setAmount(amount); + transfer.setCurrency(currency); + transfer.setExternalId(externalId); + transfer.setFinancialTransactionId(financialTransactionId); + transfer.setPayeeNote(payeeNote); + transfer.setPayerMessage(payerMessage); + transfer.setPayee(payee); + transfer.setReason(reason); + transfer.setStatus(status); + + assertEquals(amount, transfer.getAmount(), 0); + assertEquals(currency, transfer.getCurrency()); + assertEquals(externalId, transfer.getExternalId()); + assertEquals(financialTransactionId, transfer.getFinancialTransactionId()); + assertEquals(payeeNote, transfer.getPayeeNote()); + assertEquals(payerMessage, transfer.getPayerMessage()); + assertEquals(reason, transfer.getReason()); + assertEquals(status, transfer.getStatus()); assertNotNull(payee); - assertEquals("id", remittancesTransfer.getPayee().getPartyId()); - assertEquals("type", remittancesTransfer.getPayee().getPartyIdType()); + assertEquals("id", transfer.getPayee().getPartyId()); + assertEquals("type", transfer.getPayee().getPartyIdType()); } @Test - public void testRemittancesTransferBodyRequest() { + public void testTransferBodyRequest() { String amount = "9"; String currency = "USD"; String externalId = "ext"; String payeeNote = "payee"; String payerMessage = "mes"; - RemittancesTransferBodyRequest.Payee payee = new RemittancesTransferBodyRequest.Payee(); + TransferBodyRequest.Payee payee = new TransferBodyRequest.Payee(); payee.setPartyId("id"); payee.setPartyIdType("type"); - RemittancesTransferBodyRequest remittancesTransfer = new RemittancesTransferBodyRequest(); + TransferBodyRequest remittancesTransfer = new TransferBodyRequest(); remittancesTransfer.setAmount(amount); remittancesTransfer.setCurrency(currency); remittancesTransfer.setExternalId(externalId);