Skip to content

Commit

Permalink
Issue #327 #345 #406
Browse files Browse the repository at this point in the history 
Corretto contenuto del raw per le transazioni SANP 2.4.
  • Loading branch information
@pintorig
pintorig committed Nov 23, 2021
1 parent 7e977a1 commit b5497be
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions jars/api-commons/src/main/java/it/govpay/rs/v1/ConverterUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static String getRptJson(Rpt rpt) throws ServiceException {
return mapper.writeValueAsString(ctRpt);
case SANP_240:
PaGetPaymentRes paGetPaymentRes_RPT = JaxbUtils.toPaGetPaymentRes_RPT(rpt.getXmlRpt(), false);
return mapper.writeValueAsString(paGetPaymentRes_RPT);
return mapper.writeValueAsString(paGetPaymentRes_RPT.getData());
}

CtRichiestaPagamentoTelematico ctRpt = JaxbUtils.toRPT(rpt.getXmlRpt(), false);
Expand Down Expand Up @@ -83,7 +83,7 @@ public static String getRtJson(Rpt rpt) throws ServiceException {
return mapper.writeValueAsString(ctRt);
case SANP_240:
PaSendRTReq paSendRTReq_RT = JaxbUtils.toPaSendRTReq_RT(rpt.getXmlRt(), false);
return mapper.writeValueAsString(paSendRTReq_RT);
return mapper.writeValueAsString(paSendRTReq_RT.getReceipt());
}

CtRicevutaTelematica ctRt = JaxbUtils.toRT(rpt.getXmlRt(), false);
Expand Down
4 changes: 2 additions & 2 deletions jars/core/src/main/java/it/govpay/core/utils/rawutils/ConverterUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static String getRptJson(Rpt rpt) throws ServiceException {
return mapper.writeValueAsString(ctRpt);
case SANP_240:
PaGetPaymentRes paGetPaymentRes_RPT = JaxbUtils.toPaGetPaymentRes_RPT(rpt.getXmlRpt(), false);
return mapper.writeValueAsString(paGetPaymentRes_RPT);
return mapper.writeValueAsString(paGetPaymentRes_RPT.getData());
}

CtRichiestaPagamentoTelematico ctRpt = JaxbUtils.toRPT(rpt.getXmlRpt(), false);
Expand All @@ -76,7 +76,7 @@ public static String getRtJson(Rpt rpt) throws ServiceException {
return mapper.writeValueAsString(ctRt);
case SANP_240:
PaSendRTReq paSendRTReq_RT = JaxbUtils.toPaSendRTReq_RT(rpt.getXmlRt(), false);
return mapper.writeValueAsString(paSendRTReq_RT);
return mapper.writeValueAsString(paSendRTReq_RT.getReceipt());
}

CtRicevutaTelematica ctRt = JaxbUtils.toRT(rpt.getXmlRt(), false);
Expand Down
4 changes: 2 additions & 2 deletions wars/api-backoffice/src/main/java/it/govpay/backoffice/v1/controllers/RppController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ public Response getRpt(Authentication user, UriInfo uriInfo, HttpHeaders httpHea
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(rpt),transactionId).build();
case SANP_240:
PaGetPaymentRes paGetPaymentRes = JaxbUtils.toPaGetPaymentRes_RPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes.getData()),transactionId).build();
}

CtRichiestaPagamentoTelematico rpt = JaxbUtils.toRPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
Expand Down Expand Up @@ -459,7 +459,7 @@ public Response getRt(Authentication user, UriInfo uriInfo, HttpHeaders httpHead
case SANP_240:
PaSendRTReq paSendRTReq = JaxbUtils.toPaSendRTReq_RT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
this.log.debug(MessageFormat.format(BaseController.LOG_MSG_ESECUZIONE_METODO_COMPLETATA, methodName));
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq.getReceipt()),transactionId).build();
}

CtRicevutaTelematica rt = JaxbUtils.toRT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
Expand Down
4 changes: 2 additions & 2 deletions wars/api-pagamento/src/main/java/it/govpay/pagamento/v1/controller/RppController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public Response rppIdDominioIuvCcpRtGET(Authentication user, UriInfo uriInfo, Ht
case SANP_240:
PaSendRTReq paSendRTReq = JaxbUtils.toPaSendRTReq_RT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
this.log.debug(MessageFormat.format(BaseController.LOG_MSG_ESECUZIONE_METODO_COMPLETATA, methodName));
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq.getReceipt()),transactionId).build();
}

CtRicevutaTelematica rt = JaxbUtils.toRT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
Expand Down Expand Up @@ -316,7 +316,7 @@ public Response rppIdDominioIuvCcpRptGET(Authentication user, UriInfo uriInfo, H
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(rpt),transactionId).build();
case SANP_240:
PaGetPaymentRes paGetPaymentRes = JaxbUtils.toPaGetPaymentRes_RPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes.getData()),transactionId).build();
}

CtRichiestaPagamentoTelematico rpt = JaxbUtils.toRPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
Expand Down
4 changes: 2 additions & 2 deletions wars/api-pagamento/src/main/java/it/govpay/pagamento/v2/controller/RppController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public Response rppIdDominioIuvCcpRtGET(Authentication user, UriInfo uriInfo, Ht
case SANP_240:
PaSendRTReq paSendRTReq = JaxbUtils.toPaSendRTReq_RT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
this.log.debug(MessageFormat.format(BaseController.LOG_MSG_ESECUZIONE_METODO_COMPLETATA, methodName));
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq.getReceipt()),transactionId).build();
}

CtRicevutaTelematica rt = JaxbUtils.toRT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
Expand Down Expand Up @@ -330,7 +330,7 @@ public Response rppIdDominioIuvCcpRptGET(Authentication user, UriInfo uriInfo, H
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(rpt),transactionId).build();
case SANP_240:
PaGetPaymentRes paGetPaymentRes = JaxbUtils.toPaGetPaymentRes_RPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes.getData()),transactionId).build();
}

CtRichiestaPagamentoTelematico rpt = JaxbUtils.toRPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
Expand Down
4 changes: 2 additions & 2 deletions wars/api-pendenze/src/main/java/it/govpay/pendenze/v1/controller/RppController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ public Response rppIdDominioIuvCcpRtGET(Authentication user, UriInfo uriInfo, Ht
case SANP_240:
PaSendRTReq paSendRTReq = JaxbUtils.toPaSendRTReq_RT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
this.log.debug(MessageFormat.format(BaseController.LOG_MSG_ESECUZIONE_METODO_COMPLETATA, methodName));
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq.getReceipt()),transactionId).build();
}

CtRicevutaTelematica rt = JaxbUtils.toRT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
Expand Down Expand Up @@ -344,7 +344,7 @@ public Response rppIdDominioIuvCcpRptGET(Authentication user, UriInfo uriInfo, H
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(rpt),transactionId).build();
case SANP_240:
PaGetPaymentRes paGetPaymentRes = JaxbUtils.toPaGetPaymentRes_RPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes.getData()),transactionId).build();
}

CtRichiestaPagamentoTelematico rpt = JaxbUtils.toRPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
Expand Down
4 changes: 2 additions & 2 deletions wars/api-pendenze/src/main/java/it/govpay/pendenze/v2/controller/RppController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public Response rppIdDominioIuvCcpRtGET(Authentication user, UriInfo uriInfo, Ht
case SANP_240:
PaSendRTReq paSendRTReq = JaxbUtils.toPaSendRTReq_RT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
this.log.debug(MessageFormat.format(BaseController.LOG_MSG_ESECUZIONE_METODO_COMPLETATA, methodName));
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paSendRTReq.getReceipt()),transactionId).build();
}

CtRicevutaTelematica rt = JaxbUtils.toRT(ricevutaDTOResponse.getRpt().getXmlRt(), false);
Expand Down Expand Up @@ -358,7 +358,7 @@ public Response rppIdDominioIuvCcpRptGET(Authentication user, UriInfo uriInfo, H
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(rpt),transactionId).build();
case SANP_240:
PaGetPaymentRes paGetPaymentRes = JaxbUtils.toPaGetPaymentRes_RPT(leggiRptDTOResponse.getRpt().getXmlRpt(), false);
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes),transactionId).build();
return this.handleResponseOk(Response.status(Status.OK).type(MediaType.APPLICATION_JSON).entity(paGetPaymentRes.getData()),transactionId).build();
}


Expand Down

0 comments on commit b5497be

Please sign in to comment.