Merge remote-tracking branch 'origin/release/7.0.0-rev2' into NAE-2092_old_user

Author: machacjozef

application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/FieldActionsRunner.groovy

@@ -3,6 +3,8 @@ package com.netgrif.application.engine.petrinet.domain.dataset.logic.action
 import com.netgrif.application.engine.business.IPostalCodeService
 import com.netgrif.application.engine.business.orsr.IOrsrService
 import com.netgrif.application.engine.importer.service.FieldFactory
+import com.netgrif.application.engine.objects.event.events.event.ActionStartEvent
+import com.netgrif.application.engine.objects.event.events.event.ActionStopEvent
 import com.netgrif.application.engine.workflow.service.interfaces.IFieldActionsCacheService
 import com.netgrif.application.engine.objects.petrinet.domain.Function
 import com.netgrif.application.engine.objects.workflow.domain.Case
@@ -12,6 +14,7 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Lookup
+import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Component
 
 @Component
@@ -35,6 +38,9 @@ abstract class FieldActionsRunner {
     @Autowired
     private IFieldActionsCacheService actionsCacheService
 
+    @Autowired
+    private ApplicationEventPublisher publisher
+
     private Map<String, Object> actionsCache = new HashMap<>()
 
     List<EventOutcome> run(com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.action.Action action, Case useCase, Map<String, String> params, List<Function> functions = []) {
@@ -47,11 +53,15 @@ abstract class FieldActionsRunner {
 
         log.debug("Action: $action")
         def code = getActionCode(action, functions)
+        final ActionStartEvent actionStart = new ActionStartEvent(action)
         try {
+            publisher.publishEvent(actionStart)
             code.init(action, useCase, task, this, params)
             code()
+            publisher.publishEvent(new ActionStopEvent(action, actionStart, true))
         } catch (Exception e) {
             log.error("Action: $action.definition")
+            publisher.publishEvent(new ActionStopEvent(action, actionStart, false))
             throw e
         }
         return ((ActionDelegate) code.delegate).outcomes

application-engine/src/main/java/com/netgrif/application/engine/event/dispatchers/ActionDispatcher.java

@@ -0,0 +1,38 @@
+package com.netgrif.application.engine.event.dispatchers;
+
+
+import com.netgrif.application.engine.objects.event.dispatchers.common.AbstractDispatcher;
+
+import com.netgrif.application.engine.objects.event.events.event.ActionStartEvent;
+import com.netgrif.application.engine.objects.event.events.event.ActionStopEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Set;
+
+@Component
+public class ActionDispatcher extends AbstractDispatcher {
+    protected ActionDispatcher() {
+        super(Set.of(ActionStartEvent.class, ActionStopEvent.class));
+    }
+
+    @EventListener
+    public void handleActionStartEvent(ActionStartEvent event) {
+        dispatch(event);
+    }
+
+    @EventListener
+    public void handleAsyncActionStartEvent(ActionStartEvent event) {
+        dispatchAsync(event);
+    }
+
+    @EventListener
+    public void handleActionStopEvent(ActionStopEvent event) {
+        dispatch(event);
+    }
+
+    @EventListener
+    public void handleAsyncActionStopEvent(ActionStopEvent event) {
+        dispatchAsync(event);
+    }
+}

application-engine/src/main/java/com/netgrif/application/engine/impersonation/service/ImpersonationService.java

@@ -6,6 +6,7 @@
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
 import com.netgrif.application.engine.auth.service.UserService;
 import com.netgrif.application.engine.configuration.properties.ImpersonationProperties;
+import com.netgrif.application.engine.objects.event.RunPhase;
 import com.netgrif.application.engine.objects.event.events.user.ImpersonationEvent;
 import com.netgrif.application.engine.objects.event.events.user.ImpersonationPhase;
 import com.netgrif.application.engine.impersonation.domain.Impersonator;
@@ -90,7 +91,7 @@ protected LoggedUser doImpersonate(LoggedUser loggedUser, LoggedUser impersonate
         securityContextService.saveToken(loggedUser.getId());
         securityContextService.reloadSecurityContext(loggedUser);
         log.info(loggedUser.getFullName() + " has just impersonated user " + impersonatedLogged.getFullName());
-        publisher.publishEvent(new ImpersonationEvent(loggedUser, impersonatedLogged, ImpersonationPhase.START));
+        publisher.publishEvent(new ImpersonationEvent(loggedUser, impersonatedLogged, RunPhase.START));
         return loggedUser;
     }
 
@@ -122,15 +123,15 @@ public LoggedUser endImpersonation(LoggedUser impersonator) {
         log.info(impersonator.getFullName() + " has stopped impersonating user " + impersonated.getFullName());
         securityContextService.saveToken(impersonator.getId());
         securityContextService.reloadSecurityContext(impersonator);
-        publisher.publishEvent(new ImpersonationEvent(impersonator, impersonated, ImpersonationPhase.STOP));
+        publisher.publishEvent(new ImpersonationEvent(impersonator, impersonated, RunPhase.STOP));
         return impersonator;
     }
 
     @Override
     public void onSessionDestroy(LoggedUser impersonator) {
         removeImpersonator(impersonator.getId());
         log.info(impersonator.getFullName() + " has logged out and stopped impersonating user " + impersonator.getImpersonated().getFullName());
-        publisher.publishEvent(new ImpersonationEvent(impersonator, impersonator.getImpersonated(), ImpersonationPhase.STOP));
+        publisher.publishEvent(new ImpersonationEvent(impersonator, impersonator.getImpersonated(), RunPhase.STOP));
     }
 
     @Override

application-engine/src/main/resources/logback.xml

@@ -8,9 +8,9 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+              value="${CONSOLE_LOG_PATTERN:-%clr(time=){yellow}%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint}  %clr(level=){yellow}%clr(${LOG_LEVEL_PATTERN:-%-5p})  %clr(pid=){yellow}%clr(${PID:- }){magenta}  %clr(thread=){yellow}%clr(%-15.15t){faint}  %clr(logger=){yellow}%clr(%-40.40logger{39}){cyan}  %clr(msg=){yellow}%m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <property name="FILE_LOG_PATTERN"
-              value="${FILE_LOG_PATTERN:-%d{yyyy-MM-dd HH:mm:ss.SSS} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+              value="${FILE_LOG_PATTERN:-time=%d{yyyy-MM-dd HH:mm:ss.SSS} level=${LOG_LEVEL_PATTERN:-%5p} pid=${PID:- } thread=%t logger=%-40.40logger{39} msg=%m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
     <logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>

nae-object-library/src/main/java/com/netgrif/application/engine/objects/event/RunPhase.java

@@ -0,0 +1,6 @@
+package com.netgrif.application.engine.objects.event;
+
+public enum RunPhase {
+    START,
+    STOP
+}

nae-object-library/src/main/java/com/netgrif/application/engine/objects/event/events/Event.java

@@ -23,6 +23,7 @@ public Event(Object source) {
     public Event(Object source, EventPhase eventPhase) {
         super(source);
         this.eventPhase = eventPhase;
+        this.time = LocalDateTime.now();
     }
 
     public abstract String getMessage();

nae-object-library/src/main/java/com/netgrif/application/engine/objects/event/events/event/ActionEvent.java

@@ -0,0 +1,33 @@
+package com.netgrif.application.engine.objects.event.events.event;
+
+import com.netgrif.application.engine.objects.event.RunPhase;
+import com.netgrif.application.engine.objects.event.events.Event;
+import com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.action.Action;
+import lombok.Getter;
+import org.bson.types.ObjectId;
+
+import java.util.Map;
+
+@Getter
+public abstract class ActionEvent extends Event {
+
+    private final String importId;
+    private final ObjectId id;
+    private final Map<String, String> fieldIds;
+    private final Map<String, String> transitionIds;
+    private RunPhase phase;
+
+
+    public ActionEvent(Action action) {
+        super(action);
+        this.importId = action.getImportId();
+        this.id = action.getId();
+        this.fieldIds = action.getFieldIds();
+        this.transitionIds = action.getTransitionIds();
+    }
+
+    protected void setPhase(RunPhase phase) {
+        this.phase = phase;
+    }
+
+}

nae-object-library/src/main/java/com/netgrif/application/engine/objects/event/events/event/ActionStartEvent.java

@@ -0,0 +1,23 @@
+package com.netgrif.application.engine.objects.event.events.event;
+
+import com.netgrif.application.engine.objects.event.RunPhase;
+import com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.action.Action;
+import com.netgrif.application.engine.objects.petrinet.domain.events.DataEventType;
+import lombok.Getter;
+
+@Getter
+public class ActionStartEvent  extends ActionEvent {
+
+    private final DataEventType trigger;
+
+    public ActionStartEvent(Action action) {
+        super(action);
+        this.trigger = action.getTrigger();
+        setPhase(RunPhase.START);
+    }
+
+    @Override
+    public String getMessage() {
+        return String.format("ActionStartEvent: %s [%s] %s", trigger, getId(), getPhase());
+    }
+}

nae-object-library/src/main/java/com/netgrif/application/engine/objects/event/events/event/ActionStopEvent.java

@@ -0,0 +1,33 @@
+package com.netgrif.application.engine.objects.event.events.event;
+
+import com.netgrif.application.engine.objects.event.RunPhase;
+import com.netgrif.application.engine.objects.petrinet.domain.dataset.logic.action.Action;
+import lombok.Getter;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+@Getter
+public class ActionStopEvent extends ActionStartEvent {
+
+    private final boolean success;
+    private final long totalDuration;
+
+    public ActionStopEvent(Action action, ActionStartEvent startEvent, boolean success) {
+        super(action);
+        setPhase(RunPhase.STOP);
+        this.success = success;
+        this.totalDuration = calculateExecutionDuration(startEvent.getTime());
+    }
+
+    @Override
+    public String getMessage() {
+        return String.format("ActionStopEvent: %s [%s] %s", getTrigger(), getId(), getPhase());
+    }
+
+    private long calculateExecutionDuration(LocalDateTime start) {
+        Duration duration = Duration.between(start, this.getTime());
+        return duration.toMillis();
+    }
+
+}

nae-object-library/src/main/java/com/netgrif/application/engine/objects/event/events/user/ImpersonationEvent.java

@@ -1,23 +1,24 @@
 package com.netgrif.application.engine.objects.event.events.user;
 
 import com.netgrif.application.engine.objects.auth.domain.LoggedUser;
+import com.netgrif.application.engine.objects.event.RunPhase;
 import lombok.Getter;
 
 public class ImpersonationEvent extends UserEvent {
 
     @Getter
     private LoggedUser impersonated;
 
-    private final ImpersonationPhase impersonationPhase;
+    private final RunPhase runPhase;
 
-    public ImpersonationEvent(LoggedUser user, LoggedUser impersonated, ImpersonationPhase impersonationPhase) {
+    public ImpersonationEvent(LoggedUser user, LoggedUser impersonated, RunPhase runPhase) {
         super(user);
         this.impersonated = impersonated;
-        this.impersonationPhase = impersonationPhase;
+        this.runPhase = runPhase;
     }
 
     @Override
     public String getMessage() {
-        return "User " + user.getUsername() + " is impersonating: " + impersonated.getUsername() + " phase: " + impersonationPhase;
+        return "User " + user.getUsername() + " is impersonating: " + impersonated.getUsername() + " phase: " + runPhase;
     }
 }