codex/command: migrate egg stocks from kandang to farm

internal/modules/inventory/transfers/services/transfer.service.go

@@ -26,7 +26,6 @@ import (
 	"gitlab.com/mbugroup/lti-api.git/internal/utils/fifo"
 
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 )
 
 type TransferService interface {
@@ -34,6 +33,8 @@ type TransferService interface {
 	GetOne(ctx *fiber.Ctx, id uint) (*entity.StockTransfer, error)
 	CreateOne(ctx *fiber.Ctx, req *validation.TransferRequest, files []*multipart.FileHeader) (*entity.StockTransfer, error)
 	DeleteOne(ctx *fiber.Ctx, id uint) error
+	CreateSystemTransfer(ctx context.Context, req *SystemTransferRequest) (*entity.StockTransfer, error)
+	DeleteSystemTransfer(ctx context.Context, id uint, actorID uint) error
 }
 
 type transferService struct {
@@ -63,6 +64,27 @@ type downstreamDependency struct {
 	FlagGroupCode string `gorm:"column:flag_group_code"`
 }
 
+type SystemTransferProduct struct {
+	ProductID  uint
+	ProductQty float64
+}
+
+type SystemTransferRequest struct {
+	TransferReason         string
+	TransferDate           time.Time
+	SourceWarehouseID      uint
+	DestinationWarehouseID uint
+	Products               []SystemTransferProduct
+	ActorID                uint
+	MovementNumber         string
+	StockLogNotes          string
+}
+
+type transferMovementResult struct {
+	Transfer    *entity.StockTransfer
+	DetailByPID map[uint64]*entity.StockTransferDetail
+}
+
 func NewTransferService(validate *validator.Validate, stockTransferRepo rStockTransfer.StockTransferRepository, stockTransferDetailRepo rStockTransfer.StockTransferDetailRepository, stockTransferDeliveryRepo rStockTransfer.StockTransferDeliveryRepository, stockTransferDeliveryItemRepo rStockTransfer.StockTransferDeliveryItemRepository, stockLogsRepo rStockLogs.StockLogRepository, productWarehouseRepo rProductWarehouse.ProductWarehouseRepository, supplierRepo rSupplier.SupplierRepository, warehouseRepo warehouseRepo.WarehouseRepository, projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, projectFlockPopulationRepo projectFlockKandangRepo.ProjectFlockPopulationRepository, documentSvc commonSvc.DocumentService, fifoStockV2Svc commonSvc.FifoStockV2Service, expenseBridge TransferExpenseBridge) TransferService {
 	return &transferService{
 		Log:                           utils.Log,
@@ -185,50 +207,17 @@ func (s transferService) GetOne(c *fiber.Ctx, id uint) (*entity.StockTransfer, e
 }
 
 func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferRequest, files []*multipart.FileHeader) (*entity.StockTransfer, error) {
-
-	pwIDs := make([]uint, 0, len(req.Products))
-
+	products := make([]SystemTransferProduct, 0, len(req.Products))
 	for _, product := range req.Products {
-		sourcePW, err := s.ProductWarehouseRepo.GetProductWarehouseByProductAndWarehouseID(
-			c.Context(), uint(product.ProductID), uint(req.SourceWarehouseID),
-		)
-		if err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk dengan ID %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
-			}
-			s.Log.Errorf("Failed to fetch product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengecek stok produk")
-		}
-		if sourcePW.Quantity < product.ProductQty {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok produk %d di gudang asal tidak mencukupi. Tersedia: %.2f, Diminta: %.2f", product.ProductID, sourcePW.Quantity, product.ProductQty))
-		}
-		pwIDs = append(pwIDs, sourcePW.Id)
+		products = append(products, SystemTransferProduct{
+			ProductID:  uint(product.ProductID),
+			ProductQty: product.ProductQty,
+		})
 	}
-
-	if err := commonSvc.EnsureProjectFlockNotClosedForProductWarehouses(
-		c.Context(),
-		s.StockTransferRepo.DB(),
-		pwIDs,
-	); err != nil {
+	if err := s.validateTransferWarehousesAndProducts(c.Context(), uint(req.SourceWarehouseID), uint(req.DestinationWarehouseID), products); err != nil {
 		return nil, err
 	}
 
-	destPfkID, err := s.getActiveProjectFlockKandangID(c.Context(), uint(req.DestinationWarehouseID))
-	if err != nil {
-		return nil, err
-	}
-
-	if destPfkID > 0 {
-		projectFlockKandang, err := s.ProjectFlockKandangRepo.GetByID(c.Context(), destPfkID)
-		if err != nil {
-			s.Log.Errorf("Failed to fetch project flock kandang by ID %d: %+v", destPfkID, err)
-			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data project flock")
-		}
-		if projectFlockKandang.ClosedAt != nil {
-			return nil, fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Project flock untuk gudang tujuan sudah ditutup (closing) pada %s", projectFlockKandang.ClosedAt.Format("2006-01-02")))
-		}
-	}
-
 	actorID, err := m.ActorIDFromContext(c)
 	if err != nil {
 		return nil, err
@@ -249,11 +238,9 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 	}
 
 	for _, delivery := range req.Deliveries {
-
 		if delivery.SupplierID == 0 {
 			continue
 		}
-
 		if delivery.VehiclePlate == "" {
 			return nil, fiber.NewError(fiber.StatusBadRequest, "Vehicle plate wajib diisi ketika supplier dipilih")
 		}
@@ -280,104 +267,28 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		}
 	}
 
-	movementNumber, err := s.StockTransferRepo.GenerateMovementNumber(c.Context())
-	if err != nil {
-		s.Log.Errorf("Failed to generate movement number: %+v", err)
-		return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat nomor transfer")
-	}
-
 	transferDate, _ := utils.ParseDateString(req.TransferDate)
-
-	entityTransfer := &entity.StockTransfer{
-		FromWarehouseId: uint64(req.SourceWarehouseID),
-		ToWarehouseId:   uint64(req.DestinationWarehouseID),
-		Reason:          req.TransferReason,
-		TransferDate:    transferDate,
-		MovementNumber:  movementNumber,
-		CreatedBy:       uint64(actorID),
-	}
-
 	expensePayloads := make([]TransferExpenseReceivingPayload, 0)
+	var detailMap map[uint64]*entity.StockTransferDetail
+	var createdTransfer *entity.StockTransfer
 
 	err = s.StockTransferRepo.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
-
-		stockTransferRepoTX := s.StockTransferRepo.WithTx(tx)
-		stockTransferDetailRepoTX := s.StockTransferDetailRepo.WithTx(tx)
 		stockTransferDeliveryRepoTX := s.StockTransferDeliveryRepo.WithTx(tx)
 		stockTransferDeliveryItemRepoTX := s.StockTransferDeliveryItemRepo.WithTx(tx)
-		productWarehouseRepoTX := rProductWarehouse.NewProductWarehouseRepository(tx)
-		stocklogsRepoTx := s.StockLogsRepository.WithTx(tx)
 
-		if err := stockTransferRepoTX.CreateOne(c.Context(), entityTransfer, nil); err != nil {
-			return err
-		}
-
-		details := make([]*entity.StockTransferDetail, 0, len(req.Products))
-		detailMap := make(map[uint64]*entity.StockTransferDetail)
-
-		for _, product := range req.Products {
-
-			sourcePW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
-				c.Context(), uint(product.ProductID), uint(req.SourceWarehouseID),
-			)
-			if err != nil {
-				if errors.Is(err, gorm.ErrRecordNotFound) {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Produk %d tidak ditemukan di gudang asal (ID: %d)", product.ProductID, req.SourceWarehouseID))
-				}
-				s.Log.Errorf("Failed to fetch source product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.SourceWarehouseID, err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang asal")
-			}
-
-			destPW, err := productWarehouseRepoTX.GetProductWarehouseByProductAndWarehouseID(
-				c.Context(), uint(product.ProductID), uint(req.DestinationWarehouseID),
-			)
-			if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-				s.Log.Errorf("Failed to fetch dest product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data stok gudang tujuan")
-			}
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				ctx := c.Context()
-				projectFlockKandangID, err := s.getActiveProjectFlockKandangID(ctx, uint(req.DestinationWarehouseID))
-				if err != nil {
-					return err
-				}
-
-				var pfkID *uint
-				if projectFlockKandangID > 0 {
-					pfkID = &projectFlockKandangID
-				}
-
-				destPW = &entity.ProductWarehouse{
-					ProductId:             uint(product.ProductID),
-					WarehouseId:           uint(req.DestinationWarehouseID),
-					Quantity:              0,
-					ProjectFlockKandangId: pfkID,
-				}
-				if err := productWarehouseRepoTX.CreateOne(c.Context(), destPW, nil); err != nil {
-					s.Log.Errorf("Failed to create product warehouse for product_id=%d, warehouse_id=%d: %+v", product.ProductID, req.DestinationWarehouseID, err)
-					return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat data stok gudang tujuan")
-				}
-			}
-
-			detail := &entity.StockTransferDetail{
-				StockTransferId: entityTransfer.Id,
-				ProductId:       uint64(product.ProductID),
-
-				SourceProductWarehouseID: func() *uint64 { id := uint64(sourcePW.Id); return &id }(),
-				UsageQty:                 0,
-				PendingQty:               0,
-
-				DestProductWarehouseID: func() *uint64 { id := uint64(destPW.Id); return &id }(),
-				TotalQty:               0,
-				TotalUsed:              0,
-			}
-			details = append(details, detail)
-			detailMap[uint64(product.ProductID)] = detail
-		}
-
-		if err := stockTransferDetailRepoTX.CreateMany(c.Context(), details, nil); err != nil {
+		movementResult, err := s.createTransferMovement(c.Context(), tx, &SystemTransferRequest{
+			TransferReason:         req.TransferReason,
+			TransferDate:           transferDate,
+			SourceWarehouseID:      uint(req.SourceWarehouseID),
+			DestinationWarehouseID: uint(req.DestinationWarehouseID),
+			Products:               products,
+			ActorID:                actorID,
+		})
+		if err != nil {
 			return err
 		}
+		detailMap = movementResult.DetailByPID
+		createdTransfer = movementResult.Transfer
 
 		var deliveries []*entity.StockTransferDelivery
 		for _, delivery := range req.Deliveries {
@@ -389,7 +300,7 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				return nil
 			}()
 			deliveries = append(deliveries, &entity.StockTransferDelivery{
-				StockTransferId:   entityTransfer.Id,
+				StockTransferId:   createdTransfer.Id,
 				SupplierId:        supplierId,
 				VehiclePlate:      delivery.VehiclePlate,
 				DriverName:        delivery.DriverName,
@@ -402,7 +313,6 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		}
 
 		var deliveryItems []*entity.StockTransferDeliveryItem
-
 		for i, delivery := range deliveries {
 			item := req.Deliveries[i]
 			for _, prod := range item.Products {
@@ -422,14 +332,11 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		}
 
 		if s.DocumentSvc != nil && len(files) > 0 {
-
 			for deliveryIdx, delivery := range deliveries {
 				reqDelivery := req.Deliveries[deliveryIdx]
-
 				if reqDelivery.DocumentIndex < 0 {
 					continue
 				}
-
 				if reqDelivery.DocumentIndex >= len(files) {
 					return fiber.NewError(fiber.StatusBadRequest,
 						fmt.Sprintf("DocumentIndex %d untuk delivery %d melebihi jumlah file yang diupload (%d)",
@@ -437,14 +344,11 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 				}
 
 				file := files[reqDelivery.DocumentIndex]
-
-				documentFiles := []commonSvc.DocumentFile{
-					{
-						File:  file,
-						Type:  string(utils.DocumentTypeTransfer),
-						Index: &reqDelivery.DocumentIndex,
-					},
-				}
+				documentFiles := []commonSvc.DocumentFile{{
+					File:  file,
+					Type:  string(utils.DocumentTypeTransfer),
+					Index: &reqDelivery.DocumentIndex,
+				}}
 				_, err := s.DocumentSvc.UploadDocuments(c.Context(), commonSvc.DocumentUploadRequest{
 					DocumentableType: string(utils.DocumentableTypeTransfer),
 					DocumentableID:   delivery.Id,
@@ -459,160 +363,31 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 			}
 		}
 
-		if s.FifoStockV2Svc == nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "FIFO v2 service is not available")
-		}
-		flagGroupByProduct := make(map[uint]string, len(req.Products))
-
-		for _, product := range req.Products {
-			detail := detailMap[uint64(product.ProductID)]
-			if detail == nil || detail.SourceProductWarehouseID == nil || detail.DestProductWarehouseID == nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Data transfer detail tidak valid")
+		for _, delivery := range req.Deliveries {
+			if delivery.SupplierID == 0 {
+				continue
 			}
-
-			flagGroupCode, ok := flagGroupByProduct[uint(product.ProductID)]
-			if !ok {
-				flagGroupCode, err = s.resolveTransferFlagGroup(c.Context(), tx, uint(product.ProductID))
-				if err != nil {
-					return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("FIFO v2 route tidak ditemukan untuk produk %d: %v", product.ProductID, err))
-				}
-				flagGroupByProduct[uint(product.ProductID)] = flagGroupCode
-			}
-
-			if err := tx.Model(&entity.StockTransferDetail{}).
-				Where("id = ?", detail.Id).
-				Updates(map[string]interface{}{
-					"usage_qty":   product.ProductQty,
-					"pending_qty": 0,
-					"total_qty":   product.ProductQty,
-				}).Error; err != nil {
-				s.Log.Errorf("Failed to update transfer detail seed fields for detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal memperbarui data tracking")
-			}
-
-			asOf := transferDate
-			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
-				FlagGroupCode:      flagGroupCode,
-				ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-				AsOf:               &asOf,
-				Tx:                 tx,
-			}); err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal. Error: %v", product.ProductID, err))
-			}
-			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
-				FlagGroupCode:      flagGroupCode,
-				ProductWarehouseID: uint(*detail.DestProductWarehouseID),
-				AsOf:               &asOf,
-				Tx:                 tx,
-			}); err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal reflow stok tujuan untuk produk %d. Error: %v", product.ProductID, err))
-			}
-
-			type usageSnapshot struct {
-				UsageQty   float64 `gorm:"column:usage_qty"`
-				PendingQty float64 `gorm:"column:pending_qty"`
-			}
-			var usage usageSnapshot
-			if err := tx.WithContext(c.Context()).
-				Table("stock_transfer_details").
-				Select("usage_qty, pending_qty").
-				Where("id = ?", detail.Id).
-				Take(&usage).Error; err != nil {
-				s.Log.Errorf("Failed to read transfer usage snapshot detail_id=%d, product_id=%d: %+v", detail.Id, product.ProductID, err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data tracking")
-			}
-			outUsageQty := usage.UsageQty
-			outPendingQty := usage.PendingQty
-			if outPendingQty > 1e-6 {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Stok tidak mencukupi untuk produk %d di gudang asal", product.ProductID))
-			}
-
-			stockLogDecrease := &entity.StockLog{
-				ProductWarehouseId: uint(*detail.SourceProductWarehouseID),
-				CreatedBy:          uint(actorID),
-				Increase:           0,
-				Decrease:           outUsageQty,
-				LoggableType:       string(utils.StockLogTypeTransfer),
-				LoggableId:         uint(detail.Id),
-				Notes:              "",
-			}
-			stockLogs, err := s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.SourceProductWarehouseID), 1)
-			if err != nil {
-				s.Log.Errorf("Failed to get stock logs: %+v", err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-			}
-			if len(stockLogs) > 0 {
-				latestStockLog := stockLogs[0]
-				stockLogDecrease.Stock = latestStockLog.Stock - stockLogDecrease.Decrease
-			} else {
-				stockLogDecrease.Stock -= stockLogDecrease.Decrease
-			}
-
-			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogDecrease, nil); err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok keluar")
-			}
-
-			inAddedQty := outUsageQty
-
-			stockLogIncrease := &entity.StockLog{
-				ProductWarehouseId: uint(*detail.DestProductWarehouseID),
-				CreatedBy:          uint(actorID),
-				Increase:           inAddedQty,
-				Decrease:           0,
-				LoggableType:       string(utils.StockLogTypeTransfer),
-				LoggableId:         uint(detail.Id),
-				Notes:              "",
-			}
-			stockLogs, err = s.StockLogsRepository.GetByProductWarehouse(c.Context(), uint(*detail.DestProductWarehouseID), 1)
-			if err != nil {
-				s.Log.Errorf("Failed to get stock logs: %+v", err)
-				return fiber.NewError(fiber.StatusInternalServerError, "Failed to get stock logs")
-			}
-			if len(stockLogs) > 0 {
-				latestStockLog := stockLogs[0]
-				stockLogIncrease.Stock = latestStockLog.Stock + stockLogIncrease.Increase
-			} else {
-				stockLogIncrease.Stock += stockLogIncrease.Increase
-			}
-			if err := stocklogsRepoTx.CreateOne(c.Context(), stockLogIncrease, nil); err != nil {
-				return fiber.NewError(fiber.StatusInternalServerError, "Gagal membuat log stok masuk")
-			}
-		}
-
-		if len(req.Deliveries) > 0 {
-			for _, delivery := range req.Deliveries {
-				// Skip adding to expensePayloads if SupplierID is 0 (optional)
-				if delivery.SupplierID == 0 {
+			for _, prod := range delivery.Products {
+				detail := detailMap[uint64(prod.ProductID)]
+				if detail == nil {
 					continue
 				}
-
-				for _, prod := range delivery.Products {
-					detail := detailMap[uint64(prod.ProductID)]
-					if detail == nil {
-						continue
-					}
-
-					warehouseID := uint(req.DestinationWarehouseID)
-					supplierID := uint(delivery.SupplierID)
-					deliveredDate := transferDate
-					deliveredQty := prod.ProductQty
-
-					payload := TransferExpenseReceivingPayload{
-						TransferDetailID: detail.Id,
-						ProductID:        uint64(prod.ProductID),
-						WarehouseID:      uint64(warehouseID),
-						SupplierID:       uint64(supplierID),
-						DeliveredQty:     deliveredQty,
-						DeliveredDate:    &deliveredDate,
-					}
-					expensePayloads = append(expensePayloads, payload)
-				}
+				warehouseID := uint(req.DestinationWarehouseID)
+				supplierID := uint(delivery.SupplierID)
+				deliveredDate := transferDate
+				expensePayloads = append(expensePayloads, TransferExpenseReceivingPayload{
+					TransferDetailID: detail.Id,
+					ProductID:        uint64(prod.ProductID),
+					WarehouseID:      uint64(warehouseID),
+					SupplierID:       uint64(supplierID),
+					DeliveredQty:     prod.ProductQty,
+					DeliveredDate:    &deliveredDate,
+				})
 			}
 		}
 
 		return nil
 	})
-
 	if err != nil {
 		if fiberErr, ok := err.(*fiber.Error); ok {
 			return nil, fiberErr
@@ -620,14 +395,13 @@ func (s *transferService) CreateOne(c *fiber.Ctx, req *validation.TransferReques
 		return nil, fiber.NewError(fiber.StatusInternalServerError, "Internal server error")
 	}
 
-	result, err := s.GetOne(c, uint(entityTransfer.Id))
+	result, err := s.GetOne(c, uint(createdTransfer.Id))
 	if err != nil {
 		return nil, err
 	}
-
 	if len(expensePayloads) > 0 {
-		if err := s.notifyExpenseItemsDelivered(c, entityTransfer.Id, expensePayloads); err != nil {
-			s.Log.Errorf("Failed to sync expense for transfer_id=%d, movement_number=%s: %+v", entityTransfer.Id, entityTransfer.MovementNumber, err)
+		if err := s.notifyExpenseItemsDelivered(c, createdTransfer.Id, expensePayloads); err != nil {
+			s.Log.Errorf("Failed to sync expense for transfer_id=%d, movement_number=%s: %+v", createdTransfer.Id, createdTransfer.MovementNumber, err)
 			return nil, fiber.NewError(fiber.StatusInternalServerError, "Gagal sinkronisasi data expense. Silakan cek manual di module expense")
 		}
 	}
@@ -650,177 +424,9 @@ func (s *transferService) DeleteOne(c *fiber.Ctx, id uint) error {
 
 	var deletedDetails []entity.StockTransferDetail
 	err = s.StockTransferRepo.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
-		stockLogRepoTx := rStockLogs.NewStockLogRepository(tx)
-
-		var transfer entity.StockTransfer
-		if err := tx.WithContext(c.Context()).
-			Clauses(clause.Locking{Strength: "UPDATE"}).
-			Where("id = ?", uint64(id)).
-			Where("deleted_at IS NULL").
-			Take(&transfer).Error; err != nil {
-			if errors.Is(err, gorm.ErrRecordNotFound) {
-				return fiber.NewError(fiber.StatusNotFound, fmt.Sprintf("Transfer dengan ID %d tidak ditemukan", id))
-			}
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil data transfer")
-		}
-
-		var details []entity.StockTransferDetail
-		if err := tx.WithContext(c.Context()).
-			Clauses(clause.Locking{Strength: "UPDATE"}).
-			Where("stock_transfer_id = ?", transfer.Id).
-			Where("deleted_at IS NULL").
-			Order("id ASC").
-			Find(&details).Error; err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal mengambil detail transfer")
-		}
-		if len(details) == 0 {
-			return fiber.NewError(fiber.StatusBadRequest, "Transfer tidak memiliki detail produk")
-		}
-
-		detailIDs := make([]uint64, 0, len(details))
-		for _, detail := range details {
-			detailIDs = append(detailIDs, detail.Id)
-		}
-		if err := s.ensureDeletePolicyForDownstreamConsumption(c.Context(), tx, detailIDs); err != nil {
-			return err
-		}
-
-		type reflowKey struct {
-			flagGroupCode      string
-			productWarehouseID uint
-		}
-		destReflows := make(map[reflowKey]struct{})
-
-		for _, detail := range details {
-			if detail.SourceProductWarehouseID == nil || *detail.SourceProductWarehouseID == 0 {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Detail transfer %d tidak memiliki source product warehouse valid", detail.Id))
-			}
-			if detail.DestProductWarehouseID == nil || *detail.DestProductWarehouseID == 0 {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Detail transfer %d tidak memiliki destination product warehouse valid", detail.Id))
-			}
-
-			flagGroupCode, err := s.resolveTransferFlagGroup(c.Context(), tx, uint(detail.ProductId))
-			if err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("FIFO v2 route tidak ditemukan untuk produk %d: %v", detail.ProductId, err))
-			}
-
-			rollbackRes, err := s.FifoStockV2Svc.Rollback(c.Context(), commonSvc.FifoStockV2RollbackRequest{
-				ProductWarehouseID: uint(*detail.SourceProductWarehouseID),
-				Usable: commonSvc.FifoStockV2Ref{
-					ID:            uint(detail.Id),
-					LegacyTypeKey: fifo.UsableKeyStockTransferOut.String(),
-					FunctionCode:  "STOCK_TRANSFER_OUT",
-				},
-				Reason: fmt.Sprintf("transfer delete #%s", transfer.MovementNumber),
-				Tx:     tx,
-			})
-			if err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal rollback FIFO v2 transfer detail %d: %v", detail.Id, err))
-			}
-
-			releasedQty := 0.0
-			if rollbackRes != nil {
-				releasedQty = rollbackRes.ReleasedQty
-			}
-			if detail.UsageQty > 1e-6 && releasedQty < detail.UsageQty-1e-6 {
-				return fiber.NewError(
-					fiber.StatusBadRequest,
-					fmt.Sprintf("Rollback FIFO v2 source transfer detail %d tidak lengkap. Dibutuhkan %.3f, terlepas %.3f", detail.Id, detail.UsageQty, releasedQty),
-				)
-			}
-
-			if releasedQty > 1e-6 {
-				if err := s.appendStockLog(
-					c.Context(),
-					stockLogRepoTx,
-					uint(*detail.SourceProductWarehouseID),
-					actorID,
-					releasedQty,
-					0,
-					uint(detail.Id),
-					fmt.Sprintf("TRANSFER DELETE #%s", transfer.MovementNumber),
-				); err != nil {
-					return err
-				}
-			}
-
-			destDecreaseQty := detail.TotalQty
-			if destDecreaseQty <= 1e-6 {
-				destDecreaseQty = detail.UsageQty
-			}
-			if destDecreaseQty > 1e-6 {
-				if err := s.appendStockLog(
-					c.Context(),
-					stockLogRepoTx,
-					uint(*detail.DestProductWarehouseID),
-					actorID,
-					0,
-					destDecreaseQty,
-					uint(detail.Id),
-					fmt.Sprintf("TRANSFER DELETE #%s", transfer.MovementNumber),
-				); err != nil {
-					return err
-				}
-			}
-
-			destReflows[reflowKey{
-				flagGroupCode:      flagGroupCode,
-				productWarehouseID: uint(*detail.DestProductWarehouseID),
-			}] = struct{}{}
-		}
-
-		now := time.Now().UTC()
-		if err := tx.WithContext(c.Context()).
-			Where("stock_transfer_detail_id IN ?", detailIDs).
-			Delete(&entity.StockTransferDeliveryItem{}).Error; err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus item delivery transfer")
-		}
-		if err := tx.WithContext(c.Context()).
-			Model(&entity.StockTransferDelivery{}).
-			Where("stock_transfer_id = ?", transfer.Id).
-			Where("deleted_at IS NULL").
-			Updates(map[string]any{
-				"deleted_at": now,
-				"updated_at": now,
-			}).Error; err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus delivery transfer")
-		}
-		if err := tx.WithContext(c.Context()).
-			Model(&entity.StockTransferDetail{}).
-			Where("id IN ?", detailIDs).
-			Where("deleted_at IS NULL").
-			Updates(map[string]any{
-				"deleted_at": now,
-				"updated_at": now,
-			}).Error; err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus detail transfer")
-		}
-
-		asOf := transfer.TransferDate
-		for key := range destReflows {
-			if _, err := s.FifoStockV2Svc.Reflow(c.Context(), commonSvc.FifoStockV2ReflowRequest{
-				FlagGroupCode:      key.flagGroupCode,
-				ProductWarehouseID: key.productWarehouseID,
-				AsOf:               &asOf,
-				Tx:                 tx,
-			}); err != nil {
-				return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Gagal reflow stok tujuan saat delete transfer: %v", err))
-			}
-		}
-
-		if err := tx.WithContext(c.Context()).
-			Model(&entity.StockTransfer{}).
-			Where("id = ?", transfer.Id).
-			Where("deleted_at IS NULL").
-			Updates(map[string]any{
-				"deleted_at": now,
-				"updated_at": now,
-			}).Error; err != nil {
-			return fiber.NewError(fiber.StatusInternalServerError, "Gagal menghapus transfer")
-		}
-
-		deletedDetails = append(deletedDetails, details...)
-		return nil
+		var err error
+		deletedDetails, err = s.deleteTransferCore(c.Context(), tx, uint64(id), actorID)
+		return err
 	})
 	if err != nil {
 		if fiberErr, ok := err.(*fiber.Error); ok {
@@ -863,13 +469,31 @@ func (s *transferService) resolveTransferFlagGroup(
 		Where(`
 			EXISTS (
 				SELECT 1
-				FROM flags f
-				JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
-				WHERE f.flagable_type = ?
-				  AND f.flagable_id = ?
-				  AND fm.flag_group_code = rr.flag_group_code
+				FROM products p
+				LEFT JOIN product_categories pc ON pc.id = p.product_category_id
+				WHERE p.id = ?
+				  AND (
+					EXISTS (
+						SELECT 1
+						FROM flags f
+						JOIN fifo_stock_v2_flag_members fm ON fm.flag_name = f.name AND fm.is_active = TRUE
+						WHERE f.flagable_type = ?
+						  AND f.flagable_id = p.id
+						  AND fm.flag_group_code = rr.flag_group_code
+					)
+					OR (
+						NOT EXISTS (
+							SELECT 1
+							FROM flags f_any
+							WHERE f_any.flagable_type = ?
+							  AND f_any.flagable_id = p.id
+						)
+						AND rr.flag_group_code = ?
+						AND UPPER(COALESCE(pc.code, '')) = 'EGG'
+					)
+				  )
 			)
-		`, entity.FlagableTypeProduct, productID).
+		`, productID, entity.FlagableTypeProduct, entity.FlagableTypeProduct, utils.LegacyFlagGroupCodeByProductCategoryCode("EGG")).
 		Order("rr.id ASC").
 		Limit(1).
 		Take(&selected).Error