fix(conditionExpression): change how the operands are given for IN op…

…eration (single values instead
shiftcode · Oct 12, 2017 · 1d5c087 · 1d5c087
1 parent e6d0d3e
commit 1d5c087
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/dynamo/expression/condition-expression-builder.spec.ts b/src/dynamo/expression/condition-expression-builder.spec.ts
@@ -270,18 +270,15 @@ describe('expressions', () => {
       const condition = ConditionExpressionBuilder.buildFilterExpression(
         'myCollection',
         'IN',
-        [['myCollection', 'myOtherValue']],
+        [['myValue', 'myOtherValue']],
         undefined,
         undefined
       )
-      expect(condition.statement).toBe('#myCollection IN (:myCollection)')
+      expect(condition.statement).toBe('#myCollection IN (:myCollection_0, :myCollection_1)')
       expect(condition.attributeNames).toEqual({ '#myCollection': 'myCollection' })
-      // TODO review not sure if the attribute should be L(ist) or S(et) or if both are supported, they both executed successfuly against dynamodb when testing but with unexpected result
-      // expect(condition.attributeValues).toEqual({
-      //   ':myCollection': { L: [{ S: 'myCollection' }, { S: 'myOtherValue' }] },
-      // })
       expect(condition.attributeValues).toEqual({
-        ':myCollection': { SS: ['myCollection', 'myOtherValue'] },
+        ':myCollection_0': { S: 'myValue' },
+        ':myCollection_1': { S: 'myOtherValue' },
       })
     })
 

diff --git a/src/dynamo/expression/condition-expression-builder.ts b/src/dynamo/expression/condition-expression-builder.ts
@@ -151,13 +151,20 @@ export class ConditionExpressionBuilder {
     existingValueNames: string[] | undefined,
     propertyMetadata: PropertyMetadata<any> | undefined
   ): Expression {
-    const mappedValues = Mapper.toDbOne(values[0], propertyMetadata)
+    const attributeValues: AttributeMap = (<any[]>values[0])
+      .map(value => Mapper.toDbOne(value, propertyMetadata))
+      .reduce(
+        (result, mappedValue: AttributeValue, index: number) => {
+          result[`${valuePlaceholder}_${index}`] = mappedValue
+          return result
+        },
+        <AttributeMap>{}
+      )
 
-    const attributeValues: AttributeMap = {}
-    attributeValues[valuePlaceholder] = <any>mappedValues
+    const inStatement = (<any[]>values[0]).map((value: any, index: number) => `${valuePlaceholder}_${index}`).join(', ')
 
     return {
-      statement: `${namePlaceholder} IN (${Object.keys(attributeValues)})`,
+      statement: `${namePlaceholder} IN (${inStatement})`,
       attributeNames,
       attributeValues,
     }
@@ -283,6 +290,10 @@ export class ConditionExpressionBuilder {
             )
           }
           break
+        case 'IN':
+          if (!Array.isArray(values[0])) {
+            throw new Error('the provided value for IN operator must be an array')
+          }
       }
     }
   }