2 Commits

Author SHA1 Message Date
Adrian Zürcher
442afcb44c change responsible person to struct 2025-11-06 16:30:37 +01:00
Adrian Zürcher
8b8d99e162 new set id to 0 to create new uniq id by gorm 2025-11-06 15:22:23 +01:00
4 changed files with 11 additions and 31 deletions

View File

@@ -24,14 +24,13 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) {
return
}
for _, responsible := range responsibles {
err = a.DbHandler.AddNewResponsible(responsible)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"message": err.Error(),
})
return
}
err = a.DbHandler.AddNewResponsible(responsibles...)
if err != nil {
c.JSON(http.StatusBadRequest, gin.H{
"message": err.Error(),
})
return
}
c.JSON(http.StatusOK, gin.H{

View File

@@ -91,11 +91,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
return err
}
encResponsiblePerson, err := crypto.Encrypt(member.ResponsiblePerson, dh.token)
if err != nil {
return err
}
member.FirstNameHash = dh.hashField(member.FirstName)
member.FirstName = encFirstName
member.LastNameHash = dh.hashField(member.LastName)
@@ -110,7 +105,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
member.FirstVisit = encFirstVisit
member.LastVisit = encLastVisit
member.Group = encGroup
member.ResponsiblePerson = encResponsiblePerson
err = dh.database.AddNewColum(&member)
if err != nil {
@@ -198,11 +192,6 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
if err != nil {
return
}
members[i].ResponsiblePerson, err = crypto.Decrypt(members[i].ResponsiblePerson, dh.token)
if err != nil {
return
}
}
return
}
@@ -298,13 +287,6 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
return err
}
}
if member.ResponsiblePerson != "" {
member.ResponsiblePerson, err = crypto.Encrypt(member.ResponsiblePerson, dh.token)
if err != nil {
return err
}
}
return dh.database.UpdateValuesById(&member, uint(member.Id))
}

View File

@@ -10,11 +10,10 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Person) erro
if !dh.DatabaseOpened() {
return errors.New("database not opened")
}
if !dh.DatabaseOpened() {
return errors.New("database not opened")
}
for _, responsible := range responsibles {
for _, responsible := range responsibles {
// set id to 0 so new uniq id is created
responsible.Id = 0
exists, err := dh.responsibleExists(responsible)
if err != nil {
return err

View File

@@ -16,5 +16,5 @@ type Member struct {
FirstVisit string `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
LastVisit string `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
Group string `gorm:"column:group" json:"group,omitempty"`
ResponsiblePerson string `gorm:"column:responsiblePerson" json:"responsiblePerson,omitempty"`
ResponsiblePerson Person `gorm:"type:json" json:"responsiblePerson"`
}