Fixed Auto-incremention fields and multiple decks presence in single account.

pom.xml

@@ -54,6 +54,7 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
            <!-- <scope>runtime</scope> -->
+            <version>2.3.232</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>

src/main/java/com/alterdekim/hearthhack/component/StartupListener.java

@@ -109,6 +109,7 @@ public class StartupListener {
     public DataSource getDataSource() {
         DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create();
         dataSourceBuilder.driverClassName("org.h2.Driver");
+        log.info("StartupListener: {}", serverConfig.getWorkDir()+File.separator+FS.dbDir+File.separator);
         dataSourceBuilder.url("jdbc:h2:file:"+serverConfig.getWorkDir()+File.separator+FS.dbDir+File.separator+"data.db;DATABASE_TO_UPPER=false;CASE_INSENSITIVE_IDENTIFIERS=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE;MODE=PostgreSQL;");
         dataSourceBuilder.username("SA");
         dataSourceBuilder.password("");

src/main/java/com/alterdekim/hearthhack/component/processor/GameMasterProcessor.java

@@ -72,6 +72,7 @@ public class GameMasterProcessor extends Processor {
         Long roomId = conn.getRoomService().findRoomWithPlayer().orElse(conn.getRoomService().createRoom(new RoomDTO(uuid))); // TODO: make 1 player rooms check.
         log.info("Got roomID (join/create): {}", roomId);
         final String pwd = conn.getRoomService().findById(roomId).orElse(new RoomDTO(uuid)).getRoomPassword();
+        log.info("getRoomService.joinRoom; {}", gameRequest);
         conn.getRoomService().joinRoom(roomId, conn.getUserId(),
                 gameRequest.getPlayerList().get(0)
                         .getAttributeList()
@@ -82,7 +83,7 @@ public class GameMasterProcessor extends Processor {
                         .getValue()
                         .getIntValue()
         ); // TODO: make 1 player rooms check.
-
+        // TODO: check there for GameRoom error (userId and deckId the same)
         conn.getGamePool().getCallbacks().put(conn.getUserId(), new OnRoomFullCallback() {
             @Override
             public void onRoomFull() {

src/main/java/com/alterdekim/hearthhack/component/processor/client/request/generic/DeckList.java

@@ -16,9 +16,12 @@ public class DeckList extends GenericParser {
 
     @Override
     public void parseGenericRequest(int token, TcpConnection conn) throws Exception {
+        log.info("GetDeckList has been triggered!");
         List<Protocol.DeckInfo> l = conn.getUserService().getDecksForUser(conn.getUserId())
                 .stream()
-                .map(d -> Protocol.DeckInfo.newBuilder()
+                .map(d -> {
+                    log.info("DeckId: {}", d.getId());
+                    return Protocol.DeckInfo.newBuilder()
                         .setId(d.getId())
                         .setName(d.getName())
                         .setCardBack(conn.getUserService().getCardBackById(d.getCardBack()).getBackId())
@@ -31,7 +34,7 @@ public class DeckList extends GenericParser {
                         .setLastModified(d.getLastModified())
                         .setSortOrder(d.getSortOrder())
                         .setSourceType(Protocol.DeckSourceType.forNumber(d.getSourceType()))
-                        .build())
+                        .build(); })
                 .collect(Collectors.toList());
         l.add(Protocol.DeckInfo.newBuilder()
                 .setId(171593L)

src/main/java/com/alterdekim/hearthhack/entity/Booster.java

@@ -32,7 +32,7 @@ import lombok.Setter;
 )
 public class Booster {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable = false)

src/main/java/com/alterdekim/hearthhack/entity/CardBack.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Table(name = "card_backs")
 public class CardBack {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable=false)

src/main/java/com/alterdekim/hearthhack/entity/Deck.java

@@ -9,13 +9,12 @@ import lombok.Setter;
 @Getter
 @Setter
 @NoArgsConstructor
-@AllArgsConstructor
 @Entity
 @Table(name = "decks")
 public class Deck {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable=false)
@@ -51,6 +50,21 @@ public class Deck {
     @Column(nullable = false)
     private Integer sourceType;
 
+    public Deck(Long id, Long userId, String name, Long cardBack, Integer hero, Integer deckType, Boolean heroPremium, Boolean cardBackOverride, Boolean heroOverride, Long lastModified, Long sortOrder, Integer sourceType) {
+        this.id = id;
+        this.userId = userId;
+        this.name = name;
+        this.cardBack = cardBack;
+        this.hero = hero;
+        this.deckType = deckType;
+        this.heroPremium = heroPremium;
+        this.cardBackOverride = cardBackOverride;
+        this.heroOverride = heroOverride;
+        this.lastModified = lastModified;
+        this.sortOrder = sortOrder;
+        this.sourceType = sourceType;
+    }
+
     public Deck(Long userId, String name, Long cardBack, Integer hero, Integer deckType, Boolean heroPremium, Boolean cardBackOverride, Boolean heroOverride, Long lastModified, Long sortOrder, Integer sourceType) {
         this.userId = userId;
         this.name = name;

src/main/java/com/alterdekim/hearthhack/entity/DeckContent.java

@@ -12,7 +12,7 @@ import lombok.*;
 @Table(name = "deck_content")
 public class DeckContent {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable=false)

src/main/java/com/alterdekim/hearthhack/entity/HeroXP.java

@@ -14,7 +14,7 @@ import lombok.Setter;
 @Table(name = "hero_xp")
 public class HeroXP {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable = false)

src/main/java/com/alterdekim/hearthhack/entity/Role.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Table(name="roles")
 public class Role {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable=false, unique=true)

src/main/java/com/alterdekim/hearthhack/entity/User.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class User {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable=false, unique=true)

src/main/java/com/alterdekim/hearthhack/entity/UserCard.java

@@ -35,7 +35,7 @@ import lombok.Setter;
 public class UserCard {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
     @Column(nullable=false)

src/main/java/com/alterdekim/hearthhack/service/RoomService.java

@@ -57,6 +57,7 @@ public class RoomService implements IService {
 
     public void joinRoom(Long roomId, Long userId, Long deckId) {
         RoomDTO r = map.get(roomId);
+        log.info("userId: " + userId + "; deckId: " + deckId);
         r.getPlayers().add(new RoomPlayerDTO(userId, deckId));
         map.put(roomId, r);
     }

src/main/java/com/alterdekim/hearthhack/service/UserService.java

@@ -7,6 +7,7 @@ import com.alterdekim.hearthhack.dto.UserDTO;
 import com.alterdekim.hearthhack.entity.*;
 import com.alterdekim.hearthhack.repository.*;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +16,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+@Slf4j
 @RequiredArgsConstructor
 @Service
 public class UserService implements IService {
@@ -50,7 +52,7 @@ public class UserService implements IService {
     }
 
     public Deck createDeck(Long userId, String name, Integer hero, Boolean isPremium) {
-        return deckRepository.save(new Deck(userId, name, 0L, hero, Protocol.DeckType.NORMAL_DECK.getNumber(), isPremium, false, false, System.currentTimeMillis(), 1461490210L, Protocol.DeckSourceType.DECK_SOURCE_TYPE_NORMAL_VALUE));
+        return deckRepository.save(new Deck(userId, name, 0L, hero, Protocol.DeckType.NORMAL_DECK.getNumber(), isPremium, false, false, 1461490210L, 1461490210L, Protocol.DeckSourceType.DECK_SOURCE_TYPE_NORMAL.getNumber()));
     }
 
     public void updateDeckName(Long userId, Long deckId, String name) {
@@ -74,6 +76,7 @@ public class UserService implements IService {
     }
 
     public List<Deck> getDecksForUser(Long userId) {
+        deckRepository.findAll().stream().forEach(d -> log.info("getDecksForUser: userId={}; deckId={}", d.getUserId(), d.getId()));
         return deckRepository.findDecksByUserId(userId);
     }