Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
880461dffb | ||
|
|
77c950d299 | ||
|
|
44e00684cc |
@@ -64,10 +64,12 @@ func main() {
|
|||||||
contactStore := store.NewContactStore(db.Pool)
|
contactStore := store.NewContactStore(db.Pool)
|
||||||
messageStore := store.NewMessageStore(db.Pool)
|
messageStore := store.NewMessageStore(db.Pool)
|
||||||
schStore := store.NewScheduledMessageStore(db.Pool)
|
schStore := store.NewScheduledMessageStore(db.Pool)
|
||||||
|
schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool)
|
||||||
|
|
||||||
contactHandler := handler.NewContactHandler(contactStore)
|
contactHandler := handler.NewContactHandler(contactStore)
|
||||||
messageHandler := handler.NewMessageHandler(messageStore)
|
messageHandler := handler.NewMessageHandler(messageStore)
|
||||||
scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
|
scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
|
||||||
|
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore)
|
||||||
|
|
||||||
router := chi.NewRouter()
|
router := chi.NewRouter()
|
||||||
|
|
||||||
@@ -81,6 +83,8 @@ func main() {
|
|||||||
router.Handle(endpoint.ADD_MESSAGE, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(messageHandler.AddMessage)))
|
router.Handle(endpoint.ADD_MESSAGE, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(messageHandler.AddMessage)))
|
||||||
router.Handle(endpoint.GET_MESSAGE, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(messageHandler.GetMessage)))
|
router.Handle(endpoint.GET_MESSAGE, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(messageHandler.GetMessage)))
|
||||||
router.Handle(endpoint.ScheduleMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.AddScheduledMessage)))
|
router.Handle(endpoint.ScheduleMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.AddScheduledMessage)))
|
||||||
|
router.Handle(endpoint.AddEventToScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageEventHandler.AddScheduledMessageEvent)))
|
||||||
|
router.Handle(endpoint.GetScheduledMessageEventEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageEventHandler.GetScheduledMessageEvent)))
|
||||||
|
|
||||||
// Start server
|
// Start server
|
||||||
server := &http.Server{
|
server := &http.Server{
|
||||||
|
|||||||
+39
-9
@@ -4,44 +4,74 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/go-chi/chi/v5"
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/config"
|
"git.kundeng.us/phoenix/textsender-api/internal/config"
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/db"
|
"git.kundeng.us/phoenix/textsender-api/internal/db"
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/handler"
|
"git.kundeng.us/phoenix/textsender-api/internal/handler"
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
||||||
|
mdlware "git.kundeng.us/phoenix/textsender-api/internal/middleware"
|
||||||
|
"git.kundeng.us/phoenix/textsender-api/internal/services"
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/store"
|
"git.kundeng.us/phoenix/textsender-api/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
var testRouter *mux.Router
|
var testRouter *chi.Mux
|
||||||
|
|
||||||
func TestMain(m *testing.M) {
|
func TestMain(m *testing.M) {
|
||||||
cfg := load()
|
cfg := load()
|
||||||
|
|
||||||
db, err := db.NewDatabase(cfg.GetDBConnString())
|
database, err := db.NewDatabase(cfg.GetDBConnString())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
panic("Failed to initialize database")
|
panic("Failed to initialize database")
|
||||||
}
|
}
|
||||||
defer db.Close()
|
defer database.Close()
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
err = db.ResetDatabase(ctx)
|
|
||||||
if err != nil {
|
if cfg.ResetDB {
|
||||||
|
if err = database.ResetDatabase(ctx); err != nil {
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
panic("Failed to initialize database")
|
panic("Failed to initialize database")
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if exists, err := db.TableExists(ctx, database.Pool, "contacts "); err == nil && !exists {
|
||||||
|
fmt.Println("Resetting database")
|
||||||
|
err = database.ResetDatabase(ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Printf("Error:%v", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
fmt.Printf("Error:%v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jwtService := services.NewJWTService(cfg.JWTSecret)
|
||||||
|
|
||||||
|
contactStore := store.NewContactStore(database.Pool)
|
||||||
|
messageStore := store.NewMessageStore(db.Pool)
|
||||||
|
schStore := store.NewScheduledMessageStore(db.Pool)
|
||||||
|
schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool)
|
||||||
|
|
||||||
contactStore := store.NewContactStore(db.Pool)
|
|
||||||
contactHandler := handler.NewContactHandler(contactStore)
|
contactHandler := handler.NewContactHandler(contactStore)
|
||||||
|
messageHandler := handler.NewMessageHandler(messageStore)
|
||||||
|
scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
|
||||||
|
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore)
|
||||||
|
|
||||||
testRouter = mux.NewRouter()
|
testRouter = chi.NewRouter()
|
||||||
testRouter.HandleFunc(endpoint.ADD_CONTACT_ENDPOINT, contactHandler.AddContact).Methods("POST")
|
testRouter.Handle(endpoint.ADD_CONTACT_ENDPOINT, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(contactHandler.AddContact)))
|
||||||
|
testRouter.Handle(endpoint.GET_CONTACT, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(contactHandler.GetContact)))
|
||||||
|
testRouter.Handle(endpoint.ADD_MESSAGE, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(messageHandler.AddMessage)))
|
||||||
|
testRouter.Handle(endpoint.GET_MESSAGE, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(messageHandler.GetMessage)))
|
||||||
|
testRouter.Handle(endpoint.ScheduleMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageHandler.AddScheduledMessage)))
|
||||||
|
testRouter.Handle(endpoint.AddEventToScheduledMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageEventHandler.AddScheduledMessageEvent)))
|
||||||
|
testRouter.Handle(endpoint.GetScheduledMessageEventEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(scheduledMessageEventHandler.GetScheduledMessageEvent)))
|
||||||
|
|
||||||
code := m.Run()
|
code := m.Run()
|
||||||
os.Exit(code)
|
os.Exit(code)
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ module git.kundeng.us/phoenix/textsender-api
|
|||||||
go 1.25.3
|
go 1.25.3
|
||||||
|
|
||||||
require (
|
require (
|
||||||
git.kundeng.us/phoenix/textsender-models v0.0.5-3-ca38ce876f-556
|
git.kundeng.us/phoenix/textsender-models v0.0.6-4-e124bcfda8-556
|
||||||
github.com/go-chi/chi/v5 v5.2.3
|
github.com/go-chi/chi/v5 v5.2.3
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.0
|
github.com/golang-jwt/jwt/v5 v5.3.0
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
git.kundeng.us/phoenix/textsender-models v0.0.5-3-ca38ce876f-556 h1:dDgjre2FlukxeKZfJiP3gtIT4wyzpQ8glAYV9LpLtuU=
|
git.kundeng.us/phoenix/textsender-models v0.0.6-4-e124bcfda8-556 h1:2shgOKmglCODswpCJeCuyPiUAph3wfc0Ep1z6b/ifis=
|
||||||
git.kundeng.us/phoenix/textsender-models v0.0.5-3-ca38ce876f-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
|
git.kundeng.us/phoenix/textsender-models v0.0.6-4-e124bcfda8-556/go.mod h1:lx5MCnOgGgsdpwzrfi9uph5xmkeb6H8AuexUNGss2no=
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
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.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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import (
|
|||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/db"
|
"git.kundeng.us/phoenix/textsender-api/internal/db"
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
||||||
|
"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Request struct {
|
type Request struct {
|
||||||
@@ -23,7 +24,7 @@ type Request struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateContactWithMock(t *testing.T) {
|
func TestCreateContactWithMock(t *testing.T) {
|
||||||
mockstore := NewMockContactStore()
|
mockstore := mock.NewMockContactStore()
|
||||||
handler := NewContactHandler(mockstore)
|
handler := NewContactHandler(mockstore)
|
||||||
|
|
||||||
testUserId := uuid.New()
|
testUserId := uuid.New()
|
||||||
@@ -47,7 +48,7 @@ func TestCreateContactWithMock(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetContactWithMock(t *testing.T) {
|
func TestGetContactWithMock(t *testing.T) {
|
||||||
mockstore := NewMockContactStore()
|
mockstore := mock.NewMockContactStore()
|
||||||
testUserId := uuid.New()
|
testUserId := uuid.New()
|
||||||
|
|
||||||
testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: testUserId}
|
testCon := contact.Contact{PhoneNumber: "+12335403383", UserId: testUserId}
|
||||||
|
|||||||
@@ -6,3 +6,5 @@ const GET_MESSAGE = "/api/v1/message"
|
|||||||
const GET_CONTACT = "/api/v1/contact"
|
const GET_CONTACT = "/api/v1/contact"
|
||||||
const ADD_CONTACT_ENDPOINT = "/api/v1/contact/new"
|
const ADD_CONTACT_ENDPOINT = "/api/v1/contact/new"
|
||||||
const ScheduleMessageEndpoint = "/api/v1/schedule/message"
|
const ScheduleMessageEndpoint = "/api/v1/schedule/message"
|
||||||
|
const AddEventToScheduledMessageEndpoint = "/api/v1/schedule/message/event"
|
||||||
|
const GetScheduledMessageEventEndpoint = "/api/v1/schedule/message/event/{id}"
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
||||||
|
"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CreateMessageRequest struct {
|
type CreateMessageRequest struct {
|
||||||
@@ -21,7 +22,7 @@ type CreateMessageRequest struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateMessageWithMock(t *testing.T) {
|
func TestCreateMessageWithMock(t *testing.T) {
|
||||||
mockStore := NewMockMessageStore()
|
mockStore := mock.NewMockMessageStore()
|
||||||
handler := NewMessageHandler(mockStore)
|
handler := NewMessageHandler(mockStore)
|
||||||
|
|
||||||
testUserId := uuid.New()
|
testUserId := uuid.New()
|
||||||
@@ -45,7 +46,7 @@ func TestCreateMessageWithMock(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGetMessageWithMock(t *testing.T) {
|
func TestGetMessageWithMock(t *testing.T) {
|
||||||
mockstore := NewMockMessageStore()
|
mockstore := mock.NewMockMessageStore()
|
||||||
testUserId := uuid.New()
|
testUserId := uuid.New()
|
||||||
|
|
||||||
testCon := message.Message{Content: "Who is the one that benefits?", UserId: testUserId}
|
testCon := message.Message{Content: "Who is the one that benefits?", UserId: testUserId}
|
||||||
|
|||||||
@@ -0,0 +1,126 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"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 {
|
||||||
|
RecipientId uuid.UUID `json:"recipient_id"`
|
||||||
|
MessageId uuid.UUID `json:"message_id"`
|
||||||
|
ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type AddScheduledMessageEventResponse struct {
|
||||||
|
Message string `json:"message"`
|
||||||
|
Data []scheduling.ScheduledMessageEvent `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetScheduledMessageEventResponse struct {
|
||||||
|
Message string `json:"message"`
|
||||||
|
Data []scheduling.ScheduledMessageEvent `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ScheduledMessageEventHandler struct {
|
||||||
|
ScheduledMessageEventStore store.ScheduledMessageEventStore
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewScheduledMessageEventHandler(str store.ScheduledMessageEventStore) *ScheduledMessageEventHandler {
|
||||||
|
return &ScheduledMessageEventHandler{ScheduledMessageEventStore: str}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *ScheduledMessageEventHandler) AddScheduledMessageEvent(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var req RequestAddScheduledMessageEvent
|
||||||
|
if err := ExtractFromRequest(r, &req); err != nil {
|
||||||
|
http.Error(w, "Invalid JSON: "+err.Error(), http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
defer r.Body.Close()
|
||||||
|
|
||||||
|
event := scheduling.ScheduledMessageEvent{RecipientId: req.RecipientId, MessageId: req.MessageId, ScheduledMessageId: req.ScheduledMessageId}
|
||||||
|
|
||||||
|
var statusCode int
|
||||||
|
var resp AddScheduledMessageEventResponse
|
||||||
|
|
||||||
|
if event.RecipientId == uuid.Nil {
|
||||||
|
statusCode = http.StatusBadRequest
|
||||||
|
resp.Message = "Recipient Id is nil"
|
||||||
|
} else if event.MessageId == uuid.Nil {
|
||||||
|
statusCode = http.StatusBadRequest
|
||||||
|
resp.Message = "Message Id is nil"
|
||||||
|
} else if event.ScheduledMessageId == uuid.Nil {
|
||||||
|
statusCode = http.StatusBadRequest
|
||||||
|
resp.Message = "Scheduled Message Id is nil"
|
||||||
|
} else {
|
||||||
|
ctx := r.Context()
|
||||||
|
|
||||||
|
if exists, err := s.ScheduledMessageEventStore.Exists(ctx, &event); err == nil {
|
||||||
|
if exists {
|
||||||
|
statusCode = http.StatusBadRequest
|
||||||
|
resp.Message = "Event already present"
|
||||||
|
} else {
|
||||||
|
if err = s.ScheduledMessageEventStore.CreateScheduledMessageEvent(ctx, &event); err == nil {
|
||||||
|
statusCode = http.StatusCreated
|
||||||
|
resp.Message = "Successful"
|
||||||
|
resp.Data = append(resp.Data, event)
|
||||||
|
} else {
|
||||||
|
statusCode = http.StatusInternalServerError
|
||||||
|
resp.Message = err.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
statusCode = http.StatusInternalServerError
|
||||||
|
resp.Message = err.Error()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RespondWithJSON(w, statusCode, &resp)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *ScheduledMessageEventHandler) GetScheduledMessageEvent(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.Method != http.MethodGet {
|
||||||
|
http.Error(w, "Metnot allowed", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
id := chi.URLParam(r, "id")
|
||||||
|
if len(id) == 0 {
|
||||||
|
pathParts := strings.Split(r.URL.Path, "/")
|
||||||
|
if len(pathParts) < 7 {
|
||||||
|
http.Error(w, "Id not provided", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
id = pathParts[6]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var statusCode int
|
||||||
|
var resp GetScheduledMessageEventResponse
|
||||||
|
|
||||||
|
if parsedId, err := uuid.Parse(id); err != nil {
|
||||||
|
resp.Message = err.Error()
|
||||||
|
statusCode = http.StatusBadRequest
|
||||||
|
} else {
|
||||||
|
ctx := r.Context()
|
||||||
|
if event, err := s.ScheduledMessageEventStore.Get(ctx, parsedId); err != nil {
|
||||||
|
resp.Message = err.Error()
|
||||||
|
statusCode = http.StatusInternalServerError
|
||||||
|
} else {
|
||||||
|
resp.Message = "Successful"
|
||||||
|
statusCode = http.StatusOK
|
||||||
|
resp.Data = append(resp.Data, *event)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RespondWithJSON(w, statusCode, &resp)
|
||||||
|
}
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
package handler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
|
"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"
|
||||||
|
"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"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CreateScheduledMessageEventRequest struct {
|
||||||
|
RecipientId uuid.UUID `json:"recipient_id"`
|
||||||
|
MessageId uuid.UUID `json:"message_id"`
|
||||||
|
ScheduledMessageId uuid.UUID `json:"scheduled_message_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestCreateScheduledMessageEventWithMock(t *testing.T) {
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
mockStore := mock.NewMockScheduledMessageEventStore()
|
||||||
|
contactStore := mock.NewMockContactStore()
|
||||||
|
messageStore := mock.NewMockMessageStore()
|
||||||
|
schMsgStore := mock.NewMockScheduledMessageStore()
|
||||||
|
|
||||||
|
handler := NewScheduledMessageEventHandler(mockStore)
|
||||||
|
|
||||||
|
recipientId := uuid.New()
|
||||||
|
messageId := uuid.New()
|
||||||
|
scheduledMessageId := uuid.New()
|
||||||
|
testUserId := uuid.New()
|
||||||
|
|
||||||
|
con := contact.Contact{}
|
||||||
|
con.Id = recipientId
|
||||||
|
con.PhoneNumber = "+10123456789"
|
||||||
|
con.UserId = testUserId
|
||||||
|
|
||||||
|
msg := message.Message{}
|
||||||
|
msg.Id = messageId
|
||||||
|
msg.Content = "Oh how the might have fallen"
|
||||||
|
msg.UserId = testUserId
|
||||||
|
|
||||||
|
schMsg := scheduling.ScheduledMessage{}
|
||||||
|
schMsg.Id = scheduledMessageId
|
||||||
|
schMsg.UserId = testUserId
|
||||||
|
schMsg.Scheduled = now.Add(20 * time.Minute)
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
testReq := CreateScheduledMessageEventRequest{RecipientId: recipientId, MessageId: messageId, ScheduledMessageId: scheduledMessageId}
|
||||||
|
jsonValue, _ := json.Marshal(testReq)
|
||||||
|
|
||||||
|
req, _ := http.NewRequest("POST", endpoint.AddEventToScheduledMessageEndpoint, strings.NewReader(string(jsonValue)))
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
|
||||||
|
handler.AddScheduledMessageEvent(rr, req)
|
||||||
|
|
||||||
|
assert.Equal(t, http.StatusCreated, rr.Code)
|
||||||
|
|
||||||
|
var response AddScheduledMessageEventResponse
|
||||||
|
err := json.Unmarshal(rr.Body.Bytes(), &response)
|
||||||
|
assert.NoError(t, err, "Error creating event %v", err)
|
||||||
|
|
||||||
|
assert.NotEmpty(t, response.Data, "No event created")
|
||||||
|
|
||||||
|
var event scheduling.ScheduledMessageEvent
|
||||||
|
event = response.Data[0]
|
||||||
|
|
||||||
|
assert.NotEmpty(t, event.Created, "Created date should not be empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetScheduledMessageEventWithMock(t *testing.T) {
|
||||||
|
now := time.Now()
|
||||||
|
|
||||||
|
contactStore := mock.NewMockContactStore()
|
||||||
|
messageStore := mock.NewMockMessageStore()
|
||||||
|
schMsgStore := mock.NewMockScheduledMessageStore()
|
||||||
|
schMsgEventStore := mock.NewMockScheduledMessageEventStore()
|
||||||
|
handler := NewScheduledMessageEventHandler(schMsgEventStore)
|
||||||
|
|
||||||
|
recipientId := uuid.New()
|
||||||
|
messageId := uuid.New()
|
||||||
|
scheduledMessageId := uuid.New()
|
||||||
|
testUserId := uuid.New()
|
||||||
|
|
||||||
|
con := contact.Contact{}
|
||||||
|
con.Id = recipientId
|
||||||
|
con.PhoneNumber = "+10123456789"
|
||||||
|
con.UserId = testUserId
|
||||||
|
|
||||||
|
msg := message.Message{}
|
||||||
|
msg.Id = messageId
|
||||||
|
msg.Content = "Oh how the might have fallen"
|
||||||
|
msg.UserId = testUserId
|
||||||
|
|
||||||
|
schMsg := scheduling.ScheduledMessage{}
|
||||||
|
schMsg.Id = scheduledMessageId
|
||||||
|
schMsg.UserId = testUserId
|
||||||
|
schMsg.Scheduled = now.Add(20 * time.Minute)
|
||||||
|
|
||||||
|
event := scheduling.ScheduledMessageEvent{}
|
||||||
|
event.MessageId = msg.Id
|
||||||
|
event.RecipientId = con.Id
|
||||||
|
event.ScheduledMessageId = schMsg.Id
|
||||||
|
|
||||||
|
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)
|
||||||
|
} else if err = schMsgEventStore.CreateScheduledMessageEvent(ctx, &event); err != nil {
|
||||||
|
assert.NoError(t, err, "Error creating scheduled message event: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
endpointValue := strings.Replace(endpoint.GetScheduledMessageEventEndpoint, "{id}", event.Id.String(), 1)
|
||||||
|
req, _ := http.NewRequest("GET", endpointValue, nil)
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
|
||||||
|
handler.GetScheduledMessageEvent(rr, req)
|
||||||
|
|
||||||
|
assert.Equal(t, http.StatusOK, rr.Code)
|
||||||
|
|
||||||
|
var response GetScheduledMessageEventResponse
|
||||||
|
err := json.Unmarshal(rr.Body.Bytes(), &response)
|
||||||
|
assert.NoError(t, err, "Error creating event %v", err)
|
||||||
|
|
||||||
|
assert.NotEmpty(t, response.Data, "No event created")
|
||||||
|
|
||||||
|
msgEvent := response.Data[0]
|
||||||
|
|
||||||
|
assert.NotEmpty(t, msgEvent.Created, "Created date should not be empty")
|
||||||
|
}
|
||||||
@@ -13,6 +13,7 @@ import (
|
|||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
"git.kundeng.us/phoenix/textsender-api/internal/handler/endpoint"
|
||||||
|
"git.kundeng.us/phoenix/textsender-api/internal/store/mock"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CreateScheduledMessageRequest struct {
|
type CreateScheduledMessageRequest struct {
|
||||||
@@ -23,7 +24,7 @@ type CreateScheduledMessageRequest struct {
|
|||||||
|
|
||||||
func TestCreateScheduledMessageWithMock(t *testing.T) {
|
func TestCreateScheduledMessageWithMock(t *testing.T) {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
mockStore := NewMockScheduledMessageStore()
|
mockStore := mock.NewMockScheduledMessageStore()
|
||||||
handler := NewScheduledMessageHandler(mockStore)
|
handler := NewScheduledMessageHandler(mockStore)
|
||||||
|
|
||||||
testUserId := uuid.New()
|
testUserId := uuid.New()
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package handler
|
package mock
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@@ -0,0 +1,90 @@
|
|||||||
|
package mock
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/google/uuid"
|
||||||
|
|
||||||
|
"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ScheduledMessageEventKey struct {
|
||||||
|
RecipientId uuid.UUID
|
||||||
|
MessageId uuid.UUID
|
||||||
|
ScheduledMessageId uuid.UUID
|
||||||
|
}
|
||||||
|
|
||||||
|
type MockScheduledMessageEventStore struct {
|
||||||
|
ScheduledMessageEvents map[uuid.UUID]*scheduling.ScheduledMessageEvent
|
||||||
|
ScheduledMessageEventsByKey map[ScheduledMessageEventKey]*scheduling.ScheduledMessageEvent
|
||||||
|
mu sync.RWMutex
|
||||||
|
Error error // Optional: simulate errors
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewMockScheduledMessageEventStore() *MockScheduledMessageEventStore {
|
||||||
|
return &MockScheduledMessageEventStore{
|
||||||
|
ScheduledMessageEvents: make(map[uuid.UUID]*scheduling.ScheduledMessageEvent),
|
||||||
|
ScheduledMessageEventsByKey: make(map[ScheduledMessageEventKey]*scheduling.ScheduledMessageEvent),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockScheduledMessageEventStore) Get(ctx context.Context, id uuid.UUID) (*scheduling.ScheduledMessageEvent, error) {
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
if m.Error != nil {
|
||||||
|
return nil, m.Error
|
||||||
|
}
|
||||||
|
|
||||||
|
if id == uuid.Nil {
|
||||||
|
return nil, fmt.Errorf("Id is nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, exists := m.ScheduledMessageEvents[id]; exists {
|
||||||
|
return m.ScheduledMessageEvents[id], nil
|
||||||
|
} else {
|
||||||
|
fmt.Println("Not found")
|
||||||
|
return nil, fmt.Errorf("Not found")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockScheduledMessageEventStore) CreateScheduledMessageEvent(ctx context.Context, event *scheduling.ScheduledMessageEvent) error {
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
if m.Error != nil {
|
||||||
|
return m.Error
|
||||||
|
}
|
||||||
|
|
||||||
|
if event.Id == uuid.Nil {
|
||||||
|
event.Id = uuid.New()
|
||||||
|
}
|
||||||
|
|
||||||
|
key := ScheduledMessageEventKey{RecipientId: event.RecipientId, MessageId: event.MessageId, ScheduledMessageId: event.ScheduledMessageId}
|
||||||
|
|
||||||
|
if _, exists := m.ScheduledMessageEventsByKey[key]; exists {
|
||||||
|
return fmt.Errorf("Already exists")
|
||||||
|
} else {
|
||||||
|
event.Created = time.Now()
|
||||||
|
m.ScheduledMessageEvents[event.Id] = event
|
||||||
|
m.ScheduledMessageEventsByKey[key] = event
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockScheduledMessageEventStore) Exists(ctx context.Context, event *scheduling.ScheduledMessageEvent) (bool, error) {
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
if m.Error != nil {
|
||||||
|
return false, m.Error
|
||||||
|
}
|
||||||
|
|
||||||
|
key := ScheduledMessageEventKey{RecipientId: event.RecipientId, MessageId: event.MessageId, ScheduledMessageId: event.ScheduledMessageId}
|
||||||
|
_, exists := m.ScheduledMessageEventsByKey[key]
|
||||||
|
|
||||||
|
return exists, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package store
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"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 {
|
||||||
|
Get(ctx context.Context, id uuid.UUID) (*scheduling.ScheduledMessageEvent, error)
|
||||||
|
CreateScheduledMessageEvent(ctx context.Context, event *scheduling.ScheduledMessageEvent) error
|
||||||
|
Exists(ctx context.Context, event *scheduling.ScheduledMessageEvent) (bool, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type PGScheduledMessageEventStore struct {
|
||||||
|
db *pgxpool.Pool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewScheduledMessageEventStore(db *pgxpool.Pool) *PGScheduledMessageEventStore {
|
||||||
|
return &PGScheduledMessageEventStore{db: db}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *PGScheduledMessageEventStore) Get(ctx context.Context, id uuid.UUID) (*scheduling.ScheduledMessageEvent, error) {
|
||||||
|
query := `SELECT id, recipient_id, message_id, scheduled_message_id, created FROM scheduled_message_events WHERE id = $1`
|
||||||
|
|
||||||
|
var event scheduling.ScheduledMessageEvent
|
||||||
|
err := s.db.QueryRow(ctx, query, id).Scan(
|
||||||
|
&event.Id, &event.RecipientId, &event.MessageId, &event.ScheduledMessageId, &event.Created,
|
||||||
|
)
|
||||||
|
|
||||||
|
if err == pgx.ErrNoRows {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("getting scheduled message event by ID: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return &event, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *PGScheduledMessageEventStore) CreateScheduledMessageEvent(ctx context.Context, event *scheduling.ScheduledMessageEvent) error {
|
||||||
|
query := `
|
||||||
|
INSERT INTO scheduled_message_events (recipient_id, message_id, scheduled_message_id)
|
||||||
|
VALUES ($1, $2, $3)
|
||||||
|
RETURNING id, created
|
||||||
|
`
|
||||||
|
|
||||||
|
return s.db.QueryRow(ctx, query, event.RecipientId, event.MessageId, event.ScheduledMessageId).Scan(
|
||||||
|
&event.Id, &event.Created,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *PGScheduledMessageEventStore) Exists(ctx context.Context, event *scheduling.ScheduledMessageEvent) (bool, error) {
|
||||||
|
query := `SELECT EXISTS(SELECT 1 FROM scheduled_message_events WHERE scheduled_message_id = $1 AND recipient_id = $2)`
|
||||||
|
|
||||||
|
var exists bool
|
||||||
|
err := s.db.QueryRow(ctx, query, event.ScheduledMessageId, event.RecipientId).Scan(&exists)
|
||||||
|
if err != nil {
|
||||||
|
return false, fmt.Errorf("Scheduled message event does not exist: %w", err)
|
||||||
|
} else {
|
||||||
|
return exists, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,10 +2,7 @@ package store
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
// "fmt"
|
|
||||||
|
|
||||||
// "github.com/google/uuid"
|
|
||||||
// "github.com/jackc/pgx/v5"
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
"github.com/jackc/pgx/v5/pgxpool"
|
||||||
|
|
||||||
"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
|
"git.kundeng.us/phoenix/textsender-models/pkg/message/scheduling"
|
||||||
|
|||||||
+11
-3
@@ -2,22 +2,30 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
|
|||||||
|
|
||||||
DROP TABLE IF EXISTS contacts CASCADE;
|
DROP TABLE IF EXISTS contacts CASCADE;
|
||||||
|
|
||||||
CREATE TABLE contacts (
|
CREATE TABLE IF NOT EXISTS contacts (
|
||||||
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||||
phone_number TEXT NOT NULL,
|
phone_number TEXT NOT NULL,
|
||||||
user_id UUID NOT NULL
|
user_id UUID NOT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE messages (
|
CREATE TABLE IF NOT EXISTS messages (
|
||||||
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||||
content TEXT NOT NULL,
|
content TEXT NOT NULL,
|
||||||
user_id UUID NOT NULL
|
user_id UUID NOT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE scheduled_messages (
|
CREATE TABLE IF NOT EXISTS scheduled_messages (
|
||||||
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||||
scheduled timestamptz NOT NULL,
|
scheduled timestamptz NOT NULL,
|
||||||
created timestamptz DEFAULT now(),
|
created timestamptz DEFAULT now(),
|
||||||
status TEXT CHECK (status IN ('PENDING', 'READY', 'PROCESSING', 'DONE')),
|
status TEXT CHECK (status IN ('PENDING', 'READY', 'PROCESSING', 'DONE')),
|
||||||
user_id UUID NOT NULL
|
user_id UUID NOT NULL
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS scheduled_message_events (
|
||||||
|
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
|
||||||
|
recipient_id UUID NOT NULL,
|
||||||
|
message_id UUID NOT NULL,
|
||||||
|
scheduled_message_id UUID NOT NULL,
|
||||||
|
created timestamptz DEFAULT now()
|
||||||
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user