Skip to content

Admin audit: fix slow SQLite writes, remove gallery, route contact through /api #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
loganlanou merged 2 commits into from
May 27, 2026
Merged

Admin audit: fix slow SQLite writes, remove gallery, route contact through /api #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2696f1a
fix(db): enable WAL + busy_timeout via modernc pragma DSN
loganlanou May 27, 2026
284a0ed
refactor: remove gallery feature and route contact through /api
loganlanou May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions cmd/build/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,13 @@ func main() {

// Stats for static build
staticStats := layouts.AdminStats{
GalleryCount: 30,
UnreadContacts: 0,
PageImages: 18,
EditableContent: int64(sitecontent.TotalFieldCount()),
}

staticContent := sitecontent.Defaults()

// Gallery items for static build
galleryItems := getStaticGalleryItems()
galleryCategories := getStaticGalleryCategories()

// Define pages to generate
staticPages := []struct {
path string
Expand All @@ -69,7 +64,6 @@ func main() {
{"/contact/index.html", pages.Contact(staticContent, false, "")},
{"/terms/index.html", pages.Terms()},
{"/privacy/index.html", pages.Privacy()},
{"/gallery/index.html", pages.Gallery(galleryItems, galleryCategories)},
{"/sign-in/index.html", pages.SignIn()},
{"/sign-up/index.html", pages.SignUp()},
{"/admin/index.html", pages.AdminDashboard(staticStats, []models.ContactSubmission{})},
Expand Down Expand Up @@ -175,59 +169,3 @@ func copyFile(src, dst string) error {
_, err = io.Copy(dstFile, srcFile)
return err
}

// getStaticGalleryItems returns hardcoded gallery items for static build
func getStaticGalleryItems() []models.GalleryItem {
return []models.GalleryItem{
// Original items
{ID: 1, Title: "CNC Milling Operation", Category: "CNC Machining", Description: "Precision 5-axis CNC milling for complex geometries", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 1, IsFeatured: true},
{ID: 2, Title: "Laser Cutting", Category: "Laser", Description: "High-precision laser cutting and engraving", ImageUrl: "/static/images/customer/laser-marking-foba.jpg", SortOrder: 2, IsFeatured: false},
{ID: 3, Title: "Welding & Fabrication", Category: "Welding", Description: "Professional TIG and MIG welding services", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 3, IsFeatured: false},
{ID: 4, Title: "3D Printing", Category: "3D Printing", Description: "Rapid prototyping with industrial FDM and SLA", ImageUrl: "/static/images/customer/mold-repair-microscope.jpg", SortOrder: 4, IsFeatured: false},
{ID: 5, Title: "CNC Lathe Work", Category: "CNC Machining", Description: "Precision turning for cylindrical components", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 5, IsFeatured: false},
{ID: 6, Title: "Plasma Cutting", Category: "Plasma", Description: "Heavy-duty plasma cutting for thick materials", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 6, IsFeatured: false},
{ID: 7, Title: "Metal Fabrication", Category: "Welding", Description: "Custom metal fabrication and assembly", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 7, IsFeatured: false},
{ID: 8, Title: "Industrial Automation", Category: "EOAT", Description: "End-of-arm tooling for robotics", ImageUrl: "/static/images/customer/laser-marking-foba.jpg", SortOrder: 8, IsFeatured: false},
{ID: 9, Title: "Precision Grinding", Category: "CNC Machining", Description: "Surface grinding to tight tolerances", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 9, IsFeatured: false},
{ID: 10, Title: "Mold Components", Category: "Mold Repair", Description: "Precision mold inserts and components", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 10, IsFeatured: false},
{ID: 11, Title: "Laser Engraving", Category: "Laser", Description: "Detailed marking and engraving services", ImageUrl: "/static/images/customer/laser-marking-foba.jpg", SortOrder: 11, IsFeatured: false},
{ID: 12, Title: "Prototyping", Category: "3D Printing", Description: "Fast turnaround prototype development", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 12, IsFeatured: false},
// Additional items
{ID: 13, Title: "Injection Mold Repair", Category: "Mold Repair", Description: "Complete restoration of damaged injection molds to original specifications", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 13, IsFeatured: true},
{ID: 14, Title: "Mold Polishing", Category: "Mold Repair", Description: "Mirror finish polishing for improved part quality", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 14, IsFeatured: false},
{ID: 15, Title: "Mold Welding Repair", Category: "Mold Repair", Description: "Precision TIG welding for mold surface restoration", ImageUrl: "/static/images/customer/mold-repair-bench.jpg", SortOrder: 15, IsFeatured: false},
{ID: 16, Title: "Assembly Fixture", Category: "Fixtures", Description: "Custom assembly fixtures for production efficiency", ImageUrl: "/static/images/customer/mold-repair-microscope.jpg", SortOrder: 16, IsFeatured: true},
{ID: 17, Title: "Welding Fixture", Category: "Fixtures", Description: "Precision welding fixtures for consistent part alignment", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 17, IsFeatured: false},
{ID: 18, Title: "Inspection Fixture", Category: "Fixtures", Description: "Quality control fixtures for dimensional verification", ImageUrl: "/static/images/customer/mold-repair-microscope.jpg", SortOrder: 18, IsFeatured: false},
{ID: 19, Title: "Machining Fixture", Category: "Fixtures", Description: "Work-holding fixtures for CNC operations", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 19, IsFeatured: false},
{ID: 20, Title: "Robot Gripper", Category: "EOAT", Description: "Custom end-of-arm gripper for automated handling", ImageUrl: "/static/images/customer/laser-marking-foba.jpg", SortOrder: 20, IsFeatured: true},
{ID: 21, Title: "Vacuum End Effector", Category: "EOAT", Description: "Suction cup tooling for sheet material handling", ImageUrl: "/static/images/customer/laser-marking-foba.jpg", SortOrder: 21, IsFeatured: false},
{ID: 22, Title: "Multi-Part Gripper", Category: "EOAT", Description: "Complex gripper systems for multiple part pickup", ImageUrl: "/static/images/customer/laser-marking-foba.jpg", SortOrder: 22, IsFeatured: false},
{ID: 23, Title: "5-Axis Machining", Category: "CNC Machining", Description: "Complex geometry machining with 5-axis capability", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 23, IsFeatured: false},
{ID: 24, Title: "Aluminum Machining", Category: "CNC Machining", Description: "High-speed machining of aluminum components", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 24, IsFeatured: false},
{ID: 25, Title: "Steel Machining", Category: "CNC Machining", Description: "Heavy-duty machining of steel and tool steel", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 25, IsFeatured: false},
{ID: 26, Title: "Precision Boring", Category: "CNC Machining", Description: "Tight tolerance boring operations", ImageUrl: "/static/images/customer/machined-cavity-detail.jpg", SortOrder: 26, IsFeatured: false},
{ID: 27, Title: "Quality Inspection", Category: "Quality", Description: "CMM and dimensional inspection services", ImageUrl: "/static/images/customer/cmm-inspection-room.jpg", SortOrder: 27, IsFeatured: false},
{ID: 28, Title: "Surface Finishing", Category: "Finishing", Description: "Bead blasting and surface treatment", ImageUrl: "/static/images/customer/mold-repair-workstation.jpg", SortOrder: 28, IsFeatured: false},
{ID: 29, Title: "Assembly Services", Category: "Assembly", Description: "Complete mechanical assembly and testing", ImageUrl: "/static/images/customer/cmm-inspection-room.jpg", SortOrder: 29, IsFeatured: false},
{ID: 30, Title: "EDM Services", Category: "EDM", Description: "Wire and sinker EDM for complex shapes", ImageUrl: "/static/images/customer/sinker-edm-closeup.jpg", SortOrder: 30, IsFeatured: false},
}
}

// getStaticGalleryCategories returns all unique categories
func getStaticGalleryCategories() []string {
return []string{
"CNC Machining",
"Mold Repair",
"Fixtures",
"EOAT",
"Laser",
"Welding",
"3D Printing",
"Plasma",
"Quality",
"Finishing",
"Assembly",
"EDM",
}
}
12 changes: 11 additions & 1 deletion internal/database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,17 @@ func New(ctx context.Context, databasePath string) (*DB, error) {
}
}

conn, err := sql.Open("sqlite", databasePath+"?_foreign_keys=on&_journal_mode=WAL")
// modernc.org/sqlite configures pragmas via `_pragma=NAME(VALUE)` query
// params. The mattn-style `_journal_mode=WAL` / `_foreign_keys=on` params
// are silently ignored, which left the DB in rollback-journal mode with
// synchronous=FULL and foreign keys OFF — causing slow, lock-prone writes
// (a single settings save could take 5-17s). WAL + a busy timeout +
// synchronous=NORMAL gives fast writes with concurrent readers.
dsn := databasePath + "?_pragma=busy_timeout(5000)" +
"&_pragma=journal_mode(WAL)" +
"&_pragma=foreign_keys(on)" +
"&_pragma=synchronous(normal)"
conn, err := sql.Open("sqlite", dsn)
if err != nil {
return nil, fmt.Errorf("unable to open database: %w", err)
}
Expand Down
41 changes: 0 additions & 41 deletions internal/database/models/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,6 @@ package models

import "rowetech/internal/database/sqlc"

// GalleryItem represents a gallery item for templates
type GalleryItem struct {
ID int64 `json:"id"`
Title string `json:"title"`
Category string `json:"category"`
Description string `json:"description"`
ImageUrl string `json:"image_url"`
SortOrder int64 `json:"sort_order"`
IsFeatured bool `json:"is_featured"`
}

// FromSqlcGalleryItems converts sqlc GalleryItems to models GalleryItems
func FromSqlcGalleryItems(items []sqlc.GalleryItem) []GalleryItem {
result := make([]GalleryItem, len(items))
for i, item := range items {
result[i] = GalleryItem{
ID: item.ID,
Title: item.Title,
Category: item.Category,
Description: item.Description.String,
ImageUrl: item.ImageUrl,
SortOrder: item.SortOrder.Int64,
IsFeatured: item.IsFeatured.Int64 == 1,
}
}
return result
}

// ContactSubmission represents a contact form submission
type ContactSubmission struct {
ID int64 `json:"id"`
Expand Down Expand Up @@ -93,19 +65,6 @@ func FromSqlcContactSubmission(item sqlc.ContactSubmission) ContactSubmission {
}
}

// FromSqlcGalleryItem converts a single sqlc GalleryItem to models GalleryItem
func FromSqlcGalleryItem(item sqlc.GalleryItem) GalleryItem {
return GalleryItem{
ID: item.ID,
Title: item.Title,
Category: item.Category,
Description: item.Description.String,
ImageUrl: item.ImageUrl,
SortOrder: item.SortOrder.Int64,
IsFeatured: item.IsFeatured.Int64 == 1,
}
}

// PageImage represents a page image for templates
type PageImage struct {
ID int64 `json:"id"`
Expand Down
62 changes: 0 additions & 62 deletions internal/handler/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package handler

import (
"log/slog"
"net/http"
"strconv"

"rowetech/internal/clerk"
"rowetech/internal/database/models"
Expand All @@ -20,12 +18,6 @@ func (h *Handler) getAdminStats(ctx echo.Context) layouts.AdminStats {
stats := layouts.AdminStats{}
c := ctx.Request().Context()

// Count gallery items
items, err := h.db.Queries.ListGalleryItems(c)
if err == nil {
stats.GalleryCount = int64(len(items))
}

// Count unread contacts
unread, err := h.db.Queries.CountUnreadContacts(c)
if err == nil {
Expand Down Expand Up @@ -106,36 +98,6 @@ func (h *Handler) AdminContent(c echo.Context) error {
return pages.AdminContent(sitecontent.Definitions(), contentValues, stats).Render(ctx, c.Response().Writer)
}

// AdminGallery renders the gallery management page
func (h *Handler) AdminGallery(c echo.Context) error {
ctx := c.Request().Context()
stats := h.getAdminStats(c)

// Get gallery items
sqlcItems, err := h.db.Queries.ListGalleryItems(ctx)
if err != nil {
slog.Error("failed to list gallery items", "error", err)
sqlcItems = nil
}
items := models.FromSqlcGalleryItems(sqlcItems)

// Get categories
sqlcCategories, err := h.db.Queries.GetGalleryCategories(ctx)
if err != nil {
slog.Error("failed to get gallery categories", "error", err)
sqlcCategories = nil
}

// Filter by category if specified
category := c.QueryParam("category")
if category != "" {
sqlcItems, _ = h.db.Queries.ListGalleryItemsByCategory(ctx, category)
items = models.FromSqlcGalleryItems(sqlcItems)
}

return pages.AdminGallery(items, sqlcCategories, stats).Render(ctx, c.Response().Writer)
}

// AdminContacts renders the contacts management page
func (h *Handler) AdminContacts(c echo.Context) error {
ctx := c.Request().Context()
Expand Down Expand Up @@ -235,27 +197,3 @@ func (h *Handler) AdminImages(c echo.Context) error {

return pages.AdminImages(imagesByPage, pageOrder, stats).Render(ctx, c.Response().Writer)
}

// APIGetGalleryEditForm returns the edit form for a gallery item
func (h *Handler) APIGetGalleryEditForm(c echo.Context) error {
ctx := c.Request().Context()
idStr := c.Param("id")

itemID, err := strconv.ParseInt(idStr, 10, 64)
if err != nil {
return c.String(http.StatusBadRequest, "Invalid ID")
}

sqlcItem, err := h.db.Queries.GetGalleryItem(ctx, itemID)
if err != nil {
return c.String(http.StatusNotFound, "Item not found")
}
item := models.FromSqlcGalleryItem(sqlcItem)

// Get categories for the dropdown
categories, _ := h.db.Queries.GetGalleryCategories(ctx)

slog.Debug("loading edit form", "id", idStr, "item", item.Title)

return pages.GalleryEditForm(item, categories).Render(ctx, c.Response().Writer)
}
Loading