Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4d86d9a8a0 | ||
|
|
c94f47060d | ||
|
|
5832df28c9 | ||
|
|
55653d996b |
2
go.mod
2
go.mod
@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB
|
||||
go 1.24.5
|
||||
|
||||
require (
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.7
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.9
|
||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1
|
||||
github.com/gin-contrib/cors v1.7.6
|
||||
github.com/gin-gonic/gin v1.11.0
|
||||
|
||||
4
go.sum
4
go.sum
@@ -1,5 +1,5 @@
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.7 h1:NqVbxbUwd7EZX6HYntyLYwwPbyTPevOhIBTFqoCVqOU=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.7/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.9 h1:B0sXVMYfjI1CQB2tX/aF+NoMeC0vlGhKs9MEYWf3oe8=
|
||||
gitea.tecamino.com/paadi/dbHandler v1.1.9/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/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
|
||||
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=
|
||||
|
||||
@@ -44,10 +44,12 @@ func (dh *DatabaseHandler) UpdateEvent(id int, event models.Event) (err error) {
|
||||
return errors.New("database not opened")
|
||||
}
|
||||
|
||||
if event.Date != "" {
|
||||
event.Day, err = utils.GetDayFromDate(event.Date)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
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 _, a := range event.Attendees {
|
||||
a.Decrypt(dh.token)
|
||||
if a.FirstName == newAttendee.FirstName && a.LastName == newAttendee.LastName {
|
||||
dh.database.DeleteRelation(&event, a, "Attendees")
|
||||
}
|
||||
|
||||
@@ -70,12 +70,19 @@ func (dh *DatabaseHandler) GetMember(id uint) (members []models.Member, err erro
|
||||
return
|
||||
}
|
||||
|
||||
//map for list all decrypted members so it only once derypt each member
|
||||
decryptedList := make(map[uint]bool, 1)
|
||||
for i := range members {
|
||||
if err := members[i].Decrypt(dh.token); err != nil {
|
||||
return members, err
|
||||
}
|
||||
if members[i].Responsible != nil {
|
||||
//check if already decrypted
|
||||
if decryptedList[members[i].Responsible.Member.Id] {
|
||||
continue
|
||||
}
|
||||
members[i].Responsible.Member.Decrypt(dh.token)
|
||||
decryptedList[members[i].Responsible.Member.Id] = true
|
||||
}
|
||||
}
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user