add relation to delete

dbHandler.go

@@ -132,19 +132,18 @@ func (dH *DBHandler) AddNewColum(model any) error {
 func (dH *DBHandler) GetById(model any, relation string, id uint) (err error) {
 	dH.logger.Debug("getById", "find id "+fmt.Sprint(id))
 
-	if id == 0 {
-		if relation != "" {
-			return dH.db.Preload(relation).Find(model).Error
-		}
-		return dH.db.Find(model).Error
-	}
+	query := dH.db
 
 	if relation != "" {
-		err = dH.db.Preload(relation).First(model, id).Error
-	} else {
-		err = dH.db.First(model, id).Error
+		query = query.Preload(relation)
 	}
 
+	if id == 0 {
+		return query.Find(model).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 {
@@ -172,20 +171,19 @@ 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 {
+	query := dH.db
+
+	if relation != "" {
+		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 dH.db.Preload(relation).Where(key+" LIKE ?", value).Delete(model).Error
-		}
-		return dH.db.Where(key+" LIKE ?", value).Find(model).Error
+		return query.Where(key+" LIKE ?", value).Find(model).Error
 	}
 
 	dH.logger.Debug("getByKey", "find equal key "+key+" value "+fmt.Sprint(value))
-	if relation != "" {
-		return dH.db.Preload(relation).Where(key+" = ?", value).Delete(model).Error
-	}
-	return dH.db.Find(model, key+" = ?", value).Error
+	return query.Find(model, key+" = ?", value).Error
 }
 
 // updateValuesById
@@ -216,10 +214,12 @@ func (dH *DBHandler) UpdateValuesById(model any, relation string, id uint) error
 	if err := dH.GetById(lookUpModel, relation, id); err != nil {
 		return err
 	}
+	query := dH.db
+
 	if relation != "" {
-		return dH.db.Preload(relation).Model(lookUpModel).Updates(model).Error
+		query = query.Preload(relation)
 	}
-	return dH.db.Model(lookUpModel).Updates(model).Error
+	return query.Model(lookUpModel).Updates(model).Error
 }
 
 // updateValuesByKey
@@ -251,13 +251,16 @@ func (dH *DBHandler) UpdateValuesByKey(model any, relation string, key string, v
 	if err := dH.GetByKey(lookUpModel, "", key, value, false); err != nil {
 		return err
 	}
+
+	query := dH.db
+
 	if relation != "" {
-		return dH.db.Preload(relation).Model(lookUpModel).Updates(model).Error
+		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")
 	}
@@ -270,7 +273,13 @@ func (dH *DBHandler) DeleteById(model any, ids ...uint) error {
 
 	dH.logger.Debug("deleteById", "delete ids "+fmt.Sprint(ids))
 
-	if err := dH.db.Delete(model, ids).Error; err != nil {
+	query := dH.db
+
+	if relation != "" {
+		query = query.Preload(relation)
+	}
+
+	if err := query.Delete(model, ids).Error; err != nil {
 		return fmt.Errorf("delete failed: %w", err)
 	}
 	return nil
@@ -293,7 +302,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, relation string, key string, value any, LikeSearch bool) error {
 	if LikeSearch {
 		value = strings.ReplaceAll(fmt.Sprint(value), "*", "%")
 		dH.logger.Debug("deleteByKey", "delete like key "+key+" value "+fmt.Sprint(value))
@@ -301,10 +310,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
+
+	if relation != "" {
+		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, relation string, key string, value any, likeSearch bool) (found bool) {
 	var query string
 	var args any
 
@@ -333,7 +349,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
+	if relation != "" {
+		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))