add db models, refactor json models, add references in migrations
This commit is contained in:
@@ -2,8 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"gitea.local.lab/Lbenedar/foundry_helper_service/internal/foundry/models"
|
||||
)
|
||||
|
||||
func (app *application) ShowText(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -27,27 +25,28 @@ func (app *application) ShowText(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
func (app *application) WhenNextSession(w http.ResponseWriter, r *http.Request) {
|
||||
data, err := app.foundryApp.HandleWSRequest("/setup")
|
||||
if err != nil {
|
||||
app.slogger.Error("", "error", err)
|
||||
w.Write([]byte(err.Error()))
|
||||
return
|
||||
}
|
||||
// data, err := app.foundryApp.HandleWSRequest("/setup")
|
||||
// if err != nil {
|
||||
// app.slogger.Error("", "error", err)
|
||||
// w.Write([]byte(err.Error()))
|
||||
// return
|
||||
// }
|
||||
|
||||
setupData, err := models.ParseSetupModel(data)
|
||||
if err != nil {
|
||||
app.slogger.Error("", "error", err)
|
||||
w.Write([]byte(err.Error()))
|
||||
return
|
||||
}
|
||||
// setupData, err := json_model.ParseSetupModel(data)
|
||||
// if err != nil {
|
||||
// app.slogger.Error("", "error", err)
|
||||
// w.Write([]byte(err.Error()))
|
||||
// return
|
||||
// }
|
||||
|
||||
nextSession, err := setupData.GetWorlds().GetSessionTime("")
|
||||
if err != nil {
|
||||
app.slogger.Error("", "error", err)
|
||||
w.Write([]byte(err.Error()))
|
||||
return
|
||||
}
|
||||
// // nextSession, err := setupData.GetWorlds().GetSessionTime("")
|
||||
// // if err != nil {
|
||||
// // app.slogger.Error("", "error", err)
|
||||
// // w.Write([]byte(err.Error()))
|
||||
// // return
|
||||
// // }
|
||||
|
||||
app.slogger.Info("Next session data is ready to send", "sessionTime", nextSession)
|
||||
w.Write([]byte(nextSession.Local().String()))
|
||||
// app.slogger.Info("Next session data is ready to send", "sessionTime", nextSession)
|
||||
// w.Write([]byte(nextSession.Local().String()))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -150,6 +150,8 @@ func main() {
|
||||
defer db.Close()
|
||||
app.slogger.Info("Database connection pool established")
|
||||
|
||||
app.foundryApp.CreateNewDataModels(db)
|
||||
|
||||
go app.StartListenFoundry()
|
||||
|
||||
errLog := slog.NewLogLogger(app.slogger.Handler(), slog.LevelError)
|
||||
|
||||
Reference in New Issue
Block a user