fix adjustments

src/main/java/dev/vality/disputes/admin/callback/CallbackNotifier.java

@@ -10,7 +10,7 @@ public interface CallbackNotifier {
 
     void sendDisputePoolingExpired(Dispute dispute);
 
-    void sendDisputeReadyForCreateAdjustment(List<Dispute> disputes);
+    void sendDisputesReadyForCreateAdjustment(List<Dispute> disputes);
 
     void sendDisputeFailedReviewRequired(Dispute dispute, String errorCode, String errorDescription);
 

src/main/java/dev/vality/disputes/admin/callback/DisputesTgBotCallbackNotifierImpl.java

@@ -34,13 +34,13 @@ public void sendDisputePoolingExpired(Dispute dispute) {
     }
 
     @Override
-    public void sendDisputeReadyForCreateAdjustment(List<Dispute> disputes) {
+    public void sendDisputesReadyForCreateAdjustment(List<Dispute> disputes) {
         var disputeReadyForCreateAdjustments = disputes.stream()
                 .map(Dispute::getId)
                 .map(UUID::toString)
                 .map(DisputeReadyForCreateAdjustment::new)
                 .toList();
-        disputesTgBotService.sendDisputeReadyForCreateAdjustment(disputeReadyForCreateAdjustments);
+        disputesTgBotService.sendDisputesReadyForCreateAdjustment(disputeReadyForCreateAdjustments);
     }
 
     @Override

src/main/java/dev/vality/disputes/admin/callback/DummyCallbackNotifierImpl.java

@@ -26,7 +26,7 @@ public void sendDisputePoolingExpired(Dispute dispute) {
     }
 
     @Override
-    public void sendDisputeReadyForCreateAdjustment(List<Dispute> disputes) {
+    public void sendDisputesReadyForCreateAdjustment(List<Dispute> disputes) {
         log.debug("Trying to call DummyCallbackNotifierImpl.sendDisputeReadyForCreateAdjustment() {}", disputes.size());
     }
 

src/main/java/dev/vality/disputes/api/controller/ErrorControllerAdvice.java

@@ -1,6 +1,7 @@
 package dev.vality.disputes.api.controller;
 
 import dev.vality.disputes.exception.AuthorizationException;
+import dev.vality.disputes.exception.InvoicingPaymentStatusPendingException;
 import dev.vality.disputes.exception.NotFoundException;
 import dev.vality.disputes.exception.TokenKeeperException;
 import dev.vality.swag.disputes.model.GeneralError;
@@ -35,6 +36,14 @@ public class ErrorControllerAdvice {
 
     // ----------------- 4xx -----------------------------------------------------
 
+    @ExceptionHandler({InvoicingPaymentStatusPendingException.class})
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public Object handleInvalidMimeTypeException(InvoicingPaymentStatusPendingException e) {
+        log.warn("<- Res [400]: Payment has non-final status", e);
+        return new GeneralError()
+                .message("Payment has non-final status");
+    }
+
     @ExceptionHandler({InvalidMimeTypeException.class})
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     public Object handleInvalidMimeTypeException(InvalidMimeTypeException e) {

src/main/java/dev/vality/disputes/exception/InvoicingPaymentStatusPendingException.java

@@ -5,4 +5,7 @@ public class InvoicingPaymentStatusPendingException extends RuntimeException {
     public InvoicingPaymentStatusPendingException(Throwable cause) {
         super(cause);
     }
+
+    public InvoicingPaymentStatusPendingException() {
+    }
 }

src/main/java/dev/vality/disputes/schedule/TaskReadyForCreateAdjustmentsService.java → src/main/java/dev/vality/disputes/schedule/AdjustmentsReadyNotificationTask.java

@@ -2,7 +2,7 @@
 
 import dev.vality.disputes.admin.callback.CallbackNotifier;
 import dev.vality.disputes.admin.management.MdcTopicProducer;
-import dev.vality.disputes.schedule.service.CreateAdjustmentsService;
+import dev.vality.disputes.schedule.core.AdjustmentsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -14,18 +14,18 @@
 @Service
 @RequiredArgsConstructor
 @SuppressWarnings({"ParameterName", "LineLength", "MissingSwitchDefault"})
-public class TaskReadyForCreateAdjustmentsService {
+public class AdjustmentsReadyNotificationTask {
 
-    private final CreateAdjustmentsService createAdjustmentsService;
+    private final AdjustmentsService adjustmentsService;
     private final CallbackNotifier callbackNotifier;
     private final MdcTopicProducer mdcTopicProducer;
 
     @Scheduled(fixedDelayString = "${dispute.fixedDelayReadyForCreateAdjustments}", initialDelayString = "${dispute.initialDelayReadyForCreateAdjustments}")
     public void processPending() {
         log.debug("Processing ReadyForCreateAdjustments get started");
-        var disputes = createAdjustmentsService.getReadyDisputesForCreateAdjustment();
+        var disputes = adjustmentsService.getReadyDisputesForCreateAdjustment();
         mdcTopicProducer.sendReadyForCreateAdjustments(disputes);
-        callbackNotifier.sendDisputeReadyForCreateAdjustment(disputes);
+        callbackNotifier.sendDisputesReadyForCreateAdjustment(disputes);
         log.info("ReadyForCreateAdjustments were processed");
     }
 }

src/main/java/dev/vality/disputes/schedule/TaskCreateAdjustmentsService.java → src/main/java/dev/vality/disputes/schedule/AdjustmentsTask.java

@@ -1,8 +1,8 @@
 package dev.vality.disputes.schedule;
 
 import dev.vality.disputes.domain.tables.pojos.Dispute;
-import dev.vality.disputes.schedule.handler.CreateAdjustmentHandler;
-import dev.vality.disputes.schedule.service.CreateAdjustmentsService;
+import dev.vality.disputes.schedule.core.AdjustmentsService;
+import dev.vality.disputes.schedule.handler.AdjustmentHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -20,18 +20,18 @@
 @Service
 @RequiredArgsConstructor
 @SuppressWarnings({"ParameterName", "LineLength", "MissingSwitchDefault"})
-public class TaskCreateAdjustmentsService {
+public class AdjustmentsTask {
 
     private final ExecutorService disputesThreadPool;
-    private final CreateAdjustmentsService createAdjustmentsService;
+    private final AdjustmentsService adjustmentsService;
     @Value("${dispute.batchSize}")
     private int batchSize;
 
     @Scheduled(fixedDelayString = "${dispute.fixedDelayCreateAdjustments}", initialDelayString = "${dispute.initialDelayCreateAdjustments}")
     public void processPending() {
         log.debug("Processing create adjustments get started");
         try {
-            var disputes = createAdjustmentsService.getDisputesForHgCall(batchSize);
+            var disputes = adjustmentsService.getDisputesForHgCall(batchSize);
             var callables = disputes.stream()
                     .map(this::handleCreateAdjustment)
                     .collect(Collectors.toList());
@@ -46,6 +46,6 @@ public void processPending() {
     }
 
     private Callable<UUID> handleCreateAdjustment(Dispute dispute) {
-        return () -> new CreateAdjustmentHandler(createAdjustmentsService).handle(dispute);
+        return () -> new AdjustmentHandler(adjustmentsService).handle(dispute);
     }
 }

src/main/java/dev/vality/disputes/schedule/TaskCreatedDisputesService.java → src/main/java/dev/vality/disputes/schedule/CreatedDisputesTask.java

@@ -1,8 +1,8 @@
 package dev.vality.disputes.schedule;
 
 import dev.vality.disputes.domain.tables.pojos.Dispute;
+import dev.vality.disputes.schedule.core.CreatedDisputesService;
 import dev.vality.disputes.schedule.handler.CreatedDisputeHandler;
-import dev.vality.disputes.schedule.service.CreatedDisputesService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,7 +19,7 @@
 @ConditionalOnProperty(value = "dispute.isScheduleCreatedEnabled", havingValue = "true")
 @Service
 @RequiredArgsConstructor
-public class TaskCreatedDisputesService {
+public class CreatedDisputesTask {
 
     private final ExecutorService disputesThreadPool;
     private final CreatedDisputesService createdDisputesService;

src/main/java/dev/vality/disputes/schedule/TaskPendingDisputesService.java → src/main/java/dev/vality/disputes/schedule/PendingDisputesTask.java

@@ -1,8 +1,8 @@
 package dev.vality.disputes.schedule;
 
 import dev.vality.disputes.domain.tables.pojos.Dispute;
+import dev.vality.disputes.schedule.core.PendingDisputesService;
 import dev.vality.disputes.schedule.handler.PendingDisputeHandler;
-import dev.vality.disputes.schedule.service.PendingDisputesService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,7 +19,7 @@
 @ConditionalOnProperty(value = "dispute.isSchedulePendingEnabled", havingValue = "true")
 @Service
 @RequiredArgsConstructor
-public class TaskPendingDisputesService {
+public class PendingDisputesTask {
 
     private final ExecutorService disputesThreadPool;
     private final PendingDisputesService pendingDisputesService;

src/main/java/dev/vality/disputes/schedule/converter/InvoicePaymentAdjustmentParamsConverter.java → src/main/java/dev/vality/disputes/schedule/converter/InvoicePaymentCapturedAdjustmentParamsConverter.java

@@ -1,39 +1,31 @@
 package dev.vality.disputes.schedule.converter;
 
-import dev.vality.damsel.domain.*;
+import dev.vality.damsel.domain.InvoicePaymentAdjustmentStatusChange;
+import dev.vality.damsel.domain.InvoicePaymentCaptured;
+import dev.vality.damsel.domain.InvoicePaymentStatus;
 import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentParams;
 import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentScenario;
 import dev.vality.disputes.domain.tables.pojos.Dispute;
+import dev.vality.disputes.schedule.service.AdjustmentExtractor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
-import java.util.Optional;
-
 @Component
-public class InvoicePaymentAdjustmentParamsConverter {
+@RequiredArgsConstructor
+public class InvoicePaymentCapturedAdjustmentParamsConverter {
 
-    public static final String DISPUTE_MASK = "disputeId=%s";
+    private final AdjustmentExtractor adjustmentExtractor;
 
     public InvoicePaymentAdjustmentParams convert(Dispute dispute) {
         var captured = new InvoicePaymentCaptured();
-        var reason = getReason(dispute);
+        var reason = adjustmentExtractor.getReason(dispute);
         captured.setReason(reason);
-        var changedAmount = dispute.getChangedAmount();
-        if (changedAmount != null) {
-            var cost = new Cash(changedAmount, new CurrencyRef(dispute.getCurrencySymbolicCode()));
-            captured.setCost(cost);
-        }
         var params = new InvoicePaymentAdjustmentParams();
         params.setReason(reason);
         params.setScenario(getInvoicePaymentAdjustmentScenario(captured));
         return params;
     }
 
-    public String getReason(Dispute dispute) {
-        return Optional.ofNullable(dispute.getReason())
-                .map(s -> String.format(DISPUTE_MASK + ", reason=%s", dispute.getId(), s))
-                .orElse(String.format(DISPUTE_MASK, dispute.getId()));
-    }
-
     private InvoicePaymentAdjustmentScenario getInvoicePaymentAdjustmentScenario(InvoicePaymentCaptured captured) {
         return InvoicePaymentAdjustmentScenario.status_change(new InvoicePaymentAdjustmentStatusChange(
                 InvoicePaymentStatus.captured(captured)));

src/main/java/dev/vality/disputes/schedule/converter/InvoicePaymentCashFlowAdjustmentParamsConverter.java

@@ -0,0 +1,32 @@
+package dev.vality.disputes.schedule.converter;
+
+import dev.vality.damsel.domain.InvoicePaymentAdjustmentCashFlow;
+import dev.vality.damsel.domain.InvoicePaymentCaptured;
+import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentParams;
+import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentScenario;
+import dev.vality.disputes.domain.tables.pojos.Dispute;
+import dev.vality.disputes.schedule.service.AdjustmentExtractor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class InvoicePaymentCashFlowAdjustmentParamsConverter {
+
+    private final AdjustmentExtractor adjustmentExtractor;
+
+    public InvoicePaymentAdjustmentParams convert(Dispute dispute) {
+        var captured = new InvoicePaymentCaptured();
+        var reason = adjustmentExtractor.getReason(dispute);
+        captured.setReason(reason);
+        var params = new InvoicePaymentAdjustmentParams();
+        params.setReason(reason);
+        params.setScenario(getInvoicePaymentAdjustmentScenario(dispute.getChangedAmount()));
+        return params;
+    }
+
+    private InvoicePaymentAdjustmentScenario getInvoicePaymentAdjustmentScenario(Long changedAmount) {
+        return InvoicePaymentAdjustmentScenario.cash_flow(new InvoicePaymentAdjustmentCashFlow()
+                .setNewAmount(changedAmount));
+    }
+}

src/main/java/dev/vality/disputes/schedule/converter/InvoicePaymentFailedAdjustmentParamsConverter.java

@@ -0,0 +1,32 @@
+package dev.vality.disputes.schedule.converter;
+
+import dev.vality.damsel.domain.*;
+import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentParams;
+import dev.vality.damsel.payment_processing.InvoicePaymentAdjustmentScenario;
+import dev.vality.disputes.domain.tables.pojos.Dispute;
+import dev.vality.disputes.schedule.service.AdjustmentExtractor;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class InvoicePaymentFailedAdjustmentParamsConverter {
+
+    private final AdjustmentExtractor adjustmentExtractor;
+
+    public InvoicePaymentAdjustmentParams convert(Dispute dispute) {
+        var invoicePaymentFailed = new InvoicePaymentFailed();
+        var reason = adjustmentExtractor.getReason(dispute);
+        invoicePaymentFailed.setFailure(OperationFailure.failure(
+                new Failure("failed_by_disputes_api").setReason(reason)));
+        var params = new InvoicePaymentAdjustmentParams();
+        params.setReason(reason);
+        params.setScenario(getInvoicePaymentAdjustmentScenario(invoicePaymentFailed));
+        return params;
+    }
+
+    private InvoicePaymentAdjustmentScenario getInvoicePaymentAdjustmentScenario(InvoicePaymentFailed failed) {
+        return InvoicePaymentAdjustmentScenario.status_change(new InvoicePaymentAdjustmentStatusChange(
+                InvoicePaymentStatus.failed(failed)));
+    }
+}