add Cloudflare R2 storage integration and update bug report handling

internal/routes/routes.go

@@ -1,20 +1,18 @@
 package routes
 
 import (
-	v2 "emly-api-go/internal/routes/v2"
 	"net/http"
 
 	v1 "emly-api-go/internal/routes/v1"
+	v2 "emly-api-go/internal/routes/v2"
+	"emly-api-go/internal/storage"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/jmoiron/sqlx"
 )
 
 // RegisterAll mounts every versioned API onto the root router.
-// To add a new API version, create internal/routes/v2 and add:
-//
-//	r.Mount("/v2", v2.NewRouter(db))
-func RegisterAll(r chi.Router, db *sqlx.DB) {
+func RegisterAll(r chi.Router, db *sqlx.DB, s3conn *storage.S3Connector) {
 	r.Get("/", func(w http.ResponseWriter, r *http.Request) {
 		_, err := w.Write([]byte("emly-api-go"))
 		if err != nil {
@@ -22,6 +20,6 @@ func RegisterAll(r chi.Router, db *sqlx.DB) {
 		}
 	})
 
-	r.Mount("/v1", v1.NewRouter(db))
-	r.Mount("/v2", v2.NewRouter(db))
+	r.Mount("/v1", v1.NewRouter(db, s3conn))
+	r.Mount("/v2", v2.NewRouter(db, s3conn))
 }

internal/routes/v1/bug_reports.go

@@ -5,13 +5,14 @@ import (
 	"time"
 
 	"emly-api-go/internal/handlers"
+	"emly-api-go/internal/storage"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/httprate"
 	"github.com/jmoiron/sqlx"
 )
 
-func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
+func registerBugReports(r chi.Router, db *sqlx.DB, dbName string, s3conn *storage.S3Connector) {
 	r.Route("/bug-reports", func(r chi.Router) {
 		// API key only: submit a report and check count
 		r.Group(func(r chi.Router) {
@@ -19,7 +20,7 @@ func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
 			r.Use(httprate.LimitByIP(30, time.Minute))
 
 			r.Get("/count", handlers.GetReportsCount(db, dbName))
-			r.Post("/", handlers.CreateBugReport(db, dbName))
+			r.Post("/", handlers.CreateBugReport(db, dbName, s3conn))
 		})
 
 		// API key + admin key: full read/write access
@@ -32,10 +33,10 @@ func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
 			r.Get("/{id}", handlers.GetBugReportByID(db, dbName))
 			r.Get("/{id}/status", handlers.GetReportStatusByID(db, dbName))
 			r.Get("/{id}/files", handlers.GetReportFilesByReportID(db, dbName))
-			r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db, dbName))
-			r.Get("/{id}/download", handlers.GetBugReportZipById(db, dbName))
+			r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db, dbName, s3conn))
+			r.Get("/{id}/download", handlers.GetBugReportZipByID(db, dbName))
 			r.Patch("/{id}/status", handlers.PatchBugReportStatus(db, dbName))
 			r.Delete("/{id}", handlers.DeleteBugReportByID(db, dbName))
 		})
 	})
-}
+}

internal/routes/v1/v1.go

@@ -6,15 +6,14 @@ import (
 
 	"emly-api-go/internal/config"
 	"emly-api-go/internal/handlers"
+	"emly-api-go/internal/storage"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/jmoiron/sqlx"
 )
 
 // NewRouter returns a chi.Router with all /v1 routes mounted.
-// Add new API versions by creating an analogous package (e.g. v2) and
-// mounting it alongside this one in internal/routes/routes.go.
-func NewRouter(db *sqlx.DB) http.Handler {
+func NewRouter(db *sqlx.DB, s3conn *storage.S3Connector) http.Handler {
 	r := chi.NewRouter()
 
 	rl := emlyMiddleware.NewRateLimiter(config.Load())
@@ -33,7 +32,7 @@ func NewRouter(db *sqlx.DB) http.Handler {
 
 	r.Route("/api", func(r chi.Router) {
 		registerAdmin(r, db)
-		registerBugReports(r, db, config.Load().Database)
+		registerBugReports(r, db, config.Load().Database, s3conn)
 	})
 
 	return r

internal/routes/v2/bug_reports.go

@@ -5,13 +5,14 @@ import (
 	"time"
 
 	"emly-api-go/internal/handlers"
+	"emly-api-go/internal/storage"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/httprate"
 	"github.com/jmoiron/sqlx"
 )
 
-func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
+func registerBugReports(r chi.Router, db *sqlx.DB, dbName string, s3conn *storage.S3Connector) {
 	r.Route("/bug-report", func(r chi.Router) {
 		// API key only: submit a report and check count
 		r.Group(func(r chi.Router) {
@@ -19,7 +20,7 @@ func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
 			r.Use(httprate.LimitByIP(30, time.Minute))
 
 			r.Get("/count", handlers.GetReportsCount(db, dbName))
-			r.Post("/", handlers.CreateBugReport(db, dbName))
+			r.Post("/", handlers.CreateBugReport(db, dbName, s3conn))
 		})
 
 		// API key + admin key: full read/write access
@@ -32,8 +33,8 @@ func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
 			r.Get("/{id}", handlers.GetBugReportByID(db, dbName))
 			r.Get("/{id}/status", handlers.GetReportStatusByID(db, dbName))
 			r.Get("/{id}/files", handlers.GetReportFilesByReportID(db, dbName))
-			r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db, dbName))
-			r.Get("/{id}/download", handlers.GetBugReportZipById(db, dbName))
+			r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db, dbName, s3conn))
+			r.Get("/{id}/download", handlers.GetBugReportZipByID(db, dbName))
 			r.Patch("/{id}/status", handlers.PatchBugReportStatus(db, dbName))
 			r.Delete("/{id}", handlers.DeleteBugReportByID(db, dbName))
 		})

internal/routes/v2/v2.go

@@ -6,15 +6,14 @@ import (
 
 	"emly-api-go/internal/config"
 	"emly-api-go/internal/handlers"
+	"emly-api-go/internal/storage"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/jmoiron/sqlx"
 )
 
-// NewRouter returns a chi.Router with all /v1 routes mounted.
-// Add new API versions by creating an analogous package (e.g. v2) and
-// mounting it alongside this one in internal/routes/routes.go.
-func NewRouter(db *sqlx.DB) http.Handler {
+// NewRouter returns a chi.Router with all /v2 routes mounted.
+func NewRouter(db *sqlx.DB, s3conn *storage.S3Connector) http.Handler {
 	r := chi.NewRouter()
 
 	rl := emlyMiddleware.NewRateLimiter(config.Load())
@@ -33,7 +32,8 @@ func NewRouter(db *sqlx.DB) http.Handler {
 
 	r.Route("/api", func(r chi.Router) {
 		registerAdmin(r, db)
-		registerBugReports(r, db, config.Load().Database)
+		registerBugReports(r, db, config.Load().Database, s3conn)
+		registerUpdates(r, db, config.Load())
 	})
 
 	return r