From e8949259969c16ed8ee7b2d07727d6023fa0083a Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 21:52:47 +0000 Subject: [PATCH 1/7] tsk-23: Message enhancements (#31) Closes #23 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/31 Co-authored-by: phoenix Co-committed-by: phoenix --- tx0/message/message.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tx0/message/message.go b/tx0/message/message.go index e4f5276..71fe125 100644 --- a/tx0/message/message.go +++ b/tx0/message/message.go @@ -5,7 +5,7 @@ import ( ) type Message struct { - Id uuid.UUID `json:"id"` - Content string `json:"content,omitempty"` - UserId uuid.UUID `json:"user_id"` + Id *uuid.UUID `json:"id,omitempty"` + Content string `json:"content"` + UserId *uuid.UUID `json:"user_id,omitempty"` } From 44848fdffdfdb3711f4e96304a0e5555d46f11df Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 22:07:06 +0000 Subject: [PATCH 2/7] tsk-25: Change time references (#32) Closes #25 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/32 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- tx0/user/service_user.go | 5 +++-- tx0/user/user.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index b63e689..cd85e9f 100644 --- a/.gitea/workflows/tag_release.yaml +++ b/.gitea/workflows/tag_release.yaml @@ -25,7 +25,7 @@ jobs: run: | echo "Creating version" - VERSION="0.0.14" + VERSION="0.1.1" 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/user/service_user.go b/tx0/user/service_user.go index 22762d5..0c9fece 100644 --- a/tx0/user/service_user.go +++ b/tx0/user/service_user.go @@ -7,8 +7,9 @@ import ( ) type ServiceUser struct { - Id uuid.UUID `json:"id"` + Id uuid.UUID `json:"id"` + // TODO: Remove the omitempty tags at a later point Username string `json:"username,omitempty"` Passphrase string `json:"passphrase,omitempty"` - Created time.Time `json:"date_created"` + Created time.Time `json:"created"` } diff --git a/tx0/user/user.go b/tx0/user/user.go index ab6f8af..4e967d5 100644 --- a/tx0/user/user.go +++ b/tx0/user/user.go @@ -13,6 +13,6 @@ type User struct { Password string `json:"password"` Firstname *string `json:"first_name,omitempty"` Lastname *string `json:"last_name,omitempty"` - Created time.Time `json:"date_created"` + Created time.Time `json:"created"` LastLogin *time.Time `json:"last_login,omitempty"` } From 564a3936e3398078273e8454f59871e6de34d0de Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 22:15:32 +0000 Subject: [PATCH 3/7] tsk-26: Put MessageEventResponse statuses in their own file (#34) Closes #26 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/34 Co-authored-by: phoenix Co-committed-by: phoenix --- .../{message_event_response.go => event/response.go} | 7 +------ tx0/message/event/status.go | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) rename tx0/message/{message_event_response.go => event/response.go} (82%) create mode 100644 tx0/message/event/status.go diff --git a/tx0/message/message_event_response.go b/tx0/message/event/response.go similarity index 82% rename from tx0/message/message_event_response.go rename to tx0/message/event/response.go index f47d461..8b44d79 100644 --- a/tx0/message/message_event_response.go +++ b/tx0/message/event/response.go @@ -1,4 +1,4 @@ -package message +package event import ( "time" @@ -18,8 +18,3 @@ type MessageEventResponse struct { Status string `json:"status"` Sent time.Time `json:"sent"` } - -const ( - Message_Event_Response_Status_Instant = "INSTANT" - Message_Event_Response_Status_Scheduled = "SCHEDULED" -) diff --git a/tx0/message/event/status.go b/tx0/message/event/status.go new file mode 100644 index 0000000..f979152 --- /dev/null +++ b/tx0/message/event/status.go @@ -0,0 +1,6 @@ +package event + +const ( + Message_Event_Response_Status_Instant = "INSTANT" + Message_Event_Response_Status_Scheduled = "SCHEDULED" +) From 7db9914bc4e7f4f7505f42e39ec0edf29557040a Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 22:22:46 +0000 Subject: [PATCH 4/7] 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 From 7c21f243edb8da5aadeb828a4fb97da723f028a1 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 22:27:57 +0000 Subject: [PATCH 5/7] tsk-33: Put TwilioConfig in its own package (#36) Closes #33 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/36 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- tx0/config/{ => auxiliary}/twilio_config.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tx0/config/{ => auxiliary}/twilio_config.go (96%) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index da7a361..e1553fd 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.3" + VERSION="0.1.4" 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/config/twilio_config.go b/tx0/config/auxiliary/twilio_config.go similarity index 96% rename from tx0/config/twilio_config.go rename to tx0/config/auxiliary/twilio_config.go index a597546..f03332c 100644 --- a/tx0/config/twilio_config.go +++ b/tx0/config/auxiliary/twilio_config.go @@ -1,4 +1,4 @@ -package config +package auxiliary import ( "fmt" From 6f9e112b72c6af52c3dd2712ce6a415f35e8a816 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 22:38:39 +0000 Subject: [PATCH 6/7] tsk-37: Add last login to service user (#38) Closes #37 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/38 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- tx0/user/service_user.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index e1553fd..5fbd045 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.4" + VERSION="0.1.5" 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/user/service_user.go b/tx0/user/service_user.go index 0c9fece..c613a7c 100644 --- a/tx0/user/service_user.go +++ b/tx0/user/service_user.go @@ -9,7 +9,8 @@ import ( type ServiceUser struct { Id uuid.UUID `json:"id"` // TODO: Remove the omitempty tags at a later point - Username string `json:"username,omitempty"` - Passphrase string `json:"passphrase,omitempty"` - Created time.Time `json:"created"` + Username string `json:"username,omitempty"` + Passphrase string `json:"passphrase,omitempty"` + Created time.Time `json:"created"` + LastLogin *time.Time `json:"last_login,omitempty"` } From f4e2336771d9b2a5624ab8d106a748d8e2c7cbf0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 31 Dec 2025 23:24:02 +0000 Subject: [PATCH 7/7] tsk-39: Rename RecipientId in scheduling.ScheduledMessageEvent (#40) Closes #39 Reviewed-on: https://git.kundeng.us/phoenix/textsender-models/pulls/40 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/tag_release.yaml | 2 +- tx0/message/scheduling/event.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/tag_release.yaml b/.gitea/workflows/tag_release.yaml index 5fbd045..995ee4e 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.5" + VERSION="0.1.6" 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/scheduling/event.go b/tx0/message/scheduling/event.go index 3a3f1aa..e8d7fa5 100644 --- a/tx0/message/scheduling/event.go +++ b/tx0/message/scheduling/event.go @@ -8,7 +8,7 @@ import ( type ScheduledMessageEvent struct { Id uuid.UUID `json:"id"` - RecipientId uuid.UUID `json:"recipient_id"` + ContactId uuid.UUID `json:"contact_id"` MessageId uuid.UUID `json:"message_id"` ScheduledMessageId uuid.UUID `json:"scheduled_message_id"` Created time.Time `json:"created"`