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

Update Site ID

Browse Source
This commit is contained in:
aditya.siregar 2024-08-28 23:48:49 +07:00
parent c1cfd794fc
commit e527872d01
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/handlers/http/user/user.go
View File

@ -323,6 +323,7 @@ func (h *Handler) toUserResponse(resp *entity.User) response.User {
PartnerName: resp.PartnerName, PartnerName: resp.PartnerName,
CreatedAt: resp.CreatedAt.Format(time.RFC3339), CreatedAt: resp.CreatedAt.Format(time.RFC3339),
UpdatedAt: resp.CreatedAt.Format(time.RFC3339), UpdatedAt: resp.CreatedAt.Format(time.RFC3339),
SiteID: resp.SiteID,
} }
} }

9
internal/handlers/response/user.go
View File

@ -7,11 +7,12 @@ type User struct {
Name string `json:"name"` Name string `json:"name"`
Email string `json:"email"` Email string `json:"email"`
PhoneNumber string `json:"phone_number"` PhoneNumber string `json:"phone_number"`
NIK string `json:"nik"` NIK string `json:"nik"`
Status string `json:"status"` Status string `json:"status"`
RoleID int64 `json:"role_id"` RoleID int64 `json:"role_id"`
RoleName string `json:"role_name"` RoleName string `json:"role_name"`
PartnerID *int64 `json:"partner_id"` PartnerID *int64 `json:"partner_id"`
SiteID *int64 `json:"site_id"`
PartnerName string `json:"partner_name"` PartnerName string `json:"partner_name"`
CreatedAt string `json:"created_at,omitempty"` CreatedAt string `json:"created_at,omitempty"`
UpdatedAt string `json:"updated_at,omitempty"` UpdatedAt string `json:"updated_at,omitempty"`
@ -39,9 +40,9 @@ type Customer struct {
type CustomerList struct { type CustomerList struct {
Users []Customer `json:"users"` Users []Customer `json:"users"`
Total int64 `json:"total"` Total int64 `json:"total"`
Limit int `json:"limit"` Limit int `json:"limit"`
Offset int `json:"offset"` Offset int `json:"offset"`
} }
type UserRegister struct { type UserRegister struct {

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

@ -177,7 +177,7 @@ func (b *UserRepository) GetUserByID(ctx context.Context, id int64) (*entity.Use
var user *entity.UserDB var user *entity.UserDB
query := b.db.Table("users"). 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 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").