mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-24 07:15:43 +00:00
Feat[BE-222.223.224]: creating create one delivery order and getone delivery order[Unfinished]
This commit is contained in:
@@ -19,7 +19,7 @@ type MarketingProduct struct {
|
|||||||
UpdatedAt time.Time `gorm:"autoUpdateTime"`
|
UpdatedAt time.Time `gorm:"autoUpdateTime"`
|
||||||
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
|
DeletedAt gorm.DeletedAt `gorm:"index" json:"-"`
|
||||||
|
|
||||||
Marketing Marketing `gorm:"foreignKey:MarketingId;references:Id"`
|
Marketing Marketing `gorm:"foreignKey:MarketingId;references:Id"`
|
||||||
ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
|
ProductWarehouse ProductWarehouse `gorm:"foreignKey:ProductWarehouseId;references:Id"`
|
||||||
DeliveryProducts []MarketingDeliveryProduct `gorm:"foreignKey:MarketingProductId;references:Id"`
|
DeliveryProduct *MarketingDeliveryProduct `gorm:"foreignKey:MarketingProductId;references:Id"`
|
||||||
}
|
}
|
||||||
|
|||||||
+11
@@ -1,6 +1,8 @@
|
|||||||
package repository
|
package repository
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
|
"gitlab.com/mbugroup/lti-api.git/internal/common/repository"
|
||||||
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
|
entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
@@ -8,6 +10,7 @@ import (
|
|||||||
|
|
||||||
type MarketingDeliveryProductRepository interface {
|
type MarketingDeliveryProductRepository interface {
|
||||||
repository.BaseRepository[entity.MarketingDeliveryProduct]
|
repository.BaseRepository[entity.MarketingDeliveryProduct]
|
||||||
|
GetByMarketingProductID(ctx context.Context, marketingProductID uint) (*entity.MarketingDeliveryProduct, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type MarketingDeliveryProductRepositoryImpl struct {
|
type MarketingDeliveryProductRepositoryImpl struct {
|
||||||
@@ -19,3 +22,11 @@ func NewMarketingDeliveryProductRepository(db *gorm.DB) MarketingDeliveryProduct
|
|||||||
BaseRepositoryImpl: repository.NewBaseRepository[entity.MarketingDeliveryProduct](db),
|
BaseRepositoryImpl: repository.NewBaseRepository[entity.MarketingDeliveryProduct](db),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *MarketingDeliveryProductRepositoryImpl) GetByMarketingProductID(ctx context.Context, marketingProductID uint) (*entity.MarketingDeliveryProduct, error) {
|
||||||
|
var deliveryProduct entity.MarketingDeliveryProduct
|
||||||
|
if err := r.DB().WithContext(ctx).Where("marketing_product_id = ?", marketingProductID).First(&deliveryProduct).Error; err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &deliveryProduct, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
rDeliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/repositories"
|
rDeliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/repositories"
|
||||||
sDeliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
|
sDeliveryOrders "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/delivery-orderss/services"
|
||||||
rMarketing "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
|
rMarketing "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
|
||||||
|
rMarketingProduct "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/sales-orders/repositories"
|
||||||
rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
|
rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
|
||||||
sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
|
sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
|
||||||
)
|
)
|
||||||
@@ -20,12 +21,13 @@ type DeliveryOrdersModule struct{}
|
|||||||
func (DeliveryOrdersModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
|
func (DeliveryOrdersModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *validator.Validate) {
|
||||||
deliveryOrdersRepo := rDeliveryOrders.NewDeliveryOrdersRepository(db)
|
deliveryOrdersRepo := rDeliveryOrders.NewDeliveryOrdersRepository(db)
|
||||||
marketingRepo := rMarketing.NewMarketingRepository(db)
|
marketingRepo := rMarketing.NewMarketingRepository(db)
|
||||||
|
marketingProductRepo := rMarketingProduct.NewMarketingProductRepository(db)
|
||||||
marketingDeliveryProductRepo := rMarketingDeliveryProduct.NewMarketingDeliveryProductRepository(db)
|
marketingDeliveryProductRepo := rMarketingDeliveryProduct.NewMarketingDeliveryProductRepository(db)
|
||||||
userRepo := rUser.NewUserRepository(db)
|
userRepo := rUser.NewUserRepository(db)
|
||||||
approvalRepo := commonRepo.NewApprovalRepository(db)
|
approvalRepo := commonRepo.NewApprovalRepository(db)
|
||||||
approvalSvc := commonSvc.NewApprovalService(approvalRepo)
|
approvalSvc := commonSvc.NewApprovalService(approvalRepo)
|
||||||
|
|
||||||
deliveryOrdersService := sDeliveryOrders.NewDeliveryOrdersService(deliveryOrdersRepo, marketingRepo, marketingDeliveryProductRepo, approvalSvc, validate)
|
deliveryOrdersService := sDeliveryOrders.NewDeliveryOrdersService(deliveryOrdersRepo, marketingRepo, marketingProductRepo, marketingDeliveryProductRepo, approvalSvc, validate)
|
||||||
userService := sUser.NewUserService(userRepo, validate)
|
userService := sUser.NewUserService(userRepo, validate)
|
||||||
|
|
||||||
DeliveryOrdersRoutes(router, userService, deliveryOrdersService)
|
DeliveryOrdersRoutes(router, userService, deliveryOrdersService)
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ type deliveryOrdersService struct {
|
|||||||
Validate *validator.Validate
|
Validate *validator.Validate
|
||||||
Repository repository.DeliveryOrdersRepository
|
Repository repository.DeliveryOrdersRepository
|
||||||
MarketingRepo marketingRepo.MarketingRepository
|
MarketingRepo marketingRepo.MarketingRepository
|
||||||
|
MarketingProductRepo marketingRepo.MarketingProductRepository
|
||||||
MarketingDeliveryProductRepo marketingDeliveryProductRepo.MarketingDeliveryProductRepository
|
MarketingDeliveryProductRepo marketingDeliveryProductRepo.MarketingDeliveryProductRepository
|
||||||
ApprovalSvc commonSvc.ApprovalService
|
ApprovalSvc commonSvc.ApprovalService
|
||||||
}
|
}
|
||||||
@@ -42,6 +43,7 @@ type deliveryOrdersService struct {
|
|||||||
func NewDeliveryOrdersService(
|
func NewDeliveryOrdersService(
|
||||||
repo repository.DeliveryOrdersRepository,
|
repo repository.DeliveryOrdersRepository,
|
||||||
marketingRepo marketingRepo.MarketingRepository,
|
marketingRepo marketingRepo.MarketingRepository,
|
||||||
|
marketingProductRepo marketingRepo.MarketingProductRepository,
|
||||||
marketingDeliveryProductRepo marketingDeliveryProductRepo.MarketingDeliveryProductRepository,
|
marketingDeliveryProductRepo marketingDeliveryProductRepo.MarketingDeliveryProductRepository,
|
||||||
approvalSvc commonSvc.ApprovalService,
|
approvalSvc commonSvc.ApprovalService,
|
||||||
validate *validator.Validate,
|
validate *validator.Validate,
|
||||||
@@ -51,6 +53,7 @@ func NewDeliveryOrdersService(
|
|||||||
Validate: validate,
|
Validate: validate,
|
||||||
Repository: repo,
|
Repository: repo,
|
||||||
MarketingRepo: marketingRepo,
|
MarketingRepo: marketingRepo,
|
||||||
|
MarketingProductRepo: marketingProductRepo,
|
||||||
MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
|
MarketingDeliveryProductRepo: marketingDeliveryProductRepo,
|
||||||
ApprovalSvc: approvalSvc,
|
ApprovalSvc: approvalSvc,
|
||||||
}
|
}
|
||||||
@@ -89,7 +92,7 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.Query) ([
|
|||||||
result := make([]dto.DeliveryOrdersListDTO, len(marketings))
|
result := make([]dto.DeliveryOrdersListDTO, len(marketings))
|
||||||
for i, marketing := range marketings {
|
for i, marketing := range marketings {
|
||||||
// Get marketing delivery products
|
// Get marketing delivery products
|
||||||
var deliveryProducts []entity.MarketingDeliveryProduct
|
var allDeliveryProducts []entity.MarketingDeliveryProduct
|
||||||
if err := s.Repository.DB().WithContext(c.Context()).
|
if err := s.Repository.DB().WithContext(c.Context()).
|
||||||
Preload("MarketingProduct").
|
Preload("MarketingProduct").
|
||||||
Where("marketing_product_id IN (?)",
|
Where("marketing_product_id IN (?)",
|
||||||
@@ -97,20 +100,20 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.Query) ([
|
|||||||
Model(&entity.MarketingProduct{}).
|
Model(&entity.MarketingProduct{}).
|
||||||
Select("id").
|
Select("id").
|
||||||
Where("marketing_id = ?", marketing.Id)).
|
Where("marketing_id = ?", marketing.Id)).
|
||||||
Find(&deliveryProducts).Error; err != nil {
|
Find(&allDeliveryProducts).Error; err != nil {
|
||||||
s.Log.Errorf("Failed to load delivery products for marketing %d: %+v", marketing.Id, err)
|
s.Log.Errorf("Failed to load delivery products for marketing %d: %+v", marketing.Id, err)
|
||||||
// Continue without products
|
// Continue without products
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create dummy DeliveryOrders untuk dto mapping
|
// Build response DTO
|
||||||
dummyDO := &entity.DeliveryOrders{
|
deliveryOrderResponse := &entity.DeliveryOrders{
|
||||||
MarketingId: marketing.Id,
|
MarketingId: marketing.Id,
|
||||||
CreatedUser: &marketing.CreatedUser,
|
CreatedUser: &marketing.CreatedUser,
|
||||||
Marketing: &marketing,
|
Marketing: &marketing,
|
||||||
DeliveryProducts: deliveryProducts,
|
DeliveryProducts: allDeliveryProducts,
|
||||||
}
|
}
|
||||||
|
|
||||||
result[i] = dto.ToDeliveryOrdersListDTOWithProducts(*dummyDO, deliveryProducts)
|
result[i] = dto.ToDeliveryOrdersListDTOWithProducts(*deliveryOrderResponse, allDeliveryProducts)
|
||||||
}
|
}
|
||||||
|
|
||||||
return result, total, nil
|
return result, total, nil
|
||||||
@@ -133,7 +136,7 @@ func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.DeliveryOrder
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get marketing delivery products
|
// Get marketing delivery products
|
||||||
var deliveryProducts []entity.MarketingDeliveryProduct
|
var allDeliveryProducts []entity.MarketingDeliveryProduct
|
||||||
if err := s.Repository.DB().WithContext(c.Context()).
|
if err := s.Repository.DB().WithContext(c.Context()).
|
||||||
Preload("MarketingProduct").
|
Preload("MarketingProduct").
|
||||||
Where("marketing_product_id IN (?)",
|
Where("marketing_product_id IN (?)",
|
||||||
@@ -141,21 +144,21 @@ func (s deliveryOrdersService) GetOne(c *fiber.Ctx, id uint) (*dto.DeliveryOrder
|
|||||||
Model(&entity.MarketingProduct{}).
|
Model(&entity.MarketingProduct{}).
|
||||||
Select("id").
|
Select("id").
|
||||||
Where("marketing_id = ?", marketing.Id)).
|
Where("marketing_id = ?", marketing.Id)).
|
||||||
Find(&deliveryProducts).Error; err != nil {
|
Find(&allDeliveryProducts).Error; err != nil {
|
||||||
s.Log.Errorf("Failed to load delivery products for marketing %d: %+v", marketing.Id, err)
|
s.Log.Errorf("Failed to load delivery products for marketing %d: %+v", marketing.Id, err)
|
||||||
// Continue without products
|
// Continue without products
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create dummy DeliveryOrders untuk dto mapping
|
// Build response DTO
|
||||||
dummyDO := &entity.DeliveryOrders{
|
deliveryOrderResponse := &entity.DeliveryOrders{
|
||||||
MarketingId: marketing.Id,
|
MarketingId: marketing.Id,
|
||||||
CreatedUser: &marketing.CreatedUser,
|
CreatedUser: &marketing.CreatedUser,
|
||||||
Marketing: marketing,
|
Marketing: marketing,
|
||||||
DeliveryProducts: deliveryProducts,
|
DeliveryProducts: allDeliveryProducts,
|
||||||
}
|
}
|
||||||
|
|
||||||
result := dto.ToDeliveryOrdersListDTOWithProducts(*dummyDO, deliveryProducts)
|
responseDTO := dto.ToDeliveryOrdersListDTOWithProducts(*deliveryOrderResponse, allDeliveryProducts)
|
||||||
return &result, nil
|
return &responseDTO, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*dto.DeliveryOrdersListDTO, error) {
|
func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*dto.DeliveryOrdersListDTO, error) {
|
||||||
@@ -163,88 +166,93 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate marketing exists
|
if err := commonSvc.EnsureRelations(c.Context(),
|
||||||
_, err := s.MarketingRepo.GetByID(c.Context(), req.MarketingId, nil)
|
commonSvc.RelationCheck{Name: "Marketing", ID: &req.MarketingId, Exists: s.MarketingRepo.IdExists},
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
); err != nil {
|
||||||
return nil, fiber.NewError(fiber.StatusNotFound, "Marketing not found")
|
return nil, err
|
||||||
}
|
}
|
||||||
if err != nil {
|
|
||||||
s.Log.Errorf("Failed to fetch marketing %d: %+v", req.MarketingId, err)
|
var relationChecks []commonSvc.RelationCheck
|
||||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing")
|
for _, requestedProduct := range req.DeliveryProducts {
|
||||||
|
relationChecks = append(relationChecks, commonSvc.RelationCheck{
|
||||||
|
Name: "MarketingProduct", ID: &requestedProduct.MarketingProductId, Exists: s.MarketingProductRepo.IdExists,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate marketing approval status - harus sudah di approve ke step Sales Order
|
|
||||||
approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(s.MarketingRepo.DB()))
|
approvalSvc := commonSvc.NewApprovalService(commonRepo.NewApprovalRepository(s.MarketingRepo.DB()))
|
||||||
latestApproval, err := approvalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowMarketing, req.MarketingId, nil)
|
latestApproval, err := approvalSvc.LatestByTarget(c.Context(), utils.ApprovalWorkflowMarketing, req.MarketingId, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check approval status")
|
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to check approval status")
|
||||||
}
|
}
|
||||||
|
|
||||||
if latestApproval == nil {
|
if latestApproval == nil {
|
||||||
return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing has not been submitted for approval")
|
return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing has not been submitted for approval")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cek apakah status approval sudah Sales Order (step 2) atau lebih
|
|
||||||
if latestApproval.StepNumber < uint16(utils.MarketingStepSalesOrder) {
|
if latestApproval.StepNumber < uint16(utils.MarketingStepSalesOrder) {
|
||||||
return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing must be approved to Sales Order step before creating delivery order")
|
return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing must be approved to Sales Order step before creating delivery order")
|
||||||
}
|
}
|
||||||
|
|
||||||
if latestApproval.Action == nil || *latestApproval.Action != entity.ApprovalActionApproved {
|
if latestApproval.Action == nil || *latestApproval.Action != entity.ApprovalActionApproved {
|
||||||
return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing is not approved for delivery")
|
return nil, fiber.NewError(fiber.StatusBadRequest, "Marketing is not approved for delivery")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate semua delivery products ada dan update mereka
|
err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTransaction *gorm.DB) error {
|
||||||
err = s.Repository.DB().WithContext(c.Context()).Transaction(func(dbTx *gorm.DB) error {
|
|
||||||
for _, product := range req.DeliveryProducts {
|
marketingProductRepositoryTx := marketingRepo.NewMarketingProductRepository(dbTransaction)
|
||||||
// Fetch marketing_product terlebih dahulu untuk pastikan punya marketing_id yang sama
|
marketingDeliveryProductRepositoryTx := marketingDeliveryProductRepo.NewMarketingDeliveryProductRepository(dbTransaction)
|
||||||
var marketingProduct entity.MarketingProduct
|
|
||||||
if err := dbTx.Where("id = ? AND marketing_id = ?", product.MarketingProductId, req.MarketingId).
|
for _, requestedProduct := range req.DeliveryProducts {
|
||||||
First(&marketingProduct).Error; err != nil {
|
allMarketingProducts, err := marketingProductRepositoryTx.GetByMarketingID(c.Context(), req.MarketingId)
|
||||||
|
if err != nil {
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Marketing product %d not found for this marketing", product.MarketingProductId))
|
return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("No marketing products found for marketing %d", req.MarketingId))
|
||||||
}
|
}
|
||||||
s.Log.Errorf("Failed to fetch marketing product: %+v", err)
|
s.Log.Errorf("Failed to fetch marketing products: %+v", err)
|
||||||
return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing product")
|
return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch marketing products")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch marketing_delivery_product by marketing_product_id
|
var foundMarketingProduct *entity.MarketingProduct
|
||||||
var mdp entity.MarketingDeliveryProduct
|
for i := range allMarketingProducts {
|
||||||
if err := dbTx.Where("marketing_product_id = ?", marketingProduct.Id).
|
if allMarketingProducts[i].Id == requestedProduct.MarketingProductId {
|
||||||
First(&mdp).Error; err != nil {
|
foundMarketingProduct = &allMarketingProducts[i]
|
||||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
break
|
||||||
return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Delivery product for marketing product %d not found", product.MarketingProductId))
|
}
|
||||||
|
}
|
||||||
|
if foundMarketingProduct == nil {
|
||||||
|
return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Marketing product %d not found for this marketing", requestedProduct.MarketingProductId))
|
||||||
|
}
|
||||||
|
|
||||||
|
deliveryProduct, err := marketingDeliveryProductRepositoryTx.GetByMarketingProductID(c.Context(), foundMarketingProduct.Id)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Delivery product for marketing product %d not found", requestedProduct.MarketingProductId))
|
||||||
}
|
}
|
||||||
s.Log.Errorf("Failed to fetch marketing delivery product: %+v", err)
|
|
||||||
return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
|
return fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch delivery product")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse delivery date per item (jika ada), atau gunakan default
|
var itemDeliveryDate time.Time
|
||||||
itemDeliveryDate := time.Now()
|
if requestedProduct.DeliveryDate != "" {
|
||||||
if product.DeliveryDate != "" {
|
parsedDate, err := utils.ParseDateString(requestedProduct.DeliveryDate)
|
||||||
parsedItemDate, err := time.Parse("2006-01-02", product.DeliveryDate)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid delivery date format for product %d", product.MarketingProductId))
|
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Invalid delivery date format for product %d: %v", requestedProduct.MarketingProductId, err))
|
||||||
}
|
}
|
||||||
itemDeliveryDate = parsedItemDate
|
itemDeliveryDate = parsedDate
|
||||||
|
} else {
|
||||||
|
itemDeliveryDate = time.Now()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update dengan data dari request - PASTIKAN UPDATE LANGSUNG KE FIELD
|
deliveryProduct.Qty = requestedProduct.Qty
|
||||||
updates := map[string]interface{}{
|
deliveryProduct.UnitPrice = requestedProduct.UnitPrice
|
||||||
"qty": product.Qty,
|
deliveryProduct.AvgWeight = requestedProduct.AvgWeight
|
||||||
"unit_price": product.UnitPrice,
|
deliveryProduct.TotalWeight = requestedProduct.TotalWeight
|
||||||
"avg_weight": product.AvgWeight,
|
deliveryProduct.TotalPrice = requestedProduct.TotalPrice
|
||||||
"total_weight": product.TotalWeight,
|
deliveryProduct.DeliveryDate = &itemDeliveryDate
|
||||||
"total_price": product.TotalPrice,
|
deliveryProduct.VehicleNumber = requestedProduct.VehicleNumber
|
||||||
"delivery_date": &itemDeliveryDate,
|
|
||||||
"vehicle_number": product.VehicleNumber,
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := dbTx.Model(&mdp).Updates(updates).Error; err != nil {
|
if err := marketingDeliveryProductRepositoryTx.UpdateOne(c.Context(), deliveryProduct.Id, deliveryProduct, nil); err != nil {
|
||||||
s.Log.Errorf("Failed to update marketing delivery product: %+v", err)
|
s.Log.Errorf("Failed to update marketing delivery product: %+v", err)
|
||||||
return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
|
return fiber.NewError(fiber.StatusInternalServerError, "Failed to update delivery product")
|
||||||
}
|
}
|
||||||
|
|
||||||
s.Log.Infof("Updated MDP %d: qty=%v, unitPrice=%v, totalPrice=%v", mdp.Id, product.Qty, product.UnitPrice, product.TotalPrice)
|
s.Log.Infof("Updated delivery product %d: qty=%v, unitPrice=%v, totalPrice=%v", deliveryProduct.Id, requestedProduct.Qty, requestedProduct.UnitPrice, requestedProduct.TotalPrice)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -254,9 +262,9 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch marketing dengan delivery products yang sudah di-update
|
// Fetch marketing dengan delivery products yang sudah di-updated
|
||||||
marketing, err := s.MarketingRepo.GetByID(c.Context(), req.MarketingId, func(db *gorm.DB) *gorm.DB {
|
marketing, err := s.MarketingRepo.GetByID(c.Context(), req.MarketingId, func(db *gorm.DB) *gorm.DB {
|
||||||
return db.Preload("CreatedUser").Preload("Products")
|
return db.Preload("CreatedUser").Preload("Products.DeliveryProduct")
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
s.Log.Errorf("Failed to fetch marketing after update: %+v", err)
|
s.Log.Errorf("Failed to fetch marketing after update: %+v", err)
|
||||||
@@ -264,30 +272,30 @@ func (s *deliveryOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Get marketing delivery products
|
// Get marketing delivery products
|
||||||
var deliveryProducts []entity.MarketingDeliveryProduct
|
var allDeliveryProducts []entity.MarketingDeliveryProduct
|
||||||
if err := s.Repository.DB().WithContext(c.Context()).
|
if err := s.MarketingDeliveryProductRepo.DB().WithContext(c.Context()).
|
||||||
Preload("MarketingProduct").
|
Preload("MarketingProduct").
|
||||||
Where("marketing_product_id IN (?)",
|
Where("marketing_product_id IN (?)",
|
||||||
s.Repository.DB().WithContext(c.Context()).
|
s.MarketingProductRepo.DB().WithContext(c.Context()).
|
||||||
Model(&entity.MarketingProduct{}).
|
Model(&entity.MarketingProduct{}).
|
||||||
Select("id").
|
Select("id").
|
||||||
Where("marketing_id = ?", req.MarketingId)).
|
Where("marketing_id = ?", req.MarketingId)).
|
||||||
Find(&deliveryProducts).Error; err != nil {
|
Find(&allDeliveryProducts).Error; err != nil {
|
||||||
s.Log.Errorf("Failed to load delivery products: %+v", err)
|
s.Log.Errorf("Failed to load delivery products: %+v", err)
|
||||||
// Continue tanpa delivery products
|
// Continue tanpa delivery products
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create dummy DeliveryOrders untuk dipakai dto mapping
|
// Build response DTO
|
||||||
dummyDO := &entity.DeliveryOrders{
|
deliveryOrderResponse := &entity.DeliveryOrders{
|
||||||
MarketingId: req.MarketingId,
|
MarketingId: req.MarketingId,
|
||||||
Notes: req.Notes,
|
Notes: req.Notes,
|
||||||
CreatedUser: &marketing.CreatedUser,
|
CreatedUser: &marketing.CreatedUser,
|
||||||
Marketing: marketing,
|
Marketing: marketing,
|
||||||
DeliveryProducts: deliveryProducts,
|
DeliveryProducts: allDeliveryProducts,
|
||||||
}
|
}
|
||||||
|
|
||||||
result := dto.ToDeliveryOrdersListDTOWithProducts(*dummyDO, deliveryProducts)
|
responseDTO := dto.ToDeliveryOrdersListDTOWithProducts(*deliveryOrderResponse, allDeliveryProducts)
|
||||||
return &result, nil
|
return &responseDTO, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.DeliveryOrders, error) {
|
func (s deliveryOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.DeliveryOrders, error) {
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ func (u *SalesOrdersController) CreateOne(c *fiber.Ctx) error {
|
|||||||
Code: fiber.StatusCreated,
|
Code: fiber.StatusCreated,
|
||||||
Status: "success",
|
Status: "success",
|
||||||
Message: "Create salesOrders successfully",
|
Message: "Create salesOrders successfully",
|
||||||
Data: result,
|
Data: dto.ToSalesOrdersListDTOFromMarketing(*result),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ type MarketingProductDTO struct {
|
|||||||
Product *productDTO.ProductBaseDTO `json:"product,omitempty"`
|
Product *productDTO.ProductBaseDTO `json:"product,omitempty"`
|
||||||
Warehouse *warehouseDTO.WarehouseBaseDTO `json:"warehouse,omitempty"`
|
Warehouse *warehouseDTO.WarehouseBaseDTO `json:"warehouse,omitempty"`
|
||||||
} `json:"product_warehouse,omitempty"`
|
} `json:"product_warehouse,omitempty"`
|
||||||
|
DeliveryProduct *MarketingDeliveryProductDTO `json:"delivery_product,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type MarketingDeliveryProductDTO struct {
|
type MarketingDeliveryProductDTO struct {
|
||||||
@@ -104,6 +105,12 @@ func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var deliveryProduct *MarketingDeliveryProductDTO
|
||||||
|
if e.DeliveryProduct != nil && e.DeliveryProduct.Id != 0 {
|
||||||
|
mapped := ToMarketingDeliveryProductDTO(*e.DeliveryProduct)
|
||||||
|
deliveryProduct = &mapped
|
||||||
|
}
|
||||||
|
|
||||||
return MarketingProductDTO{
|
return MarketingProductDTO{
|
||||||
Id: e.Id,
|
Id: e.Id,
|
||||||
Qty: e.Qty,
|
Qty: e.Qty,
|
||||||
@@ -112,6 +119,7 @@ func ToMarketingProductDTO(e entity.MarketingProduct) MarketingProductDTO {
|
|||||||
TotalWeight: e.TotalWeight,
|
TotalWeight: e.TotalWeight,
|
||||||
TotalPrice: e.TotalPrice,
|
TotalPrice: e.TotalPrice,
|
||||||
ProductWarehouse: productWarehouse,
|
ProductWarehouse: productWarehouse,
|
||||||
|
DeliveryProduct: deliveryProduct,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
type MarketingProductRepository interface {
|
type MarketingProductRepository interface {
|
||||||
repository.BaseRepository[entity.MarketingProduct]
|
repository.BaseRepository[entity.MarketingProduct]
|
||||||
GetByMarketingID(ctx context.Context, marketingID uint) ([]entity.MarketingProduct, error)
|
GetByMarketingID(ctx context.Context, marketingID uint) ([]entity.MarketingProduct, error)
|
||||||
|
IdExists(ctx context.Context, id uint) (bool, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type MarketingProductRepositoryImpl struct {
|
type MarketingProductRepositoryImpl struct {
|
||||||
@@ -33,3 +34,7 @@ func (r *MarketingProductRepositoryImpl) GetByMarketingID(ctx context.Context, m
|
|||||||
}
|
}
|
||||||
return products, nil
|
return products, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *MarketingProductRepositoryImpl) IdExists(ctx context.Context, id uint) (bool, error) {
|
||||||
|
return repository.Exists[entity.MarketingProduct](ctx, r.DB(), id)
|
||||||
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ func (s salesOrdersService) withRelations(db *gorm.DB) *gorm.DB {
|
|||||||
Preload("SalesPerson").
|
Preload("SalesPerson").
|
||||||
Preload("Products.ProductWarehouse.Product").
|
Preload("Products.ProductWarehouse.Product").
|
||||||
Preload("Products.ProductWarehouse.Warehouse").
|
Preload("Products.ProductWarehouse.Warehouse").
|
||||||
Preload("Products.DeliveryProducts")
|
Preload("Products.DeliveryProduct")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s salesOrdersService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Marketing, int64, error) {
|
func (s salesOrdersService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Marketing, int64, error) {
|
||||||
@@ -255,7 +255,13 @@ func (s *salesOrdersService) CreateOne(c *fiber.Ctx, req *validation.Create) (*e
|
|||||||
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to create salesOrders")
|
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to create salesOrders")
|
||||||
}
|
}
|
||||||
|
|
||||||
return s.GetOne(c, marketing.Id)
|
marketing, err = s.MarketingRepo.GetByID(c.Context(), marketing.Id, s.withRelations)
|
||||||
|
if err != nil {
|
||||||
|
s.Log.Errorf("Failed to fetch created marketing: %+v", err)
|
||||||
|
return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch created sales order")
|
||||||
|
}
|
||||||
|
|
||||||
|
return marketing, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.Marketing, error) {
|
func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint) (*entity.Marketing, error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user