From 083e5537ec09baae4c6a9393882c2db52f32dac8 Mon Sep 17 00:00:00 2001
From: "aditya.siregar" <aditya.siregar@gopay.co.id>
Date: Wed, 28 Aug 2024 14:04:16 +0700
Subject: [PATCH] Fix User Custmer Type

---
 internal/entity/auth.go           | 9 ++++-----
 internal/repository/users/user.go | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/internal/entity/auth.go b/internal/entity/auth.go
index ca34b24..3fdd65e 100644
--- a/internal/entity/auth.go
+++ b/internal/entity/auth.go
@@ -72,7 +72,7 @@ func (u *UserDB) ToUser() *User {
 		Name:          u.Name,
 		Email:         u.Email,
 		NIK:           u.NIK,
-		PhoneNumber: u.PhoneNumber,
+		PhoneNumber:   u.PhoneNumber,
 		Status:        u.Status,
 		CreatedAt:     u.CreatedAt,
 		UpdatedAt:     u.UpdatedAt,
@@ -188,7 +188,6 @@ func (o *UserDB) SetDeleted(updatedby int64) {
 	o.Status = userstatus.Inactive
 }
 
-
 type CustomerList []*UserDB
 
 type CustomerSearch struct {
@@ -201,12 +200,12 @@ type CustomerSearch struct {
 	Offset    int
 }
 
-
 func (b *CustomerList) ToCustomerList() []*Customer {
 	var users []*Customer
 	for _, user := range *b {
-		users = append(users, user.ToCustomer())
+		if user.UserType == "CUSTOMER" {
+			users = append(users, user.ToCustomer())
+		}
 	}
 	return users
 }
-
diff --git a/internal/repository/users/user.go b/internal/repository/users/user.go
index e6283c0..d1c2b14 100644
--- a/internal/repository/users/user.go
+++ b/internal/repository/users/user.go
@@ -129,12 +129,12 @@ func (b *UserRepository) GetAllCustomer(ctx context.Context, req entity.Customer
 	var total int64
 
 	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 roles r ON ur.role_id = r.role_id").
 		Joins("LEFT JOIN partners b ON ur.partner_id = b.id").
 		Where("users.deleted_at is null").
-		Where("users.user_type = ?", "CUSTOMER")
+		Where("users.user_type = 'CUSTOMER'")
 
 	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+"%")