Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(dynamodb): apply filter expressions in Query (#123)

paseri37398b6f4fa4f51b
diff --git a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java
index 62588c1e2b..41c8a0c5dd 100644
--- a/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbService.java
@@ -486,16 +486,25 @@ public class DynamoDbService {
}
}
- int scannedCount = results.size();
+ List<JsonNode> evaluatedItems = results;
JsonNode lastEvaluatedKey = null;
- if (limit != null && limit > 0 && results.size() > limit) {
- JsonNode lastItem = results.get(limit - 1);
+ if (limit != null && limit > 0 && evaluatedItems.size() > limit) {
+ JsonNode lastItem = evaluatedItems.get(limit - 1);
lastEvaluatedKey = buildKeyNode(table, lastItem, pkName, skName);
- results = results.subList(0, limit);
+ evaluatedItems = new ArrayList<>(evaluatedItems.subList(0, limit));
+ }
+
+ int scannedCount = evaluatedItems.size();
+
+ if (filterExpression != null) {
+ evaluatedItems = evaluatedItems.stream()
+ .filter(item -> matchesFilterExpression(item, filterExpression,
+ exprAttrNames, expressionAttrValues))
+ .toList();
}
- return new QueryResult(results, scannedCount, lastEvaluatedKey);
+ return new QueryResult(evaluatedItems, scannedCount, lastEvaluatedKey);
}
public ScanResult scan(String tableName, String filterExpression,
diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java
index 56f71f1242..11d8fa7f37 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbIntegrationTest.java
@@ -251,6 +251,61 @@ class DynamoDbIntegrationTest {
@Test
@Order(11)
+ void queryWithFilterExpression() {
+ given()
+ .header("X-Amz-Target", "DynamoDB_20120810.Query")
+ .contentType(DYNAMODB_CONTENT_TYPE)
+ .body("""
+ {
+ "TableName": "TestTable",
+ "KeyConditionExpression": "pk = :pk",
+ "FilterExpression": "total >= :min",
+ "ExpressionAttributeValues": {
+ ":pk": {"S": "user-1"},
+ ":min": {"N": "50"}
+ }
+ }
+ """)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("Count", equalTo(1))
+ .body("ScannedCount", equalTo(3))
+ .body("Items[0].sk.S", equalTo("order-001"));
+ }
+
+ @Test
+ @Order(12)
+ void queryWithFilterExpressionAndLimitReturnsLastEvaluatedKey() {
+ given()
+ .header("X-Amz-Target", "DynamoDB_20120810.Query")
+ .contentType(DYNAMODB_CONTENT_TYPE)
+ .body("""
+ {
+ "TableName": "TestTable",
+ "KeyConditionExpression": "pk = :pk",
+ "FilterExpression": "total >= :min",
+ "Limit": 2,
+ "ExpressionAttributeValues": {
+ ":pk": {"S": "user-1"},
+ ":min": {"N": "50"}
+ }
+ }
+ """)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("Count", equalTo(1))
+ .body("ScannedCount", equalTo(2))
+ .body("Items[0].sk.S", equalTo("order-001"))
+ .body("LastEvaluatedKey.pk.S", equalTo("user-1"))
+ .body("LastEvaluatedKey.sk.S", equalTo("order-002"));
+ }
+
+ @Test
+ @Order(13)
void scan() {
given()
.header("X-Amz-Target", "DynamoDB_20120810.Scan")
@@ -267,7 +322,7 @@ class DynamoDbIntegrationTest {
}
@Test
- @Order(12)
+ @Order(14)
void deleteItem() {
given()
.header("X-Amz-Target", "DynamoDB_20120810.DeleteItem")
@@ -307,7 +362,7 @@ class DynamoDbIntegrationTest {
}
@Test
- @Order(13)
+ @Order(15)
void deleteTable() {
given()
.header("X-Amz-Target", "DynamoDB_20120810.DeleteTable")
diff --git a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java
index 7f8e7da422..efd103a7a4 100644
--- a/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/dynamodb/DynamoDbServiceTest.java
@@ -44,12 +44,16 @@ class DynamoDbServiceTest {
5L, 5L);
}
+ private ObjectNode attributeValue(String type, String value) {
+ ObjectNode attrValue = mapper.createObjectNode();
+ attrValue.put(type, value);
+ return attrValue;
+ }
+
private ObjectNode item(String... kvPairs) {
ObjectNode node = mapper.createObjectNode();
for (int i = 0; i < kvPairs.length; i += 2) {
- ObjectNode attrValue = mapper.createObjectNode();
- attrValue.put("S", kvPairs[i + 1]);
- node.set(kvPairs[i], attrValue);
+ node.set(kvPairs[i], attributeValue("S", kvPairs[i + 1]));
}
return node;
}
@@ -216,6 +220,75 @@ class DynamoDbServiceTest {
assertEquals(2, results.items().size());
}
+ @Test
+ void queryAppliesFilterExpressionAfterKeyCondition() {
+ createOrdersTable();
+
+ ObjectNode first = item("customerId", "c1", "orderId", "o1");
+ first.set("total", attributeValue("N", "100"));
+ service.putItem("Orders", first);
+
+ ObjectNode second = item("customerId", "c1", "orderId", "o2");
+ second.set("total", attributeValue("N", "100"));
+ service.putItem("Orders", second);
+
+ ObjectNode third = item("customerId", "c1", "orderId", "o3");
+ third.set("total", attributeValue("N", "99"));
+ service.putItem("Orders", third);
+
+ ObjectNode exprValues = mapper.createObjectNode();
+ exprValues.set(":pk", attributeValue("S", "c1"));
+ exprValues.set(":min", attributeValue("N", "100"));
+
+ DynamoDbService.QueryResult results = service.query("Orders", null, exprValues,
+ "customerId = :pk", "total >= :min", null);
+
+ assertEquals(2, results.items().size());
+ assertEquals(3, results.scannedCount());
+ assertEquals(List.of("o1", "o2"), results.items().stream()
+ .map(result -> result.get("orderId").get("S").asText())
+ .toList());
+ }
+
+ @Test
+ void queryWithFilterExpressionAndLimitUsesPreFilterPageState() {
+ createOrdersTable();
+
+ ObjectNode first = item("customerId", "c1", "orderId", "o1");
+ first.set("total", attributeValue("N", "100"));
+ service.putItem("Orders", first);
+
+ ObjectNode second = item("customerId", "c1", "orderId", "o2");
+ second.set("total", attributeValue("N", "99"));
+ service.putItem("Orders", second);
+
+ ObjectNode third = item("customerId", "c1", "orderId", "o3");
+ third.set("total", attributeValue("N", "100"));
+ service.putItem("Orders", third);
+
+ ObjectNode exprValues = mapper.createObjectNode();
+ exprValues.set(":pk", attributeValue("S", "c1"));
+ exprValues.set(":min", attributeValue("N", "100"));
+
+ DynamoDbService.QueryResult firstPage = service.query("Orders", null, exprValues,
+ "customerId = :pk", "total >= :min", 2, null, null, null, "us-east-1");
+
+ assertEquals(1, firstPage.items().size());
+ assertEquals("o1", firstPage.items().get(0).get("orderId").get("S").asText());
+ assertEquals(2, firstPage.scannedCount());
+ assertNotNull(firstPage.lastEvaluatedKey());
+ assertEquals("o2", firstPage.lastEvaluatedKey().get("orderId").get("S").asText());
+
+ DynamoDbService.QueryResult secondPage = service.query("Orders", null, exprValues,
+ "customerId = :pk", "total >= :min", 2, null,
+ firstPage.lastEvaluatedKey(), null, "us-east-1");
+
+ assertEquals(1, secondPage.items().size());
+ assertEquals("o3", secondPage.items().get(0).get("orderId").get("S").asText());
+ assertEquals(1, secondPage.scannedCount());
+ assertNull(secondPage.lastEvaluatedKey());
+ }
+
@Test
void scan() {
createUsersTable();