fix indexes being removed on update

Author: jeremydaly

__tests__/entity.update.unit.test.js

@@ -5,7 +5,10 @@ const TestTable = new Table({
   name: 'test-table',
   partitionKey: 'pk',
   sortKey: 'sk',
-  DocumentClient
+  DocumentClient,
+  indexes: {
+    GSI1: { partitionKey: 'GSI1pk' }
+  }
 })
 
 const TestEntity = new Entity({
@@ -78,6 +81,20 @@ const TestEntity3 = new Entity({
   table: TestTable3
 })
 
+const TestEntityGSI = new Entity({
+  name: 'TestEntityGSI',
+  autoExecute: false,
+  attributes: {
+    email: { type: 'string', partitionKey: true },
+    sk: { type: 'string', sortKey: true },
+    test: { type: 'string' },
+    test2: { type: 'string' },
+    GSI1pk: { partitionKey: 'GSI1'}
+  },
+  timestamps: false,
+  table: TestTable
+})
+
 
 describe('update',()=>{
 
@@ -96,6 +113,11 @@ describe('update',()=>{
     expect(TableName).toBe('test-table')
   })
 
+  it('creates update with GSI', () => {
+    let { TableName, Key, UpdateExpression, ExpressionAttributeNames, ExpressionAttributeValues } = TestEntityGSI.updateParams({ pk: 'test-pk', sk: 'test-sk', GSI1pk: 'test' })
+    expect(UpdateExpression).toBe('SET #_et = if_not_exists(#_et,:_et), #GSI1pk = :GSI1pk')
+  })
+
 
   it('creates update with multiple fields (default types)', () => {
     let { TableName, Key, UpdateExpression, ExpressionAttributeNames, ExpressionAttributeValues } = TestEntity.updateParams({

classes/Entity.js

@@ -488,7 +488,6 @@ class Entity {
     const names = {}
     const values = {}
 
-
     // Loop through valid fields and add appropriate action
     Object.keys(data).forEach((field) => {
       const mapping = schema.attributes[field]
@@ -512,8 +511,10 @@ class Entity {
         REMOVE.push(`#${field}`)
         names[`#${field}`] = field
       } else if (
-        !mapping.partitionKey
-        && !mapping.sortKey
+        // !mapping.partitionKey
+        // && !mapping.sortKey
+        mapping.partitionKey !== true
+        && mapping.sortKey !== true
         && (mapping.save === undefined || mapping.save === true)
         && (!mapping.link || (mapping.link && mapping.save === true))
       ) {