fixes

Signed-off-by: Sarah Funkhouser <147884153+golanglemonade@users.noreply.github.com>

Author: golanglemonade

internal/graphapi/controlreport_test.go

@@ -99,17 +99,17 @@ func TestQueryControlReports(t *testing.T) {
 	orgUser := suite.seedOrgOwner(t)
 
 	orgOwnedCount := int64(11)
-	systemOwnedCount := int64(3)
 	controlIDs := []string{}
 
 	for range orgOwnedCount {
 		control := (&ControlBuilder{client: suite.client}).MustNew(localTestOrg.owner.UserCtx, t)
 		controlIDs = append(controlIDs, control.ID)
 	}
 
-	// system-owned controls must not appear in controlReports results
-	for range systemOwnedCount {
-		(&ControlBuilder{client: suite.client, SystemOwned: lo.ToPtr(true)}).MustNew(localTestOrg.owner.UserCtx, t)
+	// system-owned controls must not appear in controlReports results (resolver filters SystemOwned: false);
+	// the hook sets system_owned = true automatically when it sees a system admin caller
+	for range int64(3) {
+		(&ControlBuilder{client: suite.client}).MustNew(sharedSystemAdminUser.UserCtx, t)
 	}
 
 	// enrich the first three org-owned controls with associated data so enrichment paths are exercised
@@ -234,9 +234,10 @@ func TestQueryControlReportsByCategory(t *testing.T) {
 	control3 := (&ControlBuilder{client: suite.client, Category: cat2}).MustNew(localTestOrg.owner.UserCtx, t)
 	(&ControlBuilder{client: suite.client}).MustNew(localTestOrg.owner.UserCtx, t)
 
-	// system-owned controls must not appear in results regardless of category
-	(&ControlBuilder{client: suite.client, Category: cat1, SystemOwned: lo.ToPtr(true)}).MustNew(localTestOrg.owner.UserCtx, t)
-	(&ControlBuilder{client: suite.client, Category: cat2, SystemOwned: lo.ToPtr(true)}).MustNew(localTestOrg.owner.UserCtx, t)
+	// system-owned controls must not appear in results regardless of category;
+	// the hook sets system_owned = true automatically when it sees a system admin caller
+	(&ControlBuilder{client: suite.client, Category: cat1}).MustNew(sharedSystemAdminUser.UserCtx, t)
+	(&ControlBuilder{client: suite.client, Category: cat2}).MustNew(sharedSystemAdminUser.UserCtx, t)
 
 	// enrich control1 with associated data so enrichment paths are exercised;
 	// control3 is used as the tertiary to confirm a second unique related control

internal/graphapi/controlreporthelpers.go

@@ -462,6 +462,7 @@ func convertControlToControlReportEdge(controls *generated.ControlConnection) *m
 
 	return &model.ControlReportConnection{
 		Edges:      edges,
+		PageInfo:   &controls.PageInfo,
 		TotalCount: controls.TotalCount,
 	}
 }

internal/graphapi/models_test.go

@@ -298,7 +298,6 @@ type ControlBuilder struct {
 	AllFields   bool
 	Category    string
 	Subcategory string
-	SystemOwned *bool
 }
 
 type SubcontrolBuilder struct {
@@ -1363,7 +1362,7 @@ func (c *ControlBuilder) MustNew(ctx context.Context, t *testing.T) *ent.Control
 	}
 
 	mutation := c.client.db.Control.Create().
-		SetRefCode(c.RefCode).SetTitle(c.Title).SetNillableSystemOwned(c.SystemOwned)
+		SetRefCode(c.RefCode).SetTitle(c.Title)
 
 	if c.ProgramID != "" {
 		mutation.AddProgramIDs(c.ProgramID)