From bafe2ead28c24b9c7df5259c9fc9194afd8c525c Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 21 Jan 2020 17:15:04 -0500
Subject: [PATCH] improve support for adding app data

---
 .../main/java/bubble/resources/app/DataResourceBase.java   | 7 ++++++-
 utils/cobbzilla-wizard                                     | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java b/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
index 902e20ad..8d9104b8 100644
--- a/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
+++ b/bubble-server/src/main/java/bubble/resources/app/DataResourceBase.java
@@ -18,12 +18,15 @@ import javax.ws.rs.Produces;
 import java.util.List;
 
 import static org.cobbzilla.util.http.HttpContentTypes.APPLICATION_JSON;
+import static org.cobbzilla.util.reflect.ReflectionUtil.copy;
 import static org.cobbzilla.wizard.resources.ResourceUtil.notFoundEx;
 
 @Consumes(APPLICATION_JSON)
 @Produces(APPLICATION_JSON) @Slf4j
 public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppData, AppDataDAO> {
 
+    private static final String[] BASIS_FIELDS = {"app", "site"};
+
     @Autowired protected BubbleConfiguration configuration;
     @Autowired protected AccountDAO accountDAO;
     @Autowired protected BubbleAppDAO appDAO;
@@ -32,7 +35,7 @@ public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppD
     @Autowired protected AppMatcherDAO matcherDAO;
     @Autowired protected AppSiteDAO siteDAO;
 
-    private AppData basis;
+    protected AppData basis;
 
     public DataResourceBase (Account account, AppData basis) {
         super(account);
@@ -51,6 +54,8 @@ public abstract class DataResourceBase extends AccountOwnedTemplateResource<AppD
 
     @Override protected AppData setReferences(ContainerRequest ctx, Account caller, AppData request) {
 
+        copy(request, basis, BASIS_FIELDS);
+
         final BubbleApp app = appDAO.findByAccountAndId(caller.getUuid(), request.getApp());
         if (app == null) throw notFoundEx(request.getApp());
         request.setApp(app.getUuid());
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 60acd208..19f9c0d7 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 60acd20840b4a6929909fb682a9c09b7d35f676c
+Subproject commit 19f9c0d74c1becc6a2a3c0a6a102a35dedc9bc0a