add new decrypt encrypt function to member
This commit is contained in:
@@ -24,86 +24,21 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
|
||||
return fmt.Errorf("member %s %s %s exists already", member.FirstName, member.LastName, member.Birthday)
|
||||
}
|
||||
|
||||
encFirstName, err := crypto.Encrypt(member.FirstName, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encLastName, err := crypto.Encrypt(member.LastName, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
//check correct birtday format
|
||||
if member.Birthday != "" && !utils.IsValidBirthday(member.Birthday) {
|
||||
return errors.New("incorrect birthday format")
|
||||
}
|
||||
|
||||
encBirthday, err := crypto.Encrypt(member.Birthday, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encAddress, err := crypto.Encrypt(member.Address, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encZip, err := crypto.Encrypt(member.Zip, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encTown, err := crypto.Encrypt(member.Town, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encPhone, err := crypto.Encrypt(member.Phone, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
//check correct email format
|
||||
if member.Email != "" && !utils.IsValidEmail(member.Email) {
|
||||
return errors.New("incorrect email format")
|
||||
}
|
||||
|
||||
encEmail, err := crypto.Encrypt(member.Email, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
now := utils.GetCurrentTime(dh.timeLocation)
|
||||
encFirstVisit, err := crypto.Encrypt(now, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
member.FirstVisit = now
|
||||
member.LastVisit = now
|
||||
|
||||
encLastVisit, err := crypto.Encrypt(now, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
encComment, err := crypto.Encrypt(member.Comment, dh.token)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
member.FirstNameHash = dh.hashField(member.FirstName)
|
||||
member.FirstName = encFirstName
|
||||
member.LastNameHash = dh.hashField(member.LastName)
|
||||
member.LastName = encLastName
|
||||
member.BirthdayHash = dh.hashField(member.Birthday)
|
||||
member.Birthday = encBirthday
|
||||
member.Address = encAddress
|
||||
member.Zip = encZip
|
||||
member.Town = encTown
|
||||
member.Phone = encPhone
|
||||
member.Email = encEmail
|
||||
member.FirstVisit = encFirstVisit
|
||||
member.LastVisit = encLastVisit
|
||||
member.Comment = encComment
|
||||
member.Encrypt(dh.token)
|
||||
|
||||
err = dh.database.AddNewColum(&member)
|
||||
if err != nil {
|
||||
@@ -137,81 +72,8 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
|
||||
}
|
||||
|
||||
for i := range members {
|
||||
if members[i].FirstName != "" {
|
||||
members[i].FirstName, err = crypto.Decrypt(members[i].FirstName, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].LastName != "" {
|
||||
members[i].LastName, err = crypto.Decrypt(members[i].LastName, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Birthday != "" {
|
||||
members[i].Birthday, err = crypto.Decrypt(members[i].Birthday, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Address != "" {
|
||||
members[i].Address, err = crypto.Decrypt(members[i].Address, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Zip != "" {
|
||||
members[i].Zip, err = crypto.Decrypt(members[i].Zip, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Town != "" {
|
||||
members[i].Town, err = crypto.Decrypt(members[i].Town, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Phone != "" {
|
||||
members[i].Phone, err = crypto.Decrypt(members[i].Phone, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Email != "" {
|
||||
members[i].Email, err = crypto.Decrypt(members[i].Email, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].FirstVisit != "" {
|
||||
members[i].FirstVisit, err = crypto.Decrypt(members[i].FirstVisit, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].LastVisit != "" {
|
||||
members[i].LastVisit, err = crypto.Decrypt(members[i].LastVisit, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if members[i].Comment != "" {
|
||||
members[i].Comment, err = crypto.Decrypt(members[i].Comment, dh.token)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if err := members[i].Decrypt(dh.token); err != nil {
|
||||
return members, err
|
||||
}
|
||||
}
|
||||
return
|
||||
|
||||
@@ -12,10 +12,19 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
|
||||
}
|
||||
|
||||
for i := range responsibles {
|
||||
if !dh.database.Exists(&models.Member{}, "", "id", 25, false) {
|
||||
continue
|
||||
if responsibles[i].MemberId == 0 && responsibles[i].Id != 0 {
|
||||
responsibles[i].MemberId = responsibles[i].Id
|
||||
responsibles[i].Id = 0
|
||||
}
|
||||
|
||||
//check if member exists
|
||||
if !dh.database.Exists(&models.Member{}, "", "id", &responsibles[i].MemberId, false) {
|
||||
continue
|
||||
}
|
||||
// check if already exists
|
||||
if dh.database.Exists(&models.Responsible{}, "Member", "id", &responsibles[i].MemberId, false) {
|
||||
continue
|
||||
}
|
||||
err := dh.database.AddNewColum(&responsibles[i])
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -25,12 +34,22 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsibles, err error) {
|
||||
func (dh *DatabaseHandler) GetResponsible(id uint) (members []models.Member, err error) {
|
||||
if !dh.DatabaseOpened() {
|
||||
return responsibles, errors.New("database not opened")
|
||||
return members, errors.New("database not opened")
|
||||
}
|
||||
|
||||
var responsibles models.Responsibles
|
||||
err = dh.database.GetById(&responsibles, "Member", id)
|
||||
|
||||
for _, r := range responsibles {
|
||||
|
||||
err := r.Member.Decrypt(dh.token)
|
||||
if err != nil {
|
||||
return members, err
|
||||
}
|
||||
members = append(members, *r.Member)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user