Merge pull request #112 from dwasinge/hook-fix

BugFix:  No Webhooks added to New Engagements

Author: mcanoy

src/main/java/com/redhat/labs/lodestar/service/ConfigService.java

@@ -77,7 +77,7 @@ public class ConfigService {
      */
     @Scheduled(every = "30s")
     void reloadConfigMapData() {
-        if(reloadConfig) {
+        if (reloadConfig) {
             loadWebHookData();
             loadConfigurationData();
         }
@@ -181,6 +181,23 @@ boolean engagementIsArchived(Project project) {
 
     }
 
+    /**
+     * Adds all configured webhooks to the project for the given {@link Engagement}.
+     * 
+     * @param engagement
+     * 
+     */
+    public void createWebhooksForEnagement(Engagement engagement) {
+
+        List<HookConfig> hookConfigs = getHookConfig();
+        hookConfigs.stream().forEach(hookC -> {
+            Hook hook = Hook.builder().projectId(engagement.getProjectId()).pushEvents(true).url(hookC.getBaseUrl())
+                    .token(hookC.getToken()).build();
+                hookService.createProjectHook(engagement.getProjectId(), hook);
+        });
+
+    }
+
     /**
      * Loads the configuration data from the configured file if it has been
      * modified.

src/main/java/com/redhat/labs/lodestar/service/EngagementService.java

@@ -67,6 +67,9 @@ public class EngagementService {
     @Inject
     HookService hookService;
 
+    @Inject
+    ConfigService configService;
+
     @Inject
     ProjectStructureService structureService;
 
@@ -115,6 +118,11 @@ public Project createEngagement(Engagement engagement, String author, String aut
             throw new UnexpectedGitLabResponseException("failed to commit files for engagement creation.");
         }
 
+        // create hooks if new engagement, should already exist if updating
+        if(project.isFirst()) {
+            configService.createWebhooksForEnagement(engagement);
+        }
+
         return project;
 
     }