[4단계 - DB 적용] 이준섭 미션 제출합니다.

src/main/java/chess/model/board/Board.java

@@ -47,7 +47,7 @@ private void validatePath(Position from, Position to) {
     Set<Position> positionsWithOutTarget = new HashSet<>(board.keySet());
     positionsWithOutTarget.remove(to);
 
-    Path path = source.findPath(from, to);
+    Path path = source.findPath(from, to, board);
     path.validateObstacle(positionsWithOutTarget);
   }
 

src/main/java/chess/model/piece/Piece.java

@@ -6,6 +6,7 @@
 import chess.model.position.Position;
 import chess.model.ErrorMessage;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 public abstract class Piece {
@@ -16,7 +17,7 @@ public Piece(final Color color) {
     this.color = color;
   }
 
-  public abstract Path findPath(Position from, Position to);
+  public abstract Path findPath(Position from, Position to, Map<Position, Piece> board);
 
   public abstract PieceInfo pieceType();
 

src/main/java/chess/model/piece/pieces/Bishop.java

@@ -10,6 +10,7 @@
 import chess.model.position.Position;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class Bishop extends Piece {
 
@@ -21,7 +22,7 @@ public Bishop(final Color color) {
   }
 
   @Override
-  public Path findPath(Position from, Position to) {
+  public Path findPath(Position from, Position to, final Map<Position, Piece> board) {
     Movement movement = convertMovement(from, to);
     validateMovement(movement, availableMovements);
 

src/main/java/chess/model/piece/pieces/King.java

@@ -10,6 +10,7 @@
 import chess.model.position.Position;
 import chess.model.ErrorMessage;
 import java.util.List;
+import java.util.Map;
 
 public class King extends Piece {
 
@@ -22,7 +23,7 @@ public King(final Color color) {
   }
 
   @Override
-  public Path findPath(Position from, Position to) {
+  public Path findPath(Position from, Position to, final Map<Position, Piece> board) {
     Movement movement = convertMovement(from, to);
     validateMovement(movement, availableMovements);
 

src/main/java/chess/model/piece/pieces/Knight.java

@@ -11,6 +11,7 @@
 import chess.model.ErrorMessage;
 
 import java.util.List;
+import java.util.Map;
 
 public class Knight extends Piece {
 
@@ -25,7 +26,7 @@ public Knight(final Color color) {
   }
 
   @Override
-  public Path findPath(Position from, Position to) {
+  public Path findPath(Position from, Position to, final Map<Position, Piece> board) {
     Movement movement = convertMovement(from, to);
     validateMovement(movement, availableMovements);
 

src/main/java/chess/model/piece/pieces/Pawn.java

@@ -41,25 +41,29 @@ public Pawn(final Color color) {
   }
 
   @Override
-  public Path findPath(final Position from, final Position to) {
+  public Path findPath(final Position from, final Position to, final Map<Position, Piece> board) {
     Movement movement = convertMovement(from, to);
-
-    if (isAttackMovement(movement)) { // 공격 움직임인 경우
-      return findPathForAttackMovement(to, movement);
+    if (isAttackMovement(movement)) {
+      return findPathForAttackMovement(to, movement, board);
     }
-
-    return findPathForEmptyPosition(from, to, movement); // 빈 칸으로 이동하는 경우
+    return findPathForEmptyPosition(from, to, movement);
   }
 
   private boolean isAttackMovement(final Movement movement) {
     return AVAILABLE_ATTACK_MOVEMENTS.get(getColor()).contains(movement);
   }
 
-  private Path findPathForAttackMovement(final Position to, final Movement movement) {
+  private Path findPathForAttackMovement(final Position to, final Movement movement, final Map<Position, Piece> board) {
     validateMovement(movement, AVAILABLE_ATTACK_MOVEMENTS.get(getColor()));
-
+    validateAttackMovement(to, board);
     return new Path(List.of(to));
   }
+  private void validateAttackMovement(final Position to, final Map<Position, Piece> board) {
+    Piece targetPiece = board.get(to);
+    if (targetPiece == null || targetPiece.getColor() == this.getColor()) {
+      throw new IllegalArgumentException(ErrorMessage.INVALID_DIRECTION.getMessage());
+    }
+  }
 
   private Path findPathForEmptyPosition(final Position from, final Position to, final Movement movement) {
     validateMovement(movement, List.of(AVAILABLE_MOVEMENTS.get(getColor())));

src/main/java/chess/model/piece/pieces/Queen.java

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class Queen extends Piece {
 
@@ -25,7 +26,7 @@ public Queen(final Color color) {
   }
 
   @Override
-  public Path findPath(final Position from, final Position to) {
+  public Path findPath(final Position from, final Position to, final Map<Position, Piece> board) {
     Movement movement = convertMovement(from, to);
     validateMovement(movement, availableMovements);
 

src/main/java/chess/model/piece/pieces/Rook.java

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 public class Rook extends Piece {
 
@@ -24,7 +25,7 @@ public Rook(final Color color) {
   }
 
   @Override
-  public Path findPath(final Position from, final Position to) {
+  public Path findPath(final Position from, final Position to, final Map<Position, Piece> board) {
     Movement movement = convertMovement(from, to);
     validateMovement(movement, availableMovements);