Compare commits
6 Commits
2974d80c11
...
v1.1.12
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5d1775943 | ||
|
|
8e45a20b6a | ||
|
|
dd4840b694 | ||
|
|
705a215707 | ||
|
|
7f27579050 | ||
|
|
81d7f5b9dc |
28
dbHandler.go
28
dbHandler.go
@@ -24,8 +24,9 @@ import (
|
||||
// - db: Active GORM database connection.
|
||||
// - logger: Pointer to a custom logger instance for structured logging.
|
||||
type DBHandler struct {
|
||||
db *gorm.DB
|
||||
logger *logging.Logger
|
||||
db *gorm.DB
|
||||
logger *logging.Logger
|
||||
NewCreatedDB bool // indicater for new created database
|
||||
}
|
||||
|
||||
// NewDBHandler
|
||||
@@ -68,6 +69,10 @@ func NewDBHandler(name, path string, logger *logging.Logger) (dH *DBHandler, err
|
||||
}
|
||||
|
||||
dbPath := filepath.Join(path, name)
|
||||
|
||||
//indicator if database exists
|
||||
_, err = os.Stat(dbPath)
|
||||
dH.NewCreatedDB = err != nil
|
||||
logger.Debug("NewDBHandler", "open database "+dbPath)
|
||||
dH.db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{})
|
||||
return
|
||||
@@ -177,8 +182,22 @@ func (dH *DBHandler) GetByKey(model any, key string, value any, LikeSearch bool,
|
||||
query = query.Preload(relation)
|
||||
}
|
||||
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), "*", "%")
|
||||
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
|
||||
}
|
||||
|
||||
@@ -368,3 +387,8 @@ func (dH *DBHandler) AddRelation(model, relation any, relationName string) error
|
||||
func (dH *DBHandler) DeleteRelation(model, relation any, relationName string) error {
|
||||
return dH.db.Model(model).Association(relationName).Delete(relation)
|
||||
}
|
||||
|
||||
func (dH *DBHandler) ReplaceRelation(model any, relationName string, data any) error {
|
||||
// .Replace() handles the "Delete missing / Add new" logic for you
|
||||
return dH.db.Model(model).Association(relationName).Replace(data)
|
||||
}
|
||||
|
||||
14
db_test.go
14
db_test.go
@@ -46,12 +46,12 @@ func TestDbHandler(t *testing.T) {
|
||||
}
|
||||
|
||||
var members []Member
|
||||
if err := dbHandler.GetById(&members, "", 0); err != nil {
|
||||
if err := dbHandler.GetById(&members, 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
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.Log(members)
|
||||
@@ -65,7 +65,7 @@ func TestDbHandler(t *testing.T) {
|
||||
|
||||
var events []Event
|
||||
|
||||
if err := dbHandler.GetById(&events, "Attendees", 0); err != nil {
|
||||
if err := dbHandler.GetById(&events, 0, "Attendees"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -78,19 +78,19 @@ func TestDbHandler(t *testing.T) {
|
||||
|
||||
//add responsible
|
||||
mem1 := &Member{}
|
||||
if err := dbHandler.GetById(mem1, "", 2); err != nil {
|
||||
if err := dbHandler.GetById(mem1, 2); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
mem2 := &Member{}
|
||||
if err := dbHandler.GetById(mem2, "", 1); err != nil {
|
||||
if err := dbHandler.GetById(mem2, 1); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user