minor changes

handlers/responsible.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"errors"
+	"fmt"
 
 	"gitea.tecamino.com/paadi/memberDB/models"
 )
@@ -11,21 +12,33 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
 		return errors.New("database not opened")
 	}
 
-	for i := range responsibles {
+next:
-		if responsibles[i].MemberId == 0 && responsibles[i].Id != 0 {
+	for _, r := range responsibles {
-			responsibles[i].MemberId = responsibles[i].Id
+		if r.MemberId == 0 && r.Id != 0 {
-			responsibles[i].Id = 0
+			r.MemberId = r.Id
+			r.Id = 0
 		}
 
 		//check if member exists
-		if !dh.database.Exists(&models.Member{}, "", "id", &responsibles[i].MemberId, false) {
+		if !dh.database.Exists(&models.Member{}, "", "id", &r.MemberId, false) {
 			continue
 		}
 		// check if already exists
-		if dh.database.Exists(&models.Responsible{}, "Member", "id", &responsibles[i].MemberId, false) {
+		var oldResponsibles models.Responsibles
-			continue
+		err := dh.database.GetById(&oldResponsibles, "Member", 0)
+		if err != nil {
+			return err
 		}
-		err := dh.database.AddNewColum(&responsibles[i])
+
+		for _, oldR := range oldResponsibles {
+			if oldR.Member == nil {
+				continue
+			} else if oldR.Member.Id == int(r.MemberId) {
+				continue next
+			}
+		}
+
+		err = dh.database.AddNewColum(&r)
 		if err != nil {
 			return err
 		}
@@ -34,21 +47,18 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
 	return nil
 }
 
-func (dh *DatabaseHandler) GetResponsible(id uint) (members []models.Member, err error) {
+func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsibles, err error) {
 	if !dh.DatabaseOpened() {
-		return members, errors.New("database not opened")
+		return responsibles, errors.New("database not opened")
 	}
 
-	var responsibles models.Responsibles
 	err = dh.database.GetById(&responsibles, "Member", id)
 
-	for _, r := range responsibles {
+	for i := range responsibles {
-
+		err := responsibles[i].Member.Decrypt(dh.token)
-		err := r.Member.Decrypt(dh.token)
 		if err != nil {
-			return members, err
+			return responsibles, err
 		}
-		members = append(members, *r.Member)
 	}
 	return
 }
@@ -61,5 +71,6 @@ func (dh *DatabaseHandler) DeleteResponsible(ids ...uint) error {
 	if len(ids) == 0 {
 		return errors.New("no ids given to be deleted")
 	}
+	fmt.Println(123, ids)
 	return dh.database.DeleteById(&models.Responsible{}, "", ids...)
 }

models/responsible.go

@@ -1,9 +1,9 @@
 package models
 
 type Responsible struct {
-	Id       uint `gorm:"primaryKey"`
+	Id       uint `gorm:"primaryKey" json:"id"`
 	MemberId uint
-	Member   *Member `gorm:"foreignKey:MemberId"`
+	Member   *Member `gorm:"foreignKey:MemberId;constraint:OnDelete:CASCADE;" json:"member"`
 }
 
 type Responsibles []Responsible