This commit is contained in:
optclblast 2024-05-12 22:24:23 +03:00 committed by optclblast
parent 3bea7e518a
commit 160be267c5

View File

@ -50,22 +50,26 @@ func (r *repositorySQL) Get(ctx context.Context, params GetParams) ([]*models.Us
var users []*models.User = make([]*models.User, 0, len(params.Ids)) var users []*models.User = make([]*models.User, 0, len(params.Ids))
if err := sqltools.Transaction(ctx, r.db, func(ctx context.Context) (err error) { if err := sqltools.Transaction(ctx, r.db, func(ctx context.Context) (err error) {
query := sq.Select("id, name, email, phone, tg, seed, created_at, activated_at"). query := sq.Select("u.id, u.name, u.email, u.phone, u.tg, u.seed, u.created_at, u.activated_at").
From("users"). From("users as u").
PlaceholderFormat(sq.Dollar) PlaceholderFormat(sq.Dollar)
if len(params.Ids) > 0 { if len(params.Ids) > 0 {
query = query.Where(sq.Eq{ query = query.Where(sq.Eq{
"id": params.Ids, "u.id": params.Ids,
}) })
} }
// if params.OrganizationId != uuid.Nil { if params.OrganizationId != uuid.Nil {
// // todo join org users query = query.InnerJoin(
// } "organizations_users as ou on ou.user_id = u.id",
).Where(sq.Eq{
"ou.organization_id": params.OrganizationId,
})
}
if params.Seed != nil { if params.Seed != nil {
query = query.Where("seed = ?", params.Seed) query = query.Where("u.seed = ?", params.Seed)
} }
rows, err := query.RunWith(r.Conn(ctx)).QueryContext(ctx) rows, err := query.RunWith(r.Conn(ctx)).QueryContext(ctx)