websocket for Raid (update quest/task participant)

Kalinow · Apr 3, 2020 · ede02f1 · ede02f1
1 parent 4b83103
commit ede02f1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/sonarQuest-frontend/src/app/pages/raid-page/raid-page.component.ts b/sonarQuest-frontend/src/app/pages/raid-page/raid-page.component.ts
@@ -8,6 +8,7 @@ import { ActivatedRoute, Router, ParamMap } from '@angular/router';
 import { switchMap } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
 import { Task } from 'app/Interfaces/Task';
+import { EventService } from 'app/services/event.service';
 
 @Component({
   selector: 'app-raid-page',
@@ -22,13 +23,19 @@ export class RaidPageComponent implements OnInit, OnDestroy {
   public raidLeaderBoardList: RaidLeaderboard[] = [];
   private raidSubscription: Subscription;
 
-  constructor(private route: ActivatedRoute, private router: Router, private raidService: RaidService) { }
+  constructor(private route: ActivatedRoute, private router: Router, private raidService: RaidService, 
+    private eventService: EventService) { }
 
   ngOnDestroy(): void {
     this.raidSubscription.unsubscribe();
   }
 
   ngOnInit() {
+    this.getRaid();
+    this.subscribeTaskEvent();
+  }
+
+  getRaid() {
     const id = this.route.snapshot.paramMap.get('id');
     this.raidSubscription = this.raidService.findRaidById(id).subscribe(resp => {
       this.monster = new BaseMonster(resp.monsterName, resp.monsterImage,
@@ -38,4 +45,10 @@ export class RaidPageComponent implements OnInit, OnDestroy {
       this.raidLeaderBoardList = resp.raidLeaderboardList;
     });
   }
+
+  private subscribeTaskEvent() {
+    this.eventService.taskEvents$.subscribe(updated => {
+      this.getRaid();
+    });
+  }
 }
diff --git a/sonarQuest-frontend/src/app/services/event.service.ts b/sonarQuest-frontend/src/app/services/event.service.ts
@@ -30,6 +30,10 @@ export class EventService implements OnChanges {
   public userDtos$ = this.userDtosSubject.asObservable();
   private unseenEventsSubject: Subject<boolean> = new ReplaySubject(1);
   public unseenEvents$ = this.unseenEventsSubject.asObservable();
+
+  private taskEventsSubject: Subject<boolean> = new ReplaySubject(1);
+  public taskEvents$ = this.taskEventsSubject.asObservable();
+
   eventDtos: EventDto[] = [];
   userDtos: UserDto[] = [];
 
@@ -176,6 +180,15 @@ export class EventService implements OnChanges {
     }
   }
 
+  //TODO: Refactoring this! Issue: https://github.com/viadee/sonarQuest/issues/266
+  public eventUpdateTask(): Observable<boolean> {
+    const currentUrl = this.router.url.substring(1);
+    if (currentUrl !== RoutingUrls.events) {
+      this.taskEventsSubject.next(true);
+      return this.taskEventsSubject.asObservable();
+    }
+  }
+
   private handleError(error: HttpErrorResponse | any) {
     let errMsg: string;
     if (error instanceof HttpErrorResponse) {

diff --git a/sonarQuest-frontend/src/app/services/websocket.service.ts b/sonarQuest-frontend/src/app/services/websocket.service.ts
@@ -1,3 +1,4 @@
+import { RaidService } from 'app/services/raid.service';
 import { EventUserDto } from './../Interfaces/EventUserDto';
 import { World } from '../Interfaces/World';
 import { WorldService } from './world.service';
@@ -41,6 +42,11 @@ export class WebsocketService {
         that.eventService.addEvent(eventUserDto);
       });
     });
+    this.stompClient.connect({}, function(frame) {
+      this.chatStomp = that.stompClient.subscribe('/raid', raid => {
+        that.eventService.eventUpdateTask();
+      });
+    });
   }
 
   sendMessage(message) {