diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java index 9c1e9fb41..4b9ff95d9 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/database/LotteryTicketRepositoryMock.java @@ -25,9 +25,9 @@ package com.iluwatar.hexagonal.database; import java.util.HashMap; import java.util.Map; import java.util.Optional; -import java.util.UUID; import com.iluwatar.hexagonal.domain.LotteryTicket; +import com.iluwatar.hexagonal.domain.LotteryTicketId; import com.iluwatar.hexagonal.domain.LotteryTicketRepository; /** @@ -37,11 +37,11 @@ import com.iluwatar.hexagonal.domain.LotteryTicketRepository; */ public class LotteryTicketRepositoryMock implements LotteryTicketRepository { - private Map tickets = new HashMap<>(); + private Map tickets = new HashMap<>(); @Override - public Optional findByUuid(UUID uuid) { - LotteryTicket ticket = tickets.get(uuid); + public Optional findById(LotteryTicketId id) { + LotteryTicket ticket = tickets.get(id); if (ticket == null) { return Optional.empty(); } else { @@ -50,14 +50,14 @@ public class LotteryTicketRepositoryMock implements LotteryTicketRepository { } @Override - public Optional save(LotteryTicket ticket) { - UUID uuid = UUID.randomUUID(); - tickets.put(uuid, ticket); - return Optional.of(uuid); + public Optional save(LotteryTicket ticket) { + LotteryTicketId id = new LotteryTicketId(); + tickets.put(id, ticket); + return Optional.of(id); } @Override - public Map findAll() { + public Map findAll() { return tickets; } } diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java index 0f0336e53..a68ea73b0 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryAdministration.java @@ -32,6 +32,6 @@ import java.util.List; public interface LotteryAdministration { List getAllSubmittedTickets(); - List performLottery(); + LotteryNumbers performLottery(); } diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java index cf07d769e..324b965f4 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryService.java @@ -31,5 +31,5 @@ public interface LotteryService { LotteryTicketSubmitResult submitTicket(LotteryTicket ticket); - LotteryTicketCheckResult checkTicketForPrize(LotteryTicket ticket); + LotteryTicketCheckResult checkTicketForPrize(LotteryTicketId id, LotteryNumbers winningNumbers); } diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryServiceImpl.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryServiceImpl.java new file mode 100644 index 000000000..9ef6f8007 --- /dev/null +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryServiceImpl.java @@ -0,0 +1,62 @@ +/** + * The MIT License + * Copyright (c) 2014 Ilkka Seppälä + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.iluwatar.hexagonal.domain; + +import java.util.Optional; + +import com.iluwatar.hexagonal.database.LotteryTicketRepositoryMock; +import com.iluwatar.hexagonal.domain.LotteryTicketCheckResult.CheckResult; +import com.iluwatar.hexagonal.domain.LotteryTicketSubmitResult.Result; + +public class LotteryServiceImpl implements LotteryService { + + private final LotteryTicketRepository repository; + + public LotteryServiceImpl() { + repository = new LotteryTicketRepositoryMock(); + } + + @Override + public LotteryTicketSubmitResult submitTicket(LotteryTicket ticket) { + Optional optional = repository.save(ticket); + Result result = Result.OK; + if (!optional.isPresent()) { + result = Result.ERROR; + } + return new LotteryTicketSubmitResult(result); + } + + @Override + public LotteryTicketCheckResult checkTicketForPrize(LotteryTicketId id, LotteryNumbers winningNumbers) { + Optional optional = repository.findById(id); + if (optional.isPresent()) { + if (optional.get().getNumbers().equals(winningNumbers)) { + return new LotteryTicketCheckResult(CheckResult.WIN_PRIZE); + } else { + return new LotteryTicketCheckResult(CheckResult.NO_PRIZE); + } + } else { + return new LotteryTicketCheckResult(CheckResult.TICKET_NOT_SUBMITTED); + } + } +} diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java new file mode 100644 index 000000000..358bdd05a --- /dev/null +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketId.java @@ -0,0 +1,38 @@ +/** + * The MIT License + * Copyright (c) 2014 Ilkka Seppälä + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.iluwatar.hexagonal.domain; + +import java.util.UUID; + +public class LotteryTicketId { + + private final UUID id; + + public LotteryTicketId() { + id = UUID.randomUUID(); + } + + public UUID getId() { + return id; + } +} diff --git a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java index cbd5dcf93..45e4a6f61 100644 --- a/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java +++ b/hexagonal/src/main/java/com/iluwatar/hexagonal/domain/LotteryTicketRepository.java @@ -24,7 +24,6 @@ package com.iluwatar.hexagonal.domain; import java.util.Map; import java.util.Optional; -import java.util.UUID; /** * @@ -33,8 +32,8 @@ import java.util.UUID; */ public interface LotteryTicketRepository { - Optional findByUuid(UUID uuid); - Optional save(LotteryTicket ticket); - Map findAll(); + Optional findById(LotteryTicketId id); + Optional save(LotteryTicket ticket); + Map findAll(); } diff --git a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java index 10394f4ca..b4ac6691e 100644 --- a/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java +++ b/hexagonal/src/test/java/com/iluwatar/hexagonal/domain/LotteryTicketRepositoryTest.java @@ -46,10 +46,10 @@ public class LotteryTicketRepositoryTest { LotteryTicketRepository repository = new LotteryTicketRepositoryMock(); assertEquals(repository.findAll().size(), 0); LotteryTicket ticket = createLotteryTicket(); - Optional uuid = repository.save(ticket); - assertTrue(uuid.isPresent()); + Optional id = repository.save(ticket); + assertTrue(id.isPresent()); assertEquals(repository.findAll().size(), 1); - Optional optionalTicket = repository.findByUuid(uuid.get()); + Optional optionalTicket = repository.findById(id.get()); assertTrue(optionalTicket.isPresent()); }