minor changes
This commit is contained in:
@@ -2,6 +2,7 @@ package handlers
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
"gitea.tecamino.com/paadi/memberDB/models"
|
"gitea.tecamino.com/paadi/memberDB/models"
|
||||||
)
|
)
|
||||||
@@ -46,21 +47,18 @@ next:
|
|||||||
return nil
|
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() {
|
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)
|
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 {
|
if err != nil {
|
||||||
return members, err
|
return responsibles, err
|
||||||
}
|
}
|
||||||
members = append(members, *r.Member)
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -73,5 +71,6 @@ func (dh *DatabaseHandler) DeleteResponsible(ids ...uint) error {
|
|||||||
if len(ids) == 0 {
|
if len(ids) == 0 {
|
||||||
return errors.New("no ids given to be deleted")
|
return errors.New("no ids given to be deleted")
|
||||||
}
|
}
|
||||||
|
fmt.Println(123, ids)
|
||||||
return dh.database.DeleteById(&models.Responsible{}, "", ids...)
|
return dh.database.DeleteById(&models.Responsible{}, "", ids...)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package models
|
package models
|
||||||
|
|
||||||
type Responsible struct {
|
type Responsible struct {
|
||||||
Id uint `gorm:"primaryKey"`
|
Id uint `gorm:"primaryKey" json:"id"`
|
||||||
MemberId uint
|
MemberId uint
|
||||||
Member *Member `gorm:"foreignKey:MemberId"`
|
Member *Member `gorm:"foreignKey:MemberId;constraint:OnDelete:CASCADE;" json:"member"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type Responsibles []Responsible
|
type Responsibles []Responsible
|
||||||
|
|||||||
Reference in New Issue
Block a user