Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
108eae597b | ||
|
|
5a0d7a5e84 | ||
|
|
cd5d93a1bb | ||
|
|
8400f29f7e | ||
|
|
4d86d9a8a0 | ||
|
|
c94f47060d | ||
|
|
5832df28c9 |
4
go.mod
4
go.mod
@@ -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
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.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=
|
||||
|
||||
@@ -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")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user