Update Main before Sprint 3

Dockerfile

@@ -3,7 +3,7 @@ WORKDIR /app
 COPY . .
 RUN mvn clean package -DskipTests
 
-FROM eclipse-temurin:17-jdk-jammy
+FROM eclipse-temurin:17-jre-jammy
 WORKDIR /app
 COPY --from=build /app/target/*.jar app.jar
 

docker-compose.yml

@@ -2,6 +2,14 @@ services:
   postgres:
     image: postgres:16
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          cpus: "0.25"
+          memory: 256M
+        reservations:
+          cpus: "0.10"
+          memory: 128M
     environment:
       POSTGRES_DB: codenames
       POSTGRES_USER: codenames_user
@@ -17,11 +25,18 @@ services:
   backend:
     image: ghcr.io/ss26-se2-codenames/backend:latest
     restart: unless-stopped
+    deploy:
+      resources:
+        limits:
+          cpus: "0.50"
+          memory: 512M
+        reservations:
+          cpus: "0.25"
+          memory: 256M
     ports:
       - "53213:8080"
-    volumes:
-      - ./data:/app/data
     environment:  # Inject datasource url into application.yml when containerized
+      JAVA_TOOL_OPTIONS: "-XX:MaxRAMPercentage=75"
       SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/codenames
       SPRING_DATASOURCE_USERNAME: codenames_user
       SPRING_DATASOURCE_PASSWORD: codenames_pass
@@ -30,4 +45,4 @@ services:
         condition: service_healthy
 
 volumes:
-  postgres_data:
+  postgres_data:

lombok.config

@@ -0,0 +1,6 @@
+#Source - https://stackoverflow.com/a/48971823
+#Posted by mladzo, modified by community. See post 'Timeline' for change history
+#Retrieved 2026-06-04, License - CC BY-SA 3.0
+
+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true

pom.xml

@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.2.5</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath /> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.codenames</groupId>
     <artifactId>Codenames_Backend</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>Codenames_Backend</name>
     <description>Codenames_Backend</description>
-    <url/>
+    <url />
     <licenses>
-        <license/>
+        <license />
     </licenses>
     <developers>
-        <developer/>
+        <developer />
     </developers>
     <scm>
-        <connection/>
-        <developerConnection/>
-        <tag/>
-        <url/>
+        <connection />
+        <developerConnection />
+        <tag />
+        <url />
     </scm>
     <properties>
         <java.version>17</java.version>
@@ -58,7 +59,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>
@@ -93,6 +94,10 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/codenames/codenames/backend/chat/ChatController.java → src/main/java/com/codenames/codenames/backend/chat/api/ChatController.java

@@ -1,9 +1,11 @@
-package com.codenames.codenames.backend.chat;
+package com.codenames.codenames.backend.chat.api;
 
-import com.codenames.codenames.backend.lobby.services.LobbyService;
-import com.codenames.codenames.backend.utility.ChatMessageType;
-import com.codenames.codenames.backend.utility.Role;
-import com.codenames.codenames.backend.utility.Team;
+import com.codenames.codenames.backend.chat.api.dto.ChatDto;
+import com.codenames.codenames.backend.chat.api.dto.ChatMessageType;
+import com.codenames.codenames.backend.chat.application.ChatService;
+import com.codenames.codenames.backend.lobby.application.LobbyService;
+import com.codenames.codenames.backend.lobby.domain.Role;
+import com.codenames.codenames.backend.lobby.domain.Team;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;

src/main/java/com/codenames/codenames/backend/chat/ChatDto.java → src/main/java/com/codenames/codenames/backend/chat/api/dto/ChatDto.java

@@ -1,6 +1,4 @@
-package com.codenames.codenames.backend.chat;
-
-import com.codenames.codenames.backend.utility.ChatMessageType;
+package com.codenames.codenames.backend.chat.api.dto;
 
 /**
  * Record class for messages that is used in controller.

src/main/java/com/codenames/codenames/backend/utility/ChatMessageType.java → src/main/java/com/codenames/codenames/backend/chat/api/dto/ChatMessageType.java

@@ -1,8 +1,9 @@
-package com.codenames.codenames.backend.utility;
+package com.codenames.codenames.backend.chat.api.dto;
 
 /**
  * Enum representing the type of chat message.
  */
 public enum ChatMessageType {
-  CHAT
-}
+  CHAT,
+  SYSTEM
+}

src/main/java/com/codenames/codenames/backend/chat/ChatService.java → src/main/java/com/codenames/codenames/backend/chat/application/ChatService.java

@@ -1,5 +1,7 @@
-package com.codenames.codenames.backend.chat;
+package com.codenames.codenames.backend.chat.application;
 
+import com.codenames.codenames.backend.chat.api.dto.ChatDto;
+import com.codenames.codenames.backend.chat.domain.ChatHistory;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/codenames/codenames/backend/chat/ChatHistory.java → src/main/java/com/codenames/codenames/backend/chat/domain/ChatHistory.java

@@ -1,5 +1,6 @@
-package com.codenames.codenames.backend.chat;
+package com.codenames.codenames.backend.chat.domain;
 
+import com.codenames.codenames.backend.chat.api.dto.ChatDto;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

src/main/java/com/codenames/codenames/backend/database/entity/CardEntity.java

@@ -0,0 +1,38 @@
+package com.codenames.codenames.backend.database.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * Persistent entity representing a card record within the database schema.
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity
+@Table(name = "card")
+public class CardEntity {
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+  @ManyToOne
+  @JoinColumn(name = "lobby_code", nullable = false)
+  private LobbyEntity lobbyEntity;
+  @Column(nullable = false)
+  private int position;
+  @Column(length = 11, nullable = false)
+  private String word;
+  @Column(length = 8, nullable = false)
+  private String color;
+  @Column(name = "is_guessed", nullable = false)
+  private Boolean isGuessed;
+}

src/main/java/com/codenames/codenames/backend/database/entity/GameStateEntity.java

@@ -0,0 +1,44 @@
+package com.codenames.codenames.backend.database.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.MapsId;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * Persistent entity representing a gameState record within the database schema.
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity
+@Table(name = "game_state")
+public class GameStateEntity {
+  @Id
+  @Column(name = "lobby_code")
+  private String lobbyCode;
+  @OneToOne
+  @MapsId
+  @JoinColumn(name = "lobby_code")
+  private LobbyEntity lobbyEntity;
+  @Column(name = "current_turn", length = 4, nullable = false)
+  private String currentTurn;
+  @Column(name = "current_phase", length = 9, nullable = false)
+  private String currentPhase;
+  @Column(name = "clue_word", length = 20)
+  private String clueWord;
+  @Column(name = "clue_guess_amount")
+  private int clueGuessAmount;
+  @Column(name = "remaining_guesses")
+  private int remainingGuesses;
+  @Column(name = "red_team_cheat_used", nullable = false)
+  private boolean redTeamCheatUsed;
+  @Column(name = "blue_team_cheat_used", nullable = false)
+  private boolean blueTeamCheatUsed;
+}

src/main/java/com/codenames/codenames/backend/database/entity/LobbyEntity.java

@@ -0,0 +1,43 @@
+package com.codenames.codenames.backend.database.entity;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.SourceType;
+
+/**
+ * Persistent entity representing a lobby record within the database schema.
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity
+@Table(name = "lobby")
+public class LobbyEntity {
+  @Id
+  @Column(name = "lobby_code", length = 5, nullable = false)
+  private String lobbyCode;
+  @Column(name = "created_at", insertable = false, updatable = false, nullable = false)
+  @CreationTimestamp(source = SourceType.DB)
+  private Timestamp createdAt;
+
+  @OneToOne(mappedBy = "lobbyEntity", cascade = CascadeType.ALL, orphanRemoval = true)
+  private GameStateEntity gameStateEntity;
+
+  @OneToMany(mappedBy = "lobbyEntity", cascade = CascadeType.ALL, orphanRemoval = true)
+  private List<PlayerEntity> playerEntities = new ArrayList<>();
+
+  @OneToMany(mappedBy = "lobbyEntity", cascade = CascadeType.ALL, orphanRemoval = true)
+  private List<CardEntity> cardEntities = new ArrayList<>();
+}

src/main/java/com/codenames/codenames/backend/database/entity/PlayerEntity.java

@@ -0,0 +1,36 @@
+package com.codenames.codenames.backend.database.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+/**
+ * Persistent entity representing a player record within the database schema.
+ */
+@Getter
+@Setter
+@NoArgsConstructor
+@Entity
+@Table(name = "player")
+public class PlayerEntity {
+  @Id
+  @Column(nullable = false)
+  private String uuid;
+  @ManyToOne
+  @JoinColumn(name = "lobby_code", nullable = false)
+  private LobbyEntity lobbyEntity;
+  @Column(length = 20, nullable = false)
+  private String username;
+  @Column(name = "is_host", nullable = false)
+  private Boolean isHost;
+  @Column(length = 4, nullable = false)
+  private String team;
+  @Column(length = 9, nullable = false)
+  private String role;
+}