Skip to content

Commit 7d08728

Browse files
authored
feat: promote to uat (#385)
2 parents 7fd9e77 + 0c389e3 commit 7d08728

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

src/main/java/it/gov/pagopa/idpay/transactions/service/RewardBatchServiceImpl.java

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,15 @@
3333
import it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionCode;
3434
import it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionMessage;
3535
import it.gov.pagopa.idpay.transactions.utils.Utilities;
36-
import java.time.LocalDate;
3736
import lombok.Data;
3837
import lombok.extern.slf4j.Slf4j;
3938
import org.springframework.dao.DuplicateKeyException;
4039
import org.springframework.data.domain.Page;
4140
import org.springframework.data.domain.PageImpl;
4241
import org.springframework.data.domain.Pageable;
42+
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
4343
import org.springframework.data.mongodb.core.query.Criteria;
4444
import org.springframework.data.mongodb.core.query.Query;
45-
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
4645
import org.springframework.http.HttpStatus;
4746
import org.springframework.scheduling.annotation.Scheduled;
4847
import org.springframework.stereotype.Service;
@@ -54,6 +53,7 @@
5453
import java.io.InputStream;
5554
import java.nio.charset.StandardCharsets;
5655
import java.text.NumberFormat;
56+
import java.time.LocalDate;
5757
import java.time.LocalDateTime;
5858
import java.time.YearMonth;
5959
import java.time.format.DateTimeFormatter;
@@ -69,7 +69,6 @@
6969
import static it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionMessage.*;
7070
import static org.springframework.http.HttpStatus.BAD_REQUEST;
7171
import static org.springframework.http.HttpStatus.NOT_FOUND;
72-
import static it.gov.pagopa.idpay.transactions.utils.ExceptionConstants.ExceptionMessage.ERROR_MESSAGE_NOT_FOUND_REWARD_BATCH_SENT;
7372

7473
@Service
7574
@Slf4j
@@ -332,8 +331,7 @@ public Mono<RewardBatch> suspendTransactions(String rewardBatchId, String initia
332331

333332
private static ReasonDTO generateReasonDto(TransactionsRequest request) {
334333
LocalDateTime now = LocalDateTime.now();
335-
ReasonDTO reason = new ReasonDTO(now, request.getReason());
336-
return reason;
334+
return new ReasonDTO(now, request.getReason());
337335
}
338336

339337
void validChecksError(ChecksErrorDTO dto) {
@@ -381,7 +379,17 @@ public Mono<RewardBatch> rejectTransactions(String rewardBatchId, String initiat
381379
.map(trxId -> Pair.of(trxId, batch.getMonth())))
382380
.flatMap(trxId2ActualBatchMont -> rewardTransactionRepository
383381
.updateStatusAndReturnOld(rewardBatchId, trxId2ActualBatchMont.getLeft(), RewardBatchTrxStatus.REJECTED, reason, trxId2ActualBatchMont.getRight(), checksErrorModel)
384-
.map(trxOld -> Pair.of(trxOld, trxId2ActualBatchMont.getRight()))
382+
.map(trxOld -> {
383+
if (trxOld != null) {
384+
log.info(
385+
"[REJECT_TRANSACTION] Transaction {} rejected. batchId: {}, initiativeId: {}",
386+
trxOld.getId(),
387+
Utilities.sanitizeString(rewardBatchId),
388+
Utilities.sanitizeString(initiativeId)
389+
);
390+
}
391+
return Pair.of(trxOld, trxId2ActualBatchMont.getRight());
392+
})
385393
)
386394
.reduce(new BatchCountersDTO(0L, 0L, 0L, 0L, 0L),
387395
(acc, trxOld2ActualRewardBatchMonth) -> {

0 commit comments

Comments
 (0)