ドメイン層のディレクトリ構成変更&Skip削除 #55

ebinase · May 7, 2022 · bb592be · bb592be
1 parent b8b1087
commit bb592be
Show file tree

Hide file tree

Showing 41 changed files with 111 additions and 157 deletions.
diff --git a/app/Console/Commands/OthelloCommand.php b/app/Console/Commands/OthelloCommand.php
@@ -3,16 +3,16 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Packages\Models\Board\Board;
-use Packages\Models\Board\Position\Position;
-use Packages\Models\Board\Position\PositionConverterTrait;
 use Packages\Models\Bot\BotFactory;
 use Packages\Models\Bot\Levels\LevelFactory;
-use Packages\Models\Board\Color\Color;
-use Packages\Models\Participant\BotParticipant;
-use Packages\Models\Participant\Player;
-use Packages\Models\Participant\ParticipantInterface;
-use Packages\Models\Turn\Turn;
+use Packages\Models\GameOrganizer\Participant\BotParticipant;
+use Packages\Models\GameOrganizer\Participant\ParticipantInterface;
+use Packages\Models\GameOrganizer\Participant\Player;
+use Packages\Models\Othello\Board\Board;
+use Packages\Models\Othello\Board\Color\Color;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Board\Position\PositionConverterTrait;
+use Packages\Models\Othello\Turn\Turn;
 
 class OthelloCommand extends Command
 {

diff --git a/app/Http/Controllers/Api/Test/BoardController.php b/app/Http/Controllers/Api/Test/BoardController.php
@@ -5,8 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Packages\Models\Board\Board;
-use Packages\Models\Board\Color\Color;
+use Packages\Models\Othello\Board\Board;
 use function collect;
 use function response;
 

diff --git a/app/Http/Controllers/GameController.php b/app/Http/Controllers/GameController.php
@@ -3,11 +3,11 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\GameRequest;
-use Packages\Models\Board\Color\Color;
-use Packages\UseCases\Game\GameInitializeUsecase;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller as BaseController;
+use Packages\Models\Othello\Board\Color\Color;
+use Packages\UseCases\Game\GameInitializeUsecase;
 use Packages\UseCases\Game\GameProcessUsecase;
-use Illuminate\Http\Request;
 use Packages\UseCases\Game\GameShowBoardUsecase;
 
 class GameController extends BaseController

diff --git a/app/Repositories/Game/SessionGameRepository.php b/app/Repositories/Game/SessionGameRepository.php
@@ -1,7 +1,7 @@
 <?php
 namespace App\Repositories\Game;
 
-use Packages\Models\Game\Game;
+use Packages\Models\GameOrganizer\Game;
 use Packages\Repositories\Game\GameRepositoryInterface;
 
 class SessionGameRepository implements GameRepositoryInterface

diff --git a/packages/Factories/Game/GameFactory.php b/packages/Factories/Game/GameFactory.php
@@ -3,10 +3,10 @@
 namespace Packages\Factories\Game;
 
 use Illuminate\Support\Str;
-use Packages\Models\Game\Game;
-use Packages\Models\Game\GameMode;
-use Packages\Models\Game\Participants;
-use Packages\Models\Participant\ParticipantInterface;
+use Packages\Models\GameOrganizer\Game;
+use Packages\Models\GameOrganizer\GameMode;
+use Packages\Models\GameOrganizer\Participant\ParticipantInterface;
+use Packages\Models\GameOrganizer\Participants;
 
 class GameFactory
 {

diff --git a/packages/Models/Bot/BotInterface.php b/packages/Models/Bot/BotInterface.php
@@ -2,10 +2,10 @@
 
 namespace Packages\Models\Bot;
 
-use Packages\Models\Board\Position\Position;
 use Packages\Models\Bot\Calculators\CalculatorInterface;
 use Packages\Models\Bot\Levels\BotLevel;
-use Packages\Models\Turn\Turn;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Turn\Turn;
 
 interface BotInterface
 {

diff --git a/packages/Models/Bot/Bots/RandomBot.php b/packages/Models/Bot/Bots/RandomBot.php
@@ -2,10 +2,10 @@
 
 namespace Packages\Models\Bot\Bots;
 
-use Packages\Models\Board\Position\Position;
 use Packages\Models\Bot\BotInterface;
 use Packages\Models\Bot\Calculators\Random\RandomCalculator;
-use Packages\Models\Turn\Turn;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Turn\Turn;
 
 class RandomBot implements BotInterface
 {

diff --git a/packages/Models/Bot/Bots/SelfOpennessBot.php b/packages/Models/Bot/Bots/SelfOpennessBot.php
@@ -2,11 +2,11 @@
 
 namespace Packages\Models\Bot\Bots;
 
-use Packages\Models\Board\Position\Position;
 use Packages\Models\Bot\BotInterface;
 use Packages\Models\Bot\Calculators\Openness\SelfOpennessCalculator;
 use Packages\Models\Bot\Calculators\Random\RandomCalculator;
-use Packages\Models\Turn\Turn;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Turn\Turn;
 
 class SelfOpennessBot implements BotInterface
 {

diff --git a/packages/Models/Bot/Calculators/Openness/SelfOpennessCalculator.php b/packages/Models/Bot/Calculators/Openness/SelfOpennessCalculator.php
@@ -2,12 +2,12 @@
 
 namespace Packages\Models\Bot\Calculators\Openness;
 
-use Packages\Models\Board\Board;
-use Packages\Models\Board\Color\Color;
-use Packages\Models\Board\Position\Position;
 use Packages\Models\Bot\Calculators\CalculatorInterface;
 use Packages\Models\Common\Matrix\Matrix;
-use Packages\Models\Turn\Turn;
+use Packages\Models\Othello\Board\Board;
+use Packages\Models\Othello\Board\Color\Color;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Turn\Turn;
 
 class SelfOpennessCalculator
 {

diff --git a/packages/Models/Bot/Calculators/Random/RandomCalculator.php b/packages/Models/Bot/Calculators/Random/RandomCalculator.php
@@ -2,7 +2,7 @@
 
 namespace Packages\Models\Bot\Calculators\Random;
 
-use Packages\Models\Board\Position\Position;
+use Packages\Models\Othello\Board\Position\Position;
 
 class RandomCalculator
 {

diff --git a/packages/Models/Game/Game.php → packages/Models/GameOrganizer/Game.php b/packages/Models/Game/Game.php → packages/Models/GameOrganizer/Game.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Packages\Models\Game;
+namespace Packages\Models\GameOrganizer;
 
-use Packages\Models\Board\Color\Color;
-use Packages\Models\Board\Position\Position;
 use Packages\Models\Bot\BotFactory;
 use Packages\Models\Bot\BotType;
-use Packages\Models\Participant\ParticipantInterface;
-use Packages\Models\Turn\Turn;
+use Packages\Models\GameOrganizer\Participant\ParticipantInterface;
+use Packages\Models\Othello\Board\Color\Color;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Turn\Turn;
 
 class Game
 {

diff --git a/packages/Models/Game/GameMode.php → packages/Models/GameOrganizer/GameMode.php b/packages/Models/Game/GameMode.php → packages/Models/GameOrganizer/GameMode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Game;
+namespace Packages\Models\GameOrganizer;
 
 /**
  * ゲームモードを表す区分オブジェクト

diff --git a/packages/Models/Game/GameStatus.php → packages/Models/GameOrganizer/GameStatus.php b/packages/Models/Game/GameStatus.php → packages/Models/GameOrganizer/GameStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Game;
+namespace Packages\Models\GameOrganizer;
 
 /**
  * ゲームの状態を表す区分オブジェクト

diff --git a/...es/Models/Participant/BaseParticipant.php → ...Organizer/Participant/BaseParticipant.php b/...es/Models/Participant/BaseParticipant.php → ...Organizer/Participant/BaseParticipant.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Participant;
+namespace Packages\Models\GameOrganizer\Participant;
 
 class BaseParticipant implements ParticipantInterface
 {

diff --git a/...ges/Models/Participant/BotParticipant.php → ...eOrganizer/Participant/BotParticipant.php b/...ges/Models/Participant/BotParticipant.php → ...eOrganizer/Participant/BotParticipant.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Participant;
+namespace Packages\Models\GameOrganizer\Participant;
 
 use http\Exception\InvalidArgumentException;
 

diff --git a/...dels/Participant/ParticipantInterface.php → ...izer/Participant/ParticipantInterface.php b/...dels/Participant/ParticipantInterface.php → ...izer/Participant/ParticipantInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Participant;
+namespace Packages\Models\GameOrganizer\Participant;
 
 interface ParticipantInterface
 {

diff --git a/packages/Models/Participant/Player.php → ...dels/GameOrganizer/Participant/Player.php b/packages/Models/Participant/Player.php → ...dels/GameOrganizer/Participant/Player.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Participant;
+namespace Packages\Models\GameOrganizer\Participant;
 
 use http\Exception\InvalidArgumentException;
 

diff --git a/packages/Models/Game/Participants.php → ...ges/Models/GameOrganizer/Participants.php b/packages/Models/Game/Participants.php → ...ges/Models/GameOrganizer/Participants.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Packages\Models\Game;
+namespace Packages\Models\GameOrganizer;
 
-use Packages\Models\Board\Color\Color;
-use Packages\Models\Participant\ParticipantInterface;
+use Packages\Models\GameOrganizer\Participant\ParticipantInterface;
+use Packages\Models\Othello\Board\Color\Color;
 
 class Participants
 {

diff --git a/packages/Models/Game/Result.php → packages/Models/GameOrganizer/Result.php b/packages/Models/Game/Result.php → packages/Models/GameOrganizer/Result.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Packages\Models\Game;
+namespace Packages\Models\GameOrganizer;
 
-use Packages\Models\Board\Color\Color;
+use Packages\Models\Othello\Board\Color\Color;
 
 /**
  * ゲームの結果を表す区分オブジェクト

diff --git a/packages/Models/Board/Board.php → packages/Models/Othello/Board/Board.php b/packages/Models/Board/Board.php → packages/Models/Othello/Board/Board.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Packages\Models\Board;
+namespace Packages\Models\Othello\Board;
 
-use Packages\Models\Board\Color\Color;
-use Packages\Models\Board\Position\Position;
-use Packages\Models\Board\Position\PositionConverterTrait;
 use Packages\Models\Common\Matrix\Matrix;
+use Packages\Models\Othello\Board\Color\Color;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Board\Position\PositionConverterTrait;
 
 class Board
 {

diff --git a/packages/Models/Board/Color/Color.php → ...ages/Models/Othello/Board/Color/Color.php b/packages/Models/Board/Color/Color.php → ...ages/Models/Othello/Board/Color/Color.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Board\Color;
+namespace Packages\Models\Othello\Board\Color;
 
 /**
  * Enum風に実装

diff --git a/packages/Models/Board/Position/Position.php → ...odels/Othello/Board/Position/Position.php b/packages/Models/Board/Position/Position.php → ...odels/Othello/Board/Position/Position.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Packages\Models\Board\Position;
+namespace Packages\Models\Othello\Board\Position;
 
 /**
  * 盤面上での位置を表すクラス

diff --git a/...Board/Position/PositionConverterTrait.php → ...Board/Position/PositionConverterTrait.php b/...Board/Position/PositionConverterTrait.php → ...Board/Position/PositionConverterTrait.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Packages\Models\Board\Position;
+namespace Packages\Models\Othello\Board\Position;
 
-use Packages\Models\Board\Board;
+use Packages\Models\Othello\Board\Board;
 
 trait PositionConverterTrait
 {

diff --git a/packages/Models/Turn/Turn.php → packages/Models/Othello/Turn/Turn.php b/packages/Models/Turn/Turn.php → packages/Models/Othello/Turn/Turn.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Packages\Models\Turn;
+namespace Packages\Models\Othello\Turn;
 
-use Packages\Models\Board\Board;
-use Packages\Models\Board\Color\Color;
-use Packages\Models\Board\Position\Position;
+use Packages\Models\Othello\Board\Board;
+use Packages\Models\Othello\Board\Color\Color;
+use Packages\Models\Othello\Board\Position\Position;
 
 class Turn
 {

diff --git a/packages/Models/Skip/SkipCounter.php b/packages/Models/Skip/SkipCounter.php
diff --git a/packages/Repositories/Game/GameRepositoryInterface.php b/packages/Repositories/Game/GameRepositoryInterface.php
@@ -2,7 +2,7 @@
 
 namespace Packages\Repositories\Game;
 
-use Packages\Models\Game\Game;
+use Packages\Models\GameOrganizer\Game;
 
 interface GameRepositoryInterface
 {

diff --git a/packages/UseCases/Game/GameInitializeUsecase.php b/packages/UseCases/Game/GameInitializeUsecase.php
@@ -4,10 +4,10 @@
 
 use Packages\Factories\Game\GameFactory;
 use Packages\Models\Bot\BotType;
-use Packages\Models\Game\Game;
-use Packages\Models\Game\GameMode;
-use Packages\Models\Participant\BotParticipant;
-use Packages\Models\Participant\Player;
+use Packages\Models\GameOrganizer\Game;
+use Packages\Models\GameOrganizer\GameMode;
+use Packages\Models\GameOrganizer\Participant\BotParticipant;
+use Packages\Models\GameOrganizer\Participant\Player;
 use Packages\Repositories\Game\GameRepositoryInterface;
 
 class GameInitializeUsecase

diff --git a/packages/UseCases/Game/GameProcessUsecase.php b/packages/UseCases/Game/GameProcessUsecase.php
@@ -2,10 +2,8 @@
 
 namespace Packages\UseCases\Game;
 
-use Illuminate\Http\JsonResponse;
-use JetBrains\PhpStorm\ArrayShape;
-use Packages\Models\Board\Position\Position;
-use Packages\Models\Game\Game;
+use Packages\Models\GameOrganizer\Game;
+use Packages\Models\Othello\Board\Position\Position;
 use Packages\Repositories\Game\GameRepositoryInterface;
 
 class GameProcessUsecase

diff --git a/tests/Feature/Bot/BotFactoryTest.php → tests/Feature/Models/Bot/BotFactoryTest.php b/tests/Feature/Bot/BotFactoryTest.php → tests/Feature/Models/Bot/BotFactoryTest.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Tests\Feature\Bot;
+namespace Tests\Feature\Models\Bot;
 
 use Packages\Models\Bot\BotFactory;
-use Packages\Models\Bot\BotInterface;
 use Packages\Models\Bot\Bots\RandomBot;
 use Packages\Models\Bot\BotType;
 use Packages\Models\Bot\Levels\LevelFactory;

diff --git a/tests/Feature/Bot/BotTest.php → tests/Feature/Models/Bot/BotTest.php b/tests/Feature/Bot/BotTest.php → tests/Feature/Models/Bot/BotTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature\Bot;
+namespace Tests\Feature\Models\Bot;
 
-use Packages\Models\Board\Position\Position;
 use Packages\Models\Bot\BotFactory;
 use Packages\Models\Bot\BotType;
 use Packages\Models\Bot\Levels\LevelFactory;
-use Packages\Models\Turn\Turn;
+use Packages\Models\Othello\Board\Position\Position;
+use Packages\Models\Othello\Turn\Turn;
 use Tests\TestCase;
 
 class BotTest extends TestCase