Skip to content

Commit ae9f2e2

Browse files
committed
PN-14059 fix pdfRasterStep condition
1 parent 02af585 commit ae9f2e2

File tree

1 file changed

+26
-28
lines changed

1 file changed

+26
-28
lines changed

src/main/java/it/pagopa/pn/ec/cartaceo/service/CartaceoService.java

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -539,35 +539,33 @@ private Mono<SendMessageResponse> notificationTrackerStep(CartaceoPresaInCaricoI
539539
private Mono<RequestConversionDto> pdfRasterStep(CartaceoPresaInCaricoInfo cartaceoPresaInCaricoInfo, it.pagopa.pn.ec.rest.v1.consolidatore.dto.PaperEngageRequest paperEngageRequestDst, PaperEngageRequest paperEngageRequestSrc) {
540540
log.debug(INVOKING_OPERATION_LABEL_WITH_ARGS, CARTACEO_PDF_RASTER_STEP, Stream.of(cartaceoPresaInCaricoInfo, paperEngageRequestDst, paperEngageRequestSrc).toList());
541541

542-
if (!isRasterFeatureEnabled(paperEngageRequestDst.getRequestPaId()) ||
543-
paperEngageRequestSrc.getApplyRasterization() == null ||
544-
Boolean.FALSE.equals(paperEngageRequestSrc.getApplyRasterization())) {
545-
return Mono.empty();
542+
if (isRasterFeatureEnabled(paperEngageRequestDst.getRequestPaId()) || Boolean.TRUE.equals(paperEngageRequestSrc.getApplyRasterization())) {
543+
544+
return Mono.justOrEmpty(paperEngageRequestDst.getAttachments())
545+
.flatMapMany(Flux::fromIterable)
546+
.filter(this::isAttachmentToConvert)
547+
.flatMap(attachment -> uploadAttachmentToConvert(cartaceoPresaInCaricoInfo, attachment))
548+
.collectList()
549+
.filter(attachmentsToConvert -> !attachmentsToConvert.isEmpty())
550+
.doOnDiscard(List.class, list -> log.debug("No attachments to convert were processed."))
551+
.flatMap(attachmentsToConvert -> {
552+
RequestConversionDto requestConversionDto = new RequestConversionDto();
553+
requestConversionDto.setxPagopaExtchCxId(cartaceoPresaInCaricoInfo.getXPagopaExtchCxId());
554+
requestConversionDto.setRequestId(cartaceoPresaInCaricoInfo.getRequestIdx());
555+
requestConversionDto.setOriginalRequest(paperEngageRequestSrc);
556+
requestConversionDto.setAttachments(attachmentsToConvert);
557+
requestConversionDto.setRequestTimestamp(OffsetDateTime.now());
558+
return dynamoPdfRasterService.insertRequestConversion(requestConversionDto);
559+
})
560+
.retryWhen(LAVORAZIONE_RICHIESTA_RETRY_STRATEGY)
561+
.doOnError(MaxRetriesExceededException.class, throwable -> {
562+
log.debug(EXCEPTION_IN_PROCESS, CARTACEO_PDF_RASTER_STEP, throwable, throwable.getMessage());
563+
StepError stepError = new StepError();
564+
stepError.setStep(PDF_RASTER_STEP);
565+
cartaceoPresaInCaricoInfo.setStepError(stepError);
566+
});
546567
}
547-
548-
return Mono.justOrEmpty(paperEngageRequestDst.getAttachments())
549-
.flatMapMany(Flux::fromIterable)
550-
.filter(this::isAttachmentToConvert)
551-
.flatMap(attachment -> uploadAttachmentToConvert(cartaceoPresaInCaricoInfo, attachment))
552-
.collectList()
553-
.filter(attachmentsToConvert -> !attachmentsToConvert.isEmpty())
554-
.doOnDiscard(List.class, list -> log.debug("No attachments to convert were processed."))
555-
.flatMap(attachmentsToConvert -> {
556-
RequestConversionDto requestConversionDto = new RequestConversionDto();
557-
requestConversionDto.setxPagopaExtchCxId(cartaceoPresaInCaricoInfo.getXPagopaExtchCxId());
558-
requestConversionDto.setRequestId(cartaceoPresaInCaricoInfo.getRequestIdx());
559-
requestConversionDto.setOriginalRequest(paperEngageRequestSrc);
560-
requestConversionDto.setAttachments(attachmentsToConvert);
561-
requestConversionDto.setRequestTimestamp(OffsetDateTime.now());
562-
return dynamoPdfRasterService.insertRequestConversion(requestConversionDto);
563-
})
564-
.retryWhen(LAVORAZIONE_RICHIESTA_RETRY_STRATEGY)
565-
.doOnError(MaxRetriesExceededException.class, throwable -> {
566-
log.debug(EXCEPTION_IN_PROCESS, CARTACEO_PDF_RASTER_STEP, throwable, throwable.getMessage());
567-
StepError stepError = new StepError();
568-
stepError.setStep(PDF_RASTER_STEP);
569-
cartaceoPresaInCaricoInfo.setStepError(stepError);
570-
});
568+
return Mono.empty();
571569
}
572570

573571
private boolean isAttachmentToConvert(it.pagopa.pn.ec.rest.v1.consolidatore.dto.PaperEngageRequestAttachments attachment) {

0 commit comments

Comments
 (0)