4 Commits

Author SHA1 Message Date
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
Adrian Zürcher
2974d80c11 add new relational table requests 2025-11-27 07:45:44 +01:00
Adrian Zürcher
8afcfcfc2d add new function 2025-11-19 23:02:55 +01:00
2 changed files with 37 additions and 33 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
@@ -64,6 +65,7 @@ func NewDBHandler(name, path string, logger *logging.Logger) (dH *DBHandler, err
if err := os.MkdirAll(path, 0666); err != err { if err := os.MkdirAll(path, 0666); err != err {
return nil, err return nil, err
} }
dH.NewCreatedDB = true
} }
} }
@@ -129,12 +131,12 @@ func (dH *DBHandler) AddNewColum(model any) error {
// //
// Returns: // Returns:
// - error: Any query error or “not found” message. // - error: Any query error or “not found” message.
func (dH *DBHandler) GetById(model any, relation string, id uint) (err error) { func (dH *DBHandler) GetById(model any, id uint, relations ...string) (err error) {
dH.logger.Debug("getById", "find id "+fmt.Sprint(id)) dH.logger.Debug("getById", "find id "+fmt.Sprint(id))
query := dH.db query := dH.db
if relation != "" { for _, relation := range relations {
query = query.Preload(relation) query = query.Preload(relation)
} }
@@ -170,10 +172,10 @@ func (dH *DBHandler) GetById(model any, relation string, id uint) (err error) {
// //
// Returns: // Returns:
// - error: Any database query error. // - error: Any database query error.
func (dH *DBHandler) GetByKey(model any, relation string, key string, value any, LikeSearch bool) error { func (dH *DBHandler) GetByKey(model any, key string, value any, LikeSearch bool, relations ...string) error {
query := dH.db query := dH.db
if relation != "" { for _, relation := range relations {
query = query.Preload(relation) query = query.Preload(relation)
} }
if LikeSearch { if LikeSearch {
@@ -203,22 +205,26 @@ func (dH *DBHandler) GetByKey(model any, relation string, key string, value any,
// //
// Returns: // Returns:
// - error: If the model is invalid or query/update fails. // - error: If the model is invalid or query/update fails.
func (dH *DBHandler) UpdateValuesById(model any, relation string, id uint) error { func (dH *DBHandler) UpdateValuesById(model any, id uint, relations ...string) error {
dH.logger.Debug("updateValuesById", "model"+fmt.Sprint(model)) dH.logger.Debug("updateValuesByKey", "model"+fmt.Sprint(model))
modelType := reflect.TypeOf(model) modelType := reflect.TypeOf(model)
if modelType.Kind() != reflect.Ptr { if modelType.Kind() != reflect.Ptr {
return errors.New("model must be a pointer to struct") return errors.New("model must be a pointer to struct")
} }
lookUpModel := reflect.New(modelType.Elem()).Interface() lookUpModel := reflect.New(modelType.Elem()).Interface()
if err := dH.GetById(lookUpModel, relation, id); err != nil { if err := dH.GetById(lookUpModel, id, relations...); err != nil {
return err return err
} }
query := dH.db
if relation != "" { // Preload relations
query := dH.db
for _, relation := range relations {
query = query.Preload(relation) query = query.Preload(relation)
} }
// Update only provided keys
return query.Model(lookUpModel).Updates(model).Error return query.Model(lookUpModel).Updates(model).Error
} }
@@ -240,7 +246,7 @@ func (dH *DBHandler) UpdateValuesById(model any, relation string, id uint) error
// //
// Returns: // Returns:
// - error: Any query or update error. // - error: Any query or update error.
func (dH *DBHandler) UpdateValuesByKey(model any, relation string, key string, value any) error { func (dH *DBHandler) UpdateValuesByKey(model any, key string, value any, relations ...string) error {
dH.logger.Debug("updateValuesByKey", "model"+fmt.Sprint(model)) dH.logger.Debug("updateValuesByKey", "model"+fmt.Sprint(model))
modelType := reflect.TypeOf(model) modelType := reflect.TypeOf(model)
if modelType.Kind() != reflect.Ptr { if modelType.Kind() != reflect.Ptr {
@@ -248,13 +254,13 @@ func (dH *DBHandler) UpdateValuesByKey(model any, relation string, key string, v
} }
lookUpModel := reflect.New(modelType.Elem()).Interface() lookUpModel := reflect.New(modelType.Elem()).Interface()
if err := dH.GetByKey(lookUpModel, "", key, value, false); err != nil { if err := dH.GetByKey(lookUpModel, key, value, false, relations...); err != nil {
return err return err
} }
query := dH.db query := dH.db
if relation != "" { for _, relation := range relations {
query = query.Preload(relation) query = query.Preload(relation)
} }
return query.Model(lookUpModel).Updates(model).Error return query.Model(lookUpModel).Updates(model).Error
@@ -267,19 +273,13 @@ func (dH *DBHandler) DeleteById(model any, relation string, ids ...uint) error {
if len(ids) == 1 && ids[0] == 0 { if len(ids) == 1 && ids[0] == 0 {
dH.logger.Debug("deleteById", "delete ALL records!") dH.logger.Debug("deleteById", "delete ALL records!")
return dH.db.Session(&gorm.Session{AllowGlobalUpdate: true}). return dH.db.Session(&gorm.Session{AllowGlobalUpdate: true, FullSaveAssociations: true}).
Delete(model).Error Delete(model).Error
} }
dH.logger.Debug("deleteById", "delete ids "+fmt.Sprint(ids)) dH.logger.Debug("deleteById", "delete ids "+fmt.Sprint(ids))
query := dH.db if err := dH.db.Delete(model, ids).Error; err != nil {
if relation != "" {
query = query.Preload(relation)
}
if err := query.Delete(model, ids).Error; err != nil {
return fmt.Errorf("delete failed: %w", err) return fmt.Errorf("delete failed: %w", err)
} }
return nil return nil
@@ -302,7 +302,7 @@ func (dH *DBHandler) DeleteById(model any, relation string, ids ...uint) error {
// //
// Returns: // Returns:
// - error: Any deletion error. // - error: Any deletion error.
func (dH *DBHandler) DeleteByKey(model any, relation string, key string, value any, LikeSearch bool) error { func (dH *DBHandler) DeleteByKey(model any, key string, value any, LikeSearch bool, relations ...string) error {
if LikeSearch { if LikeSearch {
value = strings.ReplaceAll(fmt.Sprint(value), "*", "%") value = strings.ReplaceAll(fmt.Sprint(value), "*", "%")
dH.logger.Debug("deleteByKey", "delete like key "+key+" value "+fmt.Sprint(value)) dH.logger.Debug("deleteByKey", "delete like key "+key+" value "+fmt.Sprint(value))
@@ -313,14 +313,14 @@ func (dH *DBHandler) DeleteByKey(model any, relation string, key string, value a
query := dH.db query := dH.db
if relation != "" { for _, relation := range relations {
query = query.Preload(relation) query = query.Preload(relation)
} }
return query.Where(key+" = ?", value).Delete(model).Error return query.Where(key+" = ?", value).Delete(model).Error
} }
func (dH *DBHandler) Exists(model any, relation string, key string, value any, likeSearch bool) (found bool) { func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool, relations ...string) (found bool) {
var query string var query string
var args any var args any
@@ -350,7 +350,7 @@ func (dH *DBHandler) Exists(model any, relation string, key string, value any, l
dH.logger.Debug("exists", "checking existence for key "+query+" value "+fmt.Sprint(args)) dH.logger.Debug("exists", "checking existence for key "+query+" value "+fmt.Sprint(args))
datababase := dH.db datababase := dH.db
if relation != "" { for _, relation := range relations {
datababase = datababase.Preload(relation) datababase = datababase.Preload(relation)
} }
@@ -366,3 +366,7 @@ func (dH *DBHandler) Exists(model any, relation string, key string, value any, l
func (dH *DBHandler) AddRelation(model, relation any, relationName string) error { func (dH *DBHandler) AddRelation(model, relation any, relationName string) error {
return dH.db.Model(model).Association(relationName).Append(relation) return dH.db.Model(model).Association(relationName).Append(relation)
} }
func (dH *DBHandler) DeleteRelation(model, relation any, relationName string) error {
return dH.db.Model(model).Association(relationName).Delete(relation)
}

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)
} }