diff --git a/pom.xml b/pom.xml index 5a271e2..e4c30f9 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ com.h2database h2 + 2.3.232 org.hibernate diff --git a/src/main/java/com/alterdekim/hearthhack/component/StartupListener.java b/src/main/java/com/alterdekim/hearthhack/component/StartupListener.java index 157e6b6..1acd527 100644 --- a/src/main/java/com/alterdekim/hearthhack/component/StartupListener.java +++ b/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(""); diff --git a/src/main/java/com/alterdekim/hearthhack/component/processor/GameMasterProcessor.java b/src/main/java/com/alterdekim/hearthhack/component/processor/GameMasterProcessor.java index 2af82c6..bc04c08 100644 --- a/src/main/java/com/alterdekim/hearthhack/component/processor/GameMasterProcessor.java +++ b/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() { diff --git a/src/main/java/com/alterdekim/hearthhack/component/processor/client/request/generic/DeckList.java b/src/main/java/com/alterdekim/hearthhack/component/processor/client/request/generic/DeckList.java index 68da59f..0613580 100644 --- a/src/main/java/com/alterdekim/hearthhack/component/processor/client/request/generic/DeckList.java +++ b/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 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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/Booster.java b/src/main/java/com/alterdekim/hearthhack/entity/Booster.java index b53d3c5..1752d63 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/Booster.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/CardBack.java b/src/main/java/com/alterdekim/hearthhack/entity/CardBack.java index b783944..d9a50a7 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/CardBack.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/Deck.java b/src/main/java/com/alterdekim/hearthhack/entity/Deck.java index 6a1bea7..e64d263 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/Deck.java +++ b/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; diff --git a/src/main/java/com/alterdekim/hearthhack/entity/DeckContent.java b/src/main/java/com/alterdekim/hearthhack/entity/DeckContent.java index 959df5c..8c8ba90 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/DeckContent.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/HeroXP.java b/src/main/java/com/alterdekim/hearthhack/entity/HeroXP.java index b0d41b6..32bb9c2 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/HeroXP.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/Role.java b/src/main/java/com/alterdekim/hearthhack/entity/Role.java index 0d03090..e3b777c 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/Role.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/User.java b/src/main/java/com/alterdekim/hearthhack/entity/User.java index fa2e01d..e61c771 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/User.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/entity/UserCard.java b/src/main/java/com/alterdekim/hearthhack/entity/UserCard.java index 1830ce9..46ce65f 100644 --- a/src/main/java/com/alterdekim/hearthhack/entity/UserCard.java +++ b/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) diff --git a/src/main/java/com/alterdekim/hearthhack/service/RoomService.java b/src/main/java/com/alterdekim/hearthhack/service/RoomService.java index 11410f2..0847554 100644 --- a/src/main/java/com/alterdekim/hearthhack/service/RoomService.java +++ b/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); } diff --git a/src/main/java/com/alterdekim/hearthhack/service/UserService.java b/src/main/java/com/alterdekim/hearthhack/service/UserService.java index c812dc4..ac6df6e 100644 --- a/src/main/java/com/alterdekim/hearthhack/service/UserService.java +++ b/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 getDecksForUser(Long userId) { + deckRepository.findAll().stream().forEach(d -> log.info("getDecksForUser: userId={}; deckId={}", d.getUserId(), d.getId())); return deckRepository.findDecksByUserId(userId); }