From fddf0f7f87b4fc10d1f3d78d2dc9f5557d85ec49 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 1 Dec 2025 21:29:31 +0000 Subject: [PATCH] tsk-44: Record when message was sent (#48) Closes #44 Reviewed-on: https://git.kundeng.us/phoenix/textsender-api/pulls/48 Co-authored-by: phoenix Co-committed-by: phoenix --- .gitea/workflows/workflow.yaml | 7 +- README.md | 4 +- cmd/api/main.go | 3 + cmd/api/main_test.go | 3 + go.mod | 21 ++--- go.sum | 53 ++++++------ internal/handler/endpoint/endpoint.go | 1 + internal/handler/message_event_response.go | 75 +++++++++++++++++ .../handler/message_event_response_test.go | 82 +++++++++++++++++++ .../store/message_event_response_store.go | 30 +++++++ .../mock/message_event_response_store.go | 59 +++++++++++++ .../store/mock/{mock_store.go => store.go} | 0 migrations/schema.sql | 14 +++- 13 files changed, 308 insertions(+), 44 deletions(-) create mode 100644 internal/handler/message_event_response.go create mode 100644 internal/handler/message_event_response_test.go create mode 100644 internal/store/message_event_response_store.go create mode 100644 internal/store/mock/message_event_response_store.go rename internal/store/mock/{mock_store.go => store.go} (100%) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index c244822..e9c73d7 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -96,11 +96,8 @@ jobs: DB_SSLMODE: disable SECRET_KEY: ${{ secrets.SECRET_KEY }} run: | - echo "Parent directory" - echo `pwd` - - echo "JWT_SECRET=$SECRET_KEY" >> .env - echo "DB_NAME=$DB_NAME" > .env + echo "JWT_SECRET=$SECRET_KEY" > .env + echo "DB_NAME=$DB_NAME" >> .env echo "DB_USER=$DB_USER" >> .env echo "DB_PASSWORD=$DB_PASSWORD" >> .env echo "DB_HOST=$DB_HOST" >> .env diff --git a/README.md b/README.md index c79b9b8..13a8c36 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,9 @@ A software system to process Text messaging queueing ## Getting started + ### Building -```BASH +```SHELL make build ``` @@ -13,7 +14,6 @@ make build Generate API documentation ``` go install github.com/swaggo/swag/cmd/swag@latest -go get -u github.com/swaggo/http-swagger/v2 swag init --generalInfo main.go --dir ./cmd/api,./internal/handler --output docs/ --parseDependency --parseInternal ``` diff --git a/cmd/api/main.go b/cmd/api/main.go index 016dbdc..068de0f 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -78,12 +78,14 @@ func main() { messageStore := store.NewMessageStore(db.Pool) schStore := store.NewScheduledMessageStore(db.Pool) schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool) + merStore := store.NewMessageEventResponseStore(db.Pool) contactHandler := handler.NewContactHandler(contactStore) messageHandler := handler.NewMessageHandler(messageStore) scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore) scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore, schStore) scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(schMsgEventStore, schStore) + eventHandler := handler.NewEventResponseHandler(merStore) router := chi.NewRouter() @@ -103,6 +105,7 @@ func main() { router.Method("PATCH", endpoint.UpdateScheduledMessageStatusEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageStatusHandler.UpdateStatus))) router.Method("GET", endpoint.GetScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.GetScheduledMessage))) router.Method("GET", endpoint.FetchNextScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.FetchNextMessage))) + router.Method("POST", endpoint.RecordEventResponse, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(eventHandler.RecordResponse))) router.Method("GET", "/swagger/*", httpSwagger.Handler( httpSwagger.URL(fmt.Sprintf("http://localhost:%s/swagger/doc.json", config.PORT)), diff --git a/cmd/api/main_test.go b/cmd/api/main_test.go index 3168e00..d23d7ff 100644 --- a/cmd/api/main_test.go +++ b/cmd/api/main_test.go @@ -58,12 +58,14 @@ func TestMain(m *testing.M) { messageStore := store.NewMessageStore(db.Pool) schStore := store.NewScheduledMessageStore(db.Pool) schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool) + merStore := store.NewMessageEventResponseStore(db.Pool) contactHandler := handler.NewContactHandler(contactStore) messageHandler := handler.NewMessageHandler(messageStore) scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore) scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore, schStore) scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(schMsgEventStore, schStore) + eventHandler := handler.NewEventResponseHandler(merStore) testRouter = chi.NewRouter() testRouter.Handle(endpoint.ADD_CONTACT_ENDPOINT, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(contactHandler.AddContact))) @@ -76,6 +78,7 @@ func TestMain(m *testing.M) { testRouter.Method("PATCH", endpoint.UpdateScheduledMessageStatusEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageStatusHandler.UpdateStatus))) testRouter.Method("GET", endpoint.GetScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.GetScheduledMessage))) testRouter.Method("GET", endpoint.FetchNextScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.FetchNextMessage))) + testRouter.Method("POST", endpoint.RecordEventResponse, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(eventHandler.RecordResponse))) code := m.Run() os.Exit(code) diff --git a/go.mod b/go.mod index 6f0092e..fb94c15 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.10 + git.kundeng.us/phoenix/textsender-models v0.0.11 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 @@ -17,24 +17,25 @@ require ( require ( github.com/KyleBanks/depth v1.2.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/go-openapi/jsonpointer v0.22.1 // indirect + github.com/go-openapi/jsonpointer v0.22.3 // indirect github.com/go-openapi/jsonreference v0.21.3 // indirect github.com/go-openapi/spec v0.22.1 // indirect - github.com/go-openapi/swag/conv v0.25.1 // indirect - github.com/go-openapi/swag/jsonname v0.25.1 // indirect - github.com/go-openapi/swag/jsonutils v0.25.1 // indirect - github.com/go-openapi/swag/loading v0.25.1 // indirect - github.com/go-openapi/swag/stringutils v0.25.1 // indirect - github.com/go-openapi/swag/typeutils v0.25.1 // indirect - github.com/go-openapi/swag/yamlutils v0.25.1 // indirect + github.com/go-openapi/swag/conv v0.25.4 // indirect + github.com/go-openapi/swag/jsonname v0.25.4 // indirect + github.com/go-openapi/swag/jsonutils v0.25.4 // indirect + github.com/go-openapi/swag/loading v0.25.4 // indirect + github.com/go-openapi/swag/stringutils v0.25.4 // indirect + github.com/go-openapi/swag/typeutils v0.25.4 // indirect + github.com/go-openapi/swag/yamlutils v0.25.4 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/kr/text v0.2.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/swaggo/files/v2 v2.0.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/crypto v0.44.0 // indirect + golang.org/x/crypto v0.45.0 // indirect golang.org/x/mod v0.30.0 // indirect golang.org/x/sync v0.18.0 // indirect golang.org/x/text v0.31.0 // indirect diff --git a/go.sum b/go.sum index 001e393..d6d2d4a 100644 --- a/go.sum +++ b/go.sum @@ -1,37 +1,38 @@ -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= +git.kundeng.us/phoenix/textsender-models v0.0.11 h1:kd2FdeZJhJJAXBm8MoyadtgNGyzC+puU1oR8B8N+MfE= +git.kundeng.us/phoenix/textsender-models v0.0.11/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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE= github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops= -github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= -github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= +github.com/go-openapi/jsonpointer v0.22.3 h1:dKMwfV4fmt6Ah90zloTbUKWMD+0he+12XYAsPotrkn8= +github.com/go-openapi/jsonpointer v0.22.3/go.mod h1:0lBbqeRsQ5lIanv3LHZBrmRGHLHcQoOXQnf88fHlGWo= github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc= github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4= github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k= github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA= github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= -github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= -github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= -github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU= -github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo= -github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8= -github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo= -github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1 h1:DSQGcdB6G0N9c/KhtpYc71PzzGEIc/fZ1no35x4/XBY= -github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1/go.mod h1:kjmweouyPwRUEYMSrbAidoLMGeJ5p6zdHi9BgZiqmsg= -github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw= -github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc= -github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw= -github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg= -github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA= -github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= -github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= -github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= +github.com/go-openapi/swag/conv v0.25.4 h1:/Dd7p0LZXczgUcC/Ikm1+YqVzkEeCc9LnOWjfkpkfe4= +github.com/go-openapi/swag/conv v0.25.4/go.mod h1:3LXfie/lwoAv0NHoEuY1hjoFAYkvlqI/Bn5EQDD3PPU= +github.com/go-openapi/swag/jsonname v0.25.4 h1:bZH0+MsS03MbnwBXYhuTttMOqk+5KcQ9869Vye1bNHI= +github.com/go-openapi/swag/jsonname v0.25.4/go.mod h1:GPVEk9CWVhNvWhZgrnvRA6utbAltopbKwDu8mXNUMag= +github.com/go-openapi/swag/jsonutils v0.25.4 h1:VSchfbGhD4UTf4vCdR2F4TLBdLwHyUDTd1/q4i+jGZA= +github.com/go-openapi/swag/jsonutils v0.25.4/go.mod h1:7OYGXpvVFPn4PpaSdPHJBtF0iGnbEaTk8AvBkoWnaAY= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4 h1:IACsSvBhiNJwlDix7wq39SS2Fh7lUOCJRmx/4SN4sVo= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.4/go.mod h1:Mt0Ost9l3cUzVv4OEZG+WSeoHwjWLnarzMePNDAOBiM= +github.com/go-openapi/swag/loading v0.25.4 h1:jN4MvLj0X6yhCDduRsxDDw1aHe+ZWoLjW+9ZQWIKn2s= +github.com/go-openapi/swag/loading v0.25.4/go.mod h1:rpUM1ZiyEP9+mNLIQUdMiD7dCETXvkkC30z53i+ftTE= +github.com/go-openapi/swag/stringutils v0.25.4 h1:O6dU1Rd8bej4HPA3/CLPciNBBDwZj9HiEpdVsb8B5A8= +github.com/go-openapi/swag/stringutils v0.25.4/go.mod h1:GTsRvhJW5xM5gkgiFe0fV3PUlFm0dr8vki6/VSRaZK0= +github.com/go-openapi/swag/typeutils v0.25.4 h1:1/fbZOUN472NTc39zpa+YGHn3jzHWhv42wAJSN91wRw= +github.com/go-openapi/swag/typeutils v0.25.4/go.mod h1:Ou7g//Wx8tTLS9vG0UmzfCsjZjKhpjxayRKTHXf2pTE= +github.com/go-openapi/swag/yamlutils v0.25.4 h1:6jdaeSItEUb7ioS9lFoCZ65Cne1/RZtPBZ9A56h92Sw= +github.com/go-openapi/swag/yamlutils v0.25.4/go.mod h1:MNzq1ulQu+yd8Kl7wPOut/YHAAU/H6hL91fF+E2RFwc= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg= github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls= github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54= github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= @@ -50,8 +51,8 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -71,8 +72,8 @@ github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI= github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.44.0 h1:A97SsFvM3AIwEEmTBiaxPPTYpDC47w720rdiiUvgoAU= -golang.org/x/crypto v0.44.0/go.mod h1:013i+Nw79BMiQiMsOPcVCB5ZIJbYkerPrGnOa00tvmc= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk= golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc= golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= diff --git a/internal/handler/endpoint/endpoint.go b/internal/handler/endpoint/endpoint.go index 6160438..6b87bf5 100644 --- a/internal/handler/endpoint/endpoint.go +++ b/internal/handler/endpoint/endpoint.go @@ -12,3 +12,4 @@ const GetScheduledMessageEventEndpoint = "/api/v1/schedule/message/event" const DeleteScheduledMessageEventEndpoint = "/api/v1/schedule/message/event/{id}" const UpdateScheduledMessageStatusEndpoint = "/api/v1/schedule/message/status/update" const FetchNextScheduledMessageEndpoint = "/api/v1/schedule/message/fetch" +const RecordEventResponse = "/api/v1/schedule/message/event/response/record" diff --git a/internal/handler/message_event_response.go b/internal/handler/message_event_response.go new file mode 100644 index 0000000..ff4edcb --- /dev/null +++ b/internal/handler/message_event_response.go @@ -0,0 +1,75 @@ +package handler + +import ( + "net/http" + "time" + + "git.kundeng.us/phoenix/textsender-models/tx0/message" + "git.kundeng.us/phoenix/textsender-models/tx0/types" + "github.com/google/uuid" + + "git.kundeng.us/phoenix/textsender-api/internal/store" +) + +type EventResponseHandler struct { + MessageEventResponseStore store.MessageEventResponseStore +} + +func NewEventResponseHandler(str store.MessageEventResponseStore) *EventResponseHandler { + return &EventResponseHandler{MessageEventResponseStore: str} +} + +type RecordEventRequest struct { + ScheduledMessageEventId uuid.UUID `json:"scheduled_message_event_id"` + Response types.JSONB `json:"response"` + UserId uuid.UUID `json:"user_id"` + Sent *time.Time `json:"sent,omitempty"` +} + +type RecordEventResponse struct { + Message string `json:"message"` + Data []*message.MessageEventResponse `json:"data"` +} + +func (e *EventResponseHandler) RecordResponse(w http.ResponseWriter, r *http.Request) { + var req RecordEventRequest + if err := ExtractFromRequest(r, &req); err != nil { + http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest) + } + defer r.Body.Close() + + var statusCode int + var rp message.MessageEventResponse + var resp RecordEventResponse + + if req.Sent == nil { + statusCode = http.StatusBadRequest + resp.Message = "Sent time is empty" + } else if req.UserId == uuid.Nil { + statusCode = http.StatusBadRequest + resp.Message = "User Id is empty" + } else if len(req.Response) == 0 { + statusCode = http.StatusBadRequest + resp.Message = "Response is empty" + } else if req.ScheduledMessageEventId == uuid.Nil { + statusCode = http.StatusBadRequest + resp.Message = "Scheduled message event Id is empty" + } else { + rp.ScheduledMessageEventId = req.ScheduledMessageEventId + rp.Response = req.Response + rp.UserId = req.UserId + rp.Sent = *req.Sent + + ctx := r.Context() + if err := e.MessageEventResponseStore.Create(ctx, &rp); err != nil { + resp.Message = err.Error() + statusCode = http.StatusInternalServerError + } else { + statusCode = http.StatusCreated + resp.Message = "Successful" + resp.Data = append(resp.Data, &rp) + } + } + + RespondWithJSON(w, statusCode, &resp) +} diff --git a/internal/handler/message_event_response_test.go b/internal/handler/message_event_response_test.go new file mode 100644 index 0000000..d21e0e0 --- /dev/null +++ b/internal/handler/message_event_response_test.go @@ -0,0 +1,82 @@ +package handler + +import ( + "encoding/json" + "net/http" + "net/http/httptest" + "strings" + "testing" + "time" + + "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" + + "git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint" + "git.kundeng.us/phoenix/textsender-api/internal/store/mock" +) + +func TestRecordMessageEventResponseWithMock(t *testing.T) { + now := time.Now() + + mockStore := mock.NewMockScheduledMessageEventStore() + contactStore := mock.NewMockContactStore() + messageStore := mock.NewMockMessageStore() + schMsgStore := mock.NewMockScheduledMessageStore() + merStore := mock.NewMockMessageEventResponseStore() + + handler := NewEventResponseHandler(merStore) + + recipientId := uuid.New() + messageId := uuid.New() + scheduledMessageId := uuid.New() + testUserId := uuid.New() + + con := testContact(recipientId, testUserId) + msg := testMessage(messageId, testUserId) + schMsg := testScheduledMessage(scheduledMessageId, testUserId, now) + event := scheduling.ScheduledMessageEvent{} + + ctx := t.Context() + + if err := contactStore.CreateContact(ctx, &con); err != nil { + assert.NoError(t, err, "Error creating contact: %v", err) + } else if err = messageStore.CreateMessage(ctx, &msg); err != nil { + assert.NoError(t, err, "Error creating message: %v", err) + } else if err = schMsgStore.CreateScheduledMessage(ctx, &schMsg); err != nil { + assert.NoError(t, err, "Error creating scheduled message: %v", err) + } + + event.MessageId = msg.Id + event.RecipientId = con.Id + event.ScheduledMessageId = schMsg.Id + if err := mockStore.CreateScheduledMessageEvent(ctx, &event); err != nil { + assert.NoError(t, err, "Error creating scheduled message event: %v", err) + } + + sent := now.Add(30 * time.Minute) + bytes := []byte("{\"body\":\"Whoknows?\",\"num_segments\":\"0\",\"direction\":\"outbound-api\",\"from\":\"+12243026041\",\"to\":\"+16303831708\",\"date_updated\":\"Sat,29Nov202519:06:59+0000\",\"uri\":\"/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SM1193a529e7f7a840667cd1e0f13ea95a.json\",\"account_sid\":\"ACefa1ef516314c9d1a68cbd657de49277\",\"num_media\":\"0\",\"status\":\"scheduled\",\"messaging_service_sid\":\"MG803f3676706b92eb02e18dd820c447f2\",\"sid\":\"SM1193a529e7f7a840667cd1e0f13ea95a\",\"date_created\":\"Sat,29Nov202519:06:59+0000\",\"api_version\":\"2010-04-01\",\"subresource_uris\":{\"media\":\"/2010-04-01/Accounts/ACefa1ef516314c9d1a68cbd657de49277/Messages/SM1193a529e7f7a840667cd1e0f13ea95a/Media.json\"}}") + + testReq := RecordEventRequest{ScheduledMessageEventId: event.Id, Response: bytes, UserId: schMsg.UserId, Sent: &sent} + jsonValue, _ := json.Marshal(testReq) + + req, _ := http.NewRequest("POST", endpoint.RecordEventResponse, strings.NewReader(string(jsonValue))) + rr := httptest.NewRecorder() + + handler.RecordResponse(rr, req) + + assert.Equal(t, http.StatusCreated, rr.Code) + + var response RecordEventResponse + err := json.Unmarshal(rr.Body.Bytes(), &response) + assert.NoError(t, err, "Error parsing message event response:%v", err) + + assert.NotEmpty(t, response.Data, "No message event response created") + + var msgEventResp message.MessageEventResponse + msgEventResp = *response.Data[0] + + assert.NotEmpty(t, msgEventResp.Response, "The response of the message event response is empty") + assert.Equal(t, msgEventResp.Response, testReq.Response, "Responses do not match") +} diff --git a/internal/store/message_event_response_store.go b/internal/store/message_event_response_store.go new file mode 100644 index 0000000..2b8d305 --- /dev/null +++ b/internal/store/message_event_response_store.go @@ -0,0 +1,30 @@ +package store + +import ( + "context" + + "git.kundeng.us/phoenix/textsender-models/tx0/message" + "github.com/jackc/pgx/v5/pgxpool" +) + +type MessageEventResponseStore interface { + Create(ctx context.Context, mer *message.MessageEventResponse) error +} + +type PGMessageEventResponseStore struct { + db *pgxpool.Pool +} + +func NewMessageEventResponseStore(db *pgxpool.Pool) *PGMessageEventResponseStore { + return &PGMessageEventResponseStore{db: db} +} + +func (m *PGMessageEventResponseStore) Create(ctx context.Context, mer *message.MessageEventResponse) error { + query := ` + INSERT INTO message_event_responses (scheduled_message_event_id, response, user_id, sent) + VALUES ($1, $2, $3, $4) + RETURNING id + ` + + return m.db.QueryRow(ctx, query, mer.ScheduledMessageEventId, mer.Response, mer.UserId, mer.Sent).Scan(&mer.Id) +} diff --git a/internal/store/mock/message_event_response_store.go b/internal/store/mock/message_event_response_store.go new file mode 100644 index 0000000..47722ff --- /dev/null +++ b/internal/store/mock/message_event_response_store.go @@ -0,0 +1,59 @@ +package mock + +import ( + "context" + "fmt" + "sync" + "time" + + "git.kundeng.us/phoenix/textsender-models/tx0/message" + "github.com/google/uuid" +) + +type MessageEventResponseKey struct { + ScheduledMessageEventId uuid.UUID + UserId uuid.UUID +} +type MockMessageEventResponseStore struct { + MessageEventResponses map[uuid.UUID]*message.MessageEventResponse + MessageEventResponsesByKey map[MessageEventResponseKey]*message.MessageEventResponse + mu sync.RWMutex + Error error +} + +func NewMockMessageEventResponseStore() *MockMessageEventResponseStore { + return &MockMessageEventResponseStore{ + MessageEventResponses: make(map[uuid.UUID]*message.MessageEventResponse), + MessageEventResponsesByKey: make(map[MessageEventResponseKey]*message.MessageEventResponse), + } +} + +func (m *MockMessageEventResponseStore) Create(ctx context.Context, mer *message.MessageEventResponse) error { + m.mu.Lock() + defer m.mu.Unlock() + + if m.Error != nil { + return m.Error + } + + if mer.Id == uuid.Nil { + mer.Id = uuid.New() + } + + if len(mer.Response) == 0 { + return fmt.Errorf("Response is empty") + } else if mer.ScheduledMessageEventId == uuid.Nil { + return fmt.Errorf("Scheduled message event Id is nil") + } else if mer.UserId == uuid.Nil { + return fmt.Errorf("User Id is nil") + } else { + key := MessageEventResponseKey{ScheduledMessageEventId: mer.ScheduledMessageEventId, UserId: mer.UserId} + sent := time.Now() + mer.Sent = sent + + m.MessageEventResponses[mer.Id] = mer + m.MessageEventResponsesByKey[key] = mer + + return nil + } +} diff --git a/internal/store/mock/mock_store.go b/internal/store/mock/store.go similarity index 100% rename from internal/store/mock/mock_store.go rename to internal/store/mock/store.go diff --git a/migrations/schema.sql b/migrations/schema.sql index 534509c..b3d30dd 100644 --- a/migrations/schema.sql +++ b/migrations/schema.sql @@ -1,6 +1,10 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; DROP TABLE IF EXISTS contacts CASCADE; +DROP TABLE IF EXISTS messages CASCADE; +DROP TABLE IF EXISTS scheduled_messages CASCADE; +DROP TABLE IF EXISTS scheduled_message_events CASCADE; +DROP TABLE IF EXISTS message_event_responses CASCADE; CREATE TABLE IF NOT EXISTS contacts ( id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), @@ -28,4 +32,12 @@ CREATE TABLE IF NOT EXISTS scheduled_message_events ( message_id UUID NOT NULL, scheduled_message_id UUID NOT NULL, created timestamptz DEFAULT now() -) +); + +CREATE TABLE IF NOT EXISTS message_event_responses ( + id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), + scheduled_message_event_id UUID NOT NULL, + response JSONB NOT NULL, + user_id UUID NOT NULL, + sent timestamptz NOT NULL +);