refactoring: organization of module dependencies; moving request and …

…response models into packages

console/src/main/java/com/bueno/application/cli/GameCLI.java

@@ -22,7 +22,7 @@
 
 import com.bueno.application.cli.commands.*;
 import com.bueno.domain.usecases.bot.BotUseCase;
-import com.bueno.domain.usecases.game.CreateForUserAndBotRequestModel;
+import com.bueno.domain.usecases.game.model.CreateForUserAndBotRequestModel;
 import com.bueno.domain.usecases.game.CreateGameUseCase;
 import com.bueno.domain.usecases.game.GameRepository;
 import com.bueno.domain.usecases.hand.PlayCardRequestModel;
@@ -33,7 +33,7 @@
 import com.bueno.domain.usecases.utils.dtos.IntelDto;
 import com.bueno.domain.usecases.user.CreateUserUseCase;
 import com.bueno.domain.usecases.user.UserRepository;
-import com.bueno.domain.usecases.user.UserRequestModel;
+import com.bueno.domain.usecases.user.model.UserRequestModel;
 import com.bueno.persistence.inmemory.InMemoryGameRepository;
 import com.bueno.persistence.inmemory.InMemoryUserRepository;
 import com.google.common.primitives.Ints;

console/src/main/java/com/bueno/application/standalone/PlayWithBots.java

@@ -22,6 +22,8 @@
 
 import com.bueno.domain.usecases.bot.BotUseCase;
 import com.bueno.domain.usecases.game.*;
+import com.bueno.domain.usecases.game.model.CreateForBotsRequestModel;
+import com.bueno.domain.usecases.game.model.PlayWithBotsResponseModel;
 import com.bueno.persistence.inmemory.InMemoryGameRepository;
 import com.google.common.primitives.Ints;
 

desktop/src/main/java/com/bueno/application/controller/GameTableController.java

@@ -22,7 +22,7 @@
 
 import com.bueno.application.model.CardImage;
 import com.bueno.application.utils.TimelineBuilder;
-import com.bueno.domain.usecases.game.CreateForUserAndBotRequestModel;
+import com.bueno.domain.usecases.game.model.CreateForUserAndBotRequestModel;
 import com.bueno.domain.usecases.game.CreateGameUseCase;
 import com.bueno.domain.usecases.hand.PlayCardRequestModel;
 import com.bueno.domain.usecases.hand.PlayCardUseCase;
@@ -32,7 +32,7 @@
 import com.bueno.domain.usecases.utils.dtos.IntelDto;
 import com.bueno.domain.usecases.utils.dtos.IntelDto.PlayerInfo;
 import com.bueno.domain.usecases.user.CreateUserUseCase;
-import com.bueno.domain.usecases.user.UserRequestModel;
+import com.bueno.domain.usecases.user.model.UserRequestModel;
 import com.bueno.persistence.inmemory.InMemoryGameRepository;
 import com.bueno.persistence.inmemory.InMemoryUserRepository;
 import javafx.animation.Timeline;

domain/src/main/java/com/bueno/domain/usecases/game/CreateGameUseCase.java

@@ -23,6 +23,8 @@
 import com.bueno.domain.entities.game.Game;
 import com.bueno.domain.entities.player.Player;
 import com.bueno.domain.entities.player.User;
+import com.bueno.domain.usecases.game.model.CreateForBotsRequestModel;
+import com.bueno.domain.usecases.game.model.CreateForUserAndBotRequestModel;
 import com.bueno.domain.usecases.utils.dtos.IntelDto;
 import com.bueno.domain.usecases.user.UserRepository;
 import com.bueno.domain.usecases.utils.exceptions.EntityNotFoundException;

domain/src/main/java/com/bueno/domain/usecases/game/PlayWithBotsUseCase.java

@@ -21,6 +21,8 @@
 package com.bueno.domain.usecases.game;
 
 import com.bueno.domain.usecases.bot.BotUseCase;
+import com.bueno.domain.usecases.game.model.CreateForBotsRequestModel;
+import com.bueno.domain.usecases.game.model.PlayWithBotsResponseModel;
 
 import java.util.Objects;
 

domain/src/main/java/com/bueno/domain/usecases/game/CreateForBotsRequestModel.java → domain/src/main/java/com/bueno/domain/usecases/game/model/CreateForBotsRequestModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.game;
+package com.bueno.domain.usecases.game.model;
 
 import lombok.Getter;
 import lombok.ToString;

domain/src/main/java/com/bueno/domain/usecases/game/CreateForUserAndBotRequestModel.java → domain/src/main/java/com/bueno/domain/usecases/game/model/CreateForUserAndBotRequestModel.java

@@ -18,9 +18,8 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.game;
+package com.bueno.domain.usecases.game.model;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 

domain/src/main/java/com/bueno/domain/usecases/game/PlayWithBotsResponseModel.java → domain/src/main/java/com/bueno/domain/usecases/game/model/PlayWithBotsResponseModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.game;
+package com.bueno.domain.usecases.game.model;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;

domain/src/main/java/com/bueno/domain/usecases/hand/PlayCardUseCase.java

@@ -27,6 +27,7 @@
 import com.bueno.domain.entities.player.Player;
 import com.bueno.domain.usecases.bot.BotUseCase;
 import com.bueno.domain.usecases.game.GameRepository;
+import com.bueno.domain.usecases.hand.validator.ActionValidator;
 import com.bueno.domain.usecases.utils.dtos.IntelDto;
 import com.bueno.domain.usecases.utils.exceptions.UnsupportedGameRequestException;
 import com.bueno.domain.usecases.utils.converters.CardConverter;

domain/src/main/java/com/bueno/domain/usecases/hand/PointsProposalUseCase.java

@@ -26,6 +26,7 @@
 import com.bueno.domain.entities.player.Player;
 import com.bueno.domain.usecases.bot.BotUseCase;
 import com.bueno.domain.usecases.game.GameRepository;
+import com.bueno.domain.usecases.hand.validator.ActionValidator;
 import com.bueno.domain.usecases.utils.dtos.IntelDto;
 import com.bueno.domain.usecases.utils.converters.IntelConverter;
 import com.bueno.domain.usecases.utils.validation.Notification;

domain/src/main/java/com/bueno/domain/usecases/hand/ActionValidator.java → domain/src/main/java/com/bueno/domain/usecases/hand/validator/ActionValidator.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.hand;
+package com.bueno.domain.usecases.hand.validator;
 
 import com.bueno.domain.entities.game.Game;
 import com.bueno.domain.entities.intel.PossibleAction;

domain/src/main/java/com/bueno/domain/usecases/intel/HandleIntelUseCase.java

@@ -22,6 +22,9 @@
 
 import com.bueno.domain.entities.game.Game;
 import com.bueno.domain.usecases.game.GameRepository;
+import com.bueno.domain.usecases.intel.model.IntelSinceResponseModel;
+import com.bueno.domain.usecases.intel.model.OwnedCardsResponseModel;
+import com.bueno.domain.usecases.intel.model.PlayerTurnResponseModel;
 import com.bueno.domain.usecases.utils.exceptions.UnsupportedGameRequestException;
 import com.bueno.domain.usecases.utils.converters.CardConverter;
 import com.bueno.domain.usecases.utils.converters.IntelConverter;

domain/src/main/java/com/bueno/domain/usecases/intel/IntelSinceResponseModel.java → domain/src/main/java/com/bueno/domain/usecases/intel/model/IntelSinceResponseModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.intel;
+package com.bueno.domain.usecases.intel.model;
 
 import com.bueno.domain.usecases.utils.dtos.IntelDto;
 import lombok.AllArgsConstructor;

domain/src/main/java/com/bueno/domain/usecases/intel/OwnedCardsResponseModel.java → domain/src/main/java/com/bueno/domain/usecases/intel/model/OwnedCardsResponseModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.intel;
+package com.bueno.domain.usecases.intel.model;
 
 import com.bueno.domain.usecases.utils.dtos.CardDto;
 import lombok.AllArgsConstructor;

domain/src/main/java/com/bueno/domain/usecases/intel/PlayerTurnResponseModel.java → domain/src/main/java/com/bueno/domain/usecases/intel/model/PlayerTurnResponseModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.intel;
+package com.bueno.domain.usecases.intel.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

domain/src/main/java/com/bueno/domain/usecases/user/CreateUserUseCase.java

@@ -21,6 +21,8 @@
 package com.bueno.domain.usecases.user;
 
 import com.bueno.domain.entities.player.User;
+import com.bueno.domain.usecases.user.model.UserRequestModel;
+import com.bueno.domain.usecases.user.model.UserResponseModel;
 import com.bueno.domain.usecases.utils.exceptions.EntityAlreadyExistsException;
 import org.springframework.stereotype.Service;
 

domain/src/main/java/com/bueno/domain/usecases/user/FindUserUseCase.java

@@ -20,6 +20,7 @@
 
 package com.bueno.domain.usecases.user;
 
+import com.bueno.domain.usecases.user.model.UserResponseModel;
 import com.bueno.domain.usecases.utils.exceptions.EntityNotFoundException;
 import org.springframework.stereotype.Service;
 

domain/src/main/java/com/bueno/domain/usecases/user/UserRequestModel.java → domain/src/main/java/com/bueno/domain/usecases/user/model/UserRequestModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.user;
+package com.bueno.domain.usecases.user.model;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

domain/src/main/java/com/bueno/domain/usecases/user/UserResponseModel.java → domain/src/main/java/com/bueno/domain/usecases/user/model/UserResponseModel.java

@@ -18,7 +18,7 @@
  *  along with CTruco.  If not, see <https://www.gnu.org/licenses/>
  */
 
-package com.bueno.domain.usecases.user;
+package com.bueno.domain.usecases.user.model;
 
 import com.bueno.domain.entities.player.User;
 import lombok.AllArgsConstructor;

domain/src/main/java/com/bueno/domain/usecases/utils/dtos/IntelDto.java

@@ -94,6 +94,4 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(timestamp);
     }
-
-
 }

domain/src/main/java/com/bueno/domain/usecases/utils/validation/Notification.java

@@ -38,10 +38,6 @@ public void addError(String message){
         addError(message, null);
     }
 
-    public void addError(Exception e){
-        addError(e.getMessage(), e);
-    }
-
     private void addError(String message, Exception e){
         errors.add(new Error(message, e));
     }

domain/src/main/java/module-info.java

@@ -7,13 +7,16 @@
 
     exports com.bueno.domain.entities.game to application.persistence;
     exports com.bueno.domain.entities.player to application.persistence;
+    exports com.bueno.domain.entities.deck to application.persistence;
 
     exports com.bueno.domain.usecases.game;
     exports com.bueno.domain.usecases.user;
     exports com.bueno.domain.usecases.hand;
     exports com.bueno.domain.usecases.bot;
     exports com.bueno.domain.usecases.intel;
     exports com.bueno.domain.usecases.utils.exceptions;
-    exports com.bueno.domain.usecases.utils.validation;
     exports com.bueno.domain.usecases.utils.dtos;
+    exports com.bueno.domain.usecases.game.model;
+    exports com.bueno.domain.usecases.intel.model;
+    exports com.bueno.domain.usecases.user.model;
 }

domain/src/test/java/com/bueno/domain/usecases/game/CreateGameUseCaseTest.java

@@ -23,6 +23,8 @@
 import com.bueno.domain.entities.game.Game;
 import com.bueno.domain.entities.player.Player;
 import com.bueno.domain.entities.player.User;
+import com.bueno.domain.usecases.game.model.CreateForBotsRequestModel;
+import com.bueno.domain.usecases.game.model.CreateForUserAndBotRequestModel;
 import com.bueno.domain.usecases.user.UserRepository;
 import com.bueno.domain.usecases.utils.exceptions.EntityNotFoundException;
 import com.bueno.domain.usecases.utils.exceptions.UnsupportedGameRequestException;

domain/src/test/java/com/bueno/domain/usecases/game/PlayWithBotsUseCaseTest.java

@@ -23,6 +23,7 @@
 import com.bueno.domain.entities.game.Game;
 import com.bueno.domain.entities.intel.Intel;
 import com.bueno.domain.usecases.bot.BotUseCase;
+import com.bueno.domain.usecases.game.model.CreateForBotsRequestModel;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

domain/src/test/java/com/bueno/domain/usecases/user/CreateUserUseCaseTest.java

@@ -21,6 +21,7 @@
 package com.bueno.domain.usecases.user;
 
 import com.bueno.domain.entities.player.User;
+import com.bueno.domain.usecases.user.model.UserRequestModel;
 import com.bueno.domain.usecases.utils.exceptions.EntityAlreadyExistsException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

domain/src/test/java/com/bueno/domain/usecases/user/FindUserUseCaseTest.java

@@ -21,6 +21,7 @@
 package com.bueno.domain.usecases.user;
 
 import com.bueno.domain.entities.player.User;
+import com.bueno.domain.usecases.user.model.UserResponseModel;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

domain/src/test/java/com/bueno/domain/usecases/user/UserRequestModelTest.java

@@ -20,6 +20,7 @@
 
 package com.bueno.domain.usecases.user;
 
+import com.bueno.domain.usecases.user.model.UserRequestModel;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 

domain/src/test/java/com/bueno/domain/usecases/utils/dtos/CardDtoTest.java

@@ -25,8 +25,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 
 class CardDtoTest {
 
@@ -63,4 +62,13 @@ void shouldThrowIfSuitIsNull() {
     void shouldThrowIfSuitIsInvalid(String suit) {
         assertThrows(IllegalArgumentException.class, () -> new CardDto("A", suit));
     }
+
+    @Test
+    @DisplayName("Should correctly create closed card")
+    void shouldCorrectlyCreateClosedCard() {
+        assertAll(
+                () -> assertEquals("X", CardDto.closed().getRank()),
+                () -> assertEquals("X", CardDto.closed().getSuit())
+        );
+    }
 }

web/src/main/java/com/bueno/web/GameController.java

@@ -21,7 +21,7 @@
 package com.bueno.web;
 
 import com.bueno.domain.usecases.game.CreateGameUseCase;
-import com.bueno.domain.usecases.game.CreateForUserAndBotRequestModel;
+import com.bueno.domain.usecases.game.model.CreateForUserAndBotRequestModel;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

web/src/main/java/com/bueno/web/UserController.java

@@ -22,7 +22,7 @@
 
 import com.bueno.domain.usecases.user.CreateUserUseCase;
 import com.bueno.domain.usecases.user.FindUserUseCase;
-import com.bueno.domain.usecases.user.UserRequestModel;
+import com.bueno.domain.usecases.user.model.UserRequestModel;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;