From dbd285456e6811c2a0fb41bda44e69580d7f5f68 Mon Sep 17 00:00:00 2001
From: Olivier Penhoat <openhoat@gmail.com>
Date: Wed, 27 Jul 2016 15:53:48 +0200
Subject: [PATCH] set id as optional

---
 lib/entity.js | 7 ++++++-
 package.json  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/entity.js b/lib/entity.js
index 407fd72..02829e8 100644
--- a/lib/entity.js
+++ b/lib/entity.js
@@ -455,7 +455,12 @@ class Entity {
         logger.enabledLevels.debug && log.debug('saving new "%s" entity', type);
         return entity.validate('new');
       })
-      .then(() => entity.generateId())
+      .then(() => {
+        if (typeof entity.getId() !== 'undefined') {
+          return;
+        }
+        return entity.generateId();
+      })
       .then(() => entity.checkIndexes())
       .then(() => entity.saveIndexes(localMulti)
         .then(() => entity.saveLinks(localMulti))
diff --git a/package.json b/package.json
index ff363ce..d2c698a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hw-redis-ohm",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Redis Object Hash Mapping",
   "main": "lib/ohm.js",
   "scripts": {