From 84f94c0809be487fe803974ab930dabdf2b9d2ad Mon Sep 17 00:00:00 2001
From: Gering112 <45523369+Gering112@users.noreply.github.com>
Date: Fri, 5 Sep 2025 13:55:26 -0400
Subject: [PATCH] Added conditional validation for certain fields

---
 .../src/main/java/com/riskified/models/BaseOrder.java  |  9 +++++++--
 .../src/main/java/com/riskified/models/Customer.java   | 10 ++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/riskified-sdk/src/main/java/com/riskified/models/BaseOrder.java b/riskified-sdk/src/main/java/com/riskified/models/BaseOrder.java
index 7e61eca..04436b3 100644
--- a/riskified-sdk/src/main/java/com/riskified/models/BaseOrder.java
+++ b/riskified-sdk/src/main/java/com/riskified/models/BaseOrder.java
@@ -83,10 +83,15 @@ public void validate(Validation validationType) throws FieldBadFormatException {
             Validate.notNull(this, this.createdAt, "Created At");
             Validate.notNull(this, this.updatedAt, "Updated At");
             Validate.notNullOrEmpty(this, this.gateway, "Gateway");
-            Validate.notNullOrEmpty(this, this.browserIp, "Browser IP");
+            if (this.source != null && !this.source.equalsIgnoreCase("phone")){
+                Validate.notNullOrEmpty(this, this.browserIp, "Browser IP");
+            }
+
             Validate.notNull(this, this.totalPrice, "Total Price");
             Validate.notNull(this, this.lineItems, "Line Items");
-            Validate.notNull(this, this.paymentDetails, "Payment Details");
+            if (this.gateway != null && !this.gateway.equalsIgnoreCase("giftcard")){
+                Validate.notNull(this, this.paymentDetails, "Payment Details");
+            }
             Validate.notNull(this, this.customer, "Customer");
             Validate.notNull(this, this.billingAddress, "Billing Address");
         }
diff --git a/riskified-sdk/src/main/java/com/riskified/models/Customer.java b/riskified-sdk/src/main/java/com/riskified/models/Customer.java
index e9d059f..30fbc17 100644
--- a/riskified-sdk/src/main/java/com/riskified/models/Customer.java
+++ b/riskified-sdk/src/main/java/com/riskified/models/Customer.java
@@ -62,12 +62,14 @@ public Customer(String email, String firstName, String lastName, String id, Date
     public void validate(Validation validationType) throws FieldBadFormatException {
 
         if (validationType == Validation.ALL) {
-            Validate.notNullOrEmpty(this, this.email, "Email");
             Validate.notNullOrEmpty(this, this.firstName, "First Name");
             Validate.notNullOrEmpty(this, this.lastName, "Last Name");
-            Validate.notNullOrEmpty(this, this.id, "Id");
-            Validate.notNull(this, this.createdAt, "Created At");
-            Validate.notNull(this, this.verifiedEmail, "Verified Email");
+            if (this.accountType != null && !this.accountType.equalsIgnoreCase("guest")){
+                Validate.notNullOrEmpty(this, this.email, "Email");
+                Validate.notNullOrEmpty(this, this.id, "Id");
+                Validate.notNull(this, this.createdAt, "Created At");
+                Validate.notNull(this, this.verifiedEmail, "Verified Email");
+            }
         }
 
         if (this.email != null) {