@twin.org/entity-storage-connector-dynamodb 0.0.1-next.7 → 0.0.1-next.9

package/README.md

@@ -13,7 +13,7 @@ npm install @twin.org/entity-storage-connector-dynamodb
 The tests developed are functional tests and need an instance of DynamoDB up and running. To run DynamoDB locally:
 
 ```sh
-docker run -p 8000:8000 --name dynamodb --hostname dynamodb -d amazon/dynamodb-local
+docker run -p 8000:8000 --name twin-entity-storage-dynamodb --hostname dynamodb -d amazon/dynamodb-local
 ```
 
 Afterwards you can run the tests as follows:

package/dist/cjs/index.cjs

@@ -225,13 +225,14 @@ class DynamoDbEntityStorageConnector {
      * Get an entity.
      * @param id The id of the entity to get, or the index value if secondaryIndex is set.
      * @param secondaryIndex Get the item using a secondary index.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The object if it can be found or undefined.
      */
-    async get(id, secondaryIndex) {
+    async get(id, secondaryIndex, conditions) {
         core.Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
-            if (core.Is.undefined(secondaryIndex)) {
+            if (core.Is.empty(secondaryIndex) && core.Is.empty(conditions)) {
                 const getCommand = new libDynamodb.GetCommand({
                     TableName: this._config.tableName,
                     Key: {
@@ -243,27 +244,27 @@ class DynamoDbEntityStorageConnector {
                 delete response.Item?.[DynamoDbEntityStorageConnector._PARTITION_ID_NAME];
                 return response.Item;
             }
-            const secIndex = secondaryIndex.toString();
-            const globalSecondaryIndex = `${secIndex}Index`;
-            const queryCommand = new clientDynamodb.QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: globalSecondaryIndex,
-                KeyConditionExpression: `#${secIndex} = :id AND #${DynamoDbEntityStorageConnector._PARTITION_ID_NAME} = :${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`,
-                ExpressionAttributeNames: {
-                    [`#${secIndex}`]: secIndex,
-                    [`#${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: DynamoDbEntityStorageConnector._PARTITION_ID_NAME
-                },
-                ExpressionAttributeValues: {
-                    [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                        S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                    },
-                    ":id": { S: id }
+            const finalConditions = {
+                conditions: []
+            };
+            if (core.Is.stringValue(secondaryIndex)) {
+                finalConditions.conditions.push({
+                    property: secondaryIndex,
+                    comparison: entity.ComparisonOperator.Equals,
+                    value: id
+                });
+            }
+            if (core.Is.arrayValue(conditions)) {
+                for (const c of conditions) {
+                    finalConditions.conditions.push({
+                        property: c.property,
+                        comparison: entity.ComparisonOperator.Equals,
+                        value: c.value
+                    });
                 }
-            });
-            const response = await docClient.send(queryCommand);
-            if (response.Items?.length === 1) {
-                return utilDynamodb.unmarshall(response.Items[0]);
             }
+            const queryResult = await this.internalQuery(finalConditions, undefined, undefined, undefined, 1, secondaryIndex);
+            return queryResult.entities[0];
         }
         catch (err) {
             if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
@@ -275,24 +276,28 @@ class DynamoDbEntityStorageConnector {
                 id
             }, err);
         }
-        return undefined;
     }
     /**
      * Set an entity.
      * @param entity The entity to set.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The id of the entity.
      */
-    async set(entity) {
+    async set(entity, conditions) {
         core.Guards.object(this.CLASS_NAME, "entity", entity);
         const id = entity[this._primaryKey.property];
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const putCommand = new libDynamodb.PutCommand({
                 TableName: this._config.tableName,
                 Item: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     ...entity
-                }
+                },
+                ConditionExpression: conditionExpression,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(putCommand);
         }
@@ -310,22 +315,30 @@ class DynamoDbEntityStorageConnector {
     /**
      * Remove the entity.
      * @param id The id of the entity to remove.
+     * @param conditions The optional conditions to match for the entities.
      * @returns Nothing.
      */
-    async remove(id) {
+    async remove(id, conditions) {
         core.Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const deleteCommand = new libDynamodb.DeleteCommand({
                 TableName: this._config.tableName,
                 Key: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     [this._primaryKey.property]: id
-                }
+                },
+                ConditionExpression: conditionExpression,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(deleteCommand);
         }
         catch (err) {
+            if (core.BaseError.isErrorName(err, "ConditionalCheckFailedException")) {
+                return;
+            }
             if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
                 throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
                     table: this._config.tableName
@@ -347,77 +360,7 @@ class DynamoDbEntityStorageConnector {
      * and a cursor which can be used to request more entities.
      */
     async query(conditions, sortProperties, properties, cursor, pageSize) {
-        try {
-            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
-            let indexName;
-            // If we have a sortable property defined in the descriptor then we must use
-            // the secondary index for the query
-            if (core.Is.arrayValue(sortProperties)) {
-                if (sortProperties.length > 1) {
-                    throw new core.GeneralError(this.CLASS_NAME, "sortSingle");
-                }
-                for (const sortProperty of sortProperties) {
-                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
-                    if (core.Is.undefined(propertySchema) ||
-                        (!propertySchema.isPrimary &&
-                            !propertySchema.isSecondary &&
-                            core.Is.empty(propertySchema.sortDirection))) {
-                        throw new core.GeneralError(this.CLASS_NAME, "sortNotIndexed", {
-                            property: sortProperty.property
-                        });
-                    }
-                    indexName = propertySchema.isPrimary
-                        ? undefined
-                        : `${sortProperty.property}Index`;
-                }
-            }
-            const attributeNames = { "#partitionId": "partitionId" };
-            const attributeValues = {
-                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                }
-            };
-            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues);
-            let keyExpression = "#partitionId = :partitionId";
-            if (expressions.keyCondition.length > 0) {
-                keyExpression += ` AND ${expressions.keyCondition}`;
-            }
-            const query = new clientDynamodb.QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: indexName,
-                KeyConditionExpression: keyExpression,
-                FilterExpression: core.Is.stringValue(expressions.filterCondition)
-                    ? expressions.filterCondition
-                    : undefined,
-                ExpressionAttributeNames: attributeNames,
-                ExpressionAttributeValues: attributeValues,
-                ProjectionExpression: properties?.map(p => p).join(", "),
-                Limit: returnSize,
-                ExclusiveStartKey: core.Is.empty(cursor)
-                    ? undefined
-                    : core.ObjectHelper.fromBytes(core.Converter.base64ToBytes(cursor))
-            });
-            const connection = this.createDocClient();
-            const results = await connection.send(query);
-            let entities = [];
-            if (core.Is.arrayValue(results.Items)) {
-                entities = results.Items.map(item => utilDynamodb.unmarshall(item));
-            }
-            return {
-                entities,
-                cursor: core.Is.empty(results.LastEvaluatedKey)
-                    ? undefined
-                    : core.Converter.bytesToBase64(core.ObjectHelper.toBytes(results.LastEvaluatedKey))
-            };
-        }
-        catch (err) {
-            if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
-                throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
-                    table: this._config.tableName
-                }, err);
-            }
-            throw new core.GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
-        }
+        return this.internalQuery(conditions, sortProperties, properties, cursor, pageSize);
     }
     /**
      * Delete the table.
@@ -439,7 +382,7 @@ class DynamoDbEntityStorageConnector {
      * @returns The condition clause.
      * @internal
      */
-    buildQueryParameters(objectPath, condition, attributeNames, attributeValues) {
+    buildQueryParameters(objectPath, condition, attributeNames, attributeValues, secondaryIndex) {
         // If no conditions are defined then return empty string
         if (core.Is.undefined(condition)) {
             return {
@@ -455,7 +398,7 @@ class DynamoDbEntityStorageConnector {
                 };
             }
             // It's a group of comparisons, so check the individual items and combine with the logical operator
-            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues));
+            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues, secondaryIndex));
             const logicalOperator = this.mapConditionalOperator(condition.logicalOperator);
             const keyCondition = joinConditions
                 .filter(j => j.keyCondition.length > 0)
@@ -473,9 +416,10 @@ class DynamoDbEntityStorageConnector {
         const schemaProp = this._entitySchema.properties?.find(p => p.property === condition.property);
         // It's a single value so just create the property comparison for the condition
         const comparison = this.mapComparisonOperator(objectPath, condition, schemaProp?.type, attributeNames, attributeValues);
+        const isKey = schemaProp?.isPrimary || (schemaProp?.isSecondary && schemaProp?.property === secondaryIndex);
         return {
-            keyCondition: schemaProp?.isPrimary ? comparison : "",
-            filterCondition: schemaProp?.isPrimary ? "" : comparison
+            keyCondition: isKey ? comparison : "",
+            filterCondition: !isKey ? comparison : ""
         };
     }
     /**
@@ -656,6 +600,125 @@ class DynamoDbEntityStorageConnector {
             return false;
         }
     }
+    /**
+     * Find all the entities which match the conditions.
+     * @param conditions The conditions to match for the entities.
+     * @param sortProperties The optional sort order.
+     * @param properties The optional properties to return, defaults to all.
+     * @param cursor The cursor to request the next page of entities.
+     * @param pageSize The suggested number of entities to return in each chunk, in some scenarios can return a different amount.
+     * @param secondaryIndex The secondary index to use for the query.
+     * @returns All the entities for the storage matching the conditions,
+     * and a cursor which can be used to request more entities.
+     * @internal
+     */
+    async internalQuery(conditions, sortProperties, properties, cursor, pageSize, secondaryIndex) {
+        try {
+            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
+            let indexName = core.Is.stringValue(secondaryIndex)
+                ? `${secondaryIndex}Index`
+                : undefined;
+            // If we have a sortable property defined in the descriptor then we must use
+            // the secondary index for the query
+            if (core.Is.arrayValue(sortProperties)) {
+                if (sortProperties.length > 1) {
+                    throw new core.GeneralError(this.CLASS_NAME, "sortSingle");
+                }
+                for (const sortProperty of sortProperties) {
+                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
+                    if (core.Is.undefined(propertySchema) ||
+                        (!propertySchema.isPrimary &&
+                            !propertySchema.isSecondary &&
+                            core.Is.empty(propertySchema.sortDirection))) {
+                        throw new core.GeneralError(this.CLASS_NAME, "sortNotIndexed", {
+                            property: sortProperty.property
+                        });
+                    }
+                    indexName = propertySchema.isPrimary
+                        ? undefined
+                        : `${sortProperty.property}Index`;
+                }
+            }
+            const attributeNames = { "#partitionId": "partitionId" };
+            const attributeValues = {
+                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
+                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
+                }
+            };
+            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues, secondaryIndex);
+            let keyExpression = "#partitionId = :partitionId";
+            if (expressions.keyCondition.length > 0) {
+                keyExpression += ` AND ${expressions.keyCondition}`;
+            }
+            const query = new clientDynamodb.QueryCommand({
+                TableName: this._config.tableName,
+                IndexName: indexName,
+                KeyConditionExpression: keyExpression,
+                FilterExpression: core.Is.stringValue(expressions.filterCondition)
+                    ? expressions.filterCondition
+                    : undefined,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues,
+                ProjectionExpression: properties?.map(p => p).join(", "),
+                Limit: returnSize,
+                ExclusiveStartKey: core.Is.empty(cursor)
+                    ? undefined
+                    : core.ObjectHelper.fromBytes(core.Converter.base64ToBytes(cursor))
+            });
+            const connection = this.createDocClient();
+            const results = await connection.send(query);
+            let entities = [];
+            if (core.Is.arrayValue(results.Items)) {
+                entities = results.Items.map(item => utilDynamodb.unmarshall(item));
+            }
+            return {
+                entities,
+                cursor: core.Is.empty(results.LastEvaluatedKey)
+                    ? undefined
+                    : core.Converter.bytesToBase64(core.ObjectHelper.toBytes(results.LastEvaluatedKey))
+            };
+        }
+        catch (err) {
+            if (core.BaseError.isErrorCode(err, "ResourceNotFoundException")) {
+                throw new core.GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
+                    table: this._config.tableName
+                }, err);
+            }
+            throw new core.GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
+        }
+    }
+    /**
+     * Build the condition expression for the query.
+     * @param conditions The conditions to build the expression from.
+     * @returns The condition expression.
+     * @throws GeneralError if the property is not found in the schema.
+     * @internal
+     */
+    buildConditionExpression(conditions) {
+        let conditionExpression;
+        let attributeNames;
+        let attributeValues;
+        if (core.Is.arrayValue(conditions)) {
+            const expressions = [];
+            for (const c of conditions) {
+                const schemaProp = this._entitySchema.properties?.find(p => p.property === c.property);
+                if (core.Is.undefined(schemaProp)) {
+                    throw new core.GeneralError(this.CLASS_NAME, "propertyNotFound", {
+                        property: c.property
+                    });
+                }
+                const attributeName = `#${c.property}`;
+                const attributeValueName = `:${c.property}`;
+                attributeNames ??= {};
+                attributeValues ??= {};
+                attributeNames[attributeName] = c.property;
+                attributeValues[attributeValueName] = c.value;
+                expressions.push(`${attributeName} = ${attributeValueName}`);
+            }
+            conditionExpression = expressions.join(" AND ");
+        }
+        return { conditionExpression, attributeNames, attributeValues };
+    }
 }
 
 exports.DynamoDbEntityStorageConnector = DynamoDbEntityStorageConnector;

package/dist/esm/index.mjs

@@ -1,7 +1,7 @@
-import { waitUntilTableExists, QueryCommand, DynamoDB } from '@aws-sdk/client-dynamodb';
+import { waitUntilTableExists, DynamoDB, QueryCommand } from '@aws-sdk/client-dynamodb';
 import { GetCommand, PutCommand, DeleteCommand, DynamoDBDocumentClient } from '@aws-sdk/lib-dynamodb';
 import { unmarshall } from '@aws-sdk/util-dynamodb';
-import { Guards, Is, BaseError, GeneralError, ObjectHelper, Converter, Coerce } from '@twin.org/core';
+import { Guards, Is, BaseError, GeneralError, Coerce, ObjectHelper, Converter } from '@twin.org/core';
 import { EntitySchemaFactory, EntitySchemaHelper, ComparisonOperator, LogicalOperator } from '@twin.org/entity';
 import { LoggingConnectorFactory } from '@twin.org/logging-models';
 
@@ -223,13 +223,14 @@ class DynamoDbEntityStorageConnector {
      * Get an entity.
      * @param id The id of the entity to get, or the index value if secondaryIndex is set.
      * @param secondaryIndex Get the item using a secondary index.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The object if it can be found or undefined.
      */
-    async get(id, secondaryIndex) {
+    async get(id, secondaryIndex, conditions) {
         Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
-            if (Is.undefined(secondaryIndex)) {
+            if (Is.empty(secondaryIndex) && Is.empty(conditions)) {
                 const getCommand = new GetCommand({
                     TableName: this._config.tableName,
                     Key: {
@@ -241,27 +242,27 @@ class DynamoDbEntityStorageConnector {
                 delete response.Item?.[DynamoDbEntityStorageConnector._PARTITION_ID_NAME];
                 return response.Item;
             }
-            const secIndex = secondaryIndex.toString();
-            const globalSecondaryIndex = `${secIndex}Index`;
-            const queryCommand = new QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: globalSecondaryIndex,
-                KeyConditionExpression: `#${secIndex} = :id AND #${DynamoDbEntityStorageConnector._PARTITION_ID_NAME} = :${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`,
-                ExpressionAttributeNames: {
-                    [`#${secIndex}`]: secIndex,
-                    [`#${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: DynamoDbEntityStorageConnector._PARTITION_ID_NAME
-                },
-                ExpressionAttributeValues: {
-                    [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                        S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                    },
-                    ":id": { S: id }
+            const finalConditions = {
+                conditions: []
+            };
+            if (Is.stringValue(secondaryIndex)) {
+                finalConditions.conditions.push({
+                    property: secondaryIndex,
+                    comparison: ComparisonOperator.Equals,
+                    value: id
+                });
+            }
+            if (Is.arrayValue(conditions)) {
+                for (const c of conditions) {
+                    finalConditions.conditions.push({
+                        property: c.property,
+                        comparison: ComparisonOperator.Equals,
+                        value: c.value
+                    });
                 }
-            });
-            const response = await docClient.send(queryCommand);
-            if (response.Items?.length === 1) {
-                return unmarshall(response.Items[0]);
             }
+            const queryResult = await this.internalQuery(finalConditions, undefined, undefined, undefined, 1, secondaryIndex);
+            return queryResult.entities[0];
         }
         catch (err) {
             if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
@@ -273,24 +274,28 @@ class DynamoDbEntityStorageConnector {
                 id
             }, err);
         }
-        return undefined;
     }
     /**
      * Set an entity.
      * @param entity The entity to set.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The id of the entity.
      */
-    async set(entity) {
+    async set(entity, conditions) {
         Guards.object(this.CLASS_NAME, "entity", entity);
         const id = entity[this._primaryKey.property];
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const putCommand = new PutCommand({
                 TableName: this._config.tableName,
                 Item: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     ...entity
-                }
+                },
+                ConditionExpression: conditionExpression,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(putCommand);
         }
@@ -308,22 +313,30 @@ class DynamoDbEntityStorageConnector {
     /**
      * Remove the entity.
      * @param id The id of the entity to remove.
+     * @param conditions The optional conditions to match for the entities.
      * @returns Nothing.
      */
-    async remove(id) {
+    async remove(id, conditions) {
         Guards.stringValue(this.CLASS_NAME, "id", id);
         try {
             const docClient = this.createDocClient();
+            const { conditionExpression, attributeNames, attributeValues } = this.buildConditionExpression(conditions);
             const deleteCommand = new DeleteCommand({
                 TableName: this._config.tableName,
                 Key: {
                     [DynamoDbEntityStorageConnector._PARTITION_ID_NAME]: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE,
                     [this._primaryKey.property]: id
-                }
+                },
+                ConditionExpression: conditionExpression,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues
             });
             await docClient.send(deleteCommand);
         }
         catch (err) {
+            if (BaseError.isErrorName(err, "ConditionalCheckFailedException")) {
+                return;
+            }
             if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
                 throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
                     table: this._config.tableName
@@ -345,77 +358,7 @@ class DynamoDbEntityStorageConnector {
      * and a cursor which can be used to request more entities.
      */
     async query(conditions, sortProperties, properties, cursor, pageSize) {
-        try {
-            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
-            let indexName;
-            // If we have a sortable property defined in the descriptor then we must use
-            // the secondary index for the query
-            if (Is.arrayValue(sortProperties)) {
-                if (sortProperties.length > 1) {
-                    throw new GeneralError(this.CLASS_NAME, "sortSingle");
-                }
-                for (const sortProperty of sortProperties) {
-                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
-                    if (Is.undefined(propertySchema) ||
-                        (!propertySchema.isPrimary &&
-                            !propertySchema.isSecondary &&
-                            Is.empty(propertySchema.sortDirection))) {
-                        throw new GeneralError(this.CLASS_NAME, "sortNotIndexed", {
-                            property: sortProperty.property
-                        });
-                    }
-                    indexName = propertySchema.isPrimary
-                        ? undefined
-                        : `${sortProperty.property}Index`;
-                }
-            }
-            const attributeNames = { "#partitionId": "partitionId" };
-            const attributeValues = {
-                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
-                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
-                }
-            };
-            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues);
-            let keyExpression = "#partitionId = :partitionId";
-            if (expressions.keyCondition.length > 0) {
-                keyExpression += ` AND ${expressions.keyCondition}`;
-            }
-            const query = new QueryCommand({
-                TableName: this._config.tableName,
-                IndexName: indexName,
-                KeyConditionExpression: keyExpression,
-                FilterExpression: Is.stringValue(expressions.filterCondition)
-                    ? expressions.filterCondition
-                    : undefined,
-                ExpressionAttributeNames: attributeNames,
-                ExpressionAttributeValues: attributeValues,
-                ProjectionExpression: properties?.map(p => p).join(", "),
-                Limit: returnSize,
-                ExclusiveStartKey: Is.empty(cursor)
-                    ? undefined
-                    : ObjectHelper.fromBytes(Converter.base64ToBytes(cursor))
-            });
-            const connection = this.createDocClient();
-            const results = await connection.send(query);
-            let entities = [];
-            if (Is.arrayValue(results.Items)) {
-                entities = results.Items.map(item => unmarshall(item));
-            }
-            return {
-                entities,
-                cursor: Is.empty(results.LastEvaluatedKey)
-                    ? undefined
-                    : Converter.bytesToBase64(ObjectHelper.toBytes(results.LastEvaluatedKey))
-            };
-        }
-        catch (err) {
-            if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
-                throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
-                    table: this._config.tableName
-                }, err);
-            }
-            throw new GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
-        }
+        return this.internalQuery(conditions, sortProperties, properties, cursor, pageSize);
     }
     /**
      * Delete the table.
@@ -437,7 +380,7 @@ class DynamoDbEntityStorageConnector {
      * @returns The condition clause.
      * @internal
      */
-    buildQueryParameters(objectPath, condition, attributeNames, attributeValues) {
+    buildQueryParameters(objectPath, condition, attributeNames, attributeValues, secondaryIndex) {
         // If no conditions are defined then return empty string
         if (Is.undefined(condition)) {
             return {
@@ -453,7 +396,7 @@ class DynamoDbEntityStorageConnector {
                 };
             }
             // It's a group of comparisons, so check the individual items and combine with the logical operator
-            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues));
+            const joinConditions = condition.conditions.map(c => this.buildQueryParameters(objectPath, c, attributeNames, attributeValues, secondaryIndex));
             const logicalOperator = this.mapConditionalOperator(condition.logicalOperator);
             const keyCondition = joinConditions
                 .filter(j => j.keyCondition.length > 0)
@@ -471,9 +414,10 @@ class DynamoDbEntityStorageConnector {
         const schemaProp = this._entitySchema.properties?.find(p => p.property === condition.property);
         // It's a single value so just create the property comparison for the condition
         const comparison = this.mapComparisonOperator(objectPath, condition, schemaProp?.type, attributeNames, attributeValues);
+        const isKey = schemaProp?.isPrimary || (schemaProp?.isSecondary && schemaProp?.property === secondaryIndex);
         return {
-            keyCondition: schemaProp?.isPrimary ? comparison : "",
-            filterCondition: schemaProp?.isPrimary ? "" : comparison
+            keyCondition: isKey ? comparison : "",
+            filterCondition: !isKey ? comparison : ""
         };
     }
     /**
@@ -654,6 +598,125 @@ class DynamoDbEntityStorageConnector {
             return false;
         }
     }
+    /**
+     * Find all the entities which match the conditions.
+     * @param conditions The conditions to match for the entities.
+     * @param sortProperties The optional sort order.
+     * @param properties The optional properties to return, defaults to all.
+     * @param cursor The cursor to request the next page of entities.
+     * @param pageSize The suggested number of entities to return in each chunk, in some scenarios can return a different amount.
+     * @param secondaryIndex The secondary index to use for the query.
+     * @returns All the entities for the storage matching the conditions,
+     * and a cursor which can be used to request more entities.
+     * @internal
+     */
+    async internalQuery(conditions, sortProperties, properties, cursor, pageSize, secondaryIndex) {
+        try {
+            const returnSize = pageSize ?? DynamoDbEntityStorageConnector._PAGE_SIZE;
+            let indexName = Is.stringValue(secondaryIndex)
+                ? `${secondaryIndex}Index`
+                : undefined;
+            // If we have a sortable property defined in the descriptor then we must use
+            // the secondary index for the query
+            if (Is.arrayValue(sortProperties)) {
+                if (sortProperties.length > 1) {
+                    throw new GeneralError(this.CLASS_NAME, "sortSingle");
+                }
+                for (const sortProperty of sortProperties) {
+                    const propertySchema = this._entitySchema.properties?.find(e => e.property === sortProperty.property);
+                    if (Is.undefined(propertySchema) ||
+                        (!propertySchema.isPrimary &&
+                            !propertySchema.isSecondary &&
+                            Is.empty(propertySchema.sortDirection))) {
+                        throw new GeneralError(this.CLASS_NAME, "sortNotIndexed", {
+                            property: sortProperty.property
+                        });
+                    }
+                    indexName = propertySchema.isPrimary
+                        ? undefined
+                        : `${sortProperty.property}Index`;
+                }
+            }
+            const attributeNames = { "#partitionId": "partitionId" };
+            const attributeValues = {
+                [`:${DynamoDbEntityStorageConnector._PARTITION_ID_NAME}`]: {
+                    S: DynamoDbEntityStorageConnector._PARTITION_ID_VALUE
+                }
+            };
+            const expressions = this.buildQueryParameters("", conditions, attributeNames, attributeValues, secondaryIndex);
+            let keyExpression = "#partitionId = :partitionId";
+            if (expressions.keyCondition.length > 0) {
+                keyExpression += ` AND ${expressions.keyCondition}`;
+            }
+            const query = new QueryCommand({
+                TableName: this._config.tableName,
+                IndexName: indexName,
+                KeyConditionExpression: keyExpression,
+                FilterExpression: Is.stringValue(expressions.filterCondition)
+                    ? expressions.filterCondition
+                    : undefined,
+                ExpressionAttributeNames: attributeNames,
+                ExpressionAttributeValues: attributeValues,
+                ProjectionExpression: properties?.map(p => p).join(", "),
+                Limit: returnSize,
+                ExclusiveStartKey: Is.empty(cursor)
+                    ? undefined
+                    : ObjectHelper.fromBytes(Converter.base64ToBytes(cursor))
+            });
+            const connection = this.createDocClient();
+            const results = await connection.send(query);
+            let entities = [];
+            if (Is.arrayValue(results.Items)) {
+                entities = results.Items.map(item => unmarshall(item));
+            }
+            return {
+                entities,
+                cursor: Is.empty(results.LastEvaluatedKey)
+                    ? undefined
+                    : Converter.bytesToBase64(ObjectHelper.toBytes(results.LastEvaluatedKey))
+            };
+        }
+        catch (err) {
+            if (BaseError.isErrorCode(err, "ResourceNotFoundException")) {
+                throw new GeneralError(this.CLASS_NAME, "tableDoesNotExist", {
+                    table: this._config.tableName
+                }, err);
+            }
+            throw new GeneralError(this.CLASS_NAME, "queryFailed", undefined, err);
+        }
+    }
+    /**
+     * Build the condition expression for the query.
+     * @param conditions The conditions to build the expression from.
+     * @returns The condition expression.
+     * @throws GeneralError if the property is not found in the schema.
+     * @internal
+     */
+    buildConditionExpression(conditions) {
+        let conditionExpression;
+        let attributeNames;
+        let attributeValues;
+        if (Is.arrayValue(conditions)) {
+            const expressions = [];
+            for (const c of conditions) {
+                const schemaProp = this._entitySchema.properties?.find(p => p.property === c.property);
+                if (Is.undefined(schemaProp)) {
+                    throw new GeneralError(this.CLASS_NAME, "propertyNotFound", {
+                        property: c.property
+                    });
+                }
+                const attributeName = `#${c.property}`;
+                const attributeValueName = `:${c.property}`;
+                attributeNames ??= {};
+                attributeValues ??= {};
+                attributeNames[attributeName] = c.property;
+                attributeValues[attributeValueName] = c.value;
+                expressions.push(`${attributeName} = ${attributeValueName}`);
+            }
+            conditionExpression = expressions.join(" AND ");
+        }
+        return { conditionExpression, attributeNames, attributeValues };
+    }
 }
 
 export { DynamoDbEntityStorageConnector };

package/dist/types/dynamoDbEntityStorageConnector.d.ts

@@ -36,21 +36,33 @@ export declare class DynamoDbEntityStorageConnector<T = unknown> implements IEnt
      * Get an entity.
      * @param id The id of the entity to get, or the index value if secondaryIndex is set.
      * @param secondaryIndex Get the item using a secondary index.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The object if it can be found or undefined.
      */
-    get(id: string, secondaryIndex?: keyof T): Promise<T | undefined>;
+    get(id: string, secondaryIndex?: keyof T, conditions?: {
+        property: keyof T;
+        value: unknown;
+    }[]): Promise<T | undefined>;
     /**
      * Set an entity.
      * @param entity The entity to set.
+     * @param conditions The optional conditions to match for the entities.
      * @returns The id of the entity.
      */
-    set(entity: T): Promise<void>;
+    set(entity: T, conditions?: {
+        property: keyof T;
+        value: unknown;
+    }[]): Promise<void>;
     /**
      * Remove the entity.
      * @param id The id of the entity to remove.
+     * @param conditions The optional conditions to match for the entities.
      * @returns Nothing.
      */
-    remove(id: string): Promise<void>;
+    remove(id: string, conditions?: {
+        property: keyof T;
+        value: unknown;
+    }[]): Promise<void>;
     /**
      * Find all the entities which match the conditions.
      * @param conditions The conditions to match for the entities.

package/docs/changelog.md

@@ -1,5 +1,5 @@
 # @twin.org/entity-storage-connector-dynamodb - Changelog
 
-## v0.0.1-next.7
+## v0.0.1-next.9
 
 - Initial Release

package/docs/reference/classes/DynamoDbEntityStorageConnector.md

@@ -98,7 +98,7 @@ The schema for the entities.
 
 ### get()
 
-> **get**(`id`, `secondaryIndex`?): `Promise`\<`undefined` \| `T`\>
+> **get**(`id`, `secondaryIndex`?, `conditions`?): `Promise`\<`undefined` \| `T`\>
 
 Get an entity.
 
@@ -112,6 +112,10 @@ The id of the entity to get, or the index value if secondaryIndex is set.
 
 Get the item using a secondary index.
 
+• **conditions?**: `object`[]
+
+The optional conditions to match for the entities.
+
 #### Returns
 
 `Promise`\<`undefined` \| `T`\>
@@ -126,7 +130,7 @@ The object if it can be found or undefined.
 
 ### set()
 
-> **set**(`entity`): `Promise`\<`void`\>
+> **set**(`entity`, `conditions`?): `Promise`\<`void`\>
 
 Set an entity.
 
@@ -136,6 +140,10 @@ Set an entity.
 
 The entity to set.
 
+• **conditions?**: `object`[]
+
+The optional conditions to match for the entities.
+
 #### Returns
 
 `Promise`\<`void`\>
@@ -150,7 +158,7 @@ The id of the entity.
 
 ### remove()
 
-> **remove**(`id`): `Promise`\<`void`\>
+> **remove**(`id`, `conditions`?): `Promise`\<`void`\>
 
 Remove the entity.
 
@@ -160,6 +168,10 @@ Remove the entity.
 
 The id of the entity to remove.
 
+• **conditions?**: `object`[]
+
+The optional conditions to match for the entities.
+
 #### Returns
 
 `Promise`\<`void`\>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@twin.org/entity-storage-connector-dynamodb",
-	"version": "0.0.1-next.7",
+	"version": "0.0.1-next.9",
 	"description": "Entity Storage connector implementation using DynamoDb storage",
 	"repository": {
 		"type": "git",
@@ -19,7 +19,7 @@
 		"@aws-sdk/util-dynamodb": "3.656",
 		"@twin.org/core": "next",
 		"@twin.org/entity": "next",
-		"@twin.org/entity-storage-models": "0.0.1-next.7",
+		"@twin.org/entity-storage-models": "0.0.1-next.9",
 		"@twin.org/logging-models": "next",
 		"@twin.org/nameof": "next"
 	},