refactor(lottery): improve code structure and readability
Some checks failed
CI / Get Changed Files (pull_request) Successful in 7s
CI / eslint (pull_request) Successful in 38s
CI / Docker frontend validation (pull_request) Successful in 50s
CI / oxlint (pull_request) Successful in 27s
CI / prettier (pull_request) Failing after 28s
CI / Docker backend validation (pull_request) Successful in 1m23s
CI / Checkstyle Main (pull_request) Successful in 1m20s
CI / test-build (pull_request) Successful in 40s

This commit is contained in:
Jan-Marlon Leibl 2025-05-07 17:55:31 +02:00
commit 7aefe67aa0
Signed by: jleibl
GPG key ID: 300B2F906DC6F1D5
5 changed files with 200 additions and 140 deletions

View file

@ -51,11 +51,19 @@ export default class BlackjackComponent implements OnInit {
debtAmount = signal(0); debtAmount = signal(0);
ngOnInit(): void { ngOnInit(): void {
// Initial user load from server
this.userService.getCurrentUser().subscribe((user) => { this.userService.getCurrentUser().subscribe((user) => {
if (user) { if (user) {
this.balance.set(user.balance); this.balance.set(user.balance);
} }
}); });
// Subscribe to user updates for real-time balance changes
this.userService.currentUser$.subscribe((user) => {
if (user) {
this.balance.set(user.balance);
}
});
} }
private updateGameState(game: BlackjackGame) { private updateGameState(game: BlackjackGame) {
@ -84,9 +92,19 @@ export default class BlackjackComponent implements OnInit {
if (isGameOver) { if (isGameOver) {
console.log('Game is over, state:', game.state); console.log('Game is over, state:', game.state);
this.userService.refreshCurrentUser(); this.userService.refreshCurrentUser();
timer(1500).subscribe(() => {
this.showGameResult.set(true); // Get the latest balance before showing the result dialog
console.log('Game result dialog shown after delay'); timer(1000).subscribe(() => {
this.userService.getCurrentUser().subscribe((user) => {
if (user) {
this.balance.set(user.balance);
// Show the result dialog after updating the balance
timer(500).subscribe(() => {
this.showGameResult.set(true);
console.log('Game result dialog shown after delay');
});
}
});
}); });
} }
} }
@ -165,12 +183,20 @@ export default class BlackjackComponent implements OnInit {
this.blackjackService.doubleDown(this.currentGameId()!).subscribe({ this.blackjackService.doubleDown(this.currentGameId()!).subscribe({
next: (game) => { next: (game) => {
this.updateGameState(game); this.updateGameState(game);
this.userService.getCurrentUser().subscribe((user) => {
if (user && user.balance < 0) { // Wait a bit to ensure the backend has finished processing
this.debtAmount.set(Math.abs(user.balance)); timer(1000).subscribe(() => {
this.showDebtDialog.set(true); this.userService.getCurrentUser().subscribe((user) => {
} if (user) {
this.balance.set(user.balance);
if (user.balance < 0) {
this.debtAmount.set(Math.abs(user.balance));
this.showDebtDialog.set(true);
}
}
});
}); });
this.isActionInProgress.set(false); this.isActionInProgress.set(false);
}, },
error: (error) => { error: (error) => {
@ -184,7 +210,13 @@ export default class BlackjackComponent implements OnInit {
onCloseGameResult(): void { onCloseGameResult(): void {
console.log('Closing game result dialog'); console.log('Closing game result dialog');
this.showGameResult.set(false); this.showGameResult.set(false);
this.userService.refreshCurrentUser();
// Refresh the balance when dialog is closed and update local state
this.userService.getCurrentUser().subscribe((user) => {
if (user) {
this.balance.set(user.balance);
}
});
} }
onCloseDebtDialog(): void { onCloseDebtDialog(): void {

View file

@ -13,6 +13,19 @@ export class UserService {
private http: HttpClient = inject(HttpClient); private http: HttpClient = inject(HttpClient);
private authService = inject(AuthService); private authService = inject(AuthService);
constructor() {
// Initialize with the current user from AuthService if available
const currentUser = this.authService.getUser();
if (currentUser) {
this.currentUserSubject.next(currentUser);
}
// Subscribe to auth service user updates
this.authService.userSubject.subscribe(user => {
this.currentUserSubject.next(user);
});
}
public getCurrentUser(): Observable<User | null> { public getCurrentUser(): Observable<User | null> {
return this.http.get<User | null>('/backend/users/me').pipe( return this.http.get<User | null>('/backend/users/me').pipe(
catchError(() => EMPTY), catchError(() => EMPTY),

View file

@ -10,6 +10,7 @@ import { RouterModule } from '@angular/router';
import { AuthService } from '@service/auth.service'; import { AuthService } from '@service/auth.service';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { AnimatedNumberComponent } from '@blackjack/components/animated-number/animated-number.component'; import { AnimatedNumberComponent } from '@blackjack/components/animated-number/animated-number.component';
import { UserService } from '@service/user.service';
@Component({ @Component({
selector: 'app-navbar', selector: 'app-navbar',
@ -21,9 +22,11 @@ import { AnimatedNumberComponent } from '@blackjack/components/animated-number/a
export class NavbarComponent implements OnInit, OnDestroy { export class NavbarComponent implements OnInit, OnDestroy {
isMenuOpen = false; isMenuOpen = false;
private authService: AuthService = inject(AuthService); private authService: AuthService = inject(AuthService);
private userService: UserService = inject(UserService);
isLoggedIn = this.authService.isLoggedIn(); isLoggedIn = this.authService.isLoggedIn();
private authSubscription!: Subscription; private authSubscription!: Subscription;
private userSubscription!: Subscription;
public balance = signal(0); public balance = signal(0);
ngOnInit() { ngOnInit() {
@ -32,10 +35,22 @@ export class NavbarComponent implements OnInit, OnDestroy {
this.balance.set(user?.balance ?? 0); this.balance.set(user?.balance ?? 0);
}, },
}); });
// Also subscribe to UserService for real-time balance updates
this.userSubscription = this.userService.currentUser$.subscribe({
next: (user) => {
if (user) {
this.balance.set(user.balance);
}
},
});
} }
ngOnDestroy() { ngOnDestroy() {
this.authSubscription.unsubscribe(); this.authSubscription.unsubscribe();
if (this.userSubscription) {
this.userSubscription.unsubscribe();
}
} }
logout() { logout() {