fix: group account list

morlay · morlay · commit 044c5b5a56bc · 2023-10-20T12:43:08.000+08:00
diff --git a/.secrets/local.mk b/.secrets/local.mk
diff --git a/cue.mod/.gitignore b/cue.mod/.gitignore
@@ -1,2 +1,3 @@
 gen/
-pkg/
+pkg/
+module.sum
diff --git a/cue.mod/module.cue b/cue.mod/module.cue
@@ -4,7 +4,7 @@ require: {
 	"github.com/innoai-tech/runtime": "v0.0.0-20230313062040-872280802f3b"
 	"k8s.io/api":                     "v0.25.4"
 	"k8s.io/apimachinery":            "v0.25.4"
-	"wagon.octohelm.tech":            "v0.0.0-20200202235959-e64a70c55ed2"
+	"wagon.octohelm.tech":            "v0.0.0"
 }
 
 replace: {
diff --git a/cue.mod/module.sum b/cue.mod/module.sum
@@ -1,2 +1,2 @@
 github.com/innoai-tech/runtime v0.0.0-20230313062040-872280802f3b h1:BKnLADxBLU0SKiWIa9ZEL2is7AzLc1B4b0YY21D4vBg=
-wagon.octohelm.tech v0.0.0-20200202235959-3ffa3ac0907e 
+wagon.octohelm.tech v0.0.0 h1:MGaJBtAuLJTv0EuRtd405SA68SAvXQwkhQkwB5HvtnY=
diff --git a/internal/dashboard/domain/group/repository/group_account_repository.go b/internal/dashboard/domain/group/repository/group_account_repository.go
@@ -70,7 +70,12 @@ func (r *GroupAccountRepository) List(ctx context.Context, where b.SqlExpr) ([]*
 	list := make([]*group.Account, 0)
 
 	if err := dal.From(group.AccountT).
-		Where(where).
+		Where(
+			b.And(
+				group.AccountT.GroupID.By(b.Value(r.Group.ID)),
+				where,
+			),
+		).
 		Scan(dal.Recv(func(v *group.Account) error {
 			list = append(list, v)
 			return nil

-Original file line number
+Diff line change
@@ @@ -1,2 +1,3 @@ @@
 gen/
 -pkg/
 +pkg/
 +module.sum
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ require: {`
`4`	`4`	`"github.com/innoai-tech/runtime": "v0.0.0-20230313062040-872280802f3b"`
`5`	`5`	`"k8s.io/api": "v0.25.4"`
`6`	`6`	`"k8s.io/apimachinery": "v0.25.4"`
`7`		`- "wagon.octohelm.tech": "v0.0.0-20200202235959-e64a70c55ed2"`
	`7`	`+ "wagon.octohelm.tech": "v0.0.0"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`replace: {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`github.com/innoai-tech/runtime v0.0.0-20230313062040-872280802f3b h1:BKnLADxBLU0SKiWIa9ZEL2is7AzLc1B4b0YY21D4vBg=`
`2`		`-wagon.octohelm.tech v0.0.0-20200202235959-3ffa3ac0907e`
	`2`	`+wagon.octohelm.tech v0.0.0 h1:MGaJBtAuLJTv0EuRtd405SA68SAvXQwkhQkwB5HvtnY=`