From 080002f4ae685d98578f1160523bd7c8bc18f140 Mon Sep 17 00:00:00 2001 From: Marco Pedone Date: Thu, 21 Aug 2025 13:54:15 +0200 Subject: [PATCH] feat: add DbHandler and helpers for database operations with logging and utility functions --- apps/backend/{db_handler.go => db/handler.go} | 17 ++++------------- .../{dbhelpers/dbhelpers.go => db/helpers.go} | 2 +- apps/backend/server.go | 5 +++-- 3 files changed, 8 insertions(+), 16 deletions(-) rename apps/backend/{db_handler.go => db/handler.go} (96%) rename apps/backend/{dbhelpers/dbhelpers.go => db/helpers.go} (99%) diff --git a/apps/backend/db_handler.go b/apps/backend/db/handler.go similarity index 96% rename from apps/backend/db_handler.go rename to apps/backend/db/handler.go index 841e8bd..95eb32f 100644 --- a/apps/backend/db_handler.go +++ b/apps/backend/db/handler.go @@ -1,8 +1,8 @@ -package main +package db import ( - "backend/dbhelpers" "backend/typedefs" + "backend/utils" "context" "fmt" "log/slog" @@ -35,7 +35,7 @@ func NewDbHandler() *DbHandler { if err != nil { panic(err) } - config.ConnConfig.Tracer = dbhelpers.NewMultiQueryTracer(dbhelpers.NewLoggingQueryTracer(slog.Default())) + config.ConnConfig.Tracer = NewMultiQueryTracer(NewLoggingQueryTracer(slog.Default())) config.AfterConnect = func(ctx context.Context, conn *pgx.Conn) error { pgxuuid.Register(conn.TypeMap()) @@ -88,7 +88,7 @@ func (h *DbHandler) InsertAnnunciInDB(annunci typedefs.AnnunciParsed) { batch := &pgx.Batch{} for _, annuncio := range annunci.Annuncio { - if contains(codici, annuncio.Codice) { + if utils.Contains(codici, annuncio.Codice) { batch.Queue(` UPDATE public.annunci SET locatore = $1, @@ -225,15 +225,6 @@ func (h *DbHandler) InsertAnnunciInDB(annunci typedefs.AnnunciParsed) { } -func contains(s []string, str string) bool { - for _, v := range s { - if v == str { - return true - } - } - return false -} - func (h *DbHandler) ClearRecords() { //SET ALL WEB TO FALSE diff --git a/apps/backend/dbhelpers/dbhelpers.go b/apps/backend/db/helpers.go similarity index 99% rename from apps/backend/dbhelpers/dbhelpers.go rename to apps/backend/db/helpers.go index ec0f967..b6a8f84 100644 --- a/apps/backend/dbhelpers/dbhelpers.go +++ b/apps/backend/db/helpers.go @@ -1,4 +1,4 @@ -package dbhelpers +package db import ( "context" diff --git a/apps/backend/server.go b/apps/backend/server.go index 68295e4..1781abd 100644 --- a/apps/backend/server.go +++ b/apps/backend/server.go @@ -1,6 +1,7 @@ package main import ( + "backend/db" storagehandlers "backend/storage_handlers" "fmt" "io" @@ -23,7 +24,7 @@ var ( imageOption bool concurrentImages int = 1 storagepath string - Db *DbHandler + Db *db.DbHandler Miogest *MiogestHandler ImageManager *ImageRefManager Storage storagehandlers.StorageHandler @@ -63,7 +64,7 @@ func main() { } // SETUP DATABASE HANDLER - Db = NewDbHandler() + Db = db.NewDbHandler() if Db == nil { log.Fatal("Error connecting to db") }