api: move server init to internal/server

Taskfile.yaml

@@ -53,6 +53,7 @@ tasks:
   dev:
     cmds:
       - task: db:up
+      - cmd: air
 
   image:up:
     dir: "{{.TASKFILE_DIR}}/docker"

cmd/server/main.go

@@ -3,23 +3,12 @@ package main
 import (
 	"context"
 	"log"
-	"os"
 
-	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jsec/f1-data-hub/internal/server"
 )
 
 func main() {
-	pool, err := pgxpool.New(context.Background(), os.Getenv("DATABASE_URL"))
-	if err != nil {
-		log.Fatal("Error getting database connection:", err)
-	}
-	defer pool.Close()
-
-	server := server.NewServer(pool)
-
-	err = server.ListenAndServe()
-	if err != nil {
-		log.Fatal("Error starting server:", err)
+	if err := server.Run(context.Background()); err != nil {
+		log.Fatal(err)
 	}
 }

internal/server/server.go

@@ -1,8 +1,10 @@
 package server
 
 import (
+	"context"
 	"fmt"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/jackc/pgx/v5/pgxpool"
@@ -14,7 +16,7 @@ type Server struct {
 	db   *database.Queries
 }
 
-func NewServer(pool *pgxpool.Pool) *http.Server {
+func createServer(pool *pgxpool.Pool) *http.Server {
 	// TODO: move this to an env variable
 	port := 8080
 	srv := &Server{
@@ -32,3 +34,20 @@ func NewServer(pool *pgxpool.Pool) *http.Server {
 
 	return server
 }
+
+func Run(ctx context.Context) error {
+	pool, err := pgxpool.New(ctx, os.Getenv("DATABASE_URL"))
+	if err != nil {
+		return fmt.Errorf("error getting database connection: %w", err)
+	}
+	defer pool.Close()
+
+	server := createServer(pool)
+
+	err = server.ListenAndServe()
+	if err != nil {
+		return fmt.Errorf("error starting server:", err)
+	}
+
+	return nil
+}