#103 appended the trigger key to the websocket topic

quartz-manager-frontend/src/app/components/logs-panel/logs-panel.component.ts

@@ -2,10 +2,12 @@ import {Component, OnInit, Input, Output, EventEmitter, OnDestroy} from '@angula
 
 import {LogsWebsocketService, ApiService, getBaseUrl, CONTEXT_PATH, QuartzManagerWebsocketMessage} from '../../services';
 import {Observable} from 'rxjs';
-import {RxStompService, } from '../../services/rx-stomp.service';
+import {RxStompService,} from '../../services/rx-stomp.service';
 import {RxStompConfig} from '@stomp/rx-stomp/esm6/rx-stomp-config';
 import {LogsRxWebsocketService} from '../../services/logs.rx-websocket.service';
 import {map} from 'rxjs/operators';
+import {Trigger} from '../../model/trigger.model';
+import {TriggerKey} from '../../model/triggerKey.model';
 
 
 @Component({
@@ -21,6 +23,8 @@ export class LogsPanelComponent implements OnInit, OnDestroy {
 
   topicSubscription;
 
+  private selectedTriggerKey: TriggerKey;
+
   constructor(
     // private logsWebsocketService: LogsWebsocketService,
     private logsRxWebsocketService: LogsRxWebsocketService,
@@ -28,6 +32,14 @@ export class LogsPanelComponent implements OnInit, OnDestroy {
   ) {
   }
 
+  @Input()
+  set triggerKey(triggerKey: TriggerKey) {
+    this.selectedTriggerKey = {...triggerKey} as TriggerKey;
+    if (this.selectedTriggerKey && this.selectedTriggerKey.name) {
+      this._subscribeToTheTopic(this.selectedTriggerKey);
+    }
+  }
+
   ngOnInit() {
     // const obs = this.logsWebsocketService.getObservable()
     // obs.subscribe({
@@ -37,17 +49,34 @@ export class LogsPanelComponent implements OnInit, OnDestroy {
     //   }
     // });
 
-    this.topicSubscription = this.logsRxWebsocketService.watch('/topic/logs')
+    // this.topicSubscription = this.logsRxWebsocketService.watch('/topic/logs')
+    //   .pipe(map(msg => JSON.parse(msg.body)))
+    //   .subscribe(this._showNewLog, (err) => {
+    //     console.log(err);
+    //     // TODO in case of 401
+    //     // this.apiService.get('/quartz-manager/session/refresh');
+    //   });
+  }
+
+  private _subscribeToTheTopic = (triggerKey: TriggerKey) => {
+    if (this.topicSubscription) {
+      this.topicSubscription.unsubscribe();
+    }
+    this.topicSubscription = this.logsRxWebsocketService.watch(`/topic/logs/${triggerKey.name}`)
       .pipe(map(msg => JSON.parse(msg.body)))
       .subscribe(this._showNewLog, (err) => {
         console.log(err);
         // TODO in case of 401
         // this.apiService.get('/quartz-manager/session/refresh');
       });
-  }
+  };
 
   ngOnDestroy() {
+    if (this.topicSubscription) {
+      this.topicSubscription.unsubscribe();
+    }
     this.topicSubscription.unsubscribe();
+    this.topicSubscription = null;
   }
 
   // onNewLogMsg = (receivedMsg) => {

quartz-manager-frontend/src/app/components/simple-trigger-config/simple-trigger-config.component.ts

@@ -73,8 +73,10 @@ export class SimpleTriggerConfigComponent implements OnInit {
 
   @Input()
   set triggerKey(triggerKey: TriggerKey) {
-    this.selectedTriggerKey = {...triggerKey} as TriggerKey;
+    if (!this.selectedTriggerKey || this.selectedTriggerKey.name !== triggerKey.name){
-    this.fetchSelectedTrigger();
+      this.selectedTriggerKey = {...triggerKey} as TriggerKey;
+      this.fetchSelectedTrigger();
+    }
   }
 
 

quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts

@@ -90,7 +90,7 @@ export class TriggerListComponent implements OnInit {
 
   onNewTrigger(newTrigger: SimpleTrigger) {
     this.newTriggers = [newTrigger, ...this.newTriggers];
-    this.selectedTrigger = newTrigger.triggerKeyDTO;
+    this.selectTrigger(newTrigger.triggerKeyDTO);
   }
 }
 

quartz-manager-frontend/src/app/views/manager/manager.component.html

@@ -30,7 +30,10 @@
     <div fxFlex="1 1 auto" style="margin-left: 20px;">
         <div fxFlex="1 1 auto" fxLayout="column" fxLayoutAlign="start stretch" fxLayoutGap="6px">
           <progress-panel></progress-panel>
-          <logs-panel fxFlex="1 1 auto" fxFill></logs-panel>
+          <logs-panel fxFlex="1 1 auto" fxFill
+                      [triggerKey]=selectedTriggerKey
+          >
+          </logs-panel>
         </div>
     </div>
 

quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/AbstractQuartzManagerJob.java

@@ -38,11 +38,13 @@ public abstract class AbstractQuartzManagerJob implements Job {
     LogRecord logMsg = doIt(jobExecutionContext);
     log.info(logMsg.getMessage());
 
+    String triggerName = jobExecutionContext.getTrigger().getKey().getName();
+
     logMsg.setThreadName(Thread.currentThread().getName());
-    webSocketLogsNotifier.send(logMsg);
+    webSocketLogsNotifier.send(triggerName, logMsg);
 
     TriggerFiredBundleDTO triggerFiredBundleDTO = WebSocketProgressNotifier.buildTriggerFiredBundle(jobExecutionContext);
-    webSocketProgressNotifier.send(triggerFiredBundleDTO);
+    webSocketProgressNotifier.send(triggerName, triggerFiredBundleDTO);
   }
 
 }

quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketLogsNotifier.java

@@ -14,7 +14,7 @@ public class WebSocketLogsNotifier implements WebhookSender<LogRecord> {
   private SimpMessageSendingOperations messagingTemplate;
 
   @Override
-  public void send(LogRecord logRecord) {
+  public void send(String triggerName, LogRecord logRecord) {
-    messagingTemplate.convertAndSend(TOPIC_LOGS, logRecord);
+    messagingTemplate.convertAndSend(TOPIC_LOGS + "/" + triggerName, logRecord);
   }
 }

quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java

@@ -20,7 +20,7 @@ public class WebSocketProgressNotifier implements WebhookSender<TriggerFiredBund
   private SimpMessageSendingOperations messagingTemplate;
 
   @Override
-  public void send(TriggerFiredBundleDTO triggerFiredBundleDTO) {
+  public void send(String triggerName, TriggerFiredBundleDTO triggerFiredBundleDTO) {
      messagingTemplate.convertAndSend(TOPIC_PROGRESS, triggerFiredBundleDTO);
   }
 

quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebhookSender.java

@@ -9,6 +9,6 @@ package it.fabioformosa.quartzmanager.api.websockets;
  */
 public interface WebhookSender<T> {
 
-	void send(T message);
+	void send(String triggerName, T message);
 
 }

quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJobTest.java

@@ -32,6 +32,7 @@ class SampleJobTest {
   @Test
   void givenASampleJob_whenTheJobIsExecuted_thenTheWebhookSendersAreCalled() {
     JobExecutionContext jobExecutionContext = Mockito.mock(JobExecutionContext.class);
+    String triggerName = "test-trigger";
 
     ScheduleBuilder schedulerBuilder = SimpleScheduleBuilder.simpleSchedule()
       .withRepeatCount(5)
@@ -40,6 +41,7 @@ class SampleJobTest {
       .newJob(SampleJob.class).withIdentity(JobKey.jobKey("test-job"))
       .build();
     Trigger trigger = TriggerBuilder.newTrigger()
+      .withIdentity(triggerName)
       .forJob(jobDetail)
       .withSchedule(schedulerBuilder)
       .build();
@@ -47,14 +49,14 @@ class SampleJobTest {
     Mockito.when(jobExecutionContext.getJobDetail()).thenReturn(jobDetail);
 
     sampleJob.execute(jobExecutionContext);
-    Mockito.verify(webSocketLogsNotifier).send(argThat(actualLogRecord -> {
+    Mockito.verify(webSocketLogsNotifier).send(triggerName, argThat(actualLogRecord -> {
       Assertions.assertThat(actualLogRecord.getMessage()).isEqualTo("Hello!");
       Assertions.assertThat(actualLogRecord.getType()).isEqualTo(LogRecord.LogType.INFO);
       Assertions.assertThat(actualLogRecord.getDate()).isNotNull();
       Assertions.assertThat(actualLogRecord.getThreadName()).isNotNull();
       return true;
     }));
-    Mockito.verify(webSocketProgressNotifier).send(argThat(triggerFiredBundleDTO -> {
+    Mockito.verify(webSocketProgressNotifier).send(triggerName, argThat(triggerFiredBundleDTO -> {
       Assertions.assertThat(triggerFiredBundleDTO.getJobKey()).isEqualTo("test-job");
       Assertions.assertThat(triggerFiredBundleDTO.getRepeatCount()).isEqualTo(6);
       Assertions.assertThat(triggerFiredBundleDTO.getJobClass()).isEqualTo(SampleJob.class.getName());