From a9161c76e5b2b9738f8508462481c718bb56450a Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 5 Feb 2020 10:22:43 -0500
Subject: [PATCH] use bulkUpdate for unlock

---
 .../src/main/java/bubble/dao/account/AccountDAO.java   |  7 ++-----
 .../src/main/java/bubble/dao/app/AppDataDAO.java       | 10 ++++++++--
 utils/cobbzilla-wizard                                 |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
index bb69956f..325d146b 100644
--- a/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/account/AccountDAO.java
@@ -350,11 +350,8 @@ public class AccountDAO extends AbstractCRUDDAO<Account> implements SqlViewSearc
     @Transactional
     public void unlock() {
         synchronized (unlocked) {
-            final List<Account> all = findAll();
-            for (Account account : all) {
-                update(account.setLocked(false));
-            }
-            log.info("unlock: " + all.size() + " accounts unlocked");
+            final int count = bulkUpdate("locked", false);
+            log.info("unlock: " + count + " accounts unlocked");
             unlocked.set(true);
             configuration.refreshPublicSystemConfigs();
         }
diff --git a/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java b/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java
index 7634a9d4..8085f74e 100644
--- a/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/app/AppDataDAO.java
@@ -97,8 +97,14 @@ public class AppDataDAO extends AppTemplateEntityDAO<AppData> {
         return list(criteria().add(and(crits.toArray(new Criterion[0]))));
     }
 
-    public void deleteDevice(String uuid) { bulkDelete("device", uuid); }
+    public void deleteDevice(String uuid) {
+        final int count = bulkDelete("device", uuid);
+        log.info("deleteDevice: deleted "+count+" AppData records for device "+uuid);
+    }
 
-    public void deleteApp(String uuid) { bulkDelete("app", uuid); }
+    public void deleteApp(String uuid) {
+        final int count = bulkDelete("app", uuid);
+        log.info("deleteApp: deleted "+count+" AppData records for app "+uuid);
+    }
 
 }
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 7ce51555..0f8abf09 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 7ce51555339f93ec769066bf66b1a2831f298b22
+Subproject commit 0f8abf0974a738ddbef7314cba462ff4f5ce287b