added IndexName support to queryBeginsWith() method

formkiq · Jul 31, 2023 · 5a590bc · 5a590bc
1 parent 1f88cd5
commit 5a590bc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbServiceImpl.java b/aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbServiceImpl.java
@@ -185,10 +185,11 @@ public QueryResponse queryBeginsWith(final QueryConfig config, final AttributeVa
 
     Map<String, AttributeValue> values = Map.of(":pk", pk, ":sk", sk);
 
-    QueryRequest q = QueryRequest.builder().tableName(this.tableName)
-        .keyConditionExpression(expression).expressionAttributeValues(values)
-        .scanIndexForward(Boolean.FALSE).projectionExpression(config.projectionExpression())
-        .exclusiveStartKey(exclusiveStartKey).limit(Integer.valueOf(limit)).build();
+    QueryRequest q =
+        QueryRequest.builder().tableName(this.tableName).keyConditionExpression(expression)
+            .expressionAttributeValues(values).scanIndexForward(Boolean.FALSE)
+            .projectionExpression(config.projectionExpression()).indexName(config.indexName())
+            .exclusiveStartKey(exclusiveStartKey).limit(Integer.valueOf(limit)).build();
 
     QueryResponse response = this.dbClient.query(q);
     return response;

diff --git a/aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/QueryConfig.java b/aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/QueryConfig.java
@@ -34,6 +34,8 @@ public class QueryConfig {
 
   /** {@link Map}. */
   private Map<String, String> expressionAttributeNames;
+  /** Index Name. */
+  private String indexName;
   /** Projection Expression. */
   private String projectionExpression;
 
@@ -64,6 +66,26 @@ public QueryConfig expressionAttributeNames(final Map<String, String> expression
     return this;
   }
 
+  /**
+   * Get Index Name.
+   * 
+   * @return {@link String}
+   */
+  public String indexName() {
+    return this.indexName;
+  }
+
+  /**
+   * Set Index Name.
+   * 
+   * @param index {@link String}
+   * @return {@link QueryConfig}
+   */
+  public QueryConfig indexName(final String index) {
+    this.indexName = index;
+    return this;
+  }
+
   /**
    * Get Projection Expression.
    * 

diff --git a/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/FolderIndexRecord.java b/dynamodb-documents/src/main/java/com/formkiq/stacks/dynamodb/FolderIndexRecord.java
@@ -254,7 +254,7 @@ public FolderIndexRecord path(final String documentPath) {
   @Override
   public String pk(final String siteId) {
     checkParentId();
-    return SiteIdKeyGenerator.createS3Key(siteId,
+    return SiteIdKeyGenerator.createDatabaseKey(siteId,
         GLOBAL_FOLDER_METADATA + TAG_DELIMINATOR + this.parentDocumentId);
   }