From 72719ed9313b03a7f044075bf0458de39ee19c8e Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 25 Aug 2020 06:04:42 -0400
Subject: [PATCH] fix default footprint lookup, find account footprint

---
 .../java/bubble/dao/account/AccountOwnedEntityDAO.java     | 5 +++++
 .../src/main/java/bubble/dao/account/TrustedClientDAO.java | 3 +++
 .../java/bubble/resources/bill/AccountPlansResource.java   | 7 ++++++-
 .../src/main/java/bubble/service/cloud/GeoService.java     | 1 -
 bubble-server/src/main/resources/messages                  | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java b/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java
index 8c2df5cf..84d69d1e 100644
--- a/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/account/AccountOwnedEntityDAO.java
@@ -64,6 +64,11 @@ public abstract class AccountOwnedEntityDAO<E extends HasAccount>
         return found != null ? found : findByAccountAndId(account.getParent(), id);
     }
 
+    public E findByAccountAndNameAndParentId(Account account, String id) {
+        final E found = findByAccountAndId(account.getParent(), id);
+        return found == null ? null : findByAccountAndId(account.getUuid(), found.getName());
+    }
+
     public File getFile(String cloudServiceUuid, String key) {
         final String sha = sha256_hex(key);
         final String pathMiddle;
diff --git a/bubble-server/src/main/java/bubble/dao/account/TrustedClientDAO.java b/bubble-server/src/main/java/bubble/dao/account/TrustedClientDAO.java
index 58b092fd..71d4c59f 100644
--- a/bubble-server/src/main/java/bubble/dao/account/TrustedClientDAO.java
+++ b/bubble-server/src/main/java/bubble/dao/account/TrustedClientDAO.java
@@ -6,6 +6,7 @@ package bubble.dao.account;
 
 import bubble.model.account.TrustedClient;
 import lombok.extern.slf4j.Slf4j;
+import org.cobbzilla.wizard.model.Identifiable;
 import org.springframework.stereotype.Repository;
 
 import static java.util.UUID.randomUUID;
@@ -13,6 +14,8 @@ import static java.util.UUID.randomUUID;
 @Repository @Slf4j
 public class TrustedClientDAO extends AccountOwnedEntityDAO<TrustedClient> {
 
+    @Override protected String getNameField() { return Identifiable.UUID; }
+
     @Override public Object preCreate(TrustedClient trusted) {
         return super.preCreate(trusted.setTrustId(randomUUID().toString()));
     }
diff --git a/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java b/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
index 2c7e6935..88326800 100644
--- a/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
+++ b/bubble-server/src/main/java/bubble/resources/bill/AccountPlansResource.java
@@ -214,7 +214,12 @@ public class AccountPlansResource extends AccountOwnedResource<AccountPlan, Acco
             }
         } else {
             log.warn("setReferences: footprint not set, using default");
-            request.setFootprint(configuration.getThisNetwork().getFootprint());
+            final BubbleFootprint footprint = footprintDAO.findByAccountAndNameAndParentId(caller, configuration.getThisNetwork().getFootprint());
+            if (footprint == null) {
+                errors.addViolation("err.footprint.defaultNotFound");
+            } else {
+                request.setFootprint(footprint.getUuid());
+            }
         }
 
         AccountPaymentMethod paymentMethod = null;
diff --git a/bubble-server/src/main/java/bubble/service/cloud/GeoService.java b/bubble-server/src/main/java/bubble/service/cloud/GeoService.java
index 92efd673..721484e9 100644
--- a/bubble-server/src/main/java/bubble/service/cloud/GeoService.java
+++ b/bubble-server/src/main/java/bubble/service/cloud/GeoService.java
@@ -245,7 +245,6 @@ public class GeoService {
         final double latitude = geo.getLatitude();
         final double longitude = geo.getLongitude();
         return getCloudRegionRelatives(network, latitude, longitude, exclude);
-
     }
 
     public List<CloudRegionRelative> getCloudRegionRelatives(BubbleNetwork network,
diff --git a/bubble-server/src/main/resources/messages b/bubble-server/src/main/resources/messages
index fefb38ea..f2f003c9 160000
--- a/bubble-server/src/main/resources/messages
+++ b/bubble-server/src/main/resources/messages
@@ -1 +1 @@
-Subproject commit fefb38ea11b3a1020474418e045cec997bed9510
+Subproject commit f2f003c914bedd55485a5f27132d86c62477bd5a