Revert "Merge branch 'fix/implement-fifo-v2' into 'dev/fifo-v2'"

This reverts merge request !340

internal/modules/marketing/repositories/salesorder_delivery_product.repository.go

@@ -105,7 +105,6 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanForAgeChickD
 		Joins("JOIN project_flock_kandangs ON project_flock_kandangs.id = product_warehouses.project_flock_kandang_id").
 		Where("project_flock_kandangs.project_flock_id = ?", projectFlockID).
 		Where("flags.name IN (?)", []string{
-			string(utils.FlagAyam),
 			string(utils.FlagAyamAfkir),
 			string(utils.FlagAyamCulling),
 			string(utils.FlagPullet),
@@ -159,12 +158,9 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetClosingPenjualanByCategory(c
 			string(utils.FlagTelurPecah),
 			string(utils.FlagTelurPutih),
 			string(utils.FlagTelurRetak),
-			string(utils.FlagTelurPapacal),
-			string(utils.FlagTelurJumbo),
 		})
 	} else {
 		db = db.Where("flags.name IN (?)", []string{
-			string(utils.FlagAyam),
 			string(utils.FlagDOC),
 			string(utils.FlagPullet),
 			string(utils.FlagLayer),
@@ -331,12 +327,12 @@ func (r *MarketingDeliveryProductRepositoryImpl) GetAllWithFilters(ctx context.C
 		switch filters.MarketingType {
 		case "ayam":
 			db = db.Where("flags.name IN (?)", []string{
-				string(utils.FlagAyam), string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer),
+				string(utils.FlagDOC), string(utils.FlagPullet), string(utils.FlagLayer),
 			})
 		case "telur":
 			db = db.Where("flags.name IN (?)", []string{
 				string(utils.FlagTelur), string(utils.FlagTelurUtuh), string(utils.FlagTelurPecah),
-				string(utils.FlagTelurPutih), string(utils.FlagTelurRetak), string(utils.FlagTelurPapacal), string(utils.FlagTelurJumbo),
+				string(utils.FlagTelurPutih), string(utils.FlagTelurRetak),
 			})
 		case "trading":
 			db = db.Where("flags.name IN (?)", []string{

internal/modules/marketing/services/deliveryorder.service.go

@@ -549,29 +549,8 @@ func (s deliveryOrdersService) consumeDeliveryStock(ctx context.Context, tx *gor
 		return fiber.NewError(fiber.StatusInternalServerError, "Delivery product not found")
 	}
 
-	route, err := commonSvc.ResolveFifoStockV2RouteByProductWarehouseIDAndLane(
-		ctx,
-		tx,
-		marketingProduct.ProductWarehouseId,
-		"MARKETING_OUT",
-		commonSvc.FifoStockV2LaneUsable,
-	)
-	if err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve FIFO v2 marketing route")
-	}
-	if route == nil {
-		return fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf("Product warehouse %d tidak mendukung transaksi Marketing pada matrix FIFO v2", marketingProduct.ProductWarehouseId),
-		)
-	}
-	usableKey := fifo.UsableKey(route.LegacyTypeKey)
-	if route.LegacyTypeKey == "" {
-		usableKey = fifo.UsableKeyMarketingDelivery
-	}
-
 	result, err := s.FifoSvc.Consume(ctx, commonSvc.StockConsumeRequest{
-		UsableKey:          usableKey,
+		UsableKey:          fifo.UsableKeyMarketingDelivery,
 		UsableID:           deliveryProduct.Id,
 		ProductWarehouseID: marketingProduct.ProductWarehouseId,
 		Quantity:           requestedQty,
@@ -624,27 +603,6 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 		return fiber.NewError(fiber.StatusInternalServerError, "Product warehouse not found")
 	}
 
-	route, err := commonSvc.ResolveFifoStockV2RouteByProductWarehouseIDAndLane(
-		ctx,
-		tx,
-		marketingProduct.ProductWarehouseId,
-		"MARKETING_OUT",
-		commonSvc.FifoStockV2LaneUsable,
-	)
-	if err != nil {
-		return fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve FIFO v2 marketing route")
-	}
-	if route == nil {
-		return fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf("Product warehouse %d tidak mendukung transaksi Marketing pada matrix FIFO v2", marketingProduct.ProductWarehouseId),
-		)
-	}
-	usableKey := fifo.UsableKey(route.LegacyTypeKey)
-	if route.LegacyTypeKey == "" {
-		usableKey = fifo.UsableKeyMarketingDelivery
-	}
-
 	deliveryProductRepo := marketingRepo.NewMarketingDeliveryProductRepository(tx)
 	currentUsage, err := deliveryProductRepo.GetUsageQty(ctx, deliveryProduct.Id)
 	if err != nil {
@@ -656,7 +614,7 @@ func (s deliveryOrdersService) releaseDeliveryStock(ctx context.Context, tx *gor
 	}
 
 	if err := s.FifoSvc.ReleaseUsage(ctx, commonSvc.StockReleaseRequest{
-		UsableKey: usableKey,
+		UsableKey: fifo.UsableKeyMarketingDelivery,
 		UsableID:  deliveryProduct.Id,
 		Tx:        tx,
 	}); err != nil {

internal/modules/marketing/services/salesorder.service.go

@@ -48,8 +48,6 @@ type salesOrdersService struct {
 	ProjectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository
 }
 
-const marketingFunctionCodeOut = "MARKETING_OUT"
-
 func NewSalesOrdersService(marketingRepo repository.MarketingRepository, customerRepo customerRepo.CustomerRepository, productWarehouseRepo productWarehouseRepo.ProductWarehouseRepository, userRepo userRepo.UserRepository, approvalSvc commonSvc.ApprovalService, fifoSvc commonSvc.FifoService, warehouseRepo warehouseRepo.WarehouseRepository,
 	projectFlockKandangRepo projectFlockKandangRepo.ProjectFlockKandangRepository, validate *validator.Validate) SalesOrdersService {
 	return &salesOrdersService{
@@ -76,36 +74,6 @@ func (s salesOrdersService) withRelations(db *gorm.DB) *gorm.DB {
 		Preload("Products.ProductWarehouse.Warehouse")
 }
 
-func (s salesOrdersService) resolveMarketingUsableKey(ctx context.Context, tx *gorm.DB, productWarehouseID uint) (fifo.UsableKey, error) {
-	if productWarehouseID == 0 {
-		return "", fiber.NewError(fiber.StatusBadRequest, "Product warehouse tidak valid untuk transaksi Marketing")
-	}
-
-	route, err := commonSvc.ResolveFifoStockV2RouteByProductWarehouseIDAndLane(
-		ctx,
-		tx,
-		productWarehouseID,
-		marketingFunctionCodeOut,
-		commonSvc.FifoStockV2LaneUsable,
-	)
-	if err != nil {
-		return "", fiber.NewError(fiber.StatusInternalServerError, "Failed to resolve FIFO v2 marketing route")
-	}
-	if route == nil {
-		return "", fiber.NewError(
-			fiber.StatusBadRequest,
-			fmt.Sprintf("Product warehouse %d tidak mendukung transaksi Marketing pada matrix FIFO v2", productWarehouseID),
-		)
-	}
-
-	usableKey := fifo.UsableKey(strings.TrimSpace(route.LegacyTypeKey))
-	if usableKey == "" {
-		usableKey = fifo.UsableKeyMarketingDelivery
-	}
-
-	return usableKey, nil
-}
-
 func (s salesOrdersService) getOne(c *fiber.Ctx, id uint) (*entity.Marketing, error) {
 	if err := m.EnsureMarketingAccess(c, s.MarketingRepo.DB(), id); err != nil {
 		return nil, err
@@ -408,12 +376,8 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 						if qtyDiff < 0 {
 							return fiber.NewError(fiber.StatusBadRequest, "Cannot decrease quantity after stock has been allocated. Please delete and create new product.")
 						} else if qtyDiff > 0 {
-							usableKey, err := s.resolveMarketingUsableKey(c.Context(), dbTransaction, rp.ProductWarehouseId)
-							if err != nil {
-								return err
-							}
-							_, err = s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
-								UsableKey:          usableKey,
+							_, err := s.FifoSvc.Consume(c.Context(), commonSvc.StockConsumeRequest{
+								UsableKey:          fifo.UsableKeyMarketingDelivery,
 								UsableID:           deliveryProduct.Id,
 								ProductWarehouseID: rp.ProductWarehouseId,
 								Quantity:           qtyDiff,
@@ -474,13 +438,9 @@ func (s salesOrdersService) UpdateOne(c *fiber.Ctx, req *validation.Update, id u
 						if deliveryProduct.DeliveryDate != nil {
 							return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Cannot delete marketing product %d because it has been delivered", old.Id))
 						}
-						usableKey, err := s.resolveMarketingUsableKey(c.Context(), dbTransaction, old.ProductWarehouseId)
-						if err != nil {
-							return err
-						}
 
 						if err := s.FifoSvc.ReleaseUsage(c.Context(), commonSvc.StockReleaseRequest{
-							UsableKey: usableKey,
+							UsableKey: fifo.UsableKeyMarketingDelivery,
 							UsableID:  deliveryProduct.Id,
 							Tx:        dbTransaction,
 						}); err != nil {
@@ -562,22 +522,9 @@ func (s salesOrdersService) DeleteOne(c *fiber.Ctx, id uint) error {
 		if len(marketing.Products) > 0 {
 			deliveryProducts, err := marketingDeliveryProductRepoTx.GetByMarketingId(c.Context(), marketing.Id)
 			if err == nil && len(deliveryProducts) > 0 {
-				deliveryUsableKeyByProductID := make(map[uint]fifo.UsableKey, len(marketing.Products))
-				for _, product := range marketing.Products {
-					usableKey, err := s.resolveMarketingUsableKey(c.Context(), dbTransaction, product.ProductWarehouseId)
-					if err != nil {
-						return err
-					}
-					deliveryUsableKeyByProductID[product.Id] = usableKey
-				}
-
 				for _, dp := range deliveryProducts {
-					usableKey, ok := deliveryUsableKeyByProductID[dp.MarketingProductId]
-					if !ok {
-						return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("Product untuk delivery %d tidak ditemukan", dp.Id))
-					}
 					if err := s.FifoSvc.ReleaseUsage(c.Context(), commonSvc.StockReleaseRequest{
-						UsableKey: usableKey,
+						UsableKey: fifo.UsableKeyMarketingDelivery,
 						UsableID:  dp.Id,
 						Tx:        dbTransaction,
 					}); err != nil {