feat: update user, user_role, ppid_datas, ppid_data_files, ppid_categories, etc

app/database/entity/ppid_datas.entity.go

@@ -6,8 +6,8 @@ type PpidDatas struct {
 	ID           uint       `json:"id" gorm:"primaryKey;type:int4;autoIncrement"`
 	Title        string     `json:"title" gorm:"type:varchar"`
 	Description  string     `json:"description" gorm:"type:varchar"`
-	CategoryId   int        `json:"category_id" gorm:"type:int4"`
+	CategoryId   uint       `json:"category_id" gorm:"type:int4"`
-	CreatedById  int        `json:"created_by_id" gorm:"type:int4"`
+	CreatedById  *uint      `json:"created_by_id" gorm:"type:int4"`
 	LevelGroupId *int       `json:"level_group_id" gorm:"type:int4"`
 	Group        *string    `json:"group" gorm:"type:varchar"`
 	StatusId     int        `json:"status_id" gorm:"type:int4"`

app/database/entity/users.entity.go

@@ -16,10 +16,10 @@ type Users struct {
 	DateOfBirth        string    `json:"date_of_birth" gorm:"type:varchar"`
 	LastEducation      string    `json:"last_education" gorm:"type:varchar"`
 	UserRoleId         int       `json:"user_role_id" gorm:"type:int4"`
-	UserLevelsId       int       `json:"user_levels_id" gorm:"type:int4"`
+	UserLevelId        int       `json:"user_level_id" gorm:"type:int4"`
 	KeycloakId         *string   `json:"keycloak_id" gorm:"type:varchar"`
 	StatusId           *int      `json:"status_id" gorm:"type:int4;default:1"`
-	CreatedById        *int      `json:"created_by_id" gorm:"type:int4"`
+	CreatedById        *uint     `json:"created_by_id" gorm:"type:int4"`
 	ProfilePicturePath *string   `json:"profile_picture_path" gorm:"type:varchar"`
 	IsActive           *bool     `json:"is_active" gorm:"type:bool;default:true"`
 	CreatedAt          time.Time `json:"created_at" gorm:"default:now()"`

app/module/ppid_datas/controller/ppid_datas.controller.go

@@ -106,6 +106,7 @@ func (_i *ppidDatasController) Show(c *fiber.Ctx) error {
 // @Description  API for create PpidDatas
 // @Tags         PPID Data
 // @Security     Bearer
+// @Param        Authorization header string true "Insert your access token" default(Bearer <Add access token here>)
 // @Param 	     payload body request.PpidDatasCreateRequest true "Required payload"
 // @Success      200  {object}  response.Response
 // @Failure      400  {object}  response.BadRequestError
@@ -118,7 +119,8 @@ func (_i *ppidDatasController) Save(c *fiber.Ctx) error {
 		return err
 	}
 
-	err := _i.ppidDatasService.Save(*req)
+	authToken := c.Get("Authorization")
+	err := _i.ppidDatasService.Save(*req, authToken)
 	if err != nil {
 		return err
 	}

app/module/ppid_datas/mapper/ppid_datas.mapper.go

@@ -1,24 +1,46 @@
 package mapper
 
 import (
+	"github.com/rs/zerolog"
 	"go-humas-be/app/database/entity"
+	ppidDataCategoriesRepository "go-humas-be/app/module/ppid_data_categories/repository"
 	res "go-humas-be/app/module/ppid_datas/response"
+	usersRepository "go-humas-be/app/module/users/repository"
+	"time"
 )
 
-func PpidDatasResponseMapper(ppidDatasReq *entity.PpidDatas) (ppidDatasRes *res.PpidDatasResponse) {
+func PpidDatasResponseMapper(log zerolog.Logger, ppidDataCategoriesRepo ppidDataCategoriesRepository.PpidDataCategoriesRepository, usersRepo usersRepository.UsersRepository, ppidDatasReq *entity.PpidDatas) (ppidDatasRes *res.PpidDatasResponse) {
 	if ppidDatasReq != nil {
+		findCategory, _ := ppidDataCategoriesRepo.FindOne(ppidDatasReq.CategoryId)
+		categoryName := ""
+		if findCategory != nil {
+			categoryName = findCategory.Title
+		}
+
+		findUser, _ := usersRepo.FindOne(*ppidDatasReq.CreatedById)
+		createdByName := ""
+		if findUser != nil {
+			createdByName = findUser.Fullname
+		}
+
+		log.Info().Str("timestamp", time.Now().
+			Format(time.RFC3339)).Str("Service:PpidDatasResponseMapper", "UserInfo:PpidData").
+			Interface("payload", findCategory).Msg("")
+
 		ppidDatasRes = &res.PpidDatasResponse{
-			ID:    ppidDatasReq.ID,
+			ID:            ppidDatasReq.ID,
-			Title:    ppidDatasReq.Title,
+			Title:         ppidDatasReq.Title,
-			Description:    ppidDatasReq.Description,
+			Description:   ppidDatasReq.Description,
 			CategoryId:    ppidDatasReq.CategoryId,
-			CreatedById:    ppidDatasReq.CreatedById,
+			CategoryName:  &categoryName,
-			StatusId:    ppidDatasReq.StatusId,
+			CreatedById:   ppidDatasReq.CreatedById,
-			IsPublish:    ppidDatasReq.IsPublish,
+			CreatedByName: &createdByName,
-			PublishedAt:    ppidDatasReq.PublishedAt,
+			StatusId:      ppidDatasReq.StatusId,
-			IsActive:    ppidDatasReq.IsActive,
+			IsPublish:     ppidDatasReq.IsPublish,
-			CreatedAt:    ppidDatasReq.CreatedAt,
+			PublishedAt:   ppidDatasReq.PublishedAt,
-			UpdatedAt:    ppidDatasReq.UpdatedAt,
+			IsActive:      ppidDatasReq.IsActive,
+			CreatedAt:     ppidDatasReq.CreatedAt,
+			UpdatedAt:     ppidDatasReq.UpdatedAt,
 		}
 	}
 	return ppidDatasRes

app/module/ppid_datas/request/ppid_datas.request.go

@@ -26,9 +26,9 @@ type PpidDatasQueryRequest struct {
 type PpidDatasCreateRequest struct {
 	Title        string  `json:"title" validate:"required"`
 	Description  string  `json:"description" validate:"required"`
-	CategoryId   int     `json:"categoryId" validate:"required"`
+	CategoryId   uint    `json:"categoryId" validate:"required"`
-	CreatedById  int     `json:"createdById" validate:"required"`
 	StatusId     int     `json:"statusId" validate:"required"`
+	CreatedById  *uint   `json:"createdById"`
 	LevelGroupId *int    `json:"levelGroupId"`
 	Group        *string `json:"group"`
 }
@@ -49,9 +49,9 @@ type PpidDatasUpdateRequest struct {
 	ID           uint       `json:"id" validate:"required"`
 	Title        string     `json:"title" validate:"required"`
 	Description  string     `json:"description" validate:"required"`
-	CategoryId   int        `json:"category_id" validate:"required"`
+	CategoryId   uint       `json:"category_id" validate:"required"`
-	CreatedById  int        `json:"created_by_id" validate:"required"`
 	StatusId     int        `json:"status_id" validate:"required"`
+	CreatedById  *uint      `json:"created_by_id"`
 	IsPublish    *bool      `json:"is_publish"`
 	PublishedAt  *time.Time `json:"published_at"`
 	LevelGroupId *int       `json:"levelGroupId"`

app/module/ppid_datas/response/ppid_datas.response.go

@@ -3,15 +3,18 @@ package response
 import "time"
 
 type PpidDatasResponse struct {
-	ID  uint    `json:"id"`
+	ID            uint       `json:"id"`
-	Title  string    `json:"title"`
+	Title         string     `json:"title"`
-	Description  string    `json:"description"`
+	Description   string     `json:"description"`
-	CategoryId  int    `json:"category_id"`
+	CategoryId    uint       `json:"categoryId"`
-	CreatedById  int    `json:"created_by_id"`
+	CategoryName  *string    `json:"categoryName"`
-	StatusId  int    `json:"status_id"`
+	CreatedById   *uint      `json:"createdById"`
-	IsPublish  bool    `json:"is_publish"`
+	CreatedByName *string    `json:"createdByName"`
-	PublishedAt  time.Time    `json:"published_at"`
+	StatusId      int        `json:"statusId"`
-	IsActive  bool    `json:"is_active"`
+	StatusName    int        `json:"statusName"`
-	CreatedAt  time.Time    `json:"created_at"`
+	IsPublish     *bool      `json:"isPublish"`
-	UpdatedAt  time.Time    `json:"updated_at"`
+	PublishedAt   *time.Time `json:"publishedAt"`
+	IsActive      *bool      `json:"isActive"`
+	CreatedAt     time.Time  `json:"createdAt"`
+	UpdatedAt     time.Time  `json:"updatedAt"`
 }

app/module/ppid_datas/service/ppid_datas.service.go

@@ -2,34 +2,44 @@ package service
 
 import (
 	"github.com/rs/zerolog"
+	ppidDataCategoriesRepository "go-humas-be/app/module/ppid_data_categories/repository"
 	"go-humas-be/app/module/ppid_datas/mapper"
 	"go-humas-be/app/module/ppid_datas/repository"
 	"go-humas-be/app/module/ppid_datas/request"
 	"go-humas-be/app/module/ppid_datas/response"
+	userLevelsRepository "go-humas-be/app/module/user_levels/repository"
+	usersRepository "go-humas-be/app/module/users/repository"
 	"go-humas-be/utils/paginator"
+	utilSvc "go-humas-be/utils/service"
 )
 
 // PpidDatasService
 type ppidDatasService struct {
-	Repo repository.PpidDatasRepository
+	Repo                   repository.PpidDatasRepository
-	Log  zerolog.Logger
+	PpidDataCategoriesRepo ppidDataCategoriesRepository.PpidDataCategoriesRepository
+	UsersRepo              usersRepository.UsersRepository
+	UserLevelsRepo         userLevelsRepository.UserLevelsRepository
+	Log                    zerolog.Logger
 }
 
 // PpidDatasService define interface of IPpidDatasService
 type PpidDatasService interface {
 	All(req request.PpidDatasQueryRequest) (ppidDatas []*response.PpidDatasResponse, paging paginator.Pagination, err error)
 	Show(id uint) (ppidDatas *response.PpidDatasResponse, err error)
-	Save(req request.PpidDatasCreateRequest) (err error)
+	Save(req request.PpidDatasCreateRequest, authToken string) (err error)
 	Update(id uint, req request.PpidDatasUpdateRequest) (err error)
 	Delete(id uint) error
 }
 
 // NewPpidDatasService init PpidDatasService
-func NewPpidDatasService(repo repository.PpidDatasRepository, log zerolog.Logger) PpidDatasService {
+func NewPpidDatasService(repo repository.PpidDatasRepository, ppidCategoriesRepository ppidDataCategoriesRepository.PpidDataCategoriesRepository, usersRepo usersRepository.UsersRepository, userLevelsRepo userLevelsRepository.UserLevelsRepository, log zerolog.Logger) PpidDatasService {
 
 	return &ppidDatasService{
-		Repo: repo,
+		Repo:                   repo,
-		Log:  log,
+		PpidDataCategoriesRepo: ppidCategoriesRepository,
+		UsersRepo:              usersRepo,
+		UserLevelsRepo:         userLevelsRepo,
+		Log:                    log,
 	}
 }
 
@@ -41,7 +51,7 @@ func (_i *ppidDatasService) All(req request.PpidDatasQueryRequest) (ppidDatass [
 	}
 
 	for _, result := range results {
-		ppidDatass = append(ppidDatass, mapper.PpidDatasResponseMapper(result))
+		ppidDatass = append(ppidDatass, mapper.PpidDatasResponseMapper(_i.Log, _i.PpidDataCategoriesRepo, _i.UsersRepo, result))
 	}
 
 	return
@@ -53,13 +63,24 @@ func (_i *ppidDatasService) Show(id uint) (ppidDatas *response.PpidDatasResponse
 		return nil, err
 	}
 
-	return mapper.PpidDatasResponseMapper(result), nil
+	return mapper.PpidDatasResponseMapper(_i.Log, _i.PpidDataCategoriesRepo, _i.UsersRepo, result), nil
 }
 
-func (_i *ppidDatasService) Save(req request.PpidDatasCreateRequest) (err error) {
+func (_i *ppidDatasService) Save(req request.PpidDatasCreateRequest, authToken string) (err error) {
 	_i.Log.Info().Interface("data", req).Msg("")
+	newReq := req.ToEntity()
 
-	return _i.Repo.Create(req.ToEntity())
+	createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, authToken)
+	newReq.CreatedById = &createdBy.ID
+	newReq.LevelGroupId = &createdBy.UserLevelId
+
+	userLevels, err := _i.UserLevelsRepo.FindOne(uint(createdBy.UserLevelId))
+	if err != nil {
+		return err
+	}
+	newReq.Group = userLevels.Group
+
+	return _i.Repo.Create(newReq)
 }
 
 func (_i *ppidDatasService) Update(id uint, req request.PpidDatasUpdateRequest) (err error) {

app/module/user_roles/controller/user_roles.controller.go

@@ -119,9 +119,9 @@ func (_i *userRolesController) Save(c *fiber.Ctx) error {
 		return err
 	}
 
-	authorizationHeader := c.Get("Authorization")
+	authToken := c.Get("Authorization")
 
-	err := _i.userRolesService.Save(*req, authorizationHeader)
+	err := _i.userRolesService.Save(*req, authToken)
 	if err != nil {
 		return err
 	}

app/module/user_roles/service/user_roles.service.go

@@ -22,7 +22,7 @@ type userRolesService struct {
 type UserRolesService interface {
 	All(req request.UserRolesQueryRequest) (userRoles []*response.UserRolesResponse, paging paginator.Pagination, err error)
 	Show(id uint) (userRoles *response.UserRolesResponse, err error)
-	Save(req request.UserRolesCreateRequest, header string) (err error)
+	Save(req request.UserRolesCreateRequest, authToken string) (err error)
 	Update(id uint, req request.UserRolesUpdateRequest) (err error)
 	Delete(id uint) error
 }
@@ -61,11 +61,11 @@ func (_i *userRolesService) Show(id uint) (userRoles *response.UserRolesResponse
 	return mapper.UserRolesResponseMapper(result), nil
 }
 
-func (_i *userRolesService) Save(req request.UserRolesCreateRequest, header string) (err error) {
+func (_i *userRolesService) Save(req request.UserRolesCreateRequest, authToken string) (err error) {
 	_i.Log.Info().Interface("data", req).Msg("")
 	newReq := req.ToEntity()
 
-	createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, header)
+	createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, authToken)
 	newReq.CreatedById = &createdBy.ID
 
 	return _i.Repo.Create(newReq)

app/module/users/controller/users.controller.go

@@ -107,6 +107,7 @@ func (_i *usersController) Show(c *fiber.Ctx) error {
 // @Description  API for create Users
 // @Tags         Users
 // @Security     Bearer
+// @Param        Authorization header string true "Insert your access token" default(Bearer <Add access token here>)
 // @Param 	     payload body request.UsersCreateRequest true "Required payload"
 // @Success      200  {object}  response.Response
 // @Failure      400  {object}  response.BadRequestError
@@ -119,7 +120,9 @@ func (_i *usersController) Save(c *fiber.Ctx) error {
 		return err
 	}
 
-	err := _i.usersService.Save(*req)
+	authToken := c.Get("Authorization")
+
+	err := _i.usersService.Save(*req, authToken)
 	if err != nil {
 		return err
 	}

app/module/users/mapper/users.mapper.go

@@ -8,27 +8,27 @@ import (
 func UsersResponseMapper(usersReq *entity.Users) (usersRes *res.UsersResponse) {
 	if usersReq != nil {
 		usersRes = &res.UsersResponse{
-			ID:    usersReq.ID,
+			ID:                 usersReq.ID,
-			Username:    usersReq.Username,
+			Username:           usersReq.Username,
-			Email:    usersReq.Email,
+			Email:              usersReq.Email,
-			Fullname:    usersReq.Fullname,
+			Fullname:           usersReq.Fullname,
-			Address:    usersReq.Address,
+			Address:            usersReq.Address,
-			PhoneNumber:    usersReq.PhoneNumber,
+			PhoneNumber:        usersReq.PhoneNumber,
-			WorkType:    usersReq.WorkType,
+			WorkType:           usersReq.WorkType,
-			GenderType:    usersReq.GenderType,
+			GenderType:         usersReq.GenderType,
-			IdentityType:    usersReq.IdentityType,
+			IdentityType:       usersReq.IdentityType,
-			IdentityNumber:    usersReq.IdentityNumber,
+			IdentityNumber:     usersReq.IdentityNumber,
-			DateOfBirth:    usersReq.DateOfBirth,
+			DateOfBirth:        usersReq.DateOfBirth,
-			LastEducation:    usersReq.LastEducation,
+			LastEducation:      usersReq.LastEducation,
-			KeycloakId:    usersReq.KeycloakId,
+			KeycloakId:         usersReq.KeycloakId,
-			UserRoleId:    usersReq.UserRoleId,
+			UserRoleId:         usersReq.UserRoleId,
-			StatusId:    usersReq.StatusId,
+			StatusId:           usersReq.StatusId,
-			UserLevelsId:    usersReq.UserLevelsId,
+			UserLevelId:        usersReq.UserLevelId,
-			CreatedById:    usersReq.CreatedById,
+			CreatedById:        usersReq.CreatedById,
-			ProfilePicturePath:    usersReq.ProfilePicturePath,
+			ProfilePicturePath: usersReq.ProfilePicturePath,
-			IsActive:    usersReq.IsActive,
+			IsActive:           usersReq.IsActive,
-			CreatedAt:    usersReq.CreatedAt,
+			CreatedAt:          usersReq.CreatedAt,
-			UpdatedAt:    usersReq.UpdatedAt,
+			UpdatedAt:          usersReq.UpdatedAt,
 		}
 	}
 	return usersRes

app/module/users/request/users.request.go

@@ -35,7 +35,7 @@ type UsersCreateRequest struct {
 	DateOfBirth    string `json:"dateOfBirth" validate:"required"`
 	LastEducation  string `json:"lastEducation" validate:"required"`
 	UserRoleId     int    `json:"userRoleId" validate:"required"`
-	UserLevelsId   int    `json:"userLevelsId" validate:"required"`
+	UserLevelId    int    `json:"userLevelId" validate:"required"`
 }
 
 func (req UsersCreateRequest) ToEntity() *entity.Users {
@@ -52,7 +52,7 @@ func (req UsersCreateRequest) ToEntity() *entity.Users {
 		DateOfBirth:    req.DateOfBirth,
 		LastEducation:  req.LastEducation,
 		UserRoleId:     req.UserRoleId,
-		UserLevelsId:   req.UserLevelsId,
+		UserLevelId:    req.UserLevelId,
 	}
 }
 
@@ -69,8 +69,8 @@ type UsersUpdateRequest struct {
 	DateOfBirth    string `json:"dateOfBirth" validate:"required"`
 	LastEducation  string `json:"lastEducation" validate:"required"`
 	UserRoleId     int    `json:"userRoleId" validate:"required"`
-	UserLevelsId   int    `json:"userLevelsId" validate:"required"`
+	UserLevelId    int    `json:"userLevelId" validate:"required"`
-	StatusId       *int   `json:"status_id"`
+	StatusId       *int   `json:"statusId"`
 }
 
 func (req UsersUpdateRequest) ToEntity() *entity.Users {
@@ -88,7 +88,7 @@ func (req UsersUpdateRequest) ToEntity() *entity.Users {
 		LastEducation:  req.LastEducation,
 		UserRoleId:     req.UserRoleId,
 		StatusId:       req.StatusId,
-		UserLevelsId:   req.UserLevelsId,
+		UserLevelId:    req.UserLevelId,
 		UpdatedAt:      time.Now(),
 	}
 }

app/module/users/response/users.response.go

@@ -8,20 +8,20 @@ type UsersResponse struct {
 	Email              string    `json:"email"`
 	Fullname           string    `json:"fullname"`
 	Address            string    `json:"address"`
-	PhoneNumber        string    `json:"phone_number"`
+	PhoneNumber        string    `json:"phoneNumber"`
-	WorkType           string    `json:"work_type"`
+	WorkType           string    `json:"workType"`
-	GenderType         string    `json:"gender_type"`
+	GenderType         string    `json:"genderType"`
-	IdentityType       string    `json:"identity_type"`
+	IdentityType       string    `json:"identityType"`
-	IdentityNumber     string    `json:"identity_number"`
+	IdentityNumber     string    `json:"identityNumber"`
-	DateOfBirth        string    `json:"date_of_birth"`
+	DateOfBirth        string    `json:"dateOfBirth"`
-	LastEducation      string    `json:"last_education"`
+	LastEducation      string    `json:"lastEducation"`
-	KeycloakId         *string   `json:"keycloak_id"`
+	KeycloakId         *string   `json:"keycloakId"`
-	UserRoleId         int       `json:"user_role_id"`
+	UserRoleId         int       `json:"userRoleId"`
 	StatusId           *int      `json:"status_id"`
-	UserLevelsId       int       `json:"user_levels_id"`
+	UserLevelId        int       `json:"userLevelId"`
-	CreatedById        *int      `json:"created_by_id"`
+	CreatedById        *uint     `json:"createdById"`
-	ProfilePicturePath *string   `json:"profile_picture_path"`
+	ProfilePicturePath *string   `json:"profilePicturePath"`
-	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/users/service/users.service.go

@@ -7,6 +7,7 @@ import (
 	"go-humas-be/app/module/users/request"
 	"go-humas-be/app/module/users/response"
 	"go-humas-be/utils/paginator"
+	utilSvc "go-humas-be/utils/service"
 )
 
 // UsersService
@@ -19,7 +20,7 @@ type usersService struct {
 type UsersService interface {
 	All(req request.UsersQueryRequest) (users []*response.UsersResponse, paging paginator.Pagination, err error)
 	Show(id uint) (users *response.UsersResponse, err error)
-	Save(req request.UsersCreateRequest) (err error)
+	Save(req request.UsersCreateRequest, authToken string) (err error)
 	Update(id uint, req request.UsersUpdateRequest) (err error)
 	Delete(id uint) error
 }
@@ -56,10 +57,14 @@ func (_i *usersService) Show(id uint) (users *response.UsersResponse, err error)
 	return mapper.UsersResponseMapper(result), nil
 }
 
-func (_i *usersService) Save(req request.UsersCreateRequest) (err error) {
+func (_i *usersService) Save(req request.UsersCreateRequest, authToken string) (err error) {
 	_i.Log.Info().Interface("data", req).Msg("")
+	newReq := req.ToEntity()
 
-	return _i.Repo.Create(req.ToEntity())
+	createdBy := utilSvc.GetUserInfo(_i.Log, _i.Repo, authToken)
+	newReq.CreatedById = &createdBy.ID
+
+	return _i.Repo.Create(newReq)
 }
 
 func (_i *usersService) Update(id uint, req request.UsersUpdateRequest) (err error) {

app/router/api.go

@@ -15,6 +15,7 @@ import (
 	"go-humas-be/app/module/master_modules"
 	"go-humas-be/app/module/ppid_data_categories"
 	"go-humas-be/app/module/ppid_data_files"
+	"go-humas-be/app/module/ppid_datas"
 	"go-humas-be/app/module/provinces"
 	"go-humas-be/app/module/user_levels"
 	"go-humas-be/app/module/user_role_accesses"
@@ -40,6 +41,7 @@ type Router struct {
 	MasterModulesRouter          *master_modules.MasterModulesRouter
 	PpidDataCategoriesRouter     *ppid_data_categories.PpidDataCategoriesRouter
 	PpidDataFilesRouter          *ppid_data_files.PpidDataFilesRouter
+	PpidDatas                    *ppid_datas.PpidDatasRouter
 	ProvincesRouter              *provinces.ProvincesRouter
 	UserLevelsRouter             *user_levels.UserLevelsRouter
 	UserRoleAccessesRouter       *user_role_accesses.UserRoleAccessesRouter
@@ -63,6 +65,7 @@ func NewRouter(
 	masterModuleRouter *master_modules.MasterModulesRouter,
 	ppidDataCategoriesRouter *ppid_data_categories.PpidDataCategoriesRouter,
 	ppidDataFilesRouter *ppid_data_files.PpidDataFilesRouter,
+	ppidDatas *ppid_datas.PpidDatasRouter,
 	provincesRouter *provinces.ProvincesRouter,
 	userLevelsRouter *user_levels.UserLevelsRouter,
 	userRoleAccessesRouter *user_role_accesses.UserRoleAccessesRouter,
@@ -84,6 +87,7 @@ func NewRouter(
 		MasterModulesRouter:          masterModuleRouter,
 		PpidDataCategoriesRouter:     ppidDataCategoriesRouter,
 		PpidDataFilesRouter:          ppidDataFilesRouter,
+		PpidDatas:                    ppidDatas,
 		ProvincesRouter:              provincesRouter,
 		UserLevelsRouter:             userLevelsRouter,
 		UserRoleAccessesRouter:       userRoleAccessesRouter,
@@ -115,6 +119,7 @@ func (r *Router) Register() {
 	r.MasterModulesRouter.RegisterMasterModulesRoutes()
 	r.PpidDataCategoriesRouter.RegisterPpidDataCategoriesRoutes()
 	r.PpidDataFilesRouter.RegisterPpidDataFilesRoutes()
+	r.PpidDatas.RegisterPpidDatasRoutes()
 	r.ProvincesRouter.RegisterProvincesRoutes()
 	r.UserLevelsRouter.RegisterUserLevelsRoutes()
 	r.UserRoleAccessesRouter.RegisterUserRoleAccessesRoutes()

docs/swagger/docs.go

@@ -3859,6 +3859,14 @@ const docTemplate = `{
                 ],
                 "summary": "Create PpidDatas",
                 "parameters": [
+                    {
+                        "type": "string",
+                        "default": "Bearer \u003cAdd access token here\u003e",
+                        "description": "Insert your access token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    },
                     {
                         "description": "Required payload",
                         "name": "payload",
@@ -5314,6 +5322,14 @@ const docTemplate = `{
                 ],
                 "summary": "Create Users",
                 "parameters": [
+                    {
+                        "type": "string",
+                        "default": "Bearer \u003cAdd access token here\u003e",
+                        "description": "Insert your access token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    },
                     {
                         "description": "Required payload",
                         "name": "payload",
@@ -5905,7 +5921,6 @@ const docTemplate = `{
             "type": "object",
             "required": [
                 "categoryId",
-                "createdById",
                 "description",
                 "statusId",
                 "title"
@@ -6139,7 +6154,7 @@ const docTemplate = `{
                 "identityType",
                 "lastEducation",
                 "phoneNumber",
-                "userLevelsId",
+                "userLevelId",
                 "userRoleId",
                 "username",
                 "workType"
@@ -6172,7 +6187,7 @@ const docTemplate = `{
                 "phoneNumber": {
                     "type": "string"
                 },
-                "userLevelsId": {
+                "userLevelId": {
                     "type": "integer"
                 },
                 "userRoleId": {
@@ -6198,7 +6213,7 @@ const docTemplate = `{
                 "identityType",
                 "lastEducation",
                 "phoneNumber",
-                "userLevelsId",
+                "userLevelId",
                 "userRoleId",
                 "username",
                 "workType"
@@ -6231,10 +6246,10 @@ const docTemplate = `{
                 "phoneNumber": {
                     "type": "string"
                 },
-                "status_id": {
+                "statusId": {
                     "type": "integer"
                 },
-                "userLevelsId": {
+                "userLevelId": {
                     "type": "integer"
                 },
                 "userRoleId": {

docs/swagger/swagger.json

@@ -3848,6 +3848,14 @@
                 ],
                 "summary": "Create PpidDatas",
                 "parameters": [
+                    {
+                        "type": "string",
+                        "default": "Bearer \u003cAdd access token here\u003e",
+                        "description": "Insert your access token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    },
                     {
                         "description": "Required payload",
                         "name": "payload",
@@ -5303,6 +5311,14 @@
                 ],
                 "summary": "Create Users",
                 "parameters": [
+                    {
+                        "type": "string",
+                        "default": "Bearer \u003cAdd access token here\u003e",
+                        "description": "Insert your access token",
+                        "name": "Authorization",
+                        "in": "header",
+                        "required": true
+                    },
                     {
                         "description": "Required payload",
                         "name": "payload",
@@ -5894,7 +5910,6 @@
             "type": "object",
             "required": [
                 "categoryId",
-                "createdById",
                 "description",
                 "statusId",
                 "title"
@@ -6128,7 +6143,7 @@
                 "identityType",
                 "lastEducation",
                 "phoneNumber",
-                "userLevelsId",
+                "userLevelId",
                 "userRoleId",
                 "username",
                 "workType"
@@ -6161,7 +6176,7 @@
                 "phoneNumber": {
                     "type": "string"
                 },
-                "userLevelsId": {
+                "userLevelId": {
                     "type": "integer"
                 },
                 "userRoleId": {
@@ -6187,7 +6202,7 @@
                 "identityType",
                 "lastEducation",
                 "phoneNumber",
-                "userLevelsId",
+                "userLevelId",
                 "userRoleId",
                 "username",
                 "workType"
@@ -6220,10 +6235,10 @@
                 "phoneNumber": {
                     "type": "string"
                 },
-                "status_id": {
+                "statusId": {
                     "type": "integer"
                 },
-                "userLevelsId": {
+                "userLevelId": {
                     "type": "integer"
                 },
                 "userRoleId": {

docs/swagger/swagger.yaml

@@ -293,7 +293,6 @@ definitions:
         type: string
     required:
     - categoryId
-    - createdById
     - description
     - statusId
     - title
@@ -455,7 +454,7 @@ definitions:
         type: string
       phoneNumber:
         type: string
-      userLevelsId:
+      userLevelId:
         type: integer
       userRoleId:
         type: integer
@@ -473,7 +472,7 @@ definitions:
     - identityType
     - lastEducation
     - phoneNumber
-    - userLevelsId
+    - userLevelId
     - userRoleId
     - username
     - workType
@@ -498,9 +497,9 @@ definitions:
         type: string
       phoneNumber:
         type: string
-      status_id:
+      statusId:
         type: integer
-      userLevelsId:
+      userLevelId:
         type: integer
       userRoleId:
         type: integer
@@ -518,7 +517,7 @@ definitions:
     - identityType
     - lastEducation
     - phoneNumber
-    - userLevelsId
+    - userLevelId
     - userRoleId
     - username
     - workType
@@ -3003,6 +3002,12 @@ paths:
     post:
       description: API for create PpidDatas
       parameters:
+      - default: Bearer <Add access token here>
+        description: Insert your access token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: Required payload
         in: body
         name: payload
@@ -3921,6 +3926,12 @@ paths:
     post:
       description: API for create Users
       parameters:
+      - default: Bearer <Add access token here>
+        description: Insert your access token
+        in: header
+        name: Authorization
+        required: true
+        type: string
       - description: Required payload
         in: body
         name: payload

main.go

@@ -16,6 +16,7 @@ import (
 	"go-humas-be/app/module/master_modules"
 	"go-humas-be/app/module/ppid_data_categories"
 	"go-humas-be/app/module/ppid_data_files"
+	"go-humas-be/app/module/ppid_datas"
 	"go-humas-be/app/module/provinces"
 	"go-humas-be/app/module/user_levels"
 	"go-humas-be/app/module/user_role_accesses"
@@ -60,6 +61,7 @@ func main() {
 		master_modules.NewMasterModulesModule,
 		ppid_data_files.NewPpidDataFilesModule,
 		ppid_data_categories.NewPpidDataCategoriesModule,
+		ppid_datas.NewPpidDatasModule,
 		provinces.NewProvincesModule,
 		user_levels.NewUserLevelsModule,
 		user_roles.NewUserRolesModule,