Skip to content

Commit 4800059

Browse files
authored
Removed custom data check (#26)
* removed custom data check * log level to debug
1 parent 894068a commit 4800059

File tree

1 file changed

+9
-20
lines changed

1 file changed

+9
-20
lines changed

src/main/java/org/mifos/connector/ams/pesacore/camel/route/PesaRouteBuilder.java

+9-20
Original file line numberDiff line numberDiff line change
@@ -184,28 +184,17 @@ public void configure() {
184184
.setHeader("Content-Type", constant("application/json"))
185185
.setHeader("Authorization", simple("Token " + authHeader))
186186
.setBody(exchange -> {
187-
if(exchange.getProperty(CHANNEL_REQUEST).toString().contains("customData")){
188-
JSONObject channelRequest = (JSONObject) exchange.getProperty(CHANNEL_REQUEST);
189-
String transactionId = exchange.getProperty(TRANSACTION_ID, String.class);
190-
String mpesaReceiptNumber = exchange.getProperty(EXTERNAL_ID, String.class);
187+
JSONObject channelRequest = (JSONObject) exchange.getProperty(CHANNEL_REQUEST);
188+
String transactionId = exchange.getProperty(TRANSACTION_ID, String.class);
189+
String mpesaReceiptNumber = exchange.getProperty(EXTERNAL_ID, String.class);
191190

192-
PesacoreRequestDTO confirmationRequestDTO = buildPesacoreDtoFromChannelRequest(channelRequest,
193-
mpesaReceiptNumber);
194-
confirmationRequestDTO.setStatus("successful");
195-
confirmationRequestDTO.setReceiptId(mpesaReceiptNumber);
196-
197-
logger.info("Confirmation request DTO: \n\n\n" + confirmationRequestDTO);
198-
return confirmationRequestDTO;
199-
}else {
200-
JSONObject paybillRequest = new JSONObject(exchange.getIn().getBody(String.class));
201-
PesacoreRequestDTO pesacoreRequestDTO = PesacoreUtils.convertPaybillPayloadToAmsPesacorePayload(paybillRequest);
191+
PesacoreRequestDTO confirmationRequestDTO = buildPesacoreDtoFromChannelRequest(channelRequest,
192+
mpesaReceiptNumber);
193+
confirmationRequestDTO.setStatus("successful");
194+
confirmationRequestDTO.setReceiptId(mpesaReceiptNumber);
202195

203-
String transactionId = pesacoreRequestDTO.getRemoteTransactionId();
204-
log.debug(pesacoreRequestDTO.toString());
205-
exchange.setProperty(TRANSACTION_ID, transactionId);
206-
logger.debug("Confirmation request DTO: {}" ,pesacoreRequestDTO);
207-
return pesacoreRequestDTO;
208-
}
196+
logger.debug("Confirmation request DTO: \n\n\n" + confirmationRequestDTO);
197+
return confirmationRequestDTO;
209198
})
210199
.marshal().json(JsonLibrary.Jackson)
211200
.toD(getConfirmationEndpoint() + "?bridgeEndpoint=true&throwExceptionOnFailure=false&"+

0 commit comments

Comments
 (0)