Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
442afcb44c |
@@ -91,11 +91,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
encResponsiblePerson, err := crypto.Encrypt(member.ResponsiblePerson, dh.token)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
member.FirstNameHash = dh.hashField(member.FirstName)
|
member.FirstNameHash = dh.hashField(member.FirstName)
|
||||||
member.FirstName = encFirstName
|
member.FirstName = encFirstName
|
||||||
member.LastNameHash = dh.hashField(member.LastName)
|
member.LastNameHash = dh.hashField(member.LastName)
|
||||||
@@ -110,7 +105,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
|
|||||||
member.FirstVisit = encFirstVisit
|
member.FirstVisit = encFirstVisit
|
||||||
member.LastVisit = encLastVisit
|
member.LastVisit = encLastVisit
|
||||||
member.Group = encGroup
|
member.Group = encGroup
|
||||||
member.ResponsiblePerson = encResponsiblePerson
|
|
||||||
|
|
||||||
err = dh.database.AddNewColum(&member)
|
err = dh.database.AddNewColum(&member)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -198,11 +192,6 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
members[i].ResponsiblePerson, err = crypto.Decrypt(members[i].ResponsiblePerson, dh.token)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -298,13 +287,6 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
|
|||||||
return err
|
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))
|
return dh.database.UpdateValuesById(&member, uint(member.Id))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,5 +16,5 @@ type Member struct {
|
|||||||
FirstVisit string `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
|
FirstVisit string `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
|
||||||
LastVisit string `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
|
LastVisit string `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
|
||||||
Group string `gorm:"column:group" json:"group,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