From c277b89ffc25a54e4903e36f4946b9f637159cae Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 28 May 2025 10:21:21 +0200 Subject: [PATCH 1/2] refactor: remove unused blackjack split funcionality --- .../blackjack/BlackJackGameController.java | 7 -- .../casino/blackjack/BlackJackGameEntity.java | 11 --- .../casino/blackjack/BlackJackService.java | 96 ++----------------- .../de/szut/casino/blackjack/CardEntity.java | 2 +- 4 files changed, 11 insertions(+), 105 deletions(-) diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java index c780ca9..03d4a46 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java @@ -57,13 +57,6 @@ public class BlackJackGameController { return ResponseEntity.ok(blackJackService.doubleDown(game)); } - @PostMapping("/blackjack/{id}/split") - public ResponseEntity split(@PathVariable Long id) { - BlackJackGameEntity game = getBlackJackGame(id); - - return ResponseEntity.ok(blackJackService.split(game)); - } - @PostMapping("/blackjack/start") public ResponseEntity createBlackJackGame(@RequestBody @Valid BetDto betDto) { Optional optionalUser = userService.getCurrentUser(); diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java index 4b03b21..4f22c9d 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java @@ -51,15 +51,4 @@ public class BlackJackGameEntity { @JsonManagedReference @SQLRestriction("card_type = 'DEALER'") private List dealerCards = new ArrayList<>(); - - @OneToMany(mappedBy = "game", cascade = CascadeType.ALL, orphanRemoval = true) - @JsonManagedReference - @SQLRestriction("card_type = 'PLAYER_SPLIT'") - private List playerSplitCards = new ArrayList<>(); - - @Column(name = "split_bet") - private BigDecimal splitBet; - - @Column(name = "is_split") - private boolean isSplit; } diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java index 5e54efe..6e9bf7e 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -2,8 +2,8 @@ package de.szut.casino.blackjack; import de.szut.casino.user.UserEntity; import de.szut.casino.user.UserRepository; +import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; @@ -24,7 +24,6 @@ public class BlackJackService { return blackJackGameRepository.findById(id).orElse(null); } - @Transactional public BlackJackGameEntity createBlackJackGame(UserEntity user, BigDecimal betAmount) { BlackJackGameEntity game = new BlackJackGameEntity(); game.setUser(user); @@ -85,36 +84,6 @@ public class BlackJackService { return game; } - @Transactional - public BlackJackGameEntity split(BlackJackGameEntity game) { - if (game.getState() != BlackJackState.IN_PROGRESS || - game.getPlayerCards().size() != 2 || - game.isSplit() || - !game.getPlayerCards().get(0).getRank().equals(game.getPlayerCards().get(1).getRank())) { - return game; - } - - UserEntity user = getUserWithFreshData(game.getUser()); - BigDecimal splitBet = game.getBet(); - - if (user.getBalance().compareTo(splitBet) < 0) { - return game; - } - - deductBetFromBalance(user, splitBet); - game.setSplitBet(splitBet); - game.setSplit(true); - - CardEntity card = game.getPlayerCards().remove(1); - card.setCardType(CardType.PLAYER_SPLIT); - game.getPlayerSplitCards().add(card); - - dealCardToPlayer(game); - dealCardToSplitHand(game); - - return processGameBasedOnState(game); - } - private BlackJackGameEntity processGameBasedOnState(BlackJackGameEntity game) { if (game.getState() != BlackJackState.IN_PROGRESS) { this.blackJackGameRepository.delete(game); @@ -154,33 +123,13 @@ public class BlackJackService { } } - private void dealCardToSplitHand(BlackJackGameEntity game) { - CardEntity card = drawCardFromDeck(game); - card.setCardType(CardType.PLAYER_SPLIT); - game.getPlayerSplitCards().add(card); - } - private void updateGameStateAndBalance(BlackJackGameEntity game) { - if (game.isSplit()) { - int mainHandValue = calculateHandValue(game.getPlayerCards()); - int splitHandValue = calculateHandValue(game.getPlayerSplitCards()); + game.setState(getState(game)); - if (mainHandValue > 21 && splitHandValue > 21) { - game.setState(BlackJackState.PLAYER_LOST); - updateUserBalance(game, false); - } else if (mainHandValue <= 21 && splitHandValue <= 21) { - game.setState(BlackJackState.IN_PROGRESS); - } else { - game.setState(BlackJackState.IN_PROGRESS); - } - } else { - game.setState(getState(game)); - - if (game.getState() == BlackJackState.PLAYER_WON) { - updateUserBalance(game, true); - } else if (game.getState() == BlackJackState.PLAYER_LOST) { - updateUserBalance(game, false); - } + if (game.getState() == BlackJackState.PLAYER_WON) { + updateUserBalance(game, true); + } else if (game.getState() == BlackJackState.PLAYER_LOST) { + updateUserBalance(game, false); } } @@ -205,40 +154,15 @@ public class BlackJackService { userRepository.save(user); } - @Transactional protected void updateUserBalance(BlackJackGameEntity game, boolean isWin) { UserEntity user = getUserWithFreshData(game.getUser()); BigDecimal totalBet = game.getBet(); BigDecimal balance = user.getBalance(); - if (game.isSplit()) { - totalBet = totalBet.add(game.getSplitBet()); - - if (isWin) { - int mainHandValue = calculateHandValue(game.getPlayerCards()); - int splitHandValue = calculateHandValue(game.getPlayerSplitCards()); - int dealerValue = calculateHandValue(game.getDealerCards()); - - if (mainHandValue <= 21 && (dealerValue > 21 || mainHandValue > dealerValue)) { - balance = balance.add(game.getBet().multiply(BigDecimal.valueOf(2))); - } else if (mainHandValue == dealerValue) { - balance = balance.add(game.getBet()); - } - - if (splitHandValue <= 21 && (dealerValue > 21 || splitHandValue > dealerValue)) { - balance = balance.add(game.getSplitBet().multiply(BigDecimal.valueOf(2))); - } else if (splitHandValue == dealerValue) { - balance = balance.add(game.getSplitBet()); - } - } else if (game.getState() == BlackJackState.DRAW) { - balance = balance.add(totalBet); - } - } else { - if (isWin) { - balance = balance.add(totalBet.multiply(BigDecimal.valueOf(2))); - } else if (game.getState() == BlackJackState.DRAW) { - balance = balance.add(totalBet); - } + if (isWin) { + balance = balance.add(totalBet.multiply(BigDecimal.valueOf(2))); + } else if (game.getState() == BlackJackState.DRAW) { + balance = balance.add(totalBet); } user.setBalance(balance); diff --git a/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java b/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java index e2c1f0e..3b6903a 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java @@ -36,5 +36,5 @@ public class CardEntity { } enum CardType { - DECK, PLAYER, DEALER, PLAYER_SPLIT + DECK, PLAYER, DEALER } From e9e2eba46fb90959b4aaab4aaa3317dda4db8cda Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 28 May 2025 10:23:18 +0200 Subject: [PATCH 2/2] refactor: readd transactional attribute --- .../src/main/java/de/szut/casino/blackjack/BlackJackService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java index 6e9bf7e..2d1c08b 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -24,6 +24,7 @@ public class BlackJackService { return blackJackGameRepository.findById(id).orElse(null); } + @Transactional public BlackJackGameEntity createBlackJackGame(UserEntity user, BigDecimal betAmount) { BlackJackGameEntity game = new BlackJackGameEntity(); game.setUser(user);