feat: enhance UOM service with audit trail and logging capabilities
This commit is contained in:
parent
0abdc2ae6f
commit
abb01c5eab
|
|
@ -3,6 +3,7 @@ package dto
|
||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
|
|
||||||
|
"github.com/Caknoooo/go-gin-clean-starter/database/entities"
|
||||||
pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
|
pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -55,3 +56,19 @@ type UomResponse struct {
|
||||||
IsActive bool `json:"is_active"`
|
IsActive bool `json:"is_active"`
|
||||||
Client pkgdto.ClientResponse `json:"client"`
|
Client pkgdto.ClientResponse `json:"client"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ToUomResponse(e entities.MUomEntity) UomResponse {
|
||||||
|
return UomResponse{
|
||||||
|
ID: e.ID.String(),
|
||||||
|
Name: e.Name,
|
||||||
|
Description: e.Description,
|
||||||
|
Symbol: e.Symbol,
|
||||||
|
Code: e.Code,
|
||||||
|
StdPrecision: e.StdPrecision,
|
||||||
|
IsActive: e.IsActive,
|
||||||
|
Client: pkgdto.ClientResponse{
|
||||||
|
ID: e.Client.ID.String(),
|
||||||
|
Name: e.Client.Name,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,11 @@ import (
|
||||||
dtodomain "github.com/Caknoooo/go-gin-clean-starter/modules/uom/dto"
|
dtodomain "github.com/Caknoooo/go-gin-clean-starter/modules/uom/dto"
|
||||||
"github.com/Caknoooo/go-gin-clean-starter/modules/uom/query"
|
"github.com/Caknoooo/go-gin-clean-starter/modules/uom/query"
|
||||||
"github.com/Caknoooo/go-gin-clean-starter/modules/uom/repository"
|
"github.com/Caknoooo/go-gin-clean-starter/modules/uom/repository"
|
||||||
|
"github.com/Caknoooo/go-gin-clean-starter/pkg/constants"
|
||||||
pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
|
pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
|
||||||
|
"github.com/Caknoooo/go-gin-clean-starter/pkg/utils"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -25,13 +28,15 @@ type uomService struct {
|
||||||
db *gorm.DB
|
db *gorm.DB
|
||||||
uomRepo repository.UomRepository
|
uomRepo repository.UomRepository
|
||||||
sequenceService sequenceservice.SequenceService
|
sequenceService sequenceservice.SequenceService
|
||||||
|
log *logrus.Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewUomService(uomRepo repository.UomRepository, sequenceService sequenceservice.SequenceService, db *gorm.DB) UomService {
|
func NewUomService(uomRepo repository.UomRepository, sequenceService sequenceservice.SequenceService, db *gorm.DB, log *logrus.Logger) UomService {
|
||||||
return &uomService{
|
return &uomService{
|
||||||
uomRepo: uomRepo,
|
uomRepo: uomRepo,
|
||||||
sequenceService: sequenceService,
|
sequenceService: sequenceService,
|
||||||
db: db,
|
db: db,
|
||||||
|
log: log,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -56,12 +61,13 @@ func (s *uomService) Create(ctx context.Context, req dtodomain.UomCreateRequest)
|
||||||
}
|
}
|
||||||
|
|
||||||
uom := entities.MUomEntity{
|
uom := entities.MUomEntity{
|
||||||
Name: req.Name,
|
Name: req.Name,
|
||||||
Description: req.Description,
|
Description: req.Description,
|
||||||
Symbol: req.Symbol,
|
Symbol: req.Symbol,
|
||||||
Code: code,
|
Code: code,
|
||||||
StdPrecision: req.StdPrecision,
|
StdPrecision: req.StdPrecision,
|
||||||
IsActive: req.IsActive,
|
IsActive: req.IsActive,
|
||||||
|
FullAuditTrail: utils.FillAuditTrail(ctx, constants.CREATE),
|
||||||
}
|
}
|
||||||
|
|
||||||
clientUUID, err := uuid.Parse(req.ClientID)
|
clientUUID, err := uuid.Parse(req.ClientID)
|
||||||
|
|
@ -81,7 +87,7 @@ func (s *uomService) Create(ctx context.Context, req dtodomain.UomCreateRequest)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return dtodomain.UomResponse{}, err
|
return dtodomain.UomResponse{}, err
|
||||||
}
|
}
|
||||||
return toUomResponse(result), nil
|
return dtodomain.ToUomResponse(result), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *uomService) GetById(ctx context.Context, uomId string) (dtodomain.UomResponse, error) {
|
func (s *uomService) GetById(ctx context.Context, uomId string) (dtodomain.UomResponse, error) {
|
||||||
|
|
@ -89,7 +95,7 @@ func (s *uomService) GetById(ctx context.Context, uomId string) (dtodomain.UomRe
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return dtodomain.UomResponse{}, err
|
return dtodomain.UomResponse{}, err
|
||||||
}
|
}
|
||||||
return toUomResponse(uom), nil
|
return dtodomain.ToUomResponse(uom), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *uomService) GetAll(ctx context.Context, filter query.UomFilter) ([]dtodomain.UomResponse, int64, error) {
|
func (s *uomService) GetAll(ctx context.Context, filter query.UomFilter) ([]dtodomain.UomResponse, int64, error) {
|
||||||
|
|
@ -99,7 +105,7 @@ func (s *uomService) GetAll(ctx context.Context, filter query.UomFilter) ([]dtod
|
||||||
}
|
}
|
||||||
var responses []dtodomain.UomResponse
|
var responses []dtodomain.UomResponse
|
||||||
for _, u := range uoms {
|
for _, u := range uoms {
|
||||||
responses = append(responses, toUomResponse(u))
|
responses = append(responses, dtodomain.ToUomResponse(u))
|
||||||
}
|
}
|
||||||
if responses == nil {
|
if responses == nil {
|
||||||
responses = make([]dtodomain.UomResponse, 0)
|
responses = make([]dtodomain.UomResponse, 0)
|
||||||
|
|
@ -119,6 +125,9 @@ func (s *uomService) Update(ctx context.Context, req dtodomain.UomUpdateRequest,
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
return dtodomain.UomResponse{}, err
|
return dtodomain.UomResponse{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
before := uom
|
||||||
|
|
||||||
uom.Name = req.Name
|
uom.Name = req.Name
|
||||||
uom.Description = req.Description
|
uom.Description = req.Description
|
||||||
uom.Symbol = req.Symbol
|
uom.Symbol = req.Symbol
|
||||||
|
|
@ -136,6 +145,7 @@ func (s *uomService) Update(ctx context.Context, req dtodomain.UomUpdateRequest,
|
||||||
} else {
|
} else {
|
||||||
uom.Client = entities.M_Client{}
|
uom.Client = entities.M_Client{}
|
||||||
}
|
}
|
||||||
|
uom.FullAuditTrail = utils.FillAuditTrail(ctx, constants.UPDATE)
|
||||||
updated, err := s.uomRepo.Update(ctx, tx, uom)
|
updated, err := s.uomRepo.Update(ctx, tx, uom)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
|
|
@ -144,11 +154,19 @@ func (s *uomService) Update(ctx context.Context, req dtodomain.UomUpdateRequest,
|
||||||
tx.Commit()
|
tx.Commit()
|
||||||
|
|
||||||
result, err := s.uomRepo.GetById(ctx, nil, updated.ID.String())
|
result, err := s.uomRepo.GetById(ctx, nil, updated.ID.String())
|
||||||
|
changes := utils.GetChangedFields(before, result)
|
||||||
|
s.log.WithFields(logrus.Fields{
|
||||||
|
"user_id": utils.GetUserID(ctx),
|
||||||
|
"action": "update",
|
||||||
|
"entity": "uom",
|
||||||
|
"entity_id": uomId,
|
||||||
|
"changes": changes, // berisi field yang berubah saja
|
||||||
|
}).Info("UOM updated")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return dtodomain.UomResponse{}, err
|
return dtodomain.UomResponse{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return toUomResponse(result), nil
|
return dtodomain.ToUomResponse(result), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *uomService) Delete(ctx context.Context, uomId string) error {
|
func (s *uomService) Delete(ctx context.Context, uomId string) error {
|
||||||
|
|
@ -158,26 +176,32 @@ func (s *uomService) Delete(ctx context.Context, uomId string) error {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
uom, err := s.uomRepo.GetById(ctx, tx, uomId)
|
||||||
|
if err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Isi audit trail DeletedBy
|
||||||
|
uom.FullAuditTrail = utils.FillAuditTrail(ctx, constants.DELETE)
|
||||||
|
|
||||||
|
// Update audit trail sebelum delete
|
||||||
|
if _, err := s.uomRepo.Update(ctx, tx, uom); err != nil {
|
||||||
|
tx.Rollback()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
if err := s.uomRepo.Delete(ctx, tx, uomId); err != nil {
|
if err := s.uomRepo.Delete(ctx, tx, uomId); err != nil {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
tx.Commit()
|
tx.Commit()
|
||||||
|
|
||||||
|
s.log.WithFields(logrus.Fields{
|
||||||
|
"user_id": utils.GetUserID(ctx),
|
||||||
|
"action": "delete",
|
||||||
|
"entity": "uom",
|
||||||
|
"entity_id": uomId,
|
||||||
|
}).Info("UOM deleted")
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func toUomResponse(e entities.MUomEntity) dtodomain.UomResponse {
|
|
||||||
return dtodomain.UomResponse{
|
|
||||||
ID: e.ID.String(),
|
|
||||||
Name: e.Name,
|
|
||||||
Description: e.Description,
|
|
||||||
Symbol: e.Symbol,
|
|
||||||
Code: e.Code,
|
|
||||||
StdPrecision: e.StdPrecision,
|
|
||||||
IsActive: e.IsActive,
|
|
||||||
Client: pkgdto.ClientResponse{
|
|
||||||
ID: e.Client.ID.String(),
|
|
||||||
Name: e.Client.Name,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -15,4 +15,8 @@ const (
|
||||||
LOGGER = "logger"
|
LOGGER = "logger"
|
||||||
SUPERADMIN = "superadmin"
|
SUPERADMIN = "superadmin"
|
||||||
COMPLETED = "completed"
|
COMPLETED = "completed"
|
||||||
|
USERID = "user_id"
|
||||||
|
CREATE = "create"
|
||||||
|
UPDATE = "update"
|
||||||
|
DELETE = "delete"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,14 @@
|
||||||
package utils
|
package utils
|
||||||
|
|
||||||
import "strings"
|
import (
|
||||||
|
"context"
|
||||||
|
"reflect"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/Caknoooo/go-gin-clean-starter/database/entities"
|
||||||
|
"github.com/Caknoooo/go-gin-clean-starter/pkg/constants"
|
||||||
|
"github.com/google/uuid"
|
||||||
|
)
|
||||||
|
|
||||||
func GetInitials(name string) string {
|
func GetInitials(name string) string {
|
||||||
name = strings.TrimSpace(name)
|
name = strings.TrimSpace(name)
|
||||||
|
|
@ -25,3 +33,49 @@ func GetInitials(name string) string {
|
||||||
}
|
}
|
||||||
return strings.ToUpper(initials)
|
return strings.ToUpper(initials)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func GetUserID(ctx context.Context) string {
|
||||||
|
val := ctx.Value(constants.USERID)
|
||||||
|
if id, ok := val.(string); ok {
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func FillAuditTrail(ctx context.Context, action string) entities.FullAuditTrail {
|
||||||
|
userID := GetUserID(ctx)
|
||||||
|
uid, _ := uuid.Parse(userID)
|
||||||
|
audit := entities.Audit{}
|
||||||
|
switch action {
|
||||||
|
case "create":
|
||||||
|
audit.CreatedBy = uid
|
||||||
|
case "update":
|
||||||
|
audit.UpdatedBy = uid
|
||||||
|
case "delete":
|
||||||
|
audit.DeletedBy = uid
|
||||||
|
}
|
||||||
|
return entities.FullAuditTrail{Audit: audit}
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetChangedFields(before, after interface{}) map[string]map[string]interface{} {
|
||||||
|
changes := make(map[string]map[string]interface{})
|
||||||
|
vBefore := reflect.ValueOf(before)
|
||||||
|
vAfter := reflect.ValueOf(after)
|
||||||
|
t := vBefore.Type()
|
||||||
|
|
||||||
|
for i := 0; i < vBefore.NumField(); i++ {
|
||||||
|
field := t.Field(i).Name
|
||||||
|
if field == "FullAuditTrail" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
valBefore := vBefore.Field(i).Interface()
|
||||||
|
valAfter := vAfter.Field(i).Interface()
|
||||||
|
if !reflect.DeepEqual(valBefore, valAfter) {
|
||||||
|
changes[field] = map[string]interface{}{
|
||||||
|
"old": valBefore,
|
||||||
|
"new": valAfter,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return changes
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -135,6 +135,7 @@ func RegisterDependencies(injector *do.Injector) {
|
||||||
// Initialize
|
// Initialize
|
||||||
db := do.MustInvokeNamed[*gorm.DB](injector, constants.DB)
|
db := do.MustInvokeNamed[*gorm.DB](injector, constants.DB)
|
||||||
jwtService := do.MustInvokeNamed[service.JWTService](injector, constants.JWTService)
|
jwtService := do.MustInvokeNamed[service.JWTService](injector, constants.JWTService)
|
||||||
|
log := do.MustInvokeNamed[*logrus.Logger](injector, constants.LOGGER)
|
||||||
|
|
||||||
// Repository
|
// Repository
|
||||||
userRepository := repository.NewUserRepository(db)
|
userRepository := repository.NewUserRepository(db)
|
||||||
|
|
@ -181,7 +182,7 @@ func RegisterDependencies(injector *do.Injector) {
|
||||||
clientServ := clientService.NewClientService(clientRepository, db)
|
clientServ := clientService.NewClientService(clientRepository, db)
|
||||||
permissionsServ := permissionsService.NewPermissionsService(permissionsRepository, db)
|
permissionsServ := permissionsService.NewPermissionsService(permissionsRepository, db)
|
||||||
categoryServ := categoryService.NewCategoryService(categoryRepository, db)
|
categoryServ := categoryService.NewCategoryService(categoryRepository, db)
|
||||||
uomServ := uomService.NewUomService(uomRepository, sequenceServ, db)
|
uomServ := uomService.NewUomService(uomRepository, sequenceServ, db, log)
|
||||||
mvendorServ := mvendorService.NewVendorService(mvendorRepository, sequenceServ, db)
|
mvendorServ := mvendorService.NewVendorService(mvendorRepository, sequenceServ, db)
|
||||||
warehouseServ := warehouseService.NewWarehouseService(warehouseRepository, db)
|
warehouseServ := warehouseService.NewWarehouseService(warehouseRepository, db)
|
||||||
zonaServ := zonaService.NewZonaService(zonaRepository, db)
|
zonaServ := zonaService.NewZonaService(zonaRepository, db)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue