refactor: move function from reader to DBContext

Author: oagudo

db_context.go

@@ -110,6 +110,30 @@ func (c *DBContext) getCurrentTimestampInUTC() string {
 	}
 }
 
+func (c *DBContext) buildSelectMessagesQuery() string {
+	limitPlaceholder := c.getSQLPlaceholder(1)
+
+	switch c.dialect {
+	case SQLDialectOracle:
+		return fmt.Sprintf(`SELECT id, payload, created_at, scheduled_at, metadata, times_attempted 
+			FROM outbox
+			WHERE scheduled_at <= %s
+			ORDER BY created_at ASC FETCH FIRST %s ROWS ONLY`, c.getCurrentTimestampInUTC(), limitPlaceholder)
+
+	case SQLDialectSQLServer:
+		return fmt.Sprintf(`SELECT TOP (%s) id, payload, created_at, scheduled_at, metadata, times_attempted 
+			FROM outbox
+			WHERE scheduled_at <= %s
+			ORDER BY created_at ASC`, limitPlaceholder, c.getCurrentTimestampInUTC())
+
+	default:
+		return fmt.Sprintf(`SELECT id, payload, created_at, scheduled_at, metadata, times_attempted 
+			FROM outbox
+			WHERE scheduled_at <= %s
+			ORDER BY created_at ASC LIMIT %s`, c.getCurrentTimestampInUTC(), limitPlaceholder)
+	}
+}
+
 // txAdapter is a wrapper around a sql.Tx that implements the Tx interface.
 type txAdapter struct {
 	tx *sql.Tx

reader.go

@@ -538,7 +538,7 @@ func (r *Reader) readOutboxMessages() ([]*Message, error) {
 	defer cancel()
 
 	// nolint:gosec
-	query := r.buildSelectMessagesQuery()
+	query := r.dbCtx.buildSelectMessagesQuery()
 	rows, err := r.dbCtx.db.QueryContext(ctx, query, r.maxMessages)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query outbox messages: %w", err)
@@ -560,27 +560,3 @@ func (r *Reader) readOutboxMessages() ([]*Message, error) {
 	}
 	return messages, nil
 }
-
-func (r *Reader) buildSelectMessagesQuery() string {
-	limitPlaceholder := r.dbCtx.getSQLPlaceholder(1)
-
-	switch r.dbCtx.dialect {
-	case SQLDialectOracle:
-		return fmt.Sprintf(`SELECT id, payload, created_at, scheduled_at, metadata, times_attempted 
-			FROM outbox 
-			WHERE scheduled_at <= %s 
-			ORDER BY created_at ASC FETCH FIRST %s ROWS ONLY`, r.dbCtx.getCurrentTimestampInUTC(), limitPlaceholder)
-
-	case SQLDialectSQLServer:
-		return fmt.Sprintf(`SELECT TOP (%s) id, payload, created_at, scheduled_at, metadata, times_attempted 
-			FROM outbox 
-			WHERE scheduled_at <= %s 
-			ORDER BY created_at ASC`, limitPlaceholder, r.dbCtx.getCurrentTimestampInUTC())
-
-	default:
-		return fmt.Sprintf(`SELECT id, payload, created_at, scheduled_at, metadata, times_attempted 
-			FROM outbox 
-			WHERE scheduled_at <= %s
-			ORDER BY created_at ASC LIMIT %s`, r.dbCtx.getCurrentTimestampInUTC(), limitPlaceholder)
-	}
-}