Fix update on empty string

kdcio · Aug 28, 2020 · 571f2a3 · 571f2a3
1 parent 90aacc4
commit 571f2a3
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/jest.setup.js b/jest.setup.js
@@ -10,6 +10,7 @@ const OPTIONS = ['-sharedDb'];
 process.env.DDB_ENDPOINT = `http://localhost:${PORT}`;
 process.env.DDB_REGION = 'localhost';
 process.env.DDB_TABLE = 'kdc-model.localhost';
+// process.env.DEBUG = 'ddb:update';
 
 const setup = async () => {
   const dynamoDB = new DynamoDB({

diff --git a/src/helpers/db/ops/update.js b/src/helpers/db/ops/update.js
@@ -10,22 +10,22 @@ const update = async function update(fields) {
   if (!fields) throw new Error('Missing fields to update');
   if (!Array.isArray(fields)) throw new Error('fields is not an array');
 
+  const fieldsUpdated = [];
   const data = this.toObject();
   let SET = '';
   let REMOVE = '';
   const ExpressionAttributeNames = {};
   const ExpressionAttributeValues = {};
 
-  let updateCtr = 0;
   // Fields that need to be set
   fields.forEach((f) => {
     if (!this.isDirty(f)) return;
-    if (data[f] == null) return;
+    if (!data[f]) return;
     if (SET !== '') SET += `, #${f} = :${f}`;
     else SET = `SET #${f} = :${f}`;
     ExpressionAttributeNames[`#${f}`] = f;
     ExpressionAttributeValues[`:${f}`] = data[f];
-    updateCtr += 1;
+    fieldsUpdated.push(f);
   });
 
   // Fields that need to be removed
@@ -35,21 +35,28 @@ const update = async function update(fields) {
     if (REMOVE === '') REMOVE += ` REMOVE #${f}`;
     else REMOVE += `, #${f}`;
     ExpressionAttributeNames[`#${f}`] = f;
-    updateCtr += 1;
+    fieldsUpdated.push(f);
   });
 
   // Nothing to update
-  if (updateCtr === 0) return;
+  if (fieldsUpdated.length === 0) return;
 
   const params = {
     Key: { ...this.pKey() },
     UpdateExpression: `${SET}${REMOVE}`,
     ExpressionAttributeNames,
-    ExpressionAttributeValues,
   };
 
+  if (Object.keys(ExpressionAttributeValues).length !== 0)
+    params.ExpressionAttributeValues = ExpressionAttributeValues;
+
   debug(params);
   await this.db('update', params);
+
+  // remove updated fields from dirtyFields
+  this._dirtyFields = this._dirtyFields.filter(
+    (f) => fieldsUpdated.indexOf(f) < 0
+  );
 };
 
 export default update;
diff --git a/tests/update.test.js b/tests/update.test.js
@@ -31,7 +31,7 @@ describe('Update', () => {
     });
     await dog.create();
 
-    expect.assertions(13);
+    expect.assertions(22);
     try {
       await dog.update();
     } catch (error) {
@@ -44,6 +44,12 @@ describe('Update', () => {
       expect(error.message).toBe('fields is not an array');
     }
 
+    try {
+      await dog.update(['hello']);
+    } catch (error) {
+      expect(error).toBeUndefined();
+    }
+
     const params = { Key: { pk: 'Retriever#1', sk: 'DOG#Retriever' } };
     let obj = await DDB.db('get', params);
     expect(obj.Item).toBeDefined();
@@ -52,13 +58,16 @@ describe('Update', () => {
 
     dog.owner = 'me';
     dog.birthDate = 'yesterday';
+    expect(dog.dirtyFields).toHaveLength(2);
     await dog.update(['owner', 'color']);
+    expect(dog.dirtyFields).toHaveLength(1);
     obj = await DDB.db('get', params);
     expect(obj.Item.owner).toBe('me');
     // Still undefined because it was included in update fields
     expect(obj.Item.birthDate).toBeUndefined();
 
     await dog.update(['owner', 'birthDate']);
+    expect(dog.dirtyFields).toHaveLength(0);
     obj = await DDB.db('get', params);
     expect(obj.Item.owner).toBe('me');
     expect(obj.Item.birthDate).toBe('yesterday');
@@ -75,5 +84,24 @@ describe('Update', () => {
     obj = await DDB.db('get', params);
     expect(obj.Item.address.address1).toBe('home');
     expect(obj.Item.address.address2).toBeUndefined();
+
+    dog.color = '';
+    dog.birthDate = '';
+    await dog.update(['color', 'birthDate']);
+    obj = await DDB.db('get', params);
+    expect(obj.Item.color).toBeUndefined();
+    expect(obj.Item.birthDate).toBeUndefined();
+
+    await dog.update(['color', 'birthDate']);
+    obj = await DDB.db('get', params);
+    expect(obj.Item.color).toBeUndefined();
+    expect(obj.Item.birthDate).toBeUndefined();
+
+    dog.color = 'white';
+    dog.birthDate = 'now';
+    await dog.update(['color', 'birthDate']);
+    obj = await DDB.db('get', params);
+    expect(obj.Item.color).toBe('white');
+    expect(obj.Item.birthDate).toBe('now');
   });
 });