refactor element updates

This commit is contained in:
Yisroel Baum 2026-05-28 20:33:14 +03:00
parent 581852ecbc
commit d334745ade
Signed by: yisroelbaum
GPG key ID: 0FA60884F75520A9
19 changed files with 453 additions and 75 deletions

View file

@ -29,31 +29,61 @@ class Element
return $this->title; return $this->title;
} }
public function setTitle(string $title): void
{
$this->title = $title;
}
public function getDescription(): string public function getDescription(): string
{ {
return $this->description; return $this->description;
} }
public function setDescription(string $description): void
{
$this->description = $description;
}
public function getIconImageUrl(): ?string public function getIconImageUrl(): ?string
{ {
return $this->iconImageUrl; return $this->iconImageUrl;
} }
public function setIconImageUrl(?string $iconImageUrl): void
{
$this->iconImageUrl = $iconImageUrl;
}
public function getRichText(): string public function getRichText(): string
{ {
return $this->richText; return $this->richText;
} }
public function setRichText(string $richText): void
{
$this->richText = $richText;
}
public function getPdfPath(): ?string public function getPdfPath(): ?string
{ {
return $this->pdfPath; return $this->pdfPath;
} }
public function setPdfPath(?string $pdfPath): void
{
$this->pdfPath = $pdfPath;
}
public function getYoutubeUrl(): ?string public function getYoutubeUrl(): ?string
{ {
return $this->youtubeUrl; return $this->youtubeUrl;
} }
public function setYoutubeUrl(?string $youtubeUrl): void
{
$this->youtubeUrl = $youtubeUrl;
}
public function getSet(): Set public function getSet(): Set
{ {
return $this->set; return $this->set;

View file

@ -8,7 +8,7 @@ interface ElementRepository
{ {
public function create(CreateElementDto $dto): Element; public function create(CreateElementDto $dto): Element;
public function update(Element $element, UpdateElementDto $dto): Element; public function update(Element $element): Element;
public function find(int $id): ?Element; public function find(int $id): ?Element;

View file

@ -38,7 +38,7 @@ class EloquentElementRepository implements ElementRepository
); );
} }
public function update(Element $element, UpdateElementDto $dto): Element public function update(Element $element): Element
{ {
$model = ElementModel::find($element->getId()); $model = ElementModel::find($element->getId());
if ($model === null) { if ($model === null) {
@ -47,25 +47,17 @@ class EloquentElementRepository implements ElementRepository
); );
} }
$model->title = $dto->title; $model->set_id = $element->getSet()->getId();
$model->description = $dto->description; $model->title = $element->getTitle();
$model->icon_image_url = $dto->iconImageUrl; $model->description = $element->getDescription();
$model->rich_text = $dto->richText; $model->icon_image_url = $element->getIconImageUrl();
$model->pdf_path = $dto->pdfPath; $model->rich_text = $element->getRichText();
$model->youtube_url = $dto->youtubeUrl; $model->pdf_path = $element->getPdfPath();
$model->youtube_url = $element->getYoutubeUrl();
$model->parent_element_id = $element->getParentElement()?->getId();
$model->save(); $model->save();
return new Element( return $this->toDomain($model);
id: $element->getId(),
title: $dto->title,
description: $dto->description,
iconImageUrl: $dto->iconImageUrl,
richText: $dto->richText,
pdfPath: $dto->pdfPath,
youtubeUrl: $dto->youtubeUrl,
set: $element->getSet(),
parentElement: $element->getParentElement(),
);
} }
public function find(int $id): ?Element public function find(int $id): ?Element

View file

@ -1,16 +0,0 @@
<?php
namespace App\Element;
class UpdateElementDto
{
public function __construct(
public string $title,
public string $description,
public ?string $iconImageUrl,
public string $richText,
public ?string $pdfPath,
public ?string $youtubeUrl,
) {
}
}

View file

@ -0,0 +1,39 @@
<?php
namespace App\Element\UseCases\UpdateElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
class UpdateDescription
{
public function __construct(private ElementRepository $elementRepository)
{
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(UpdateDescriptionRequest $request): Element
{
if ($request->id === null) {
throw new BadRequestException('id is required');
}
if ($request->description === null) {
throw new BadRequestException('description is required');
}
$element = $this->elementRepository->find($request->id);
if ($element === null) {
throw new NotFoundException('Element not found');
}
$element->setDescription($request->description);
return $this->elementRepository->update($element);
}
}

View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\UpdateElement;
class UpdateDescriptionRequest
{
public function __construct(
public ?int $id,
public ?string $description,
) {
}
}

View file

@ -4,14 +4,20 @@ namespace App\Element\UseCases\UpdateElement;
use App\Element\Element; use App\Element\Element;
use App\Element\ElementRepository; use App\Element\ElementRepository;
use App\Element\UpdateElementDto;
use App\Exceptions\BadRequestException; use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException; use App\Exceptions\NotFoundException;
class UpdateElement class UpdateElement
{ {
public function __construct(private ElementRepository $elementRepository) public function __construct(
{ private UpdateTitle $updateTitle,
private UpdateDescription $updateDescription,
private UpdateIconImageUrl $updateIconImageUrl,
private UpdateRichText $updateRichText,
private UpdatePdfPath $updatePdfPath,
private UpdateYoutubeUrl $updateYoutubeUrl,
private ElementRepository $elementRepository,
) {
} }
/** /**
@ -24,8 +30,53 @@ class UpdateElement
throw new BadRequestException('id is required'); throw new BadRequestException('id is required');
} }
if ($request->title === null || trim($request->title) === '') { $hasNoFields = $request->title === null
throw new BadRequestException('title is required'); && $request->description === null
&& $request->iconImageUrl === null
&& $request->richText === null
&& $request->pdfPath === null
&& $request->youtubeUrl === null;
if ($hasNoFields) {
throw new BadRequestException('nothing to update');
}
if ($request->title !== null) {
$this->updateTitle->execute(new UpdateTitleRequest(
id: $request->id,
title: $request->title,
));
}
if ($request->description !== null) {
$this->updateDescription->execute(new UpdateDescriptionRequest(
id: $request->id,
description: $request->description,
));
}
if ($request->iconImageUrl !== null) {
$this->updateIconImageUrl->execute(
new UpdateIconImageUrlRequest(
id: $request->id,
iconImageUrl: $request->iconImageUrl,
)
);
}
if ($request->richText !== null) {
$this->updateRichText->execute(new UpdateRichTextRequest(
id: $request->id,
richText: $request->richText,
));
}
if ($request->pdfPath !== null) {
$this->updatePdfPath->execute(new UpdatePdfPathRequest(
id: $request->id,
pdfPath: $request->pdfPath,
));
}
if ($request->youtubeUrl !== null) {
$this->updateYoutubeUrl->execute(new UpdateYoutubeUrlRequest(
id: $request->id,
youtubeUrl: $request->youtubeUrl,
));
} }
$element = $this->elementRepository->find($request->id); $element = $this->elementRepository->find($request->id);
@ -33,25 +84,6 @@ class UpdateElement
throw new NotFoundException('Element not found'); throw new NotFoundException('Element not found');
} }
return $this->elementRepository->update( return $element;
$element,
new UpdateElementDto(
title: $request->title,
description: $request->description ?? '',
iconImageUrl: $this->nullableString($request->iconImageUrl),
richText: $request->richText ?? '',
pdfPath: $this->nullableString($request->pdfPath),
youtubeUrl: $this->nullableString($request->youtubeUrl),
),
);
}
private function nullableString(?string $value): ?string
{
if ($value === null || $value === '') {
return null;
}
return $value;
} }
} }

View file

@ -0,0 +1,50 @@
<?php
namespace App\Element\UseCases\UpdateElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
class UpdateIconImageUrl
{
public function __construct(private ElementRepository $elementRepository)
{
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(UpdateIconImageUrlRequest $request): Element
{
if ($request->id === null) {
throw new BadRequestException('id is required');
}
if ($request->iconImageUrl === null) {
throw new BadRequestException('iconImageUrl is required');
}
$element = $this->elementRepository->find($request->id);
if ($element === null) {
throw new NotFoundException('Element not found');
}
$element->setIconImageUrl($this->nullableString(
$request->iconImageUrl,
));
return $this->elementRepository->update($element);
}
private function nullableString(string $value): ?string
{
if ($value === '') {
return null;
}
return $value;
}
}

View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\UpdateElement;
class UpdateIconImageUrlRequest
{
public function __construct(
public ?int $id,
public ?string $iconImageUrl,
) {
}
}

View file

@ -0,0 +1,48 @@
<?php
namespace App\Element\UseCases\UpdateElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
class UpdatePdfPath
{
public function __construct(private ElementRepository $elementRepository)
{
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(UpdatePdfPathRequest $request): Element
{
if ($request->id === null) {
throw new BadRequestException('id is required');
}
if ($request->pdfPath === null) {
throw new BadRequestException('pdfPath is required');
}
$element = $this->elementRepository->find($request->id);
if ($element === null) {
throw new NotFoundException('Element not found');
}
$element->setPdfPath($this->nullableString($request->pdfPath));
return $this->elementRepository->update($element);
}
private function nullableString(string $value): ?string
{
if ($value === '') {
return null;
}
return $value;
}
}

View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\UpdateElement;
class UpdatePdfPathRequest
{
public function __construct(
public ?int $id,
public ?string $pdfPath,
) {
}
}

View file

@ -0,0 +1,39 @@
<?php
namespace App\Element\UseCases\UpdateElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
class UpdateRichText
{
public function __construct(private ElementRepository $elementRepository)
{
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(UpdateRichTextRequest $request): Element
{
if ($request->id === null) {
throw new BadRequestException('id is required');
}
if ($request->richText === null) {
throw new BadRequestException('richText is required');
}
$element = $this->elementRepository->find($request->id);
if ($element === null) {
throw new NotFoundException('Element not found');
}
$element->setRichText($request->richText);
return $this->elementRepository->update($element);
}
}

View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\UpdateElement;
class UpdateRichTextRequest
{
public function __construct(
public ?int $id,
public ?string $richText,
) {
}
}

View file

@ -0,0 +1,39 @@
<?php
namespace App\Element\UseCases\UpdateElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
class UpdateTitle
{
public function __construct(private ElementRepository $elementRepository)
{
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(UpdateTitleRequest $request): Element
{
if ($request->id === null) {
throw new BadRequestException('id is required');
}
if ($request->title === null || trim($request->title) === '') {
throw new BadRequestException('title is required');
}
$element = $this->elementRepository->find($request->id);
if ($element === null) {
throw new NotFoundException('Element not found');
}
$element->setTitle(trim($request->title));
return $this->elementRepository->update($element);
}
}

View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\UpdateElement;
class UpdateTitleRequest
{
public function __construct(
public ?int $id,
public ?string $title,
) {
}
}

View file

@ -0,0 +1,50 @@
<?php
namespace App\Element\UseCases\UpdateElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
class UpdateYoutubeUrl
{
public function __construct(private ElementRepository $elementRepository)
{
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(UpdateYoutubeUrlRequest $request): Element
{
if ($request->id === null) {
throw new BadRequestException('id is required');
}
if ($request->youtubeUrl === null) {
throw new BadRequestException('youtubeUrl is required');
}
$element = $this->elementRepository->find($request->id);
if ($element === null) {
throw new NotFoundException('Element not found');
}
$element->setYoutubeUrl($this->nullableString(
$request->youtubeUrl,
));
return $this->elementRepository->update($element);
}
private function nullableString(string $value): ?string
{
if ($value === '') {
return null;
}
return $value;
}
}

View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\UpdateElement;
class UpdateYoutubeUrlRequest
{
public function __construct(
public ?int $id,
public ?string $youtubeUrl,
) {
}
}

View file

@ -5,7 +5,6 @@ namespace Tests\Fakes;
use App\Element\CreateElementDto; use App\Element\CreateElementDto;
use App\Element\Element; use App\Element\Element;
use App\Element\ElementRepository; use App\Element\ElementRepository;
use App\Element\UpdateElementDto;
use App\Set\Set as DomainSet; use App\Set\Set as DomainSet;
class FakeElementRepository implements ElementRepository class FakeElementRepository implements ElementRepository
@ -34,20 +33,10 @@ class FakeElementRepository implements ElementRepository
return $element; return $element;
} }
public function update(Element $element, UpdateElementDto $dto): Element public function update(Element $element): Element
{ {
$updatedElement = new Element( $updatedElement = $this->cloneElement($element);
id: $element->getId(), $this->elementsById[$updatedElement->getId()] = $updatedElement;
title: $dto->title,
description: $dto->description,
iconImageUrl: $dto->iconImageUrl,
richText: $dto->richText,
pdfPath: $dto->pdfPath,
youtubeUrl: $dto->youtubeUrl,
set: $element->getSet(),
parentElement: $element->getParentElement(),
);
$this->elementsById[$element->getId()] = $updatedElement;
return $this->cloneElement($updatedElement); return $this->cloneElement($updatedElement);
} }

View file

@ -6,7 +6,13 @@ use App\Controllers\ElementController;
use App\Element\CreateElementDto; use App\Element\CreateElementDto;
use App\Element\Element; use App\Element\Element;
use App\Element\UseCases\GetElement\GetElement; use App\Element\UseCases\GetElement\GetElement;
use App\Element\UseCases\UpdateElement\UpdateDescription;
use App\Element\UseCases\UpdateElement\UpdateElement; use App\Element\UseCases\UpdateElement\UpdateElement;
use App\Element\UseCases\UpdateElement\UpdateIconImageUrl;
use App\Element\UseCases\UpdateElement\UpdatePdfPath;
use App\Element\UseCases\UpdateElement\UpdateRichText;
use App\Element\UseCases\UpdateElement\UpdateTitle;
use App\Element\UseCases\UpdateElement\UpdateYoutubeUrl;
use App\Set\Set as DomainSet; use App\Set\Set as DomainSet;
use Tests\Fakes\FakeElementRepository; use Tests\Fakes\FakeElementRepository;
use Tests\TestCase; use Tests\TestCase;
@ -21,7 +27,15 @@ class ElementControllerTest extends TestCase
{ {
$this->elementRepo = new FakeElementRepository(); $this->elementRepo = new FakeElementRepository();
$getElement = new GetElement($this->elementRepo); $getElement = new GetElement($this->elementRepo);
$updateElement = new UpdateElement($this->elementRepo); $updateElement = new UpdateElement(
new UpdateTitle($this->elementRepo),
new UpdateDescription($this->elementRepo),
new UpdateIconImageUrl($this->elementRepo),
new UpdateRichText($this->elementRepo),
new UpdatePdfPath($this->elementRepo),
new UpdateYoutubeUrl($this->elementRepo),
$this->elementRepo,
);
$this->controller = new ElementController($getElement, $updateElement); $this->controller = new ElementController($getElement, $updateElement);
} }