Feat(BE-36,37,38,39): master area, customer, kandang, location, warehouse

This commit is contained in:
Hafizh A. Y
2025-10-02 10:51:15 +07:00
parent dbc1f79a36
commit e8905be856
79 changed files with 3745 additions and 169 deletions
+8 -6
View File
@@ -3,7 +3,7 @@ package dto
import (
"time"
model "gitlab.com/mbugroup/lti-api.git/internal/modules/users/models"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
)
// === DTO Structs ===
@@ -27,14 +27,16 @@ type UserDetailDTO struct {
// === Mapper Functions ===
func ToUserBaseDTO(m model.User) UserBaseDTO {
func ToUserBaseDTO(m entity.User) UserBaseDTO {
return UserBaseDTO{
Id: m.Id,
Name: m.Name,
Id: m.Id,
IdUser: m.IdUser,
Email: m.Email,
Name: m.Name,
}
}
func ToUserListDTO(m model.User) UserListDTO {
func ToUserListDTO(m entity.User) UserListDTO {
return UserListDTO{
UserBaseDTO: ToUserBaseDTO(m),
CreatedAt: m.CreatedAt,
@@ -42,7 +44,7 @@ func ToUserListDTO(m model.User) UserListDTO {
}
}
func ToUserListDTOs(m []model.User) []UserListDTO {
func ToUserListDTOs(m []entity.User) []UserListDTO {
result := make([]UserListDTO, len(m))
for i, r := range m {
result[i] = ToUserListDTO(r)
@@ -1,17 +0,0 @@
package model
import (
"time"
"gorm.io/gorm"
)
type User struct {
Id uint `gorm:"primaryKey"`
IdUser int64 `gorm:"uniqueIndex"`
Email string `gorm:"uniqueIndex"`
Name string `gorm:"not null"`
CreatedAt time.Time
UpdatedAt time.Time
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
}
@@ -1,21 +1,21 @@
package repository
import (
model "gitlab.com/mbugroup/lti-api.git/internal/modules/users/models"
"gitlab.com/mbugroup/lti-api.git/internal/repository"
"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
"gorm.io/gorm"
)
type UserRepository interface {
repository.BaseRepository[model.User]
repository.BaseRepository[entity.User]
}
type UserRepositoryImpl struct {
*repository.BaseRepositoryImpl[model.User]
*repository.BaseRepositoryImpl[entity.User]
}
func NewUserRepository(db *gorm.DB) UserRepository {
return &UserRepositoryImpl{
BaseRepositoryImpl: repository.NewBaseRepository[model.User](db),
BaseRepositoryImpl: repository.NewBaseRepository[entity.User](db),
}
}
+15 -11
View File
@@ -3,7 +3,7 @@ package service
import (
"errors"
model "gitlab.com/mbugroup/lti-api.git/internal/modules/users/models"
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
repository "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
validation "gitlab.com/mbugroup/lti-api.git/internal/modules/users/validations"
"gitlab.com/mbugroup/lti-api.git/internal/utils"
@@ -15,10 +15,10 @@ import (
)
type UserService interface {
GetAll(ctx *fiber.Ctx, params *validation.Query) ([]model.User, int64, error)
GetOne(ctx *fiber.Ctx, id uint) (*model.User, error)
CreateOne(ctx *fiber.Ctx, req *validation.Create) (*model.User, error)
UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*model.User, error)
GetAll(ctx *fiber.Ctx, params *validation.Query) ([]entity.User, int64, error)
GetOne(ctx *fiber.Ctx, id uint) (*entity.User, error)
CreateOne(ctx *fiber.Ctx, req *validation.Create) (*entity.User, error)
UpdateOne(ctx *fiber.Ctx, req *validation.Update, id uint) (*entity.User, error)
DeleteOne(ctx *fiber.Ctx, id uint) error
}
@@ -35,7 +35,7 @@ func NewUserService(repo repository.UserRepository, validate *validator.Validate
Repository: repo,
}
}
func (s userService) GetAll(c *fiber.Ctx, params *validation.Query) ([]model.User, int64, error) {
func (s userService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.User, int64, error) {
if err := s.Validate.Struct(params); err != nil {
return nil, 0, err
}
@@ -56,7 +56,7 @@ func (s userService) GetAll(c *fiber.Ctx, params *validation.Query) ([]model.Use
return users, total, nil
}
func (s userService) GetOne(c *fiber.Ctx, id uint) (*model.User, error) {
func (s userService) GetOne(c *fiber.Ctx, id uint) (*entity.User, error) {
user, err := s.Repository.GetByID(c.Context(), id, nil)
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, fiber.NewError(fiber.StatusNotFound, "User not found")
@@ -68,13 +68,13 @@ func (s userService) GetOne(c *fiber.Ctx, id uint) (*model.User, error) {
return user, nil
}
func (s *userService) CreateOne(c *fiber.Ctx, req *validation.Create) (*model.User, error) {
func (s *userService) CreateOne(c *fiber.Ctx, req *validation.Create) (*entity.User, error) {
if err := s.Validate.Struct(req); err != nil {
return nil, err
}
createBody := &model.User{
Name: req.Name,
createBody := &entity.User{
Name: req.Name,
}
if err := s.Repository.CreateOne(c.Context(), createBody, nil); err != nil {
@@ -85,7 +85,7 @@ func (s *userService) CreateOne(c *fiber.Ctx, req *validation.Create) (*model.Us
return createBody, nil
}
func (s userService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*model.User, error) {
func (s userService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.User, error) {
if err := s.Validate.Struct(req); err != nil {
return nil, err
}
@@ -96,6 +96,10 @@ func (s userService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*
updateBody["name"] = *req.Name
}
if len(updateBody) == 0 {
return s.GetOne(c, id)
}
if err := s.Repository.PatchOne(c.Context(), id, updateBody, nil); err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, fiber.NewError(fiber.StatusNotFound, "User not found")