ev-dev-labs
diff --git a/‎cmd/ocpp-server/main.go‎
Lines changed: 73 additions & 9 deletions b/‎cmd/ocpp-server/main.go‎
Lines changed: 73 additions & 9 deletions
diff --git a/‎cmd/ocpp-server/main_test.go‎
Lines changed: 48 additions & 7 deletions b/‎cmd/ocpp-server/main_test.go‎
Lines changed: 48 additions & 7 deletions
@@ -16,10 +16,18 @@
 //	OCPP_LISTEN_ADDR           (default :9090)
 //	OCPP_HEARTBEAT_INTERVAL    (default 300s) — interval returned in BootNotification
 //	OCPP_READ_DEADLINE         (default 900s) — closes the WS if no message within this window
+//	OCPP_DB_HOST               (default "") — empty selects the zero-config
+//	                           in-memory session store; set it to persist via
+//	                           Postgres (internal/database/ocpp.Store).
+//	OCPP_DB_PORT               (default 5432)
+//	OCPP_DB_USER               (default teslasync)
+//	OCPP_DB_PASSWORD           (default teslasync)
+//	OCPP_DB_NAME               (default teslasync)
+//	OCPP_DB_SSLMODE            (default disable)
 //
-// Persistence: the foundation PR uses the in-memory session store
-// (internal/ocpp.MemorySessionStore). A Postgres-backed store can be
-// wired here in a follow-up without touching the protocol layer.
+// Persistence: Postgres when OCPP_DB_HOST is set, otherwise the
+// in-memory session store. The dispatcher only sees the
+// ocpp.SessionStore port, so the protocol layer is untouched either way.
 package main
 
 import (
@@ -30,12 +38,16 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"strconv"
 	"syscall"
 	"time"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
+	appconfig "github.com/ev-dev-labs/teslasync/internal/config"
+	"github.com/ev-dev-labs/teslasync/internal/database"
+	dbocpp "github.com/ev-dev-labs/teslasync/internal/database/ocpp"
 	"github.com/ev-dev-labs/teslasync/internal/ocpp"
 )
 
@@ -59,18 +71,53 @@ type config struct {
 	listenAddr        string
 	heartbeatInterval time.Duration
 	readDeadline      time.Duration
+	dbHost            string
+	dbPort            int
+	dbUser            string
+	dbPassword        string
+	dbName            string
+	dbSSLMode         string
 }
 
 // loadConfig resolves the CSMS configuration from the environment,
 // falling back to spec-sensible defaults for anything unset or blank.
+// An empty OCPP_DB_HOST selects the in-memory session store.
 func loadConfig() config {
 	return config{
 		listenAddr:        envOr("OCPP_LISTEN_ADDR", defaultListenAddr),
 		heartbeatInterval: envDurationOr("OCPP_HEARTBEAT_INTERVAL", defaultHeartbeatInterval),
 		readDeadline:      envDurationOr("OCPP_READ_DEADLINE", defaultReadDeadline),
+		dbHost:            os.Getenv("OCPP_DB_HOST"),
+		dbPort:            envIntOr("OCPP_DB_PORT", 5432),
+		dbUser:            envOr("OCPP_DB_USER", "teslasync"),
+		dbPassword:        envOr("OCPP_DB_PASSWORD", "teslasync"),
+		dbName:            envOr("OCPP_DB_NAME", "teslasync"),
+		dbSSLMode:         envOr("OCPP_DB_SSLMODE", "disable"),
 	}
 }
 
+// openSessionStore resolves the persistence backend: Postgres when
+// OCPP_DB_HOST is set, otherwise the zero-config in-memory store. It
+// returns a close func the caller must defer (a no-op for memory).
+func openSessionStore(ctx context.Context, cfg config) (ocpp.SessionStore, func(), error) {
+	if cfg.dbHost == "" {
+		return ocpp.NewMemorySessionStore(), func() {}, nil
+	}
+	db, err := database.New(ctx, appconfig.DatabaseConfig{
+		Host:     cfg.dbHost,
+		Port:     cfg.dbPort,
+		User:     cfg.dbUser,
+		Password: cfg.dbPassword,
+		Name:     cfg.dbName,
+		SSLMode:  cfg.dbSSLMode,
+	})
+	if err != nil {
+		return nil, nil, fmt.Errorf("connect database: %w", err)
+	}
+	log.Info().Str("host", cfg.dbHost).Str("db", cfg.dbName).Msg("OCPP CSMS using Postgres session store")
+	return dbocpp.NewStore(db), db.Close, nil
+}
+
 func main() {
 	zerolog.TimeFieldFormat = time.RFC3339
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339})
@@ -93,18 +140,22 @@ func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
 	defer cancel()
 
-	if err := run(ctx, newServer(cfg), ln, shutdownTimeout); err != nil {
+	store, closeStore, err := openSessionStore(ctx, cfg)
+	if err != nil {
+		log.Fatal().Err(err).Msg("OCPP server failed to open session store")
+	}
+	defer closeStore()
+
+	if err := run(ctx, newServer(cfg, store), ln, shutdownTimeout); err != nil {
 		log.Fatal().Err(err).Msg("OCPP server failed")
 	}
 }
 
 // newServer builds the HTTP server that fronts the OCPP CSMS: a
 // /healthz liveness probe plus the WebSocket transport mounted at
-// /ocpp/. Persistence uses the zero-config in-memory session store;
-// a Postgres-backed store can be swapped in without changing this
-// wiring or the protocol layer.
-func newServer(cfg config) *http.Server {
-	store := ocpp.NewMemorySessionStore()
+// /ocpp/. The session store is injected so main can select the
+// Postgres or in-memory backend without touching this wiring.
+func newServer(cfg config, store ocpp.SessionStore) *http.Server {
 	dispatcher := ocpp.NewDispatcher(store, cfg.heartbeatInterval)
 	ocppServer := ocpp.NewServer(dispatcher, cfg.readDeadline)
 	return &http.Server{
@@ -171,6 +222,19 @@ func envOr(key, def string) string {
 	return def
 }
 
+func envIntOr(key string, def int) int {
+	raw := os.Getenv(key)
+	if raw == "" {
+		return def
+	}
+	n, err := strconv.Atoi(raw)
+	if err != nil {
+		log.Warn().Err(err).Str("key", key).Str("raw", raw).Msg("invalid integer, using default")
+		return def
+	}
+	return n
+}
+
 func envDurationOr(key string, def time.Duration) time.Duration {
 	raw := os.Getenv(key)
 	if raw == "" {
 
@@ -12,6 +12,8 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+
+	"github.com/ev-dev-labs/teslasync/internal/ocpp"
 )
 
 // ── config helpers ─────────────────────────────────────────────────────────
@@ -196,7 +198,7 @@ func TestNewServer_Shape(t *testing.T) {
 		listenAddr:        "127.0.0.1:0",
 		heartbeatInterval: 30 * time.Second,
 		readDeadline:      0,
-	})
+	}, ocpp.NewMemorySessionStore())
 	if srv == nil {
 		t.Fatal("newServer returned nil")
 	}
@@ -221,7 +223,7 @@ func TestRun_GracefulShutdown(t *testing.T) {
 	if err != nil {
 		t.Fatalf("listen: %v", err)
 	}
-	srv := newServer(config{heartbeatInterval: time.Minute})
+	srv := newServer(config{heartbeatInterval: time.Minute}, ocpp.NewMemorySessionStore())
 
 	ctx, cancel := context.WithCancel(context.Background())
 	done := make(chan error, 1)
@@ -269,7 +271,7 @@ func TestRun_ContextAlreadyCancelled(t *testing.T) {
 	if err != nil {
 		t.Fatalf("listen: %v", err)
 	}
-	srv := newServer(config{heartbeatInterval: time.Minute})
+	srv := newServer(config{heartbeatInterval: time.Minute}, ocpp.NewMemorySessionStore())
 
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel() // already cancelled before run starts
@@ -284,7 +286,7 @@ func TestRun_ServerClosedExternallyReturnsNil(t *testing.T) {
 	if err != nil {
 		t.Fatalf("listen: %v", err)
 	}
-	srv := newServer(config{heartbeatInterval: time.Minute})
+	srv := newServer(config{heartbeatInterval: time.Minute}, ocpp.NewMemorySessionStore())
 
 	// Context never cancels; the serve loop ends only because the server
 	// is closed out from under it — Serve then reports ErrServerClosed,
@@ -329,7 +331,7 @@ func TestRun_ServeErrorIsWrapped(t *testing.T) {
 	if err := ln.Close(); err != nil {
 		t.Fatalf("close listener: %v", err)
 	}
-	srv := newServer(config{heartbeatInterval: time.Minute})
+	srv := newServer(config{heartbeatInterval: time.Minute}, ocpp.NewMemorySessionStore())
 
 	rerr := run(context.Background(), srv, ln, 2*time.Second)
 	if rerr == nil {
@@ -400,7 +402,7 @@ func TestRun_ShutdownTimeoutIsWrapped(t *testing.T) {
 // ── end-to-end OCPP WebSocket wiring ───────────────────────────────────────
 
 func TestOCPPServer_WebSocketBootNotification(t *testing.T) {
-	srv := newServer(config{heartbeatInterval: 42 * time.Second, readDeadline: 0})
+	srv := newServer(config{heartbeatInterval: 42 * time.Second, readDeadline: 0}, ocpp.NewMemorySessionStore())
 	ts := httptest.NewServer(srv.Handler)
 	defer ts.Close()
 
@@ -473,7 +475,7 @@ func TestOCPPServer_WebSocketBootNotification(t *testing.T) {
 }
 
 func TestOCPPServer_WebSocketRejectsWrongSubprotocol(t *testing.T) {
-	srv := newServer(config{heartbeatInterval: time.Minute})
+	srv := newServer(config{heartbeatInterval: time.Minute}, ocpp.NewMemorySessionStore())
 	ts := httptest.NewServer(srv.Handler)
 	defer ts.Close()
 
@@ -500,3 +502,42 @@ func TestOCPPServer_WebSocketRejectsWrongSubprotocol(t *testing.T) {
 func dialer(_ *testing.T) *websocket.Dialer {
 	return &websocket.Dialer{} // no subprotocols
 }
+
+// ── session store selection ────────────────────────────────────────────────
+
+func TestOpenSessionStore_MemoryByDefault(t *testing.T) {
+	store, closeFn, err := openSessionStore(context.Background(), config{})
+	if err != nil {
+		t.Fatalf("openSessionStore: %v", err)
+	}
+	defer closeFn()
+	if _, ok := store.(*ocpp.MemorySessionStore); !ok {
+		t.Fatalf("store = %T, want *ocpp.MemorySessionStore", store)
+	}
+}
+
+func TestEnvIntOr(t *testing.T) {
+	const key = "OCPP_TEST_ENV_INT_OR"
+	tests := []struct {
+		name  string
+		set   bool
+		value string
+		def   int
+		want  int
+	}{
+		{"unset returns default", false, "", 5432, 5432},
+		{"empty value returns default", true, "", 5432, 5432},
+		{"set value overrides default", true, "5433", 5432, 5433},
+		{"invalid value returns default", true, "not-a-port", 5432, 5432},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.set {
+				t.Setenv(key, tt.value)
+			}
+			if got := envIntOr(key, tt.def); got != tt.want {
+				t.Errorf("envIntOr = %d, want %d", got, tt.want)
+			}
+		})
+	}
+}