add relation to delete

dbHandler.go

@@ -129,14 +129,21 @@ func (dH *DBHandler) AddNewColum(model any) error {
 //
 // Returns:
 //   - error: Any query error or “not found” message.
-func (dH *DBHandler) GetById(model any, id uint) 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 {
+	query := dH.db
-		return dH.db.Find(model).Error
+
+	if relation != "" {
+		query = query.Preload(relation)
 	}
 
-	err := dH.db.First(model, id).Error
+	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 {
@@ -163,15 +170,20 @@ func (dH *DBHandler) GetById(model any, id uint) error {
 //
 // Returns:
 //   - error: Any database query error.
-func (dH *DBHandler) GetByKey(model any, key string, value any, LikeSearch bool) 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))
-		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))
-	return dH.db.Find(model, key+" = ?", value).Error
+	return query.Find(model, key+" = ?", value).Error
 }
 
 // updateValuesById
@@ -191,7 +203,7 @@ func (dH *DBHandler) GetByKey(model any, key string, value any, LikeSearch bool)
 //
 // Returns:
 //   - error: If the model is invalid or query/update fails.
-func (dH *DBHandler) UpdateValuesById(model any, id uint) error {
+func (dH *DBHandler) UpdateValuesById(model any, relation string, id uint) error {
 	dH.logger.Debug("updateValuesById", "model"+fmt.Sprint(model))
 	modelType := reflect.TypeOf(model)
 	if modelType.Kind() != reflect.Ptr {
@@ -199,10 +211,15 @@ func (dH *DBHandler) UpdateValuesById(model any, id uint) error {
 	}
 
 	lookUpModel := reflect.New(modelType.Elem()).Interface()
-	if err := dH.GetById(lookUpModel, id); err != nil {
+	if err := dH.GetById(lookUpModel, relation, id); err != nil {
 		return err
 	}
-	return dH.db.Model(lookUpModel).Updates(model).Error
+	query := dH.db
+
+	if relation != "" {
+		query = query.Preload(relation)
+	}
+	return query.Model(lookUpModel).Updates(model).Error
 }
 
 // updateValuesByKey
@@ -223,7 +240,7 @@ func (dH *DBHandler) UpdateValuesById(model any, id uint) error {
 //
 // Returns:
 //   - error: Any query or update error.
-func (dH *DBHandler) UpdateValuesByKey(model any, key string, value any) error {
+func (dH *DBHandler) UpdateValuesByKey(model any, relation string, key string, value any) error {
 	dH.logger.Debug("updateValuesByKey", "model"+fmt.Sprint(model))
 	modelType := reflect.TypeOf(model)
 	if modelType.Kind() != reflect.Ptr {
@@ -231,13 +248,19 @@ func (dH *DBHandler) UpdateValuesByKey(model any, key string, value any) error {
 	}
 
 	lookUpModel := reflect.New(modelType.Elem()).Interface()
-	if err := dH.GetByKey(lookUpModel, key, value, false); err != nil {
+	if err := dH.GetByKey(lookUpModel, "", key, value, false); err != nil {
 		return err
 	}
-	return dH.db.Model(lookUpModel).Updates(model).Error
+
+	query := dH.db
+
+	if relation != "" {
+		query = query.Preload(relation)
+	}
+	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")
 	}
@@ -250,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
@@ -273,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))
@@ -281,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)
+	}
+
+	return query.Where(key+" = ?", value).Delete(model).Error
 }
 
-func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool) (found bool) {
+func (dH *DBHandler) Exists(model any, relation string, key string, value any, likeSearch bool) (found bool) {
 	var query string
 	var args any
 
@@ -313,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))
@@ -322,23 +363,6 @@ func (dH *DBHandler) Exists(model any, key string, value any, likeSearch bool) (
 	return tx.RowsAffected > 0
 }
 
-func (dH *DBHandler) GetByIdWithRelation(model any, relation string, id uint) error {
-	if id == 0 {
-		return dH.db.Preload(relation).Find(model).Error
-	}
-
-	// Load member AND its events
-	err := dH.db.Preload(relation).First(model, id).Error
-
-	if errors.Is(err, gorm.ErrRecordNotFound) {
-		return fmt.Errorf("no record found for id: %v", id)
-	} else if err != nil {
-		return fmt.Errorf("query failed: %w", err)
-	}
-	return nil
-}
-
 func (dH *DBHandler) AddRelation(model, relation any, relationName string) error {
 	return dH.db.Model(model).Association(relationName).Append(relation)
-
 }

db_test.go

@@ -15,6 +15,8 @@ type Member struct {
 	Id                  int      `gorm:"primaryKey" json:"id"`
 	FirstName           string   `gorm:"column:firstName" json:"firstName,omitempty"`
 	LastName            string   `gorm:"column:lastName" json:"lastName,omitempty"`
+	ResponsiblePersonID *int     `json:"responsiblePersonId"`
+	ResponsiblePerson   *Member  `gorm:"foreignKey:ResponsiblePersonID" json:"responsiblePerson"`
 	Events              []*Event `gorm:"many2many:member_events;" json:"events"`
 }
 
@@ -33,21 +35,23 @@ func TestDbHandler(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	member := &Member{FirstName: "adrian", LastName: "zuercher"}
+	membersIN := []*Member{{FirstName: "adrian", LastName: "zuercher"}, {FirstName: "adichild", LastName: "zuercher"}}
+	for _, member := range membersIN {
 		dbHandler.AddNewColum(member)
 		event := &Event{
 			Name: "testEvent",
 		}
 		dbHandler.AddNewColum(event)
 		dbHandler.AddRelation(event, member, "Attendees")
+	}
 
 	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.GetByIdWithRelation(&members, "Events", 0); err != nil {
+	if err := dbHandler.GetById(&members, "Events", 0); err != nil {
 		t.Fatal(err)
 	}
 	t.Log(members)
@@ -61,7 +65,7 @@ func TestDbHandler(t *testing.T) {
 
 	var events []Event
 
-	if err := dbHandler.GetByIdWithRelation(&events, "Attendees", 0); err != nil {
+	if err := dbHandler.GetById(&events, "Attendees", 0); err != nil {
 		t.Fatal(err)
 	}
 
@@ -72,6 +76,27 @@ func TestDbHandler(t *testing.T) {
 		}
 	}
 
+	//add responsible
+	mem1 := &Member{}
+	if err := dbHandler.GetById(mem1, "", 2); err != nil {
+		t.Fatal(err)
+	}
+
+	mem2 := &Member{}
+	if err := dbHandler.GetById(mem2, "", 1); err != nil {
+		t.Fatal(err)
+	}
+
+	mem1.ResponsiblePerson = mem2
+	dbHandler.UpdateValuesById(mem1, "", uint(mem1.Id))
+
+	if err := dbHandler.GetById(mem1, "", 2); err != nil {
+		t.Fatal(err)
+	}
+
+	t.Log(mem1)
+	t.Log(mem1.ResponsiblePerson)
+
 	if err := dbHandler.Close(); err != nil {
 		t.Fatal(err)
 	}