diff --git a/backend/app/Controllers/SetController.php b/backend/app/Controllers/SetController.php index c7f34e0..1a035c9 100644 --- a/backend/app/Controllers/SetController.php +++ b/backend/app/Controllers/SetController.php @@ -25,13 +25,20 @@ class SetController } /** - * @return array{id: int, name: string} + * @return array{ + * id: int, + * name: string, + * description: string, + * iconImageUrl: string + * } */ private function buildSetPayload(DomainSet $set): array { return [ 'id' => $set->getId(), 'name' => $set->getName(), + 'description' => $set->getDescription(), + 'iconImageUrl' => $set->getIconImageUrl(), ]; } } diff --git a/backend/app/Set/CreateSetDto.php b/backend/app/Set/CreateSetDto.php index 841b0a4..934a410 100644 --- a/backend/app/Set/CreateSetDto.php +++ b/backend/app/Set/CreateSetDto.php @@ -6,6 +6,8 @@ class CreateSetDto { public function __construct( public string $name, + public string $description, + public string $iconImageUrl, ) { } } diff --git a/backend/app/Set/EloquentSetRepository.php b/backend/app/Set/EloquentSetRepository.php index ef8976e..d7db606 100644 --- a/backend/app/Set/EloquentSetRepository.php +++ b/backend/app/Set/EloquentSetRepository.php @@ -8,6 +8,8 @@ class EloquentSetRepository implements SetRepository { $model = SetModel::create([ 'name' => $dto->name, + 'description' => $dto->description, + 'icon_image_url' => $dto->iconImageUrl, ]); return $this->toDomain($model); @@ -36,6 +38,8 @@ class EloquentSetRepository implements SetRepository return new Set( id: $model->id, name: $model->name, + description: $model->description, + iconImageUrl: $model->icon_image_url, ); } } diff --git a/backend/app/Set/Set.php b/backend/app/Set/Set.php index bb6f51a..bf44461 100644 --- a/backend/app/Set/Set.php +++ b/backend/app/Set/Set.php @@ -7,6 +7,8 @@ class Set public function __construct( private int $id, private string $name, + private string $description, + private string $iconImageUrl, ) { } @@ -19,4 +21,14 @@ class Set { return $this->name; } + + public function getDescription(): string + { + return $this->description; + } + + public function getIconImageUrl(): string + { + return $this->iconImageUrl; + } } diff --git a/backend/app/Set/SetModel.php b/backend/app/Set/SetModel.php index c30e2c9..d80a6df 100644 --- a/backend/app/Set/SetModel.php +++ b/backend/app/Set/SetModel.php @@ -8,6 +8,8 @@ use Illuminate\Database\Eloquent\Model; /** * @property int $id * @property string $name + * @property string $description + * @property string $icon_image_url * * @method static Builder|SetModel newModelQuery() * @method static Builder|SetModel newQuery() @@ -23,5 +25,5 @@ class SetModel extends Model public $timestamps = false; - protected $fillable = ['name']; + protected $fillable = ['name', 'description', 'icon_image_url']; } diff --git a/backend/database/migrations/2026_05_24_000000_sets_table.php b/backend/database/migrations/2026_05_24_000000_sets_table.php index a39348b..f3ab093 100644 --- a/backend/database/migrations/2026_05_24_000000_sets_table.php +++ b/backend/database/migrations/2026_05_24_000000_sets_table.php @@ -11,6 +11,8 @@ return new class extends Migration Schema::create('sets', function (Blueprint $table) { $table->id(); $table->string('name'); + $table->text('description'); + $table->string('icon_image_url'); }); } diff --git a/backend/database/seeders/SetSeeder.php b/backend/database/seeders/SetSeeder.php index 2f2975c..5c70d6d 100644 --- a/backend/database/seeders/SetSeeder.php +++ b/backend/database/seeders/SetSeeder.php @@ -15,6 +15,10 @@ class SetSeeder extends Seeder $set = $setRepository->create(new CreateSetDto( name: $title, + description: 'Baderech HaAvodah is a way of living - ' + . 'a structured path for inner and outer growth, ' + . 'spiritual refinement, and personal development.', + iconImageUrl: '/assets/baderech-haavodah-icon.svg', )); } } diff --git a/backend/tests/Fakes/FakeSetRepository.php b/backend/tests/Fakes/FakeSetRepository.php index 295e619..079ea93 100644 --- a/backend/tests/Fakes/FakeSetRepository.php +++ b/backend/tests/Fakes/FakeSetRepository.php @@ -19,6 +19,8 @@ class FakeSetRepository implements SetRepository $set = new DomainSet( id: $id, name: $dto->name, + description: $dto->description, + iconImageUrl: $dto->iconImageUrl, ); $this->setsById[$id] = $set; @@ -52,6 +54,8 @@ class FakeSetRepository implements SetRepository return new DomainSet( id: $set->getId(), name: $set->getName(), + description: $set->getDescription(), + iconImageUrl: $set->getIconImageUrl(), ); } } diff --git a/backend/tests/Unit/Element/ElementTest.php b/backend/tests/Unit/Element/ElementTest.php index 3e914d9..5d7ded2 100644 --- a/backend/tests/Unit/Element/ElementTest.php +++ b/backend/tests/Unit/Element/ElementTest.php @@ -10,7 +10,12 @@ class ElementTest extends TestCase { public function testCreatesElementWithNullableParent(): void { - $set = new DomainSet(1, 'Daily learning'); + $set = new DomainSet( + id: 1, + name: 'Daily learning', + description: 'Daily learning description', + iconImageUrl: '/assets/daily-learning-icon.svg', + ); $rootElement = new Element( id: 1, title: 'Root', diff --git a/backend/tests/Unit/Element/UseCases/CreateElementTest.php b/backend/tests/Unit/Element/UseCases/CreateElementTest.php index 2d01fc6..340f49e 100644 --- a/backend/tests/Unit/Element/UseCases/CreateElementTest.php +++ b/backend/tests/Unit/Element/UseCases/CreateElementTest.php @@ -7,6 +7,7 @@ use App\Element\UseCases\CreateElement\CreateElement; use App\Element\UseCases\CreateElement\CreateElementRequest; use App\Exceptions\BadRequestException; use App\Set\CreateSetDto; +use App\Set\Set as DomainSet; use DomainException; use Tests\Fakes\FakeElementRepository; use Tests\Fakes\FakeSetRepository; @@ -30,11 +31,18 @@ class CreateElementTest extends TestCase ); } + private function createSet(string $name): DomainSet + { + return $this->setRepo->create(new CreateSetDto( + name: $name, + description: "$name description", + iconImageUrl: '/assets/test-set-icon.svg', + )); + } + public function testCreatesRootElement(): void { - $set = $this->setRepo->create( - new CreateSetDto('Daily learning') - ); + $set = $this->createSet('Daily learning'); $element = $this->createElement->execute(new CreateElementRequest( setId: $set->getId(), @@ -50,9 +58,7 @@ class CreateElementTest extends TestCase public function testCreatesChildElement(): void { - $set = $this->setRepo->create( - new CreateSetDto('Daily learning') - ); + $set = $this->createSet('Daily learning'); $rootElement = $this->createElement->execute( new CreateElementRequest( setId: $set->getId(), @@ -114,9 +120,7 @@ class CreateElementTest extends TestCase public function testThrowsWhenParentElementDoesNotExist(): void { - $set = $this->setRepo->create( - new CreateSetDto('Daily learning') - ); + $set = $this->createSet('Daily learning'); $this->expectException(DomainException::class); $this->expectExceptionMessage( @@ -132,9 +136,7 @@ class CreateElementTest extends TestCase public function testThrowsWhenRootElementAlreadyExists(): void { - $set = $this->setRepo->create( - new CreateSetDto('Daily learning') - ); + $set = $this->createSet('Daily learning'); $this->createElement->execute(new CreateElementRequest( setId: $set->getId(), title: 'Root', @@ -155,12 +157,8 @@ class CreateElementTest extends TestCase public function testThrowsWhenParentBelongsToAnotherSet(): void { - $parentSet = $this->setRepo->create( - new CreateSetDto('Parent set') - ); - $childSet = $this->setRepo->create( - new CreateSetDto('Child set') - ); + $parentSet = $this->createSet('Parent set'); + $childSet = $this->createSet('Child set'); $parentElement = $this->createElement->execute( new CreateElementRequest( setId: $parentSet->getId(),