Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: consolidate helpers and dedupe boilerplate code (#2437)
Kyle Mendell1cc90881cee2
diff --git a/backend/internal/api/ws_handler.go b/backend/internal/api/ws_handler.goindex f5faf0365..f262fc939 100644--- a/backend/internal/api/ws_handler.go+++ b/backend/internal/api/ws_handler.go@@ -374,53 +374,59 @@ func NewWebSocketHandler(}// ============================================================================-// Project WebSocket/Streaming Endpoints+// Shared Log Stream Helpers// ============================================================================-// ProjectLogs streams project logs over WebSocket.-//-// @Summary Get project logs via WebSocket-// @Description Stream project logs over WebSocket connection-// @Tags WebSocket-// @Param id path string true "Environment ID"-// @Param projectId path string true "Project ID"-// @Param follow query bool false "Follow log output" default(true)-// @Param tail query string false "Number of lines to show from the end" default(100)-// @Param since query string false "Show logs since timestamp"-// @Param timestamps query bool false "Show timestamps" default(false)-// @Param format query string false "Output format (text or json)" default(text)-// @Param batched query bool false "Batch log messages" default(false)-// @Router /api/environments/{id}/ws/projects/{projectId}/logs [get]-func (h *WebSocketHandler) ProjectLogs(c *gin.Context) {- projectID := c.Param("projectId")- if strings.TrimSpace(projectID) == "" {- c.JSON(http.StatusBadRequest, gin.H{"success": false, "error": (&common.ProjectIDRequiredError{}).Error()})- return- }+// logStreamParams holds the standard query parameters shared by every WS log endpoint.+type logStreamParams struct {+ follow bool+ tail string+ since string+ timestamps bool+ format string+ batched bool+}- follow := c.DefaultQuery("follow", "true") == "true"+func parseLogStreamParamsInternal(c *gin.Context) logStreamParams {tail, _ := httputil.GetQueryParam(c, "tail", false)if tail == "" {tail = "100"}since, _ := httputil.GetQueryParam(c, "since", false)- timestamps := c.DefaultQuery("timestamps", "false") == "true"format, _ := httputil.GetQueryParam(c, "format", false)if format == "" {format = "text"}- batched := c.DefaultQuery("batched", "false") == "true"-+ return logStreamParams{+ follow: c.DefaultQuery("follow", "true") == "true",+ tail: tail,+ since: since,+ timestamps: c.DefaultQuery("timestamps", "false") == "true",+ format: format,+ batched: c.DefaultQuery("batched", "false") == "true",+ }+}++// serveLogStreamInternal is the shared scaffold for all three WS log endpoints (project, container, service).+// It performs upgrade, builds the stream key, gets-or-creates the multiplexing hub, registers metrics,+// and serves the client. The caller-supplied hubBuilder constructs the underlying *wsLogStream+// when no hub already exists for streamKey.+func (h *WebSocketHandler) serveLogStreamInternal(+ c *gin.Context,+ kind, resourceID string,+ params logStreamParams,+ hubBuilder func(streamKey string, onEmpty func(*wsLogStream)) *wsLogStream,+) {conn, err := h.wsUpgrader.Upgrade(c.Writer, c.Request, nil)if err != nil {return}- streamKey := buildLogStreamKeyInternal(c.Param("id"), systemtypes.WSKindProjectLogs, projectID, format, batched, follow, tail, since, timestamps)+ streamKey := buildLogStreamKeyInternal(c.Param("id"), kind, resourceID, params.format, params.batched, params.follow, params.tail, params.since, params.timestamps)stream := h.getOrCreateLogStreamInternal(streamKey, func(onEmpty func(*wsLogStream)) *wsLogStream {- return h.startProjectLogHub(streamKey, projectID, format, batched, follow, tail, since, timestamps, onEmpty)+ return hubBuilder(streamKey, onEmpty)})- connID := h.wsMetrics.RegisterConnection(buildWSConnectionInfoInternal(c, systemtypes.WSKindProjectLogs, projectID))+ connID := h.wsMetrics.RegisterConnection(buildWSConnectionInfoInternal(c, kind, resourceID))// WebSocket connections use context.Background() because they are long-lived and should not// be tied to the HTTP request context. Cleanup is handled via the hub's OnEmpty callback// which triggers when all clients disconnect.@@ -430,6 +436,60 @@ func (h *WebSocketHandler) ProjectLogs(c *gin.Context) {})}+// broadcastLogStreamErrorInternal emits an error message to every client of a log stream.+// resourceLabel is the human-readable noun used in slog/error text (e.g. "project log stream").+// errorPrefix is the user-facing message prefix (e.g. "Failed to stream project logs: ").+func broadcastLogStreamErrorInternal(resourceLabel, errorPrefix string, resourceID string, format string, err error, ls *wsLogStream) {+ slog.Warn(resourceLabel+" failed", "resourceID", resourceID, "error", err)++ if format == "json" {+ msg := ws.LogMessage{+ Seq: ls.seq.Add(1),+ Level: "error",+ Message: errorPrefix + err.Error(),+ Service: "arcane",+ Timestamp: ws.NowRFC3339(),+ }+ if b, marshalErr := json.Marshal(msg); marshalErr == nil {+ ls.hub.Broadcast(b)+ }+ return+ }++ ls.hub.Broadcast([]byte(errorPrefix + err.Error()))+}++// ============================================================================+// Project WebSocket/Streaming Endpoints+// ============================================================================++// ProjectLogs streams project logs over WebSocket.+//+// @Summary Get project logs via WebSocket+// @Description Stream project logs over WebSocket connection+// @Tags WebSocket+// @Param id path string true "Environment ID"+// @Param projectId path string true "Project ID"+// @Param follow query bool false "Follow log output" default(true)+// @Param tail query string false "Number of lines to show from the end" default(100)+// @Param since query string false "Show logs since timestamp"+// @Param timestamps query bool false "Show timestamps" default(false)+// @Param format query string false "Output format (text or json)" default(text)+// @Param batched query bool false "Batch log messages" default(false)+// @Router /api/environments/{id}/ws/projects/{projectId}/logs [get]+func (h *WebSocketHandler) ProjectLogs(c *gin.Context) {+ projectID := c.Param("projectId")+ if strings.TrimSpace(projectID) == "" {+ c.JSON(http.StatusBadRequest, gin.H{"success": false, "error": (&common.ProjectIDRequiredError{}).Error()})+ return+ }++ params := parseLogStreamParamsInternal(c)+ h.serveLogStreamInternal(c, systemtypes.WSKindProjectLogs, projectID, params, func(streamKey string, onEmpty func(*wsLogStream)) *wsLogStream {+ return h.startProjectLogHub(streamKey, projectID, params.format, params.batched, params.follow, params.tail, params.since, params.timestamps, onEmpty)+ })+}+func newWSLogStreamInternal(key, format string) (*wsLogStream, context.Context) {ls := &wsLogStream{hub: ws.NewHub(1024),@@ -488,23 +548,7 @@ func waitForLogStreamSubscriberInternal(ctx context.Context, firstSubscriber <-c}func (h *WebSocketHandler) broadcastProjectLogStreamErrorInternal(projectID, format string, err error, ls *wsLogStream) {- slog.Warn("project log stream failed", "projectID", projectID, "error", err)-- if format == "json" {- msg := ws.LogMessage{- Seq: ls.seq.Add(1),- Level: "error",- Message: "Failed to stream project logs: " + err.Error(),- Service: "arcane",- Timestamp: ws.NowRFC3339(),- }- if b, marshalErr := json.Marshal(msg); marshalErr == nil {- ls.hub.Broadcast(b)- }- return- }-- ls.hub.Broadcast([]byte("Failed to stream project logs: " + err.Error()))+ broadcastLogStreamErrorInternal("project log stream", "Failed to stream project logs: ", projectID, format, err, ls)}func startProjectLogForwardersInternal(ctx context.Context, format string, batched bool, lines <-chan string, ls *wsLogStream) {@@ -599,35 +643,9 @@ func (h *WebSocketHandler) ContainerLogs(c *gin.Context) {return}- follow := c.DefaultQuery("follow", "true") == "true"- tail, _ := httputil.GetQueryParam(c, "tail", false)- if tail == "" {- tail = "100"- }- since, _ := httputil.GetQueryParam(c, "since", false)- timestamps := c.DefaultQuery("timestamps", "false") == "true"- format, _ := httputil.GetQueryParam(c, "format", false)- if format == "" {- format = "text"- }- batched := c.DefaultQuery("batched", "false") == "true"-- conn, err := h.wsUpgrader.Upgrade(c.Writer, c.Request, nil)- if err != nil {- return- }-- streamKey := buildLogStreamKeyInternal(c.Param("id"), systemtypes.WSKindContainerLogs, containerID, format, batched, follow, tail, since, timestamps)- stream := h.getOrCreateLogStreamInternal(streamKey, func(onEmpty func(*wsLogStream)) *wsLogStream {- return h.startContainerLogHub(streamKey, containerID, format, batched, follow, tail, since, timestamps, onEmpty)- })- connID := h.wsMetrics.RegisterConnection(buildWSConnectionInfoInternal(c, systemtypes.WSKindContainerLogs, containerID))- // WebSocket connections use context.Background() because they are long-lived and should not- // be tied to the HTTP request context. Cleanup is handled via the hub's OnEmpty callback- // which triggers when all clients disconnect.- ws.ServeClientWithOnRemove(context.Background(), stream.hub, conn, func() {- h.wsMetrics.UnregisterConnection(connID)- h.releaseLogStreamInternal(streamKey, stream)+ params := parseLogStreamParamsInternal(c)+ h.serveLogStreamInternal(c, systemtypes.WSKindContainerLogs, containerID, params, func(streamKey string, onEmpty func(*wsLogStream)) *wsLogStream {+ return h.startContainerLogHub(streamKey, containerID, params.format, params.batched, params.follow, params.tail, params.since, params.timestamps, onEmpty)})}@@ -695,23 +713,7 @@ func (h *WebSocketHandler) startContainerLogHub(key, containerID, format string,}func (h *WebSocketHandler) broadcastContainerLogStreamErrorInternal(containerID, format string, err error, ls *wsLogStream) {- slog.Warn("container log stream failed", "containerID", containerID, "error", err)-- if format == "json" {- msg := ws.LogMessage{- Seq: ls.seq.Add(1),- Level: "error",- Message: "Failed to stream container logs: " + err.Error(),- Service: "arcane",- Timestamp: ws.NowRFC3339(),- }- if b, marshalErr := json.Marshal(msg); marshalErr == nil {- ls.hub.Broadcast(b)- }- return- }-- ls.hub.Broadcast([]byte("Failed to stream container logs: " + err.Error()))+ broadcastLogStreamErrorInternal("container log stream", "Failed to stream container logs: ", containerID, format, err, ls)}// ============================================================================@@ -733,42 +735,15 @@ func (h *WebSocketHandler) broadcastContainerLogStreamErrorInternal(containerID,// @Param batched query bool false "Batch log messages" default(false)// @Router /api/environments/{id}/ws/swarm/services/{serviceId}/logs [get]func (h *WebSocketHandler) ServiceLogs(c *gin.Context) {- environmentID := c.Param("id")serviceID := c.Param("serviceId")if strings.TrimSpace(serviceID) == "" {c.JSON(http.StatusBadRequest, gin.H{"success": false, "error": "Service ID is required"})return}- follow := c.DefaultQuery("follow", "true") == "true"- tail, _ := httputil.GetQueryParam(c, "tail", false)- if tail == "" {- tail = "100"- }- since, _ := httputil.GetQueryParam(c, "since", false)- timestamps := c.DefaultQuery("timestamps", "false") == "true"- format, _ := httputil.GetQueryParam(c, "format", false)- if format == "" {- format = "text"- }- batched := c.DefaultQuery("batched", "false") == "true"-- conn, err := h.wsUpgrader.Upgrade(c.Writer, c.Request, nil)- if err != nil {- return- }-- streamKey := buildLogStreamKeyInternal(environmentID, systemtypes.WSKindServiceLogs, serviceID, format, batched, follow, tail, since, timestamps)- connID := h.wsMetrics.RegisterConnection(buildWSConnectionInfoInternal(c, systemtypes.WSKindServiceLogs, serviceID))- stream := h.getOrCreateLogStreamInternal(streamKey, func(onEmpty func(*wsLogStream)) *wsLogStream {- return h.startServiceLogHub(streamKey, serviceID, format, batched, follow, tail, since, timestamps, onEmpty)- })- // WebSocket connections use context.Background() because they are long-lived and should not- // be tied to the HTTP request context. Cleanup is handled via the hub's OnEmpty callback- // which triggers when all clients disconnect.- ws.ServeClientWithOnRemove(context.Background(), stream.hub, conn, func() {- h.wsMetrics.UnregisterConnection(connID)- h.releaseLogStreamInternal(streamKey, stream)+ params := parseLogStreamParamsInternal(c)+ h.serveLogStreamInternal(c, systemtypes.WSKindServiceLogs, serviceID, params, func(streamKey string, onEmpty func(*wsLogStream)) *wsLogStream {+ return h.startServiceLogHub(streamKey, serviceID, params.format, params.batched, params.follow, params.tail, params.since, params.timestamps, onEmpty)})}@@ -836,23 +811,7 @@ func (h *WebSocketHandler) startServiceLogHub(key, serviceID, format string, bat}func (h *WebSocketHandler) broadcastServiceLogStreamErrorInternal(serviceID, format string, err error, ls *wsLogStream) {- slog.Warn("service log stream failed", "serviceID", serviceID, "error", err)-- if format == "json" {- msg := ws.LogMessage{- Seq: ls.seq.Add(1),- Level: "error",- Message: "Failed to stream service logs: " + err.Error(),- Service: "arcane",- Timestamp: ws.NowRFC3339(),- }- if b, marshalErr := json.Marshal(msg); marshalErr == nil {- ls.hub.Broadcast(b)- }- return- }-- ls.hub.Broadcast([]byte("Failed to stream service logs: " + err.Error()))+ broadcastLogStreamErrorInternal("service log stream", "Failed to stream service logs: ", serviceID, format, err, ls)}// ContainerStats streams container stats over WebSocket.diff --git a/backend/internal/bootstrap/services_bootstrap.go b/backend/internal/bootstrap/services_bootstrap.goindex d1f0a65e0..ff5ec808a 100644--- a/backend/internal/bootstrap/services_bootstrap.go+++ b/backend/internal/bootstrap/services_bootstrap.go@@ -89,6 +89,7 @@ func initializeServices(ctx context.Context, db *database.DB, cfg *config.Configsvcs.Docker,svcs.Container,svcs.Project,+ svcs.Image,svcs.Settings,svcs.Vulnerability,svcs.Environment,diff --git a/backend/internal/huma/handlers/dashboard_test.go b/backend/internal/huma/handlers/dashboard_test.goindex af2966fe1..4dde72ee2 100644--- a/backend/internal/huma/handlers/dashboard_test.go+++ b/backend/internal/huma/handlers/dashboard_test.go@@ -111,7 +111,7 @@ func TestDashboardHandlerGetDashboardReturnsSnapshot(t *testing.T) {dockerSvc := newDashboardHandlerTestDockerService(t, settingsSvc, containers, images)handler := &DashboardHandler{- dashboardService: services.NewDashboardService(db, dockerSvc, nil, nil, settingsSvc, nil, nil, nil),+ dashboardService: services.NewDashboardService(db, dockerSvc, nil, nil, nil, settingsSvc, nil, nil, nil),}output, err := handler.GetDashboard(context.Background(), &GetDashboardInput{EnvironmentID: "0"})@@ -149,6 +149,7 @@ func TestDashboardHandlerGetEnvironmentsOverviewReturnsAggregateSummary(t *testinil,nil,nil,+ nil,settingsSvc,nil,services.NewEnvironmentService(db, http.DefaultClient, nil, nil, settingsSvc, nil),diff --git a/backend/internal/models/project.go b/backend/internal/models/project.goindex d6b118041..e80d0c861 100644--- a/backend/internal/models/project.go+++ b/backend/internal/models/project.go@@ -13,7 +13,7 @@ const ()type Project struct {- Name string `json:"name" sortable:"true"`+ Name string `json:"name" sortable:"true" gorm:"index:idx_projects_name"`DirName *string `json:"dir_name"`Path string `json:"path" sortable:"true" gorm:"uniqueIndex"`Status ProjectStatus `json:"status" sortable:"true"`diff --git a/backend/internal/services/dashboard_service.go b/backend/internal/services/dashboard_service.goindex 42a05b20c..628b9c7a4 100644--- a/backend/internal/services/dashboard_service.go+++ b/backend/internal/services/dashboard_service.go@@ -35,6 +35,7 @@ type DashboardService struct {dockerService *DockerClientServicecontainerService *ContainerServiceprojectService *ProjectService+ imageService *ImageServicesettingsService *SettingsServicevulnerabilityService *VulnerabilityServiceenvironmentService *EnvironmentService@@ -50,6 +51,7 @@ func NewDashboardService(dockerService *DockerClientService,containerService *ContainerService,projectService *ProjectService,+ imageService *ImageService,settingsService *SettingsService,vulnerabilityService *VulnerabilityService,environmentService *EnvironmentService,@@ -60,6 +62,7 @@ func NewDashboardService(dockerService: dockerService,containerService: containerService,projectService: projectService,+ imageService: imageService,settingsService: settingsService,vulnerabilityService: vulnerabilityService,environmentService: environmentService,@@ -132,7 +135,12 @@ func (s *DashboardService) GetSnapshot(ctx context.Context, options DashboardAct})containerPage := limitDashboardItemsInternal(containerItems, dashboardSnapshotPreloadLimit)- projectIDByName := buildProjectIDMapInternal(ctx, s.db, filteredContainers)+ var projectIDByName map[string]string+ if s.imageService != nil {+ projectIDByName = s.imageService.BuildProjectIDMap(ctx, filteredContainers)+ } else {+ projectIDByName = map[string]string{}+ }imageUsageMap := buildUsageMapInternal(filteredContainers, projectIDByName)imageItems := mapDockerImagesToDTOs(dockerImages, imageUsageMap, nil, nil)sort.Slice(imageItems, func(i, j int) bool {diff --git a/backend/internal/services/dashboard_service_test.go b/backend/internal/services/dashboard_service_test.goindex 2d17b472f..b751d02b0 100644--- a/backend/internal/services/dashboard_service_test.go+++ b/backend/internal/services/dashboard_service_test.go@@ -100,7 +100,7 @@ func newDashboardTestVersionServiceInternal() *VersionService {func TestDashboardService_GetActionItems_IncludesExpiringAPIKeys(t *testing.T) {db, settingsSvc := setupDashboardServiceTestDB(t)- svc := NewDashboardService(db, nil, nil, nil, settingsSvc, nil, nil, nil)+ svc := NewDashboardService(db, nil, nil, nil, nil, settingsSvc, nil, nil, nil)now := time.Now()createDashboardTestAPIKey(t, db, models.ApiKey{@@ -144,7 +144,7 @@ func TestDashboardService_GetActionItems_IncludesExpiringAPIKeys(t *testing.T) {func TestDashboardService_GetActionItems_DebugAllGoodReturnsNoItems(t *testing.T) {db, settingsSvc := setupDashboardServiceTestDB(t)- svc := NewDashboardService(db, nil, nil, nil, settingsSvc, nil, nil, nil)+ svc := NewDashboardService(db, nil, nil, nil, nil, settingsSvc, nil, nil, nil)createDashboardTestAPIKey(t, db, models.ApiKey{Name: "expiring-soon",@@ -234,7 +234,7 @@ func TestDashboardService_GetSnapshot_ReturnsDashboardSnapshot(t *testing.T) {Status: models.ProjectStatusStopped,}).Error)projectSvc := NewProjectService(db, settingsSvc, nil, &ImageService{db: db}, nil, nil, config.Load())- svc := NewDashboardService(db, dockerSvc, nil, projectSvc, settingsSvc, nil, nil, nil)+ svc := NewDashboardService(db, dockerSvc, nil, projectSvc, nil, settingsSvc, nil, nil, nil)snapshot, err := svc.GetSnapshot(context.Background(), DashboardActionItemsOptions{})require.NoError(t, err)@@ -284,7 +284,7 @@ func TestDashboardService_GetSnapshot_DebugAllGoodOnlyClearsActionItems(t *testicreateDashboardTestImageUpdateRecord(t, db, models.ImageUpdateRecord{ID: "sha256:image-b", HasUpdate: true})dockerSvc := newDashboardTestDockerService(t, settingsSvc, containers, images)- svc := NewDashboardService(db, dockerSvc, nil, nil, settingsSvc, nil, nil, nil)+ svc := NewDashboardService(db, dockerSvc, nil, nil, nil, settingsSvc, nil, nil, nil)snapshot, err := svc.GetSnapshot(context.Background(), DashboardActionItemsOptions{DebugAllGood: true})require.NoError(t, err)@@ -381,7 +381,7 @@ func TestDashboardService_GetEnvironmentsOverview_ReturnsLocalAndRemoteSummariesdockerSvc := newDashboardTestDockerService(t, settingsSvc, containers, images)envSvc := NewEnvironmentService(db, remoteServer.Client(), nil, nil, settingsSvc, nil)- svc := NewDashboardService(db, dockerSvc, nil, nil, settingsSvc, nil, envSvc, newDashboardTestVersionServiceInternal())+ svc := NewDashboardService(db, dockerSvc, nil, nil, nil, settingsSvc, nil, envSvc, newDashboardTestVersionServiceInternal())overview, err := svc.GetEnvironmentsOverview(context.Background(), DashboardActionItemsOptions{})require.NoError(t, err)@@ -427,7 +427,7 @@ func TestDashboardService_GetEnvironmentsOverview_HandlesRemoteSnapshotFailure(t})envSvc := NewEnvironmentService(db, http.DefaultClient, nil, nil, settingsSvc, nil)- svc := NewDashboardService(db, nil, nil, nil, settingsSvc, nil, envSvc, newDashboardTestVersionServiceInternal())+ svc := NewDashboardService(db, nil, nil, nil, nil, settingsSvc, nil, envSvc, newDashboardTestVersionServiceInternal())overview, err := svc.GetEnvironmentsOverview(context.Background(), DashboardActionItemsOptions{})require.NoError(t, err)@@ -493,7 +493,7 @@ func TestDashboardService_GetEnvironmentsOverview_OmitsVersionInfoWhenFetchFails})envSvc := NewEnvironmentService(db, remoteServer.Client(), nil, nil, settingsSvc, nil)- svc := NewDashboardService(db, nil, nil, nil, settingsSvc, nil, envSvc, newDashboardTestVersionServiceInternal())+ svc := NewDashboardService(db, nil, nil, nil, nil, settingsSvc, nil, envSvc, newDashboardTestVersionServiceInternal())overview, err := svc.GetEnvironmentsOverview(context.Background(), DashboardActionItemsOptions{})require.NoError(t, err)@@ -554,7 +554,7 @@ func TestDashboardService_GetActionItems_CountsAffectedResources(t *testing.T) {dockerSvc := newDashboardTestDockerService(t, settingsSvc, containers, images)projectSvc := NewProjectService(db, settingsSvc, nil, &ImageService{db: db}, nil, nil, config.Load())- svc := NewDashboardService(db, dockerSvc, nil, projectSvc, settingsSvc, nil, nil, nil)+ svc := NewDashboardService(db, dockerSvc, nil, projectSvc, nil, settingsSvc, nil, nil, nil)actionItems, err := svc.GetActionItems(ctx, DashboardActionItemsOptions{})require.NoError(t, err)diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.goindex f249de2e5..e2af07270 100644--- a/backend/internal/services/gitops_sync_service.go+++ b/backend/internal/services/gitops_sync_service.go@@ -18,6 +18,7 @@ import ("github.com/getarcaneapp/arcane/backend/pkg/libarcane/startup""github.com/getarcaneapp/arcane/backend/pkg/pagination""github.com/getarcaneapp/arcane/backend/pkg/projects"+ "github.com/getarcaneapp/arcane/backend/pkg/utils""github.com/getarcaneapp/arcane/backend/pkg/utils/mapper""github.com/getarcaneapp/arcane/types/gitops""github.com/getarcaneapp/arcane/types/swarm"@@ -110,15 +111,10 @@ func (s *GitOpsSyncService) getEnvironmentSyncLimits(ctx context.Context) (int,return defaultMaxSyncFiles, defaultMaxSyncTotalSize, defaultMaxSyncBinarySize}- maxFiles := normalizeSyncLimitSetting(s.settingsService.GetIntSetting(ctx, "gitSyncMaxFiles", defaultMaxSyncFiles), defaultMaxSyncFiles)- maxTotalSizeMB := normalizeSyncLimitSetting(- s.settingsService.GetIntSetting(ctx, "gitSyncMaxTotalSizeMb", defaultMaxSyncTotalSizeMB),- defaultMaxSyncTotalSizeMB,- )- maxBinarySizeMB := normalizeSyncLimitSetting(- s.settingsService.GetIntSetting(ctx, "gitSyncMaxBinarySizeMb", defaultMaxSyncBinarySizeMB),- defaultMaxSyncBinarySizeMB,- )+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ maxFiles := normalizeSyncLimitSetting(utils.IntOrDefault(cfg.GitSyncMaxFiles.Value, defaultMaxSyncFiles), defaultMaxSyncFiles)+ maxTotalSizeMB := normalizeSyncLimitSetting(utils.IntOrDefault(cfg.GitSyncMaxTotalSizeMb.Value, defaultMaxSyncTotalSizeMB), defaultMaxSyncTotalSizeMB)+ maxBinarySizeMB := normalizeSyncLimitSetting(utils.IntOrDefault(cfg.GitSyncMaxBinarySizeMb.Value, defaultMaxSyncBinarySizeMB), defaultMaxSyncBinarySizeMB)return maxFiles, megabytesToBytes(maxTotalSizeMB), megabytesToBytes(maxBinarySizeMB)}diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex 095bf606c..69c5d44e7 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -8,6 +8,8 @@ import ("log/slog""net/http""strings"+ "sync"+ "time""github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models"@@ -33,6 +35,16 @@ type ImageService struct {registryService *ContainerRegistryServicevulnerabilityService *VulnerabilityServiceeventService *EventService++ projectIDCache projectIDNameCache+}++// projectIDNameCache memoizes the (project name → project ID) map used to enrich image+// usage data with the owning project. The TTL bounds staleness; see projectIDCacheTTL.+type projectIDNameCache struct {+ mu sync.RWMutex+ byName map[string]string+ expires time.Time}func NewImageService(db *database.DB, dockerService *DockerClientService, registryService *ContainerRegistryService, imageUpdateService *ImageUpdateService, vulnerabilityService *VulnerabilityService, eventService *EventService) *ImageService {@@ -603,7 +615,7 @@ func (s *ImageService) ListImagesPaginated(ctx context.Context, params paginatio}}- projectIDByName := buildProjectIDMapInternal(ctx, s.db, containers)+ projectIDByName := s.BuildProjectIDMap(ctx, containers)usageMap := buildUsageMapInternal(containers, projectIDByName)updateMap := buildUpdateMap(updateRecords)@@ -745,9 +757,49 @@ func (s *ImageService) GetTotalImageSize(ctx context.Context) (int64, error) {return total, nil}-func buildProjectIDMapInternal(ctx context.Context, db *database.DB, containers []container.Summary) map[string]string {+// projectIDCacheTTL bounds how long a snapshot of all (name → id) project rows is reused.+// Dashboard polls frequently; the projects table changes rarely, so a short TTL is safe.+const projectIDCacheTTL = 5 * time.Second++func (s *ImageService) loadProjectIDByNameCachedInternal(ctx context.Context) map[string]string {+ s.projectIDCache.mu.RLock()+ if cached := s.projectIDCache.byName; cached != nil && time.Now().Before(s.projectIDCache.expires) {+ s.projectIDCache.mu.RUnlock()+ return cached+ }+ s.projectIDCache.mu.RUnlock()++ s.projectIDCache.mu.Lock()+ defer s.projectIDCache.mu.Unlock()+ if cached := s.projectIDCache.byName; cached != nil && time.Now().Before(s.projectIDCache.expires) {+ return cached+ }++ var projects []models.Project+ if err := s.db.WithContext(ctx).Select("id", "name").Find(&projects).Error; err != nil {+ slog.WarnContext(ctx, "failed to load project ID map", "error", err)+ // Return last cached value if any; otherwise an empty map (don't store, so we retry next call).+ if s.projectIDCache.byName != nil {+ return s.projectIDCache.byName+ }+ return map[string]string{}+ }++ byName := make(map[string]string, len(projects))+ for _, p := range projects {+ byName[p.Name] = p.ID+ }+ s.projectIDCache.byName = byName+ s.projectIDCache.expires = time.Now().Add(projectIDCacheTTL)+ return byName+}++// BuildProjectIDMap returns a map of compose project name → project ID for any+// containers that carry the com.docker.compose.project label. The lookup uses a+// short-TTL cache shared across all callers of this ImageService instance.+func (s *ImageService) BuildProjectIDMap(ctx context.Context, containers []container.Summary) map[string]string {projectIDs := make(map[string]string)- if db == nil {+ if s.db == nil {return projectIDs}@@ -764,20 +816,12 @@ func buildProjectIDMapInternal(ctx context.Context, db *database.DB, containersreturn projectIDs}- projectNames := make([]string, 0, len(projectNameSet))+ all := s.loadProjectIDByNameCachedInternal(ctx)for name := range projectNameSet {- projectNames = append(projectNames, name)- }-- var projects []models.Project- if err := db.WithContext(ctx).Where("name IN ?", projectNames).Find(&projects).Error; err != nil {- slog.WarnContext(ctx, "failed to resolve project IDs for image usage", "error", err)- return projectIDs- }- for _, project := range projects {- projectIDs[project.Name] = project.ID+ if id, ok := all[name]; ok {+ projectIDs[name] = id+ }}-return projectIDs}diff --git a/backend/internal/services/project_service.go b/backend/internal/services/project_service.goindex 9f2c84ebc..650d28a87 100644--- a/backend/internal/services/project_service.go+++ b/backend/internal/services/project_service.go@@ -449,8 +449,8 @@ func (s *ProjectService) loadComposeProjectForProjectInternal(ctx context.Contexreturn nil, "", err}- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")- projectsDirectory, pdErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ projectsDirectory, pdErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))if pdErr != nil {slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)projectsDirectory = "/app/data/projects"@@ -461,8 +461,7 @@ func (s *ProjectService) loadComposeProjectForProjectInternal(ctx context.Contexslog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)}- autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)- composeProject, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv, pathMapper)+ composeProject, loadErr := projects.LoadComposeProject(ctx, composeFileFullPath, normalizeComposeProjectName(proj.Name), projectsDirectory, utils.BoolOrDefault(cfg.AutoInjectEnv.Value, false), pathMapper)if loadErr != nil {return nil, "", loadErr}@@ -830,10 +829,9 @@ func (s *ProjectService) GetProjectFileContent(ctx context.Context, projectID, rcomposeFile, detectErr := s.resolveProjectComposeFileInternal(ctx, proj)if detectErr == nil {- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")- projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))- autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)- envLoader := projects.NewEnvLoader(projectsDirectory, filepath.Dir(composeFile), autoInjectEnv)+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))+ envLoader := projects.NewEnvLoader(projectsDirectory, filepath.Dir(composeFile), utils.BoolOrDefault(cfg.AutoInjectEnv.Value, false))envMap, _, _ := envLoader.LoadEnvironment(ctx)includes, parseErr := projects.ParseIncludes(composeFile, envMap, true)@@ -901,10 +899,9 @@ func (s *ProjectService) enrichWithIncludeFiles(ctx context.Context, composeFile}// Load environment variables so that include paths with ${VAR} references are expanded- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")- projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))- autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)- envLoader := projects.NewEnvLoader(projectsDirectory, filepath.Dir(composeFile), autoInjectEnv)+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))+ envLoader := projects.NewEnvLoader(projectsDirectory, filepath.Dir(composeFile), utils.BoolOrDefault(cfg.AutoInjectEnv.Value, false))envMap, _, _ := envLoader.LoadEnvironment(ctx)includes, parseErr := projects.ParseIncludes(composeFile, envMap, false)@@ -1185,16 +1182,15 @@ func (s *ProjectService) enrichWithGitOpsInfo(ctx context.Context, proj *models.}func (s *ProjectService) enrichWithComposeServiceConfigs(ctx context.Context, proj *models.Project, composeFile string, resp *project.Details) {- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")- projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ projectsDirectory, _ := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))pathMapper, pmErr := s.getPathMapper(ctx)if pmErr != nil {slog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)}- autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)- composeProj, loadErr := projects.LoadComposeProject(ctx, composeFile, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv, pathMapper)+ composeProj, loadErr := projects.LoadComposeProject(ctx, composeFile, normalizeComposeProjectName(proj.Name), projectsDirectory, utils.BoolOrDefault(cfg.AutoInjectEnv.Value, false), pathMapper)if loadErr != nil {slog.WarnContext(ctx, "failed to load compose service configs", "path", composeFile, "error", loadErr)return@@ -2358,8 +2354,8 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, u}// Get configured projects directory from settings- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")- projectsDirectory, pdErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ projectsDirectory, pdErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))if pdErr != nil {slog.WarnContext(ctx, "unable to determine projects directory; using default", "error", pdErr)projectsDirectory = "/app/data/projects"@@ -2370,8 +2366,7 @@ func (s *ProjectService) RestartProject(ctx context.Context, projectID string, uslog.WarnContext(ctx, "failed to create path mapper, continuing without translation", "error", pmErr)}- autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)- compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory, autoInjectEnv, pathMapper)+ compProj, _, lerr := projects.LoadComposeProjectFromDir(ctx, proj.Path, normalizeComposeProjectName(proj.Name), projectsDirectory, utils.BoolOrDefault(cfg.AutoInjectEnv.Value, false), pathMapper)if lerr != nil {_ = s.updateProjectStatusInternal(ctx, projectID, models.ProjectStatusRunning)return fmt.Errorf("failed to load compose project: %w", lerr)@@ -3482,8 +3477,8 @@ func (s *ProjectService) countServicesFromCompose(ctx context.Context, p models.// and once for the project name).// The effective name is nil when it matches the normalized directory name.func (s *ProjectService) loadComposeMetadataForSyncInternal(ctx context.Context, dirPath, dirName string) (serviceCount int, composeProjectName *string, err error) {- projectsDirSetting := s.settingsService.GetStringSetting(ctx, "projectsDirectory", "/app/data/projects")- projectsDirectory, pErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(projectsDirSetting))+ cfg := s.settingsService.GetSettingsOrDefaults(ctx)+ projectsDirectory, pErr := projects.GetProjectsDirectory(ctx, strings.TrimSpace(cfg.ProjectsDirectory.Value))if pErr != nil {return 0, nil, pErr}@@ -3494,7 +3489,7 @@ func (s *ProjectService) loadComposeMetadataForSyncInternal(ctx context.Context,}normName := normalizeComposeProjectName(dirName)- autoInjectEnv := s.settingsService.GetBoolSetting(ctx, "autoInjectEnv", false)+ autoInjectEnv := utils.BoolOrDefault(cfg.AutoInjectEnv.Value, false)// First, try loading without forcing a project name so compose-go can// resolve COMPOSE_PROJECT_NAME from the .env file. If this fails (e.g.diff --git a/backend/internal/services/settings_service.go b/backend/internal/services/settings_service.goindex 6dc4accff..6b9555977 100644--- a/backend/internal/services/settings_service.go+++ b/backend/internal/services/settings_service.go@@ -506,6 +506,21 @@ func (s *SettingsService) GetSettings(ctx context.Context) (*models.Settings, erreturn settings, nil}+// GetSettingsOrDefaults is a convenience for hot paths that need a snapshot but cannot+// meaningfully recover from a settings load failure. It logs any error and guarantees a+// non-nil *Settings (defaults: a zero-valued struct, which the SettingVariable helpers+// like utils.BoolOrDefault treat as "use the caller's default").+func (s *SettingsService) GetSettingsOrDefaults(ctx context.Context) *models.Settings {+ cfg, err := s.GetSettings(ctx)+ if err != nil {+ slog.WarnContext(ctx, "failed to load settings, falling back to defaults", "error", err)+ }+ if cfg == nil {+ return &models.Settings{}+ }+ return cfg+}+func (s *SettingsService) getEffectiveSettingsConfig(ctx context.Context) *models.Settings {settings := s.GetSettingsConfig().Clone()s.applyEnvOverrides(ctx, settings)diff --git a/backend/internal/services/user_service.go b/backend/internal/services/user_service.goindex c35aca59d..7a34d7389 100644--- a/backend/internal/services/user_service.go+++ b/backend/internal/services/user_service.go@@ -18,6 +18,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/database""github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/pkg/pagination"+ "github.com/getarcaneapp/arcane/backend/pkg/utils/dbutil""github.com/getarcaneapp/arcane/types/user")@@ -132,7 +133,7 @@ func (s *UserService) validateArgon2Password(encodedHash, password string) error}func (s *UserService) CreateUser(ctx context.Context, user *models.User) (*models.User, error) {- err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ err := dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {if err := tx.Create(user).Error; err != nil {return fmt.Errorf("failed to create user: %w", err)}@@ -145,51 +146,23 @@ func (s *UserService) CreateUser(ctx context.Context, user *models.User) (*model}func (s *UserService) GetUserByUsername(ctx context.Context, username string) (*models.User, error) {- var user models.User- if err := s.db.WithContext(ctx).Where("username = ?", username).First(&user).Error; err != nil {- if errors.Is(err, gorm.ErrRecordNotFound) {- return nil, ErrUserNotFound- }- return nil, fmt.Errorf("failed to get user: %w", err)- }- return &user, nil+ return dbutil.FirstWhere[models.User](ctx, s.db.DB, ErrUserNotFound, "username = ?", username)}func (s *UserService) GetUserByID(ctx context.Context, id string) (*models.User, error) {- var user models.User- if err := s.db.WithContext(ctx).Where("id = ?", id).First(&user).Error; err != nil {- if errors.Is(err, gorm.ErrRecordNotFound) {- return nil, ErrUserNotFound- }- return nil, fmt.Errorf("failed to get user: %w", err)- }- return &user, nil+ return dbutil.FirstWhere[models.User](ctx, s.db.DB, ErrUserNotFound, "id = ?", id)}func (s *UserService) GetUserByOidcSubjectId(ctx context.Context, subjectId string) (*models.User, error) {- var user models.User- if err := s.db.WithContext(ctx).Where("oidc_subject_id = ?", subjectId).First(&user).Error; err != nil {- if errors.Is(err, gorm.ErrRecordNotFound) {- return nil, ErrUserNotFound- }- return nil, fmt.Errorf("failed to get user: %w", err)- }- return &user, nil+ return dbutil.FirstWhere[models.User](ctx, s.db.DB, ErrUserNotFound, "oidc_subject_id = ?", subjectId)}func (s *UserService) GetUserByEmail(ctx context.Context, email string) (*models.User, error) {- var user models.User- if err := s.db.WithContext(ctx).Where("email = ?", email).First(&user).Error; err != nil {- if errors.Is(err, gorm.ErrRecordNotFound) {- return nil, ErrUserNotFound- }- return nil, fmt.Errorf("failed to get user by email: %w", err)- }- return &user, nil+ return dbutil.FirstWhere[models.User](ctx, s.db.DB, ErrUserNotFound, "email = ?", email)}func (s *UserService) UpdateUser(ctx context.Context, user *models.User) (*models.User, error) {- err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ err := dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {var existing models.Userif err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).@@ -231,7 +204,7 @@ func (s *UserService) UpdateUser(ctx context.Context, user *models.User) (*model// This MUST be done inside a transaction to ensure the lock is held until the update is committed.func (s *UserService) AttachOidcSubjectTransactional(ctx context.Context, userID string, subject string, updateFn func(u *models.User)) (*models.User, error) {var out *models.User- err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ err := dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {var u models.Userif err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).@@ -278,7 +251,7 @@ func (s *UserService) CreateDefaultAdmin(ctx context.Context) error {return fmt.Errorf("failed to hash default admin password: %w", err)}- return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ return dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {var count int64if err := tx.Model(&models.User{}).Count(&count).Error; err != nil {return fmt.Errorf("failed to count users: %w", err)@@ -314,7 +287,7 @@ func (s *UserService) CreateDefaultAdmin(ctx context.Context) error {}func (s *UserService) DeleteUser(ctx context.Context, id string) error {- return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ return dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {var existing models.Userif err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).@@ -357,7 +330,7 @@ func (s *UserService) UpgradePasswordHash(ctx context.Context, userID, passwordreturn fmt.Errorf("failed to create new hash: %w", err)}- return s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {+ return dbutil.WithTx(ctx, s.db.DB, func(tx *gorm.DB) error {if err := tx.Model(&models.User{}).Where("id = ?", userID).Update("password_hash", newHash).Error; err != nil {diff --git a/backend/pkg/dockerutil/volume_utils.go b/backend/pkg/dockerutil/volume_utils.goindex 83d9d4720..20acb8b92 100644--- a/backend/pkg/dockerutil/volume_utils.go+++ b/backend/pkg/dockerutil/volume_utils.go@@ -7,6 +7,7 @@ import ("sync""time"+ "github.com/moby/moby/api/types/container""github.com/moby/moby/api/types/mount""github.com/moby/moby/api/types/volume""github.com/moby/moby/client"@@ -67,13 +68,9 @@ func InvalidateVolumeUsageCache() {volumeUsageCacheTime = time.Time{}}-func GetContainersUsingVolume(ctx context.Context, dockerClient *client.Client, volumeName string) ([]string, error) {- containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})- if err != nil {- return nil, fmt.Errorf("failed to list containers: %w", err)- }- containers := containerList.Items-+// FilterContainersUsingVolume returns the IDs of containers in the provided slice that mount the named volume.+// Use this when checking many volumes in a row — list containers once and reuse the slice.+func FilterContainersUsingVolume(containers []container.Summary, volumeName string) []string {containerIDs := make([]string, 0)for _, c := range containers {for _, m := range c.Mounts {@@ -83,8 +80,19 @@ func GetContainersUsingVolume(ctx context.Context, dockerClient *client.Client,}}}+ return containerIDs+}++// GetContainersUsingVolume lists all containers and returns IDs that mount the named volume.+// For batch checks (multiple volumes), prefer listing containers once via dockerClient.ContainerList+// and calling FilterContainersUsingVolume per volume.+func GetContainersUsingVolume(ctx context.Context, dockerClient *client.Client, volumeName string) ([]string, error) {+ containerList, err := dockerClient.ContainerList(ctx, client.ContainerListOptions{All: true})+ if err != nil {+ return nil, fmt.Errorf("failed to list containers: %w", err)+ }+ containerIDs := FilterContainersUsingVolume(containerList.Items, volumeName)slog.DebugContext(ctx, "found containers using volume", "volume", volumeName, "container_count", len(containerIDs))-return containerIDs, nil}diff --git a/backend/pkg/utils/dbutil/dbutil.go b/backend/pkg/utils/dbutil/dbutil.gonew file mode 100644index 000000000..543aa8175--- /dev/null+++ b/backend/pkg/utils/dbutil/dbutil.go@@ -0,0 +1,35 @@+// Package dbutil provides small generic helpers around GORM that consolidate+// repetitive single-row lookup and transaction boilerplate found across services.+package dbutil++import (+ "context"+ "errors"+ "fmt"++ "gorm.io/gorm"+)++// FirstWhere fetches a single row of T matching the provided WHERE clause.+// It maps gorm.ErrRecordNotFound to notFound (when non-nil) and otherwise wraps+// the error with a generic "failed to query <T>" prefix.+//+// Example:+//+// user, err := dbutil.FirstWhere[models.User](ctx, s.db.DB, ErrUserNotFound, "username = ?", username)+func FirstWhere[T any](ctx context.Context, db *gorm.DB, notFound error, where string, args ...any) (*T, error) {+ var out T+ if err := db.WithContext(ctx).Where(where, args...).First(&out).Error; err != nil {+ if errors.Is(err, gorm.ErrRecordNotFound) && notFound != nil {+ return nil, notFound+ }+ return nil, fmt.Errorf("failed to query %T: %w", out, err)+ }+ return &out, nil+}++// WithTx runs fn inside a GORM transaction bound to ctx. Equivalent to+// db.WithContext(ctx).Transaction(fn) but tightens the surface area at call sites.+func WithTx(ctx context.Context, db *gorm.DB, fn func(tx *gorm.DB) error) error {+ return db.WithContext(ctx).Transaction(fn)+}diff --git a/backend/pkg/utils/dbutil/dbutil_test.go b/backend/pkg/utils/dbutil/dbutil_test.gonew file mode 100644index 000000000..b7fce4264--- /dev/null+++ b/backend/pkg/utils/dbutil/dbutil_test.go@@ -0,0 +1,79 @@+package dbutil++import (+ "context"+ "errors"+ "testing"++ glsqlite "github.com/glebarez/sqlite"+ "github.com/stretchr/testify/require"+ "gorm.io/gorm"+)++type widget struct {+ ID string `gorm:"primaryKey"`+ Name string+}++var errWidgetNotFound = errors.New("widget not found")++func newTestDB(t *testing.T) *gorm.DB {+ t.Helper()+ db, err := gorm.Open(glsqlite.Open(":memory:"), &gorm.Config{})+ require.NoError(t, err)+ require.NoError(t, db.AutoMigrate(&widget{}))+ return db+}++func TestFirstWhereFound(t *testing.T) {+ db := newTestDB(t)+ require.NoError(t, db.Create(&widget{ID: "w-1", Name: "alpha"}).Error)++ got, err := FirstWhere[widget](context.Background(), db, errWidgetNotFound, "name = ?", "alpha")+ require.NoError(t, err)+ require.Equal(t, "w-1", got.ID)+}++func TestFirstWhereNotFoundReturnsSentinel(t *testing.T) {+ db := newTestDB(t)++ _, err := FirstWhere[widget](context.Background(), db, errWidgetNotFound, "name = ?", "missing")+ require.ErrorIs(t, err, errWidgetNotFound)+}++func TestFirstWhereNotFoundWithNilSentinel(t *testing.T) {+ db := newTestDB(t)++ _, err := FirstWhere[widget](context.Background(), db, nil, "name = ?", "missing")+ require.Error(t, err)+ require.ErrorIs(t, err, gorm.ErrRecordNotFound)+}++func TestWithTxCommit(t *testing.T) {+ db := newTestDB(t)++ err := WithTx(context.Background(), db, func(tx *gorm.DB) error {+ return tx.Create(&widget{ID: "w-1", Name: "alpha"}).Error+ })+ require.NoError(t, err)++ got, err := FirstWhere[widget](context.Background(), db, errWidgetNotFound, "id = ?", "w-1")+ require.NoError(t, err)+ require.Equal(t, "alpha", got.Name)+}++func TestWithTxRollback(t *testing.T) {+ db := newTestDB(t)+ boom := errors.New("boom")++ err := WithTx(context.Background(), db, func(tx *gorm.DB) error {+ if err := tx.Create(&widget{ID: "w-1", Name: "alpha"}).Error; err != nil {+ return err+ }+ return boom+ })+ require.ErrorIs(t, err, boom)++ _, err = FirstWhere[widget](context.Background(), db, errWidgetNotFound, "id = ?", "w-1")+ require.ErrorIs(t, err, errWidgetNotFound)+}diff --git a/backend/pkg/utils/string_util.go b/backend/pkg/utils/string_util.goindex b14732933..c4cc4e79d 100644--- a/backend/pkg/utils/string_util.go+++ b/backend/pkg/utils/string_util.go@@ -1,6 +1,9 @@package utils-import "strings"+import (+ "strconv"+ "strings"+)// StringOrDefault returns the trimmed value if non-empty, otherwise defaultValue.func StringOrDefault(value, defaultValue string) string {@@ -10,3 +13,27 @@ func StringOrDefault(value, defaultValue string) string {}return value}++// BoolOrDefault parses value as a bool, falling back to defaultValue when empty or unparseable.+func BoolOrDefault(value string, defaultValue bool) bool {+ if value == "" {+ return defaultValue+ }+ v, err := strconv.ParseBool(value)+ if err != nil {+ return defaultValue+ }+ return v+}++// IntOrDefault parses value as an int, falling back to defaultValue when empty or unparseable.+func IntOrDefault(value string, defaultValue int) int {+ if value == "" {+ return defaultValue+ }+ v, err := strconv.Atoi(value)+ if err != nil {+ return defaultValue+ }+ return v+}diff --git a/backend/resources/migrations/postgres/049_add_projects_name_index.down.sql b/backend/resources/migrations/postgres/049_add_projects_name_index.down.sqlnew file mode 100644index 000000000..2177cfdbb--- /dev/null+++ b/backend/resources/migrations/postgres/049_add_projects_name_index.down.sql@@ -0,0 +1 @@+DROP INDEX IF EXISTS idx_projects_name;diff --git a/backend/resources/migrations/postgres/049_add_projects_name_index.up.sql b/backend/resources/migrations/postgres/049_add_projects_name_index.up.sqlnew file mode 100644index 000000000..2deb77b44--- /dev/null+++ b/backend/resources/migrations/postgres/049_add_projects_name_index.up.sql@@ -0,0 +1 @@+CREATE INDEX IF NOT EXISTS idx_projects_name ON projects (name);diff --git a/backend/resources/migrations/sqlite/049_add_projects_name_index.down.sql b/backend/resources/migrations/sqlite/049_add_projects_name_index.down.sqlnew file mode 100644index 000000000..2177cfdbb--- /dev/null+++ b/backend/resources/migrations/sqlite/049_add_projects_name_index.down.sql@@ -0,0 +1 @@+DROP INDEX IF EXISTS idx_projects_name;diff --git a/backend/resources/migrations/sqlite/049_add_projects_name_index.up.sql b/backend/resources/migrations/sqlite/049_add_projects_name_index.up.sqlnew file mode 100644index 000000000..2deb77b44--- /dev/null+++ b/backend/resources/migrations/sqlite/049_add_projects_name_index.up.sql@@ -0,0 +1 @@+CREATE INDEX IF NOT EXISTS idx_projects_name ON projects (name);