From 0af0c3667378be8ba180786ae121e5b11d8ff084 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Mon, 2 Sep 2024 10:41:17 +0200
Subject: [PATCH] refactoring

---
 .../thingsboard/server/service/ws/WebSocketSessionRef.java   | 5 +++++
 .../ws/notification/DefaultNotificationCommandsHandler.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionRef.java b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionRef.java
index 44919b138c..7ce7bd5735 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionRef.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/WebSocketSessionRef.java
@@ -17,6 +17,7 @@ package org.thingsboard.server.service.ws;
 
 import lombok.Builder;
 import lombok.Data;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.service.security.model.SecurityUser;
 
 import java.net.InetSocketAddress;
@@ -39,6 +40,10 @@ public class WebSocketSessionRef {
     private final WebSocketSessionType sessionType;
     private final AtomicInteger sessionSubIdSeq = new AtomicInteger();
 
+    public TenantId getTenantId() {
+        return securityCtx != null ? securityCtx.getTenantId() : TenantId.SYS_TENANT_ID;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
index 84f3698845..77f000990c 100644
--- a/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
+++ b/application/src/main/java/org/thingsboard/server/service/ws/notification/DefaultNotificationCommandsHandler.java
@@ -242,7 +242,7 @@ public class DefaultNotificationCommandsHandler implements NotificationCommandsH
 
     @Override
     public void handleUnsubCmd(WebSocketSessionRef sessionRef, UnsubscribeCmd cmd) {
-        localSubscriptionService.cancelSubscription(sessionRef.getSecurityCtx().getTenantId(), sessionRef.getSessionId(), cmd.getCmdId());
+        localSubscriptionService.cancelSubscription(sessionRef.getTenantId(), sessionRef.getSessionId(), cmd.getCmdId());
     }
 
     private void sendUpdate(String sessionId, CmdUpdate update) {