Compare commits

...

7 Commits

Author SHA1 Message Date
Adrian Zürcher
108eae597b remove same name check 2026-02-06 08:32:32 +01:00
Adrian Zürcher
5a0d7a5e84 fix multiple decryption 2026-02-05 07:18:52 +01:00
Adrian Zürcher
cd5d93a1bb lift golang version to 1.25 2026-02-05 07:18:37 +01:00
Adrian Zürcher
8400f29f7e update dbhandler 2025-11-30 21:35:39 +01:00
Adrian Zürcher
4d86d9a8a0 update dbhandler 2025-11-30 21:29:42 +01:00
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
3 changed files with 15 additions and 11 deletions

4
go.mod
View File

@@ -1,9 +1,9 @@
module gitea.tecamino.com/paadi/memberDB
go 1.24.5
go 1.25.4
require (
gitea.tecamino.com/paadi/dbHandler v1.1.7
gitea.tecamino.com/paadi/dbHandler v1.1.10
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
View File

@@ -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.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
gitea.tecamino.com/paadi/dbHandler v1.1.10/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=

View File

@@ -12,10 +12,6 @@ func (dh *DatabaseHandler) StartNewEvent(event *models.Event) error {
return errors.New("database not opened")
}
if dh.database.Exists(&models.Event{}, "name", event.Name, false) {
return errors.New("event with name: " + event.Name + " exists already")
}
event.Date = utils.GetCurrentTime(dh.timeLocation)
event.Day = utils.GetCurrentDay(dh.timeLocation)
return dh.database.AddNewColum(&event)
@@ -28,8 +24,13 @@ func (dh *DatabaseHandler) GetEvent(id uint) (events []models.Event, err error)
err = dh.database.GetById(&events, id, "Attendees")
idMap := make(map[uint]bool)
for i := range events {
for j := range events[i].Attendees {
if _, ok := idMap[events[i].Attendees[j].Id]; ok {
continue
}
idMap[events[i].Attendees[j].Id] = true
events[i].Attendees[j].Decrypt(dh.token)
}
}
@@ -44,9 +45,11 @@ func (dh *DatabaseHandler) UpdateEvent(id int, event models.Event) (err error) {
return errors.New("database not opened")
}
event.Day, err = utils.GetDayFromDate(event.Date)
if err != nil {
return err
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 +102,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")
}