diff --git a/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.ts b/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.ts index 4be55a5e1ad307728e11ce53787fa1448674688e..a6a036247e8c87caf4ecc1d266603a05e2a4829d 100644 --- a/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.ts +++ b/src/app/components/shared/feedback-barometer-page/feedback-barometer-page.component.ts @@ -3,7 +3,6 @@ import { ActivatedRoute } from '@angular/router'; import { AuthenticationService } from '../../../services/http/authentication.service'; import { UserRole } from '../../../models/user-roles.enum'; import { NotificationService } from '../../../services/util/notification.service'; -import { RxStompService } from '@stomp/ng2-stompjs'; import { Message } from '@stomp/stompjs'; import { WsFeedbackService } from '../../../services/websockets/ws-feedback.service'; @@ -27,7 +26,6 @@ export class FeedbackBarometerPageComponent implements OnInit { constructor( private authenticationService: AuthenticationService, private notification: NotificationService, - private rxStompService: RxStompService, private wsFeedbackService: WsFeedbackService, private route: ActivatedRoute, ) { this.roomId = localStorage.getItem(`roomId`); @@ -36,7 +34,7 @@ export class FeedbackBarometerPageComponent implements OnInit { ngOnInit() { this.userRole = this.authenticationService.getRole(); - this.rxStompService.watch(`/topic/${this.roomId}.feedback.stream`).subscribe((message: Message) => { + this.wsFeedbackService.getFeedbackStream(this.roomId).subscribe((message: Message) => { this.parseIncomingMessage(message); }); diff --git a/src/app/services/websockets/ws-feedback.service.ts b/src/app/services/websockets/ws-feedback.service.ts index 668095d1c8ca16d28261c50c2f1697374b838fb0..4061cec98e559c68599751bb9fc07e144be827b7 100644 --- a/src/app/services/websockets/ws-feedback.service.ts +++ b/src/app/services/websockets/ws-feedback.service.ts @@ -2,6 +2,8 @@ import { Injectable } from '@angular/core'; import { WsConnectorService } from '../../services/websockets/ws-connector.service'; import { CreateFeedback } from '../../models/messages/create-feedback'; import { GetFeedback } from '../../models/messages/get-feedback'; +import { Observable } from 'rxjs'; +import { IMessage } from '@stomp/stompjs'; @Injectable({ providedIn: 'root' @@ -19,4 +21,8 @@ export class WsFeedbackService { this.wsConnector.send(`/backend/queue/${roomId}.feedback.query`, JSON.stringify(getFeedback)); } + + getFeedbackStream(roomId: string): Observable<IMessage> { + return this.wsConnector.getWatcher(`/topic/${roomId}.feedback.stream`); + } }