change table to references

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

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
}