phoenix/schedtxt_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tsk-51: Send message endpoint (#52)

Browse Source 
Closes #51

Reviewed-on: phoenix/textsender-api#52
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
phoenix
2025-12-10 21:35:02 +00:00
committed by phoenix
parent 20ffc45f89
commit 0d252bc261
32 changed files with 753 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/api/main.go
+23 -19
View File
@@ -15,6 +15,7 @@ import (
"github.com/swaggo/http-swagger/v2"
_ "git.kundeng.us/phoenix/textsender-api/docs"
"git.kundeng.us/phoenix/textsender-api/internal/app"
"git.kundeng.us/phoenix/textsender-api/internal/config"
database "git.kundeng.us/phoenix/textsender-api/internal/db"
"git.kundeng.us/phoenix/textsender-api/internal/handler"
@@ -36,18 +37,20 @@ import (
// @name Authorization
// @description JWT Bearer Token
func main() {
cfg := config.Load()
if cfg == nil {
fmt.Println("Error initializing config")
os.Exit(-1)
cfg, tCfg, err := config.Load()
if err != nil {
log.Fatal("Error:", err)
} else if cfg == nil {
log.Fatal("Error initializing config")
} else if cfg.JWTSecret == "" {
fmt.Println("Error: JWTSecret not initialized")
os.Exit(-1)
log.Fatal("Error: JWTSecret not initialized")
}
apiApp := app.App{TwilioConfig: tCfg}
db, err := database.NewDatabase(cfg.GetDBConnString())
if err != nil {
log.Fatalf("Failed to connect to database: %v", err)
log.Fatal("Failed to connect to database:", err)
}
defer db.Close()
@@ -56,19 +59,18 @@ func main() {
if cfg.ResetDB {
log.Println("Resetting database")
if err := db.ResetDatabase(ctx); err != nil {
log.Fatalf("Failed to reset database: %v", err)
log.Fatal("Failed to reset database:", err)
}
log.Println("Database reset completed. Exiting.")
return
} else {
if exists, err := database.TableExists(ctx, db.Pool, "contacts"); err == nil && !exists {
fmt.Println("Resetting database")
err = db.ResetDatabase(ctx)
if err != nil {
fmt.Printf("Error:%v", err)
log.Println("Resetting database")
if err = db.ResetDatabase(ctx); err != nil {
log.Fatal("Error:", err)
}
} else {
fmt.Printf("Error:%v", err)
log.Fatal("Error:", err)
}
}
@@ -80,12 +82,13 @@ func main() {
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)
contactHandler := handler.NewContactHandler(&apiApp, contactStore)
messageHandler := handler.NewMessageHandler(&apiApp, messageStore)
scheduledMessageHandler := handler.NewScheduledMessageHandler(&apiApp, schStore)
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(&apiApp, schMsgEventStore, schStore)
scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(&apiApp, schMsgEventStore, schStore)
eventHandler := handler.NewEventResponseHandler(&apiApp, merStore)
instantMessageHandler := handler.NewSendInstantMessageHandler(&apiApp, merStore, contactStore, messageStore)
router := chi.NewRouter()
@@ -106,6 +109,7 @@ func main() {
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("POST", endpoint.SendInstantMessageEndpoint, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(instantMessageHandler.Send)))
router.Method("GET", "/swagger/*", httpSwagger.Handler(
httpSwagger.URL(fmt.Sprintf("http://localhost:%s/swagger/doc.json", config.PORT)),
cmd/api/main_test.go
+19 -12
View File
@@ -4,6 +4,7 @@ import (
"context"
"flag"
"fmt"
"log"
"net/http"
"os"
"path"
@@ -12,6 +13,7 @@ import (
"github.com/go-chi/chi/v5"
"github.com/joho/godotenv"
"git.kundeng.us/phoenix/textsender-api/internal/app"
"git.kundeng.us/phoenix/textsender-api/internal/config"
"git.kundeng.us/phoenix/textsender-api/internal/db"
"git.kundeng.us/phoenix/textsender-api/internal/handler"
@@ -24,7 +26,7 @@ import (
var testRouter *chi.Mux
func TestMain(m *testing.M) {
cfg := load()
cfg, apiApp := load()
database, err := db.NewDatabase(cfg.GetDBConnString())
if err != nil {
@@ -60,12 +62,12 @@ func TestMain(m *testing.M) {
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)
contactHandler := handler.NewContactHandler(apiApp, contactStore)
messageHandler := handler.NewMessageHandler(apiApp, messageStore)
scheduledMessageHandler := handler.NewScheduledMessageHandler(apiApp, schStore)
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(apiApp, schMsgEventStore, schStore)
scheduledMessageStatusHandler := handler.NewScheduledMessageStatusHandler(apiApp, schMsgEventStore, schStore)
eventHandler := handler.NewEventResponseHandler(apiApp, merStore)
testRouter = chi.NewRouter()
testRouter.Handle(endpoint.ADD_CONTACT_ENDPOINT, mdlware.AuthMiddleware(jwtService)(http.HandlerFunc(contactHandler.AddContact)))
@@ -84,7 +86,7 @@ func TestMain(m *testing.M) {
os.Exit(code)
}
func load() *config.Config {
func load() (*config.Config, *app.App) {
resetDb := flag.Bool("reset-db", false, "Reset the database schema and exit")
port := flag.String("port", config.PORT, "Server port")
flag.Parse()
@@ -103,10 +105,15 @@ func load() *config.Config {
unpackedConnString := config.UnpackDBConnString()
dbConnString := unpackedConnString.Parse()
return &config.Config{
DBConnString: dbConnString,
ServerPort: *port,
ResetDB: *resetDb,
if tCfg, err := config.TwilioConfig(); err != nil {
log.Fatal("Error: ", err)
return nil, nil
} else {
return &config.Config{
DBConnString: dbConnString,
ServerPort: *port,
ResetDB: *resetDb,
}, &app.App{TwilioConfig: tCfg}
}
}