emly/api-golang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make bug report database name configurable

Browse Source 
Replace the hardcoded "emly_bugreports_dev" database name in SQL queries with the database name from the application configuration.
This commit is contained in:
Flavio Fois
2026-03-26 20:28:51 +01:00
parent 09a760e025
commit e6d663f4f2
5 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
internal/handlers/bug_report.route.go
View File

@@ -41,7 +41,7 @@ var fileRoles = []struct {
{"config", models.FileRoleConfig, "application/json"}, {"config", models.FileRoleConfig, "application/json"},
} }
func CreateBugReport(db *sqlx.DB) http.HandlerFunc { func CreateBugReport(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
if err := r.ParseMultipartForm(32 << 20); err != nil { if err := r.ParseMultipartForm(32 << 20); err != nil {
jsonError(w, http.StatusBadRequest, "invalid multipart form: "+err.Error()) jsonError(w, http.StatusBadRequest, "invalid multipart form: "+err.Error())
@@ -77,7 +77,7 @@ func CreateBugReport(db *sqlx.DB) http.HandlerFunc {
log.Printf("[BUGREPORT] Received from name=%s hwid=%s ip=%s", name, hwid, submitterIP) log.Printf("[BUGREPORT] Received from name=%s hwid=%s ip=%s", name, hwid, submitterIP)
result, err := db.ExecContext(r.Context(), result, err := db.ExecContext(r.Context(),
"INSERT INTO emly_bugreports_dev.bug_reports (name, email, description, hwid, hostname, os_user, submitter_ip, system_info, status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", fmt.Sprintf("INSERT INTO %s.bug_reports (name, email, description, hwid, hostname, os_user, submitter_ip, system_info, status) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", dbName),
name, email, description, hwid, hostname, osUser, submitterIP, systemInfo, models.BugReportStatusNew, name, email, description, hwid, hostname, osUser, submitterIP, systemInfo, models.BugReportStatusNew,
) )
if err != nil { if err != nil {
@@ -121,7 +121,7 @@ func CreateBugReport(db *sqlx.DB) http.HandlerFunc {
log.Printf("[BUGREPORT] File uploaded: role=%s size=%d bytes", fr.role, len(data)) log.Printf("[BUGREPORT] File uploaded: role=%s size=%d bytes", fr.role, len(data))
_, err = db.ExecContext(r.Context(), _, err = db.ExecContext(r.Context(),
"INSERT INTO emly_bugreports_dev.bug_report_files (report_id, file_role, filename, mime_type, file_size, data) VALUES (?, ?, ?, ?, ?, ?)", fmt.Sprintf("INSERT INTO %s.bug_report_files (report_id, file_role, filename, mime_type, file_size, data) VALUES (?, ?, ?, ?, ?, ?)", dbName),
reportID, fr.role, filename, mimeType, len(data), data, reportID, fr.role, filename, mimeType, len(data), data,
) )
if err != nil { if err != nil {
@@ -140,7 +140,7 @@ func CreateBugReport(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetAllBugReports(db *sqlx.DB) http.HandlerFunc { func GetAllBugReports(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
page, pageSize := 1, 20 page, pageSize := 1, 20
if p := r.URL.Query().Get("page"); p != "" { if p := r.URL.Query().Get("page"); p != "" {
@@ -172,17 +172,17 @@ func GetAllBugReports(db *sqlx.DB) http.HandlerFunc {
} }
var total int var total int
countQuery := "SELECT COUNT(*) FROM emly_bugreports_dev.bug_reports br " + whereClause countQuery := fmt.Sprintf("SELECT COUNT(*) FROM %s.bug_reports br ", dbName) + whereClause
if err := db.GetContext(r.Context(), &total, countQuery, params...); err != nil { if err := db.GetContext(r.Context(), &total, countQuery, params...); err != nil {
jsonError(w, http.StatusInternalServerError, err.Error()) jsonError(w, http.StatusInternalServerError, err.Error())
return return
} }
mainQuery := ` mainQuery := fmt.Sprintf(`
SELECT br.*, COUNT(bf.id) as file_count SELECT br.*, COUNT(bf.id) as file_count
FROM emly_bugreports_dev.bug_reports br FROM %s.bug_reports br
LEFT JOIN emly_bugreports_dev.bug_report_files bf ON bf.report_id = br.id LEFT JOIN %s.bug_report_files bf ON bf.report_id = br.id
` + whereClause + ` `, dbName, dbName) + whereClause + `
GROUP BY br.id GROUP BY br.id
ORDER BY br.created_at DESC ORDER BY br.created_at DESC
LIMIT ? OFFSET ?` LIMIT ? OFFSET ?`
@@ -204,7 +204,7 @@ func GetAllBugReports(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetBugReportByID(db *sqlx.DB) http.HandlerFunc { func GetBugReportByID(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
id := chi.URLParam(r, "id") id := chi.URLParam(r, "id")
if id == "" { if id == "" {
@@ -213,7 +213,7 @@ func GetBugReportByID(db *sqlx.DB) http.HandlerFunc {
} }
var report models.BugReport var report models.BugReport
reportErr := db.GetContext(r.Context(), &report, "SELECT * FROM emly_bugreports_dev.bug_reports WHERE id = ?", id) reportErr := db.GetContext(r.Context(), &report, fmt.Sprintf("SELECT * FROM %s.bug_reports WHERE id = ?", dbName), id)
if errors.Is(reportErr, sql.ErrNoRows) { if errors.Is(reportErr, sql.ErrNoRows) {
jsonError(w, http.StatusNotFound, "bug report not found") jsonError(w, http.StatusNotFound, "bug report not found")
return return
@@ -235,11 +235,11 @@ func GetBugReportByID(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetReportsCount(db *sqlx.DB) http.HandlerFunc { func GetReportsCount(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
rawStatus := r.URL.Query().Get("status") rawStatus := r.URL.Query().Get("status")
query := "SELECT COUNT(*) FROM emly_bugreports_dev.bug_reports" query := fmt.Sprintf("SELECT COUNT(*) FROM %s.bug_reports", dbName)
var args []interface{} var args []interface{}
if strings.TrimSpace(rawStatus) != "" { if strings.TrimSpace(rawStatus) != "" {
@@ -262,7 +262,7 @@ func GetReportsCount(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetReportFilesByReportID(db *sqlx.DB) http.HandlerFunc { func GetReportFilesByReportID(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
id := chi.URLParam(r, "id") id := chi.URLParam(r, "id")
if id == "" { if id == "" {
@@ -271,7 +271,7 @@ func GetReportFilesByReportID(db *sqlx.DB) http.HandlerFunc {
} }
var files []models.BugReportFile var files []models.BugReportFile
if err := db.SelectContext(r.Context(), &files, "SELECT * FROM emly_bugreports_dev.bug_report_files WHERE report_id = ?", id); err != nil { if err := db.SelectContext(r.Context(), &files, fmt.Sprintf("SELECT * FROM %s.bug_report_files WHERE report_id = ?", dbName), id); err != nil {
jsonError(w, http.StatusInternalServerError, err.Error()) jsonError(w, http.StatusInternalServerError, err.Error())
return return
} }
@@ -280,7 +280,7 @@ func GetReportFilesByReportID(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetBugReportZipById(db *sqlx.DB) http.HandlerFunc { func GetBugReportZipById(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
id := chi.URLParam(r, "id") id := chi.URLParam(r, "id")
if id == "" { if id == "" {
@@ -289,7 +289,7 @@ func GetBugReportZipById(db *sqlx.DB) http.HandlerFunc {
} }
var report models.BugReport var report models.BugReport
err := db.GetContext(r.Context(), &report, "SELECT * FROM emly_bugreports_dev.bug_reports WHERE id = ?", id) err := db.GetContext(r.Context(), &report, fmt.Sprintf("SELECT * FROM %s.bug_reports WHERE id = ?", dbName), id)
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
jsonError(w, http.StatusNotFound, "bug report not found") jsonError(w, http.StatusNotFound, "bug report not found")
return return
@@ -300,7 +300,7 @@ func GetBugReportZipById(db *sqlx.DB) http.HandlerFunc {
} }
var files []models.BugReportFile var files []models.BugReportFile
if err := db.SelectContext(r.Context(), &files, "SELECT * FROM emly_bugreports_dev.bug_report_files WHERE report_id = ?", id); err != nil { if err := db.SelectContext(r.Context(), &files, fmt.Sprintf("SELECT * FROM %s.bug_report_files WHERE report_id = ?", dbName), id); err != nil {
jsonError(w, http.StatusInternalServerError, err.Error()) jsonError(w, http.StatusInternalServerError, err.Error())
return return
} }
@@ -364,7 +364,7 @@ func GetBugReportZipById(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetReportFileByFileID(db *sqlx.DB) http.HandlerFunc { func GetReportFileByFileID(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
reportId := chi.URLParam(r, "id") reportId := chi.URLParam(r, "id")
if reportId == "" { if reportId == "" {
@@ -378,7 +378,7 @@ func GetReportFileByFileID(db *sqlx.DB) http.HandlerFunc {
} }
var file models.BugReportFile var file models.BugReportFile
err := db.GetContext(r.Context(), &file, "SELECT filename, mime_type, data FROM emly_bugreports_dev.bug_report_files WHERE report_id = ? AND id = ?", reportId, fileId) err := db.GetContext(r.Context(), &file, fmt.Sprintf("SELECT filename, mime_type, data FROM %s.bug_report_files WHERE report_id = ? AND id = ?", dbName), reportId, fileId)
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
jsonError(w, http.StatusNotFound, "file not found") jsonError(w, http.StatusNotFound, "file not found")
return return
@@ -401,7 +401,7 @@ func GetReportFileByFileID(db *sqlx.DB) http.HandlerFunc {
} }
} }
func GetReportStatusByID(db *sqlx.DB) http.HandlerFunc { func GetReportStatusByID(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
reportId := chi.URLParam(r, "id") reportId := chi.URLParam(r, "id")
if reportId == "" { if reportId == "" {
@@ -410,7 +410,7 @@ func GetReportStatusByID(db *sqlx.DB) http.HandlerFunc {
} }
var reportStatus models.BugReportStatus var reportStatus models.BugReportStatus
if err := db.GetContext(r.Context(), &reportStatus, "SELECT status FROM emly_bugreports_dev.bug_reports WHERE id = ?", reportId); err != nil { if err := db.GetContext(r.Context(), &reportStatus, fmt.Sprintf("SELECT status FROM %s.bug_reports WHERE id = ?", dbName), reportId); err != nil {
jsonError(w, http.StatusInternalServerError, err.Error()) jsonError(w, http.StatusInternalServerError, err.Error())
return return
} }
@@ -419,7 +419,7 @@ func GetReportStatusByID(db *sqlx.DB) http.HandlerFunc {
} }
} }
func PatchBugReportStatus(db *sqlx.DB) http.HandlerFunc { func PatchBugReportStatus(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
reportId := chi.URLParam(r, "id") reportId := chi.URLParam(r, "id")
if reportId == "" { if reportId == "" {
@@ -434,7 +434,7 @@ func PatchBugReportStatus(db *sqlx.DB) http.HandlerFunc {
} }
reportStatus := models.BugReportStatus(body) reportStatus := models.BugReportStatus(body)
result, err := db.ExecContext(r.Context(), "UPDATE emly_bugreports_dev.bug_reports SET status = ? WHERE id = ?", reportStatus, reportId) result, err := db.ExecContext(r.Context(), fmt.Sprintf("UPDATE %s.bug_reports SET status = ? WHERE id = ?", dbName), reportStatus, reportId)
if err != nil { if err != nil {
jsonError(w, http.StatusInternalServerError, err.Error()) jsonError(w, http.StatusInternalServerError, err.Error())
return return
@@ -453,7 +453,7 @@ func PatchBugReportStatus(db *sqlx.DB) http.HandlerFunc {
} }
} }
func DeleteBugReportByID(db *sqlx.DB) http.HandlerFunc { func DeleteBugReportByID(db *sqlx.DB, dbName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
reportId := chi.URLParam(r, "id") reportId := chi.URLParam(r, "id")
if reportId == "" { if reportId == "" {
@@ -461,7 +461,7 @@ func DeleteBugReportByID(db *sqlx.DB) http.HandlerFunc {
return return
} }
result, err := db.ExecContext(r.Context(), "DELETE FROM emly_bugreports_dev.bug_reports WHERE id = ?", reportId) result, err := db.ExecContext(r.Context(), fmt.Sprintf("DELETE FROM %s.bug_reports WHERE id = ?", dbName), reportId)
if err != nil { if err != nil {
jsonError(w, http.StatusInternalServerError, err.Error()) jsonError(w, http.StatusInternalServerError, err.Error())
return return

22
internal/routes/v1/bug_reports.go
View File

@@ -11,15 +11,15 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
) )
func registerBugReports(r chi.Router, db *sqlx.DB) { func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
r.Route("/bug-reports", func(r chi.Router) { r.Route("/bug-reports", func(r chi.Router) {
// API key only: submit a report and check count // API key only: submit a report and check count
r.Group(func(r chi.Router) { r.Group(func(r chi.Router) {
r.Use(apimw.APIKeyAuth(db)) r.Use(apimw.APIKeyAuth(db))
r.Use(httprate.LimitByIP(30, time.Minute)) r.Use(httprate.LimitByIP(30, time.Minute))
r.Get("/count", handlers.GetReportsCount(db)) r.Get("/count", handlers.GetReportsCount(db, dbName))
r.Post("/", handlers.CreateBugReport(db)) r.Post("/", handlers.CreateBugReport(db, dbName))
}) })
// API key + admin key: full read/write access // API key + admin key: full read/write access
@@ -28,14 +28,14 @@ func registerBugReports(r chi.Router, db *sqlx.DB) {
r.Use(apimw.AdminKeyAuth(db)) r.Use(apimw.AdminKeyAuth(db))
r.Use(httprate.LimitByIP(30, time.Minute)) r.Use(httprate.LimitByIP(30, time.Minute))
r.Get("/", handlers.GetAllBugReports(db)) r.Get("/", handlers.GetAllBugReports(db, dbName))
r.Get("/{id}", handlers.GetBugReportByID(db)) r.Get("/{id}", handlers.GetBugReportByID(db, dbName))
r.Get("/{id}/status", handlers.GetReportStatusByID(db)) r.Get("/{id}/status", handlers.GetReportStatusByID(db, dbName))
r.Get("/{id}/files", handlers.GetReportFilesByReportID(db)) r.Get("/{id}/files", handlers.GetReportFilesByReportID(db, dbName))
r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db)) r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db, dbName))
r.Get("/{id}/download", handlers.GetBugReportZipById(db)) r.Get("/{id}/download", handlers.GetBugReportZipById(db, dbName))
r.Patch("/{id}/status", handlers.PatchBugReportStatus(db)) r.Patch("/{id}/status", handlers.PatchBugReportStatus(db, dbName))
r.Delete("/{id}", handlers.DeleteBugReportByID(db)) r.Delete("/{id}", handlers.DeleteBugReportByID(db, dbName))
}) })
}) })
} }

2
internal/routes/v1/v1.go
View File

@@ -33,7 +33,7 @@ func NewRouter(db *sqlx.DB) http.Handler {
r.Route("/api", func(r chi.Router) { r.Route("/api", func(r chi.Router) {
registerAdmin(r, db) registerAdmin(r, db)
registerBugReports(r, db) registerBugReports(r, db, config.Load().Database)
}) })
return r return r

22
internal/routes/v2/bug_reports.go
View File

@@ -11,15 +11,15 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
) )
func registerBugReports(r chi.Router, db *sqlx.DB) { func registerBugReports(r chi.Router, db *sqlx.DB, dbName string) {
r.Route("/bug-report", func(r chi.Router) { r.Route("/bug-report", func(r chi.Router) {
// API key only: submit a report and check count // API key only: submit a report and check count
r.Group(func(r chi.Router) { r.Group(func(r chi.Router) {
r.Use(apimw.APIKeyAuth(db)) r.Use(apimw.APIKeyAuth(db))
r.Use(httprate.LimitByIP(30, time.Minute)) r.Use(httprate.LimitByIP(30, time.Minute))
r.Get("/count", handlers.GetReportsCount(db)) r.Get("/count", handlers.GetReportsCount(db, dbName))
r.Post("/", handlers.CreateBugReport(db)) r.Post("/", handlers.CreateBugReport(db, dbName))
}) })
// API key + admin key: full read/write access // API key + admin key: full read/write access
@@ -28,14 +28,14 @@ func registerBugReports(r chi.Router, db *sqlx.DB) {
r.Use(apimw.AdminKeyAuth(db)) r.Use(apimw.AdminKeyAuth(db))
r.Use(httprate.LimitByIP(30, time.Minute)) r.Use(httprate.LimitByIP(30, time.Minute))
r.Get("/", handlers.GetAllBugReports(db)) r.Get("/", handlers.GetAllBugReports(db, dbName))
r.Get("/{id}", handlers.GetBugReportByID(db)) r.Get("/{id}", handlers.GetBugReportByID(db, dbName))
r.Get("/{id}/status", handlers.GetReportStatusByID(db)) r.Get("/{id}/status", handlers.GetReportStatusByID(db, dbName))
r.Get("/{id}/files", handlers.GetReportFilesByReportID(db)) r.Get("/{id}/files", handlers.GetReportFilesByReportID(db, dbName))
r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db)) r.Get("/{id}/files/{file_id}", handlers.GetReportFileByFileID(db, dbName))
r.Get("/{id}/download", handlers.GetBugReportZipById(db)) r.Get("/{id}/download", handlers.GetBugReportZipById(db, dbName))
r.Patch("/{id}/status", handlers.PatchBugReportStatus(db)) r.Patch("/{id}/status", handlers.PatchBugReportStatus(db, dbName))
r.Delete("/{id}", handlers.DeleteBugReportByID(db)) r.Delete("/{id}", handlers.DeleteBugReportByID(db, dbName))
}) })
}) })
} }

2
internal/routes/v2/v2.go
View File

@@ -33,7 +33,7 @@ func NewRouter(db *sqlx.DB) http.Handler {
r.Route("/api", func(r chi.Router) { r.Route("/api", func(r chi.Router) {
registerAdmin(r, db) registerAdmin(r, db)
registerBugReports(r, db) registerBugReports(r, db, config.Load().Database)
}) })
return r return r