From c738cce9233d9f6d7c1e37bae8b5575fa52ce0f6 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Thu, 7 Nov 2024 12:01:50 +0700 Subject: [PATCH] feat: update users --- app/module/users/request/users.request.go | 106 +++++++++++----------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/app/module/users/request/users.request.go b/app/module/users/request/users.request.go index f49da7d..73e3cdb 100644 --- a/app/module/users/request/users.request.go +++ b/app/module/users/request/users.request.go @@ -28,22 +28,22 @@ type UsersQueryRequest struct { } type UsersCreateRequest struct { - Username string `json:"username" validate:"required,lowercase"` - Email string `json:"email" validate:"required,email"` - Fullname string `json:"fullname" validate:"required"` - PhoneNumber string `json:"phoneNumber" validate:"required"` - UserLevelId uint `json:"userLevelId" validate:"required"` - UserRoleId uint `json:"userRoleId" validate:"required"` - Password string `json:"password" validate:"required"` - Address string `json:"address"` - WorkType string `json:"workType"` - GenderType string `json:"genderType"` - IdentityType string `json:"identityType"` - IdentityGroup string `json:"identityGroup"` - IdentityGroupNumber string `json:"identityGroupNumber"` - IdentityNumber string `json:"identityNumber"` - DateOfBirth string `json:"dateOfBirth"` - LastEducation string `json:"lastEducation"` + Username string `json:"username" validate:"required,lowercase"` + Email string `json:"email" validate:"required,email"` + Fullname string `json:"fullname" validate:"required"` + UserLevelId uint `json:"userLevelId" validate:"required"` + UserRoleId uint `json:"userRoleId" validate:"required"` + Password string `json:"password" validate:"required"` + PhoneNumber *string `json:"phoneNumber"` + Address *string `json:"address"` + WorkType *string `json:"workType"` + GenderType *string `json:"genderType"` + IdentityType *string `json:"identityType"` + IdentityGroup *string `json:"identityGroup"` + IdentityGroupNumber *string `json:"identityGroupNumber"` + IdentityNumber *string `json:"identityNumber"` + DateOfBirth *string `json:"dateOfBirth"` + LastEducation *string `json:"lastEducation"` } func (req UsersCreateRequest) ToEntity() *entity.Users { @@ -51,39 +51,39 @@ func (req UsersCreateRequest) ToEntity() *entity.Users { Username: req.Username, Email: req.Email, Fullname: req.Fullname, - Address: req.Address, - PhoneNumber: req.PhoneNumber, - WorkType: req.WorkType, - GenderType: req.GenderType, - IdentityType: req.IdentityType, - IdentityGroup: req.IdentityGroup, - IdentityGroupNumber: req.IdentityGroupNumber, - IdentityNumber: req.IdentityNumber, - DateOfBirth: req.DateOfBirth, - LastEducation: req.LastEducation, + Address: *req.Address, + PhoneNumber: *req.PhoneNumber, + WorkType: *req.WorkType, + GenderType: *req.GenderType, + IdentityType: *req.IdentityType, + IdentityGroup: *req.IdentityGroup, + IdentityGroupNumber: *req.IdentityGroupNumber, + IdentityNumber: *req.IdentityNumber, + DateOfBirth: *req.DateOfBirth, + LastEducation: *req.LastEducation, UserRoleId: req.UserRoleId, UserLevelId: req.UserLevelId, } } type UsersUpdateRequest struct { - Username string `json:"username" validate:"required,lowercase"` - Email string `json:"email" validate:"required,email"` - Fullname string `json:"fullname" validate:"required"` - PhoneNumber string `json:"phoneNumber" validate:"required"` - UserLevelId uint `json:"userLevelId" validate:"required"` - UserRoleId uint `json:"userRoleId" validate:"required"` - Password string `json:"password" validate:"required"` - Address string `json:"address"` - WorkType string `json:"workType"` - GenderType string `json:"genderType"` - IdentityType string `json:"identityType"` - IdentityGroup string `json:"identityGroup"` - IdentityGroupNumber string `json:"identityGroupNumber"` - IdentityNumber string `json:"identityNumber"` - DateOfBirth string `json:"dateOfBirth"` - LastEducation string `json:"lastEducation"` - StatusId *int `json:"statusId"` + Username string `json:"username" validate:"required,lowercase"` + Email string `json:"email" validate:"required,email"` + Fullname string `json:"fullname" validate:"required"` + UserLevelId uint `json:"userLevelId" validate:"required"` + UserRoleId uint `json:"userRoleId" validate:"required"` + Password string `json:"password" validate:"required"` + PhoneNumber *string `json:"phoneNumber"` + Address *string `json:"address"` + WorkType *string `json:"workType"` + GenderType *string `json:"genderType"` + IdentityType *string `json:"identityType"` + IdentityGroup *string `json:"identityGroup"` + IdentityGroupNumber *string `json:"identityGroupNumber"` + IdentityNumber *string `json:"identityNumber"` + DateOfBirth *string `json:"dateOfBirth"` + LastEducation *string `json:"lastEducation"` + StatusId *int `json:"statusId"` } func (req UsersUpdateRequest) ToEntity() *entity.Users { @@ -91,16 +91,16 @@ func (req UsersUpdateRequest) ToEntity() *entity.Users { Username: req.Username, Email: req.Email, Fullname: req.Fullname, - Address: req.Address, - PhoneNumber: req.PhoneNumber, - WorkType: req.WorkType, - GenderType: req.GenderType, - IdentityType: req.IdentityType, - IdentityGroup: req.IdentityGroup, - IdentityGroupNumber: req.IdentityGroupNumber, - IdentityNumber: req.IdentityNumber, - DateOfBirth: req.DateOfBirth, - LastEducation: req.LastEducation, + Address: *req.Address, + PhoneNumber: *req.PhoneNumber, + WorkType: *req.WorkType, + GenderType: *req.GenderType, + IdentityType: *req.IdentityType, + IdentityGroup: *req.IdentityGroup, + IdentityGroupNumber: *req.IdentityGroupNumber, + IdentityNumber: *req.IdentityNumber, + DateOfBirth: *req.DateOfBirth, + LastEducation: *req.LastEducation, UserRoleId: req.UserRoleId, StatusId: req.StatusId, UserLevelId: req.UserLevelId,