fix: add domain to request bodies and fix whereWithKeys format

HansOspina · HansOspina · commit 16b9eb037105 · 2026-01-26T14:23:08.000-05:00
- Add domain as string to find/create/update/delete requests
- Fix whereWithKeys to use where: {keys: [...]} format
- Add WhereClause sealed interface for type-safe where clauses
- Change create endpoint from /row/insert to /row
- Add integration tests with InventoryHistory model
- Update .gitignore to exclude CLAUDE.md and sensitive files
diff --git a/.gitignore b/.gitignore
@@ -95,6 +95,7 @@ replay_pid*
 
 # Claude Code
 .claude/
+CLAUDE.md
 
 # JetBrains
 cmake-build-*/
@@ -115,4 +116,3 @@ cmake-build-*/
 .idea/**/gradle.xml
 .idea/**/libraries
 .idea/**/mongoSettings.xml
-*.iws
diff --git a/src/main/java/com/sbxcloud/sbx/client/SBXService.java b/src/main/java/com/sbxcloud/sbx/client/SBXService.java
@@ -65,14 +65,15 @@ public <T> SBXFindResponse<T> find(FindQuery query, Class<T> type) {
      * Finds records matching the query.
      */
     public <T> SBXFindResponse<T> find(SBXFindRequest request, Class<T> type) {
+        var requestWithDomain = request.withDomain(domain);
         if (debug) {
-            log.info("SBX find: {}", request);
+            log.info("SBX find: {}", requestWithDomain);
         }
 
         try {
             var response = restClient.post()
                     .uri("/api/data/v1/row/find")
-                    .body(request)
+                    .body(requestWithDomain)
                     .retrieve()
                     .body(new ParameterizedTypeReference<Map<String, Object>>() {});
 
@@ -141,7 +142,7 @@ public <T> SBXFindResponse<T> findAll(FindQuery query, Class<T> type) {
      * Creates new records.
      */
     public <T> SBXResponse<T> create(String model, List<Map<String, Object>> rows) {
-        return upsert("/api/data/v1/row/insert", model, rows, true);
+        return upsert("/api/data/v1/row", model, rows, true);
     }
 
     /**
@@ -175,7 +176,7 @@ public SBXResponse<Void> delete(String model, List<String> keys) {
 
         try {
             for (List<String> chunk : partition(keys, DEFAULT_CHUNK_SIZE)) {
-                var request = SBXDeleteRequest.of(model, chunk);
+                var request = SBXDeleteRequest.of(model, domain, chunk);
                 var response = restClient.post()
                         .uri("/api/data/v1/row/delete")
                         .body(request)
@@ -698,7 +699,7 @@ private <T> SBXResponse<T> upsert(String endpoint, String model, List<Map<String
             List<String> allKeys = new ArrayList<>();
 
             for (List<Map<String, Object>> chunk : partition(cleanedRows, DEFAULT_CHUNK_SIZE)) {
-                var request = SBXUpsertRequest.of(model, chunk);
+                var request = SBXUpsertRequest.of(model, domain, chunk);
                 var response = restClient.post()
                         .uri(endpoint)
                         .body(request)
diff --git a/src/main/java/com/sbxcloud/sbx/model/SBXDeleteRequest.java b/src/main/java/com/sbxcloud/sbx/model/SBXDeleteRequest.java
@@ -4,20 +4,22 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Request payload for delete operations.
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record SBXDeleteRequest(
         @JsonProperty("row_model") String rowModel,
-        List<String> keys
+        String domain,
+        Map<String, List<String>> where
 ) {
-    public static SBXDeleteRequest of(String model, List<String> keys) {
-        return new SBXDeleteRequest(model, keys);
+    public static SBXDeleteRequest of(String model, int domain, List<String> keys) {
+        return new SBXDeleteRequest(model, String.valueOf(domain), Map.of("keys", keys));
     }
 
-    public static SBXDeleteRequest ofSingle(String model, String key) {
-        return new SBXDeleteRequest(model, List.of(key));
+    public static SBXDeleteRequest ofSingle(String model, int domain, String key) {
+        return of(model, domain, List.of(key));
     }
 }
diff --git a/src/main/java/com/sbxcloud/sbx/model/SBXFindRequest.java b/src/main/java/com/sbxcloud/sbx/model/SBXFindRequest.java
@@ -11,33 +11,45 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record SBXFindRequest(
         @JsonProperty("row_model") String rowModel,
-        List<LogicalGroup> where,
+        String domain,
+        WhereClause where,
         Integer page,
         Integer size,
         @JsonProperty("fetch") List<String> fetchModels,
         @JsonProperty("rfetch") List<String> fetchReferencingModels,
-        @JsonProperty("autowire") List<String> autowire,
-        List<String> keys
+        @JsonProperty("autowire") List<String> autowire
 ) {
     public static Builder builder(String model) {
         return new Builder(model);
     }
 
+    /**
+     * Returns a copy of this request with the given domain.
+     */
+    public SBXFindRequest withDomain(int domain) {
+        return new SBXFindRequest(rowModel, String.valueOf(domain), where, page, size, fetchModels, fetchReferencingModels, autowire);
+    }
+
     public static class Builder {
         private final String rowModel;
-        private List<LogicalGroup> where;
+        private String domain;
+        private WhereClause where;
         private Integer page;
         private Integer size;
         private List<String> fetchModels;
         private List<String> fetchReferencingModels;
         private List<String> autowire;
-        private List<String> keys;
 
         private Builder(String rowModel) {
             this.rowModel = rowModel;
         }
 
-        public Builder where(List<LogicalGroup> where) {
+        public Builder domain(int domain) {
+            this.domain = String.valueOf(domain);
+            return this;
+        }
+
+        public Builder where(WhereClause where) {
             this.where = where;
             return this;
         }
@@ -67,13 +79,8 @@ public Builder autowire(List<String> autowire) {
             return this;
         }
 
-        public Builder keys(List<String> keys) {
-            this.keys = keys;
-            return this;
-        }
-
         public SBXFindRequest build() {
-            return new SBXFindRequest(rowModel, where, page, size, fetchModels, fetchReferencingModels, autowire, keys);
+            return new SBXFindRequest(rowModel, domain, where, page, size, fetchModels, fetchReferencingModels, autowire);
         }
     }
 }
diff --git a/src/main/java/com/sbxcloud/sbx/model/SBXProperty.java b/src/main/java/com/sbxcloud/sbx/model/SBXProperty.java
@@ -1,16 +1,19 @@
 package com.sbxcloud.sbx.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * Model field/property definition.
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public record SBXProperty(
         Integer id,
         String name,
         FieldType type,
-        @JsonProperty("reference_model") String referenceModel,
+        @JsonProperty("reference_model") Object referenceModel,
         @JsonProperty("reference_model_id") Integer referenceModelId,
+        @JsonProperty("reference_type_name") String referenceTypeName,
         @JsonProperty("default_value") String defaultValue,
         Boolean required
 ) {
diff --git a/src/main/java/com/sbxcloud/sbx/model/SBXUpsertRequest.java b/src/main/java/com/sbxcloud/sbx/model/SBXUpsertRequest.java
@@ -12,13 +12,14 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record SBXUpsertRequest(
         @JsonProperty("row_model") String rowModel,
+        String domain,
         List<Map<String, Object>> rows
 ) {
-    public static SBXUpsertRequest of(String model, List<Map<String, Object>> rows) {
-        return new SBXUpsertRequest(model, rows);
+    public static SBXUpsertRequest of(String model, int domain, List<Map<String, Object>> rows) {
+        return new SBXUpsertRequest(model, String.valueOf(domain), rows);
     }
 
-    public static SBXUpsertRequest ofSingle(String model, Map<String, Object> row) {
-        return new SBXUpsertRequest(model, List.of(row));
+    public static SBXUpsertRequest ofSingle(String model, int domain, Map<String, Object> row) {
+        return of(model, domain, List.of(row));
     }
 }
diff --git a/src/main/java/com/sbxcloud/sbx/model/WhereClause.java b/src/main/java/com/sbxcloud/sbx/model/WhereClause.java
@@ -0,0 +1,49 @@
+package com.sbxcloud.sbx.model;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents the "where" clause in SBX queries.
+ * Can be either condition-based (list of groups) or key-based.
+ */
+@JsonSerialize(using = WhereClause.Serializer.class)
+public sealed interface WhereClause permits WhereClause.Conditions, WhereClause.Keys {
+
+    /**
+     * Condition-based where clause (list of logical groups).
+     */
+    record Conditions(List<LogicalGroup> groups) implements WhereClause {}
+
+    /**
+     * Key-based where clause for finding by primary keys.
+     */
+    record Keys(List<String> keys) implements WhereClause {}
+
+    static WhereClause conditions(List<LogicalGroup> groups) {
+        return new Conditions(groups);
+    }
+
+    static WhereClause keys(List<String> keys) {
+        return new Keys(keys);
+    }
+
+    /**
+     * Custom serializer to output the correct JSON format.
+     */
+    class Serializer extends JsonSerializer<WhereClause> {
+        @Override
+        public void serialize(WhereClause value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+            switch (value) {
+                case Conditions c -> gen.writeObject(c.groups());
+                case Keys k -> gen.writeObject(Map.of("keys", k.keys()));
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/sbxcloud/sbx/query/FindQuery.java b/src/main/java/com/sbxcloud/sbx/query/FindQuery.java
@@ -426,15 +426,24 @@ public FindQuery setPageSize(int pageSize) {
      * Compiles the query into a request payload.
      */
     public SBXFindRequest compile() {
+        WhereClause whereClause;
+        if (keys != null && !keys.isEmpty()) {
+            whereClause = WhereClause.keys(keys);
+        } else if (!groups.isEmpty()) {
+            whereClause = WhereClause.conditions(groups);
+        } else {
+            whereClause = null;
+        }
+
         return new SBXFindRequest(
                 model,
-                groups.isEmpty() ? null : groups,
+                null, // domain is added by SBXService
+                whereClause,
                 page,
                 pageSize,
                 fetchModels,
                 fetchReferencingModels,
-                autowire,
-                keys
+                autowire
         );
     }
 
diff --git a/src/test/java/com/sbxcloud/sbx/FindQueryTest.java b/src/test/java/com/sbxcloud/sbx/FindQueryTest.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sbxcloud.sbx.model.AndOr;
 import com.sbxcloud.sbx.model.Operation;
+import com.sbxcloud.sbx.model.WhereClause;
 import com.sbxcloud.sbx.query.FindQuery;
 import org.junit.jupiter.api.Test;
 
@@ -22,11 +23,14 @@ void shouldBuildSimpleQuery() {
 
         assertEquals("contact", query.rowModel());
         assertNotNull(query.where());
-        assertEquals(1, query.where().size());
-        assertEquals(AndOr.AND, query.where().get(0).andOr());
-        assertEquals(1, query.where().get(0).group().size());
+        assertInstanceOf(WhereClause.Conditions.class, query.where());
 
-        var expr = query.where().get(0).group().get(0);
+        var conditions = (WhereClause.Conditions) query.where();
+        assertEquals(1, conditions.groups().size());
+        assertEquals(AndOr.AND, conditions.groups().get(0).andOr());
+        assertEquals(1, conditions.groups().get(0).group().size());
+
+        var expr = conditions.groups().get(0).group().get(0);
         assertEquals("status", expr.field());
         assertEquals(Operation.EQUAL, expr.operation());
         assertEquals("ACTIVE", expr.value());
@@ -44,15 +48,16 @@ void shouldBuildQueryWithMultipleConditions() {
                 .compile();
 
         assertEquals("contact", query.rowModel());
-        assertEquals(2, query.where().size());
+        var conditions = (WhereClause.Conditions) query.where();
+        assertEquals(2, conditions.groups().size());
 
         // First group: AND
-        assertEquals(AndOr.AND, query.where().get(0).andOr());
-        assertEquals(2, query.where().get(0).group().size());
+        assertEquals(AndOr.AND, conditions.groups().get(0).andOr());
+        assertEquals(2, conditions.groups().get(0).group().size());
 
         // Second group: OR
-        assertEquals(AndOr.OR, query.where().get(1).andOr());
-        assertEquals(2, query.where().get(1).group().size());
+        assertEquals(AndOr.OR, conditions.groups().get(1).andOr());
+        assertEquals(2, conditions.groups().get(1).group().size());
     }
 
     @Test
@@ -86,7 +91,11 @@ void shouldBuildQueryWithKeys() {
                 .whereWithKeys("key1", "key2", "key3")
                 .compile();
 
-        assertEquals(List.of("key1", "key2", "key3"), query.keys());
+        assertNotNull(query.where());
+        assertInstanceOf(WhereClause.Keys.class, query.where());
+
+        var keysClause = (WhereClause.Keys) query.where();
+        assertEquals(List.of("key1", "key2", "key3"), keysClause.keys());
     }
 
     @Test
@@ -95,7 +104,8 @@ void shouldBuildQueryWithInOperator() {
                 .andWhereIsIn("status", "ACTIVE", "PENDING")
                 .compile();
 
-        var expr = query.where().get(0).group().get(0);
+        var conditions = (WhereClause.Conditions) query.where();
+        var expr = conditions.groups().get(0).group().get(0);
         assertEquals(Operation.IN, expr.operation());
         assertEquals(List.of("ACTIVE", "PENDING"), expr.value());
     }
@@ -107,13 +117,14 @@ void shouldBuildQueryWithNullChecks() {
                 .andWhereIsNotNull("email")
                 .compile();
 
-        assertEquals(2, query.where().get(0).group().size());
+        var conditions = (WhereClause.Conditions) query.where();
+        assertEquals(2, conditions.groups().get(0).group().size());
 
-        var nullExpr = query.where().get(0).group().get(0);
+        var nullExpr = conditions.groups().get(0).group().get(0);
         assertEquals(Operation.IS, nullExpr.operation());
         assertNull(nullExpr.value());
 
-        var notNullExpr = query.where().get(0).group().get(1);
+        var notNullExpr = conditions.groups().get(0).group().get(1);
         assertEquals(Operation.IS_NOT, notNullExpr.operation());
         assertNull(notNullExpr.value());
     }
@@ -126,7 +137,8 @@ void shouldBuildQueryWithLikeOperations() {
                 .andWhereContains("address", "Street")
                 .compile();
 
-        var group = query.where().get(0).group();
+        var conditions = (WhereClause.Conditions) query.where();
+        var group = conditions.groups().get(0).group();
 
         assertEquals("John%", group.get(0).value());
         assertEquals("%@example.com", group.get(1).value());
@@ -139,7 +151,8 @@ void shouldEscapePercentInContains() {
                 .andWhereContains("name", "100%")
                 .compile();
 
-        var expr = query.where().get(0).group().get(0);
+        var conditions = (WhereClause.Conditions) query.where();
+        var expr = conditions.groups().get(0).group().get(0);
         assertEquals("%100%", expr.value());
     }
 }
diff --git a/src/test/java/com/sbxcloud/sbx/SBXIntegrationTest.java b/src/test/java/com/sbxcloud/sbx/SBXIntegrationTest.java
diff --git a/src/test/java/com/sbxcloud/sbx/model/InventoryHistory.java b/src/test/java/com/sbxcloud/sbx/model/InventoryHistory.java

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,14 @@`
`12`	`12`	`@JsonInclude(JsonInclude.Include.NON_NULL)`
`13`	`13`	`public record SBXUpsertRequest(`
`14`	`14`	`@JsonProperty("row_model") String rowModel,`
	`15`	`+ String domain,`
`15`	`16`	`List<Map<String, Object>> rows`
`16`	`17`	`) {`
`17`		`- public static SBXUpsertRequest of(String model, List<Map<String, Object>> rows) {`
`18`		`- return new SBXUpsertRequest(model, rows);`
	`18`	`+ public static SBXUpsertRequest of(String model, int domain, List<Map<String, Object>> rows) {`
	`19`	`+ return new SBXUpsertRequest(model, String.valueOf(domain), rows);`
`19`	`20`	`}`
`20`	`21`
`21`		`- public static SBXUpsertRequest ofSingle(String model, Map<String, Object> row) {`
`22`		`- return new SBXUpsertRequest(model, List.of(row));`
	`22`	`+ public static SBXUpsertRequest ofSingle(String model, int domain, Map<String, Object> row) {`
	`23`	`+ return of(model, domain, List.of(row));`
`23`	`24`	`}`
`24`	`25`	`}`