tsk-14: Fix startup crash (#16)
Closes #14 Reviewed-on: phoenix/textsender-auth#16 Co-authored-by: phoenix <kundeng00@pm.me> Co-committed-by: phoenix <kundeng00@pm.me>
This commit is contained in:
+14
-8
@@ -37,18 +37,24 @@ func main() {
|
||||
ctx := context.Background()
|
||||
|
||||
if cfg.ResetDB {
|
||||
log.Println("Resetting database")
|
||||
if err := db.ResetDatabase(ctx); err != nil {
|
||||
log.Fatalf("Failed to reset database: %v", err)
|
||||
} else {
|
||||
log.Println("Resetting database")
|
||||
log.Println("Database reset completed. Exiting.")
|
||||
}
|
||||
log.Println("Database reset completed. Exiting.")
|
||||
return
|
||||
} else {
|
||||
if exists, err := database.TableExists(ctx, db.Pool, "users"); err == nil && !exists {
|
||||
fmt.Println("Resetting database")
|
||||
err = db.ResetDatabase(ctx)
|
||||
if exists, err := database.TableExists(ctx, db.Pool, "users"); err == nil {
|
||||
if !exists {
|
||||
if err = db.ResetDatabase(ctx); err != nil {
|
||||
fmt.Println("Error:", err)
|
||||
} else {
|
||||
fmt.Println("Database reset")
|
||||
}
|
||||
}
|
||||
} else {
|
||||
fmt.Println(err.Error())
|
||||
fmt.Println("Error:", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,8 +70,8 @@ func main() {
|
||||
router.Use(middleware.Timeout(60 * time.Second))
|
||||
router.Use(mdleware.JSONContentType)
|
||||
|
||||
router.Post(endpoint.Register, userHandler.Register)
|
||||
router.Post(endpoint.Login, loginHandler.Login)
|
||||
router.Method("Post", endpoint.Register, http.HandlerFunc(userHandler.Register))
|
||||
router.Method("Post", endpoint.Login, http.HandlerFunc(loginHandler.Login))
|
||||
|
||||
// Start server
|
||||
server := &http.Server{
|
||||
|
||||
@@ -39,9 +39,11 @@ func TestMain(m *testing.M) {
|
||||
|
||||
userStore := model.NewUserStore(db.Pool)
|
||||
userHandler := handler.NewUserHandler(userStore)
|
||||
loginHandler := handler.NewLoginHandler(userStore)
|
||||
|
||||
testRouter = mux.NewRouter()
|
||||
testRouter.HandleFunc(endpoint.Register, userHandler.Register).Methods("POST")
|
||||
testRouter.HandleFunc(endpoint.Login, loginHandler.Login).Methods("POST")
|
||||
|
||||
code := m.Run()
|
||||
os.Exit(code)
|
||||
|
||||
Reference in New Issue
Block a user