5 Commits

Author SHA1 Message Date
Adrian Zürcher
8e45a20b6a fix key search for []string type 2026-02-11 14:51:07 +01:00
Adrian Zürcher
dd4840b694 remove useless print 2025-11-30 21:34:16 +01:00
Adrian Zürcher
705a215707 fix wrong database exists check 2025-11-30 21:26:35 +01:00
Adrian Zürcher
7f27579050 add new boolean indicator for when new database is created 2025-11-30 21:01:53 +01:00
Adrian Zürcher
81d7f5b9dc fix wrong test parameter 2025-11-30 20:57:52 +01:00
2 changed files with 28 additions and 9 deletions

View File

@@ -24,8 +24,9 @@ import (
// - db: Active GORM database connection. // - db: Active GORM database connection.
// - logger: Pointer to a custom logger instance for structured logging. // - logger: Pointer to a custom logger instance for structured logging.
type DBHandler struct { type DBHandler struct {
db *gorm.DB db *gorm.DB
logger *logging.Logger logger *logging.Logger
NewCreatedDB bool // indicater for new created database
} }
// NewDBHandler // NewDBHandler
@@ -68,6 +69,10 @@ func NewDBHandler(name, path string, logger *logging.Logger) (dH *DBHandler, err
} }
dbPath := filepath.Join(path, name) dbPath := filepath.Join(path, name)
//indicator if database exists
_, err = os.Stat(dbPath)
dH.NewCreatedDB = err != nil
logger.Debug("NewDBHandler", "open database "+dbPath) logger.Debug("NewDBHandler", "open database "+dbPath)
dH.db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{}) dH.db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
return return
@@ -177,8 +182,22 @@ func (dH *DBHandler) GetByKey(model any, key string, value any, LikeSearch bool,
query = query.Preload(relation) query = query.Preload(relation)
} }
if LikeSearch { if LikeSearch {
if vals, ok := value.([]string); ok {
subQuery := dH.db
for i, v := range vals {
v = strings.ReplaceAll(v, "*", "%")
if i == 0 {
subQuery = subQuery.Where(key+" LIKE ?", v)
} else {
subQuery = subQuery.Or(key+" LIKE ?", v)
}
}
return query.Where(subQuery).Find(model).Error
}
value = strings.ReplaceAll(fmt.Sprint(value), "*", "%") value = strings.ReplaceAll(fmt.Sprint(value), "*", "%")
dH.logger.Debug("getByKey", "find like key "+key+" value "+fmt.Sprint(value)) dH.logger.Debug("getByKey", "find like key "+key+" value "+fmt.Sprint(value))
fmt.Println(465, "find like key "+key+" value "+fmt.Sprint(value))
return query.Where(key+" LIKE ?", value).Find(model).Error return query.Where(key+" LIKE ?", value).Find(model).Error
} }

View File

@@ -46,12 +46,12 @@ func TestDbHandler(t *testing.T) {
} }
var members []Member var members []Member
if err := dbHandler.GetById(&members, "", 0); err != nil { if err := dbHandler.GetById(&members, 0); err != nil {
t.Fatal(err) t.Fatal(err)
} }
t.Log(members) t.Log(members)
if err := dbHandler.GetById(&members, "Events", 0); err != nil { if err := dbHandler.GetById(&members, 0, "Events"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
t.Log(members) t.Log(members)
@@ -65,7 +65,7 @@ func TestDbHandler(t *testing.T) {
var events []Event var events []Event
if err := dbHandler.GetById(&events, "Attendees", 0); err != nil { if err := dbHandler.GetById(&events, 0, "Attendees"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
@@ -78,19 +78,19 @@ func TestDbHandler(t *testing.T) {
//add responsible //add responsible
mem1 := &Member{} mem1 := &Member{}
if err := dbHandler.GetById(mem1, "", 2); err != nil { if err := dbHandler.GetById(mem1, 2); err != nil {
t.Fatal(err) t.Fatal(err)
} }
mem2 := &Member{} mem2 := &Member{}
if err := dbHandler.GetById(mem2, "", 1); err != nil { if err := dbHandler.GetById(mem2, 1); err != nil {
t.Fatal(err) t.Fatal(err)
} }
mem1.ResponsiblePerson = mem2 mem1.ResponsiblePerson = mem2
dbHandler.UpdateValuesById(mem1, "", uint(mem1.Id)) dbHandler.UpdateValuesById(mem1, uint(mem1.Id))
if err := dbHandler.GetById(mem1, "", 2); err != nil { if err := dbHandler.GetById(mem1, 2); err != nil {
t.Fatal(err) t.Fatal(err)
} }