refactor: merge internal/sync into internal/garmin, regroup api files and routes
Garmin auth/sync routes move under /api/garmin/*; sync.Service becomes garmin.Sync with garmin.SyncConfig/ClientConfig; applog becomes internal/log; the test mock moves into the garmin package as MockClient (breaking the test-only import cycle the merge created); stale test URLs and type names updated to match. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -14,22 +14,21 @@ import (
|
||||
"time"
|
||||
|
||||
"geniusrun/backend/internal/api"
|
||||
"geniusrun/backend/internal/applog"
|
||||
"geniusrun/backend/internal/auth"
|
||||
"geniusrun/backend/internal/config"
|
||||
"geniusrun/backend/internal/garmin"
|
||||
"geniusrun/backend/internal/log"
|
||||
"geniusrun/backend/internal/store"
|
||||
appsync "geniusrun/backend/internal/sync"
|
||||
)
|
||||
|
||||
func main() {
|
||||
cfg, err := config.Load()
|
||||
envCfg, err := config.LoadEnv()
|
||||
if err != nil {
|
||||
log.Fatalf("config: %v", err)
|
||||
}
|
||||
slog.SetDefault(applog.NewLogger(cfg.LogLevel, os.Stdout))
|
||||
slog.SetDefault(applog.NewLogger(envCfg.LogLevel, os.Stdout))
|
||||
|
||||
db, err := store.Open(cfg.DBPath)
|
||||
db, err := store.Open(envCfg.DBPath)
|
||||
if err != nil {
|
||||
log.Fatalf("open database: %v", err)
|
||||
}
|
||||
@@ -45,37 +44,43 @@ func main() {
|
||||
}
|
||||
|
||||
authVerifier, err := auth.NewOIDCVerifier(context.Background(), auth.OIDCConfig{
|
||||
IssuerURL: cfg.OIDCIssuerURL,
|
||||
ClientID: cfg.OIDCClientID,
|
||||
ClientSecret: cfg.OIDCClientSecret,
|
||||
RedirectURL: cfg.OIDCRedirectURL,
|
||||
RequiredRole: cfg.OIDCRequiredRole,
|
||||
IssuerURL: envCfg.OIDCIssuerURL,
|
||||
ClientID: envCfg.OIDCClientID,
|
||||
ClientSecret: envCfg.OIDCClientSecret,
|
||||
RedirectURL: envCfg.OIDCRedirectURL,
|
||||
RequiredRole: envCfg.OIDCRequiredRole,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatalf("oidc: %v", err)
|
||||
}
|
||||
|
||||
server := api.NewServer(db, garmin.NewClient, garmin.Config{
|
||||
PythonPath: cfg.GarminPythonPath,
|
||||
TokenStorePath: cfg.GarminTokenStoreRoot,
|
||||
}, appsync.Config{}, authVerifier, api.SessionConfig{
|
||||
Secret: cfg.SessionSecret,
|
||||
Duration: appCfg.SessionDuration,
|
||||
Secure: cfg.SessionSecure,
|
||||
BackendURL: cfg.BackendURL,
|
||||
FrontendURL: cfg.FrontendURL,
|
||||
})
|
||||
server := api.NewServer(
|
||||
db,
|
||||
garmin.NewClient,
|
||||
garmin.ClientConfig{
|
||||
PythonPath: envCfg.PythonPath,
|
||||
TokenStorePath: envCfg.TokenStoreRoot,
|
||||
},
|
||||
garmin.SyncConfig{},
|
||||
authVerifier,
|
||||
api.SessionConfig{
|
||||
Secret: envCfg.SessionSecret,
|
||||
Duration: appCfg.SessionDuration,
|
||||
Secure: envCfg.SessionSecure,
|
||||
BackendURL: envCfg.BackendURL,
|
||||
FrontendURL: envCfg.FrontendURL,
|
||||
})
|
||||
|
||||
for _, e := range cfg.DisplayEnv() {
|
||||
for _, e := range envCfg.DisplayEnv() {
|
||||
server.EnvVars = append(server.EnvVars, api.EnvVar{Name: e.Name, Value: e.Value})
|
||||
}
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer stop()
|
||||
|
||||
httpServer := &http.Server{Addr: cfg.Addr, Handler: server.Router()}
|
||||
httpServer := &http.Server{Addr: envCfg.BackendAddr, Handler: server.Router()}
|
||||
go func() {
|
||||
log.Printf("geniusrund listening on %s", cfg.Addr)
|
||||
log.Printf("geniusrund listening on %s", envCfg.BackendAddr)
|
||||
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||
log.Fatalf("http server: %v", err)
|
||||
}
|
||||
|
||||
@@ -13,9 +13,8 @@ import (
|
||||
"time"
|
||||
|
||||
"geniusrun/backend/internal/classify"
|
||||
"geniusrun/backend/internal/garmin/mock"
|
||||
"geniusrun/backend/internal/garmin"
|
||||
"geniusrun/backend/internal/store"
|
||||
appsync "geniusrun/backend/internal/sync"
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -73,8 +72,8 @@ func main() {
|
||||
IsActive: true,
|
||||
}))
|
||||
|
||||
m := &mock.Client{}
|
||||
svc := appsync.NewService(m, db, userID, appsync.Config{MinConfidence: 0.6}, nil)
|
||||
m := &garmin.MockClient{}
|
||||
svc := garmin.NewSync(m, db, userID, garmin.SyncConfig{MinConfidence: 0.6}, nil)
|
||||
|
||||
today := time.Now()
|
||||
activityIDs := []int64{}
|
||||
|
||||
Reference in New Issue
Block a user