UPDATE template, add enabled checkbox

Author: RecuencoJones

pom.xml

@@ -172,6 +172,8 @@
 
                         <!-- Add package to export here -->
                         <Export-Package>
+                            com.recuencojones.bitbucket.log,
+                            com.recuencojones.bitbucket.log.dao,
                             com.recuencojones.bitbucket.log.api,
                         </Export-Package>
 

src/main/java/com/recuencojones/bitbucket/log/OnRepositoryClone.java

@@ -1,8 +1,11 @@
 package com.recuencojones.bitbucket.log;
 
+import com.recuencojones.bitbucket.log.dao.*;
+
 import com.atlassian.bitbucket.event.repository.RepositoryCloneEvent;
 import com.atlassian.bitbucket.repository.Repository;
 import com.atlassian.event.api.EventListener;
+import com.atlassian.event.api.EventPublisher;
 import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 
 import com.atlassian.sal.api.net.*;
@@ -14,44 +17,52 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Named;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+
 import javax.inject.Inject;
+import javax.inject.Named;
 
-@Named("onRepositoryClone")
+@Named
 public class OnRepositoryClone {
 	private static final Logger log = LoggerFactory.getLogger(OnRepositoryClone.class);
 
 	@ComponentImport
 	private final RequestFactory requestFactory;
 
-	@ComponentImport
-	private final PluginSettingsFactory pluginSettingsFactory;
+	private final RepositoryCloneSettingsDAO repositoryCloneSettingsDAO;
 
 	@Inject
 	public OnRepositoryClone(
 		final RequestFactory requestFactory,
-		final PluginSettingsFactory pluginSettingsFactory
+		final RepositoryCloneSettingsDAO repositoryCloneSettingsDAO
 	) {
 		this.requestFactory = requestFactory;
-		this.pluginSettingsFactory = pluginSettingsFactory;
+		this.repositoryCloneSettingsDAO = repositoryCloneSettingsDAO;
 	}
 
 	@EventListener
-	public void onCloneEvent(final RepositoryCloneEvent cloneEvent) {
-		final Repository repository = cloneEvent.getRepository();
-		final String projectKey = repository.getProject().getKey();
+	public void onCloneEvent(final RepositoryCloneEvent event) {
+		final Repository repository = event.getRepository();
+		final int repositoryID = repository.getId();
 		final String repositorySlug = repository.getSlug();
+		final String projectKey = repository.getProject().getKey();
+
+		final RepositoryCloneSettings settings = repositoryCloneSettingsDAO.get(repositoryID);
 
-		log.info("Repository {}/{} cloned", projectKey, repositorySlug);
+		if (settings != null && settings.isEnabled()) {
+			log.debug("Repository {}/{} has log-on-clone settings", projectKey, repositorySlug);
 
-		final Request request = requestFactory.createRequest(Request.MethodType.POST, "https://en6qhxx7a3ksl.x.pipedream.net");
+			final Request request = requestFactory.createRequest(Request.MethodType.POST, settings.getURL());
 
-		request.setRequestBody(new Gson().toJson(repository));
+			request.setRequestBody(new Gson().toJson(repository));
 
-		try {
-			request.execute();
-		} catch (final ResponseException e) {
-			log.error("Could not log clone of {}/{}. Skipping.", projectKey, repositorySlug);
+			try {
+				request.execute();
+			} catch (final ResponseException e) {
+				log.error("Could not log clone of {}/{}. Skipping.", projectKey, repositorySlug);
+			}
 		}
 	}
 }

src/main/java/com/recuencojones/bitbucket/log/OnRepositoryDeleted.java

@@ -1,5 +1,7 @@
 package com.recuencojones.bitbucket.log;
 
+import com.recuencojones.bitbucket.log.dao.*;
+
 import com.atlassian.bitbucket.event.repository.RepositoryDeletedEvent;
 
 import com.atlassian.bitbucket.repository.Repository;
@@ -17,26 +19,30 @@
 import javax.inject.Named;
 import javax.inject.Inject;
 
-@Named("onRepositoryDeleted")
+@Named
 public class OnRepositoryDeleted {
 	private static final Logger log = LoggerFactory.getLogger(OnRepositoryClone.class);
 
-	@ComponentImport
-	private final PluginSettingsFactory pluginSettingsFactory;
+	private final RepositoryCloneSettingsDAO repositoryCloneSettingsDAO;
 
 	@Inject
 	public OnRepositoryDeleted(
-		final PluginSettingsFactory pluginSettingsFactory
+		final RepositoryCloneSettingsDAO repositoryCloneSettingsDAO
 	) {
-		this.pluginSettingsFactory = pluginSettingsFactory;
+		this.repositoryCloneSettingsDAO = repositoryCloneSettingsDAO;
 	}
 
 	@EventListener
 	public void onRepositoryDeleted(final RepositoryDeletedEvent event) {
-		deleteSettings(event.getRepository());
-	}
-
-	private void deleteSettings(final Repository repository) {
-
+		final Repository repository = event.getRepository();
+		final int repositoryID = repository.getId();
+		final String repositorySlug = repository.getSlug();
+		final String projectKey = repository.getProject().getKey();
+		final RepositoryCloneSettings settings = repositoryCloneSettingsDAO.get(repositoryID);
+
+		if (settings != null) {
+			log.debug("Repository {}/{} has log-on-clone settings, delete.", projectKey, repositorySlug);
+			repositoryCloneSettingsDAO.remove(settings);
+		}
 	}
 }

src/main/java/com/recuencojones/bitbucket/log/dao/RepositoryCloneSettings.java

@@ -14,13 +14,20 @@
 public interface RepositoryCloneSettings extends Entity {
 
 	String REPO_ID_COLUMN = "REPO_ID";
+	String ENABLED_COLUMN = "ENABLED";
 	String URL_COLUMN = "URL";
 
 	@Indexed
 	@Accessor(REPO_ID_COLUMN)
 	@NotNull
 	int getId();
 
+	@Accessor(ENABLED_COLUMN)
+	boolean isEnabled();
+
+	@Mutator(ENABLED_COLUMN)
+	void setEnabled(boolean enabled);
+
 	@Accessor(URL_COLUMN)
 	@StringLength(UNLIMITED)
 	String getURL();

src/main/java/com/recuencojones/bitbucket/log/dao/RepositoryCloneSettingsDAO.java

@@ -11,11 +11,9 @@
 import net.java.ao.DBParam;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import static com.recuencojones.bitbucket.log.dao.RepositoryCloneSettings.REPO_ID_COLUMN;
 
-@Named
 @Component
 public class RepositoryCloneSettingsDAO {
 	private static final String ID_QUERY = String.format("%s = ?", REPO_ID_COLUMN);
@@ -30,7 +28,7 @@ public RepositoryCloneSettingsDAO(
 		this.ao = ao;
 	}
 
-	public RepositoryCloneSettings save(int repositoryID, String url) {
+	public RepositoryCloneSettings save(int repositoryID, String url, boolean enabled) {
 		RepositoryCloneSettings settings = find(repositoryID);
 
 		if (settings == null) {
@@ -41,6 +39,7 @@ public RepositoryCloneSettings save(int repositoryID, String url) {
 		}
 
 		settings.setURL(url);
+		settings.setEnabled(enabled);
 		settings.save();
 
 		return settings;
@@ -53,6 +52,10 @@ public RepositoryCloneSettings get(int repositoryID) {
 	public void remove(int repositoryID) {
 		RepositoryCloneSettings settings = find(repositoryID);
 
+		remove(settings);
+	}
+
+	public void remove(RepositoryCloneSettings settings) {
 		ao.delete(settings);
 	}
 

src/main/java/com/recuencojones/bitbucket/log/rest/RepositoryCloneSettingsDTO.java

@@ -8,14 +8,25 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RepositoryCloneSettingsDTO {
 
-    @JsonProperty("url")
-    private String url;
+	@JsonProperty("enabled")
+	private boolean enabled;
 
-    public String getURL() {
-        return url;
-    }
+	@JsonProperty("url")
+	private String url;
 
-    public void setURL(String url) {
-        this.url = url;
-    }
+	public boolean getEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
+	public String getURL() {
+		return url;
+	}
+
+	public void setURL(String url) {
+		this.url = url;
+	}
 }

src/main/java/com/recuencojones/bitbucket/log/rest/RepositoryCloneSettingsResource.java

@@ -57,6 +57,7 @@ public Response getSettings(@Context Repository repository) {
 		if (settings != null) {
 			RepositoryCloneSettingsDTO settingsDTO = new RepositoryCloneSettingsDTO();
 
+			settingsDTO.setEnabled(settings.isEnabled());
 			settingsDTO.setURL(settings.getURL());
 
 			return ResponseFactory.ok(settingsDTO).build();
@@ -70,7 +71,7 @@ public Response saveSettings(@Context Repository repository, RepositoryCloneSett
 		permissionValidationService.validateForRepository(repository, Permission.REPO_ADMIN);
 
 		log.info("Store logging url for repository {}/{}", repository.getProject().getKey(), repository.getSlug());
-		repositoryCloneSettingsDAO.save(repository.getId(), settings.getURL());
+		repositoryCloneSettingsDAO.save(repository.getId(), settings.getURL(), settings.getEnabled());
 
 		return ResponseFactory.ok().build();
 	}

src/main/resources/META-INF/spring/atlassian-component-imports.xml

@@ -1,5 +1,7 @@
 bitbucket.web.repository.log-on-clone.title=Log on clone for {0} / {1}
 bitbucket.web.repository.log-on-clone.heading=Log on clone
+bitbucket.web.repository.log-on-clone.setting.enabled.label=Enable
+bitbucket.web.repository.log-on-clone.setting.enabled.description=Call URL on clone event?
 bitbucket.web.repository.log-on-clone.setting.url.label=URL
 bitbucket.web.repository.log-on-clone.setting.url.placeholder=Logging service URL
 bitbucket.web.repository.log-on-clone.setting.url.description=Target url should be a webhook listening on http/https. Event will be sent with POST method.

src/main/resources/log-on-clone.properties

@@ -6,3 +6,10 @@
   width: 20px;
   top: 5px;
 }
+
+.button-success {
+  display: inline-block;
+  top: -12px;
+  margin-left: 8px;
+  color: #35B37E;
+}