Add complete/fail to context

slackapi · Aug 20, 2024 · c9a204a · c9a204a
1 parent 0a077ce
commit c9a204a
Show file tree

Hide file tree

Showing 12 changed files with 199 additions and 45 deletions.
diff --git a/bolt/src/main/java/com/slack/api/bolt/context/Context.java b/bolt/src/main/java/com/slack/api/bolt/context/Context.java
@@ -69,6 +69,11 @@ public abstract class Context {
      */
     protected String functionBotAccessToken;
 
+    /**
+     * The ID of function_executed event delivery.
+     */
+    protected String functionExecutionId;
+
     /**
      * The scopes associated to the botToken
      */

diff --git a/bolt/src/main/java/com/slack/api/bolt/context/FunctionUtility.java b/bolt/src/main/java/com/slack/api/bolt/context/FunctionUtility.java
@@ -0,0 +1,35 @@
+package com.slack.api.bolt.context;
+
+import com.slack.api.methods.MethodsClient;
+import com.slack.api.methods.SlackApiException;
+import com.slack.api.methods.request.chat.ChatPostMessageRequest;
+import com.slack.api.methods.response.chat.ChatPostMessageResponse;
+import com.slack.api.methods.response.functions.FunctionsCompleteErrorResponse;
+import com.slack.api.methods.response.functions.FunctionsCompleteSuccessResponse;
+import com.slack.api.model.block.LayoutBlock;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+public interface FunctionUtility {
+
+    String getFunctionExecutionId();
+
+    MethodsClient client();
+
+    default FunctionsCompleteSuccessResponse complete(Map<String, ?> outputs) throws IOException, SlackApiException {
+        return this.client().functionsCompleteSuccess(r -> r
+                .functionExecutionId(this.getFunctionExecutionId())
+                .outputs(outputs)
+        );
+    }
+
+    default FunctionsCompleteErrorResponse fail(String error) throws IOException, SlackApiException {
+        return this.client().functionsCompleteError(r -> r
+                .functionExecutionId(this.getFunctionExecutionId())
+                .error(error)
+        );
+    }
+
+}
diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/ActionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/ActionContext.java
@@ -2,6 +2,7 @@
 
 import com.slack.api.bolt.context.ActionRespondUtility;
 import com.slack.api.bolt.context.Context;
+import com.slack.api.bolt.context.FunctionUtility;
 import com.slack.api.bolt.util.Responder;
 import lombok.*;
 
@@ -15,7 +16,7 @@
 @AllArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-public class ActionContext extends Context implements ActionRespondUtility {
+public class ActionContext extends Context implements ActionRespondUtility, FunctionUtility {
 
     private String triggerId;
     private String responseUrl;

diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/EventContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/EventContext.java
@@ -1,17 +1,24 @@
 package com.slack.api.bolt.context.builtin;
 
 import com.slack.api.bolt.context.Context;
+import com.slack.api.bolt.context.FunctionUtility;
 import com.slack.api.bolt.context.SayUtility;
+import com.slack.api.methods.SlackApiException;
+import com.slack.api.methods.response.functions.FunctionsCompleteErrorResponse;
+import com.slack.api.methods.response.functions.FunctionsCompleteSuccessResponse;
 import lombok.*;
 
+import java.io.IOException;
+import java.util.Map;
+
 @Getter
 @Setter
 @Builder
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
 @NoArgsConstructor
 @AllArgsConstructor
-public class EventContext extends Context implements SayUtility {
+public class EventContext extends Context implements SayUtility, FunctionUtility {
 
     private String channelId;
 
@@ -21,5 +28,4 @@ public class EventContext extends Context implements SayUtility {
     // X-Slack-Retry-Reason: http_error in HTTP Mode
     // "retry_reason": "timeout", in Socket Mode
     private String retryReason;
-
 }
diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/ViewSubmissionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/ViewSubmissionContext.java
@@ -4,6 +4,7 @@
 import com.slack.api.app_backend.views.payload.ViewSubmissionPayload;
 import com.slack.api.app_backend.views.response.ViewSubmissionResponse;
 import com.slack.api.bolt.context.Context;
+import com.slack.api.bolt.context.FunctionUtility;
 import com.slack.api.bolt.context.InputBlockRespondUtility;
 import com.slack.api.bolt.util.Responder;
 import com.slack.api.bolt.response.Response;
@@ -20,7 +21,7 @@
 @AllArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = false)
-public class ViewSubmissionContext extends Context implements InputBlockRespondUtility {
+public class ViewSubmissionContext extends Context implements InputBlockRespondUtility, FunctionUtility {
 
     private List<ViewSubmissionPayload.ResponseUrl> responseUrls;
     private Responder responder;

diff --git a/bolt/src/main/java/com/slack/api/bolt/request/builtin/BlockActionRequest.java b/bolt/src/main/java/com/slack/api/bolt/request/builtin/BlockActionRequest.java
@@ -42,6 +42,9 @@ public BlockActionRequest(
                 getContext().setTeamId(payload.getUser().getTeamId());
             }
             getContext().setRequestUserId(payload.getUser().getId());
+            if (payload.getFunctionData() != null) {
+                getContext().setFunctionExecutionId(payload.getFunctionData().getExecutionId());
+            }
         }
     }
 

diff --git a/bolt/src/main/java/com/slack/api/bolt/request/builtin/EventRequest.java b/bolt/src/main/java/com/slack/api/bolt/request/builtin/EventRequest.java
@@ -107,11 +107,15 @@ public EventRequest(
             this.getContext().setChannelId(event.get("channel_id").getAsString());
         }
 
-        if (this.eventType != null
-                && this.eventType.equals(FunctionExecutedEvent.TYPE_NAME)
-                && event.get("bot_access_token") != null) {
-            String functionBotAccessToken = event.get("bot_access_token").getAsString();
-            this.getContext().setFunctionBotAccessToken(functionBotAccessToken);
+        if (this.eventType != null && this.eventType.equals(FunctionExecutedEvent.TYPE_NAME)) {
+            if (event.get("bot_access_token") != null) {
+                String functionBotAccessToken = event.get("bot_access_token").getAsString();
+                this.getContext().setFunctionBotAccessToken(functionBotAccessToken);
+            }
+            if (event.get("function_execution_id") != null) {
+                String functionExecutionId = event.get("function_execution_id").getAsString();
+                this.getContext().setFunctionExecutionId(functionExecutionId);
+            }
         }
     }
 

diff --git a/bolt/src/main/java/com/slack/api/bolt/request/builtin/ViewClosedRequest.java b/bolt/src/main/java/com/slack/api/bolt/request/builtin/ViewClosedRequest.java
@@ -43,6 +43,9 @@ public ViewClosedRequest(
         }
         getContext().setRequestUserId(payload.getUser().getId());
         getContext().setFunctionBotAccessToken(payload.getBotAccessToken());
+        if (payload.getFunctionData() != null) {
+            getContext().setFunctionExecutionId(payload.getFunctionData().getExecutionId());
+        }
     }
 
     private DefaultContext context = new DefaultContext();

diff --git a/bolt/src/main/java/com/slack/api/bolt/request/builtin/ViewSubmissionRequest.java b/bolt/src/main/java/com/slack/api/bolt/request/builtin/ViewSubmissionRequest.java
@@ -44,6 +44,9 @@ public ViewSubmissionRequest(
         getContext().setRequestUserId(payload.getUser().getId());
         getContext().setResponseUrls(payload.getResponseUrls());
         getContext().setFunctionBotAccessToken(payload.getBotAccessToken());
+        if (payload.getFunctionData() != null) {
+            getContext().setFunctionExecutionId(payload.getFunctionData().getExecutionId());
+        }
     }
 
     private ViewSubmissionContext context = new ViewSubmissionContext();