Skip to content

fix: display error message on conflicting recipe name #1770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christianlupus merged 2 commits into from
Aug 31, 2023
Merged

fix: display error message on conflicting recipe name #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31db708
fix: display error message on conflicting recipe name
SethFalco Jul 30, 2023
5ca27dc
Update Changelog
christianlupus Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
[#1687](https://github.com/nextcloud/cookbook/pull/1687) @christianlupus
- Prevent popup from falsely showing during loading of the app
[#1764](https://github.com/nextcloud/cookbook/pull/1764) @christianlupus
- Fix unclear error message if recipe is already existing
[#1770](https://github.com/nextcloud/cookbook/pull/1770) @SethFalco

### Maintenance
- Fix URL of Transifex after upstream subdomain change
Expand Down
7 changes: 7 additions & 0 deletions lib/Controller/Implementation/RecipeImplementation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ public function update($id) {
$recipeData = $this->restParser->getParameters();
try {
$file = $this->service->addRecipe($recipeData);
} catch (RecipeExistsException $ex) {
$json = [
'msg' => $ex->getMessage(),
'file' => $ex->getFile(),
'line' => $ex->getLine(),
];
return new JSONResponse($json, Http::STATUS_CONFLICT);
} catch (NoRecipeNameGivenException $ex) {
$json = [
'msg' => $ex->getMessage(),
Expand Down
18 changes: 18 additions & 0 deletions tests/Unit/Controller/Implementation/RecipeImplementationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,24 @@ public function testUpdateNoName(): void {
$this->assertEquals($errorMsg, $ret->getData()['msg']);
}

public function testUpdateConflictingName(): void {
$this->ensureCacheCheckTriggered();

$recipe = ['a', 'recipe', 'as', 'array'];

$errorMsg = "Another recipe with that name already exists";
$ex = new RecipeExistsException($errorMsg);

$this->restParser->method('getParameters')->willReturn($recipe);
$this->recipeService->expects($this->once())->method('addRecipe')->with($recipe)->willThrowException($ex);
$this->dbCacheService->expects($this->never())->method('addRecipe');

$ret = $this->sut->update(1);

$this->assertEquals(409, $ret->getStatus());
$this->assertEquals($errorMsg, $ret->getData()['msg']);
}

public function testCreate(): void {
$this->ensureCacheCheckTriggered();

Expand Down