simplify code and add total

api/reportHandler.go

@@ -9,11 +9,6 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-type counter struct {
-	event int
-	total int
-}
-
 func (a *APIHandler) GetReport(c *gin.Context) {
 	if !a.DBHandlerIsInitialized() {
 		a.logger.Error("GetReport", "database handler is not initialized")
@@ -57,9 +52,6 @@ func (a *APIHandler) GetReport(c *gin.Context) {
 
 	report.Data = make(map[string]*models.Data)
 
-	//helper
-	count := make(map[string]*counter)
-
 	addedMember := make(map[uint]bool)
 
 	if len(events) == 0 {
@@ -68,40 +60,41 @@ func (a *APIHandler) GetReport(c *gin.Context) {
 	}
 
 	for _, e := range events {
+		var includesDate bool
 
-		for _, d := range request.Date {
-			if !strings.Contains(e.Date, d) {
+		for i, d := range request.Date {
+			if strings.Contains(e.Date, d) {
+				request.Date = slices.Delete(request.Date, i, min(len(request.Date), i+1))
+				includesDate = true
+				break
+			}
+		}
+		if !includesDate {
 			continue
 		}
-		}
 
-		var data *models.Data
-		if _, ok := count[e.Day]; !ok {
-			count[e.Day] = &counter{}
+		attendanceLength := len(e.Attendees)
+
+		total, ok := report.Data["total"]
+		if !ok {
+			total = models.AddNewData(attendanceLength)
+			report.Data["total"] = total
 		}
-		count[e.Day].event += 1
 
 		data, ok := report.Data[e.Day]
 		if !ok {
-			data = &models.Data{}
+			data = models.AddNewData(attendanceLength)
 			report.Data[e.Day] = data
 		}
 
-		if data.Minimal > len(e.Attendees) {
-			data.Minimal = len(e.Attendees)
-		}
-
-		if data.Maximal < len(e.Attendees) {
-			data.Maximal = len(e.Attendees)
-		}
-
-		count[e.Day].total = +len(e.Attendees)
-		data.Average = count[e.Day].total / count[e.Day].event
+		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
 		}
@@ -126,7 +119,6 @@ func (a *APIHandler) GetReport(c *gin.Context) {
 			} else if !slices.Contains(request.Groups, m.Group.Id) {
 				continue
 			}
-
 		}
 		report.NonAttendees = append(report.NonAttendees, &m)
 	}

go.mod

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB
 go 1.25.4
 
 require (
-	gitea.tecamino.com/paadi/dbHandler v1.1.10
+	gitea.tecamino.com/paadi/dbHandler v1.1.11
 	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.10 h1:zZQbDTJ0bu6CIW90Zms8yYIzTLHtWPNhVKRxLUXEDuE=
-gitea.tecamino.com/paadi/dbHandler v1.1.10/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
+gitea.tecamino.com/paadi/dbHandler v1.1.11 h1:hTpMWRr4dW7TkiBnEku0/3ggDC7/uP82U9paRKY/QEs=
+gitea.tecamino.com/paadi/dbHandler v1.1.11/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/report.go

@@ -8,11 +8,6 @@ import (
 	"gitea.tecamino.com/paadi/memberDB/models"
 )
 
-type counter struct {
-	event int
-	total int
-}
-
 func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.Report, err error) {
 	if !dh.DatabaseOpened() {
 		return report, errors.New("database not opened")
@@ -35,46 +30,45 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
 
 	report.Data = make(map[string]*models.Data)
 
-	//helper
-	count := make(map[string]*counter)
-
 	addedMember := make(map[uint]bool)
 
 	for _, e := range events {
 
-		for _, d := range filter.Date {
-			if !strings.Contains(e.Date, d) {
+		var includesDate bool
+
+		for i, d := range filter.Date {
+			if strings.Contains(e.Date, d) {
+				filter.Date = slices.Delete(filter.Date, i, min(len(filter.Date), i+1))
+				includesDate = true
+				break
+			}
+		}
+		if !includesDate {
 			continue
 		}
-		}
 
-		var data *models.Data
-		if _, ok := count[e.Day]; !ok {
-			count[e.Day] = &counter{}
+		attendanceLength := len(e.Attendees)
+
+		total, ok := report.Data["total"]
+		if !ok {
+			total = models.AddNewData(attendanceLength)
+			report.Data["total"] = total
 		}
-		count[e.Day].event += 1
 
 		data, ok := report.Data[e.Day]
 		if !ok {
-			data = &models.Data{}
+			data = models.AddNewData(attendanceLength)
 			report.Data[e.Day] = data
 		}
 
-		if data.Minimal > len(e.Attendees) {
-			data.Minimal = len(e.Attendees)
-		}
-
-		if data.Maximal < len(e.Attendees) {
-			data.Maximal = len(e.Attendees)
-		}
-
-		count[e.Day].total = +len(e.Attendees)
-		data.Average = count[e.Day].total / count[e.Day].event
+		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
 		}
@@ -89,9 +83,13 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
 	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)
 	}
 

models/report.go

@@ -13,7 +13,26 @@ type Report struct {
 }
 
 type Data struct {
-	Minimal int `json:"minimal,omitempty"`
-	Average int `json:"average,omitempty"`
-	Maximal int `json:"maximal,omitempty"`
+	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
 }