Refactor Forms::delete() to use Doctrine

[MAILPOET-3039]
This commit is contained in:
Rodrigo Primo
2021-04-02 11:41:16 -03:00
committed by Veljko V
parent 49f0c054fd
commit 5ceb084c64
4 changed files with 23 additions and 4 deletions

View File

@ -303,10 +303,10 @@ class Forms extends APIEndpoint {
}
public function delete($data = []) {
$id = (isset($data['id']) ? (int)$data['id'] : false);
$form = Form::findOne($id);
if ($form instanceof Form) {
$form->delete();
$form = $this->getForm($data);
if ($form instanceof FormEntity) {
$this->formsRepository->delete($form);
return $this->successResponse(null, ['count' => 1]);
} else {

View File

@ -36,6 +36,11 @@ class FormsRepository extends Repository {
->getSingleScalarResult();
}
public function delete(FormEntity $form) {
$this->remove($form);
$this->flush();
}
public function trash(FormEntity $form) {
$this->updateDeletedAt($form, Carbon::now());
}

View File

@ -239,6 +239,13 @@ class FormsTest extends \MailPoetTest {
expect($response->meta['count'])->equals(1);
}
public function testErrorWhenDeletingNonExistentForm() {
$response = $this->endpoint->delete(['id' => 'Invalid ID']);
expect($response->errors[0]['error'])->equals('not_found');
expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
expect($response->meta)->isEmpty();
}
public function testItCanDuplicateAForm() {
$response = $this->endpoint->duplicate(['id' => $this->form1->getId()]);
expect($response->status)->equals(APIResponse::STATUS_OK);

View File

@ -13,6 +13,13 @@ class FormsRepositoryTest extends \MailPoetTest {
$this->repository = $this->diContainer->get(FormsRepository::class);
}
public function testItCanDeleteForm() {
$form = $this->createForm('Form 1');
expect($this->repository->findOneById($form->getId()))->isInstanceOf(FormEntity::class);
$this->repository->delete($form);
expect($form->getId())->null();
}
public function testItCanTrashForm() {
$form = $this->createForm('Form 1');
expect($form->getDeletedAt())->null();