Completely broken will not work!

Author: LiamEarl

backend/pom.xml

@@ -30,6 +30,13 @@
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <version>3.5.6</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

backend/src/main/java/com/onevoneme/config/WebSocketConfig.java

@@ -0,0 +1,24 @@
+package com.onevoneme.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry config) {
+        config.enableSimpleBroker("/topic");
+        config.setApplicationDestinationPrefixes("/ws");
+    }
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/connect-ws"); // connection endpoint
+    }
+
+}

…voneme/controller/BackendController.java …onevoneme/controller/RestController.javabackend/src/main/java/com/onevoneme/controller/BackendController.java renamed to backend/src/main/java/com/onevoneme/controller/RestController.java backend/src/main/java/com/onevoneme/controller/BackendController.java renamed to backend/src/main/java/com/onevoneme/controller/RestController.java

@@ -1,24 +1,22 @@
 package com.onevoneme.controller;
 
-import com.onevoneme.model.GameUser;
-import com.onevoneme.model.game.Game;
-import com.onevoneme.model.move.TTTMove;
 import com.onevoneme.services.ManageGameService;
 import com.onevoneme.services.UsernamePolicyService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.Map;
 
-@RestController
+@org.springframework.web.bind.annotation.RestController
 @RequestMapping("/api")
-public class BackendController {
+public class RestController {
     private final ManageGameService gameService;
     private final UsernamePolicyService usernamePolicyService;
 
-    public BackendController(ManageGameService gameService, UsernamePolicyService usernamePolicyService) {
+    public RestController(ManageGameService gameService, UsernamePolicyService usernamePolicyService) {
         this.gameService = gameService;
         this.usernamePolicyService = usernamePolicyService;
     }
@@ -31,6 +29,16 @@ public ResponseEntity<Map<String, String>> health() {
         return ResponseEntity.ok(response);
     }
 
+
+    @PostMapping("/queue/{username}")
+    public ResponseEntity<String> queueUp(@PathVariable String username) {
+        if (!gameService.isUserCreated(username)) {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+
+        return ResponseEntity.status(HttpStatus.ACCEPTED).body(gameService.queueUp(username).toString());
+    }
+
     @PostMapping("/register/{username}")
     public ResponseEntity<String> registerUser(@PathVariable String username) {
         String policyError = usernamePolicyService.validateUsername(username);
@@ -44,35 +52,5 @@ public ResponseEntity<String> registerUser(@PathVariable String username) {
             return new ResponseEntity<>(HttpStatus.ACCEPTED);
         }
     }
-
-    @PostMapping("/queue/{username}")
-    public ResponseEntity<?> queueUp(@PathVariable String username) {
-        if (!gameService.isUserCreated(username)) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body("Please register before queueing.");
-        }
-        Game game = gameService.queueUp(username);
-        return ResponseEntity.ok(game);
-    }
-
-    @PostMapping("/make_move/tictactoe/{username}")
-    public ResponseEntity<String> makeTicTacMove(@PathVariable String username, @RequestBody TTTMove move) {
-        boolean success = gameService.makeMove(move);
-        return success ? ResponseEntity.ok("success") : ResponseEntity.badRequest().body("unsuccessful");
-    }
-
-    @GetMapping("/gamestate/{username}")
-    public Game getGameState(@PathVariable String username) {
-        return gameService.getGameState(username);
-    }
-//
-//    @PostMapping("/make_move/rockpaperscissors/{username}")
-//    public ResponseEntity<String> makeTicTacMove(@PathVariable String username, @RequestBody TTTMove move) {
-//        boolean success = gameService.makeMove(move);
-//    }
-
-    @GetMapping("/users")
-    public HashMap<String, GameUser> getUsers() {
-        return gameService.getUsers();
-    }
 }
 

backend/src/main/java/com/onevoneme/controller/SocketController.java

@@ -0,0 +1,43 @@
+package com.onevoneme.controller;
+import com.onevoneme.model.user.GameUser;
+import com.onevoneme.model.game.Game;
+import com.onevoneme.model.move.TTTMove;
+import com.onevoneme.services.ManageGameService;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.SendTo;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.HashMap;
+
+@Controller
+public class SocketController {
+
+    private final SimpMessagingTemplate messagingTemplate;
+    private final ManageGameService gameService;
+    public SocketController(ManageGameService gameService, SimpMessagingTemplate messagingTemplate) {
+        this.gameService = gameService;
+        this.messagingTemplate = messagingTemplate;
+    }
+
+    @MessageMapping("/make_move/tictactoe/{username}")
+    public Game makeTicTacMove(@PathVariable String username, @RequestBody TTTMove move) {
+        return gameService.makeMove(move);
+    }
+
+    @MessageMapping("/gamestate/{username}")
+    @SendTo("/topic/gamestate/{gamecode}")
+    public Game getGameState(@PathVariable String username) {
+        return gameService.getGameState(username);
+    }
+
+    @GetMapping("/users")
+    @SendTo("/topic/users")
+    public HashMap<String, GameUser> getUsers() {
+        return gameService.getUsers();
+    }
+
+}

backend/src/main/java/com/onevoneme/model/game/ActiveGame.java

@@ -1,37 +1,21 @@
 package com.onevoneme.model.game;
 
-import com.onevoneme.model.GameUser;
-import java.util.HashSet;
-import java.util.Set;
+import com.onevoneme.model.user.GameUser;
 
 public class ActiveGame {
     private GameUser[] users;
     private Game game;
-    private Set<String> usersAcknowledgedEnd = new HashSet<>();
 
     public ActiveGame(Game game, GameUser user1, GameUser user2) {
         this.game = game;
         users = new GameUser[] {user1, user2};
     }
 
-    // Explicit getters to avoid reliance on Lombok annotation processing in build environments
     public GameUser[] getUsers() {
         return users;
     }
 
     public Game getGame() {
         return game;
     }
-    
-    public void acknowledgeEnd(String username) {
-        usersAcknowledgedEnd.add(username);
-    }
-    
-    public boolean bothUsersAcknowledgedEnd() {
-        return usersAcknowledgedEnd.size() >= 2;
-    }
-    
-    public Set<String> getUsersAcknowledgedEnd() {
-        return usersAcknowledgedEnd;
-    }
 }

backend/src/main/java/com/onevoneme/model/game/Game.java

@@ -5,5 +5,6 @@
 public interface Game {
     boolean validateMove(Move move);
     void makeMove(Move move);
-    boolean getWon();
+    boolean gameCompleted();
+    String getWinner();
 }

backend/src/main/java/com/onevoneme/model/game/GameCodeGenerator.java

@@ -0,0 +1,16 @@
+package com.onevoneme.model.game;
+
+import java.security.SecureRandom;
+
+public class GameCodeGenerator {
+    private static final String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+    private static final SecureRandom rand = new SecureRandom();
+
+    public static String generate(int length) {
+        StringBuilder sb = new StringBuilder(length);
+        for (int i = 0; i < length; i++) {
+            sb.append(characters.charAt(rand.nextInt(characters.length())));
+        }
+        return sb.toString();
+    }
+}

backend/src/main/java/com/onevoneme/model/game/RockPaperScissors.java

@@ -1,12 +1,11 @@
 package com.onevoneme.model.game;
 
-import com.onevoneme.model.GameUser;
 import com.onevoneme.model.move.Move;
 import com.onevoneme.model.move.TTTMove;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class UltimateTTT implements Game {
     private int turn = 1;
@@ -15,24 +14,9 @@ public class UltimateTTT implements Game {
     private final String[] users;
     private int won = 0;
     private final String type = "tictactoe";
+    private final String code = GameCodeGenerator.generate(7);
 
-    public String getType() {
-        return type;
-    }
-
-    public int getTurn() {
-        return turn;
-    }
-
-    public int[][] getTotalBoard() {
-        return totalBoard;
-    }
-
-    public Map<String, Integer> getUsernameToTacNumber() {
-        return usernameToTacNumber;
-    }
-
-    public int getWinner() {
+    public int getWon() {
         return won;
     }
 
@@ -83,10 +67,23 @@ public void makeMove(Move move) {
     }
 
     @Override
-    public boolean getWon() {
+    public boolean gameCompleted() {
         return this.won != 0;
     }
 
+    @Override
+    public String getWinner() {
+        if(this.won == 0) return "None";
+        if(this.won == -1) return "Cats";
+        AtomicReference<String> winner = new AtomicReference<>("");
+        usernameToTacNumber.forEach((key, value) -> {
+            if(this.won == value) {
+                winner.set(key);
+            }
+        });
+        return winner.get();
+    }
+
     // Returns winner number (1 or 2) if someone won, 0 if no winner yet or cat's game
     public int isBoardWon() {
         // Check rows
@@ -131,4 +128,25 @@ public boolean isBoardFull() {
         }
         return true;
     }
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public int getTurn() {
+        return turn;
+    }
+
+    public int[][] getTotalBoard() {
+        return totalBoard;
+    }
+
+    public Map<String, Integer> getUsernameToTacNumber() {
+        return usernameToTacNumber;
+    }
+
 }