feat: update user levels

app/database/entity/user_levels.entity.go

@@ -8,7 +8,7 @@ type UserLevels struct {
 	AliasName     string    `json:"alias_name" gorm:"type:varchar"`
 	LevelNumber   int       `json:"level_number" gorm:"type:int4"`
 	ParentLevelId int       `json:"parent_level_id" gorm:"type:int4"`
-	ProvinceId    int       `json:"province_id" gorm:"type:int4"`
+	ProvinceId    *int      `json:"province_id" gorm:"type:int4"`
 	Group         *string   `json:"group" gorm:"type:varchar"`
 	IsActive      *bool     `json:"is_active" gorm:"type:bool"`
 	CreatedAt     time.Time `json:"created_at" gorm:"default:now()"`

app/module/user_levels/controller/user_levels.controller.go

@@ -114,7 +114,7 @@ func (_i *userLevelsController) Save(c *fiber.Ctx) error {
 		return err
 	}
 
-	err := _i.userLevelsService.Save(*req)
+	dataResult, err := _i.userLevelsService.Save(*req)
 	if err != nil {
 		return err
 	}
@@ -122,6 +122,7 @@ func (_i *userLevelsController) Save(c *fiber.Ctx) error {
 	return utilRes.Resp(c, utilRes.Response{
 		Success:  true,
 		Messages: utilRes.Messages{"UserLevels successfully created"},
+		Data:     dataResult,
 	})
 }
 

app/module/user_levels/mapper/user_levels.mapper.go

@@ -8,16 +8,16 @@ import (
 func UserLevelsResponseMapper(userLevelsReq *entity.UserLevels) (userLevelsRes *res.UserLevelsResponse) {
 	if userLevelsReq != nil {
 		userLevelsRes = &res.UserLevelsResponse{
-			ID:    userLevelsReq.ID,
+			ID:            userLevelsReq.ID,
-			Name:    userLevelsReq.Name,
+			Name:          userLevelsReq.Name,
-			AliasName:    userLevelsReq.AliasName,
+			AliasName:     userLevelsReq.AliasName,
-			LevelNumber:    userLevelsReq.LevelNumber,
+			LevelNumber:   userLevelsReq.LevelNumber,
-			ParentLevelId:    userLevelsReq.ParentLevelId,
+			ParentLevelId: userLevelsReq.ParentLevelId,
 			ProvinceId:    userLevelsReq.ProvinceId,
-			IsActive:    userLevelsReq.IsActive,
+			IsActive:      userLevelsReq.IsActive,
-			CreatedAt:    userLevelsReq.CreatedAt,
+			CreatedAt:     userLevelsReq.CreatedAt,
-			UpdatedAt:    userLevelsReq.UpdatedAt,
+			UpdatedAt:     userLevelsReq.UpdatedAt,
 		}
 	}
 	return userLevelsRes
-}
+}

app/module/user_levels/repository/user_levels.repository.go

@@ -18,7 +18,7 @@ type UserLevelsRepository interface {
 	GetAll(req request.UserLevelsQueryRequest) (userLevelss []*entity.UserLevels, paging paginator.Pagination, err error)
 	FindOne(id uint) (userLevels *entity.UserLevels, err error)
 	FindOneByAlias(alias string) (userLevels *entity.UserLevels, err error)
-	Create(userLevels *entity.UserLevels) (err error)
+	Create(userLevels *entity.UserLevels) (userLevelsReturn *entity.UserLevels, err error)
 	Update(id uint, userLevels *entity.UserLevels) (err error)
 	Delete(id uint) (err error)
 }
@@ -92,8 +92,9 @@ func (_i *userLevelsRepository) FindOneByAlias(alias string) (userLevels *entity
 	return userLevels, nil
 }
 
-func (_i *userLevelsRepository) Create(userLevels *entity.UserLevels) (err error) {
+func (_i *userLevelsRepository) Create(userLevels *entity.UserLevels) (userLevelsReturn *entity.UserLevels, err error) {
-	return _i.DB.DB.Create(userLevels).Error
+	result := _i.DB.DB.Create(userLevels)
+	return userLevels, result.Error
 }
 
 func (_i *userLevelsRepository) Update(id uint, userLevels *entity.UserLevels) (err error) {

app/module/user_levels/request/user_levels.request.go

@@ -24,7 +24,7 @@ type UserLevelsCreateRequest struct {
 	AliasName     string `json:"aliasName" validate:"required"`
 	LevelNumber   int    `json:"levelNumber" validate:"required"`
 	ParentLevelId int    `json:"parentLevelId" validate:"required"`
-	ProvinceId    int    `json:"provinceId" validate:"required"`
+	ProvinceId    *int   `json:"provinceId"`
 	IsActive      *bool  `json:"isActive"`
 }
 
@@ -44,7 +44,7 @@ type UserLevelsUpdateRequest struct {
 	AliasName     string `json:"aliasName" validate:"required"`
 	LevelNumber   int    `json:"levelNumber" validate:"required"`
 	ParentLevelId int    `json:"parentLevelId" validate:"required"`
-	ProvinceId    int    `json:"provinceId" validate:"required"`
+	ProvinceId    *int   `json:"provinceId"`
 }
 
 func (req UserLevelsUpdateRequest) ToEntity() *entity.UserLevels {

app/module/user_levels/response/user_levels.response.go

@@ -5,11 +5,11 @@ import "time"
 type UserLevelsResponse struct {
 	ID            uint      `json:"id"`
 	Name          string    `json:"name"`
-	AliasName     string    `json:"alias_name"`
+	AliasName     string    `json:"aliasName"`
-	LevelNumber   int       `json:"level_number"`
+	LevelNumber   int       `json:"levelNumber"`
-	ParentLevelId int       `json:"parent_level_id"`
+	ParentLevelId int       `json:"parentLevelId"`
-	ProvinceId    int       `json:"province_id"`
+	ProvinceId    *int      `json:"provinceId"`
-	IsActive      *bool     `json:"is_active"`
+	IsActive      *bool     `json:"isActive"`
-	CreatedAt     time.Time `json:"created_at"`
+	CreatedAt     time.Time `json:"createdAt"`
-	UpdatedAt     time.Time `json:"updated_at"`
+	UpdatedAt     time.Time `json:"updatedAt"`
 }

app/module/user_levels/service/user_levels.service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"github.com/rs/zerolog"
+	"go-humas-be/app/database/entity"
 	"go-humas-be/app/module/user_levels/mapper"
 	"go-humas-be/app/module/user_levels/repository"
 	"go-humas-be/app/module/user_levels/request"
@@ -19,7 +20,7 @@ type userLevelsService struct {
 type UserLevelsService interface {
 	All(req request.UserLevelsQueryRequest) (userLevels []*response.UserLevelsResponse, paging paginator.Pagination, err error)
 	Show(id uint) (userLevels *response.UserLevelsResponse, err error)
-	Save(req request.UserLevelsCreateRequest) (err error)
+	Save(req request.UserLevelsCreateRequest) (userLevels *entity.UserLevels, err error)
 	Update(id uint, req request.UserLevelsUpdateRequest) (err error)
 	Delete(id uint) error
 }
@@ -56,10 +57,15 @@ func (_i *userLevelsService) Show(id uint) (userLevels *response.UserLevelsRespo
 	return mapper.UserLevelsResponseMapper(result), nil
 }
 
-func (_i *userLevelsService) Save(req request.UserLevelsCreateRequest) (err error) {
+func (_i *userLevelsService) Save(req request.UserLevelsCreateRequest) (userLevels *entity.UserLevels, err error) {
 	_i.Log.Info().Interface("data", req).Msg("")
 
-	return _i.Repo.Create(req.ToEntity())
+	saveUserLevelsRes, err := _i.Repo.Create(req.ToEntity())
+	if err != nil {
+		return nil, err
+	}
+
+	return saveUserLevelsRes, nil
 }
 
 func (_i *userLevelsService) Update(id uint, req request.UserLevelsUpdateRequest) (err error) {

docs/swagger/docs.go

@@ -7478,8 +7478,7 @@ const docTemplate = `{
                 "aliasName",
                 "levelNumber",
                 "name",
-                "parentLevelId",
+                "parentLevelId"
-                "provinceId"
             ],
             "properties": {
                 "aliasName": {
@@ -7508,8 +7507,7 @@ const docTemplate = `{
                 "aliasName",
                 "levelNumber",
                 "name",
-                "parentLevelId",
+                "parentLevelId"
-                "provinceId"
             ],
             "properties": {
                 "aliasName": {

docs/swagger/swagger.json

@@ -7467,8 +7467,7 @@
                 "aliasName",
                 "levelNumber",
                 "name",
-                "parentLevelId",
+                "parentLevelId"
-                "provinceId"
             ],
             "properties": {
                 "aliasName": {
@@ -7497,8 +7496,7 @@
                 "aliasName",
                 "levelNumber",
                 "name",
-                "parentLevelId",
+                "parentLevelId"
-                "provinceId"
             ],
             "properties": {
                 "aliasName": {

docs/swagger/swagger.yaml

@@ -439,7 +439,6 @@ definitions:
     - levelNumber
     - name
     - parentLevelId
-    - provinceId
     type: object
   request.UserLevelsUpdateRequest:
     properties:
@@ -458,7 +457,6 @@ definitions:
     - levelNumber
     - name
     - parentLevelId
-    - provinceId
     type: object
   request.UserLogin:
     properties: