diff --git a/backend/src/main/java/de/szut/casino/coinflip/CoinflipDto.java b/backend/src/main/java/de/szut/casino/coinflip/CoinflipDto.java index a7f9adb..8d5a47b 100644 --- a/backend/src/main/java/de/szut/casino/coinflip/CoinflipDto.java +++ b/backend/src/main/java/de/szut/casino/coinflip/CoinflipDto.java @@ -2,16 +2,13 @@ package de.szut.casino.coinflip; import de.szut.casino.shared.dto.BetDto; import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; import lombok.Getter; -import lombok.NoArgsConstructor; import lombok.Setter; import java.math.BigDecimal; @Getter @Setter -@NoArgsConstructor public class CoinflipDto extends BetDto { @NotNull(message = "chosen side cannot be null") private CoinSide coinSide; diff --git a/backend/src/main/java/de/szut/casino/coinflip/CoinflipService.java b/backend/src/main/java/de/szut/casino/coinflip/CoinflipService.java index c6c39d7..c706ffa 100644 --- a/backend/src/main/java/de/szut/casino/coinflip/CoinflipService.java +++ b/backend/src/main/java/de/szut/casino/coinflip/CoinflipService.java @@ -9,12 +9,11 @@ import java.util.Random; @Service public class CoinflipService { - private final Random random; + private final Random random = new Random(); private final BalanceService balanceService; - public CoinflipService(BalanceService balanceService, Random random) { + public CoinflipService(BalanceService balanceService) { this.balanceService = balanceService; - this.random = random; } public CoinflipResult play(UserEntity user, CoinflipDto coinflipDto) { diff --git a/backend/src/main/java/de/szut/casino/config/AppConfig.java b/backend/src/main/java/de/szut/casino/config/AppConfig.java deleted file mode 100644 index 9d9c869..0000000 --- a/backend/src/main/java/de/szut/casino/config/AppConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.szut.casino.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.util.Random; - -@Configuration -public class AppConfig { - - @Bean - public Random random() { - return new Random(); - } -} diff --git a/backend/src/test/java/de/szut/casino/coinflip/CoinflipServiceTest.java b/backend/src/test/java/de/szut/casino/coinflip/CoinflipServiceTest.java deleted file mode 100644 index 2b15ba0..0000000 --- a/backend/src/test/java/de/szut/casino/coinflip/CoinflipServiceTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.szut.casino.coinflip; - -import de.szut.casino.shared.service.BalanceService; -import de.szut.casino.user.UserEntity; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.math.BigDecimal; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.Mockito.*; - -class CoinflipServiceTest { - - @Mock - private BalanceService balanceService; - - @Mock - private Random random; - - @InjectMocks - private CoinflipService coinflipService; - - private UserEntity user; - private CoinflipDto coinflipDto; - - @BeforeEach - void setUp() { - MockitoAnnotations.openMocks(this); - user = new UserEntity(); - user.setBalance(BigDecimal.valueOf(100)); - coinflipDto = new CoinflipDto(BigDecimal.valueOf(10), CoinSide.HEAD); - } - - @Test - void testPlay_userWins() { - when(random.nextBoolean()).thenReturn(true); - - CoinflipResult result = coinflipService.play(user, coinflipDto); - - assertTrue(result.isWin()); - assertEquals(BigDecimal.valueOf(20), result.getPayout()); - assertEquals(CoinSide.HEAD, result.getCoinSide()); - verify(balanceService, times(1)).subtractFunds(user, BigDecimal.valueOf(10)); - verify(balanceService, times(1)).addFunds(user, BigDecimal.valueOf(20)); - } - - @Test - void testPlay_userLoses() { - when(random.nextBoolean()).thenReturn(false); - - CoinflipResult result = coinflipService.play(user, coinflipDto); - - assertFalse(result.isWin()); - assertEquals(BigDecimal.ZERO, result.getPayout()); - assertEquals(CoinSide.TAILS, result.getCoinSide()); - verify(balanceService, times(1)).subtractFunds(user, BigDecimal.valueOf(10)); - verify(balanceService, never()).addFunds(any(), any()); - } -}