diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index ef71af5..215c2e6 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -691,8 +691,7 @@ UPDATE users SET Name = $1, "Group" = $2, Email = $3, Role = $4 WHERE AmoID = $5 WITH user_data AS ( SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false ) -SELECT u.ID, u.Name, u.Email, u.Role, u."Group", u.CreatedAt, u.Subdomain, u.Country, u.AmoUserID, u.AmoID, - COUNT(*) OVER() as total_count +SELECT u.*, COUNT(*) OVER() as total_count FROM users u JOIN user_data a ON u.AmoUserID = a.AmoID WHERE u.Deleted = false diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go index 8ec336b..7a0369b 100644 --- a/dal/sqlcgen/queries.sql.go +++ b/dal/sqlcgen/queries.sql.go @@ -2154,8 +2154,7 @@ const getUsersWithPagination = `-- name: GetUsersWithPagination :many WITH user_data AS ( SELECT AmoID FROM users WHERE users.AccountID = $1 AND Deleted = false ) -SELECT u.ID, u.Name, u.Email, u.Role, u."Group", u.CreatedAt, u.Subdomain, u.Country, u.AmoUserID, u.AmoID, - COUNT(*) OVER() as total_count +SELECT u.id, u.accountid, u.amoid, u.name, u.email, u.role, u."Group", u.deleted, u.createdat, u.subdomain, u.amouserid, u.country, COUNT(*) OVER() as total_count FROM users u JOIN user_data a ON u.AmoUserID = a.AmoID WHERE u.Deleted = false @@ -2170,15 +2169,17 @@ type GetUsersWithPaginationParams struct { type GetUsersWithPaginationRow struct { ID int64 `db:"id" json:"id"` + Accountid string `db:"accountid" json:"accountid"` + Amoid int32 `db:"amoid" json:"amoid"` Name string `db:"name" json:"name"` Email string `db:"email" json:"email"` Role int32 `db:"role" json:"role"` Group int32 `db:"Group" json:"Group"` + Deleted bool `db:"deleted" json:"deleted"` Createdat sql.NullTime `db:"createdat" json:"createdat"` Subdomain string `db:"subdomain" json:"subdomain"` - Country string `db:"country" json:"country"` Amouserid int32 `db:"amouserid" json:"amouserid"` - Amoid int32 `db:"amoid" json:"amoid"` + Country string `db:"country" json:"country"` TotalCount int64 `db:"total_count" json:"total_count"` } @@ -2193,15 +2194,17 @@ func (q *Queries) GetUsersWithPagination(ctx context.Context, arg GetUsersWithPa var i GetUsersWithPaginationRow if err := rows.Scan( &i.ID, + &i.Accountid, + &i.Amoid, &i.Name, &i.Email, &i.Role, &i.Group, + &i.Deleted, &i.Createdat, &i.Subdomain, - &i.Country, &i.Amouserid, - &i.Amoid, + &i.Country, &i.TotalCount, ); err != nil { return nil, err