From 2dd141e1e9bb5010528574876cceadd401c62d3d Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <themaxx76@gmail.com>
Date: Mon, 12 Apr 2021 19:23:16 +0200
Subject: [PATCH] [v1.1.0] Added new event publisher for new created and
 removed `Role`s having "`site`" type (#20896)

---
 CHANGELOG.md                                  |  4 ++--
 pom.xml                                       |  2 +-
 .../event/publisher/lr62/model/RoleEvent.java | 10 ++++++++
 .../lr62/model/RoleEventPublisher.java        | 23 ++++++++++++++-----
 4 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94d1e19..4fd66a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for "event-publisher-portal"
 
-## [v1.1.0-SNAPSHOT]
-Added new event publisher for new created `Role`s having "`site`" type (#20896)
+## [v1.1.0]
+Added new event publisher for new created and removed `Role`s having "`site`" type (#20896)
 
 ## [v1.0.0]
 - First release (#19461)
diff --git a/pom.xml b/pom.xml
index f451435..8f42d54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
 	<groupId>org.gcube.portal</groupId>
 	<artifactId>event-publisher-hook</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.0</version>
 	<packaging>war</packaging>
 
 	<properties>
diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEvent.java b/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEvent.java
index f79f7c5..211b31e 100644
--- a/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEvent.java
+++ b/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEvent.java
@@ -10,6 +10,7 @@ public class RoleEvent extends PortalModelListenerEvent<Role> {
 
     public static final String CREATED_NAME = "role_created";
     public static final String DELETED_NAME = "role_deleted";
+//    public static final String UPDATED_NAME = "role_updated";
 
     private RoleEvent(String name, Role role) throws PortalException, SystemException {
         super(name, role);
@@ -34,4 +35,13 @@ public class RoleEvent extends PortalModelListenerEvent<Role> {
         }
     }
 
+//    public static RoleEvent newUpdatedEvent(Role role) {
+//        try {
+//            return new RoleEvent(UPDATED_NAME, role.getDescriptiveName());
+//        } catch (PortalException | SystemException e) {
+//            log.error("Cannot create event from Role model object", e);
+//            return null;
+//        }
+//    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEventPublisher.java b/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEventPublisher.java
index a453d13..143f38c 100644
--- a/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEventPublisher.java
+++ b/src/main/java/org/gcube/portal/event/publisher/lr62/model/RoleEventPublisher.java
@@ -41,10 +41,25 @@ public class RoleEventPublisher extends AbstractEventPublisherBaseModelListener<
             }
             publish(event);
         } else if (log.isDebugEnabled()) {
-            log.debug("Removed a non-site type role: " + role.getName());
+            log.debug("Removed a non-site type role: " + role.getTitle());
         }
     }
 
+    @Override
+    public void onAfterUpdate(Role role) throws ModelListenerException {
+//        if (role.getType() == RoleConstants.TYPE_SITE) {
+//            log.info("Updated a role having site type");
+//            RoleEvent event = RoleEvent.newUpdatedEvent(role);
+//
+//            if (log.isTraceEnabled()) {
+//                log.trace("Event is: " + event);
+//            }
+//            publish(event);
+//        } else if (log.isDebugEnabled()) {
+//            log.debug("Updated a non-site type role: " + role.getName());
+//        }
+    }
+
     /* Uninteresting model events */
 
     @Override
@@ -61,10 +76,6 @@ public class RoleEventPublisher extends AbstractEventPublisherBaseModelListener<
             throws ModelListenerException {
     }
 
-    @Override
-    public void onAfterUpdate(Role role) throws ModelListenerException {
-    }
-
     @Override
     public void onBeforeAddAssociation(Object classPK, String associationClassName, Object associationClassPK)
             throws ModelListenerException {
@@ -78,7 +89,7 @@ public class RoleEventPublisher extends AbstractEventPublisherBaseModelListener<
     public void onBeforeRemoveAssociation(Object classPK, String associationClassName, Object associationClassPK)
             throws ModelListenerException {
     }
-
+    
     @Override
     public void onBeforeUpdate(Role role) throws ModelListenerException {
     }