From 9d5a58f927528ab68cddb462418506fa20d32f6e Mon Sep 17 00:00:00 2001 From: hanif salafi Date: Mon, 3 Mar 2025 09:13:00 +0700 Subject: [PATCH] feat: update user levels --- .../repository/user_levels.repository.go | 6 +- .../request/user_levels.request.go | 58 ++++++++++--------- .../response/user_levels.response.go | 21 +++---- docs/swagger/docs.go | 6 ++ docs/swagger/swagger.json | 6 ++ docs/swagger/swagger.yaml | 4 ++ 6 files changed, 59 insertions(+), 42 deletions(-) diff --git a/app/module/user_levels/repository/user_levels.repository.go b/app/module/user_levels/repository/user_levels.repository.go index a194651..e1e120d 100644 --- a/app/module/user_levels/repository/user_levels.repository.go +++ b/app/module/user_levels/repository/user_levels.repository.go @@ -62,11 +62,7 @@ func (_i *userLevelsRepository) GetAll(req request.UserLevelsQueryRequest) (user req.Pagination.Count = count req.Pagination = paginator.Paging(req.Pagination) - if req.Pagination.Limit == -1 { - query.Limit(req.Pagination.Limit) - } - - err = query.Offset(req.Pagination.Offset).Find(&userLevelss).Error + err = query.Offset(req.Pagination.Offset).Limit(req.Pagination.Limit).Find(&userLevelss).Error if err != nil { return } diff --git a/app/module/user_levels/request/user_levels.request.go b/app/module/user_levels/request/user_levels.request.go index d8f7e1c..c55cbe4 100644 --- a/app/module/user_levels/request/user_levels.request.go +++ b/app/module/user_levels/request/user_levels.request.go @@ -20,45 +20,49 @@ 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"` - Group *string `json:"group"` - 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"` + IsApprovalActive *bool `json:"isApprovalActive"` + IsActive *bool `json:"isActive"` } func (req UserLevelsCreateRequest) ToEntity() *entity.UserLevels { return &entity.UserLevels{ - Name: req.Name, - AliasName: req.AliasName, - LevelNumber: req.LevelNumber, - ParentLevelId: req.ParentLevelId, - ProvinceId: req.ProvinceId, - Group: req.Group, - IsActive: req.IsActive, + Name: req.Name, + AliasName: req.AliasName, + LevelNumber: req.LevelNumber, + ParentLevelId: req.ParentLevelId, + ProvinceId: req.ProvinceId, + IsApprovalActive: req.IsApprovalActive, + 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"` - Group *string `json:"group"` - 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"` + IsApprovalActive *bool `json:"isApprovalActive"` + Group *string `json:"group"` + ProvinceId *int `json:"provinceId"` } func (req UserLevelsUpdateRequest) ToEntity() *entity.UserLevels { return &entity.UserLevels{ - Name: req.Name, - AliasName: req.AliasName, - LevelNumber: req.LevelNumber, - ParentLevelId: req.ParentLevelId, - ProvinceId: req.ProvinceId, - Group: req.Group, - UpdatedAt: time.Now(), + Name: req.Name, + AliasName: req.AliasName, + LevelNumber: req.LevelNumber, + ParentLevelId: req.ParentLevelId, + ProvinceId: req.ProvinceId, + IsApprovalActive: req.IsApprovalActive, + 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 e5b8917..cdc2956 100644 --- a/app/module/user_levels/response/user_levels.response.go +++ b/app/module/user_levels/response/user_levels.response.go @@ -3,14 +3,15 @@ package response import "time" type UserLevelsResponse struct { - ID uint `json:"id"` - Name string `json:"name"` - AliasName string `json:"aliasName"` - 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"` + ID uint `json:"id"` + Name string `json:"name"` + AliasName string `json:"aliasName"` + LevelNumber int `json:"levelNumber"` + ParentLevelId *int `json:"parentLevelId"` + ProvinceId *int `json:"provinceId"` + IsApprovalActive *bool `json:"isApprovalActive"` + 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 4fac14a..5713eaa 100644 --- a/docs/swagger/docs.go +++ b/docs/swagger/docs.go @@ -8693,6 +8693,9 @@ const docTemplate = `{ "isActive": { "type": "boolean" }, + "isApprovalActive": { + "type": "boolean" + }, "levelNumber": { "type": "integer" }, @@ -8721,6 +8724,9 @@ const docTemplate = `{ "group": { "type": "string" }, + "isApprovalActive": { + "type": "boolean" + }, "levelNumber": { "type": "integer" }, diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index 717b816..a12a249 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -8682,6 +8682,9 @@ "isActive": { "type": "boolean" }, + "isApprovalActive": { + "type": "boolean" + }, "levelNumber": { "type": "integer" }, @@ -8710,6 +8713,9 @@ "group": { "type": "string" }, + "isApprovalActive": { + "type": "boolean" + }, "levelNumber": { "type": "integer" }, diff --git a/docs/swagger/swagger.yaml b/docs/swagger/swagger.yaml index 505183a..1e127f4 100644 --- a/docs/swagger/swagger.yaml +++ b/docs/swagger/swagger.yaml @@ -512,6 +512,8 @@ definitions: type: string isActive: type: boolean + isApprovalActive: + type: boolean levelNumber: type: integer name: @@ -531,6 +533,8 @@ definitions: type: string group: type: string + isApprovalActive: + type: boolean levelNumber: type: integer name: