fix(api): pass database instance to Server struct for owner redirect handlers

Signed-off-by: djach7 <djachimo@redhat.com>

Author: djach7

api/handlers/rvinfo.go

@@ -35,7 +35,17 @@ func RvInfoHandler() http.HandlerFunc {
 // GetOwnerRedirect implements the rvInfo GET endpoint (OpenAPI interface method)
 func (s *Server) GetOwnerRedirect(w http.ResponseWriter, r *http.Request) {
 	slog.Debug("Fetching rvInfo")
-	rvInfoJSON, err := db.FetchRvInfoJSON()
+
+	var rvInfoJSON []byte
+	var err error
+
+	// Use struct database if available, otherwise fall back to global db
+	if s.db != nil {
+		rvInfoJSON, err = s.db.FetchRvInfoJSON()
+	} else {
+		rvInfoJSON, err = db.FetchRvInfoJSON()
+	}
+
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			slog.Error("No rvInfo found")
@@ -53,12 +63,29 @@ func (s *Server) GetOwnerRedirect(w http.ResponseWriter, r *http.Request) {
 
 // PostOwnerRedirect implements the rvInfo POST endpoint (OpenAPI interface method)
 func (s *Server) PostOwnerRedirect(w http.ResponseWriter, r *http.Request) {
+	slog.Debug("PostOwnerRedirect: Starting handler")
+	
 	rvInfo, ok := ReadRequestBody(w, r)
 	if !ok {
+		slog.Error("PostOwnerRedirect: Failed to read request body")
 		return
 	}
+	
+	slog.Debug("PostOwnerRedirect: Read request body", "size", len(rvInfo))
+
+	// Use struct database if available, otherwise fall back to global db
+	var err error
+	if s.db != nil {
+		slog.Debug("PostOwnerRedirect: Using struct database")
+		err = s.db.InsertRvInfo(rvInfo)
+	} else {
+		slog.Debug("PostOwnerRedirect: Using global database (fallback)")
+		err = db.InsertRvInfo(rvInfo)
+	}
+	
+	slog.Debug("PostOwnerRedirect: Insert operation completed", "error", err)
 
-	if err := db.InsertRvInfo(rvInfo); err != nil {
+	if err != nil {
 		if HandleDBError(w, r, "rvInfo", err) {
 			return
 		}
@@ -77,6 +104,8 @@ func (s *Server) PostOwnerRedirect(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", ContentTypeJSON)
 	w.WriteHeader(http.StatusCreated)
 	w.Write(rvInfo)
+	
+	slog.Debug("PostOwnerRedirect: Successfully completed, response sent")
 }
 
 // PutOwnerRedirect implements the rvInfo PUT endpoint (OpenAPI interface method)
@@ -86,7 +115,15 @@ func (s *Server) PutOwnerRedirect(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := db.UpdateRvInfo(rvInfo); err != nil {
+	// Use struct database if available, otherwise fall back to global db
+	var err error
+	if s.db != nil {
+		err = s.db.UpdateRvInfo(rvInfo)
+	} else {
+		err = db.UpdateRvInfo(rvInfo)
+	}
+
+	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			slog.Error("rvInfo does not exist, cannot update")
 			WriteErrorResponse(w, r, http.StatusNotFound, "rvInfo does not exist", "No rvInfo found to update", "rvInfo does not exist")

api/handlers/vouchers.go

@@ -32,13 +32,15 @@ import (
 type Server struct {
 	ownerPKeys []crypto.PublicKey
 	to2Server  *fdo.TO2Server
+	db         *db.State
 }
 
 // NewServer creates a new Server instance
-func NewServer(ownerPKeys []crypto.PublicKey, to2Server *fdo.TO2Server) *Server {
+func NewServer(ownerPKeys []crypto.PublicKey, to2Server *fdo.TO2Server, database *db.State) *Server {
 	return &Server{
 		ownerPKeys: ownerPKeys,
 		to2Server:  to2Server,
+		db:         database,
 	}
 }
 

cmd/owner.go

@@ -321,7 +321,7 @@ func serveOwner(config *OwnerServerConfig) error {
 	}
 
 	// Create OpenAPI server instance
-	apiServer := handlers.NewServer([]crypto.PublicKey{state.ownerKey.Public()}, to2Server)
+	apiServer := handlers.NewServer([]crypto.PublicKey{state.ownerKey.Public()}, to2Server, state.DB)
 
 	// Create the main HTTP handler with chi router for API endpoints
 	mainHandler := http.NewServeMux()

internal/db/state.go

@@ -17,6 +17,7 @@ import (
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 // State implements all FDO server state persistence interfaces using GORM
@@ -98,6 +99,50 @@ func (s *State) Close() error {
 	return sqlDB.Close()
 }
 
+// FetchRvInfoJSON reads the rvinfo JSON from the database
+func (s *State) FetchRvInfoJSON() ([]byte, error) {
+	var rvInfo RvInfo
+	if err := s.DB.Where("id = ?", 1).First(&rvInfo).Error; err != nil {
+		return nil, err
+	}
+	return rvInfo.Value, nil
+}
+
+// InsertRvInfo inserts new rvinfo JSON into the database
+func (s *State) InsertRvInfo(data []byte) error {
+	// check the data can be parsed into [][]protocol.RvInstruction
+	if _, err := parseHumanReadableRvJSON(data); err != nil {
+		return fmt.Errorf("%w: %v", ErrInvalidRvInfo, err)
+	}
+
+	rvInfo := RvInfo{
+		ID:    1,
+		Value: data,
+	}
+	tx := s.DB.Clauses(clause.OnConflict{DoNothing: true}).Create(&rvInfo)
+	if tx.Error != nil {
+		return tx.Error
+	}
+	if tx.RowsAffected == 0 {
+		return gorm.ErrDuplicatedKey
+	}
+	return nil
+}
+
+// UpdateRvInfo updates existing rvinfo JSON in the database
+func (s *State) UpdateRvInfo(data []byte) error {
+	// check the data can be parsed into [][]protocol.RvInstruction
+	if _, err := parseHumanReadableRvJSON(data); err != nil {
+		return fmt.Errorf("%w: %v", ErrInvalidRvInfo, err)
+	}
+
+	rvInfo := RvInfo{
+		ID:    1,
+		Value: data,
+	}
+	return s.DB.Save(&rvInfo).Error
+}
+
 // Compile-time check for interface implementation correctness
 var _ interface {
 	protocol.TokenService