paadi/memberDB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add new relational table requests

Browse Source
This commit is contained in:
Adrian Zürcher
2025-11-27 07:58:43 +01:00
parent f28a3edbcf
commit b0895aee01
11 changed files with 125 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
handlers/members.go
View File

@@ -4,7 +4,6 @@ import (
"errors"
"fmt"
"gitea.tecamino.com/paadi/memberDB/crypto"
"gitea.tecamino.com/paadi/memberDB/models"
"gitea.tecamino.com/paadi/memberDB/utils"
)
@@ -66,7 +65,7 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
return members, errors.New("database not opened")
}
err = dh.database.GetById(&members, "", id)
err = dh.database.GetById(&members, id, "Group", "Responsible", "Responsible.Member", "Events")
if err != nil {
return
}
@@ -75,102 +74,38 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
if err := members[i].Decrypt(dh.token); err != nil {
return members, err
}
if members[i].Responsible != nil {
members[i].Responsible.Member.Decrypt(dh.token)
}
}
return
}
// UpdateMember updates/overrides all information given meber id
func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error) {
func (dh *DatabaseHandler) UpdateMember(id uint, member models.Member) (err error) {
if !dh.DatabaseOpened() {
return errors.New("database not opened")
}
if member.FirstName != "" {
member.FirstNameHash = dh.hashField(member.FirstName)
member.FirstName, err = crypto.Encrypt(member.FirstName, dh.token)
if err != nil {
return
}
}
if member.LastName != "" {
member.LastNameHash = dh.hashField(member.LastName)
member.LastName, err = crypto.Encrypt(member.LastName, dh.token)
if err != nil {
return
}
}
//check correct birtday format
if member.Birthday != "" && utils.IsValidBirthday(member.Birthday) {
member.BirthdayHash = dh.hashField(member.BirthdayHash)
member.Birthday, err = crypto.Encrypt(member.Birthday, dh.token)
if err != nil {
return err
}
} else if member.Birthday != "" {
if member.Birthday != "" && !utils.IsValidBirthday(member.Birthday) {
return errors.New("incorrect birthday format")
}
if member.Address != "" {
member.Address, err = crypto.Encrypt(member.Address, dh.token)
if err != nil {
return err
}
}
if member.Zip != "" {
member.Zip, err = crypto.Encrypt(member.Zip, dh.token)
if err != nil {
return err
}
}
if member.Town != "" {
member.Town, err = crypto.Encrypt(member.Town, dh.token)
if err != nil {
return err
}
}
if member.Phone != "" {
member.Phone, err = crypto.Encrypt(member.Phone, dh.token)
if err != nil {
return err
}
}
//check correct email format
if member.Email != "" && utils.IsValidEmail(member.Email) {
member.Email, err = crypto.Encrypt(member.Email, dh.token)
if err != nil {
return err
}
} else if member.Email != "" {
if member.Email != "" && !utils.IsValidEmail(member.Email) {
return errors.New("incorrect email format")
}
if member.FirstVisit != "" {
member.FirstVisit, err = crypto.Encrypt(member.FirstVisit, dh.token)
if err != nil {
return err
}
if member.Group != nil {
member.GroupId = &member.Group.Id
}
if member.LastVisit != "" {
member.LastVisit, err = crypto.Encrypt(member.LastVisit, dh.token)
if err != nil {
return err
}
if member.Responsible != nil {
member.ResponsibleId = &member.Responsible.Id
}
if member.Comment != "" {
member.Comment, err = crypto.Encrypt(member.Comment, dh.token)
if err != nil {
return err
}
}
return dh.database.UpdateValuesById(&member, "", uint(member.Id))
member.Encrypt(dh.token)
return dh.database.UpdateValuesById(&member, uint(member.Id), "Group", "Responsible", "Responsible.Member")
}
// memberExists helper to check wheter member already exists
@@ -180,7 +115,7 @@ func (dh *DatabaseHandler) memberExists(checkMember models.Member) (bool, error)
}
var members []models.Member
if !dh.database.Exists(&members, "", "birthdayHash", dh.hashField(checkMember.Birthday), false) {
if !dh.database.Exists(&members, "birthdayHash", dh.hashField(checkMember.Birthday), false) {
return false, nil
}