Adjusted the configuration of the slack integration

Author: mkimberlin

server/src/main/java/com/objectcomputing/checkins/configuration/CheckInsConfiguration.java

@@ -31,6 +31,9 @@ public static class ApplicationConfig {
         @NotNull
         private GoogleApiConfig googleApi;
 
+        @NotNull
+        private NotificationsConfig notifications;
+
         @Getter
         @Setter
         @ConfigurationProperties("feedback")
@@ -66,5 +69,25 @@ public static class ScopeConfig {
                 private String scopeForDirectoryApi;
             }
         }
+
+        @Getter
+        @Setter
+        @ConfigurationProperties("notifications")
+        public static class NotificationsConfig {
+
+            @NotNull
+            private SlackConfig slack;
+
+            @Getter
+            @Setter
+            @ConfigurationProperties("slack")
+            public static class SlackConfig {
+                @NotBlank
+                private String webhookUrl;
+
+                @NotBlank
+                private String botToken;
+            }
+        }
     }
 }

server/src/main/java/com/objectcomputing/checkins/notifications/social_media/SlackPoster.java

@@ -1,5 +1,6 @@
 package com.objectcomputing.checkins.notifications.social_media;
 
+import com.objectcomputing.checkins.configuration.CheckInsConfiguration;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.HttpStatus;
@@ -16,9 +17,12 @@ public class SlackPoster {
     @Inject
     private HttpClient slackClient;
 
+    @Inject
+    private CheckInsConfiguration configuration;
+
     public HttpResponse post(String slackBlock) {
         // See if we can have a webhook URL.
-        String slackWebHook = System.getenv("SLACK_WEBHOOK_URL");
+        String slackWebHook = configuration.getApplication().getNotifications().getSlack().getWebhookUrl();
         if (slackWebHook != null) {
             // POST it to Slack.
             BlockingHttpClient client = slackClient.toBlocking();

server/src/main/java/com/objectcomputing/checkins/notifications/social_media/SlackSearch.java

@@ -1,5 +1,6 @@
 package com.objectcomputing.checkins.notifications.social_media;
 
+import com.objectcomputing.checkins.configuration.CheckInsConfiguration;
 import com.slack.api.model.block.LayoutBlock;
 import com.slack.api.Slack;
 import com.slack.api.methods.MethodsClient;
@@ -16,6 +17,7 @@
 import java.util.List;
 import java.io.IOException;
 
+import jnr.ffi.annotations.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,8 +26,11 @@ public class SlackSearch {
     private static final Logger LOG = LoggerFactory.getLogger(SlackSearch.class);
     private static final String env = "SLACK_BOT_TOKEN";
 
+    @Inject
+    private CheckInsConfiguration configuration;
+
     public String findChannelId(String channelName) {
-        String token = System.getenv(env);
+        String token = configuration.getApplication().getNotifications().getSlack().getBotToken();
         if (token != null) {
             try {
                 MethodsClient client = Slack.getInstance().methods(token);

server/src/main/resources/application.yml

@@ -97,6 +97,10 @@ check-ins:
     feedback:
       max-suggestions: 6
       request-subject: "Feedback request"
+    notifications:
+      slack:
+        webhook-url: ${ SLACK_WEBHOOK_URL }
+        bot-token: ${ SLACK_BOT_TOKEN }
   web-address: ${ WEB_ADDRESS }
 ---
 flyway:

server/src/test/resources/application-test.yml

@@ -41,6 +41,10 @@ check-ins:
   application:
     google-api:
       delegated-user: [email protected]
+    notifications:
+      slack:
+        webhook-url: https://bogus.objectcomputing.com/slack
+        bot-token: BOGUS_TOKEN
 ---
 aes:
   key: BOGUS_TEST_KEY