From a8dbd693ba0a1e592a42ae4de15d97964d904f39 Mon Sep 17 00:00:00 2001 From: phoenix Date: Sat, 29 Nov 2025 20:22:31 +0000 Subject: [PATCH] tsk-40: Get Contact bug (#46) Closes #40 Reviewed-on: https://git.kundeng.us/phoenix/textsender-api/pulls/46 Co-authored-by: phoenix Co-committed-by: phoenix --- cmd/api/main.go | 2 +- go.mod | 2 +- go.sum | 2 ++ internal/handler/contact.go | 12 ++++++------ internal/handler/contact_test.go | 2 +- internal/handler/message.go | 2 +- internal/handler/message_test.go | 2 +- internal/handler/schedule_message_status.go | 2 +- internal/handler/schedule_message_status_test.go | 2 +- internal/handler/scheduled_message.go | 2 +- internal/handler/scheduled_message_event.go | 2 +- internal/handler/scheduled_message_event_test.go | 6 +++--- internal/handler/scheduled_message_test.go | 2 +- internal/services/jwt_service.go | 5 ++--- internal/store/contact_store.go | 3 +-- internal/store/message_store.go | 3 +-- internal/store/mock/mock_store.go | 5 ++--- internal/store/mock/scheduled_message_event_store.go | 3 +-- internal/store/mock/scheduled_message_store.go | 3 +-- internal/store/scheduled_message_event_store.go | 3 +-- internal/store/scheduled_message_store.go | 3 +-- 21 files changed, 31 insertions(+), 37 deletions(-) diff --git a/cmd/api/main.go b/cmd/api/main.go index 7faf4cc..016dbdc 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -61,7 +61,7 @@ func main() { log.Println("Database reset completed. Exiting.") return } else { - if exists, err := database.TableExists(ctx, db.Pool, "contacts "); err == nil && !exists { + if exists, err := database.TableExists(ctx, db.Pool, "contacts"); err == nil && !exists { fmt.Println("Resetting database") err = db.ResetDatabase(ctx) if err != nil { diff --git a/go.mod b/go.mod index 475b545..6f0092e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/textsender-api go 1.25.4 require ( - git.kundeng.us/phoenix/textsender-models v0.0.9 + git.kundeng.us/phoenix/textsender-models v0.0.10 github.com/go-chi/chi/v5 v5.2.3 github.com/golang-jwt/jwt/v5 v5.3.0 github.com/google/uuid v1.6.0 diff --git a/go.sum b/go.sum index e25fecb..001e393 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ git.kundeng.us/phoenix/textsender-models v0.0.9 h1:wHEbDLYzMpXQ8OaIf05xFY1V19iTpQogTJEuKInkjEQ= git.kundeng.us/phoenix/textsender-models v0.0.9/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= +git.kundeng.us/phoenix/textsender-models v0.0.10 h1:0AMe/zm4Xte2BcuqqhRP7+42m+4To+rUnHkR2a9eXlI= +git.kundeng.us/phoenix/textsender-models v0.0.10/go.mod h1:9iPDQJg1Tc6WMNoW5+f8YKmnosMwlWHJ++hmxNLDEe0= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/internal/handler/contact.go b/internal/handler/contact.go index e07b8a8..d2af0e6 100644 --- a/internal/handler/contact.go +++ b/internal/handler/contact.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" "github.com/google/uuid" "git.kundeng.us/phoenix/textsender-api/internal/store" - "git.kundeng.us/phoenix/textsender-models/pkg/contact" ) type RequestAddContact struct { @@ -20,11 +20,6 @@ type AddContactResponse struct { Data []contact.Contact `json:"data"` } -type GetContactResponse struct { - Message string `json:"message"` - Data []contact.Contact `json:"data"` -} - type ContactHandler struct { ContactStore store.ContactStore } @@ -88,6 +83,11 @@ func (c *ContactHandler) AddContact(w http.ResponseWriter, r *http.Request) { RespondWithJSON(w, statusCode, &resp) } +type GetContactResponse struct { + Message string `json:"message"` + Data []contact.Contact `json:"data"` +} + // GetContact godoc // @Summary Get contact // @Description Get a contact record to have a recipient to send a text to (requires JWT) diff --git a/internal/handler/contact_test.go b/internal/handler/contact_test.go index 9504cf9..3214843 100644 --- a/internal/handler/contact_test.go +++ b/internal/handler/contact_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "git.kundeng.us/phoenix/textsender-models/pkg/contact" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/handler/message.go b/internal/handler/message.go index 28c55dc..b576e87 100644 --- a/internal/handler/message.go +++ b/internal/handler/message.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" + "git.kundeng.us/phoenix/textsender-models/tx0/message" "github.com/google/uuid" "git.kundeng.us/phoenix/textsender-api/internal/store" - "git.kundeng.us/phoenix/textsender-models/pkg/message" ) type RequestAddMessage struct { diff --git a/internal/handler/message_test.go b/internal/handler/message_test.go index 6478b82..a457eaa 100644 --- a/internal/handler/message_test.go +++ b/internal/handler/message_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "git.kundeng.us/phoenix/textsender-models/pkg/message" + "git.kundeng.us/phoenix/textsender-models/tx0/message" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/handler/schedule_message_status.go b/internal/handler/schedule_message_status.go index 616afd4..bcb4696 100644 --- a/internal/handler/schedule_message_status.go +++ b/internal/handler/schedule_message_status.go @@ -3,10 +3,10 @@ package handler import ( "net/http" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "git.kundeng.us/phoenix/textsender-api/internal/store" - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type RequestScheduledMessageStatus struct { diff --git a/internal/handler/schedule_message_status_test.go b/internal/handler/schedule_message_status_test.go index da25d3a..ca3acde 100644 --- a/internal/handler/schedule_message_status_test.go +++ b/internal/handler/schedule_message_status_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/handler/scheduled_message.go b/internal/handler/scheduled_message.go index d2499df..f1891b5 100644 --- a/internal/handler/scheduled_message.go +++ b/internal/handler/scheduled_message.go @@ -6,10 +6,10 @@ import ( "strings" "time" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "git.kundeng.us/phoenix/textsender-api/internal/store" - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type RequestAddScheduledMessage struct { diff --git a/internal/handler/scheduled_message_event.go b/internal/handler/scheduled_message_event.go index ebee917..c49cbb9 100644 --- a/internal/handler/scheduled_message_event.go +++ b/internal/handler/scheduled_message_event.go @@ -4,11 +4,11 @@ import ( "net/http" "strings" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/go-chi/chi/v5" "github.com/google/uuid" "git.kundeng.us/phoenix/textsender-api/internal/store" - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type RequestAddScheduledMessageEvent struct { diff --git a/internal/handler/scheduled_message_event_test.go b/internal/handler/scheduled_message_event_test.go index bc17adb..9b73bb7 100644 --- a/internal/handler/scheduled_message_event_test.go +++ b/internal/handler/scheduled_message_event_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "git.kundeng.us/phoenix/textsender-models/pkg/contact" - "git.kundeng.us/phoenix/textsender-models/pkg/message" - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" + "git.kundeng.us/phoenix/textsender-models/tx0/message" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/handler/scheduled_message_test.go b/internal/handler/scheduled_message_test.go index ebfa145..778552f 100644 --- a/internal/handler/scheduled_message_test.go +++ b/internal/handler/scheduled_message_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/services/jwt_service.go b/internal/services/jwt_service.go index b4eaf56..ee38e90 100644 --- a/internal/services/jwt_service.go +++ b/internal/services/jwt_service.go @@ -3,10 +3,9 @@ package services import ( "time" + txtmodels_token "git.kundeng.us/phoenix/textsender-models/tx0/token" + txtmodels_user "git.kundeng.us/phoenix/textsender-models/tx0/user" "github.com/golang-jwt/jwt/v5" - - txtmodels_token "git.kundeng.us/phoenix/textsender-models/pkg/token" - txtmodels_user "git.kundeng.us/phoenix/textsender-models/pkg/user" ) type JWTService struct { diff --git a/internal/store/contact_store.go b/internal/store/contact_store.go index 9eb050a..7e9d72c 100644 --- a/internal/store/contact_store.go +++ b/internal/store/contact_store.go @@ -4,11 +4,10 @@ import ( "context" "fmt" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" - - "git.kundeng.us/phoenix/textsender-models/pkg/contact" ) type ContactStore interface { diff --git a/internal/store/message_store.go b/internal/store/message_store.go index b262a51..29528af 100644 --- a/internal/store/message_store.go +++ b/internal/store/message_store.go @@ -4,11 +4,10 @@ import ( "context" "fmt" + "git.kundeng.us/phoenix/textsender-models/tx0/message" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" - - "git.kundeng.us/phoenix/textsender-models/pkg/message" ) type MessageStore interface { diff --git a/internal/store/mock/mock_store.go b/internal/store/mock/mock_store.go index 0361965..d1c571c 100644 --- a/internal/store/mock/mock_store.go +++ b/internal/store/mock/mock_store.go @@ -5,10 +5,9 @@ import ( "errors" "sync" + "git.kundeng.us/phoenix/textsender-models/tx0/contact" + "git.kundeng.us/phoenix/textsender-models/tx0/message" "github.com/google/uuid" - - "git.kundeng.us/phoenix/textsender-models/pkg/contact" - "git.kundeng.us/phoenix/textsender-models/pkg/message" ) type Key struct { diff --git a/internal/store/mock/scheduled_message_event_store.go b/internal/store/mock/scheduled_message_event_store.go index b1cbd32..b7b3cf8 100644 --- a/internal/store/mock/scheduled_message_event_store.go +++ b/internal/store/mock/scheduled_message_event_store.go @@ -6,9 +6,8 @@ import ( "sync" "time" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" - - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type ScheduledMessageEventKey struct { diff --git a/internal/store/mock/scheduled_message_store.go b/internal/store/mock/scheduled_message_store.go index 8211924..75a0853 100644 --- a/internal/store/mock/scheduled_message_store.go +++ b/internal/store/mock/scheduled_message_store.go @@ -5,9 +5,8 @@ import ( "fmt" "sync" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" - - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type ScheduledMessageKey struct { diff --git a/internal/store/scheduled_message_event_store.go b/internal/store/scheduled_message_event_store.go index bf523d1..e17fc7e 100644 --- a/internal/store/scheduled_message_event_store.go +++ b/internal/store/scheduled_message_event_store.go @@ -4,11 +4,10 @@ import ( "context" "fmt" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" - - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type ScheduledMessageEventStore interface { diff --git a/internal/store/scheduled_message_store.go b/internal/store/scheduled_message_store.go index a278135..d1aeea6 100644 --- a/internal/store/scheduled_message_store.go +++ b/internal/store/scheduled_message_store.go @@ -4,11 +4,10 @@ import ( "context" "fmt" + "git.kundeng.us/phoenix/textsender-models/tx0/message/scheduling" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" - - "git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling" ) type ScheduledMessageStore interface {