Refactor CreateBookingMatchFilter function to include date filtering …

…in tests
COS301-SE-2024 · Sep 17, 2024 · dfaa7f5 · dfaa7f5
1 parent 3513119
commit dfaa7f5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/occupi-backend/pkg/analytics/analytics.go b/occupi-backend/pkg/analytics/analytics.go
@@ -1,6 +1,8 @@
 package analytics
 
 import (
+	"fmt"
+
 	"github.com/COS301-SE-2024/occupi/occupi-backend/pkg/models"
 	"go.mongodb.org/mongo-driver/bson"
 )
@@ -42,6 +44,9 @@ func CreateBookingMatchFilter(creatorEmail string, attendeesEmail []string, filt
 
 	// Conditionally add the attendees filter if emails is not of length 0
 	if len(attendeesEmail) > 0 {
+		fmt.Println(attendeesEmail)
+		// print len of attendeesEmail
+		fmt.Println(len(attendeesEmail))
 		matchFilter = append(matchFilter, bson.E{Key: "emails", Value: bson.D{{Key: "$in", Value: attendeesEmail}}})
 	}
 

diff --git a/occupi-backend/pkg/database/database.go b/occupi-backend/pkg/database/database.go
@@ -2065,17 +2065,18 @@ func GetAnalyticsOnBookings(ctx *gin.Context, appsession *models.AppSession, cre
 	switch calculate {
 	case "top3":
 		dateFilter = "date"
+		filter.Filter["timeTo"] = ""
 		pipeline = analytics.GetTop3MostBookedRooms(creatorEmail, attendeeEmails, filter, dateFilter)
 	case "historical":
 		// add or overwrite "timeTo" with time.Now and delete "timeFrom" if present
-		filter.Filter["timeTo"] = time.Now().Format(time.RFC3339)
-		delete(filter.Filter, "timeFrom")
+		filter.Filter["timeTo"] = time.Now()
+		filter.Filter["timeFrom"] = ""
 		dateFilter = "end"
 		pipeline = analytics.AggregateBookings(creatorEmail, attendeeEmails, filter, dateFilter)
 	case "upcoming":
 		// add or overwrite "timeFrom" with time.Now and delete "timeTo" if present
-		filter.Filter["timeFrom"] = time.Now().Format(time.RFC3339)
-		delete(filter.Filter, "timeTo")
+		filter.Filter["timeFrom"] = time.Now()
+		filter.Filter["timeTo"] = ""
 		dateFilter = "end"
 		pipeline = analytics.AggregateBookings(creatorEmail, attendeeEmails, filter, dateFilter)
 	default:

diff --git a/occupi-backend/pkg/database/database_helpers.go b/occupi-backend/pkg/database/database_helpers.go
@@ -1,6 +1,7 @@
 package database
 
 import (
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -290,6 +291,8 @@ func MakeEmailAndEmailsAndTimeFilter(creatorEmail string, attendeeEmails []strin
 
 	// filter attendeeEmails in emails array
 	if len(attendeeEmails) > 0 {
+		fmt.Println(attendeeEmails)
+		fmt.Println(len(attendeeEmails))
 		mongoFilter["emails"] = bson.M{"$in": attendeeEmails}
 	}
 

diff --git a/occupi-backend/pkg/handlers/api_handlers.go b/occupi-backend/pkg/handlers/api_handlers.go
@@ -1486,7 +1486,11 @@ func GetAnalyticsOnBookings(ctx *gin.Context, appsession *models.AppSession, cal
 	if err := ctx.ShouldBindJSON(&request); err != nil {
 		request.Creator = ctx.DefaultQuery("creator", "")
 		attendees := ctx.DefaultQuery("attendeeEmails", "")
-		request.Attendees = strings.Split(attendees, ",")
+		if attendees == "" {
+			request.Attendees = []string{}
+		} else {
+			request.Attendees = strings.Split(attendees, ",")
+		}
 
 		// default time is since 1970
 		timeFromStr := ctx.DefaultQuery("timeFrom", "1970-01-01T00:00:00Z")

diff --git a/occupi-backend/pkg/router/router.go b/occupi-backend/pkg/router/router.go
@@ -84,9 +84,9 @@ func OccupiRouter(router *gin.Engine, appsession *models.AppSession) {
 		analytics.GET("/arrival-departure-average", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.GetAnalyticsOnHours(ctx, appsession, "arrivaldeparture", true) })
 		analytics.GET("/in-office", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.GetAnalyticsOnHours(ctx, appsession, "inofficehours", true) })
 
-		analytics.GET("/top-bookings", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.GetAnalyticsOnBookings(ctx, appsession, "top3") })
-		analytics.GET("/bookings-historical", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.GetAnalyticsOnBookings(ctx, appsession, "historical") })
-		analytics.GET("/bookings-current", middleware.ProtectedRoute, func(ctx *gin.Context) { handlers.GetAnalyticsOnBookings(ctx, appsession, "upcoming") })
+		analytics.GET("/top-bookings", func(ctx *gin.Context) { handlers.GetAnalyticsOnBookings(ctx, appsession, "top3") })
+		analytics.GET("/bookings-historical", func(ctx *gin.Context) { handlers.GetAnalyticsOnBookings(ctx, appsession, "historical") })
+		analytics.GET("/bookings-current", func(ctx *gin.Context) { handlers.GetAnalyticsOnBookings(ctx, appsession, "upcoming") })
 	}
 	auth := router.Group("/auth")
 	{