apksel-dev/apskel-pos-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix User Custmer Type

Browse Source
This commit is contained in:
aditya.siregar 2024-08-28 14:04:16 +07:00
parent dacd341c6e
commit 083e5537ec
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/entity/auth.go
View File

@ -72,7 +72,7 @@ func (u *UserDB) ToUser() *User {
Name: u.Name, Name: u.Name,
Email: u.Email, Email: u.Email,
NIK: u.NIK, NIK: u.NIK,
PhoneNumber: u.PhoneNumber, PhoneNumber: u.PhoneNumber,
Status: u.Status, Status: u.Status,
CreatedAt: u.CreatedAt, CreatedAt: u.CreatedAt,
UpdatedAt: u.UpdatedAt, UpdatedAt: u.UpdatedAt,
@ -188,7 +188,6 @@ func (o *UserDB) SetDeleted(updatedby int64) {
o.Status = userstatus.Inactive o.Status = userstatus.Inactive
} }
type CustomerList []*UserDB type CustomerList []*UserDB
type CustomerSearch struct { type CustomerSearch struct {
@ -201,12 +200,12 @@ type CustomerSearch struct {
Offset int Offset int
} }
func (b *CustomerList) ToCustomerList() []*Customer { func (b *CustomerList) ToCustomerList() []*Customer {
var users []*Customer var users []*Customer
for _, user := range *b { for _, user := range *b {
users = append(users, user.ToCustomer()) if user.UserType == "CUSTOMER" {
users = append(users, user.ToCustomer())
}
} }
return users return users
} }

4
internal/repository/users/user.go
View File

@ -129,12 +129,12 @@ func (b *UserRepository) GetAllCustomer(ctx context.Context, req entity.Customer
var total int64 var total int64
query := b.db.Table("users"). query := b.db.Table("users").
Select("users.id, users.email, users.name, users.phone_number, users.status, users.created_at, users.updated_at, ur.role_id, r.role_name, ur.partner_id, b.name as partner_name"). Select("users.id, users.email, users.name, users.phone_number, users.status, users.user_type, users.created_at, users.updated_at, ur.role_id, r.role_name, ur.partner_id, b.name as partner_name").
Joins("LEFT JOIN user_roles ur ON users.id = ur.user_id"). Joins("LEFT JOIN user_roles ur ON users.id = ur.user_id").
Joins("LEFT JOIN roles r ON ur.role_id = r.role_id"). Joins("LEFT JOIN roles r ON ur.role_id = r.role_id").
Joins("LEFT JOIN partners b ON ur.partner_id = b.id"). Joins("LEFT JOIN partners b ON ur.partner_id = b.id").
Where("users.deleted_at is null"). Where("users.deleted_at is null").
Where("users.user_type = ?", "CUSTOMER") Where("users.user_type = 'CUSTOMER'")
if req.Search != "" { if req.Search != "" {
query = query.Where("users.name ILIKE ? or users.email ILIKE ? or r.role_name ILIKE ? or b.name ILIKE ? ", "%"+req.Search+"%", "%"+req.Search+"%", "%"+req.Search+"%", "%"+req.Search+"%") query = query.Where("users.name ILIKE ? or users.email ILIKE ? or r.role_name ILIKE ? or b.name ILIKE ? ", "%"+req.Search+"%", "%"+req.Search+"%", "%"+req.Search+"%", "%"+req.Search+"%")