From ffd651d74b1fd453933bd5dd86cf600496da9d25 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Thu, 27 Mar 2025 14:18:03 +0100 Subject: [PATCH 01/41] feat: add balance when player wins gets blackjack in first round --- .../de/szut/casino/blackjack/BlackJackService.java | 13 ++++++++++--- .../de/szut/casino/blackjack/BlackJackState.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) 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 df1a459..62b8859 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -42,8 +42,15 @@ public class BlackJackService { dealerCard.setCardType(CardType.DEALER); game.getDealerCards().add(dealerCard); - game.setState(getState(game)); - user.setBalance(user.getBalance().subtract(betAmount)); + BlackJackState state = getState(game); + if (state == BlackJackState.PLAYER_BLACKJACK) { + BigDecimal blackjackWinnings = betAmount.multiply(new BigDecimal("1.5")); + user.setBalance(user.getBalance().add(blackjackWinnings)); + } else { + user.setBalance(user.getBalance().subtract(betAmount)); + } + + game.setState(state); userRepository.save(user); blackJackGameRepository.save(game); @@ -88,7 +95,7 @@ public class BlackJackService { int playerHandValue = calculateHandValue(game.getPlayerCards()); if (playerHandValue == 21) { - return BlackJackState.PLAYER_WON; + return BlackJackState.PLAYER_BLACKJACK; } else if (playerHandValue > 21) { return BlackJackState.PLAYER_LOST; } diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java index 2ba802c..e866bd9 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java @@ -1,7 +1,7 @@ package de.szut.casino.blackjack; public enum BlackJackState { - PLAYER_WON, IN_PROGRESS, + PLAYER_BLACKJACK, PLAYER_LOST, } From 68ea66d4f9611329a64d9662bc5216a31c615407 Mon Sep 17 00:00:00 2001 From: Jan-Marlon Leibl Date: Thu, 27 Mar 2025 15:22:24 +0100 Subject: [PATCH 02/41] feat: add stand and get game features to blackjack game --- backend/requests/blackjack.http | 8 ++ .../blackjack/BlackJackGameController.java | 38 +++++- .../casino/blackjack/BlackJackGameEntity.java | 5 +- .../casino/blackjack/BlackJackService.java | 66 +++++++++- .../szut/casino/blackjack/BlackJackState.java | 1 + .../de/szut/casino/blackjack/CardEntity.java | 4 + .../game/blackjack/blackjack.component.html | 9 ++ .../game/blackjack/blackjack.component.ts | 61 +++++++++ .../game-controls/game-controls.component.ts | 122 ++++++++++++++--- .../game-result/game-result.component.css | 1 + .../game-result/game-result.component.spec.ts | 23 ++++ .../game-result/game-result.component.ts | 124 ++++++++++++++++++ .../blackjack/services/blackjack.service.ts | 11 ++ 13 files changed, 444 insertions(+), 29 deletions(-) create mode 100644 frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.css create mode 100644 frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts create mode 100644 frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts diff --git a/backend/requests/blackjack.http b/backend/requests/blackjack.http index 1ac2def..16f7122 100644 --- a/backend/requests/blackjack.http +++ b/backend/requests/blackjack.http @@ -10,3 +10,11 @@ Content-Type: application/json POST http://localhost:8080/blackjack/202/hit Authorization: Bearer {{token}} +### +POST http://localhost:8080/blackjack/202/stand +Authorization: Bearer {{token}} + +### +GET http://localhost:8080/blackjack/202 +Authorization: Bearer {{token}} + 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 58505eb..9f1dae9 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java @@ -26,6 +26,23 @@ public class BlackJackGameController { this.userService = userService; } + @GetMapping("/blackjack/{id}") + public ResponseEntity getGame(@PathVariable Long id, @RequestHeader("Authorization") String token) { + Optional optionalUser = userService.getCurrentUser(token); + + if (optionalUser.isEmpty()) { + return ResponseEntity.notFound().build(); + } + + UserEntity user = optionalUser.get(); + BlackJackGameEntity game = blackJackService.getBlackJackGame(id); + if (game == null || !Objects.equals(game.getUserId(), user.getId())) { + return ResponseEntity.notFound().build(); + } + + return ResponseEntity.ok(game); + } + @PostMapping("/blackjack/{id}/hit") public ResponseEntity hit(@PathVariable Long id, @RequestHeader("Authorization") String token) { Optional optionalUser = userService.getCurrentUser(token); @@ -40,13 +57,24 @@ public class BlackJackGameController { return ResponseEntity.notFound().build(); } - if (game.getState() != BlackJackState.IN_PROGRESS) { - Map errorResponse = new HashMap<>(); - errorResponse.put("error", "Invalid state"); - return ResponseEntity.badRequest().body(errorResponse); + return ResponseEntity.ok(blackJackService.hit(game)); + } + + @PostMapping("/blackjack/{id}/stand") + public ResponseEntity stand(@PathVariable Long id, @RequestHeader("Authorization") String token) { + Optional optionalUser = userService.getCurrentUser(token); + + if (optionalUser.isEmpty()) { + return ResponseEntity.notFound().build(); } - return ResponseEntity.ok(blackJackService.hit(game)); + UserEntity user = optionalUser.get(); + BlackJackGameEntity game = blackJackService.getBlackJackGame(id); + if (game == null || !Objects.equals(game.getUserId(), user.getId())) { + return ResponseEntity.notFound().build(); + } + + return ResponseEntity.ok(blackJackService.stand(game)); } @PostMapping("/blackjack/start") 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 eb5a704..0dbfcc0 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java @@ -24,12 +24,15 @@ public class BlackJackGameEntity { @GeneratedValue private Long id; + @Version + @JsonIgnore + private Long version; + @ManyToOne @JoinColumn(name = "user_id", nullable = false) @JsonIgnore private UserEntity user; - // Expose UserID to JSON output public Long getUserId() { return user != null ? user.getId() : null; } 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 df1a459..801acaa 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -3,6 +3,7 @@ package de.szut.casino.blackjack; import de.szut.casino.user.UserEntity; import de.szut.casino.user.UserRepository; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.List; @@ -26,6 +27,7 @@ public class BlackJackService { return optionalBlackJackGame.orElse(null); } + @Transactional public BlackJackGameEntity createBlackJackGame(UserEntity user, BigDecimal betAmount) { BlackJackGameEntity game = new BlackJackGameEntity(); game.setUser(user); @@ -46,21 +48,79 @@ public class BlackJackService { user.setBalance(user.getBalance().subtract(betAmount)); userRepository.save(user); - blackJackGameRepository.save(game); - - return game; + return blackJackGameRepository.save(game); } + @Transactional public BlackJackGameEntity hit(BlackJackGameEntity game) { + game = blackJackGameRepository.findById(game.getId()).orElse(game); + + if (game.getState() != BlackJackState.IN_PROGRESS) { + return game; + } + CardEntity drawnCard = drawCardFromDeck(game); drawnCard.setCardType(CardType.PLAYER); game.getPlayerCards().add(drawnCard); game.setState(getState(game)); + if (game.getState() == BlackJackState.PLAYER_WON) { + updateUserBalance(game, true); + } else if (game.getState() == BlackJackState.PLAYER_LOST) { + updateUserBalance(game, false); + } + return blackJackGameRepository.save(game); } + @Transactional + public BlackJackGameEntity stand(BlackJackGameEntity game) { + game = blackJackGameRepository.findById(game.getId()).orElse(game); + + if (game.getState() != BlackJackState.IN_PROGRESS) { + return game; + } + + while (calculateHandValue(game.getDealerCards()) < 17) { + CardEntity dealerCard = drawCardFromDeck(game); + dealerCard.setCardType(CardType.DEALER); + game.getDealerCards().add(dealerCard); + } + + int playerValue = calculateHandValue(game.getPlayerCards()); + int dealerValue = calculateHandValue(game.getDealerCards()); + + if (dealerValue > 21 || playerValue > dealerValue) { + game.setState(BlackJackState.PLAYER_WON); + updateUserBalance(game, true); + } else { + game.setState(BlackJackState.DRAW); + updateUserBalance(game, false); + } + + return blackJackGameRepository.save(game); + } + + @Transactional + private void updateUserBalance(BlackJackGameEntity game, boolean isWin) { + UserEntity user = game.getUser(); + user = userRepository.findById(user.getId()).orElse(user); + BigDecimal balance = user.getBalance(); + + BigDecimal betAmount = game.getBet(); + + if (isWin) { + balance = balance.add(betAmount.multiply(BigDecimal.valueOf(2))); + } + else if (game.getState() == BlackJackState.DRAW) { + balance = balance.add(betAmount); + } + + user.setBalance(balance); + userRepository.save(user); + } + private void initializeDeck(BlackJackGameEntity game) { for (Suit suit : Suit.values()) { for (Rank rank : Rank.values()) { diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java index 2ba802c..e1d422d 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java @@ -4,4 +4,5 @@ public enum BlackJackState { PLAYER_WON, IN_PROGRESS, PLAYER_LOST, + DRAW, } 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 5520b58..27d09d6 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java @@ -19,6 +19,10 @@ public class CardEntity { @JsonIgnore private Long id; + @Version + @JsonIgnore + private Long version; + @ManyToOne @JoinColumn(name = "game_id", nullable = false) @JsonBackReference diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html index ae130d4..27860a1 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -7,6 +7,8 @@ @if (gameInProgress()) { + + + diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.ts b/frontend/src/app/feature/game/blackjack/blackjack.component.ts index 174c358..2e29eb0 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.ts +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.ts @@ -10,6 +10,8 @@ import { GameControlsComponent } from './components/game-controls/game-controls. import { GameInfoComponent } from './components/game-info/game-info.component'; import { Card, BlackjackGame } from './models/blackjack.model'; import { BlackjackService } from './services/blackjack.service'; +import { HttpErrorResponse } from '@angular/common/http'; +import { GameResultComponent } from './components/game-result/game-result.component'; @Component({ selector: 'app-blackjack', @@ -22,6 +24,7 @@ import { BlackjackService } from './services/blackjack.service'; PlayerHandComponent, GameControlsComponent, GameInfoComponent, + GameResultComponent, ], templateUrl: './blackjack.component.html', changeDetection: ChangeDetectionStrategy.OnPush, @@ -37,8 +40,14 @@ export default class BlackjackComponent { balance = signal(0); currentGameId = signal(undefined); gameInProgress = signal(false); + gameState = signal('IN_PROGRESS'); + showGameResult = signal(false); constructor() { + this.refreshUserBalance(); + } + + private refreshUserBalance(): void { this.userService.getCurrentUser().subscribe((user) => { this.balance.set(user?.balance ?? 0); }); @@ -49,6 +58,7 @@ export default class BlackjackComponent { this.currentGameId.set(game.id); this.currentBet.set(game.bet); this.gameInProgress.set(game.state === 'IN_PROGRESS'); + this.gameState.set(game.state); this.dealerCards.set( game.dealerCards.map((card, index) => ({ @@ -63,12 +73,20 @@ export default class BlackjackComponent { hidden: false, })) ); + + if (game.state !== 'IN_PROGRESS') { + this.refreshUserBalance(); + setTimeout(() => { + this.showGameResult.set(true); + }, 1000); + } } onNewGame(bet: number): void { this.blackjackService.startGame(bet).subscribe({ next: (game) => { this.updateGameState(game); + this.refreshUserBalance(); }, error: (error) => { console.error('Failed to start game:', error); @@ -85,12 +103,18 @@ export default class BlackjackComponent { }, error: (error) => { console.error('Failed to hit:', error); + this.handleGameError(error); }, }); } onStand(): void { if (!this.currentGameId()) return; + + if (this.gameState() !== 'IN_PROGRESS') { + console.log('Cannot stand: game is not in progress'); + return; + } this.blackjackService.stand(this.currentGameId()!).subscribe({ next: (game) => { @@ -98,10 +122,47 @@ export default class BlackjackComponent { }, error: (error) => { console.error('Failed to stand:', error); + this.handleGameError(error); }, }); } + onCloseGameResult(): void { + this.showGameResult.set(false); + } + + private handleGameError(error: any): void { + if (error instanceof HttpErrorResponse) { + if (error.status === 400 && error.error?.error === 'Invalid state') { + this.gameInProgress.set(false); + + this.refreshUserBalance(); + } + else if (error.status === 500) { + console.log('Server error occurred. The game may have been updated in another session.'); + + this.gameInProgress.set(false); + + this.refreshUserBalance(); + + if (this.currentGameId()) { + this.refreshGameState(this.currentGameId()!); + } + } + } + } + + private refreshGameState(gameId: number): void { + this.blackjackService.getGame(gameId).subscribe({ + next: (game) => { + this.updateGameState(game); + }, + error: (err) => { + console.error('Failed to refresh game state:', err); + } + }); + } + leaveGame(): void { this.router.navigate(['/home']); } diff --git a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts index c78111f..73c5928 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts @@ -1,36 +1,118 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { Card } from '../../models/blackjack.model'; @Component({ selector: 'app-game-controls', standalone: true, imports: [CommonModule], template: ` -
- - - +
+
+
+
Deine Punkte: {{ calculateHandValue(playerCards) }}
+
+ Status: {{ getStatusText(gameState) }} +
+
+
+
+ + + +
`, changeDetection: ChangeDetectionStrategy.OnPush, }) export class GameControlsComponent { + @Input() playerCards: Card[] = []; + @Input() gameState: string = 'IN_PROGRESS'; + @Output() hit = new EventEmitter(); @Output() stand = new EventEmitter(); @Output() leave = new EventEmitter(); + + calculateHandValue(cards: Card[]): number { + let sum = 0; + let aceCount = 0; + + const rankValues: Record = { + TWO: 2, + THREE: 3, + FOUR: 4, + FIVE: 5, + SIX: 6, + SEVEN: 7, + EIGHT: 8, + NINE: 9, + TEN: 10, + JACK: 10, + QUEEN: 10, + KING: 10, + ACE: 11 + }; + + for (const card of cards) { + if (!card.hidden) { + const value = rankValues[card.rank] || 0; + sum += value; + if (card.rank === 'ACE') { + aceCount++; + } + } + } + + while (sum > 21 && aceCount > 0) { + sum -= 10; + aceCount--; + } + + return sum; + } + + getStatusText(state: string): string { + switch (state) { + case 'IN_PROGRESS': + return 'Spiel läuft'; + case 'PLAYER_WON': + return 'Gewonnen!'; + case 'PLAYER_LOST': + return 'Verloren!'; + case 'DRAW': + return 'Unentschieden!'; + default: + return state; + } + } + + getStatusClass(state: string): string { + switch (state) { + case 'PLAYER_WON': + return 'text-emerald'; + case 'PLAYER_LOST': + return 'text-accent-red'; + case 'DRAW': + return 'text-yellow-400'; + default: + return 'text-white'; + } + } } diff --git a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.css b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.css new file mode 100644 index 0000000..5c8977f --- /dev/null +++ b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.css @@ -0,0 +1 @@ +/* No custom styles needed */ diff --git a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts new file mode 100644 index 0000000..fbc1d3d --- /dev/null +++ b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GameResultComponent } from './game-result.component'; + +describe('GameResultComponent', () => { + let component: GameResultComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [GameResultComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(GameResultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts new file mode 100644 index 0000000..15c1d8f --- /dev/null +++ b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts @@ -0,0 +1,124 @@ +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { CommonModule, CurrencyPipe } from '@angular/common'; +import { animate, style, transition, trigger } from '@angular/animations'; + +@Component({ + selector: 'app-game-result', + standalone: true, + imports: [CommonModule, CurrencyPipe], + template: ` +
+
+

{{ getResultTitle() }}

+

{{ getResultMessage() }}

+ +
+
+
Einsatz:
+
{{ amount }} €
+ +
{{ isDraw ? 'Zurückgegeben:' : (isWin ? 'Gewonnen:' : 'Verloren:') }}
+
+ {{ isLoss ? '-' : '+' }}{{ amount }} € +
+ +
Gesamt:
+
+ {{ isWin ? '+' : (isLoss ? '-' : '') }}{{ amount }} € +
+
+
+ + +
+
+ `, + styleUrls: ['./game-result.component.css'], + changeDetection: ChangeDetectionStrategy.OnPush, + animations: [ + trigger('fadeInOut', [ + transition(':enter', [ + style({ opacity: 0 }), + animate('300ms ease-out', style({ opacity: 1 })) + ]), + transition(':leave', [ + animate('200ms ease-in', style({ opacity: 0 })) + ]) + ]), + trigger('cardAnimation', [ + transition(':enter', [ + style({ opacity: 0, transform: 'scale(0.8)' }), + animate('350ms ease-out', style({ opacity: 1, transform: 'scale(1)' })) + ]) + ]) + ] +}) +export class GameResultComponent { + @Input() gameState: string = ''; + @Input() amount: number = 0; + @Input() set show(value: boolean) { + this.visible = value; + } + + visible = false; + + get isWin(): boolean { + return this.gameState === 'PLAYER_WON'; + } + + get isLoss(): boolean { + return this.gameState === 'PLAYER_LOST'; + } + + get isDraw(): boolean { + return this.gameState === 'DRAW'; + } + + getResultTitle(): string { + if (this.isWin) return 'Gewonnen!'; + if (this.isLoss) return 'Verloren!'; + if (this.isDraw) return 'Unentschieden!'; + return ''; + } + + getResultMessage(): string { + if (this.isWin) return 'Glückwunsch! Du hast diese Runde gewonnen.'; + if (this.isLoss) return 'Schade! Du hast diese Runde verloren.'; + if (this.isDraw) return 'Diese Runde endet unentschieden. Dein Einsatz wurde zurückgegeben.'; + return ''; + } + + getResultClass(): string { + if (this.isWin) return 'text-emerald'; + if (this.isLoss) return 'text-accent-red'; + if (this.isDraw) return 'text-yellow-400'; + return ''; + } +} diff --git a/frontend/src/app/feature/game/blackjack/services/blackjack.service.ts b/frontend/src/app/feature/game/blackjack/services/blackjack.service.ts index 86ab7cf..f0ce54e 100644 --- a/frontend/src/app/feature/game/blackjack/services/blackjack.service.ts +++ b/frontend/src/app/feature/game/blackjack/services/blackjack.service.ts @@ -41,4 +41,15 @@ export class BlackjackService { }) ); } + + getGame(gameId: number): Observable { + return this.http + .get(`/backend/blackjack/${gameId}`, { responseType: 'json' }) + .pipe( + catchError((error) => { + console.error('Get game error:', error); + throw error; + }) + ); + } } From c9f71f70fa8746db627ac15f308c114c17f26558 Mon Sep 17 00:00:00 2001 From: Jan-Marlon Leibl Date: Thu, 27 Mar 2025 15:40:26 +0100 Subject: [PATCH 03/41] feat: add double down feature to blackjack game --- .../blackjack/BlackJackGameController.java | 17 ++ .../casino/blackjack/BlackJackService.java | 150 ++++++++++++------ .../game/blackjack/blackjack.component.html | 2 + .../game/blackjack/blackjack.component.ts | 35 +++- .../game-controls/game-controls.component.ts | 8 + .../game-result/game-result.component.ts | 22 ++- .../blackjack/services/blackjack.service.ts | 11 ++ 7 files changed, 188 insertions(+), 57 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 9f1dae9..a10fe63 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java @@ -77,6 +77,23 @@ public class BlackJackGameController { return ResponseEntity.ok(blackJackService.stand(game)); } + @PostMapping("/blackjack/{id}/doubleDown") + public ResponseEntity doubleDown(@PathVariable Long id, @RequestHeader("Authorization") String token) { + Optional optionalUser = userService.getCurrentUser(token); + + if (optionalUser.isEmpty()) { + return ResponseEntity.notFound().build(); + } + + UserEntity user = optionalUser.get(); + BlackJackGameEntity game = blackJackService.getBlackJackGame(id); + if (game == null || !Objects.equals(game.getUserId(), user.getId())) { + return ResponseEntity.notFound().build(); + } + + return ResponseEntity.ok(blackJackService.doubleDown(game)); + } + @PostMapping("/blackjack/start") public ResponseEntity createBlackJackGame(@RequestBody @Valid CreateBlackJackGameDto createBlackJackGameDto, @RequestHeader("Authorization") String token) { Optional optionalUser = userService.getCurrentUser(token); 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 801acaa..5c39459 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -14,17 +14,15 @@ import java.util.Random; public class BlackJackService { private final BlackJackGameRepository blackJackGameRepository; private final UserRepository userRepository; + private final Random random = new Random(); public BlackJackService(BlackJackGameRepository blackJackGameRepository, UserRepository userRepository) { this.blackJackGameRepository = blackJackGameRepository; this.userRepository = userRepository; } - private final Random random = new Random(); - public BlackJackGameEntity getBlackJackGame(Long id) { - Optional optionalBlackJackGame = blackJackGameRepository.findById(id); - return optionalBlackJackGame.orElse(null); + return blackJackGameRepository.findById(id).orElse(null); } @Transactional @@ -32,88 +30,147 @@ public class BlackJackService { BlackJackGameEntity game = new BlackJackGameEntity(); game.setUser(user); game.setBet(betAmount); + initializeDeck(game); - - for (int i = 0; i < 2; i++) { - CardEntity playerCard = drawCardFromDeck(game); - playerCard.setCardType(CardType.PLAYER); - game.getPlayerCards().add(playerCard); - } - - CardEntity dealerCard = drawCardFromDeck(game); - dealerCard.setCardType(CardType.DEALER); - game.getDealerCards().add(dealerCard); - + dealInitialCards(game); + game.setState(getState(game)); - user.setBalance(user.getBalance().subtract(betAmount)); - - userRepository.save(user); + deductBetFromBalance(user, betAmount); + return blackJackGameRepository.save(game); } @Transactional public BlackJackGameEntity hit(BlackJackGameEntity game) { - game = blackJackGameRepository.findById(game.getId()).orElse(game); + game = refreshGameState(game); if (game.getState() != BlackJackState.IN_PROGRESS) { return game; } - CardEntity drawnCard = drawCardFromDeck(game); - drawnCard.setCardType(CardType.PLAYER); - game.getPlayerCards().add(drawnCard); - - game.setState(getState(game)); - - if (game.getState() == BlackJackState.PLAYER_WON) { - updateUserBalance(game, true); - } else if (game.getState() == BlackJackState.PLAYER_LOST) { - updateUserBalance(game, false); - } - + dealCardToPlayer(game); + updateGameStateAndBalance(game); + return blackJackGameRepository.save(game); } @Transactional public BlackJackGameEntity stand(BlackJackGameEntity game) { - game = blackJackGameRepository.findById(game.getId()).orElse(game); + game = refreshGameState(game); if (game.getState() != BlackJackState.IN_PROGRESS) { return game; } - while (calculateHandValue(game.getDealerCards()) < 17) { - CardEntity dealerCard = drawCardFromDeck(game); - dealerCard.setCardType(CardType.DEALER); - game.getDealerCards().add(dealerCard); - } + dealCardsToDealerUntilMinimumScore(game); + determineWinnerAndUpdateBalance(game); + + return blackJackGameRepository.save(game); + } + @Transactional + public BlackJackGameEntity doubleDown(BlackJackGameEntity game) { + game = refreshGameState(game); + + if (game.getState() != BlackJackState.IN_PROGRESS || game.getPlayerCards().size() != 2) { + return game; + } + + UserEntity user = getUserWithFreshData(game.getUser()); + BigDecimal additionalBet = game.getBet(); + + if (user.getBalance().compareTo(additionalBet) < 0) { + return game; + } + + deductBetFromBalance(user, additionalBet); + game.setBet(game.getBet().add(additionalBet)); + + dealCardToPlayer(game); + updateGameStateAndBalance(game); + + if (game.getState() == BlackJackState.IN_PROGRESS) { + return stand(game); + } + + return game; + } + + + private BlackJackGameEntity refreshGameState(BlackJackGameEntity game) { + return blackJackGameRepository.findById(game.getId()).orElse(game); + } + + private UserEntity getUserWithFreshData(UserEntity user) { + return userRepository.findById(user.getId()).orElse(user); + } + + private void dealInitialCards(BlackJackGameEntity game) { + for (int i = 0; i < 2; i++) { + dealCardToPlayer(game); + } + + dealCardToDealer(game); + } + + private void dealCardToPlayer(BlackJackGameEntity game) { + CardEntity card = drawCardFromDeck(game); + card.setCardType(CardType.PLAYER); + game.getPlayerCards().add(card); + } + + private void dealCardToDealer(BlackJackGameEntity game) { + CardEntity card = drawCardFromDeck(game); + card.setCardType(CardType.DEALER); + game.getDealerCards().add(card); + } + + private void dealCardsToDealerUntilMinimumScore(BlackJackGameEntity game) { + while (calculateHandValue(game.getDealerCards()) < 17) { + dealCardToDealer(game); + } + } + + private void updateGameStateAndBalance(BlackJackGameEntity game) { + game.setState(getState(game)); + + if (game.getState() == BlackJackState.PLAYER_WON) { + updateUserBalance(game, true); + } else if (game.getState() == BlackJackState.PLAYER_LOST) { + updateUserBalance(game, false); + } + } + + private void determineWinnerAndUpdateBalance(BlackJackGameEntity game) { int playerValue = calculateHandValue(game.getPlayerCards()); int dealerValue = calculateHandValue(game.getDealerCards()); if (dealerValue > 21 || playerValue > dealerValue) { game.setState(BlackJackState.PLAYER_WON); updateUserBalance(game, true); + } else if (playerValue < dealerValue) { + game.setState(BlackJackState.PLAYER_LOST); + updateUserBalance(game, false); } else { game.setState(BlackJackState.DRAW); - updateUserBalance(game, false); + updateUserBalance(game, false); // For draw, player gets their bet back } - - return blackJackGameRepository.save(game); + } + + private void deductBetFromBalance(UserEntity user, BigDecimal betAmount) { + user.setBalance(user.getBalance().subtract(betAmount)); + userRepository.save(user); } @Transactional private void updateUserBalance(BlackJackGameEntity game, boolean isWin) { - UserEntity user = game.getUser(); - user = userRepository.findById(user.getId()).orElse(user); - BigDecimal balance = user.getBalance(); - + UserEntity user = getUserWithFreshData(game.getUser()); BigDecimal betAmount = game.getBet(); + BigDecimal balance = user.getBalance(); if (isWin) { balance = balance.add(betAmount.multiply(BigDecimal.valueOf(2))); - } - else if (game.getState() == BlackJackState.DRAW) { + } else if (game.getState() == BlackJackState.DRAW) { balance = balance.add(betAmount); } @@ -159,6 +216,7 @@ public class BlackJackService { private int calculateHandValue(List hand) { int sum = 0; int aceCount = 0; + for (CardEntity card : hand) { sum += card.getRank().getValue(); if (card.getRank() == Rank.ACE) { diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html index 27860a1..debbb75 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -11,6 +11,7 @@ [gameState]="gameState()" (hit)="onHit()" (stand)="onStand()" + (doubleDown)="onDoubleDown()" (leave)="leaveGame()" > } @@ -32,4 +33,5 @@ [gameState]="gameState()" [amount]="currentBet()" [show]="showGameResult()" + (close)="onCloseGameResult()" > diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.ts b/frontend/src/app/feature/game/blackjack/blackjack.component.ts index 2e29eb0..57a04fc 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.ts +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.ts @@ -60,10 +60,13 @@ export default class BlackjackComponent { this.gameInProgress.set(game.state === 'IN_PROGRESS'); this.gameState.set(game.state); + // When game ends, make sure all dealer cards are visible + const isGameOver = game.state !== 'IN_PROGRESS'; + this.dealerCards.set( game.dealerCards.map((card, index) => ({ ...card, - hidden: index === 1 && game.state === 'IN_PROGRESS', + hidden: !isGameOver && index === 1 && game.state === 'IN_PROGRESS', })) ); @@ -74,11 +77,14 @@ export default class BlackjackComponent { })) ); - if (game.state !== 'IN_PROGRESS') { + // Only refresh and show game result if the game has ended + if (isGameOver) { + console.log('Game is over, state:', game.state); this.refreshUserBalance(); - setTimeout(() => { - this.showGameResult.set(true); - }, 1000); + + // Show result immediately without resetting first + this.showGameResult.set(true); + console.log('Game result dialog should be shown now'); } } @@ -127,7 +133,26 @@ export default class BlackjackComponent { }); } + onDoubleDown(): void { + if (!this.currentGameId()) return; + + if (this.gameState() !== 'IN_PROGRESS' || this.playerCards().length !== 2) { + return; + } + + this.blackjackService.doubleDown(this.currentGameId()!).subscribe({ + next: (game) => { + this.updateGameState(game); + }, + error: (error) => { + console.error('Failed to double down:', error); + this.handleGameError(error); + }, + }); + } + onCloseGameResult(): void { + console.log('Closing game result dialog'); this.showGameResult.set(false); } diff --git a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts index 73c5928..3e75315 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts @@ -31,6 +31,13 @@ import { Card } from '../../models/blackjack.model'; > Halten + @@ -52,6 +72,7 @@ import { Card } from '../../models/blackjack.model'; export class GameControlsComponent { @Input() playerCards: Card[] = []; @Input() gameState: string = 'IN_PROGRESS'; + @Input() isActionInProgress: boolean = false; @Output() hit = new EventEmitter(); @Output() stand = new EventEmitter(); diff --git a/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts b/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts index e35bf73..f6b6091 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts @@ -86,10 +86,15 @@ import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angula @@ -101,6 +106,7 @@ export class GameInfoComponent implements OnChanges { @Input() balance = 0; @Input() currentBet = 0; @Input() gameInProgress = false; + @Input() isActionInProgress = false; @Output() newGame = new EventEmitter(); betForm: FormGroup; diff --git a/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts b/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts index e158f67..2b27fee 100644 --- a/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PlayingCardComponent } from '../playing-card/playing-card.component'; import { Card } from '../../models/blackjack.model'; @@ -15,11 +15,12 @@ import { Card } from '../../models/blackjack.model'; class="flex justify-center gap-4 min-h-[160px] p-4 border-2 border-emerald-400 rounded-lg" > @if (cards.length > 0) { - @for (card of cards; track card) { + @for (card of cardsWithState; track card.id) { } } @else { @@ -33,6 +34,33 @@ import { Card } from '../../models/blackjack.model'; `, changeDetection: ChangeDetectionStrategy.OnPush, }) -export class PlayerHandComponent { +export class PlayerHandComponent implements OnChanges { @Input() cards: Card[] = []; + cardsWithState: (Card & { isNew: boolean; id: string })[] = []; + + private lastCardCount = 0; + + ngOnChanges(changes: SimpleChanges): void { + if (changes['cards']) { + this.updateCardsWithState(); + } + } + + private updateCardsWithState(): void { + const newCards = this.cards.length > this.lastCardCount; + + this.cardsWithState = this.cards.map((card, index) => { + // Consider a card new if it's added after the initial state and is the latest card + const isNew = newCards && index >= this.lastCardCount; + + return { + ...card, + isNew, + // Generate a unique ID to help Angular track the cards + id: `${card.suit}-${card.rank}-${index}` + }; + }); + + this.lastCardCount = this.cards.length; + } } diff --git a/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts b/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts index 186ac9b..e006bd4 100644 --- a/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts @@ -1,6 +1,7 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Input, AfterViewInit, ElementRef, OnChanges, SimpleChanges } from '@angular/core'; import { CommonModule } from '@angular/common'; import { suitSymbols, Suit } from '../../models/blackjack.model'; +import { gsap } from 'gsap'; @Component({ selector: 'app-playing-card', @@ -8,31 +9,90 @@ import { suitSymbols, Suit } from '../../models/blackjack.model'; imports: [CommonModule], template: `
@if (!hidden) { - {{ getDisplayRank(rank) }} + {{ getDisplayRank(rank) }} } @if (!hidden) { {{ getSuitSymbol(suit) }} } @if (!hidden) { - {{ + {{ getDisplayRank(rank) }} }
`, + styles: [` + .card-element { + transform-style: preserve-3d; + backface-visibility: hidden; + } + `], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class PlayingCardComponent { +export class PlayingCardComponent implements AfterViewInit, OnChanges { @Input({ required: true }) rank!: string; @Input({ required: true }) suit!: Suit; @Input({ required: true }) hidden!: boolean; + @Input() isNew: boolean = false; + + constructor(private elementRef: ElementRef) {} + + get isRedSuit(): boolean { + return this.suit === 'HEARTS' || this.suit === 'DIAMONDS'; + } + + ngAfterViewInit(): void { + if (this.isNew) { + this.animateNewCard(); + } + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes['hidden'] && !changes['hidden'].firstChange) { + this.animateCardFlip(); + } + } + + private animateNewCard(): void { + const cardElement = this.elementRef.nativeElement.querySelector('.card-element'); + gsap.fromTo( + cardElement, + { + y: -100, + opacity: 0, + rotation: -10, + scale: 0.7 + }, + { + y: 0, + opacity: 1, + rotation: 0, + scale: 1, + duration: 0.5, + ease: 'power2.out' + } + ); + } + + private animateCardFlip(): void { + const cardElement = this.elementRef.nativeElement.querySelector('.card-element'); + gsap.to(cardElement, { + rotationY: 180, + duration: 0.3, + onComplete: () => { + gsap.set(cardElement, { rotationY: 0 }); + } + }); + } protected getSuitSymbol(suit: Suit): string { return suitSymbols[suit]; From cb6c1550b7d7fe9c76dd99da73f93ffb0f47d80f Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Thu, 27 Mar 2025 15:46:07 +0100 Subject: [PATCH 05/41] refactor: refactor state logic --- backend/requests/blackjack.http | 2 +- .../blackjack/BlackJackGameController.java | 2 +- .../casino/blackjack/BlackJackService.java | 30 +++++++++++-------- .../szut/casino/blackjack/BlackJackState.java | 1 + .../de/szut/casino/blackjack/CardEntity.java | 1 + 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/backend/requests/blackjack.http b/backend/requests/blackjack.http index 1ac2def..0b8b261 100644 --- a/backend/requests/blackjack.http +++ b/backend/requests/blackjack.http @@ -7,6 +7,6 @@ Content-Type: application/json } ### -POST http://localhost:8080/blackjack/202/hit +POST http://localhost:8080/blackjack/54/hit Authorization: Bearer {{token}} 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 58505eb..774e0c1 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameController.java @@ -46,7 +46,7 @@ public class BlackJackGameController { return ResponseEntity.badRequest().body(errorResponse); } - return ResponseEntity.ok(blackJackService.hit(game)); + return ResponseEntity.ok(blackJackService.hit(game, user)); } @PostMapping("/blackjack/start") 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 62b8859..693c055 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackService.java @@ -42,14 +42,7 @@ public class BlackJackService { dealerCard.setCardType(CardType.DEALER); game.getDealerCards().add(dealerCard); - BlackJackState state = getState(game); - if (state == BlackJackState.PLAYER_BLACKJACK) { - BigDecimal blackjackWinnings = betAmount.multiply(new BigDecimal("1.5")); - user.setBalance(user.getBalance().add(blackjackWinnings)); - } else { - user.setBalance(user.getBalance().subtract(betAmount)); - } - + BlackJackState state = handleState(game, user); game.setState(state); userRepository.save(user); @@ -58,12 +51,12 @@ public class BlackJackService { return game; } - public BlackJackGameEntity hit(BlackJackGameEntity game) { + public BlackJackGameEntity hit(BlackJackGameEntity game, UserEntity user) { CardEntity drawnCard = drawCardFromDeck(game); drawnCard.setCardType(CardType.PLAYER); game.getPlayerCards().add(drawnCard); - game.setState(getState(game)); + game.setState(handleState(game, user)); return blackJackGameRepository.save(game); } @@ -91,12 +84,25 @@ public class BlackJackService { return game.getDeck().removeFirst(); } - private BlackJackState getState(BlackJackGameEntity game) { + private BlackJackState handleState(BlackJackGameEntity game, UserEntity user) { int playerHandValue = calculateHandValue(game.getPlayerCards()); if (playerHandValue == 21) { - return BlackJackState.PLAYER_BLACKJACK; + CardEntity hole = drawCardFromDeck(game); + hole.setCardType(CardType.DEALER); + game.getDealerCards().add(hole); + + int dealerHandValue = calculateHandValue(game.getDealerCards()); + + if (dealerHandValue == 21) { + return BlackJackState.STANDOFF; + } else { + BigDecimal blackjackWinnings = game.getBet().multiply(new BigDecimal("1.5")); + user.setBalance(user.getBalance().add(blackjackWinnings)); + return BlackJackState.PLAYER_BLACKJACK; + } } else if (playerHandValue > 21) { + user.setBalance(user.getBalance().subtract(game.getBet())); return BlackJackState.PLAYER_LOST; } diff --git a/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java b/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java index e866bd9..f896058 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackState.java @@ -4,4 +4,5 @@ public enum BlackJackState { IN_PROGRESS, PLAYER_BLACKJACK, PLAYER_LOST, + STANDOFF, } 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 5520b58..3b6903a 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java @@ -31,6 +31,7 @@ public class CardEntity { private Rank rank; @Enumerated(EnumType.STRING) + @JsonIgnore private CardType cardType; } From 23888ceb274b97423526cd5cfd6793ad31066e93 Mon Sep 17 00:00:00 2001 From: Jan-Marlon Leibl Date: Thu, 27 Mar 2025 15:47:16 +0100 Subject: [PATCH 06/41] style(blackjack): format code for better readability --- .../game/blackjack/blackjack.component.html | 12 ++- .../game/blackjack/blackjack.component.ts | 33 ++++--- .../dealer-hand/dealer-hand.component.ts | 14 +-- .../game-controls/game-controls.component.ts | 32 ++++--- .../game-info/game-info.component.ts | 4 +- .../game-result/game-result.component.spec.ts | 5 +- .../game-result/game-result.component.ts | 88 +++++++++---------- .../player-hand/player-hand.component.ts | 14 +-- .../playing-card/playing-card.component.ts | 58 +++++++----- 9 files changed, 139 insertions(+), 121 deletions(-) diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html index 62d5489..1a6b8d3 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -5,17 +5,21 @@
- + @if (isActionInProgress()) {
-
-
+
+
{{ currentAction() }}
} - + @if (gameInProgress()) { ('IN_PROGRESS'); showGameResult = signal(false); - + // Add loading state trackers isActionInProgress = signal(false); currentAction = signal(''); @@ -66,7 +66,7 @@ export default class BlackjackComponent { // When game ends, make sure all dealer cards are visible const isGameOver = game.state !== 'IN_PROGRESS'; - + this.dealerCards.set( game.dealerCards.map((card, index) => ({ ...card, @@ -85,7 +85,7 @@ export default class BlackjackComponent { if (isGameOver) { console.log('Game is over, state:', game.state); this.refreshUserBalance(); - + // Show result immediately without resetting first this.showGameResult.set(true); console.log('Game result dialog should be shown now'); @@ -95,7 +95,7 @@ export default class BlackjackComponent { onNewGame(bet: number): void { this.isActionInProgress.set(true); this.currentAction.set('Spiel wird gestartet...'); - + this.blackjackService.startGame(bet).subscribe({ next: (game) => { this.updateGameState(game); @@ -114,7 +114,7 @@ export default class BlackjackComponent { this.isActionInProgress.set(true); this.currentAction.set('Karte wird gezogen...'); - + this.blackjackService.hit(this.currentGameId()!).subscribe({ next: (game) => { this.updateGameState(game); @@ -130,7 +130,7 @@ export default class BlackjackComponent { onStand(): void { if (!this.currentGameId() || this.isActionInProgress()) return; - + if (this.gameState() !== 'IN_PROGRESS') { console.log('Cannot stand: game is not in progress'); return; @@ -138,7 +138,7 @@ export default class BlackjackComponent { this.isActionInProgress.set(true); this.currentAction.set('Dealer zieht Karten...'); - + this.blackjackService.stand(this.currentGameId()!).subscribe({ next: (game) => { this.updateGameState(game); @@ -154,7 +154,7 @@ export default class BlackjackComponent { onDoubleDown(): void { if (!this.currentGameId() || this.isActionInProgress()) return; - + if (this.gameState() !== 'IN_PROGRESS' || this.playerCards().length !== 2) { console.log('Cannot double down: game is not in progress or more than 2 cards'); return; @@ -162,7 +162,7 @@ export default class BlackjackComponent { this.isActionInProgress.set(true); this.currentAction.set('Einsatz wird verdoppelt...'); - + this.blackjackService.doubleDown(this.currentGameId()!).subscribe({ next: (game) => { this.updateGameState(game); @@ -181,20 +181,19 @@ export default class BlackjackComponent { this.showGameResult.set(false); } - private handleGameError(error: any): void { + private handleGameError(error: HttpErrorResponse): void { if (error instanceof HttpErrorResponse) { if (error.status === 400 && error.error?.error === 'Invalid state') { this.gameInProgress.set(false); - + this.refreshUserBalance(); - } - else if (error.status === 500) { + } else if (error.status === 500) { console.log('Server error occurred. The game may have been updated in another session.'); - + this.gameInProgress.set(false); - + this.refreshUserBalance(); - + if (this.currentGameId()) { this.refreshGameState(this.currentGameId()!); } @@ -209,7 +208,7 @@ export default class BlackjackComponent { }, error: (err) => { console.error('Failed to refresh game state:', err); - } + }, }); } diff --git a/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts b/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts index 990b3c8..6d77f60 100644 --- a/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts @@ -35,30 +35,30 @@ import { Card } from '../../models/blackjack.model'; export class DealerHandComponent implements OnChanges { @Input() cards: Card[] = []; cardsWithState: (Card & { isNew: boolean; id: string })[] = []; - + private lastCardCount = 0; - + ngOnChanges(changes: SimpleChanges): void { if (changes['cards']) { this.updateCardsWithState(); } } - + private updateCardsWithState(): void { const newCards = this.cards.length > this.lastCardCount; - + this.cardsWithState = this.cards.map((card, index) => { // Consider a card new if it's added after the initial state and is the latest card const isNew = newCards && index >= this.lastCardCount; - + return { ...card, isNew, // Generate a unique ID to help Angular track the cards - id: `${card.suit}-${card.rank}-${index}` + id: `${card.suit}-${card.rank}-${index}`, }; }); - + this.lastCardCount = this.cards.length; } } diff --git a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts index 899417f..9922309 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts @@ -10,7 +10,9 @@ import { Card } from '../../models/blackjack.model';
-
Deine Punkte: {{ calculateHandValue(playerCards) }}
+
+ Deine Punkte: {{ calculateHandValue(playerCards) }} +
Status: {{ getStatusText(gameState) }}
@@ -26,7 +28,9 @@ import { Card } from '../../models/blackjack.model'; Ziehen @if (isActionInProgress) {
-
+
} @@ -39,7 +43,9 @@ import { Card } from '../../models/blackjack.model'; Halten @if (isActionInProgress) {
-
+
} @@ -52,7 +58,9 @@ import { Card } from '../../models/blackjack.model'; Verdoppeln @if (isActionInProgress) {
-
+
} @@ -71,9 +79,9 @@ import { Card } from '../../models/blackjack.model'; }) export class GameControlsComponent { @Input() playerCards: Card[] = []; - @Input() gameState: string = 'IN_PROGRESS'; - @Input() isActionInProgress: boolean = false; - + @Input() gameState = 'IN_PROGRESS'; + @Input() isActionInProgress = false; + @Output() hit = new EventEmitter(); @Output() stand = new EventEmitter(); @Output() doubleDown = new EventEmitter(); @@ -82,7 +90,7 @@ export class GameControlsComponent { calculateHandValue(cards: Card[]): number { let sum = 0; let aceCount = 0; - + const rankValues: Record = { TWO: 2, THREE: 3, @@ -96,9 +104,9 @@ export class GameControlsComponent { JACK: 10, QUEEN: 10, KING: 10, - ACE: 11 + ACE: 11, }; - + for (const card of cards) { if (!card.hidden) { const value = rankValues[card.rank] || 0; @@ -108,12 +116,12 @@ export class GameControlsComponent { } } } - + while (sum > 21 && aceCount > 0) { sum -= 10; aceCount--; } - + return sum; } diff --git a/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts b/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts index f6b6091..6219b98 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-info/game-info.component.ts @@ -92,7 +92,9 @@ import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angula Neues Spiel @if (isActionInProgress) {
-
+
} diff --git a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts index fbc1d3d..81ac70d 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts @@ -8,9 +8,8 @@ describe('GameResultComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [GameResultComponent] - }) - .compileComponents(); + imports: [GameResultComponent], + }).compileComponents(); fixture = TestBed.createComponent(GameResultComponent); component = fixture.componentInstance; diff --git a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts index 48021c7..e84a7ce 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.ts @@ -7,55 +7,49 @@ import { animate, style, transition, trigger } from '@angular/animations'; standalone: true, imports: [CommonModule, CurrencyPipe], template: ` -
-
+
+

{{ getResultTitle() }}

{{ getResultMessage() }}

- -
+ +
Einsatz:
{{ amount }} €
- -
{{ isDraw ? 'Zurückgegeben:' : (isWin ? 'Gewonnen:' : 'Verloren:') }}
-
+ {{ isDraw ? 'Zurückgegeben:' : isWin ? 'Gewonnen:' : 'Verloren:' }} +
+
{{ isLoss ? '-' : '+' }}{{ amount }} €
- -
Gesamt:
-
+ Gesamt: +
+
- {{ isWin ? '+' : (isLoss ? '-' : '') }}{{ amount }} € + {{ isWin ? '+' : isLoss ? '-' : '' }}{{ amount }} €
- -
@@ -67,68 +61,66 @@ import { animate, style, transition, trigger } from '@angular/animations'; trigger('fadeInOut', [ transition(':enter', [ style({ opacity: 0 }), - animate('150ms ease-out', style({ opacity: 1 })) + animate('150ms ease-out', style({ opacity: 1 })), ]), - transition(':leave', [ - animate('150ms ease-in', style({ opacity: 0 })) - ]) + transition(':leave', [animate('150ms ease-in', style({ opacity: 0 }))]), ]), trigger('cardAnimation', [ transition(':enter', [ style({ opacity: 0, transform: 'scale(0.95)' }), - animate('200ms ease-out', style({ opacity: 1, transform: 'scale(1)' })) - ]) - ]) - ] + animate('200ms ease-out', style({ opacity: 1, transform: 'scale(1)' })), + ]), + ]), + ], }) export class GameResultComponent { - @Input() gameState: string = ''; - @Input() amount: number = 0; + @Input() gameState = ''; + @Input() amount = 0; @Input() set show(value: boolean) { console.log('GameResultComponent show input changed:', value, 'gameState:', this.gameState); this.visible = value; } - - @Output() close = new EventEmitter(); - + + @Output() gameResultClosed = new EventEmitter(); + visible = false; - + get isWin(): boolean { return this.gameState === 'PLAYER_WON'; } - + get isLoss(): boolean { return this.gameState === 'PLAYER_LOST'; } - + get isDraw(): boolean { return this.gameState === 'DRAW'; } - + getResultTitle(): string { if (this.isWin) return 'Gewonnen!'; if (this.isLoss) return 'Verloren!'; if (this.isDraw) return 'Unentschieden!'; return ''; } - + getResultMessage(): string { if (this.isWin) return 'Glückwunsch! Du hast diese Runde gewonnen.'; if (this.isLoss) return 'Schade! Du hast diese Runde verloren.'; if (this.isDraw) return 'Diese Runde endet unentschieden. Dein Einsatz wurde zurückgegeben.'; return ''; } - + getResultClass(): string { if (this.isWin) return 'text-emerald'; if (this.isLoss) return 'text-accent-red'; if (this.isDraw) return 'text-yellow-400'; return ''; } - + closeDialog(): void { this.visible = false; - this.close.emit(); + this.gameResultClosed.emit(); console.log('Dialog closed by user'); } } diff --git a/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts b/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts index 2b27fee..33bf547 100644 --- a/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts @@ -37,30 +37,30 @@ import { Card } from '../../models/blackjack.model'; export class PlayerHandComponent implements OnChanges { @Input() cards: Card[] = []; cardsWithState: (Card & { isNew: boolean; id: string })[] = []; - + private lastCardCount = 0; - + ngOnChanges(changes: SimpleChanges): void { if (changes['cards']) { this.updateCardsWithState(); } } - + private updateCardsWithState(): void { const newCards = this.cards.length > this.lastCardCount; - + this.cardsWithState = this.cards.map((card, index) => { // Consider a card new if it's added after the initial state and is the latest card const isNew = newCards && index >= this.lastCardCount; - + return { ...card, isNew, // Generate a unique ID to help Angular track the cards - id: `${card.suit}-${card.rank}-${index}` + id: `${card.suit}-${card.rank}-${index}`, }; }); - + this.lastCardCount = this.cards.length; } } diff --git a/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts b/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts index e006bd4..662ddc6 100644 --- a/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/playing-card/playing-card.component.ts @@ -1,4 +1,12 @@ -import { ChangeDetectionStrategy, Component, Input, AfterViewInit, ElementRef, OnChanges, SimpleChanges } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + Input, + AfterViewInit, + ElementRef, + OnChanges, + SimpleChanges, +} from '@angular/core'; import { CommonModule } from '@angular/common'; import { suitSymbols, Suit } from '../../models/blackjack.model'; import { gsap } from 'gsap'; @@ -14,7 +22,9 @@ import { gsap } from 'gsap'; [class]="hidden ? 'bg-red-800' : 'bg-white'" > @if (!hidden) { - {{ getDisplayRank(rank) }} + {{ + getDisplayRank(rank) + }} } @if (!hidden) { } @if (!hidden) { - {{ - getDisplayRank(rank) - }} + {{ getDisplayRank(rank) }} }
`, - styles: [` - .card-element { - transform-style: preserve-3d; - backface-visibility: hidden; - } - `], + styles: [ + ` + .card-element { + transform-style: preserve-3d; + backface-visibility: hidden; + } + `, + ], changeDetection: ChangeDetectionStrategy.OnPush, }) export class PlayingCardComponent implements AfterViewInit, OnChanges { @Input({ required: true }) rank!: string; @Input({ required: true }) suit!: Suit; @Input({ required: true }) hidden!: boolean; - @Input() isNew: boolean = false; + @Input() isNew = false; constructor(private elementRef: ElementRef) {} @@ -66,31 +80,31 @@ export class PlayingCardComponent implements AfterViewInit, OnChanges { const cardElement = this.elementRef.nativeElement.querySelector('.card-element'); gsap.fromTo( cardElement, - { - y: -100, + { + y: -100, opacity: 0, rotation: -10, - scale: 0.7 + scale: 0.7, }, - { - y: 0, + { + y: 0, opacity: 1, rotation: 0, scale: 1, - duration: 0.5, - ease: 'power2.out' + duration: 0.5, + ease: 'power2.out', } ); } private animateCardFlip(): void { const cardElement = this.elementRef.nativeElement.querySelector('.card-element'); - gsap.to(cardElement, { - rotationY: 180, + gsap.to(cardElement, { + rotationY: 180, duration: 0.3, onComplete: () => { gsap.set(cardElement, { rotationY: 0 }); - } + }, }); } From 05322e3d8309edcb29f8aabcb6b6ac8c72d0ac2a Mon Sep 17 00:00:00 2001 From: Jan-Marlon Leibl Date: Thu, 27 Mar 2025 15:50:34 +0100 Subject: [PATCH 07/41] refactor(blackjack): remove unnecessary comments and clean code --- .../src/app/feature/game/blackjack/blackjack.component.html | 1 - .../src/app/feature/game/blackjack/blackjack.component.ts | 4 ---- .../blackjack/components/dealer-hand/dealer-hand.component.ts | 2 -- .../blackjack/components/player-hand/player-hand.component.ts | 2 -- 4 files changed, 9 deletions(-) diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html index 1a6b8d3..c47d2f6 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -6,7 +6,6 @@ - @if (isActionInProgress()) {
('IN_PROGRESS'); showGameResult = signal(false); - // Add loading state trackers isActionInProgress = signal(false); currentAction = signal(''); @@ -64,7 +63,6 @@ export default class BlackjackComponent { this.gameInProgress.set(game.state === 'IN_PROGRESS'); this.gameState.set(game.state); - // When game ends, make sure all dealer cards are visible const isGameOver = game.state !== 'IN_PROGRESS'; this.dealerCards.set( @@ -81,12 +79,10 @@ export default class BlackjackComponent { })) ); - // Only refresh and show game result if the game has ended if (isGameOver) { console.log('Game is over, state:', game.state); this.refreshUserBalance(); - // Show result immediately without resetting first this.showGameResult.set(true); console.log('Game result dialog should be shown now'); } diff --git a/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts b/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts index 6d77f60..50ff0cf 100644 --- a/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/dealer-hand/dealer-hand.component.ts @@ -48,13 +48,11 @@ export class DealerHandComponent implements OnChanges { const newCards = this.cards.length > this.lastCardCount; this.cardsWithState = this.cards.map((card, index) => { - // Consider a card new if it's added after the initial state and is the latest card const isNew = newCards && index >= this.lastCardCount; return { ...card, isNew, - // Generate a unique ID to help Angular track the cards id: `${card.suit}-${card.rank}-${index}`, }; }); diff --git a/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts b/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts index 33bf547..d47114f 100644 --- a/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/player-hand/player-hand.component.ts @@ -50,13 +50,11 @@ export class PlayerHandComponent implements OnChanges { const newCards = this.cards.length > this.lastCardCount; this.cardsWithState = this.cards.map((card, index) => { - // Consider a card new if it's added after the initial state and is the latest card const isNew = newCards && index >= this.lastCardCount; return { ...card, isNew, - // Generate a unique ID to help Angular track the cards id: `${card.suit}-${card.rank}-${index}`, }; }); From 732d475a8452ea043dce02da30af56a83c17776e Mon Sep 17 00:00:00 2001 From: Jan-Marlon Leibl Date: Wed, 2 Apr 2025 09:06:44 +0200 Subject: [PATCH 08/41] feat: add game state enum and refactor game components --- .../casino/blackjack/BlackJackGameEntity.java | 4 - .../de/szut/casino/blackjack/CardEntity.java | 4 - frontend/src/app/enum/gameState.ts | 6 ++ .../game/blackjack/blackjack.component.html | 2 +- .../game/blackjack/blackjack.component.ts | 15 ++-- .../game-controls/game-controls.component.ts | 82 +++---------------- .../game-result/game-result.component.css | 1 - .../game-result/game-result.component.spec.ts | 22 ----- .../game-result/game-result.component.ts | 10 +-- .../services/game-controls.service.ts | 74 +++++++++++++++++ 10 files changed, 105 insertions(+), 115 deletions(-) create mode 100644 frontend/src/app/enum/gameState.ts delete mode 100644 frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.css delete mode 100644 frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts create mode 100644 frontend/src/app/feature/game/blackjack/services/game-controls.service.ts 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 0dbfcc0..4f22c9d 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/BlackJackGameEntity.java @@ -24,10 +24,6 @@ public class BlackJackGameEntity { @GeneratedValue private Long id; - @Version - @JsonIgnore - private Long version; - @ManyToOne @JoinColumn(name = "user_id", nullable = false) @JsonIgnore 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 27d09d6..5520b58 100644 --- a/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java +++ b/backend/src/main/java/de/szut/casino/blackjack/CardEntity.java @@ -19,10 +19,6 @@ public class CardEntity { @JsonIgnore private Long id; - @Version - @JsonIgnore - private Long version; - @ManyToOne @JoinColumn(name = "game_id", nullable = false) @JsonBackReference diff --git a/frontend/src/app/enum/gameState.ts b/frontend/src/app/enum/gameState.ts new file mode 100644 index 0000000..b07bf85 --- /dev/null +++ b/frontend/src/app/enum/gameState.ts @@ -0,0 +1,6 @@ +export enum GameState { + PLAYER_WON = 'PLAYER_WON', + IN_PROGRESS = 'IN_PROGRESS', + PLAYER_LOST = 'PLAYER_LOST', + DRAW = 'DRAW', +} \ No newline at end of file diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.html b/frontend/src/app/feature/game/blackjack/blackjack.component.html index c47d2f6..887aeeb 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.html +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.html @@ -49,5 +49,5 @@ [gameState]="gameState()" [amount]="currentBet()" [show]="showGameResult()" - (close)="onCloseGameResult()" + (gameResultClosed)="onCloseGameResult()" > diff --git a/frontend/src/app/feature/game/blackjack/blackjack.component.ts b/frontend/src/app/feature/game/blackjack/blackjack.component.ts index 5b5ad42..621cbf5 100644 --- a/frontend/src/app/feature/game/blackjack/blackjack.component.ts +++ b/frontend/src/app/feature/game/blackjack/blackjack.component.ts @@ -12,6 +12,7 @@ import { Card, BlackjackGame } from './models/blackjack.model'; import { BlackjackService } from './services/blackjack.service'; import { HttpErrorResponse } from '@angular/common/http'; import { GameResultComponent } from './components/game-result/game-result.component'; +import { GameState } from '../../../enum/gameState'; @Component({ selector: 'app-blackjack', @@ -40,7 +41,7 @@ export default class BlackjackComponent { balance = signal(0); currentGameId = signal(undefined); gameInProgress = signal(false); - gameState = signal('IN_PROGRESS'); + gameState = signal(GameState.IN_PROGRESS); showGameResult = signal(false); isActionInProgress = signal(false); @@ -60,15 +61,15 @@ export default class BlackjackComponent { console.log('Game state update:', game); this.currentGameId.set(game.id); this.currentBet.set(game.bet); - this.gameInProgress.set(game.state === 'IN_PROGRESS'); - this.gameState.set(game.state); + this.gameInProgress.set(game.state === GameState.IN_PROGRESS); + this.gameState.set(game.state as GameState); - const isGameOver = game.state !== 'IN_PROGRESS'; + const isGameOver = game.state !== GameState.IN_PROGRESS; this.dealerCards.set( game.dealerCards.map((card, index) => ({ ...card, - hidden: !isGameOver && index === 1 && game.state === 'IN_PROGRESS', + hidden: !isGameOver && index === 1 && game.state === GameState.IN_PROGRESS, })) ); @@ -127,7 +128,7 @@ export default class BlackjackComponent { onStand(): void { if (!this.currentGameId() || this.isActionInProgress()) return; - if (this.gameState() !== 'IN_PROGRESS') { + if (this.gameState() !== GameState.IN_PROGRESS) { console.log('Cannot stand: game is not in progress'); return; } @@ -151,7 +152,7 @@ export default class BlackjackComponent { onDoubleDown(): void { if (!this.currentGameId() || this.isActionInProgress()) return; - if (this.gameState() !== 'IN_PROGRESS' || this.playerCards().length !== 2) { + if (this.gameState() !== GameState.IN_PROGRESS || this.playerCards().length !== 2) { console.log('Cannot double down: game is not in progress or more than 2 cards'); return; } diff --git a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts index 9922309..00a8eca 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts @@ -1,6 +1,8 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; import { CommonModule } from '@angular/common'; import { Card } from '../../models/blackjack.model'; +import { GameState } from '../../../../../enum/gameState'; +import { GameControlsService } from '../../services/game-controls.service'; @Component({ selector: 'app-game-controls', @@ -11,10 +13,10 @@ import { Card } from '../../models/blackjack.model';
- Deine Punkte: {{ calculateHandValue(playerCards) }} + Deine Punkte: {{ gameControlsService.calculateHandValue(playerCards) }}
- Status: {{ getStatusText(gameState) }} + Status: {{ gameControlsService.getStatusText(gameState) }}
@@ -22,7 +24,7 @@ import { Card } from '../../models/blackjack.model';
`, - styleUrls: ['./game-result.component.css'], changeDetection: ChangeDetectionStrategy.OnPush, animations: [ trigger('fadeInOut', [ @@ -74,7 +74,7 @@ import { animate, style, transition, trigger } from '@angular/animations'; ], }) export class GameResultComponent { - @Input() gameState = ''; + @Input() gameState: GameState = GameState.IN_PROGRESS; @Input() amount = 0; @Input() set show(value: boolean) { console.log('GameResultComponent show input changed:', value, 'gameState:', this.gameState); @@ -86,15 +86,15 @@ export class GameResultComponent { visible = false; get isWin(): boolean { - return this.gameState === 'PLAYER_WON'; + return this.gameState === GameState.PLAYER_WON; } get isLoss(): boolean { - return this.gameState === 'PLAYER_LOST'; + return this.gameState === GameState.PLAYER_LOST; } get isDraw(): boolean { - return this.gameState === 'DRAW'; + return this.gameState === GameState.DRAW; } getResultTitle(): string { diff --git a/frontend/src/app/feature/game/blackjack/services/game-controls.service.ts b/frontend/src/app/feature/game/blackjack/services/game-controls.service.ts new file mode 100644 index 0000000..ecd294d --- /dev/null +++ b/frontend/src/app/feature/game/blackjack/services/game-controls.service.ts @@ -0,0 +1,74 @@ +import { Injectable } from '@angular/core'; +import { Card } from '../models/blackjack.model'; +import { GameState } from '../../../../enum/gameState'; + +@Injectable({ + providedIn: 'root' +}) +export class GameControlsService { + calculateHandValue(cards: Card[]): number { + let sum = 0; + let aceCount = 0; + + const rankValues: Record = { + TWO: 2, + THREE: 3, + FOUR: 4, + FIVE: 5, + SIX: 6, + SEVEN: 7, + EIGHT: 8, + NINE: 9, + TEN: 10, + JACK: 10, + QUEEN: 10, + KING: 10, + ACE: 11, + }; + + for (const card of cards) { + if (!card.hidden) { + const value = rankValues[card.rank] || 0; + sum += value; + if (card.rank === 'ACE') { + aceCount++; + } + } + } + + while (sum > 21 && aceCount > 0) { + sum -= 10; + aceCount--; + } + + return sum; + } + + getStatusText(state: GameState): string { + switch (state) { + case GameState.IN_PROGRESS: + return 'Spiel läuft'; + case GameState.PLAYER_WON: + return 'Gewonnen!'; + case GameState.PLAYER_LOST: + return 'Verloren!'; + case GameState.DRAW: + return 'Unentschieden!'; + default: + return state; + } + } + + getStatusClass(state: GameState): string { + switch (state) { + case GameState.PLAYER_WON: + return 'text-emerald'; + case GameState.PLAYER_LOST: + return 'text-accent-red'; + case GameState.DRAW: + return 'text-yellow-400'; + default: + return 'text-white'; + } + } +} \ No newline at end of file From f1c70f5f2c4d1809fdb45fbfdf3a4f75f6acd2bd Mon Sep 17 00:00:00 2001 From: Jan-Marlon Leibl Date: Wed, 2 Apr 2025 09:08:04 +0200 Subject: [PATCH 09/41] style: format code and add missing newlines --- frontend/src/app/enum/gameState.ts | 2 +- .../game-controls/game-controls.component.ts | 11 ++++++++--- .../game/blackjack/services/game-controls.service.ts | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/enum/gameState.ts b/frontend/src/app/enum/gameState.ts index b07bf85..69e3ddf 100644 --- a/frontend/src/app/enum/gameState.ts +++ b/frontend/src/app/enum/gameState.ts @@ -3,4 +3,4 @@ export enum GameState { IN_PROGRESS = 'IN_PROGRESS', PLAYER_LOST = 'PLAYER_LOST', DRAW = 'DRAW', -} \ No newline at end of file +} diff --git a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts index 00a8eca..7572376 100644 --- a/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts +++ b/frontend/src/app/feature/game/blackjack/components/game-controls/game-controls.component.ts @@ -16,7 +16,10 @@ import { GameControlsService } from '../../services/game-controls.service'; Deine Punkte: {{ gameControlsService.calculateHandValue(playerCards) }}
- Status: {{ gameControlsService.getStatusText(gameState) }} + Status: + {{ + gameControlsService.getStatusText(gameState) + }}
@@ -54,7 +57,9 @@ import { GameControlsService } from '../../services/game-controls.service';