Compare commits

..

2 Commits

Author SHA1 Message Date
Adrian Zürcher
28406d662e update dbHandler 2026-02-16 22:23:24 +01:00
Adrian Zürcher
62046ec239 fix only one event per day 2026-02-12 15:15:24 +01:00
4 changed files with 17 additions and 11 deletions

View File

@@ -3,7 +3,6 @@ package api
import ( import (
"net/http" "net/http"
"slices" "slices"
"strings"
"gitea.tecamino.com/paadi/memberDB/models" "gitea.tecamino.com/paadi/memberDB/models"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -62,9 +61,13 @@ func (a *APIHandler) GetReport(c *gin.Context) {
for _, e := range events { for _, e := range events {
var includesDate bool var includesDate bool
for i, d := range request.Date { if len(e.Date) < 10 {
if strings.Contains(e.Date, d) { continue
request.Date = slices.Delete(request.Date, i, min(len(request.Date), i+1)) }
for _, d := range request.Date {
if len(d) < 10 {
continue
} else if d[:10] == e.Date[:10] {
includesDate = true includesDate = true
break break
} }

2
go.mod
View File

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/memberDB
go 1.25.4 go 1.25.4
require ( require (
gitea.tecamino.com/paadi/dbHandler v1.1.11 gitea.tecamino.com/paadi/dbHandler v1.1.12
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 gitea.tecamino.com/paadi/tecamino-logger v0.2.1
github.com/gin-contrib/cors v1.7.6 github.com/gin-contrib/cors v1.7.6
github.com/gin-gonic/gin v1.11.0 github.com/gin-gonic/gin v1.11.0

4
go.sum
View File

@@ -1,5 +1,5 @@
gitea.tecamino.com/paadi/dbHandler v1.1.11 h1:hTpMWRr4dW7TkiBnEku0/3ggDC7/uP82U9paRKY/QEs= gitea.tecamino.com/paadi/dbHandler v1.1.12 h1:F1ARSTUm0MZmF84FfD/g5RQNMYyDYXHYrB3cXPSi4qw=
gitea.tecamino.com/paadi/dbHandler v1.1.11/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= 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 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM= gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=

View File

@@ -3,7 +3,6 @@ package handlers
import ( import (
"errors" "errors"
"slices" "slices"
"strings"
"gitea.tecamino.com/paadi/memberDB/models" "gitea.tecamino.com/paadi/memberDB/models"
) )
@@ -36,9 +35,13 @@ func (dh *DatabaseHandler) GetReport(filter models.ReportFilter) (report models.
var includesDate bool var includesDate bool
for i, d := range filter.Date { if len(e.Date) < 10 {
if strings.Contains(e.Date, d) { continue
filter.Date = slices.Delete(filter.Date, i, min(len(filter.Date), i+1)) }
for _, d := range filter.Date {
if len(d) < 10 {
continue
} else if d[:10] == e.Date[:10] {
includesDate = true includesDate = true
break break
} }