update dbHandler

api/reportHandler.go

@@ -0,0 +1,132 @@
+package api
+
+import (
+	"net/http"
+	"slices"
+
+	"gitea.tecamino.com/paadi/memberDB/models"
+	"github.com/gin-gonic/gin"
+)
+
+func (a *APIHandler) GetReport(c *gin.Context) {
+	if !a.DBHandlerIsInitialized() {
+		a.logger.Error("GetReport", "database handler is not initialized")
+		c.JSON(http.StatusInternalServerError, nil)
+		return
+	}
+
+	var err error
+	var report models.Report
+	var request models.ReportFilter
+
+	err = c.BindJSON(&request)
+	if err != nil {
+		a.logger.Error("GetReport", err)
+		c.JSON(http.StatusBadRequest, nil)
+		return
+	}
+
+	if len(request.Date) == 0 {
+		c.JSON(http.StatusOK, gin.H{
+			"data": report,
+		})
+		return
+	}
+
+	var events []models.Event
+
+	if len(request.Name) > 0 {
+		events, err = a.DbHandler.GetEventByKey("name", request.Name, true)
+	} else {
+		events, err = a.DbHandler.GetEvent(0)
+	}
+
+	if err != nil {
+		a.logger.Error("GetReport", err)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	report.Data = make(map[string]*models.Data)
+
+	addedMember := make(map[uint]bool)
+
+	if len(events) == 0 {
+		c.JSON(http.StatusOK, gin.H{})
+		return
+	}
+
+	for _, e := range events {
+		var includesDate bool
+
+		if len(e.Date) < 10 {
+			continue
+		}
+		for _, d := range request.Date {
+			if len(d) < 10 {
+				continue
+			} else if d[:10] == e.Date[:10] {
+				includesDate = true
+				break
+			}
+		}
+		if !includesDate {
+			continue
+		}
+
+		attendanceLength := len(e.Attendees)
+
+		total, ok := report.Data["total"]
+		if !ok {
+			total = models.AddNewData(attendanceLength)
+			report.Data["total"] = total
+		}
+
+		data, ok := report.Data[e.Day]
+		if !ok {
+			data = models.AddNewData(attendanceLength)
+			report.Data[e.Day] = data
+		}
+
+		data.AddData(attendanceLength)
+		total.AddData(attendanceLength)
+
+		for _, a := range e.Attendees {
+			if _, ok := addedMember[a.Id]; ok {
+				continue
+			}
+
+			report.Attendees = append(report.Attendees, a)
+			addedMember[a.Id] = true
+		}
+	}
+
+	// add all member not attended
+	members, err := a.DbHandler.GetMember(0)
+	if err != nil {
+		a.logger.Error("GetReport", err)
+		c.JSON(http.StatusBadRequest, gin.H{
+			"message": err.Error(),
+		})
+		return
+	}
+
+	for _, m := range members {
+		if _, ok := addedMember[m.Id]; ok {
+			continue
+		} else if len(request.Groups) > 0 {
+			if m.Group == nil {
+				continue
+			} else if !slices.Contains(request.Groups, m.Group.Id) {
+				continue
+			}
+		}
+		report.NonAttendees = append(report.NonAttendees, &m)
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"data": report,
+	})
+}

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.12
 	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

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.12 h1:F1ARSTUm0MZmF84FfD/g5RQNMYyDYXHYrB3cXPSi4qw=
+gitea.tecamino.com/paadi/dbHandler v1.1.12/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=

handlers/events.go

@@ -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,36 @@ 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)
+		}
+	}
+	if err != nil {
+		return
+	}
+	return
+}
+
+func (dh *DatabaseHandler) GetEventByKey(key string, value any, likeSearch bool) (events []models.Event, err error) {
+	if !dh.DatabaseOpened() {
+		return events, errors.New("database not opened")
+	}
+
+	err = dh.database.GetByKey(&events, key, value, likeSearch, "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 +68,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 +125,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")
 			}

handlers/members.go

@@ -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

handlers/report.go

@@ -0,0 +1,100 @@
+package handlers
+
+import (
+	"errors"
+	"slices"
+
+	"gitea.tecamino.com/paadi/memberDB/models"
+)
+
+func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.Report, err error) {
+	if !dh.DatabaseOpened() {
+		return report, errors.New("database not opened")
+	}
+
+	if len(filter.Date) == 0 {
+		return
+	}
+
+	var events []models.Event
+
+	if len(filter.Name) > 0 {
+		err = dh.database.GetByKey(&events, "name", filter.Name, true)
+	} else {
+		events, err = dh.GetEvent(0)
+	}
+	if err != nil {
+		return
+	}
+
+	report.Data = make(map[string]*models.Data)
+
+	addedMember := make(map[uint]bool)
+
+	for _, e := range events {
+
+		var includesDate bool
+
+		if len(e.Date) < 10 {
+			continue
+		}
+		for _, d := range filter.Date {
+			if len(d) < 10 {
+				continue
+			} else if d[:10] == e.Date[:10] {
+				includesDate = true
+				break
+			}
+		}
+		if !includesDate {
+			continue
+		}
+
+		attendanceLength := len(e.Attendees)
+
+		total, ok := report.Data["total"]
+		if !ok {
+			total = models.AddNewData(attendanceLength)
+			report.Data["total"] = total
+		}
+
+		data, ok := report.Data[e.Day]
+		if !ok {
+			data = models.AddNewData(attendanceLength)
+			report.Data[e.Day] = data
+		}
+
+		data.AddData(attendanceLength)
+		total.AddData(attendanceLength)
+
+		for _, a := range e.Attendees {
+			if _, ok := addedMember[a.Id]; ok {
+				continue
+			}
+
+			report.Attendees = append(report.Attendees, a)
+			addedMember[a.Id] = true
+		}
+	}
+
+	// add all member not attended
+	members, err := dh.GetMember(0)
+	if err != nil {
+		return
+	}
+
+	for _, m := range members {
+		if _, ok := addedMember[m.Id]; ok {
+			continue
+		} else if len(filter.Groups) > 0 {
+			if m.Group == nil {
+				continue
+			} else if !slices.Contains(filter.Groups, m.Group.Id) {
+				continue
+			}
+		}
+		report.NonAttendees = append(report.NonAttendees, &m)
+	}
+
+	return
+}

models/report.go

@@ -0,0 +1,38 @@
+package models
+
+type ReportFilter struct {
+	Date   []string `json:"date"`
+	Groups []uint   `json:"groupIds,omitempty"`
+	Name   []string `json:"name,omitempty"`
+}
+
+type Report struct {
+	Data         map[string]*Data `json:"data,omitempty"`
+	Attendees    []*Member        `json:"attendees,omitempty"`
+	NonAttendees []*Member        `json:"nonAttendees,omitempty"`
+}
+
+type Data struct {
+	Events       int `json:"events"`
+	Minimal      int `json:"minimal"`
+	Average      int `json:"average"`
+	Maximal      int `json:"maximal"`
+	averageCount int `json:"-"`
+}
+
+func AddNewData(value int) *Data {
+	return &Data{Minimal: value}
+}
+
+func (d *Data) AddData(value int) {
+	d.Events += 1
+	if d.Minimal > value {
+		d.Minimal = value
+	}
+	if d.Maximal < value {
+		d.Maximal = value
+	}
+
+	d.averageCount += value
+	d.Average = d.averageCount / d.Events
+}