Filtering buttons in buttons resource, and filtering out allowed buttons

Author: tomasbjerre

CHANGELOG.md

@@ -8,7 +8,7 @@ Changelog of Pull Request Notifier for Bitbucket.
 
  * So that the user may be admin in the repo, but not in the project.
 
-  [0e8243eb4d445dd](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/0e8243eb4d445dd) Tomas Bjerre *2016-07-30 06:58:02*
+  [4ee1f0d0a754a04](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/commit/4ee1f0d0a754a04) Tomas Bjerre *2016-07-30 07:15:22*
 
 ### GitHub [#135](https://github.com/tomasbjerre/pull-request-notifier-for-bitbucket/issues/135) Not permitted to access buttons settings as project/repo admin
   Getting project and repo with sys admin permissions

src/main/java/se/bjurr/prnfb/presentation/ButtonServlet.java

@@ -87,6 +87,7 @@ public Response get() {
   List<PrnfbButton> buttons = this.settingsService.getButtons();
   Iterable<PrnfbButton> allowedButtons = this.userCheckService.filterAllowed(buttons);
   List<ButtonDTO> dtos = toButtonDtoList(allowedButtons);
+  Collections.sort(dtos);
   return ok(dtos, APPLICATION_JSON).build();
  }
 
@@ -112,7 +113,9 @@ public Response get(@PathParam("projectKey") String projectKey) {
    return status(UNAUTHORIZED).build();
   }
   List<PrnfbButton> buttons = this.settingsService.getButtons(projectKey);
-  List<ButtonDTO> dtos = toButtonDtoList(buttons);
+  Iterable<PrnfbButton> allowedButtons = this.userCheckService.filterAllowed(buttons);
+  List<ButtonDTO> dtos = toButtonDtoList(allowedButtons);
+  Collections.sort(dtos);
   return ok(dtos, APPLICATION_JSON).build();
  }
 
@@ -124,7 +127,8 @@ public Response get(@PathParam("projectKey") String projectKey, @PathParam("repo
    return status(UNAUTHORIZED).build();
   }
   List<PrnfbButton> buttons = this.settingsService.getButtons(projectKey, repositorySlug);
-  List<ButtonDTO> dtos = toButtonDtoList(buttons);
+  Iterable<PrnfbButton> allowedButtons = this.userCheckService.filterAllowed(buttons);
+  List<ButtonDTO> dtos = toButtonDtoList(allowedButtons);
   Collections.sort(dtos);
   return ok(dtos, APPLICATION_JSON).build();
  }

src/test/java/se/bjurr/prnfb/presentation/ButtonServletTest.java

@@ -114,6 +114,7 @@ public void testThatButtonCanBeListedForAPr() throws Exception {
  public void testThatButtonCanBeListedPerProject() throws Exception {
   when(this.settingsService.getButtons(this.buttonDto1.getProjectKey().orNull()))//
     .thenReturn(newArrayList(this.button1));
+  allowAll();
 
   Response actual = this.sut.get(this.buttonDto1.getProjectKey().orNull());
   @SuppressWarnings("unchecked")
@@ -129,6 +130,7 @@ public void testThatButtonCanBeListedPerProjectAndRepo() throws Exception {
     this.settingsService.getButtons(this.buttonDto1.getProjectKey().orNull(), this.buttonDto1.getRepositorySlug()
       .orNull()))//
     .thenReturn(newArrayList(this.button1));
+  allowAll();
 
   Response actual = this.sut
     .get(this.buttonDto1.getProjectKey().orNull(), this.buttonDto1.getRepositorySlug().orNull());