3 Commits

Author SHA1 Message Date
Adrian Zürcher
c94f47060d add new database creation indicator 2025-11-30 21:11:58 +01:00
Adrian Zürcher
5832df28c9 add missing decrypt of member before deleting attendance 2025-11-28 16:48:08 +01:00
Adrian Zürcher
55653d996b fix random name changes, only once decrypt each member 2025-11-28 08:21:45 +01:00
4 changed files with 16 additions and 6 deletions

2
go.mod
View File

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB
go 1.24.5 go 1.24.5
require ( require (
gitea.tecamino.com/paadi/dbHandler v1.1.7 gitea.tecamino.com/paadi/dbHandler v1.1.8
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 gitea.tecamino.com/paadi/tecamino-logger v0.2.1
github.com/gin-contrib/cors v1.7.6 github.com/gin-contrib/cors v1.7.6
github.com/gin-gonic/gin v1.11.0 github.com/gin-gonic/gin v1.11.0

4
go.sum
View File

@@ -1,5 +1,5 @@
gitea.tecamino.com/paadi/dbHandler v1.1.7 h1:NqVbxbUwd7EZX6HYntyLYwwPbyTPevOhIBTFqoCVqOU= gitea.tecamino.com/paadi/dbHandler v1.1.8 h1:8iB3vunMyb9M/nYzErmvU/CjhY6IZt8aRGQryeGiO+c=
gitea.tecamino.com/paadi/dbHandler v1.1.7/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= gitea.tecamino.com/paadi/dbHandler v1.1.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE= gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM= gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=

View File

@@ -44,9 +44,11 @@ func (dh *DatabaseHandler) UpdateEvent(id int, event models.Event) (err error) {
return errors.New("database not opened") return errors.New("database not opened")
} }
event.Day, err = utils.GetDayFromDate(event.Date) if event.Date != "" {
if err != nil { event.Day, err = utils.GetDayFromDate(event.Date)
return err if err != nil {
return err
}
} }
return dh.database.UpdateValuesById(&event, uint(event.Id)) return dh.database.UpdateValuesById(&event, uint(event.Id))
} }
@@ -99,6 +101,7 @@ func (dh *DatabaseHandler) DeleteAttendeesFromEvent(newEvent models.Event) error
for _, newAttendee := range newEvent.Attendees { for _, newAttendee := range newEvent.Attendees {
for _, a := range event.Attendees { for _, a := range event.Attendees {
a.Decrypt(dh.token)
if a.FirstName == newAttendee.FirstName && a.LastName == newAttendee.LastName { if a.FirstName == newAttendee.FirstName && a.LastName == newAttendee.LastName {
dh.database.DeleteRelation(&event, a, "Attendees") dh.database.DeleteRelation(&event, a, "Attendees")
} }

View File

@@ -70,12 +70,19 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
return return
} }
//map for list all decrypted members so it only once derypt each member
decryptedList := make(map[uint]bool, 1)
for i := range members { for i := range members {
if err := members[i].Decrypt(dh.token); err != nil { if err := members[i].Decrypt(dh.token); err != nil {
return members, err return members, err
} }
if members[i].Responsible != nil { if members[i].Responsible != nil {
//check if already decrypted
if decryptedList[members[i].Responsible.Member.Id] {
continue
}
members[i].Responsible.Member.Decrypt(dh.token) members[i].Responsible.Member.Decrypt(dh.token)
decryptedList[members[i].Responsible.Member.Id] = true
} }
} }
return return