wiring done

Author: Kapil Verma

go/samples/http/go.mod

@@ -9,6 +9,7 @@ require (
 )
 
 require (
+	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/lib/pq v1.10.7 // indirect
 	go.opentelemetry.io/otel v1.10.0 // indirect
 )

go/samples/http/go.sum

@@ -14,6 +14,8 @@ github.com/google/sqlcommenter/go/database/sql v0.0.1-beta h1:N680pEYaRwmOSrQWUd
 github.com/google/sqlcommenter/go/database/sql v0.0.1-beta/go.mod h1:VdswmF4SM0cbjJdD+3GyM5QuXpHhH6F5nSzcbikzCGY=
 github.com/google/sqlcommenter/go/net/http v0.0.1-beta h1:7XQ6poZv+ZJwwHWQHlesq9IMsRus3G6Z9n10qAkrGqE=
 github.com/google/sqlcommenter/go/net/http v0.0.1-beta/go.mod h1:tVUqM1YZ/K3eRTdGzeav1GSbw+BXNdTGzSAbLW9CxAc=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

go/samples/http/main.go

@@ -9,82 +9,96 @@ import (
 	"github.com/google/sqlcommenter/go/core"
 	gosql "github.com/google/sqlcommenter/go/database/sql"
 	httpnet "github.com/google/sqlcommenter/go/net/http"
+	"github.com/julienschmidt/httprouter"
 	"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 
 	"sqlcommenter-http/mysqldb"
 	"sqlcommenter-http/pgdb"
+	"sqlcommenter-http/todos"
 )
 
-var db *gosql.DB
+func MakeIndexRoute(db *gosql.DB) func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+	return func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+		exp, _ := stdouttrace.New(stdouttrace.WithPrettyPrint())
+		bsp := sdktrace.NewSimpleSpanProcessor(exp) // You should use batch span processor in prod
+		tp := sdktrace.NewTracerProvider(
+			sdktrace.WithSampler(sdktrace.AlwaysSample()),
+			sdktrace.WithSpanProcessor(bsp),
+		)
 
-func Index(w http.ResponseWriter, r *http.Request) {
-	exp, _ := stdouttrace.New(stdouttrace.WithPrettyPrint())
-	bsp := sdktrace.NewSimpleSpanProcessor(exp) // You should use batch span processor in prod
-	tp := sdktrace.NewTracerProvider(
-		sdktrace.WithSampler(sdktrace.AlwaysSample()),
-		sdktrace.WithSpanProcessor(bsp),
-	)
+		ctx, span := tp.Tracer("foo").Start(r.Context(), "parent-span-name")
+		defer span.End()
 
-	ctx, span := tp.Tracer("foo").Start(r.Context(), "parent-span-name")
-	defer span.End()
+		db.ExecContext(ctx, "Select 1")
+		db.Exec("Select 2")
 
-	db.ExecContext(ctx, "Select 1")
-	db.Exec("Select 2")
+		stmt1, err := db.Prepare("Select 3")
+		if err != nil {
+			log.Fatal(err)
+		}
+		stmt1.QueryRow()
 
-	stmt1, err := db.Prepare("Select 3")
-	if err != nil {
-		log.Fatal(err)
+		stmt2, err := db.PrepareContext(ctx, "Select 4")
+		if err != nil {
+			log.Fatal(err)
+		}
+		stmt2.QueryRow()
+
+		db.QueryContext(ctx, "Select 5")
+
+		fmt.Fprintf(w, "Hello World!\r\n")
 	}
-	stmt1.QueryRow()
+}
 
-	stmt2, err := db.PrepareContext(ctx, "Select 4")
+// middleware is used to intercept incoming HTTP calls and apply general functions upon them.
+func middleware(next httprouter.Handle) httprouter.Handle {
+	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+		ctx := core.ContextInject(r.Context(), httpnet.NewHTTPRequestExtractor(r, next))
+		log.Printf("HTTP request sent to %s from %v", r.URL.Path, next)
+		next(w, r.WithContext(ctx), p)
+	}
+}
+
+func runApp(todosController *todos.TodosController) {
+	err := todosController.CreateTodosTableIfNotExists()
 	if err != nil {
 		log.Fatal(err)
 	}
-	stmt2.QueryRow()
 
-	db.QueryContext(ctx, "Select 5")
+	router := httprouter.New()
 
-	fmt.Fprintf(w, "Hello World!\r\n")
-}
+	index := MakeIndexRoute(todosController.DB)
+	router.GET("/", middleware(index))
 
-// middleware is used to intercept incoming HTTP calls and apply general functions upon them.
-func middleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := core.ContextInject(r.Context(), httpnet.NewHTTPRequestExtractor(r, next))
-		log.Printf("HTTP request sent to %s from %v", r.URL.Path, next)
-		next.ServeHTTP(w, r.WithContext(ctx))
-	})
+	router.GET("/todos", middleware(todosController.ActionList))
+	router.POST("/todos", middleware(todosController.ActionInsert))
+	router.PUT("/todos/:id", middleware(todosController.ActionUpdate))
+	router.DELETE("/todos/:id", middleware(todosController.ActionDelete))
+
+	http.ListenAndServe(":8080", router)
 }
 
 func runForMysql() *gosql.DB {
 	connection := "root:password@/sqlcommenter_db"
-	db = mysqldb.ConnectMySQL(connection)
-
-	mux := http.NewServeMux()
-	finalHandler := http.HandlerFunc(Index)
-	mux.Handle("/", middleware((finalHandler)))
-	log.Fatal(http.ListenAndServe(":8080", mux))
-	return db
+	db := mysqldb.ConnectMySQL(connection)
+	todosController := &todos.TodosController{DB: db, SQL: todos.MySQLQueries{}}
+	runApp(todosController)
 	return db
 }
 
 func runForPg() *gosql.DB {
 	connection := "postgres://dev:dev@localhost/sqlcommenter_db?sslmode=disable"
-	db = pgdb.ConnectPG(connection)
-
-	mux := http.NewServeMux()
-	finalHandler := http.HandlerFunc(Index)
-	mux.Handle("/", middleware((finalHandler)))
-	log.Fatal(http.ListenAndServe(":8080", mux))
+	db := pgdb.ConnectPG(connection)
+	todosController := &todos.TodosController{DB: db, SQL: todos.PGQueries{}}
+	runApp(todosController)
 	return db
 }
 
 func main() {
 	var engine string
 
-	flag.StringVar(&engine, "db_engine", "mysql", "db-engine to run the sample on")
+	flag.StringVar(&engine, "db_engine", "mysql", "db-engine to run the sample application on")
 	flag.Parse()
 
 	if engine != "mysql" && engine != "pg" {

go/samples/http/todos/controller.go

@@ -0,0 +1,33 @@
+package todos
+
+import (
+	"net/http"
+
+	gosql "github.com/google/sqlcommenter/go/database/sql"
+	"github.com/julienschmidt/httprouter"
+)
+
+type TodosController struct {
+	DB  *gosql.DB
+	SQL TodosQueries
+}
+
+func (c *TodosController) CreateTodosTableIfNotExists() error {
+	return nil
+}
+
+func (c *TodosController) ActionList(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+
+}
+
+func (c *TodosController) ActionInsert(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+
+}
+
+func (c *TodosController) ActionUpdate(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+
+}
+
+func (c *TodosController) ActionDelete(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+
+}

go/samples/http/todos/queries.go

@@ -0,0 +1,54 @@
+package todos
+
+type PGQueries struct{}
+type MySQLQueries struct{}
+
+type TodosQueries interface {
+	CreateTodosTableIfNotExists() string
+	ListTodos(search string) string
+	InsertTodo(task string) string
+	UpdateTodo(id int, task string) string
+	DeleteTodo(id int) string
+}
+
+// PGQueries impl
+func (sql PGQueries) CreateTodosTableIfNotExists() string {
+	return ""
+}
+
+func (sql PGQueries) ListTodos(search string) string {
+	return ""
+}
+
+func (sql PGQueries) InsertTodo(task string) string {
+	return ""
+}
+
+func (sql PGQueries) UpdateTodo(id int, task string) string {
+	return ""
+}
+
+func (sql PGQueries) DeleteTodo(id int) string {
+	return ""
+}
+
+// MySQLQueries impl
+func (sql MySQLQueries) CreateTodosTableIfNotExists() string {
+	return ""
+}
+
+func (sql MySQLQueries) ListTodos(search string) string {
+	return ""
+}
+
+func (sql MySQLQueries) InsertTodo(task string) string {
+	return ""
+}
+
+func (sql MySQLQueries) UpdateTodo(id int, task string) string {
+	return ""
+}
+
+func (sql MySQLQueries) DeleteTodo(id int) string {
+	return ""
+}