From b79f310163b7ab01d57bb58e632d89cd61909ded Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 14 Jan 2019 14:32:34 +0100
Subject: [PATCH] Update/sync of develop before branching
---
.../no/nibio/vips/logic/controller/session/UserBean.java | 7 +++++++
src/main/java/no/nibio/vips/logic/entity/Organization.java | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
index 25ca99b4..44d8c643 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
@@ -215,6 +215,13 @@ public class UserBean {
user = em.find(VipsLogicUser.class, user.getUserId());
// Remove all notification subscriptions
SessionControllerGetter.getMessagingBean().deleteAllNotificationSubscriptions(user);
+ // TODO: Move these objects from user to be deleted to the organization's archive user
+ // * All observations
+ // * All messages
+ // * All POIs
+ // * All non-private forecast configurations
+ //
+ // TODO: Delete all of the user's private forecast configurations and results
em.remove(user);
}
diff --git a/src/main/java/no/nibio/vips/logic/entity/Organization.java b/src/main/java/no/nibio/vips/logic/entity/Organization.java
index b948b010..5da5b372 100755
--- a/src/main/java/no/nibio/vips/logic/entity/Organization.java
+++ b/src/main/java/no/nibio/vips/logic/entity/Organization.java
@@ -39,7 +39,6 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.persistence.FetchType;
-import org.hibernate.annotations.Type;
/**
* @copyright 2013 <a href="http://www.nibio.no/">NIBIO</a>
--
GitLab