Add interactif slack message
Signed-off-by: Sacha Al Himdani <sacha@getprobo.com>
This commit is contained in:
@@ -62,4 +62,5 @@ const (
|
||||
InvitationEntityType
|
||||
MembershipEntityType
|
||||
SlackMessageEntityType
|
||||
SlackMessageUpdateEntityType
|
||||
)
|
||||
|
||||
21
pkg/coredata/migrations/20251020T163914Z.sql
Normal file
21
pkg/coredata/migrations/20251020T163914Z.sql
Normal file
@@ -0,0 +1,21 @@
|
||||
CREATE TYPE slack_message_type AS ENUM ('TRUST_CENTER_ACCESS_REQUEST', 'WELCOME');
|
||||
|
||||
ALTER TABLE slack_messages ALTER COLUMN body TYPE JSONB USING body::jsonb;
|
||||
ALTER TABLE slack_messages ADD COLUMN message_ts TEXT;
|
||||
ALTER TABLE slack_messages ADD COLUMN channel_id TEXT;
|
||||
ALTER TABLE slack_messages ADD COLUMN requester_email TEXT;
|
||||
ALTER TABLE slack_messages ADD COLUMN type slack_message_type NOT NULL;
|
||||
|
||||
ALTER TABLE slack_messages ADD CONSTRAINT unique_slack_message_org_ts_channel UNIQUE (organization_id, message_ts, channel_id);
|
||||
|
||||
CREATE TABLE slack_message_updates (
|
||||
id TEXT PRIMARY KEY,
|
||||
tenant_id TEXT NOT NULL,
|
||||
slack_message_id TEXT NOT NULL,
|
||||
body JSONB NOT NULL,
|
||||
created_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
updated_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
sent_at TIMESTAMP WITH TIME ZONE,
|
||||
error TEXT,
|
||||
CONSTRAINT fk_slack_message_updates_slack_message_id FOREIGN KEY (slack_message_id) REFERENCES slack_messages(id) ON UPDATE CASCADE ON DELETE CASCADE
|
||||
);
|
||||
@@ -18,6 +18,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"time"
|
||||
|
||||
"github.com/getprobo/probo/pkg/gid"
|
||||
@@ -27,13 +28,17 @@ import (
|
||||
|
||||
type (
|
||||
SlackMessage struct {
|
||||
ID gid.GID `db:"id"`
|
||||
OrganizationID gid.GID `db:"organization_id"`
|
||||
Body string `db:"body"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at"`
|
||||
SentAt *time.Time `db:"sent_at"`
|
||||
Error *string `db:"error"`
|
||||
ID gid.GID `db:"id"`
|
||||
OrganizationID gid.GID `db:"organization_id"`
|
||||
Type SlackMessageType `db:"type"`
|
||||
Body map[string]any `db:"body"`
|
||||
MessageTS *string `db:"message_ts"`
|
||||
ChannelID *string `db:"channel_id"`
|
||||
RequesterEmail *string `db:"requester_email"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at"`
|
||||
SentAt *time.Time `db:"sent_at"`
|
||||
Error *string `db:"error"`
|
||||
}
|
||||
|
||||
ErrNoUnsentSlackMessage struct{}
|
||||
@@ -46,13 +51,17 @@ func (e ErrNoUnsentSlackMessage) Error() string {
|
||||
func NewSlackMessage(
|
||||
scope Scoper,
|
||||
organizationID gid.GID,
|
||||
body string,
|
||||
messageType SlackMessageType,
|
||||
body map[string]any,
|
||||
requesterEmail *string,
|
||||
) *SlackMessage {
|
||||
now := time.Now()
|
||||
return &SlackMessage{
|
||||
ID: gid.New(scope.GetTenantID(), SlackMessageEntityType),
|
||||
OrganizationID: organizationID,
|
||||
Type: messageType,
|
||||
Body: body,
|
||||
RequesterEmail: requesterEmail,
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
}
|
||||
@@ -64,15 +73,17 @@ func (s *SlackMessage) Insert(
|
||||
scope Scoper,
|
||||
) error {
|
||||
q := `
|
||||
INSERT INTO slack_messages (id, tenant_id, organization_id, body, created_at, updated_at)
|
||||
VALUES (@id, @tenant_id, @organization_id, @body, @created_at, @updated_at)
|
||||
INSERT INTO slack_messages (id, tenant_id, organization_id, type, body, requester_email, created_at, updated_at)
|
||||
VALUES (@id, @tenant_id, @organization_id, @type, @body, @requester_email, @created_at, @updated_at)
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": s.ID,
|
||||
"tenant_id": scope.GetTenantID(),
|
||||
"organization_id": s.OrganizationID,
|
||||
"type": s.Type,
|
||||
"body": s.Body,
|
||||
"requester_email": s.RequesterEmail,
|
||||
"created_at": s.CreatedAt,
|
||||
"updated_at": s.UpdatedAt,
|
||||
}
|
||||
@@ -90,7 +101,7 @@ func (s *SlackMessage) LoadNextUnsentForUpdate(
|
||||
conn pg.Conn,
|
||||
) error {
|
||||
q := `
|
||||
SELECT id, organization_id, body, created_at, updated_at, sent_at, error
|
||||
SELECT id, organization_id, type, body, message_ts, channel_id, requester_email, created_at, updated_at, sent_at, error
|
||||
FROM slack_messages
|
||||
WHERE sent_at IS NULL AND error IS NULL
|
||||
ORDER BY created_at ASC
|
||||
@@ -117,21 +128,61 @@ FOR UPDATE
|
||||
return nil
|
||||
}
|
||||
|
||||
// This is used for Slack webhook verification where we don't know the tenant yet
|
||||
func (s *SlackMessage) LoadByChannelAndTSUnscoped(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
channelID string,
|
||||
messageTS string,
|
||||
) error {
|
||||
q := `
|
||||
SELECT id, organization_id, type, body, message_ts, channel_id, requester_email, created_at, updated_at, sent_at, error
|
||||
FROM slack_messages
|
||||
WHERE message_ts = @message_ts AND channel_id = @channel_id
|
||||
LIMIT 1
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"message_ts": messageTS,
|
||||
"channel_id": channelID,
|
||||
}
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query slack message: %w", err)
|
||||
}
|
||||
|
||||
message, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[SlackMessage])
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return fmt.Errorf("slack message not found")
|
||||
}
|
||||
return fmt.Errorf("cannot collect slack message: %w", err)
|
||||
}
|
||||
|
||||
*s = message
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SlackMessage) Update(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
) error {
|
||||
q := `
|
||||
UPDATE slack_messages
|
||||
SET sent_at = @sent_at, updated_at = @updated_at, error = @error
|
||||
SET body = @body, sent_at = @sent_at, updated_at = @updated_at, error = @error, message_ts = @message_ts, channel_id = @channel_id
|
||||
WHERE id = @id
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": s.ID,
|
||||
"body": s.Body,
|
||||
"sent_at": s.SentAt,
|
||||
"updated_at": s.UpdatedAt,
|
||||
"error": s.Error,
|
||||
"message_ts": s.MessageTS,
|
||||
"channel_id": s.ChannelID,
|
||||
}
|
||||
|
||||
_, err := conn.Exec(ctx, q, args)
|
||||
@@ -141,3 +192,86 @@ WHERE id = @id
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SlackMessage) LoadById(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
scope Scoper,
|
||||
slackMessageID gid.GID,
|
||||
) error {
|
||||
q := `
|
||||
SELECT id, organization_id, type, body, message_ts, channel_id, requester_email, created_at, updated_at, sent_at, error
|
||||
FROM slack_messages
|
||||
WHERE id = @id
|
||||
AND %s
|
||||
LIMIT 1
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": slackMessageID,
|
||||
}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query slack message: %w", err)
|
||||
}
|
||||
|
||||
message, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[SlackMessage])
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return fmt.Errorf("slack message not found")
|
||||
}
|
||||
return fmt.Errorf("cannot collect slack message: %w", err)
|
||||
}
|
||||
|
||||
*s = message
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SlackMessage) LoadLatestByRequesterEmailAndType(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
scope Scoper,
|
||||
organizationID gid.GID,
|
||||
requesterEmail string,
|
||||
messageType SlackMessageType,
|
||||
since time.Time,
|
||||
) error {
|
||||
q := `
|
||||
SELECT id, organization_id, type, body, message_ts, channel_id, requester_email, created_at, updated_at, sent_at, error
|
||||
FROM slack_messages
|
||||
WHERE %s
|
||||
AND organization_id = @organization_id
|
||||
AND requester_email = @requester_email
|
||||
AND type = @type
|
||||
AND created_at >= @since
|
||||
ORDER BY created_at DESC
|
||||
LIMIT 1
|
||||
`
|
||||
|
||||
q = fmt.Sprintf(q, scope.SQLFragment())
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"organization_id": organizationID,
|
||||
"requester_email": requesterEmail,
|
||||
"type": messageType,
|
||||
"since": since,
|
||||
}
|
||||
maps.Copy(args, scope.SQLArguments())
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query slack message: %w", err)
|
||||
}
|
||||
|
||||
message, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[SlackMessage])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
*s = message
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
57
pkg/coredata/slack_message_type.go
Normal file
57
pkg/coredata/slack_message_type.go
Normal file
@@ -0,0 +1,57 @@
|
||||
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
// PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package coredata
|
||||
|
||||
import (
|
||||
"database/sql/driver"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
type SlackMessageType string
|
||||
|
||||
const (
|
||||
SlackMessageTypeTrustCenterAccessRequest SlackMessageType = "TRUST_CENTER_ACCESS_REQUEST"
|
||||
SlackMessageTypeWelcome SlackMessageType = "WELCOME"
|
||||
)
|
||||
|
||||
func (smt SlackMessageType) String() string {
|
||||
return string(smt)
|
||||
}
|
||||
|
||||
func (smt *SlackMessageType) Scan(value any) error {
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("unsupported type for SlackMessageType: %T", value)
|
||||
}
|
||||
|
||||
switch s {
|
||||
case "TRUST_CENTER_ACCESS_REQUEST":
|
||||
*smt = SlackMessageTypeTrustCenterAccessRequest
|
||||
case "WELCOME":
|
||||
*smt = SlackMessageTypeWelcome
|
||||
default:
|
||||
return fmt.Errorf("invalid SlackMessageType value: %q", s)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (smt SlackMessageType) Value() (driver.Value, error) {
|
||||
return smt.String(), nil
|
||||
}
|
||||
182
pkg/coredata/slack_message_update.go
Normal file
182
pkg/coredata/slack_message_update.go
Normal file
@@ -0,0 +1,182 @@
|
||||
// Copyright (c) 2025 Probo Inc <hello@getprobo.com>.
|
||||
//
|
||||
// Permission to use, copy, modify, and/or distribute this software for any
|
||||
// purpose with or without fee is hereby granted, provided that the above
|
||||
// copyright notice and this permission notice appear in all copies.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
|
||||
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||
// PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
package coredata
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/getprobo/probo/pkg/gid"
|
||||
"github.com/jackc/pgx/v5"
|
||||
"go.gearno.de/kit/pg"
|
||||
)
|
||||
|
||||
type (
|
||||
SlackMessageUpdate struct {
|
||||
ID gid.GID `db:"id"`
|
||||
SlackMessageID gid.GID `db:"slack_message_id"`
|
||||
Body map[string]any `db:"body"`
|
||||
CreatedAt time.Time `db:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at"`
|
||||
SentAt *time.Time `db:"sent_at"`
|
||||
Error *string `db:"error"`
|
||||
}
|
||||
|
||||
ErrNoUnsentSlackMessageUpdate struct{}
|
||||
)
|
||||
|
||||
func (e ErrNoUnsentSlackMessageUpdate) Error() string {
|
||||
return "no unsent slack message update found"
|
||||
}
|
||||
|
||||
func NewSlackMessageUpdate(
|
||||
scope Scoper,
|
||||
slackMessageID gid.GID,
|
||||
body map[string]any,
|
||||
) *SlackMessageUpdate {
|
||||
now := time.Now()
|
||||
return &SlackMessageUpdate{
|
||||
ID: gid.New(scope.GetTenantID(), SlackMessageUpdateEntityType),
|
||||
SlackMessageID: slackMessageID,
|
||||
Body: body,
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
}
|
||||
}
|
||||
|
||||
func (s *SlackMessageUpdate) Insert(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
scope Scoper,
|
||||
) error {
|
||||
q := `
|
||||
INSERT INTO slack_message_updates (id, tenant_id, slack_message_id, body, created_at, updated_at, sent_at, error)
|
||||
VALUES (@id, @tenant_id, @slack_message_id, @body, @created_at, @updated_at, @sent_at, @error)
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": s.ID,
|
||||
"tenant_id": scope.GetTenantID(),
|
||||
"slack_message_id": s.SlackMessageID,
|
||||
"body": s.Body,
|
||||
"created_at": s.CreatedAt,
|
||||
"updated_at": s.UpdatedAt,
|
||||
"sent_at": s.SentAt,
|
||||
"error": s.Error,
|
||||
}
|
||||
|
||||
_, err := conn.Exec(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot insert slack message update: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SlackMessageUpdate) LoadLatestBySlackMessageID(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
slackMessageID gid.GID,
|
||||
) error {
|
||||
q := `
|
||||
SELECT id, slack_message_id, body, created_at, updated_at, sent_at, error
|
||||
FROM slack_message_updates
|
||||
WHERE slack_message_id = @slack_message_id
|
||||
ORDER BY created_at DESC
|
||||
LIMIT 1
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"slack_message_id": slackMessageID,
|
||||
}
|
||||
|
||||
rows, err := conn.Query(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query slack message updates: %w", err)
|
||||
}
|
||||
|
||||
update, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[SlackMessageUpdate])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
*s = update
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SlackMessageUpdate) LoadNextUnsentForUpdate(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
) error {
|
||||
q := `
|
||||
SELECT smu.id, smu.slack_message_id, smu.body, smu.created_at, smu.updated_at, smu.sent_at, smu.error
|
||||
FROM slack_message_updates smu
|
||||
INNER JOIN slack_messages sm ON smu.slack_message_id = sm.id
|
||||
WHERE smu.sent_at IS NULL
|
||||
AND smu.error IS NULL
|
||||
AND sm.sent_at IS NOT NULL
|
||||
AND sm.error IS NULL
|
||||
ORDER BY smu.created_at ASC
|
||||
LIMIT 1
|
||||
FOR UPDATE OF smu
|
||||
`
|
||||
|
||||
rows, err := conn.Query(ctx, q)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot query slack message updates: %w", err)
|
||||
}
|
||||
|
||||
update, err := pgx.CollectExactlyOneRow(rows, pgx.RowToStructByName[SlackMessageUpdate])
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return ErrNoUnsentSlackMessageUpdate{}
|
||||
}
|
||||
|
||||
return fmt.Errorf("cannot collect slack message update: %w", err)
|
||||
}
|
||||
|
||||
*s = update
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *SlackMessageUpdate) Update(
|
||||
ctx context.Context,
|
||||
conn pg.Conn,
|
||||
) error {
|
||||
q := `
|
||||
UPDATE slack_message_updates
|
||||
SET body = @body, updated_at = @updated_at, sent_at = @sent_at, error = @error
|
||||
WHERE id = @id
|
||||
`
|
||||
|
||||
args := pgx.StrictNamedArgs{
|
||||
"id": s.ID,
|
||||
"body": s.Body,
|
||||
"updated_at": s.UpdatedAt,
|
||||
"sent_at": s.SentAt,
|
||||
"error": s.Error,
|
||||
}
|
||||
|
||||
_, err := conn.Exec(ctx, q, args)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot update slack message update: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user