Handling object update scenario such that an update overwrites the in…

…dex of a field with a prior index entry.
bekabox · Dec 26, 2010 · 939768c · 939768c
1 parent 051ec19
commit 939768c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/redis/clients/johm/JOhm.java b/src/main/java/redis/clients/johm/JOhm.java
@@ -153,6 +153,9 @@ public static <T> T save(final Object model) {
 
     @SuppressWarnings("unchecked")
     public static <T> T save(final Object model, boolean saveChildren) {
+        if (!isNew(model)) {
+            delete(model.getClass(), JOhmUtils.getId(model));
+        }
         final Nest nest = initIfNeeded(model);
 
         final Map<String, String> hashedObject = new HashMap<String, String>();
@@ -290,7 +293,8 @@ public static boolean delete(Class<?> clazz, int id, boolean deleteIndexes,
                             fieldValue = JOhmUtils.getId(fieldValue);
                         }
                         if (!JOhmUtils.isNullOrEmpty(fieldValue)) {
-                            nest.cat(field.getName()).cat(fieldValue).del();
+                            nest.cat(field.getName()).cat(fieldValue).srem(
+                                    String.valueOf(id));
                         }
                     }
                 }

diff --git a/src/test/java/redis/clients/johm/SearchTest.java b/src/test/java/redis/clients/johm/SearchTest.java
@@ -272,9 +272,9 @@ public void cannotSearchAfterDeletingIndexes() {
         assertNotNull(JOhm.get(User.class, id));
 
         List<User> users = JOhm.find(User.class, "age", 88);
-        assertEquals(1, users.size());
+        assertEquals(0, users.size()); // index already updated
         users = JOhm.find(User.class, "age", 77);
-        assertEquals(1, users.size());
+        assertEquals(0, users.size()); // index already updated
         users = JOhm.find(User.class, "age", 66);
         assertEquals(1, users.size());