From caddf988c061082958a89a7c5ec1ad4b33f5ab54 Mon Sep 17 00:00:00 2001 From: Vaibhav-a Mankar Date: Thu, 24 Aug 2023 16:36:13 +0530 Subject: [PATCH] Team error resource response --- .../TeamsErrorResourceResponse.java | 18 ++++++++++++++++++ .../teams/handlers/TeamsResponseHandler.java | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/conversations/TeamsErrorResourceResponse.java diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/conversations/TeamsErrorResourceResponse.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/conversations/TeamsErrorResourceResponse.java new file mode 100644 index 00000000..0e895b78 --- /dev/null +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/conversations/TeamsErrorResourceResponse.java @@ -0,0 +1,18 @@ +package org.finos.springbot.teams.conversations; + +import com.microsoft.bot.schema.ResourceResponse; + +public class TeamsErrorResourceResponse extends ResourceResponse { + + Throwable e; + + public TeamsErrorResourceResponse(String id, Throwable e ) { + super(id); + this.e = e; + } + + public Throwable getThrowable() { + return e; + } +} + diff --git a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/TeamsResponseHandler.java b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/TeamsResponseHandler.java index 838397bd..01f7d04b 100644 --- a/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/TeamsResponseHandler.java +++ b/libs/teams/teams-chat-workflow-spring-boot-starter/src/main/java/org/finos/springbot/teams/handlers/TeamsResponseHandler.java @@ -9,6 +9,7 @@ import org.finos.springbot.teams.TeamsException; import org.finos.springbot.teams.content.TeamsAddressable; +import org.finos.springbot.teams.conversations.TeamsErrorResourceResponse; import org.finos.springbot.teams.history.StorageIDResponseHandler; import org.finos.springbot.teams.history.TeamsHistory; import org.finos.springbot.teams.response.templating.EntityMarkupTemplateProvider; @@ -194,7 +195,7 @@ private BiFunction handle } catch (JsonProcessingException e1) { } } else { - LOG.error("message:\n"+out); + LOG.error("message:\n"+out); } if(!(t instanceof ErrorResponse)) { @@ -204,6 +205,7 @@ private BiFunction handle initErrorHandler(); eh.handleError(e); Action.CURRENT_ACTION.set(Action.NULL_ACTION); + rr = new TeamsErrorResourceResponse(address.getKey(), e); } else if(rr != null) { performStorage(address, data, teamsState); }