feat: integrate InventoryRequestService into InventoryIssueService and update related methods
Deploy Application / deploy (push) Successful in 19s Details

This commit is contained in:
Habib Fatkhul Rohman 2025-12-09 13:55:17 +07:00
parent 1fe55d516e
commit 3d9ad4cff1
4 changed files with 54 additions and 29 deletions

View File

@ -7,6 +7,7 @@ import (
dtodomain "github.com/Caknoooo/go-gin-clean-starter/modules/inventory_issue/dto"
"github.com/Caknoooo/go-gin-clean-starter/modules/inventory_issue/query"
"github.com/Caknoooo/go-gin-clean-starter/modules/inventory_issue/repository"
invrequestservice "github.com/Caknoooo/go-gin-clean-starter/modules/inventory_request/service"
sequenceservice "github.com/Caknoooo/go-gin-clean-starter/modules/sequence/service"
"github.com/Caknoooo/go-gin-clean-starter/pkg/constants"
pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
@ -30,11 +31,12 @@ type InventoryIssueService interface {
}
type inventoryIssueService struct {
db *gorm.DB
issueRepo repository.InventoryIssueRepository
issueLineRepo repository.InventoryIssueLineRepository
sequenceService sequenceservice.SequenceService
log *logrus.Logger
db *gorm.DB
issueRepo repository.InventoryIssueRepository
issueLineRepo repository.InventoryIssueLineRepository
invRequestService invrequestservice.InventoryRequestService
sequenceService sequenceservice.SequenceService
log *logrus.Logger
}
// GetLineById implements InventoryIssueService.
@ -87,8 +89,8 @@ func (s *inventoryIssueService) GetLinesByIssueId(ctx context.Context, issueId s
return dtodomain.ToInventoryIssueLineResponses(lines), nil
}
func NewInventoryIssueService(db *gorm.DB, issueRepo repository.InventoryIssueRepository, issueLineRepo repository.InventoryIssueLineRepository, sequenceService sequenceservice.SequenceService, log *logrus.Logger) InventoryIssueService {
return &inventoryIssueService{db: db, issueRepo: issueRepo, issueLineRepo: issueLineRepo, sequenceService: sequenceService, log: log}
func NewInventoryIssueService(db *gorm.DB, issueRepo repository.InventoryIssueRepository, issueLineRepo repository.InventoryIssueLineRepository, invRequestService invrequestservice.InventoryRequestService, sequenceService sequenceservice.SequenceService, log *logrus.Logger) InventoryIssueService {
return &inventoryIssueService{db: db, issueRepo: issueRepo, issueLineRepo: issueLineRepo, invRequestService: invRequestService, sequenceService: sequenceService, log: log}
}
func (s *inventoryIssueService) Create(ctx context.Context, req dtodomain.InventoryIssueCreateRequest) (dtodomain.InventoryIssueResponse, error) {
@ -122,6 +124,14 @@ func (s *inventoryIssueService) Create(ctx context.Context, req dtodomain.Invent
tx.Rollback()
return dtodomain.InventoryIssueResponse{}, err
}
// get inventory request line by InvRequestID
invRequestLinesResponse, err := s.invRequestService.GetLinesByRequestId(ctx, invRequestUUID.String())
if err != nil {
tx.Rollback()
return dtodomain.InventoryIssueResponse{}, err
}
issue := entities.TInventoryIssueEntity{
DocumentNumber: docNum,
DocumentType: req.DocumentType,
@ -138,18 +148,24 @@ func (s *inventoryIssueService) Create(ctx context.Context, req dtodomain.Invent
tx.Rollback()
return dtodomain.InventoryIssueResponse{}, err
}
// Bulk create lines
// Bulk create lines from inv request lines InvRequestID
var lines []entities.TInventoryIssueLineEntity
for _, lineReq := range req.IssueLines {
productUUID, err := uuid.Parse(lineReq.ProductID)
if err != nil && lineReq.ProductID != "" {
for _, lineReq := range invRequestLinesResponse {
productUUID, err := uuid.Parse(lineReq.Product.ID)
if err != nil && lineReq.Product.ID != "" {
tx.Rollback()
return dtodomain.InventoryIssueResponse{}, err
}
warehouseUUID, err := uuid.Parse(lineReq.WarehouseID)
if err != nil && lineReq.WarehouseID != "" {
tx.Rollback()
return dtodomain.InventoryIssueResponse{}, err
warehouseID := utils.GetWarehouseID(ctx)
var warehouseUUID uuid.UUID
if warehouseID == "" {
warehouseUUID = uuid.Nil
} else {
warehouseUUID, err = uuid.Parse(warehouseID)
if err != nil {
tx.Rollback()
return dtodomain.InventoryIssueResponse{}, err
}
}
clientLineUUID, err := uuid.Parse(lineReq.ClientID)
if err != nil {
@ -158,10 +174,10 @@ func (s *inventoryIssueService) Create(ctx context.Context, req dtodomain.Invent
}
lines = append(lines, entities.TInventoryIssueLineEntity{
CurrentStock: lineReq.CurrentStock,
MinStock: lineReq.MinStock,
RequestQuantity: lineReq.RequestQuantity,
IssuedQuantity: lineReq.IssuedQuantity,
Remarks: lineReq.Remarks,
MinStock: 0,
RequestQuantity: lineReq.Quantity,
IssuedQuantity: 0,
Remarks: "",
InvIssueID: created.ID,
ProductID: productUUID,
WarehouseID: warehouseUUID,

View File

@ -10,13 +10,14 @@ const (
ENUM_PAGINATION_PER_PAGE = 10
ENUM_PAGINATION_PAGE = 1
DB = "db"
JWTService = "JWTService"
LOGGER = "logger"
SUPERADMIN = "superadmin"
COMPLETED = "completed"
USERID = "user_id"
CREATE = "create"
UPDATE = "update"
DELETE = "delete"
DB = "db"
JWTService = "JWTService"
LOGGER = "logger"
SUPERADMIN = "superadmin"
COMPLETED = "completed"
USERID = "user_id"
WAREHOUSEID = "warehouse_id"
CREATE = "create"
UPDATE = "update"
DELETE = "delete"
)

View File

@ -42,6 +42,14 @@ func GetUserID(ctx context.Context) string {
return ""
}
func GetWarehouseID(ctx context.Context) string {
val := ctx.Value(constants.WAREHOUSEID)
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)

View File

@ -192,7 +192,7 @@ func RegisterDependencies(injector *do.Injector) {
inventoryReceiptServ := inventoryReceiptService.NewInventoryReceiptService(db, inventoryReceiptRepository, inventoryReceiptLineRepository, productRepository, uomRepository, inventoryStorageRepository, sequenceServ, log)
assignmentServ := assignmentService.NewAssignmentService(db, assignmentRepository, assignmentUserRepository)
inventoryRequestServ := inventoryRequestService.NewInventoryRequestService(db, inventoryRequestRepository, inventoryRequestLineRepository, inventoryStorageServ, sequenceServ, log)
inventoryIssueServ := inventoryIssueService.NewInventoryIssueService(db, inventoryIssueRepository, inventoryIssueLineRepository, sequenceServ, log)
inventoryIssueServ := inventoryIssueService.NewInventoryIssueService(db, inventoryIssueRepository, inventoryIssueLineRepository, inventoryRequestServ, sequenceServ, log)
inventoryReturnServ := inventoryReturnService.NewInventoryReturnService(db, inventoryReturnRepository, inventoryReturnLineRepository, inventoryIssueLineRepository, productRepository, sequenceServ, log)
inventoryMovementServ := inventoryMovementService.NewInventoryMovementService(db, inventoryMovementRepository, inventoryMovementLineRepository, sequenceServ, log)
quarantineServ := quarantineService.NewQuarantineService(db, quarantineRepository, quarantineLineRepository, productRepository, uomRepository, inventoryStorageRepository)