Updated dbconv for new pending and results schema

Author: PythonHacker24

internal/session/dbconv.go

@@ -13,7 +13,7 @@ import (
 
 /* converts project session struct into PostgreSQL supported format */
 func ConvertSessionToStoreParams(session *Session) (*postgresql.StoreSessionPQParams, error) {
-	// Validate status
+	/* validate status */
 	status := string(session.Status)
 	if status != string(StatusActive) && status != string(StatusExpired) && status != string(StatusPending) {
 		return nil, fmt.Errorf("invalid session status: %q, must be one of: %q, %q, %q",
@@ -53,17 +53,17 @@ func ConvertSessionToStoreParams(session *Session) (*postgresql.StoreSessionPQPa
 }
 
 /* converts project transaction struct into PostgreSQL supported format */
-func ConvertTransactiontoStoreParams(tx types.Transaction) (postgresql.CreateTransactionPQParams, error) {
+func ConvertTransactionPendingtoStoreParams(tx types.Transaction) (postgresql.CreatePendingTransactionPQParams, error) {
 	/* marshal ACL entries to JSON bytes */
 	entriesJSON, err := json.Marshal(tx.Entries)
 	if err != nil {
-		return postgresql.CreateTransactionPQParams{}, fmt.Errorf("failed to marshal ACL entries: %w", err)
+		return postgresql.CreatePendingTransactionPQParams{}, fmt.Errorf("failed to marshal ACL entries: %w", err)
 	}
 
 	/* convert timestamp to pgtype.Timestamptz */
 	var timestamp pgtype.Timestamptz
 	if err := timestamp.Scan(tx.Timestamp); err != nil {
-		return postgresql.CreateTransactionPQParams{}, fmt.Errorf("failed to convert timestamp: %w", err)
+		return postgresql.CreatePendingTransactionPQParams{}, fmt.Errorf("failed to convert timestamp: %w", err)
 	}
 
 	/* handle optional error message */
@@ -84,7 +84,54 @@ func ConvertTransactiontoStoreParams(tx types.Transaction) (postgresql.CreateTra
 		durationMs = pgtype.Int8{Int64: tx.DurationMs, Valid: true}
 	}
 
-	return postgresql.CreateTransactionPQParams{
+	return postgresql.CreatePendingTransactionPQParams{
+		ID:         tx.ID,
+		SessionID:  tx.SessionID,
+		Timestamp:  timestamp,
+		Operation:  string(tx.Operation),
+		TargetPath: tx.TargetPath,
+		Entries:    entriesJSON,
+		Status:     string(tx.Status),
+		ErrorMsg:   errorMsg,
+		Output:     output,
+		ExecutedBy: tx.ExecutedBy,
+		DurationMs: durationMs,
+	}, nil
+}
+
+/* converts project transaction struct into PostgreSQL supported format */
+func ConvertTransactionResulttoStoreParams(tx types.Transaction) (postgresql.CreateResultsTransactionPQParams, error) {
+	/* marshal ACL entries to JSON bytes */
+	entriesJSON, err := json.Marshal(tx.Entries)
+	if err != nil {
+		return postgresql.CreateResultsTransactionPQParams{}, fmt.Errorf("failed to marshal ACL entries: %w", err)
+	}
+
+	/* convert timestamp to pgtype.Timestamptz */
+	var timestamp pgtype.Timestamptz
+	if err := timestamp.Scan(tx.Timestamp); err != nil {
+		return postgresql.CreateResultsTransactionPQParams{}, fmt.Errorf("failed to convert timestamp: %w", err)
+	}
+
+	/* handle optional error message */
+	var errorMsg pgtype.Text
+	if tx.ErrorMsg != "" {
+		errorMsg = pgtype.Text{String: tx.ErrorMsg, Valid: true}
+	}
+
+	/* handle optional output */
+	var output pgtype.Text
+	if tx.Output != "" {
+		output = pgtype.Text{String: tx.Output, Valid: true}
+	}
+
+	/* Handle optional duration */
+	var durationMs pgtype.Int8
+	if tx.DurationMs > 0 {
+		durationMs = pgtype.Int8{Int64: tx.DurationMs, Valid: true}
+	}
+
+	return postgresql.CreateResultsTransactionPQParams{
 		ID:         tx.ID,
 		SessionID:  tx.SessionID,
 		Timestamp:  timestamp,