diff --git a/app/Actions/RenameVillage.php b/app/Actions/RenameVillage.php new file mode 100644 index 0000000..ce22104 --- /dev/null +++ b/app/Actions/RenameVillage.php @@ -0,0 +1,27 @@ + self::MAX_LENGTH) { + throw new GameRuleViolation('name', 'A village name has 1 to '.self::MAX_LENGTH.' characters.'); + } + + return $this->mutate($user, $villageId, function (Simulation $sim, Village $village, CarbonImmutable $now) use ($name) { + $village->name = $name; + }); + } +} diff --git a/app/Websocket/Controllers/VillageController.php b/app/Websocket/Controllers/VillageController.php index 07286a2..8537755 100644 --- a/app/Websocket/Controllers/VillageController.php +++ b/app/Websocket/Controllers/VillageController.php @@ -10,6 +10,7 @@ use App\Actions\QueueBuild; use App\Actions\QueueDemolish; use App\Actions\QueueUpgrade; use App\Actions\Recruit; +use App\Actions\RenameVillage; use App\Actions\SetPriority; use App\Actions\ShowVillage; use App\Models\User; @@ -18,7 +19,7 @@ use App\Presenters\VillagePresenter; use App\Websocket\GameController; use Closure; -/** village.show|build|upgrade|demolish|cancel|staff|recruit|cancelRecruit|levy|endLevy. Each answers with the fresh village state. */ +/** village.show|build|upgrade|demolish|cancel|staff|recruit|cancelRecruit|levy|endLevy|rename. Each answers with the fresh village state. */ class VillageController extends GameController { public function show() @@ -77,6 +78,11 @@ class VillageController extends GameController return $this->village(fn ($user, $id) => app(EndLevy::class)($user, $id)); } + public function rename() + { + return $this->village(fn ($user, $id) => app(RenameVillage::class)($user, $id, (string) request('name'))); + } + /** @param Closure(User, int): Village $action */ private function village(Closure $action) { diff --git a/tests/Feature/JoinWorldTest.php b/tests/Feature/JoinWorldTest.php index 83050fa..27b3027 100644 --- a/tests/Feature/JoinWorldTest.php +++ b/tests/Feature/JoinWorldTest.php @@ -2,6 +2,7 @@ use App\Actions\JoinWorld; use App\Actions\ListWorlds; +use App\Actions\RenameVillage; use App\Actions\ShowVillage; use App\Game\Map\Continent; use App\Models\User; @@ -63,3 +64,13 @@ it('shows a start village to its owner only', function () { ->and(collect($state['buildable'])->firstWhere('type', 'wall')['blocked'])->toBeNull() ->and(rule(fn () => app(ShowVillage::class)(User::factory()->create(), $village->id)))->toBe('not_found'); }); + +it('renames an own village, trimmed, and refuses empty or long names', function () { + $village = startVillage(); + + app(RenameVillage::class)(owner($village), $village->id, " Iron Hill \n"); + expect($village->fresh()->name)->toBe('Iron Hill') + ->and(rule(fn () => app(RenameVillage::class)(owner($village), $village->id, ' ')))->toBe('name') + ->and(rule(fn () => app(RenameVillage::class)(owner($village), $village->id, str_repeat('x', 33))))->toBe('name') + ->and(rule(fn () => app(RenameVillage::class)(User::factory()->create(), $village->id, 'Mine')))->toBe('not_found'); +});