3 Commits

Author SHA1 Message Date
Adrian Zürcher
f28a3edbcf change function and gorm tag 2025-11-20 18:00:12 +01:00
Adrian Zürcher
1d203d1d2f add json tag to model 2025-11-20 17:49:08 +01:00
Adrian Zürcher
2f539c254b minor changes 2025-11-20 17:47:41 +01:00
5 changed files with 21 additions and 16 deletions

View File

@@ -21,12 +21,18 @@ func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
return dh.database.AddNewColum(&event)
}
func (dh *DatabaseHandler) GetEvent(id uint) (event []models.Event, err error) {
func (dh *DatabaseHandler) GetEvent(id uint) (events []models.Event, err error) {
if !dh.DatabaseOpened() {
return event, errors.New("database not opened")
return events, errors.New("database not opened")
}
err = dh.database.GetById(&event, "Attendees", id)
err = dh.database.GetById(&events, "Attendees", id)
for i := range events {
for j := range events[i].Attendees {
events[i].Attendees[j].Decrypt(dh.token)
}
}
if err != nil {
return
}

View File

@@ -2,6 +2,7 @@ package handlers
import (
"errors"
"fmt"
"gitea.tecamino.com/paadi/memberDB/models"
)
@@ -46,21 +47,18 @@ next:
return nil
}
func (dh *DatabaseHandler) GetResponsible(id uint) (members []models.Member, err error) {
func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsibles, err error) {
if !dh.DatabaseOpened() {
return members, errors.New("database not opened")
return responsibles, 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)
for i := range responsibles {
err := responsibles[i].Member.Decrypt(dh.token)
if err != nil {
return members, err
return responsibles, err
}
members = append(members, *r.Member)
}
return
}
@@ -73,5 +71,6 @@ 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...)
}

View File

@@ -5,5 +5,5 @@ type Event struct {
Name string `gorm:"column:name" json:"name"`
Date string `gorm:"column:date" json:"date"`
Day string `gorm:"column:day" json:"day"`
Attendees []*Member `gorm:"many2many:member_events;"`
Attendees []*Member `gorm:"many2many:member_events;constraint:OnDelete:CASCADE;" json:"attendees"`
}

View File

@@ -21,9 +21,9 @@ type Member struct {
FirstVisit string `gorm:"column:firstVisit" json:"firstVisit,omitempty"`
LastVisit string `gorm:"column:lastVisit" json:"lastVisit,omitempty"`
GroupId *int `json:"GroupId,omitempty"`
Group *Group `gorm:"foreignKey:GroupId" json:"group,omitempty"`
Group *Group `gorm:"foreignKey:GroupId;constraint:OnDelete:CASCADE;"json:"group,omitempty"`
ResponsibleId *int `json:"ResponsibleId,omitempty"`
Responsible *Member `gorm:"foreignKey:ResponsibleId" json:"responsible,omitempty"`
Responsible *Member `gorm:"foreignKey:ResponsibleId;constraint:OnDelete:CASCADE;" json:"responsible,omitempty"`
Comment string `gorm:"column:comment" json:"comment,omitempty"`
Events []*Event `gorm:"many2many:member_events;" `
}

View File

@@ -1,9 +1,9 @@
package models
type Responsible struct {
Id uint `gorm:"primaryKey"`
Id uint `gorm:"primaryKey" json:"id"`
MemberId uint
Member *Member `gorm:"foreignKey:MemberId"`
Member *Member `gorm:"foreignKey:MemberId;constraint:OnDelete:CASCADE;" json:"member"`
}
type Responsibles []Responsible