yisroelbaum/Rabbi_Gerzi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

delete child elements

Browse source
This commit is contained in:
Yisroel Baum 2026-06-21 22:13:59 +03:00
parent ac0f404fce
commit f4b42973cb
Signed by: yisroelbaum
GPG key ID: 0FA60884F75520A9
10 changed files with 271 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backend/app/Controllers/ElementController.php
View file

@ -5,6 +5,8 @@ namespace App\Controllers;
use App\Element\Element;
use App\Element\UseCases\CreateChildElement\CreateChildElement;
use App\Element\UseCases\CreateChildElement\CreateChildElementRequest;
use App\Element\UseCases\DeleteChildElement\DeleteChildElement;
use App\Element\UseCases\DeleteChildElement\DeleteChildElementRequest;
use App\Element\UseCases\GetElement\GetElement;
use App\Element\UseCases\GetElement\GetElementRequest;
use App\Element\UseCases\UpdateElement\UpdateElement;
@ -21,6 +23,7 @@ class ElementController
public function __construct(
private GetElement $getElement,
private CreateChildElement $createChildElement,
private DeleteChildElement $deleteChildElement,
private UpdateElement $updateElement,
private FileUploader $fileUploader,
) {
@ -82,6 +85,28 @@ class ElementController
], 201);
}
public function deleteChild(?int $parentId, ?int $childId): JsonResponse
{
try {
$this->deleteChildElement->execute(
new DeleteChildElementRequest(
parentElementId: $parentId,
childElementId: $childId,
)
);
} catch (BadRequestException $exception) {
return new JsonResponse([
'error' => $exception->getMessage(),
], 400);
} catch (NotFoundException $exception) {
return new JsonResponse([
'error' => $exception->getMessage(),
], 404);
}
return new JsonResponse(null, 204);
}
public function update(Request $request): JsonResponse
{
$file = $this->uploadedFileInput($request, 'file');

2
backend/app/Element/ElementRepository.php
View file

@ -10,6 +10,8 @@ interface ElementRepository
public function update(Element $element): Element;
public function delete(Element $element): void;
public function find(int $id): ?Element;
public function findRootBySet(DomainSet $set): ?Element;

12
backend/app/Element/EloquentElementRepository.php
View file

@ -63,6 +63,18 @@ class EloquentElementRepository implements ElementRepository
return $this->toDomain($model);
}
public function delete(Element $element): void
{
$model = ElementModel::find($element->getId());
if ($model === null) {
throw new DomainException(
"Element with id: {$element->getId()} doesnt exist"
);
}
$model->delete();
}
public function find(int $id): ?Element
{
$model = ElementModel::find($id);

83
backend/app/Element/UseCases/DeleteChildElement/DeleteChildElement.php Normal file
View file

@ -0,0 +1,83 @@
<?php
namespace App\Element\UseCases\DeleteChildElement;
use App\Element\Element;
use App\Element\ElementRepository;
use App\Exceptions\BadRequestException;
use App\Exceptions\NotFoundException;
use App\Shared\Files\FileUploader;
class DeleteChildElement
{
public function __construct(
private ElementRepository $elementRepository,
private FileUploader $fileUploader,
) {
}
/**
* @throws BadRequestException
* @throws NotFoundException
*/
public function execute(DeleteChildElementRequest $request): void
{
if ($request->parentElementId === null) {
throw new BadRequestException('parentElementId is required');
}
if ($request->childElementId === null) {
throw new BadRequestException('childElementId is required');
}
$parentElement = $this->elementRepository->find(
$request->parentElementId
);
if ($parentElement === null) {
throw new NotFoundException('Parent element not found');
}
$childElement = $this->elementRepository->find(
$request->childElementId
);
if ($childElement === null) {
throw new NotFoundException('Child element not found');
}
$actualParentElement = $childElement->getParentElement();
if (
$actualParentElement === null
|| $actualParentElement->getId() !== $parentElement->getId()
) {
throw new BadRequestException(
'Child element does not belong to parent'
);
}
$this->deleteSubtree($childElement);
}
private function deleteSubtree(Element $element): void
{
$childElements = $this->elementRepository->findByParentElement(
$element
);
foreach ($childElements as $childElement) {
$this->deleteSubtree($childElement);
}
$this->deleteManagedFile($element->getIconImageUrl());
$this->deleteManagedFile($element->getShortPdfPath());
$this->deleteManagedFile($element->getLongPdfPath());
$this->elementRepository->delete($element);
}
private function deleteManagedFile(?string $path): void
{
if ($path === null) {
return;
}
$this->fileUploader->delete($path);
}
}

12
backend/app/Element/UseCases/DeleteChildElement/DeleteChildElementRequest.php Normal file
View file

@ -0,0 +1,12 @@
<?php
namespace App\Element\UseCases\DeleteChildElement;
class DeleteChildElementRequest
{
public function __construct(
public ?int $parentElementId,
public ?int $childElementId,
) {
}
}

5
backend/routes/api.php
View file

@ -17,5 +17,10 @@ Route::post('/elements/{parentId}/children', [
'createChild',
])
->middleware(AuthMiddleware::class);
Route::delete('/elements/{parentId}/children/{childId}', [
ElementController::class,
'deleteChild',
])
->middleware(AuthMiddleware::class);
Route::post('/element/update', [ElementController::class, 'update'])
->middleware(AuthMiddleware::class);

5
backend/tests/Fakes/FakeElementRepository.php
View file

@ -42,6 +42,11 @@ class FakeElementRepository implements ElementRepository
return $this->cloneElement($updatedElement);
}
public function delete(Element $element): void
{
unset($this->elementsById[$element->getId()]);
}
public function find(int $id): ?Element
{
if (! isset($this->elementsById[$id])) {

2
backend/tests/Unit/Controllers/ElementControllerTest.php
View file

@ -6,6 +6,7 @@ use App\Controllers\ElementController;
use App\Element\CreateElementDto;
use App\Element\Element;
use App\Element\UseCases\CreateChildElement\CreateChildElement;
use App\Element\UseCases\DeleteChildElement\DeleteChildElement;
use App\Element\UseCases\GetElement\GetElement;
use App\Element\UseCases\UpdateElement\UpdateDescription;
use App\Element\UseCases\UpdateElement\UpdateElement;
@ -63,6 +64,7 @@ class ElementControllerTest extends TestCase
$this->controller = new ElementController(
$getElement,
new CreateChildElement($this->elementRepo),
new DeleteChildElement($this->elementRepo, $this->fileUploader),
$updateElement,
$this->fileUploader,
);

60
frontend/rabbi_gerzi/src/stores/elements.ts
View file

@ -73,6 +73,7 @@ export const useElementsStore = defineStore('elements', () => {
childElements.value = []
error.value = null
saveError.value = null
childActionError.value = null
isLoading.value = true
try {
@ -139,6 +140,36 @@ export const useElementsStore = defineStore('elements', () => {
}
}
async function deleteChildElement(
parentElementId: string,
childElementId: number,
): Promise<boolean> {
childActionError.value = null
isManagingChildren.value = true
try {
const encodedParentElementId = encodeURIComponent(parentElementId)
const encodedChildElementId = encodeURIComponent(
childElementId.toString(),
)
const response = await fetch(
`${ELEMENTS_URL}/${encodedParentElementId}`
+ `/children/${encodedChildElementId}`,
{
method: 'DELETE',
credentials: 'include',
},
)
return await handleDeleteChildElementResponse(response, childElementId)
} catch {
childActionError.value = 'Network error - could not remove child element'
return false
} finally {
isManagingChildren.value = false
}
}
async function clearElementIconImage(elementId: string): Promise<boolean> {
return await saveElementPatch(
elementId,
@ -314,6 +345,34 @@ export const useElementsStore = defineStore('elements', () => {
return data.element
}
async function handleDeleteChildElementResponse(
response: Response,
childElementId: number,
): Promise<boolean> {
if (response.status === 401) {
childActionError.value = 'Please log in again'
return false
}
if (response.status === 400 || response.status === 404) {
childActionError.value = await errorMessage(
response,
'Could not remove child element',
)
return false
}
if (!response.ok) {
childActionError.value = 'Could not remove child element'
return false
}
childElements.value = childElements.value.filter((childElement) => {
return childElement.id !== childElementId
})
return true
}
async function errorMessage(
response: Response,
fallbackMessage: string,
@ -341,6 +400,7 @@ export const useElementsStore = defineStore('elements', () => {
fetchElement,
updateElement,
createChildElement,
deleteChildElement,
uploadElementIconImage,
uploadElementShortPdf,
uploadElementLongPdf,

82
frontend/rabbi_gerzi/src/views/AdminElementPage.vue
View file

@ -143,6 +143,29 @@ async function handleAddChild(): Promise<void> {
})
}
async function handleRemoveChild(childElementId: number): Promise<void> {
if (elementId.value === '') {
return
}
const confirmed = window.confirm(
'Delete this child element and all of its descendants?',
)
if (!confirmed) {
return
}
childStatus.value = null
const deleted = await elementsStore.deleteChildElement(
elementId.value,
childElementId,
)
if (deleted) {
childStatus.value = 'Child element removed'
}
}
function chooseIconImage(): void {
iconImageInput.value?.click()
}
@ -500,23 +523,35 @@ function resetInput(changeEvent: Event): void {
v-for="childElement in childElements"
:key="childElement.id"
class="admin-element-page__child-item"
data-cy="admin-child-item"
>
<RouterLink
:to="{
name: 'admin-element',
params: { id: childElement.id },
}"
class="admin-element-page__child-link"
data-cy="admin-child-edit-link"
<div class="admin-element-page__child-body">
<RouterLink
:to="{
name: 'admin-element',
params: { id: childElement.id },
}"
class="admin-element-page__child-link"
data-cy="admin-child-edit-link"
>
{{ childElement.title }}
</RouterLink>
<p
v-if="childElement.description !== ''"
class="admin-element-page__child-description"
>
{{ childElement.description }}
</p>
</div>
<button
class="admin-element-page__secondary-button"
data-cy="admin-remove-child"
type="button"
:disabled="isManagingChildren"
@click="handleRemoveChild(childElement.id)"
>
{{ childElement.title }}
</RouterLink>
<p
v-if="childElement.description !== ''"
class="admin-element-page__child-description"
>
{{ childElement.description }}
</p>
Remove
</button>
</li>
</ul>
<p
@ -700,13 +735,22 @@ function resetInput(changeEvent: Event): void {
.admin-element-page__child-item {
display: flex;
flex-direction: column;
gap: 0.25rem;
align-items: flex-start;
justify-content: space-between;
gap: 0.7rem;
padding: 0.75rem;
border: 1px solid var(--color-border);
border-radius: 4px;
}
.admin-element-page__child-body {
display: flex;
flex: 1;
flex-direction: column;
gap: 0.25rem;
min-width: 0;
}
.admin-element-page__child-link {
color: var(--color-slate);
font-size: 0.95rem;
@ -833,5 +877,9 @@ function resetInput(changeEvent: Event): void {
align-items: stretch;
flex-direction: column;
}
.admin-element-page__child-item {
flex-direction: column;
}
}
</style>