Add check for version invoice snapshot (#84)

Author: strug

pom.xml

@@ -62,7 +62,7 @@
         <dependency>
             <groupId>dev.vality</groupId>
             <artifactId>damsel</artifactId>
-            <version>1.674-368f05b</version>
+            <version>1.678-09e4c72</version>
         </dependency>
         <dependency>
             <groupId>dev.vality.geck</groupId>

src/main/java/dev/vality/hooker/service/InvoicingEventService.java

@@ -16,9 +16,11 @@
 import dev.vality.hooker.utils.TimeUtils;
 import dev.vality.swag_webhook_events.model.*;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.thrift.TException;
 import org.springframework.stereotype.Service;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class InvoicingEventService
@@ -51,7 +53,14 @@ public InvoicePaymentAdjustment getAdjustmentByMessage(InvoicingMessage message,
     @Override
     public dev.vality.damsel.payment_processing.Invoice getInvoiceByMessage(InvoicingMessage message) {
         try {
-            return invoicingClient.get(message.getSourceId(), getEventRange(message));
+            dev.vality.damsel.payment_processing.Invoice invoice =
+                    invoicingClient.get(message.getSourceId(), getEventRange(message));
+            if (invoice.getLatestEventId() != message.getSequenceId().intValue()) {
+                log.warn("Event not need version: {} but come: {}", message.getSequenceId(),
+                        invoice.getLatestEventId());
+                throw new RemoteHostException("Event not need version!");
+            }
+            return invoice;
         } catch (InvoiceNotFound e) {
             throw new NotFoundException("Invoice not found, invoiceId=" + message.getSourceId());
         } catch (TException e) {
@@ -157,7 +166,7 @@ private static InvoicePaymentAdjustment findAdjustmentInPayment(InvoicingMessage
         }
         return invoicePayment.getAdjustments().stream()
                 .filter(invoicePaymentAdjustment -> invoicePaymentAdjustment.isSetId()
-                        && invoicePaymentAdjustment.getId().equals(adjustmentId))
+                                                    && invoicePaymentAdjustment.getId().equals(adjustmentId))
                 .findFirst()
                 .orElseThrow(() -> new NotFoundException(
                         String.format("Adjustment not found, invoiceId=%s, paymentId=%s, adjustmentId=%s",

src/test/java/dev/vality/hooker/service/InvoicingEventServiceTest.java

@@ -56,6 +56,7 @@ void setUp() throws Exception {
     void testRefundSucceeded() {
         InvoicingMessage message = random(InvoicingMessage.class, "userInteraction");
         message.setPaymentId("1");
+        message.setSequenceId(1L);
         message.setRefundId("1");
         message.setType(InvoicingMessageEnum.REFUND);
         message.setEventTime("2016-03-22T06:12:27Z");
@@ -75,6 +76,7 @@ void testRefundSucceeded() {
     void testJson() throws JsonProcessingException {
         InvoicingMessage message = random(InvoicingMessage.class, "userInteraction");
         message.setPaymentId("1");
+        message.setSequenceId(1L);
         message.setType(InvoicingMessageEnum.PAYMENT);
         message.setEventTime("2016-03-22T06:12:27Z");
         message.setEventType(EventType.INVOICE_PAYMENT_STATUS_CHANGED);
@@ -127,6 +129,7 @@ private static InvoicingMessage createInvloiceMessage(String adjustmentId) {
         message.setEventTime("2016-03-22T06:12:27Z");
         message.setEventType(EventType.INVOICE_PAYMENT_STATUS_CHANGED);
         message.setPaymentStatus(PaymentStatusEnum.CAPTURED);
+        message.setSequenceId(1L);
         return message;
     }
 
@@ -230,6 +233,7 @@ private static InvoicingMessage createDefaultInvoicingMessage() {
         message.setSequenceId(123L);
         message.setType(InvoicingMessageEnum.PAYMENT);
         message.setEventTime("2016-03-22T06:12:27Z");
+        message.setSequenceId(1L);
         return message;
     }
 }

src/test/java/dev/vality/hooker/utils/BuildUtils.java

@@ -71,6 +71,7 @@ public static dev.vality.damsel.payment_processing.Invoice buildInvoice(String p
             payer.getPaymentResource().getResource()
                     .setPaymentTool(paymentTool);
         }
+        invoice.setLatestEventId(1);
         return invoice;
     }