Admin GUI #109 #55 #25

Author: tomasbjerre

CHANGELOG.md

@@ -5,12 +5,12 @@ module.exports = function(grunt) {
 
   jsbeautifier: {
    files: ["Gruntfile.js",
-    "**/*.vm",
-    "**/*.xml",
+    "src/**/*.vm",
+    "src/**/*.xml",
     "pom.xml",
-    "**/*.js",
+    "src/**/*.js",
     "Gruntfile.js",
-    "**/*.css"
+    "src/**/*.css"
    ],
    options: {
     html: {

Gruntfile.js

@@ -42,6 +42,7 @@ The plugin has its own implementation to create the RESCOPED_FROM and RESCOPED_T
 
 The filter text as well as the URL support variables. These are:
 
+* ${EVERYTHING_URL} Example: PULL_REQUEST_ID=1&PULL_REQUEST_TITLE=some%20thing...
 * ${PULL_REQUEST_ID} Example: 1
 * ${PULL_REQUEST_TITLE} Example: Anything
 * ${PULL_REQUEST_VERSION} Example: 1
@@ -102,13 +103,17 @@ Some rest resources are available. You can figure out the JSON structure by look
  * `DELETE /{uuid}` Deletes notification with *uuid*.
  * `GET` Get all notifications.
  * `GET /{uuid}` Get notification with *uuid*.
+ * `GET /projectKey/{projectKey}` Get all notifications for the project.
+ * `GET /projectKey/{projectKey}/repositorySlug/{repositorySlug}` Get all notifications for the project and repository.
  * `POST` Save a notification.
 
 * `/bitbucket/rest/prnfb-admin/1.0/settings/buttons`
  * `DELETE /{uuid}` Deletes button with *uuid*.
  * `GET` Get all buttons that the current user is allowed to use.
  * `GET /{uuid}` Get button with *uuid*.
  * `GET /repository/{repositoryId}/pullrequest/{pullRequestId}` Get all buttons for repository that the current user is allowed to use.
+ * `GET /projectKey/{projectKey}` Get all buttons for the project.
+ * `GET /projectKey/{projectKey}/repositorySlug/{repositorySlug}` Get all buttons for the project and repository.
  * `POST` Save a button.
  * `POST /press` Press the button.
 

README.md

@@ -151,6 +151,7 @@
        <gitHubToken>${GITHUB_OAUTH2TOKEN}</gitHubToken>
        <gitHubIssuePattern>#([0-9]*)</gitHubIssuePattern>
        <filePath>CHANGELOG.md</filePath>
+       <removeIssueFromMessage>true</removeIssueFromMessage>
        <templateContent>
         <![CDATA[
 # Pull Request Notifier for Bitbucket Changelog

pom.xml

@@ -1,7 +1,6 @@
 package se.bjurr.prnfb.presentation;
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 import static javax.ws.rs.core.Response.ok;
 import static javax.ws.rs.core.Response.status;
 import static javax.ws.rs.core.Response.Status.OK;
@@ -44,21 +43,25 @@ public ButtonServlet(ButtonsService buttonsService, SettingsService settingsServ
 
  @POST
  @XsrfProtectionExcluded
- @Produces(TEXT_PLAIN)
+ @Produces(APPLICATION_JSON)
  public Response create(ButtonDTO buttonDto) {
   if (!this.userCheckService.isAdminAllowed()) {
    return status(UNAUTHORIZED).build();
   }
   PrnfbButton prnfbButton = toPrnfbButton(buttonDto);
-  this.settingsService.addOrUpdateButton(prnfbButton);
-  return status(OK).build();
+  PrnfbButton created = this.settingsService.addOrUpdateButton(prnfbButton);
+  ButtonDTO createdDto = toButtonDto(created);
+
+  return status(OK)//
+    .entity(createdDto)//
+    .build();
  }
 
  @DELETE
  @Path("{uuid}")
  @XsrfProtectionExcluded
  @Produces(APPLICATION_JSON)
- public Response delete(UUID prnfbButton) {
+ public Response delete(@PathParam("uuid") UUID prnfbButton) {
   if (!this.userCheckService.isAdminAllowed()) {
    return status(UNAUTHORIZED).build();
   }
@@ -88,6 +91,30 @@ public Response get(@PathParam("repositoryId") Integer repositoryId, @PathParam(
   return ok(dtos, APPLICATION_JSON).build();
  }
 
+ @GET
+ @Path("/projectKey/{projectKey}")
+ @Produces(APPLICATION_JSON)
+ public Response get(@PathParam("projectKey") String projectKey) {
+  if (!this.userCheckService.isViewAllowed()) {
+   return status(UNAUTHORIZED).build();
+  }
+  List<PrnfbButton> buttons = this.settingsService.getButtons(projectKey);
+  List<ButtonDTO> dtos = toButtonDtoList(buttons);
+  return ok(dtos, APPLICATION_JSON).build();
+ }
+
+ @GET
+ @Path("/projectKey/{projectKey}/repositorySlug/{repositorySlug}")
+ @Produces(APPLICATION_JSON)
+ public Response get(@PathParam("projectKey") String projectKey, @PathParam("repositorySlug") String repositorySlug) {
+  if (!this.userCheckService.isViewAllowed()) {
+   return status(UNAUTHORIZED).build();
+  }
+  List<PrnfbButton> buttons = this.settingsService.getButtons(projectKey, repositorySlug);
+  List<ButtonDTO> dtos = toButtonDtoList(buttons);
+  return ok(dtos, APPLICATION_JSON).build();
+ }
+
  @GET
  @Path("{uuid}")
  @Produces(APPLICATION_JSON)

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

@@ -2,7 +2,6 @@
 
 import static com.google.common.base.Throwables.propagate;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
 import static javax.ws.rs.core.Response.ok;
 import static javax.ws.rs.core.Response.status;
 import static javax.ws.rs.core.Response.Status.OK;
@@ -41,18 +40,21 @@ public NotificationServlet(SettingsService settingsService, UserCheckService use
 
  @POST
  @XsrfProtectionExcluded
- @Produces(TEXT_PLAIN)
+ @Produces(APPLICATION_JSON)
  public Response create(NotificationDTO notificationDto) {
   if (!this.userCheckService.isAdminAllowed()) {
    return status(UNAUTHORIZED).build();
   }
   try {
    PrnfbNotification prnfbNotification = toPrnfbNotification(notificationDto);
-   this.settingsService.addOrUpdateNotification(prnfbNotification);
+   PrnfbNotification created = this.settingsService.addOrUpdateNotification(prnfbNotification);
+   NotificationDTO createdDto = toNotificationDto(created);
+   return status(OK)//
+     .entity(createdDto)//
+     .build();
   } catch (Exception e) {
-   propagate(e);
+   throw propagate(e);
   }
-  return status(OK).build();
  }
 
  @DELETE
@@ -78,6 +80,30 @@ public Response get() {
   return ok(dtos).build();
  }
 
+ @GET
+ @Path("/projectKey/{projectKey}")
+ @Produces(APPLICATION_JSON)
+ public Response get(@PathParam("projectKey") String projectKey) {
+  if (!this.userCheckService.isViewAllowed()) {
+   return status(UNAUTHORIZED).build();
+  }
+  List<PrnfbNotification> notifications = this.settingsService.getNotifications(projectKey);
+  List<NotificationDTO> dtos = toNotificationDtoList(notifications);
+  return ok(dtos).build();
+ }
+
+ @GET
+ @Path("/projectKey/{projectKey}/repositorySlug/{repositorySlug}")
+ @Produces(APPLICATION_JSON)
+ public Response get(@PathParam("projectKey") String projectKey, @PathParam("repositorySlug") String repositorySlug) {
+  if (!this.userCheckService.isViewAllowed()) {
+   return status(UNAUTHORIZED).build();
+  }
+  List<PrnfbNotification> notifications = this.settingsService.getNotifications(projectKey, repositorySlug);
+  List<NotificationDTO> dtos = toNotificationDtoList(notifications);
+  return ok(dtos).build();
+ }
+
  @GET
  @Path("{uuid}")
  @Produces(APPLICATION_JSON)

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

@@ -13,7 +13,9 @@
 @XmlAccessorType(FIELD)
 public class ButtonDTO {
 
- private String title;
+ private String name;
+ private String projectKey;
+ private String repositorySlug;
  private USER_LEVEL userLevel;
  private UUID uuid;
 
@@ -29,11 +31,25 @@ public boolean equals(Object obj) {
    return false;
   }
   ButtonDTO other = (ButtonDTO) obj;
-  if (this.title == null) {
-   if (other.title != null) {
+  if (this.projectKey == null) {
+   if (other.projectKey != null) {
     return false;
    }
-  } else if (!this.title.equals(other.title)) {
+  } else if (!this.projectKey.equals(other.projectKey)) {
+   return false;
+  }
+  if (this.repositorySlug == null) {
+   if (other.repositorySlug != null) {
+    return false;
+   }
+  } else if (!this.repositorySlug.equals(other.repositorySlug)) {
+   return false;
+  }
+  if (this.name == null) {
+   if (other.name != null) {
+    return false;
+   }
+  } else if (!this.name.equals(other.name)) {
    return false;
   }
   if (this.userLevel != other.userLevel) {
@@ -49,14 +65,26 @@ public boolean equals(Object obj) {
   return true;
  }
 
- public String getTitle() {
-  return this.title;
+ public String getName() {
+  return this.name;
+ }
+
+ public String getProjectKey() {
+  return this.projectKey;
+ }
+
+ public String getRepositorySlug() {
+  return this.repositorySlug;
  }
 
  public USER_LEVEL getUserLevel() {
   return this.userLevel;
  }
 
+ public UUID getUuid() {
+  return this.uuid;
+ }
+
  public UUID getUUID() {
   return this.uuid;
  }
@@ -65,14 +93,24 @@ public UUID getUUID() {
  public int hashCode() {
   final int prime = 31;
   int result = 1;
-  result = prime * result + ((this.title == null) ? 0 : this.title.hashCode());
+  result = prime * result + ((this.projectKey == null) ? 0 : this.projectKey.hashCode());
+  result = prime * result + ((this.repositorySlug == null) ? 0 : this.repositorySlug.hashCode());
+  result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
   result = prime * result + ((this.userLevel == null) ? 0 : this.userLevel.hashCode());
   result = prime * result + ((this.uuid == null) ? 0 : this.uuid.hashCode());
   return result;
  }
 
- public void setTitle(String title) {
-  this.title = title;
+ public void setName(String name) {
+  this.name = name;
+ }
+
+ public void setProjectKey(String projectKey) {
+  this.projectKey = projectKey;
+ }
+
+ public void setRepositorySlug(String repositorySlug) {
+  this.repositorySlug = repositorySlug;
  }
 
  public void setUserLevel(USER_LEVEL userLevel) {
@@ -85,7 +123,8 @@ public void setUuid(UUID uuid) {
 
  @Override
  public String toString() {
-  return "ButtonDTO [title=" + this.title + ", userLevel=" + this.userLevel + ", uuid=" + this.uuid + "]";
+  return "ButtonDTO [name=" + this.name + ", userLevel=" + this.userLevel + ", uuid=" + this.uuid + ", repositorySlug="
+    + this.repositorySlug + ", projectKey=" + this.projectKey + "]";
  }
 
 }

src/main/java/se/bjurr/prnfb/presentation/dto/ButtonDTO.java

@@ -2,8 +2,6 @@
 
 import static javax.xml.bind.annotation.XmlAccessType.FIELD;
 
-import java.util.UUID;
-
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -12,7 +10,6 @@
 public class HeaderDTO {
 
  private String name;
- private UUID uuid;
  private String value;
 
  @Override
@@ -34,13 +31,6 @@ public boolean equals(Object obj) {
   } else if (!this.name.equals(other.name)) {
    return false;
   }
-  if (this.uuid == null) {
-   if (other.uuid != null) {
-    return false;
-   }
-  } else if (!this.uuid.equals(other.uuid)) {
-   return false;
-  }
   if (this.value == null) {
    if (other.value != null) {
     return false;
@@ -55,10 +45,6 @@ public String getName() {
   return this.name;
  }
 
- public UUID getUuid() {
-  return this.uuid;
- }
-
  public String getValue() {
   return this.value;
  }
@@ -68,7 +54,6 @@ public int hashCode() {
   final int prime = 31;
   int result = 1;
   result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
-  result = prime * result + ((this.uuid == null) ? 0 : this.uuid.hashCode());
   result = prime * result + ((this.value == null) ? 0 : this.value.hashCode());
   return result;
  }
@@ -77,17 +62,13 @@ public void setName(String name) {
   this.name = name;
  }
 
- public void setUuid(UUID uuid) {
-  this.uuid = uuid;
- }
-
  public void setValue(String value) {
   this.value = value;
  }
 
  @Override
  public String toString() {
-  return "HeaderDTO [name=" + this.name + ", uuid=" + this.uuid + ", value=" + this.value + "]";
+  return "HeaderDTO [name=" + this.name + ", value=" + this.value + "]";
  }
 
 }