From 732d475a8452ea043dce02da30af56a83c17776e Mon Sep 17 00:00:00 2001
From: Jan-Marlon Leibl <jleibl@proton.me>
Date: Wed, 2 Apr 2025 09:06:44 +0200
Subject: [PATCH] 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()"
 ></app-game-result>
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<number | undefined>(undefined);
   gameInProgress = signal(false);
-  gameState = signal<string>('IN_PROGRESS');
+  gameState = signal<GameState>(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';
       <div class="flex justify-center text-lg mb-5">
         <div class="card p-4">
           <div class="text-emerald font-bold mb-1">
-            Deine Punkte: {{ calculateHandValue(playerCards) }}
+            Deine Punkte: {{ gameControlsService.calculateHandValue(playerCards) }}
           </div>
           <div class="text-text-secondary">
-            Status: <span [class]="getStatusClass(gameState)">{{ getStatusText(gameState) }}</span>
+            Status: <span [class]="gameControlsService.getStatusClass(gameState)">{{ gameControlsService.getStatusText(gameState) }}</span>
           </div>
         </div>
       </div>
@@ -22,7 +24,7 @@ import { Card } from '../../models/blackjack.model';
         <button
           (click)="hit.emit()"
           class="button-primary px-8 py-4 text-lg font-medium min-w-[120px] relative"
-          [disabled]="gameState !== 'IN_PROGRESS' || isActionInProgress"
+          [disabled]="gameState !== GameState.IN_PROGRESS || isActionInProgress"
           [class.opacity-50]="isActionInProgress"
         >
           <span [class.invisible]="isActionInProgress">Ziehen</span>
@@ -37,7 +39,7 @@ import { Card } from '../../models/blackjack.model';
         <button
           (click)="stand.emit()"
           class="button-primary px-8 py-4 text-lg font-medium min-w-[120px] relative"
-          [disabled]="gameState !== 'IN_PROGRESS' || isActionInProgress"
+          [disabled]="gameState !== GameState.IN_PROGRESS || isActionInProgress"
           [class.opacity-50]="isActionInProgress"
         >
           <span [class.invisible]="isActionInProgress">Halten</span>
@@ -52,7 +54,7 @@ import { Card } from '../../models/blackjack.model';
         <button
           (click)="doubleDown.emit()"
           class="button-primary px-8 py-4 text-lg font-medium min-w-[120px] relative"
-          [disabled]="gameState !== 'IN_PROGRESS' || playerCards.length !== 2 || isActionInProgress"
+          [disabled]="gameState !== GameState.IN_PROGRESS || playerCards.length !== 2 || isActionInProgress"
           [class.opacity-50]="isActionInProgress"
         >
           <span [class.invisible]="isActionInProgress">Verdoppeln</span>
@@ -79,77 +81,15 @@ import { Card } from '../../models/blackjack.model';
 })
 export class GameControlsComponent {
   @Input() playerCards: Card[] = [];
-  @Input() gameState = 'IN_PROGRESS';
-  @Input() isActionInProgress = false;
+  @Input() gameState: GameState = GameState.IN_PROGRESS;
+  @Input() isActionInProgress: boolean = false;
 
   @Output() hit = new EventEmitter<void>();
   @Output() stand = new EventEmitter<void>();
   @Output() doubleDown = new EventEmitter<void>();
   @Output() leave = new EventEmitter<void>();
 
-  calculateHandValue(cards: Card[]): number {
-    let sum = 0;
-    let aceCount = 0;
+  protected readonly GameState = GameState;
 
-    const rankValues: Record<string, number> = {
-      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';
-    }
-  }
+  constructor(protected gameControlsService: GameControlsService) {}
 }
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
deleted file mode 100644
index 5c8977f..0000000
--- a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.css
+++ /dev/null
@@ -1 +0,0 @@
-/* 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
deleted file mode 100644
index 81ac70d..0000000
--- a/frontend/src/app/feature/game/blackjack/components/game-result/game-result.component.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { GameResultComponent } from './game-result.component';
-
-describe('GameResultComponent', () => {
-  let component: GameResultComponent;
-  let fixture: ComponentFixture<GameResultComponent>;
-
-  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
index e84a7ce..4b63e59 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
@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, Output, EventEmitter } from '@angular/core';
 import { CommonModule, CurrencyPipe } from '@angular/common';
 import { animate, style, transition, trigger } from '@angular/animations';
+import { GameState } from '../../../../../enum/gameState';
 
 @Component({
   selector: 'app-game-result',
@@ -55,7 +56,6 @@ import { animate, style, transition, trigger } from '@angular/animations';
       </div>
     </div>
   `,
-  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<string, number> = {
+      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