tsk-24: Fixed tests (#25)
Closes #24 Reviewed-on: phoenix/textsender-api#25 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
+2
-2
@@ -64,12 +64,12 @@ func main() {
|
||||
contactStore := store.NewContactStore(db.Pool)
|
||||
messageStore := store.NewMessageStore(db.Pool)
|
||||
schStore := store.NewScheduledMessageStore(db.Pool)
|
||||
schMsgEvent := store.NewScheduledMessageEventStore(db.Pool)
|
||||
schMsgEventStore := store.NewScheduledMessageEventStore(db.Pool)
|
||||
|
||||
contactHandler := handler.NewContactHandler(contactStore)
|
||||
messageHandler := handler.NewMessageHandler(messageStore)
|
||||
scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
|
||||
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEvent)
|
||||
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore)
|
||||
|
||||
router := chi.NewRouter()
|
||||
|
||||
|
||||
+36
-7
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"path"
|
||||
"testing"
|
||||
@@ -15,6 +16,8 @@ import (
|
||||
"git.kundeng.us/phoenix/textsender-api/internal/db"
|
||||
"git.kundeng.us/phoenix/textsender-api/internal/handler"
|
||||
"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"
|
||||
)
|
||||
|
||||
@@ -23,25 +26,51 @@ var testRouter *mux.Router
|
||||
func TestMain(m *testing.M) {
|
||||
cfg := load()
|
||||
|
||||
db, err := db.NewDatabase(cfg.GetDBConnString())
|
||||
database, err := db.NewDatabase(cfg.GetDBConnString())
|
||||
if err != nil {
|
||||
fmt.Println(err.Error())
|
||||
panic("Failed to initialize database")
|
||||
}
|
||||
defer db.Close()
|
||||
defer database.Close()
|
||||
|
||||
ctx := context.Background()
|
||||
err = db.ResetDatabase(ctx)
|
||||
if err != nil {
|
||||
fmt.Println(err.Error())
|
||||
panic("Failed to initialize database")
|
||||
|
||||
if cfg.ResetDB {
|
||||
if err = database.ResetDatabase(ctx); err != nil {
|
||||
fmt.Println(err.Error())
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
contactStore := store.NewContactStore(db.Pool)
|
||||
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)
|
||||
|
||||
contactHandler := handler.NewContactHandler(contactStore)
|
||||
messageHandler := handler.NewMessageHandler(messageStore)
|
||||
scheduledMessageHandler := handler.NewScheduledMessageHandler(schStore)
|
||||
scheduledMessageEventHandler := handler.NewScheduledMessageEventHandler(schMsgEventStore)
|
||||
|
||||
testRouter = mux.NewRouter()
|
||||
testRouter.HandleFunc(endpoint.ADD_CONTACT_ENDPOINT, contactHandler.AddContact).Methods("POST")
|
||||
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)))
|
||||
|
||||
code := m.Run()
|
||||
os.Exit(code)
|
||||
|
||||
Reference in New Issue
Block a user