From de17c512930336974ed24c26314b1630307a50ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= <kuba--@users.noreply.github.com>
Date: Tue, 16 Feb 2021 16:50:00 +0100
Subject: [PATCH] Avoid precondition failed (412) on ingest

---
 handler.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/handler.go b/handler.go
index 67695fabb..bbb1daa60 100644
--- a/handler.go
+++ b/handler.go
@@ -189,10 +189,10 @@ func (ivr *ImportValueRequest) ValidateWithTimestamp(indexCreatedAt, fieldCreate
 	if valueSetCount > 1 {
 		return errors.Errorf("must pass ints, floats, or strings but not multiple")
 	}
-	if ivr.IndexCreatedAt != 0 && ivr.FieldCreatedAt != 0 {
-		if ivr.IndexCreatedAt != indexCreatedAt || ivr.FieldCreatedAt != fieldCreatedAt {
-			return ErrPreconditionFailed
-		}
+
+	if (ivr.IndexCreatedAt != 0 && ivr.IndexCreatedAt != indexCreatedAt) ||
+		(ivr.FieldCreatedAt != 0 && ivr.FieldCreatedAt != fieldCreatedAt) {
+		return ErrPreconditionFailed
 	}
 	return nil
 }
@@ -253,10 +253,9 @@ type ImportRoaringRequest struct {
 
 // ValidateWithTimestamp ensures that the payload of the request is valid.
 func (irr *ImportRoaringRequest) ValidateWithTimestamp(indexCreatedAt, fieldCreatedAt int64) error {
-	if irr.IndexCreatedAt != 0 && irr.FieldCreatedAt != 0 {
-		if irr.IndexCreatedAt != indexCreatedAt || irr.FieldCreatedAt != fieldCreatedAt {
-			return ErrPreconditionFailed
-		}
+	if (irr.IndexCreatedAt != 0 && irr.IndexCreatedAt != indexCreatedAt) ||
+		(irr.FieldCreatedAt != 0 && irr.FieldCreatedAt != fieldCreatedAt) {
+		return ErrPreconditionFailed
 	}
 	return nil
 }