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

17
handlers/events.go
View File

@@ -12,7 +12,7 @@ func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
return errors.New("database not opened")
}
if dh.database.Exists(&models.Event{}, "", "name", event.Name, false) {
if dh.database.Exists(&models.Event{}, "name", event.Name, false) {
return errors.New("event with name: " + event.Name + " exists already")
}
@@ -26,7 +26,7 @@ func (dh *DatabaseHandler) GetEvent(id uint) (events []models.Event, err error)
return events, errors.New("database not opened")
}
err = dh.database.GetById(&events, "Attendees", id)
err = dh.database.GetById(&events, id, "Attendees")
for i := range events {
for j := range events[i].Attendees {
@@ -43,7 +43,12 @@ func (dh *DatabaseHandler) UpdateEvent(id int, event models.Event) (err error) {
if !dh.DatabaseOpened() {
return errors.New("database not opened")
}
return dh.database.UpdateValuesById(&event, "", uint(event.Id))
event.Day, err = utils.GetDayFromDate(event.Date)
if err != nil {
return err
}
return dh.database.UpdateValuesById(&event, uint(event.Id))
}
func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error {
@@ -64,14 +69,14 @@ func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error {
}
var event models.Event
err := dh.database.GetById(&event, "Attendees", uint(newEvent.Id))
err := dh.database.GetById(&event, uint(newEvent.Id), "Attendees")
if err != nil {
return err
}
next:
for _, newAttendee := range newEvent.Attendees {
if !dh.database.Exists(&models.Member{}, "", "id", newAttendee.Id, false) {
if !dh.database.Exists(&models.Member{}, "id", newAttendee.Id, false) {
continue
}
for _, attendee := range event.Attendees {
@@ -90,7 +95,7 @@ func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error
}
var event models.Event
dh.database.GetById(&event, "Attendees", uint(newEvent.Id))
dh.database.GetById(&event, uint(newEvent.Id), "Attendees")
for _, newAttendee := range newEvent.Attendees {
for _, a := range event.Attendees {

8
handlers/group.go
View File

@@ -11,7 +11,7 @@ func (dh *DatabaseHandler) NewGroup(group *models.Group) error {
return errors.New("database not opened")
}
if dh.database.Exists(&models.Group{}, "", "name", group.Name, false) {
if dh.database.Exists(&models.Group{}, "name", group.Name, false) {
return errors.New("group with name: " + group.Name + " exists already")
}
return dh.database.AddNewColum(&group)
@@ -22,18 +22,18 @@ func (dh *DatabaseHandler) GetGroup(id uint) (group []models.Group, err error) {
return group, errors.New("database not opened")
}
err = dh.database.GetById(&group, "", id)
err = dh.database.GetById(&group, id)
if err != nil {
return
}
return
}
func (dh *DatabaseHandler) UpdateGroup(id int, group models.Group) (err error) {
func (dh *DatabaseHandler) UpdateGroup(id uint, group models.Group) (err error) {
if !dh.DatabaseOpened() {
return errors.New("database not opened")
}
return dh.database.UpdateValuesById(&group, "", uint(group.Id))
return dh.database.UpdateValuesById(&group, uint(group.Id))
}
func (dh *DatabaseHandler) DeleteGroup(ids ...uint) error {

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
}

14
handlers/responsible.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"errors"
"fmt"
"gitea.tecamino.com/paadi/memberDB/models"
)
@@ -14,18 +13,14 @@ func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible)
next:
for _, r := range responsibles {
if r.MemberId == 0 && r.Id != 0 {
r.MemberId = r.Id
r.Id = 0
}
//check if member exists
if !dh.database.Exists(&models.Member{}, "", "id", &r.MemberId, false) {
if !dh.database.Exists(&models.Member{}, "id", &r.MemberId, false) {
continue
}
// check if already exists
var oldResponsibles models.Responsibles
err := dh.database.GetById(&oldResponsibles, "Member", 0)
err := dh.database.GetById(&oldResponsibles, 0, "Member")
if err != nil {
return err
}
@@ -33,7 +28,7 @@ next:
for _, oldR := range oldResponsibles {
if oldR.Member == nil {
continue
} else if oldR.Member.Id == int(r.MemberId) {
} else if oldR.Member.Id == r.MemberId {
continue next
}
}
@@ -52,7 +47,7 @@ func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsi
return responsibles, errors.New("database not opened")
}
err = dh.database.GetById(&responsibles, "Member", id)
err = dh.database.GetById(&responsibles, id, "Member")
for i := range responsibles {
err := responsibles[i].Member.Decrypt(dh.token)
@@ -71,6 +66,5 @@ func (dh *DatabaseHandler) DeleteResponsible(ids ...uint) error {
if len(ids) == 0 {
return errors.New("no ids given to be deleted")
}
fmt.Println(123, ids)
return dh.database.DeleteById(&models.Responsible{}, "", ids...)
}