#7263 fix cascade deleting

IQSS · Nov 20, 2020 · 7809c50 · 7809c50
1 parent 3027e0b
commit 7809c50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/BannerMessage.java b/src/main/java/edu/harvard/iq/dataverse/BannerMessage.java
@@ -29,6 +29,9 @@ public class BannerMessage implements Serializable {
 
     @OneToMany(mappedBy = "bannerMessage", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
     private Collection<BannerMessageText> bannerMessageTexts;
+
+    @OneToMany(mappedBy = "bannerMessage", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
+    private Collection<UserBannerMessage> userBannerMessages;
 
     public Collection<BannerMessageText> getBannerMessageTexts() {
         return this.bannerMessageTexts;

diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
@@ -496,7 +496,8 @@ public void removeAuthentictedUserItems(AuthenticatedUser au){
 
         deletePendingAccessRequests(au);
 
-
+        deleteBannerMessages(au);
+
         if (!explicitGroupService.findGroups(au).isEmpty()) {
             for(ExplicitGroup explicitGroup: explicitGroupService.findGroups(au)){
                 explicitGroup.removeByRoleAssgineeIdentifier(au.getIdentifier());
@@ -505,6 +506,12 @@ public void removeAuthentictedUserItems(AuthenticatedUser au){
 
     }
 
+    private void deleteBannerMessages(AuthenticatedUser  au){
+
+       em.createNativeQuery("delete from userbannermessage where user_id  = "+au.getId()).executeUpdate();
+
+    }
+
     private void deletePendingAccessRequests(AuthenticatedUser  au){
 
        em.createNativeQuery("delete from fileaccessrequests where authenticated_user_id  = "+au.getId()).executeUpdate();