From e527872d01c79834d89f32b1a81820f3f1d9df63 Mon Sep 17 00:00:00 2001 From: "aditya.siregar" Date: Wed, 28 Aug 2024 23:48:49 +0700 Subject: [PATCH] Update Site ID --- internal/handlers/http/user/user.go | 1 + internal/handlers/response/user.go | 9 +++++---- internal/repository/users/user.go | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/internal/handlers/http/user/user.go b/internal/handlers/http/user/user.go index 048de7a..9727d4c 100644 --- a/internal/handlers/http/user/user.go +++ b/internal/handlers/http/user/user.go @@ -323,6 +323,7 @@ func (h *Handler) toUserResponse(resp *entity.User) response.User { PartnerName: resp.PartnerName, CreatedAt: resp.CreatedAt.Format(time.RFC3339), UpdatedAt: resp.CreatedAt.Format(time.RFC3339), + SiteID: resp.SiteID, } } diff --git a/internal/handlers/response/user.go b/internal/handlers/response/user.go index 2462367..5509b77 100644 --- a/internal/handlers/response/user.go +++ b/internal/handlers/response/user.go @@ -7,11 +7,12 @@ type User struct { Name string `json:"name"` Email string `json:"email"` PhoneNumber string `json:"phone_number"` - NIK string `json:"nik"` + NIK string `json:"nik"` Status string `json:"status"` RoleID int64 `json:"role_id"` RoleName string `json:"role_name"` PartnerID *int64 `json:"partner_id"` + SiteID *int64 `json:"site_id"` PartnerName string `json:"partner_name"` CreatedAt string `json:"created_at,omitempty"` UpdatedAt string `json:"updated_at,omitempty"` @@ -39,9 +40,9 @@ type Customer struct { type CustomerList struct { Users []Customer `json:"users"` - Total int64 `json:"total"` - Limit int `json:"limit"` - Offset int `json:"offset"` + Total int64 `json:"total"` + Limit int `json:"limit"` + Offset int `json:"offset"` } type UserRegister struct { diff --git a/internal/repository/users/user.go b/internal/repository/users/user.go index d1c2b14..ac87266 100644 --- a/internal/repository/users/user.go +++ b/internal/repository/users/user.go @@ -177,7 +177,7 @@ func (b *UserRepository) GetUserByID(ctx context.Context, id int64) (*entity.Use var user *entity.UserDB query := b.db.Table("users"). - Select("users.id, users.email,users.phone_number,users.nik, users.password , users.name, 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.phone_number,users.nik, users.password , users.name, users.status, users.created_at, users.updated_at, ur.role_id, r.role_name, ur.partner_id, ur.site_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").