Skip to content

[BUG]searching-groups-on-a-non-existing-application-result-in-500-error #833

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

Open
fjr3o6 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[BUG]searching-groups-on-a-non-existing-application-result-in-500-error #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion ...i-api-rest-services/src/main/java/fr/insee/sugoi/services/controller/GroupController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
import fr.insee.sugoi.core.model.ProviderResponse;
import fr.insee.sugoi.core.model.ProviderResponse.ProviderResponseStatus;
import fr.insee.sugoi.core.model.SugoiUser;
import fr.insee.sugoi.core.service.ApplicationService;
import fr.insee.sugoi.core.service.GroupService;
import fr.insee.sugoi.model.Group;
import fr.insee.sugoi.model.exceptions.ApplicationNotFoundException;
import fr.insee.sugoi.model.exceptions.IdNotMatchingException;
import fr.insee.sugoi.model.paging.PageResult;
import fr.insee.sugoi.model.paging.PageableResult;
Expand Down Expand Up @@ -67,6 +69,8 @@ public class GroupController {

@Autowired private GroupService groupService;

@Autowired private ApplicationService applicationService;

@GetMapping(
path = {"/realms/{realm}/applications/{application}/groups"},
produces = {MediaType.APPLICATION_JSON_VALUE})
Expand Down Expand Up @@ -111,8 +115,14 @@ public ResponseEntity<PageResult<Group>> getGroups(
filterGroup.setName(name);
filterGroup.setDescription(description);
PageableResult pageableResult = new PageableResult(size, offset, searchCookie);
PageResult<Group> foundGroups = null;
try {
applicationService.findById(realm, applicationName);

PageResult<Group> foundGroups =
} catch (ApplicationNotFoundException e) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
}
foundGroups =
groupService.findByProperties(realm, applicationName, filterGroup, pageableResult);

if (foundGroups.isHasMoreResult()) {
Expand Down
3 changes: 3 additions & 0 deletions ...i-rest-services/src/test/java/fr/insee/sugoi/services/controller/GroupControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import fr.insee.sugoi.commons.services.controller.technics.SugoiAdviceController;
import fr.insee.sugoi.core.model.ProviderResponse;
import fr.insee.sugoi.core.model.ProviderResponse.ProviderResponseStatus;
import fr.insee.sugoi.core.service.ApplicationService;
import fr.insee.sugoi.core.service.GroupService;
import fr.insee.sugoi.model.Group;
import fr.insee.sugoi.model.exceptions.GroupAlreadyExistException;
Expand Down Expand Up @@ -58,6 +59,8 @@ public class GroupControllerTest {

@MockBean private GroupService groupService;

@MockBean private ApplicationService applicationService;

ObjectMapper objectMapper = new ObjectMapper();
Group group1, group2, group2Updated;
PageResult<Group> pageResult;
Expand Down
8 changes: 8 additions & 0 deletions sugoi-api-test/src/test/resources/scenario/group_scenario_sync.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ Feature: Groups scenario admin
Then the client receives status code 200
Then the client expect to receive a list of groups

Scenario: Get groups application not exist
When the client perform GET request on url /realms/domaine1/applications/non/groups
Then the client receives status code 404

Scenario: Get group
When the client perform GET request on url /realms/domaine1/applications/applitest/groups/Administrateurs_AppliTest
And show body received
Expand All @@ -22,6 +26,10 @@ Feature: Groups scenario admin
And show body received
Then the client receives status code 200

Scenario: Get group application not exist
When the client perform GET request on url /realms/domaine1/applications/non/groups/Administrateurs_AppliTest
Then the client receives status code 404

Scenario: Post group
When the client perform POST request with body on url /realms/domaine1/applications/applitest/groups body:
"""
Expand Down