Skip to content

Commit

Permalink
Merge pull request #73 from pagopa/PAGOPA-1320-gpd-payments-analizzar…
Browse files Browse the repository at this point in the history
…e-500

[PAGOPA-1320-gpd-payments-analizzare-500] logging
  • Loading branch information
jacopocarlini authored Nov 8, 2023
2 parents 8476cf9 + 9231a89 commit a885a4b
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@
import it.gov.pagopa.payments.model.partner.PaSendRTV2Response;
import it.gov.pagopa.payments.model.partner.PaVerifyPaymentNoticeReq;
import it.gov.pagopa.payments.model.partner.PaVerifyPaymentNoticeRes;
import it.gov.pagopa.payments.service.PartnerService;
import java.io.IOException;
import javax.xml.bind.JAXBElement;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLStreamException;

import it.gov.pagopa.payments.service.PartnerService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ws.server.endpoint.annotation.Endpoint;
Expand Down Expand Up @@ -96,11 +95,8 @@ public JAXBElement<PaSendRTV2Response> paSendRTV2(
@ResponsePayload
public JAXBElement<PaDemandPaymentNoticeResponse> paDemandPaymentNotice(
@RequestPayload JAXBElement<PaDemandPaymentNoticeRequest> request)
throws DatatypeConfigurationException,
ParserConfigurationException,
IOException,
SAXException,
XMLStreamException {
throws DatatypeConfigurationException, ParserConfigurationException, IOException,
SAXException, XMLStreamException {

log.info(" paDemandPaymentNotice START ");
return factory.createPaDemandPaymentNoticeResponse(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package it.gov.pagopa.payments.endpoints.validation;

import it.gov.pagopa.payments.endpoints.validation.exceptions.PartnerValidationException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
Expand All @@ -9,10 +10,13 @@

@Component
@Order(Ordered.HIGHEST_PRECEDENCE)
@Slf4j
public class SoapFaultDefinitionExceptionResolver implements EndpointExceptionResolver {

public boolean resolveException(MessageContext messageContext, Object endpoint, Exception ex) {

log.error("an Error occurred: {}",ex.getMessage(), ex);

if (ex instanceof PartnerValidationException) {
throw (PartnerValidationException) ex;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ protected void doService(

try {
callService(httpServletRequest, httpServletResponse);
} catch (PartnerValidationException e) {
}
catch (PartnerValidationException e) {

log.error("Processing resulted in exception: " + e.getMessage());
faultCode = e.getError().getFaultCode();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package it.gov.pagopa.payments.model;

import lombok.ToString;

@ToString
public enum DebtPositionStatus {
DRAFT,
PUBLISHED,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package it.gov.pagopa.payments.model;

import lombok.ToString;

@ToString
public enum PaymentOptionStatus {
PO_UNPAID,
PO_PAID,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
import java.util.List;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;

@Data
@NoArgsConstructor
@ToString
public class PaymentsModelResponse implements Serializable {

private static final long serialVersionUID = -4897632346879847721L;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import java.time.LocalDateTime;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;

@Data
@NoArgsConstructor
@ToString
public class PaymentsTransferModelResponse implements Serializable {

private String organizationFiscalCode;
Expand Down
38 changes: 36 additions & 2 deletions src/main/java/it/gov/pagopa/payments/service/PartnerService.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,33 @@
import it.gov.pagopa.payments.mapper.ConvertTableEntityToReceiptEntity;
import it.gov.pagopa.payments.model.*;
import it.gov.pagopa.payments.model.partner.*;
import it.gov.pagopa.payments.model.partner.CtEntityUniqueIdentifier;
import it.gov.pagopa.payments.model.partner.CtPaymentOptionDescriptionPA;
import it.gov.pagopa.payments.model.partner.CtPaymentOptionsDescriptionListPA;
import it.gov.pagopa.payments.model.partner.CtPaymentPA;
import it.gov.pagopa.payments.model.partner.CtPaymentPAV2;
import it.gov.pagopa.payments.model.partner.CtQrCode;
import it.gov.pagopa.payments.model.partner.CtRichiestaMarcaDaBollo;
import it.gov.pagopa.payments.model.partner.CtSubject;
import it.gov.pagopa.payments.model.partner.CtTransferListPA;
import it.gov.pagopa.payments.model.partner.CtTransferListPAV2;
import it.gov.pagopa.payments.model.partner.CtTransferPA;
import it.gov.pagopa.payments.model.partner.CtTransferPAV2;
import it.gov.pagopa.payments.model.partner.PaDemandPaymentNoticeRequest;
import it.gov.pagopa.payments.model.partner.PaDemandPaymentNoticeResponse;
import it.gov.pagopa.payments.model.partner.PaGetPaymentReq;
import it.gov.pagopa.payments.model.partner.PaGetPaymentRes;
import it.gov.pagopa.payments.model.partner.PaGetPaymentV2Request;
import it.gov.pagopa.payments.model.partner.PaGetPaymentV2Response;
import it.gov.pagopa.payments.model.partner.PaSendRTReq;
import it.gov.pagopa.payments.model.partner.PaSendRTRes;
import it.gov.pagopa.payments.model.partner.PaSendRTV2Request;
import it.gov.pagopa.payments.model.partner.PaSendRTV2Response;
import it.gov.pagopa.payments.model.partner.PaVerifyPaymentNoticeRes;
import it.gov.pagopa.payments.model.partner.StAmountOption;
import it.gov.pagopa.payments.model.partner.StEntityUniqueIdentifierType;
import it.gov.pagopa.payments.model.partner.StOutcome;
import it.gov.pagopa.payments.model.partner.StTransferType;
import it.gov.pagopa.payments.model.spontaneous.*;
import it.gov.pagopa.payments.utils.CommonUtil;
import it.gov.pagopa.payments.utils.CustomizedMapper;
Expand Down Expand Up @@ -115,11 +142,18 @@ public PaVerifyPaymentNoticeRes paVerifyPaymentNotice(PaVerifyPaymentNoticeReq r

checkDebtPositionStatus(paymentOption);

PaVerifyPaymentNoticeRes result;
log.info(
"[paVerifyPaymentNotice] Response OK generation [noticeNumber={}]",
request.getQrCode().getNoticeNumber());

return this.generatePaVerifyPaymentNoticeResponse(paymentOption);
try {
result = this.generatePaVerifyPaymentNoticeResponse(paymentOption);
}
catch (Exception e){
log.error("[paVerifyPaymentNotice] paymentOption {}", paymentOption, e);
throw e;
}
return result;
}

@Transactional(readOnly = true)
Expand Down

0 comments on commit a885a4b

Please sign in to comment.