feat(integrations): align slack parity
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
package v1
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"github.com/gochat/gochat/internal/model"
|
||||
"github.com/gochat/gochat/internal/service"
|
||||
"github.com/gochat/gochat/pkg/response"
|
||||
)
|
||||
@@ -30,7 +32,7 @@ func (h *SlackIntegrationHandler) Create(c *gin.Context) {
|
||||
}
|
||||
|
||||
var req service.CreateSlackRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
if err := c.ShouldBind(&req); err != nil {
|
||||
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
@@ -40,7 +42,7 @@ func (h *SlackIntegrationHandler) Create(c *gin.Context) {
|
||||
handleServiceError(c, svcErr)
|
||||
return
|
||||
}
|
||||
response.OK(c, hook)
|
||||
c.JSON(http.StatusOK, h.slackAppPayload(c, accountID, []model.IntegrationHook{*hook}))
|
||||
}
|
||||
|
||||
// Update updates a Slack integration for an account.
|
||||
@@ -53,17 +55,21 @@ func (h *SlackIntegrationHandler) Update(c *gin.Context) {
|
||||
}
|
||||
|
||||
var req service.UpdateSlackRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
if err := c.ShouldBind(&req); err != nil {
|
||||
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
hook, svcErr := h.svc.Update(c.Request.Context(), accountID, req)
|
||||
if svcErr != nil {
|
||||
if errors.Is(svcErr, service.ErrSlackInvalidChannel) {
|
||||
c.JSON(http.StatusUnprocessableEntity, gin.H{"error": "Invalid slack channel. Please try again"})
|
||||
return
|
||||
}
|
||||
handleServiceError(c, svcErr)
|
||||
return
|
||||
}
|
||||
response.OK(c, hook)
|
||||
c.JSON(http.StatusOK, h.slackAppPayload(c, accountID, []model.IntegrationHook{*hook}))
|
||||
}
|
||||
|
||||
// Delete removes a Slack integration for an account.
|
||||
@@ -79,7 +85,7 @@ func (h *SlackIntegrationHandler) Delete(c *gin.Context) {
|
||||
handleServiceError(c, svcErr)
|
||||
return
|
||||
}
|
||||
response.OK(c, gin.H{"message": "Slack integration deleted"})
|
||||
c.Status(http.StatusOK)
|
||||
}
|
||||
|
||||
// ListAllChannels lists available Slack channels.
|
||||
@@ -96,16 +102,45 @@ func (h *SlackIntegrationHandler) ListAllChannels(c *gin.Context) {
|
||||
handleServiceError(c, svcErr)
|
||||
return
|
||||
}
|
||||
response.OK(c, channels)
|
||||
c.JSON(http.StatusOK, channels)
|
||||
}
|
||||
|
||||
// RegisterSlackIntegrationRoutes registers Slack integration routes.
|
||||
func RegisterSlackIntegrationRoutes(g *gin.RouterGroup, h *SlackIntegrationHandler) {
|
||||
g.POST("/slack", h.Create)
|
||||
g.PATCH("/slack", h.Update)
|
||||
g.PUT("/slack", h.Update)
|
||||
g.DELETE("/slack", h.Delete)
|
||||
|
||||
slack := g.Group("/slack")
|
||||
{
|
||||
slack.POST("/", h.Create)
|
||||
slack.PATCH("/", h.Update)
|
||||
slack.PUT("/", h.Update)
|
||||
slack.DELETE("/", h.Delete)
|
||||
slack.GET("/list_all_channels", h.ListAllChannels)
|
||||
}
|
||||
}
|
||||
|
||||
func (h *SlackIntegrationHandler) slackAppPayload(c *gin.Context, accountID uint, fallback []model.IntegrationHook) gin.H {
|
||||
hooks, err := h.svc.ListHooks(c.Request.Context(), accountID)
|
||||
if err != nil || len(hooks) == 0 {
|
||||
hooks = fallback
|
||||
}
|
||||
serializedHooks := make([]gin.H, 0, len(hooks))
|
||||
for _, hook := range hooks {
|
||||
serializedHooks = append(serializedHooks, serializeIntegrationHook(hook))
|
||||
}
|
||||
return gin.H{
|
||||
"id": "slack",
|
||||
"name": "Slack",
|
||||
"description": "Connect Slack channels for real-time notifications",
|
||||
"short_description": "Connect Slack channels for real-time notifications",
|
||||
"enabled": len(serializedHooks) > 0,
|
||||
"hooks": serializedHooks,
|
||||
"hook_type": integrationAppHookType("slack"),
|
||||
"allow_multiple_hooks": integrationAppAllowsMultipleHooks("slack"),
|
||||
"settings_form_schema": integrationAppSettingsFormSchema("slack"),
|
||||
"visible_properties": integrationAppVisibleProperties("slack"),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user