remove useless print

dbHandler.go

@@ -26,6 +26,7 @@ import (
 type DBHandler struct {
 	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
@@ -129,22 +134,21 @@ func (dH *DBHandler) AddNewColum(model any) error {
 //
 // Returns:
 //   - 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))
 
-	if id == 0 {
+	query := dH.db
-		if relation != "" {
+
-			return dH.db.Preload(relation).Find(model).Error
+	for _, relation := range relations {
-		}
+		query = query.Preload(relation)
-		return dH.db.Find(model).Error
 	}
 
-	if relation != "" {
+	if id == 0 {
-		err = dH.db.Preload(relation).First(model, id).Error
+		return query.Find(model).Error
-	} else {
-		err = dH.db.First(model, id).Error
 	}
 
+	err = query.First(model, id).Error
+
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return fmt.Errorf("no record found for id: %v", id)
 	} else if err != nil {
@@ -171,21 +175,20 @@ func (dH *DBHandler) GetById(model any, relation string, id uint) (err error) {
 //
 // Returns:
 //   - 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
+
+	for _, relation := range relations {
+		query = query.Preload(relation)
+	}
 	if LikeSearch {
 		value = strings.ReplaceAll(fmt.Sprint(value), "*", "%")
 		dH.logger.Debug("getByKey", "find like key "+key+" value "+fmt.Sprint(value))
-		if relation != "" {
+		return query.Where(key+" LIKE ?", value).Find(model).Error
-			return dH.db.Preload(relation).Where(key+" LIKE ?", value).Delete(model).Error
-		}
-		return dH.db.Where(key+" LIKE ?", value).Find(model).Error
 	}
 
 	dH.logger.Debug("getByKey", "find equal key "+key+" value "+fmt.Sprint(value))
-	if relation != "" {
+	return query.Find(model, key+" = ?", value).Error
-		return dH.db.Preload(relation).Where(key+" = ?", value).Delete(model).Error
-	}
-	return dH.db.Find(model, key+" = ?", value).Error
 }
 
 // updateValuesById
@@ -205,21 +208,27 @@ func (dH *DBHandler) GetByKey(model any, relation string, key string, value any,
 //
 // Returns:
 //   - 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)
 	if modelType.Kind() != reflect.Ptr {
 		return errors.New("model must be a pointer to struct")
 	}
 
 	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
 	}
-	if relation != "" {
+
-		return dH.db.Preload(relation).Model(lookUpModel).Updates(model).Error
+	// Preload relations
+	query := dH.db
+	for _, relation := range relations {
+		query = query.Preload(relation)
 	}
-	return dH.db.Model(lookUpModel).Updates(model).Error
+
+	// Update only provided keys
+	return query.Model(lookUpModel).Updates(model).Error
 }
 
 // updateValuesByKey
@@ -240,7 +249,7 @@ func (dH *DBHandler) UpdateValuesById(model any, relation string, id uint) error
 //
 // Returns:
 //   - 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))
 	modelType := reflect.TypeOf(model)
 	if modelType.Kind() != reflect.Ptr {
@@ -248,23 +257,26 @@ func (dH *DBHandler) UpdateValuesByKey(model any, relation string, key string, v
 	}
 
 	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
 	}
-	if relation != "" {
+
-		return dH.db.Preload(relation).Model(lookUpModel).Updates(model).Error
+	query := dH.db
+
+	for _, relation := range relations {
+		query = query.Preload(relation)
 	}
-	return dH.db.Model(lookUpModel).Updates(model).Error
+	return query.Model(lookUpModel).Updates(model).Error
 }
 
-func (dH *DBHandler) DeleteById(model any, ids ...uint) error {
+func (dH *DBHandler) DeleteById(model any, relation string, ids ...uint) error {
 	if len(ids) == 0 {
 		return fmt.Errorf("no IDs provided")
 	}
 
 	if len(ids) == 1 && ids[0] == 0 {
 		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
 	}
 
@@ -293,7 +305,7 @@ func (dH *DBHandler) DeleteById(model any, ids ...uint) error {
 //
 // Returns:
 //   - error: Any deletion error.
-func (dH *DBHandler) DeleteByKey(model any, key string, value any, LikeSearch bool) error {
+func (dH *DBHandler) DeleteByKey(model any, key string, value any, LikeSearch bool, relations ...string) error {
 	if LikeSearch {
 		value = strings.ReplaceAll(fmt.Sprint(value), "*", "%")
 		dH.logger.Debug("deleteByKey", "delete like key "+key+" value "+fmt.Sprint(value))
@@ -301,10 +313,17 @@ func (dH *DBHandler) DeleteByKey(model any, key string, value any, LikeSearch bo
 	}
 
 	dH.logger.Debug("deleteByKey", "delete equal key "+key+" value "+fmt.Sprint(value))
-	return dH.db.Where(key+" = ?", value).Delete(model).Error
+
+	query := dH.db
+
+	for _, relation := range relations {
+		query = query.Preload(relation)
 	}
 
-func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool) (found bool) {
+	return query.Where(key+" = ?", value).Delete(model).Error
+}
+
+func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool, relations ...string) (found bool) {
 	var query string
 	var args any
 
@@ -333,7 +352,12 @@ func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool) (
 
 	dH.logger.Debug("exists", "checking existence for key "+query+" value "+fmt.Sprint(args))
 
-	tx := dH.db.Where(query, args).Find(model)
+	datababase := dH.db
+	for _, relation := range relations {
+		datababase = datababase.Preload(relation)
+	}
+
+	tx := datababase.Where(query, args).Find(model)
 
 	if tx.Error != nil {
 		dH.logger.Error("Exists", fmt.Sprintf("query failed: %v", tx.Error))
@@ -345,3 +369,7 @@ func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool) (
 func (dH *DBHandler) AddRelation(model, relation any, relationName string) error {
 	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)
+}

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