feat: Drinker Logout

new-tech-project-2 · Nov 22, 2022 · 25413d0 · 25413d0
1 parent 4255f48
commit 25413d0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/dcom/ssdbackend/api/domain/dispenser/service/DispenserSocketService.java b/src/main/java/dcom/ssdbackend/api/domain/dispenser/service/DispenserSocketService.java
@@ -28,10 +28,14 @@ public void dispenserLogin(WebSocketSession session, String dispenserId, Map<Str
     }
 
     public void drinkerLogin(WebSocketSession session, String dispenserId, Map<String, List<WebSocketSession>> drinkerMap, Map<WebSocketSession, String> keyDrinkerMap) {
-        List<WebSocketSession> drinkerWebSocketSessionList = drinkerMap.get(dispenserId);
-        drinkerWebSocketSessionList.add(session);
+        drinkerMap.get(dispenserId).add(session);
         keyDrinkerMap.put(session,dispenserId);
     }
+    public void drinkerLogout(WebSocketSession session, String dispenserId, Map<String, List<WebSocketSession>> drinkerMap, Map<WebSocketSession, String> keyDrinkerMap) throws IOException {
+        drinkerMap.get(dispenserId).remove(session);
+        keyDrinkerMap.remove(session,dispenserId);
+        session.close();
+    }
 
     public void startDispenser(String dispenserId, Map<String, List<WebSocketSession>> drinkerMap, Map<String, WebSocketSession> keyDispenserMap) throws IOException {
         Dispenser dispenser = dispenserRepository.findById(dispenserId).get();

diff --git a/src/main/java/dcom/ssdbackend/api/global/websocket/WebSocketHandler.java b/src/main/java/dcom/ssdbackend/api/global/websocket/WebSocketHandler.java
@@ -41,6 +41,10 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
             dispenserSocketService.drinkerLogin(session,(String)jsonObject.get("dispenserId"),drinkerMap,keyDrinkerMap);
         }
 
+        if(jsonObject.get("eventType").equals("drinkerLogout")){
+            dispenserSocketService.drinkerLogout(session,(String)jsonObject.get("dispenserId"),drinkerMap,keyDrinkerMap);
+        }
+
         if(jsonObject.get("eventType").equals("startDispenser")){
             dispenserSocketService.startDispenser((String)jsonObject.get("dispenserId"),drinkerMap,keyDispenserMap);
         }
@@ -55,11 +59,10 @@ public void afterConnectionClosed (WebSocketSession session, CloseStatus status)
         if (keyDispenserMap.containsValue(session)) {
             String dispenserId = valueDispenserMap.get(session);
 
-            List<WebSocketSession> drinkerWebSocketSessionList = drinkerMap.get(dispenserId);
-
-            if (!drinkerWebSocketSessionList.isEmpty()) {
-                for (WebSocketSession s : drinkerWebSocketSessionList) {
+            if (!drinkerMap.get(dispenserId).isEmpty()) {
+                for (WebSocketSession s : drinkerMap.get(dispenserId)) {
                     s.sendMessage(new TextMessage("{\"eventType\":\"end\"}"));
+                    keyDrinkerMap.remove(s);
                     s.close();
                 }
             }