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

change table to references

Browse Source
This commit is contained in:
Adrian Zürcher
2025-11-20 10:40:56 +01:00
parent 4a469d1fd4
commit fe194754b1
14 changed files with 101 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
handlers/database.go
View File

@@ -4,14 +4,16 @@ import (
"crypto/hmac"
"crypto/sha256"
"encoding/hex"
"time"
"gitea.tecamino.com/paadi/dbHandler"
"gitea.tecamino.com/paadi/tecamino-logger/logging"
)
type DatabaseHandler struct {
database *dbHandler.DBHandler
token []byte
database *dbHandler.DBHandler
timeLocation *time.Location
token []byte
}
func NewDatabaseHandler(name, path string, logger *logging.Logger) (*DatabaseHandler, error) {
@@ -23,6 +25,14 @@ func NewDatabaseHandler(name, path string, logger *logging.Logger) (*DatabaseHan
return &DatabaseHandler{database: database}, nil
}
func (dH *DatabaseHandler) SetTimezone(timezone string) (err error) {
if timezone == "" {
timezone = "Local"
}
dH.timeLocation, err = time.LoadLocation(timezone)
return
}
func (dH *DatabaseHandler) DatabaseOpened() bool {
return dH.database != nil
}

43
handlers/events.go
View File

@@ -2,10 +2,9 @@ package handlers
import (
"errors"
"slices"
"time"
"gitea.tecamino.com/paadi/memberDB/models"
"gitea.tecamino.com/paadi/memberDB/utils"
)
func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
@@ -13,11 +12,12 @@ 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")
}
event.Date = time.Now().Format("2006-01-02 15:04:05")
event.Date = utils.GetCurrentTime(dh.timeLocation)
event.Day = utils.GetCurrentDay(dh.timeLocation)
return dh.database.AddNewColum(&event)
}
@@ -26,14 +26,10 @@ func (dh *DatabaseHandler) GetEvent(id uint) (event []models.Event, err error) {
return event, errors.New("database not opened")
}
err = dh.database.GetById(&event, id)
err = dh.database.GetById(&event, "Attendees", id)
if err != nil {
return
}
for i := range event {
event[i].Count = len(event[i].Attendees)
}
return
}
@@ -41,7 +37,7 @@ 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))
return dh.database.UpdateValuesById(&event, "", uint(event.Id))
}
func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error {
@@ -53,7 +49,7 @@ func (dh *DatabaseHandler) DeleteEvent(ids ...uint) error {
return errors.New("no ids given to be deleted")
}
return dh.database.DeleteById(&models.Event{}, ids...)
return dh.database.DeleteById(&models.Event{}, "", ids...)
}
func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error {
@@ -62,24 +58,24 @@ func (dh *DatabaseHandler) AddAttendeesToEvent(newEvent models.Event) error {
}
var event models.Event
err := dh.database.GetById(&event, uint(newEvent.Id))
err := dh.database.GetById(&event, "Attendees", uint(newEvent.Id))
if err != nil {
return err
}
next:
for _, newAttendee := range newEvent.Attendees {
if !dh.database.Exists(&models.Member{}, "", "id", newAttendee.Id, false) {
continue
}
for _, attendee := range event.Attendees {
if attendee.FirstName == newAttendee.FirstName && attendee.LastName == newAttendee.LastName {
continue next
}
}
event.Attendees = append(event.Attendees, newAttendee)
dh.database.AddRelation(&event, newAttendee, "Attendees")
}
event.Count = len(event.Attendees)
return dh.database.UpdateValuesById(&event, uint(newEvent.Id))
return nil
}
func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error {
@@ -88,17 +84,14 @@ func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error
}
var event models.Event
dh.database.GetById(&event, uint(newEvent.Id))
dh.database.GetById(&event, "Attendees", uint(newEvent.Id))
next:
for _, newAttendee := range newEvent.Attendees {
for i := range event.Attendees {
if event.Attendees[i].FirstName == newAttendee.FirstName && event.Attendees[i].LastName == newAttendee.LastName {
event.Attendees = slices.Delete(event.Attendees, i, i+1)
continue next
for _, a := range event.Attendees {
if a.FirstName == newAttendee.FirstName && a.LastName == newAttendee.LastName {
dh.database.DeleteRelation(&event, a, "Attendees")
}
}
}
event.Count = len(event.Attendees)
return dh.database.UpdateValuesById(&event, uint(newEvent.Id))
return nil
}

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,7 +22,7 @@ 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
}
@@ -33,7 +33,7 @@ func (dh *DatabaseHandler) UpdateGroup(id int, 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 {
@@ -45,5 +45,5 @@ func (dh *DatabaseHandler) DeleteGroup(ids ...uint) error {
return errors.New("no ids given to be deleted")
}
return dh.database.DeleteById(&models.Group{}, ids...)
return dh.database.DeleteById(&models.Group{}, "", ids...)
}

31
handlers/members.go
View File

@@ -3,7 +3,6 @@ package handlers
import (
"errors"
"fmt"
"time"
"gitea.tecamino.com/paadi/memberDB/crypto"
"gitea.tecamino.com/paadi/memberDB/models"
@@ -75,7 +74,7 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
return err
}
now := time.Now().Format("2006-01-02 15:04:05")
now := utils.GetCurrentTime(dh.timeLocation)
encFirstVisit, err := crypto.Encrypt(now, dh.token)
if err != nil {
return err
@@ -86,11 +85,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
return err
}
encGroup, err := crypto.Encrypt(member.Group, dh.token)
if err != nil {
return err
}
encComment, err := crypto.Encrypt(member.Comment, dh.token)
if err != nil {
return err
@@ -109,7 +103,6 @@ func (dh *DatabaseHandler) AddNewMember(members ...models.Member) error {
member.Email = encEmail
member.FirstVisit = encFirstVisit
member.LastVisit = encLastVisit
member.Group = encGroup
member.Comment = encComment
err = dh.database.AddNewColum(&member)
@@ -129,7 +122,7 @@ func (dh *DatabaseHandler) DeleteMember(ids ...uint) error {
if len(ids) == 0 {
return errors.New("no ids given to be deleted")
}
return dh.database.DeleteById(&models.Member{}, ids...)
return dh.database.DeleteById(&models.Member{}, "", ids...)
}
// GetMember returns one member by given id
@@ -138,7 +131,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)
if err != nil {
return
}
@@ -214,13 +207,6 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
}
}
if members[i].Group != "" {
members[i].Group, err = crypto.Decrypt(members[i].Group, dh.token)
if err != nil {
return
}
}
if members[i].Comment != "" {
members[i].Comment, err = crypto.Decrypt(members[i].Comment, dh.token)
if err != nil {
@@ -316,20 +302,13 @@ func (dh *DatabaseHandler) UpdateMember(id int, member models.Member) (err error
}
}
if member.Group != "" {
member.Group, err = crypto.Encrypt(member.Group, dh.token)
if err != nil {
return err
}
}
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))
return dh.database.UpdateValuesById(&member, "", uint(member.Id))
}
// memberExists helper to check wheter member already exists
@@ -339,7 +318,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
}

40
handlers/responsible.go
View File

@@ -6,35 +6,31 @@ import (
"gitea.tecamino.com/paadi/memberDB/models"
)
func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Person) error {
func (dh *DatabaseHandler) AddNewResponsible(responsibles ...models.Responsible) error {
if !dh.DatabaseOpened() {
return errors.New("database not opened")
}
for _, responsible := range responsibles {
// set id to 0 so new uniq id is created
responsible.Id = 0
exists, err := dh.responsibleExists(responsible)
if err != nil {
return err
} else if exists {
for i := range responsibles {
if !dh.database.Exists(&models.Member{}, "", "id", 25, false) {
continue
}
err = dh.database.AddNewColum(&responsible)
err := dh.database.AddNewColum(&responsibles[i])
if err != nil {
return err
}
}
return nil
}
func (dh *DatabaseHandler) GetResponsible(id uint) (persons []models.Person, err error) {
func (dh *DatabaseHandler) GetResponsible(id uint) (responsibles models.Responsibles, err error) {
if !dh.DatabaseOpened() {
return persons, errors.New("database not opened")
return responsibles, errors.New("database not opened")
}
err = dh.database.GetById(&persons, id)
err = dh.database.GetById(&responsibles, "Member", id)
return
}
@@ -46,23 +42,5 @@ func (dh *DatabaseHandler) DeleteResponsible(ids ...uint) error {
if len(ids) == 0 {
return errors.New("no ids given to be deleted")
}
return dh.database.DeleteById(&models.Person{}, ids...)
}
func (dh *DatabaseHandler) responsibleExists(CheckResponsible models.Person) (bool, error) {
if !dh.DatabaseOpened() {
return false, errors.New("database not opened")
}
var persons []models.Person
if !dh.database.Exists(&persons, "lastName", CheckResponsible.LastName, false) {
return false, nil
}
for _, person := range persons {
if person.FirstName == CheckResponsible.FirstName && person.LastName == CheckResponsible.LastName {
return true, nil
}
}
return false, nil
return dh.database.DeleteById(&models.Responsible{}, "", ids...)
}