Added missing properties. Fixed dynamo ops

src/Clients/Goa.Clients.Dynamo/Enums/ReturnValuesOnConditionCheckFailure.cs

@@ -0,0 +1,17 @@
+namespace Goa.Clients.Dynamo.Enums;
+
+/// <summary>
+/// Specifies how to return attribute values when a condition check fails.
+/// </summary>
+public enum ReturnValuesOnConditionCheckFailure
+{
+    /// <summary>
+    /// Nothing is returned. (This is the default.)
+    /// </summary>
+    NONE,
+
+    /// <summary>
+    /// Returns all attributes of the item as they appeared before the operation.
+    /// </summary>
+    ALL_OLD
+}

src/Clients/Goa.Clients.Dynamo/Models/ItemCollectionMetrics.cs

@@ -0,0 +1,18 @@
+namespace Goa.Clients.Dynamo.Models;
+
+/// <summary>
+/// Information about item collections, if any, that were affected by the operation.
+/// </summary>
+public class ItemCollectionMetrics
+{
+    /// <summary>
+    /// The partition key value of the item collection.
+    /// </summary>
+    public Dictionary<string, AttributeValue>? ItemCollectionKey { get; set; }
+
+    /// <summary>
+    /// An estimate of item collection size, in gigabytes. This value is a two-element array
+    /// containing a lower bound and an upper bound for the estimate.
+    /// </summary>
+    public List<double>? SizeEstimateRangeGB { get; set; }
+}

src/Clients/Goa.Clients.Dynamo/Operations/Batch/BatchWriteItemResponse.cs

@@ -23,4 +23,9 @@ public class BatchWriteItemResponse
     /// The write capacity units consumed by the BatchWriteItem operation.
     /// </summary>
     public List<ConsumedCapacity>? ConsumedCapacity { get; set; }
+
+    /// <summary>
+    /// A list of tables that were processed by BatchWriteItem and, for each table, information about any item collections that were affected by individual DeleteItem or PutItem operations.
+    /// </summary>
+    public Dictionary<string, List<ItemCollectionMetrics>>? ItemCollectionMetrics { get; set; }
 }

src/Clients/Goa.Clients.Dynamo/Operations/DeleteItem/DeleteItemBuilder.cs

@@ -30,24 +30,38 @@ public DeleteItemBuilder WithKey(string attributeName, AttributeValue value)
 
     /// <summary>
     /// Sets a condition expression that must be satisfied for the delete operation to succeed.
+    /// Multiple conditions are combined with AND.
     /// </summary>
     /// <param name="condition">The condition that must be met.</param>
     /// <returns>The DeleteItemBuilder instance for method chaining.</returns>
     public DeleteItemBuilder WithCondition(Condition condition)
     {
+        if (string.IsNullOrEmpty(condition.Expression))
+        {
+            return this;
+        }
+
         if (string.IsNullOrEmpty(_request.ConditionExpression))
         {
             _request.ConditionExpression = condition.Expression;
         }
         else
         {
-            _request.ConditionExpression += " AND " + condition.Expression;
+            _request.ConditionExpression = $"({_request.ConditionExpression}) AND ({condition.Expression})";
+        }
+
+        if (condition.ExpressionNames.Count > 0)
+        {
+            _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
+        }
+
+        if (condition.ExpressionValues.Count > 0)
+        {
+            _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
         }
 
-        _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
-        _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
         return this;
     }
 
@@ -90,6 +104,17 @@ public DeleteItemBuilder WithReturnItemCollectionMetrics(ReturnItemCollectionMet
         return this;
     }
 
+    /// <summary>
+    /// Specifies how to return attribute values when a conditional check fails.
+    /// </summary>
+    /// <param name="returnValuesOnConditionCheckFailure">The return values on condition check failure setting.</param>
+    /// <returns>The DeleteItemBuilder instance for method chaining.</returns>
+    public DeleteItemBuilder WithReturnValuesOnConditionCheckFailure(ReturnValuesOnConditionCheckFailure returnValuesOnConditionCheckFailure)
+    {
+        _request.ReturnValuesOnConditionCheckFailure = returnValuesOnConditionCheckFailure;
+        return this;
+    }
+
     /// <summary>
     /// Builds and returns the configured DeleteItemRequest.
     /// </summary>

src/Clients/Goa.Clients.Dynamo/Operations/DeleteItem/DeleteItemRequest.cs

@@ -48,4 +48,10 @@ public class DeleteItemRequest
     /// Determines whether item collection metrics are returned.
     /// </summary>
     public ReturnItemCollectionMetrics ReturnItemCollectionMetrics { get; set; } = ReturnItemCollectionMetrics.NONE;
+
+    /// <summary>
+    /// Specifies how to return attribute values when a conditional check fails.
+    /// Use ALL_OLD to return all attributes of the item as they appeared before the operation.
+    /// </summary>
+    public ReturnValuesOnConditionCheckFailure ReturnValuesOnConditionCheckFailure { get; set; } = ReturnValuesOnConditionCheckFailure.NONE;
 }

src/Clients/Goa.Clients.Dynamo/Operations/DeleteItem/DeleteItemResponse.cs

@@ -16,4 +16,9 @@ public class DeleteItemResponse
     /// The number of capacity units consumed by the operation.
     /// </summary>
     public double? ConsumedCapacityUnits { get; set; }
+
+    /// <summary>
+    /// Information about item collections, if any, that were affected by the operation.
+    /// </summary>
+    public Dictionary<string, List<ItemCollectionMetrics>>? ItemCollectionMetrics { get; set; }
 }

src/Clients/Goa.Clients.Dynamo/Operations/PutItem/PutItemBuilder.cs

@@ -41,16 +41,38 @@ public PutItemBuilder WithAttribute(string attributeName, AttributeValue value)
 
     /// <summary>
     /// Sets a condition expression that must be satisfied for the put operation to succeed.
+    /// Multiple conditions are combined with AND.
     /// </summary>
     /// <param name="condition">The condition that must be met.</param>
     /// <returns>The PutItemBuilder instance for method chaining.</returns>
     public PutItemBuilder WithCondition(Condition condition)
     {
-        _request.ConditionExpression = condition.Expression;
-        _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
-        _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        if (string.IsNullOrEmpty(condition.Expression))
+        {
+            return this;
+        }
+
+        if (string.IsNullOrEmpty(_request.ConditionExpression))
+        {
+            _request.ConditionExpression = condition.Expression;
+        }
+        else
+        {
+            _request.ConditionExpression = $"({_request.ConditionExpression}) AND ({condition.Expression})";
+        }
+
+        if (condition.ExpressionNames.Count > 0)
+        {
+            _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
+        }
+
+        if (condition.ExpressionValues.Count > 0)
+        {
+            _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        }
+
         return this;
     }
 
@@ -76,6 +98,17 @@ public PutItemBuilder WithReturnValues(ReturnValues returnValues)
         return this;
     }
 
+    /// <summary>
+    /// Specifies how to return attribute values when a conditional check fails.
+    /// </summary>
+    /// <param name="returnValuesOnConditionCheckFailure">The return values on condition check failure setting.</param>
+    /// <returns>The PutItemBuilder instance for method chaining.</returns>
+    public PutItemBuilder WithReturnValuesOnConditionCheckFailure(ReturnValuesOnConditionCheckFailure returnValuesOnConditionCheckFailure)
+    {
+        _request.ReturnValuesOnConditionCheckFailure = returnValuesOnConditionCheckFailure;
+        return this;
+    }
+
     /// <summary>
     /// Builds and returns the configured PutItemRequest.
     /// </summary>

src/Clients/Goa.Clients.Dynamo/Operations/PutItem/PutItemRequest.cs

@@ -47,4 +47,10 @@ public class PutItemRequest
     /// Determines whether item collection metrics are returned.
     /// </summary>
     public ReturnItemCollectionMetrics ReturnItemCollectionMetrics { get; set; } = ReturnItemCollectionMetrics.NONE;
+
+    /// <summary>
+    /// Specifies how to return attribute values when a conditional check fails.
+    /// Use ALL_OLD to return all attributes of the item as they appeared before the operation.
+    /// </summary>
+    public ReturnValuesOnConditionCheckFailure ReturnValuesOnConditionCheckFailure { get; set; } = ReturnValuesOnConditionCheckFailure.NONE;
 }

src/Clients/Goa.Clients.Dynamo/Operations/Query/QueryBuilder.cs

@@ -1,3 +1,4 @@
+using System.Text.RegularExpressions;
 using Goa.Clients.Dynamo.Enums;
 using Goa.Clients.Dynamo.Models;
 using Goa.Core;
@@ -8,7 +9,7 @@ namespace Goa.Clients.Dynamo.Operations.Query;
 /// Fluent builder for constructing DynamoDB Query requests with a user-friendly API.
 /// </summary>
 /// <param name="tableName">The name of the table to query.</param>
-public class QueryBuilder(string tableName)
+public partial class QueryBuilder(string tableName)
 {
     private readonly QueryRequest _request = new()
     {
@@ -31,10 +32,18 @@ public QueryBuilder WithKey(Condition condition)
             _request.KeyConditionExpression += " AND " + condition.Expression;
         }
 
-        _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
-        _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        if (condition.ExpressionNames.Count > 0)
+        {
+            _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
+        }
+
+        if (condition.ExpressionValues.Count > 0)
+        {
+            _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        }
+
         return this;
     }
 
@@ -54,20 +63,45 @@ public QueryBuilder WithConsistentRead(bool consistentRead = true)
     /// </summary>
     /// <param name="indexName">The name of the index to query, or null to query the base table.</param>
     /// <returns>The QueryBuilder instance for method chaining.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when indexName length is less than 3 or greater than 255 characters.</exception>
+    /// <exception cref="ArgumentException">Thrown when indexName contains invalid characters (must match pattern [a-zA-Z0-9_.-]+).</exception>
     public QueryBuilder WithIndex(string? indexName)
     {
-        _request.IndexName = string.IsNullOrWhiteSpace(indexName) ? null : indexName;
+        if (string.IsNullOrWhiteSpace(indexName))
+        {
+            _request.IndexName = null;
+            return this;
+        }
+
+        ArgumentOutOfRangeException.ThrowIfLessThan(indexName.Length, 3, nameof(indexName));
+        ArgumentOutOfRangeException.ThrowIfGreaterThan(indexName.Length, 255, nameof(indexName));
+
+        if (!IndexNamePattern().IsMatch(indexName))
+        {
+            throw new ArgumentException("Index name must match pattern [a-zA-Z0-9_.-]+.", nameof(indexName));
+        }
+
+        _request.IndexName = indexName;
         return this;
     }
 
+    [GeneratedRegex("^[a-zA-Z0-9_.-]+$")]
+    private static partial Regex IndexNamePattern();
+
     /// <summary>
     /// Sets the maximum number of items to return from the query.
     /// </summary>
     /// <param name="limit">The maximum number of items to return, or null for no limit.</param>
     /// <returns>The QueryBuilder instance for method chaining.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when limit is less than 1.</exception>
     public QueryBuilder WithLimit(int? limit)
     {
-        _request.Limit = limit > 0 ? limit : null;
+        if (limit.HasValue)
+        {
+            ArgumentOutOfRangeException.ThrowIfLessThan(limit.Value, 1, nameof(limit));
+        }
+
+        _request.Limit = limit;
         return this;
     }
 
@@ -175,10 +209,18 @@ public QueryBuilder WithFilter(Condition condition)
             _request.FilterExpression += " AND " + condition.Expression;
         }
 
-        _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
-        _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        if (condition.ExpressionNames.Count > 0)
+        {
+            _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
+        }
+
+        if (condition.ExpressionValues.Count > 0)
+        {
+            _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        }
+
         return this;
     }
 

src/Clients/Goa.Clients.Dynamo/Operations/Scan/ScanBuilder.cs

@@ -31,10 +31,18 @@ public ScanBuilder WithFilter(Condition condition)
             _request.FilterExpression += " AND " + condition.Expression;
         }
 
-        _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
-        _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
-        _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        if (condition.ExpressionNames.Count > 0)
+        {
+            _request.ExpressionAttributeNames ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeNames.Merge(condition.ExpressionNames);
+        }
+
+        if (condition.ExpressionValues.Count > 0)
+        {
+            _request.ExpressionAttributeValues ??= new(StringComparer.OrdinalIgnoreCase);
+            _request.ExpressionAttributeValues.Merge(condition.ExpressionValues);
+        }
+
         return this;
     }
 

src/Clients/Goa.Clients.Dynamo/Operations/Transactions/TransactConditionCheckItem.cs

@@ -1,4 +1,5 @@
-using Goa.Clients.Dynamo.Models;
+using Goa.Clients.Dynamo.Enums;
+using Goa.Clients.Dynamo.Models;
 
 namespace Goa.Clients.Dynamo.Operations.Transactions;
 
@@ -31,4 +32,10 @@ public class TransactConditionCheckItem
     /// One or more substitution tokens for attribute names in an expression.
     /// </summary>
     public Dictionary<string, string>? ExpressionAttributeNames { get; set; }
+
+    /// <summary>
+    /// Specifies how to return attribute values when a conditional check fails.
+    /// Use ALL_OLD to return all attributes of the item as they appeared before the operation.
+    /// </summary>
+    public ReturnValuesOnConditionCheckFailure ReturnValuesOnConditionCheckFailure { get; set; } = ReturnValuesOnConditionCheckFailure.NONE;
 }

src/Clients/Goa.Clients.Dynamo/Operations/Transactions/TransactDeleteItem.cs

@@ -1,4 +1,5 @@
-using Goa.Clients.Dynamo.Models;
+using Goa.Clients.Dynamo.Enums;
+using Goa.Clients.Dynamo.Models;
 
 namespace Goa.Clients.Dynamo.Operations.Transactions;
 
@@ -31,4 +32,10 @@ public class TransactDeleteItem
     /// One or more substitution tokens for attribute names in an expression.
     /// </summary>
     public Dictionary<string, string>? ExpressionAttributeNames { get; set; }
+
+    /// <summary>
+    /// Specifies how to return attribute values when a conditional check fails.
+    /// Use ALL_OLD to return all attributes of the item as they appeared before the operation.
+    /// </summary>
+    public ReturnValuesOnConditionCheckFailure ReturnValuesOnConditionCheckFailure { get; set; } = ReturnValuesOnConditionCheckFailure.NONE;
 }

src/Clients/Goa.Clients.Dynamo/Operations/Transactions/TransactGetBuilder.cs

@@ -1,3 +1,4 @@
+using Goa.Clients.Dynamo.Enums;
 using Goa.Clients.Dynamo.Models;
 
 namespace Goa.Clients.Dynamo.Operations.Transactions;
@@ -70,6 +71,17 @@ public TransactGetBuilder WithGet(string tableName, Dictionary<string, Attribute
         return WithGet(tableName, key);
     }
 
+    /// <summary>
+    /// Determines the level of detail about consumed capacity to return.
+    /// </summary>
+    /// <param name="returnConsumedCapacity">The level of consumed capacity information to return.</param>
+    /// <returns>The TransactGetBuilder instance for method chaining.</returns>
+    public TransactGetBuilder WithReturnConsumedCapacity(ReturnConsumedCapacity returnConsumedCapacity)
+    {
+        _request.ReturnConsumedCapacity = returnConsumedCapacity;
+        return this;
+    }
+
     /// <summary>
     /// Builds and returns the configured TransactGetRequest.
     /// </summary>