#7263 add deactivate as an endpoint

IQSS · Nov 24, 2020 · e134508 · e134508
1 parent b1c6b28
commit e134508
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/BannerMessageServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/BannerMessageServiceBean.java
@@ -51,6 +51,14 @@ public void save( BannerMessage message ) {
     public void deleteBannerMessage(Object pk) {
         BannerMessage message = em.find(BannerMessage.class, pk);
 
+        if (message != null) { 
+            em.remove(message);
+        }
+    }
+
+    public void deactivateBannerMessage(Object pk) {
+        BannerMessage message = em.find(BannerMessage.class, pk);
+
         if (message != null) { 
             message.setActive(false);
             em.merge(message);

diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -1887,12 +1887,29 @@ public Response addBannerMessage(JsonObject jsonObject) throws WrappedResponse {
     @Path("/bannerMessage/{id}")
     public Response deleteBannerMessage(@PathParam("id") Long id) throws WrappedResponse {
 
+        BannerMessage message = em.find(BannerMessage.class, id);
+        if (message == null){
+            return error(Response.Status.NOT_FOUND, "Message id = "  + id + " not found.");
+        }
         bannerMessageService.deleteBannerMessage(id);
 
         return ok("Message id =  " + id + " deleted.");
 
     }
 
+    @PUT
+    @Path("/bannerMessage/{id}/deactivate")
+    public Response deactivateBannerMessage(@PathParam("id") Long id) throws WrappedResponse {
+        BannerMessage message = em.find(BannerMessage.class, id);
+        if (message == null){
+            return error(Response.Status.NOT_FOUND, "Message id = "  + id + " not found.");
+        }
+        bannerMessageService.deactivateBannerMessage(id);
+
+        return ok("Message id =  " + id + " deactivated.");
+
+    }
+
     @GET
     @Path("/bannerMessage")
     public Response getBannerMessages(@PathParam("id") Long id) throws WrappedResponse {