mirrors/homebox
1
0
Fork 1
mirror of https://github.com/hay-kot/homebox.git synced 2025-08-06 01:20:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

change some method signatures to support GID

Browse source
This commit is contained in:
Hayden 2023-03-08 09:44:10 -09:00
parent d6823e4e61
commit 73be2333f6
No known key found for this signature in database
GPG key ID: 17CF79474E257545
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/internal/data/repo/repo_locations_test.go
View file

@ -124,7 +124,7 @@ func TestItemRepository_TreeQuery(t *testing.T) {
locs := useLocations(t, 3) locs := useLocations(t, 3)
// Set relations // 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, ID: locs[0].ID,
ParentID: locs[1].ID, ParentID: locs[1].ID,
Name: locs[0].Name, Name: locs[0].Name,

15
backend/internal/data/repo/repo_maintenance_entry.go
View file

@ -6,6 +6,8 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/hay-kot/homebox/backend/internal/data/ent" "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/ent/maintenanceentry"
"github.com/hay-kot/homebox/backend/internal/data/types" "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 { type MaintenanceLogQuery struct {
Completed bool Completed bool `json:"completed" schema:"completed"`
Scheduled bool 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{ log := MaintenanceLog{
ItemID: itemID, 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 { if query.Completed {
q = q.Where(maintenanceentry.And( q = q.Where(maintenanceentry.And(

2
backend/internal/data/repo/repo_maintenance_entry_test.go
View file

@ -59,7 +59,7 @@ func TestMaintenanceEntryRepository_GetLog(t *testing.T) {
} }
// Get the log for the item // 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, Completed: true,
}) })
if err != nil { if err != nil {