Update Release branch

.github/workflows/gradle-build-production.yml

@@ -87,6 +87,7 @@ jobs:
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \
             --set-env-vars "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }}" \
             --set-env-vars "SLACK_BOT_TOKEN=${{ secrets.SLACK_BOT_TOKEN }}" \
+            --set-env-vars "SLACK_KUDOS_CHANNEL_ID=${{ secrets.SLACK_KUDOS_CHANNEL_ID }}" \
             --set-env-vars "SLACK_SIGNING_SECRET=${{ secrets.SLACK_PULSE_SIGNING_SECRET }}" \
             --platform "managed" \
             --max-instances 8 \

.github/workflows/gradle-deploy-develop.yml

@@ -113,6 +113,7 @@ jobs:
             --set-env-vars "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }}" \
             --set-env-vars "SLACK_BOT_TOKEN=${{ secrets.SLACK_BOT_TOKEN }}" \
             --set-env-vars "SLACK_SIGNING_SECRET=${{ secrets.SLACK_PULSE_SIGNING_SECRET }}" \
+            --set-env-vars "SLACK_KUDOS_CHANNEL_ID=${{ secrets.SLACK_KUDOS_CHANNEL_ID }}" \
             --platform "managed" \
             --max-instances 2 \
             --allow-unauthenticated

.github/workflows/gradle-deploy-native-develop.yml

@@ -111,6 +111,7 @@ jobs:
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=dev,cloud,google,gcp" \
             --set-env-vars "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }}" \
             --set-env-vars "SLACK_BOT_TOKEN=${{ secrets.SLACK_BOT_TOKEN }}" \
+            --set-env-vars "SLACK_KUDOS_CHANNEL_ID=${{ secrets.SLACK_KUDOS_CHANNEL_ID }}" \
             --set-env-vars "SLACK_SIGNING_SECRET=${{ secrets.SLACK_PULSE_SIGNING_SECRET }}" \
             --platform "managed" \
             --max-instances 2 \

docker-compose.yaml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   postgresql:
     image: postgres:17.2

docs/Gemfile.lock

@@ -220,6 +220,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
+    mini_portile2 (2.8.8)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
@@ -228,25 +229,26 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.18.3)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm-linux)
+    nokogiri (1.18.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.18.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86-linux)
+    nokogiri (1.18.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.18.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.18.3-x86_64-linux-gnu)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (5.0.4)
-    racc (1.7.3)
+    racc (1.8.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
@@ -275,7 +277,7 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (1.8.0)
-    uri (0.13.0)
+    uri (0.13.2)
     webrick (1.8.2)
 
 PLATFORMS

server/build.gradle

@@ -7,7 +7,7 @@ plugins {
     id "jacoco"
 }
 
-version "0.8.14"
+version "0.8.15"
 group "com.objectcomputing.checkins"
 
 repositories {

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

@@ -82,6 +82,9 @@ public static class SlackConfig {
 
             @NotBlank
             private String signingSecret;
+
+            @NotBlank
+            private String kudosChannel;
         }
     }
 }

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

@@ -0,0 +1,124 @@
+package com.objectcomputing.checkins.notifications.social_media;
+
+import com.objectcomputing.checkins.configuration.CheckInsConfiguration;
+
+import com.slack.api.Slack;
+import com.slack.api.methods.MethodsClient;
+import com.slack.api.methods.request.chat.ChatPostMessageRequest;
+import com.slack.api.methods.response.chat.ChatPostMessageResponse;
+import com.slack.api.methods.request.chat.ChatDeleteRequest;
+import com.slack.api.methods.response.chat.ChatDeleteResponse;
+import com.slack.api.methods.request.conversations.ConversationsOpenRequest;
+import com.slack.api.methods.response.conversations.ConversationsOpenResponse;
+
+import jakarta.inject.Singleton;
+import jakarta.inject.Inject;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+@Singleton
+public class SlackSender {
+    private static final Logger LOG = LoggerFactory.getLogger(SlackSender.class);
+
+    @Inject
+    private CheckInsConfiguration configuration;
+
+    public boolean send(List<String> userIds, String slackBlocks) {
+        // See if we have a token.
+        String token = configuration.getApplication()
+                                    .getSlack().getBotToken();
+        if (token != null && !slackBlocks.isEmpty()) {
+            MethodsClient client = Slack.getInstance().methods(token);
+
+            try {
+                ConversationsOpenResponse openResponse =
+                    client.conversationsOpen(ConversationsOpenRequest.builder()
+                        .users(userIds)
+                        .returnIm(true)
+                        .build());
+                if (!openResponse.isOk()) {
+                    LOG.error("Unable to open the conversation");
+                    return false;
+                }
+
+                return send(openResponse.getChannel().getId(), slackBlocks);
+            } catch(Exception ex) {
+                LOG.error("SlackSender.send: " + ex.toString());
+                return false;
+            }
+        } else {
+            LOG.error("Missing token or missing slack blocks");
+            return false;
+        }
+    }
+
+    public boolean send(String channelId, String slackBlocks) {
+        // See if we have a token.
+        String token = configuration.getApplication()
+                                    .getSlack().getBotToken();
+        if (token != null && !slackBlocks.isEmpty()) {
+            MethodsClient client = Slack.getInstance().methods(token);
+
+            try {
+                ChatPostMessageRequest request = ChatPostMessageRequest
+                    .builder()
+                    .channel(channelId)
+                    .blocksAsString(slackBlocks)
+                    .build();
+
+                // Send it to Slack
+                ChatPostMessageResponse response = client.chatPostMessage(request);
+
+                if (!response.isOk()) {
+                    LOG.error("Unable to send the chat message: " +
+                              response.getError());
+                }
+
+                return response.isOk();
+            } catch(Exception ex) {
+                LOG.error("SlackSender.send: " + ex.toString());
+                return false;
+            }
+        } else {
+            LOG.error("Missing token or missing slack blocks");
+            return false;
+        }
+    }
+
+    public boolean delete(String channel, String ts) {
+        // See if we have a token.
+        String token = configuration.getApplication()
+                                    .getSlack().getBotToken();
+        if (token != null) {
+            MethodsClient client = Slack.getInstance().methods(token);
+
+            try {
+                ChatDeleteRequest request = ChatDeleteRequest
+                        .builder()
+                        .channel(channel)
+                        .ts(ts)
+                        .build();
+
+                // Send it to Slack
+                ChatDeleteResponse response = client.chatDelete(request);
+
+                if (!response.isOk()) {
+                    LOG.error("Unable to delete the chat message: " +
+                              response.getError());
+                }
+
+                return response.isOk();
+            } catch(Exception ex) {
+                LOG.error("SlackSender.delete: " + ex.toString());
+                return false;
+            }
+        } else {
+            LOG.error("Missing token or missing slack blocks");
+            return false;
+        }
+    }
+}
+

server/src/main/java/com/objectcomputing/checkins/services/kudos/KudosController.java

@@ -39,6 +39,11 @@ public Kudos create(@Body @Valid KudosCreateDTO kudos) {
     }
 
     @Put
+    public Kudos update(@Body @Valid KudosUpdateDTO kudos) {
+        return kudosServices.update(kudos);
+    }
+
+    @Put("/approve")
     public Kudos approve(@Body @Valid Kudos kudos) {
         return kudosServices.approve(kudos);
     }

server/src/main/java/com/objectcomputing/checkins/services/kudos/KudosConverter.java

@@ -1,6 +1,6 @@
 package com.objectcomputing.checkins.services.kudos;
 
-import com.objectcomputing.checkins.notifications.social_media.SlackSearch;
+import com.objectcomputing.checkins.services.slack.SlackSearch;
 import com.objectcomputing.checkins.services.kudos.kudos_recipient.KudosRecipientServices;
 import com.objectcomputing.checkins.services.kudos.kudos_recipient.KudosRecipient;
 import com.objectcomputing.checkins.services.memberprofile.MemberProfileServices;
@@ -22,10 +22,6 @@
 
 @Singleton
 public class KudosConverter {
-    private record InternalBlock(
-      List<LayoutBlock> blocks
-    ) {}
-
     private final MemberProfileServices memberProfileServices;
     private final KudosRecipientServices kudosRecipientServices;
     private final SlackSearch slackSearch;
@@ -61,9 +57,8 @@ public String toSlackBlock(Kudos kudos) {
             .elements(content).build();
         RichTextBlock richTextBlock = RichTextBlock.builder()
             .elements(List.of(element)).build();
-        InternalBlock block = new InternalBlock(List.of(richTextBlock));
         Gson mapper = GsonFactory.createSnakeCase();
-        return mapper.toJson(block);
+        return mapper.toJson(List.of(richTextBlock));
     }
 
     private RichTextSectionElement.TextStyle boldItalic() {

server/src/main/java/com/objectcomputing/checkins/services/kudos/KudosServices.java

@@ -9,8 +9,12 @@ public interface KudosServices {
 
     Kudos save(KudosCreateDTO kudos);
 
+    Kudos update(KudosUpdateDTO kudos);
+
     Kudos approve(Kudos kudos);
 
+    Kudos savePreapproved(KudosCreateDTO kudos);
+
     List<KudosResponseDTO> getRecent();
 
     KudosResponseDTO getById(UUID id);