Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
442afcb44c | ||
|
|
8b8d99e162 |
@@ -24,14 +24,13 @@ func (a *APIHandler) AddNewResponsible(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
for _, responsible := range responsibles {
|
||||
err = a.DbHandler.AddNewResponsible(responsible)
|
||||
err = a.DbHandler.AddNewResponsible(responsibles...)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{
|
||||
"message": err.Error(),
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
|
||||
@@ -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))
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user