From 73be2333f64b046e49774d79255e6bfd9236d03a Mon Sep 17 00:00:00 2001
From: Hayden <64056131+hay-kot@users.noreply.github.com>
Date: Wed, 8 Mar 2023 09:44:10 -0900
Subject: [PATCH] change some method signatures to support GID

---
 backend/internal/data/repo/repo_locations_test.go |  2 +-
 .../internal/data/repo/repo_maintenance_entry.go  | 15 +++++++++++----
 .../data/repo/repo_maintenance_entry_test.go      |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/internal/data/repo/repo_locations_test.go b/backend/internal/data/repo/repo_locations_test.go
index 0334a42..644828d 100644
--- a/backend/internal/data/repo/repo_locations_test.go
+++ b/backend/internal/data/repo/repo_locations_test.go
@@ -124,7 +124,7 @@ func TestItemRepository_TreeQuery(t *testing.T) {
 	locs := useLocations(t, 3)
 
 	// Set relations
-	_, err := tRepos.Locations.UpdateOneByGroup(context.Background(), tGroup.ID, locs[0].ID, LocationUpdate{
+	_, err := tRepos.Locations.UpdateByGroup(context.Background(), tGroup.ID, locs[0].ID, LocationUpdate{
 		ID:          locs[0].ID,
 		ParentID:    locs[1].ID,
 		Name:        locs[0].Name,
diff --git a/backend/internal/data/repo/repo_maintenance_entry.go b/backend/internal/data/repo/repo_maintenance_entry.go
index 96eae75..7ef282b 100644
--- a/backend/internal/data/repo/repo_maintenance_entry.go
+++ b/backend/internal/data/repo/repo_maintenance_entry.go
@@ -6,6 +6,8 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/hay-kot/homebox/backend/internal/data/ent"
+	"github.com/hay-kot/homebox/backend/internal/data/ent/group"
+	"github.com/hay-kot/homebox/backend/internal/data/ent/item"
 	"github.com/hay-kot/homebox/backend/internal/data/ent/maintenanceentry"
 	"github.com/hay-kot/homebox/backend/internal/data/types"
 )
@@ -92,16 +94,21 @@ func (r *MaintenanceEntryRepository) Update(ctx context.Context, ID uuid.UUID, i
 }
 
 type MaintenanceLogQuery struct {
-	Completed bool
-	Scheduled bool
+	Completed bool `json:"completed" schema:"completed"`
+	Scheduled bool `json:"scheduled" schema:"scheduled"`
 }
 
-func (r *MaintenanceEntryRepository) GetLog(ctx context.Context, itemID uuid.UUID, query MaintenanceLogQuery) (MaintenanceLog, error) {
+func (r *MaintenanceEntryRepository) GetLog(ctx context.Context, groupID, itemID uuid.UUID, query MaintenanceLogQuery) (MaintenanceLog, error) {
 	log := MaintenanceLog{
 		ItemID: itemID,
 	}
 
-	q := r.db.MaintenanceEntry.Query().Where(maintenanceentry.ItemID(itemID))
+	q := r.db.MaintenanceEntry.Query().Where(
+		maintenanceentry.ItemID(itemID),
+		maintenanceentry.HasItemWith(
+			item.HasGroupWith(group.IDEQ(groupID)),
+		),
+	)
 
 	if query.Completed {
 		q = q.Where(maintenanceentry.And(
diff --git a/backend/internal/data/repo/repo_maintenance_entry_test.go b/backend/internal/data/repo/repo_maintenance_entry_test.go
index e9763e7..a82768c 100644
--- a/backend/internal/data/repo/repo_maintenance_entry_test.go
+++ b/backend/internal/data/repo/repo_maintenance_entry_test.go
@@ -59,7 +59,7 @@ func TestMaintenanceEntryRepository_GetLog(t *testing.T) {
 	}
 
 	// Get the log for the item
-	log, err := tRepos.MaintEntry.GetLog(context.Background(), item.ID, MaintenanceLogQuery{
+	log, err := tRepos.MaintEntry.GetLog(context.Background(), tGroup.ID, item.ID, MaintenanceLogQuery{
 		Completed: true,
 	})
 	if err != nil {