diff --git a/handlers/members.go b/handlers/members.go index 78cda7f..c597d55 100644 --- a/handlers/members.go +++ b/handlers/members.go @@ -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)) } diff --git a/models/member.go b/models/member.go index 46cfa3b..ad757a6 100644 --- a/models/member.go +++ b/models/member.go @@ -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"` }