From 7db9914bc4e7f4f7505f42e39ec0edf29557040a Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 22:22:46 +0000 Subject: [PATCH] tsk-29: Change type of Response from MessageEventResponse (#35) Closes #29 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/35 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- tx0/message/event/response.go | 18 ++++++++---------- tx0/types/jsonb.go | 1 + 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index cd85e9f..da7a361 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -25,7 +25,7 @@ jobs: run: | echo "Creating version" - VERSION="0.1.1" + VERSION="0.1.3" PROJECT_COMMIT_HASH=$(git rev-parse HEAD | cut -c 1-10) BRANCH_REF="${{ gitea.ref }}" BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3) diff --git a/tx0/message/event/response.go b/tx0/message/event/response.go index 8b44d79..720dd6b 100644 --- a/tx0/message/event/response.go +++ b/tx0/message/event/response.go @@ -4,17 +4,15 @@ import ( "time" "github.com/google/uuid" - - "git.kundeng.us/phoenix/textsender-models/tx0/types" ) type MessageEventResponse struct { - Id uuid.UUID `json:"id,omitempty"` - ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id,omitempty"` - Response types.JSONB `json:"response"` - UserId uuid.UUID `json:"user_id,omitempty"` - ContactId *uuid.UUID `json:"contact_id,omitempty"` - MessageId *uuid.UUID `json:"message_id,omitempty"` - Status string `json:"status"` - Sent time.Time `json:"sent"` + Id uuid.UUID `json:"id,omitempty"` + ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id,omitempty"` + Response map[string]any `json:"response"` + UserId uuid.UUID `json:"user_id,omitempty"` + ContactId *uuid.UUID `json:"contact_id,omitempty"` + MessageId *uuid.UUID `json:"message_id,omitempty"` + Status string `json:"status"` + Sent time.Time `json:"sent"` } diff --git a/tx0/types/jsonb.go b/tx0/types/jsonb.go index 9bacec6..d8dffbf 100644 --- a/tx0/types/jsonb.go +++ b/tx0/types/jsonb.go @@ -6,6 +6,7 @@ import ( "fmt" ) +// NOTE: Might end up removing this type JSONB json.RawMessage // Scan implements sql.Scanner