From df2d868e441387c4042a5d9c62f6860784f68fe5 Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Mon, 10 Feb 2025 08:15:20 +0700 Subject: [PATCH] feat: update group on user levels --- .../user_levels/mapper/user_levels.mapper.go | 1 + .../request/user_levels.request.go | 26 +++++++++++-------- .../response/user_levels.response.go | 1 + docs/swagger/docs.go | 6 +++++ docs/swagger/swagger.json | 6 +++++ docs/swagger/swagger.yaml | 4 +++ 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/app/module/user_levels/mapper/user_levels.mapper.go b/app/module/user_levels/mapper/user_levels.mapper.go index c687a80..a3bb92b 100644 --- a/app/module/user_levels/mapper/user_levels.mapper.go +++ b/app/module/user_levels/mapper/user_levels.mapper.go @@ -14,6 +14,7 @@ func UserLevelsResponseMapper(userLevelsReq *entity.UserLevels) (userLevelsRes * LevelNumber: userLevelsReq.LevelNumber, ParentLevelId: userLevelsReq.ParentLevelId, ProvinceId: userLevelsReq.ProvinceId, + Group: userLevelsReq.Group, IsActive: userLevelsReq.IsActive, CreatedAt: userLevelsReq.CreatedAt, UpdatedAt: userLevelsReq.UpdatedAt, diff --git a/app/module/user_levels/request/user_levels.request.go b/app/module/user_levels/request/user_levels.request.go index 204e297..d8f7e1c 100644 --- a/app/module/user_levels/request/user_levels.request.go +++ b/app/module/user_levels/request/user_levels.request.go @@ -20,12 +20,13 @@ type UserLevelsQueryRequest struct { } type UserLevelsCreateRequest struct { - Name string `json:"name" validate:"required"` - AliasName string `json:"aliasName" validate:"required"` - LevelNumber int `json:"levelNumber" validate:"required"` - ParentLevelId *int `json:"parentLevelId"` - ProvinceId *int `json:"provinceId"` - IsActive *bool `json:"isActive"` + Name string `json:"name" validate:"required"` + AliasName string `json:"aliasName" validate:"required"` + LevelNumber int `json:"levelNumber" validate:"required"` + ParentLevelId *int `json:"parentLevelId"` + ProvinceId *int `json:"provinceId"` + Group *string `json:"group"` + IsActive *bool `json:"isActive"` } func (req UserLevelsCreateRequest) ToEntity() *entity.UserLevels { @@ -35,16 +36,18 @@ func (req UserLevelsCreateRequest) ToEntity() *entity.UserLevels { LevelNumber: req.LevelNumber, ParentLevelId: req.ParentLevelId, ProvinceId: req.ProvinceId, + Group: req.Group, IsActive: req.IsActive, } } type UserLevelsUpdateRequest struct { - Name string `json:"name" validate:"required"` - AliasName string `json:"aliasName" validate:"required"` - LevelNumber int `json:"levelNumber" validate:"required"` - ParentLevelId *int `json:"parentLevelId"` - ProvinceId *int `json:"provinceId"` + Name string `json:"name" validate:"required"` + AliasName string `json:"aliasName" validate:"required"` + LevelNumber int `json:"levelNumber" validate:"required"` + ParentLevelId *int `json:"parentLevelId"` + Group *string `json:"group"` + ProvinceId *int `json:"provinceId"` } func (req UserLevelsUpdateRequest) ToEntity() *entity.UserLevels { @@ -54,6 +57,7 @@ func (req UserLevelsUpdateRequest) ToEntity() *entity.UserLevels { LevelNumber: req.LevelNumber, ParentLevelId: req.ParentLevelId, ProvinceId: req.ProvinceId, + Group: req.Group, UpdatedAt: time.Now(), } } diff --git a/app/module/user_levels/response/user_levels.response.go b/app/module/user_levels/response/user_levels.response.go index da3164a..e5b8917 100644 --- a/app/module/user_levels/response/user_levels.response.go +++ b/app/module/user_levels/response/user_levels.response.go @@ -9,6 +9,7 @@ type UserLevelsResponse struct { LevelNumber int `json:"levelNumber"` ParentLevelId *int `json:"parentLevelId"` ProvinceId *int `json:"provinceId"` + Group *string `json:"group"` IsActive *bool `json:"isActive"` CreatedAt time.Time `json:"createdAt"` UpdatedAt time.Time `json:"updatedAt"` diff --git a/docs/swagger/docs.go b/docs/swagger/docs.go index e8186fc..bc76dae 100644 --- a/docs/swagger/docs.go +++ b/docs/swagger/docs.go @@ -7856,6 +7856,9 @@ const docTemplate = `{ "aliasName": { "type": "string" }, + "group": { + "type": "string" + }, "isActive": { "type": "boolean" }, @@ -7884,6 +7887,9 @@ const docTemplate = `{ "aliasName": { "type": "string" }, + "group": { + "type": "string" + }, "levelNumber": { "type": "integer" }, diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index 18ef13a..f88744f 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -7845,6 +7845,9 @@ "aliasName": { "type": "string" }, + "group": { + "type": "string" + }, "isActive": { "type": "boolean" }, @@ -7873,6 +7876,9 @@ "aliasName": { "type": "string" }, + "group": { + "type": "string" + }, "levelNumber": { "type": "integer" }, diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index a67745c..65f4ad0 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -463,6 +463,8 @@ definitions: properties: aliasName: type: string + group: + type: string isActive: type: boolean levelNumber: @@ -482,6 +484,8 @@ definitions: properties: aliasName: type: string + group: + type: string levelNumber: type: integer name: