ci: align mr development production triggers

.gitlab-ci.yml

@@ -1,35 +1,142 @@
+stages:
+  - build
+  - gitops
+
+variables:
+  AWS_REGION: ap-southeast-3
+  ECR_REGISTRY: 886436954922.dkr.ecr.ap-southeast-3.amazonaws.com
+  ECR_REPO_NAME: mbugroup/lti-api
+  ECR_REPOSITORY: ${ECR_REGISTRY}/${ECR_REPO_NAME}
+
+  DOCKER_HOST: unix:///var/run/docker.sock
+  DOCKER_TLS_CERTDIR: ""
+  DOCKER_BUILDKIT: "1"
+
 workflow:
   rules:
-    # MR pipeline
+    # run untuk branch utama & MR
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
-      when: always
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
-
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
-    # Push pipeline hanya untuk env branch
-    - if: '$CI_COMMIT_BRANCH == "development"'
-      when: always
-    - if: '$CI_COMMIT_BRANCH == "staging"'
-      when: always
-    - if: '$CI_COMMIT_BRANCH == "production"'
-      when: always
-
-    # Selain itu jangan buat pipeline
     - when: never
 
-include:
+# =========================
-  # khusus MR (notif)
+# Helper: login ECR
-  - local: "ci/merge_request.yml"
+# =========================
-    rules:
+.ecr_login: &ecr_login |
-      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+  AWS_CLI_ENV_ARGS=""
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_REGION=$AWS_REGION"
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}"
+  AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-}"
+  if [ -n "${AWS_SESSION_TOKEN:-}" ]; then
+    AWS_CLI_ENV_ARGS="$AWS_CLI_ENV_ARGS -e AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN"
+  fi
 
-  # khusus push ke branch env
+  PASS="$(docker run --rm $AWS_CLI_ENV_ARGS public.ecr.aws/aws-cli/aws-cli:latest \
-  - local: "ci/development.yml"
+    ecr get-login-password --region "$AWS_REGION" || true)"
-    rules:
+  if [ -z "$PASS" ]; then
-      - if: '$CI_COMMIT_BRANCH == "development"'
+    echo "ERROR: Failed to get ECR login password."
+    exit 1
+  fi
+  echo "$PASS" | docker login --username AWS --password-stdin "$ECR_REGISTRY"
 
-  - local: "ci/staging.yml"
+# =========================
-    rules:
+# MR
-      - if: '$CI_COMMIT_BRANCH == "staging"'
+# =========================
+build_mr:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "production"'
+  variables:
+    IMAGE_TAG: "prod-mr-${CI_COMMIT_SHORT_SHA}"
+  before_script:
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    echo "Build (MR) : $ECR_REPOSITORY:$IMAGE_TAG"
+    docker build -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
+    echo "Pushing image for MR..."
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
 
-  - local: "ci/production.yml"
+# =========================
-    rules:
+# DEVELOPMENT (push branch development)
-      - if: '$CI_COMMIT_BRANCH == "production"'
+# =========================
+build_push_dev:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "development"'
+  variables:
+    IMAGE_TAG: "dev-${CI_COMMIT_SHORT_SHA}"
+  before_script:
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    echo "Build & push (dev): $ECR_REPOSITORY:$IMAGE_TAG"
+    docker build -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
+
+# =========================
+# PRODUCTION (push branch production)
+# =========================
+build_push_prod:
+  stage: build
+  image: public.ecr.aws/docker/library/docker:27
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+  variables:
+    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+  before_script:
+    - set -eu
+    - docker version
+    - docker info
+    - *ecr_login
+  script: |
+    set -eu
+    echo "Build & push (prod): $ECR_REPOSITORY:$IMAGE_TAG"
+    docker build -f Dockerfile -t "$ECR_REPOSITORY:$IMAGE_TAG" .
+    docker push "$ECR_REPOSITORY:$IMAGE_TAG"
+
+update_gitops_prod_lti:
+  stage: gitops
+  image: public.ecr.aws/docker/library/alpine:3.20
+  tags: [self-hosted-dev]
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "production"'
+  needs: ["build_push_prod"]
+  variables:
+    IMAGE_TAG: "prod-${CI_COMMIT_SHORT_SHA}"
+    GITOPS_BRANCH: main
+    VALUES_FILE: environments/lti/prod/lti-values-prod.yaml
+    GITOPS_REPO_URL: https://oauth2:${GITOPS_TOKEN}@gitlab.com/cristian.anggita.parjaman/gitops.git
+  before_script:
+    - set -eu
+    - apk add --no-cache git yq
+    - git config --global user.email "ci@gitlab"
+    - git config --global user.name "gitlab-ci"
+  script: |
+    set -eu
+    rm -rf gitops
+    git clone --depth 1 --branch "$GITOPS_BRANCH" "$GITOPS_REPO_URL" gitops
+    cd gitops
+
+    echo "Updating prod image.tag to $IMAGE_TAG"
+    yq -i '.image.tag = strenv(IMAGE_TAG)' "$VALUES_FILE"
+
+    git add "$VALUES_FILE"
+    if git diff --cached --quiet; then
+      echo "No changes to commit"
+      exit 0
+    fi
+    git commit -m "lti prod deploy ${IMAGE_TAG}"
+    git push origin "$GITOPS_BRANCH"

README.md

@@ -111,3 +111,4 @@ IT Development PT Mitra Berlian Unggas Group
 ## 📃 License
 
 > This project is private. All rights reserved.
+# mr test Sat  7 Feb 2026 00:14:58 WIB

internal/common/service/common.fifo.service.go

@@ -26,7 +26,6 @@ type FifoService interface {
 	Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error)
 	ReleaseUsage(ctx context.Context, req StockReleaseRequest) error
 	AdjustStockableQuantity(ctx context.Context, req StockAdjustRequest) error
-	ResolvePending(ctx context.Context, req PendingResolveRequest) ([]PendingResolution, error)
 }
 
 type fifoService struct {
@@ -112,11 +111,6 @@ type PendingResolution struct {
 	Quantity  float64
 }
 
-type PendingResolveRequest struct {
-	ProductWarehouseID uint
-	Tx                 *gorm.DB
-}
-
 type StockReplenishResult struct {
 	AddedQuantity    float64
 	PendingResolved  []PendingResolution
@@ -233,23 +227,6 @@ func (s *fifoService) Replenish(ctx context.Context, req StockReplenishRequest)
 	return result, nil
 }
 
-func (s *fifoService) ResolvePending(ctx context.Context, req PendingResolveRequest) ([]PendingResolution, error) {
-	if req.ProductWarehouseID == 0 {
-		return nil, errors.New("product warehouse id is required")
-	}
-
-	var resolved []PendingResolution
-	err := s.withTransaction(ctx, req.Tx, func(tx *gorm.DB) error {
-		var err error
-		resolved, err = s.resolvePendingForWarehouse(ctx, tx, req.ProductWarehouseID)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-	return resolved, nil
-}
-
 func (s *fifoService) Consume(ctx context.Context, req StockConsumeRequest) (*StockConsumeResult, error) {
 	if req.UsableID == 0 || strings.TrimSpace(req.UsableKey.String()) == "" {
 		return nil, errors.New("usable key and id are required")
@@ -872,8 +849,8 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 		if cfg.Columns.CreatedAt == cfg.Columns.ID {
 			var rows []struct {
 				ID        uint
-				Pending   float64 `gorm:"column:pending_qty"`
+				Pending   float64
-				CreatedAt int64   `gorm:"column:created_at"`
+				CreatedAt int64
 			}
 
 			query := tx.Table(cfg.Table).
@@ -890,26 +867,27 @@ func (s *fifoService) fetchPendingCandidates(ctx context.Context, tx *gorm.DB, p
 				query = query.Order(order)
 			}
 
-		if err := query.Find(&rows).Error; err != nil {
+			if err := query.Find(&rows).Error; err != nil {
-			return nil, err
+				return nil, err
-		}
-		for _, row := range rows {
-			if row.Pending <= 0 {
-				continue
 			}
-			candidates = append(candidates, pendingCandidate{
+
-				UsableKey: key,
+			for _, row := range rows {
-				Config:    cfg,
+				if row.Pending <= 0 {
-				UsableID:  row.ID,
+					continue
-				Pending:   row.Pending,
+				}
-				CreatedAt: time.Unix(0, row.CreatedAt),
+				candidates = append(candidates, pendingCandidate{
-			})
+					UsableKey: key,
-		}
+					Config:    cfg,
-	} else {
+					UsableID:  row.ID,
+					Pending:   row.Pending,
+					CreatedAt: time.Unix(0, row.CreatedAt),
+				})
+			}
+		} else {
 			var rows []struct {
 				ID        uint
-				Pending   float64   `gorm:"column:pending_qty"`
+				Pending   float64
-				CreatedAt time.Time `gorm:"column:created_at"`
+				CreatedAt time.Time
 			}
 
 			query := tx.Table(cfg.Table).

internal/database/seed/seeder.go

@@ -74,7 +74,7 @@ func seedUsers(tx *gorm.DB) (map[string]uint, error) {
 }
 
 func seedUoms(tx *gorm.DB, createdBy uint) (map[string]uint, error) {
-	names := []string{"Kilogram", "Gram", "Liter", "Unit", "Ekor", "Butir"}
+	names := []string{"Kilogram", "Gram", "Liter", "Unit", "Ekor"}
 	result := make(map[string]uint, len(names))
 
 	for _, name := range names {
@@ -235,7 +235,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Utuh",
 			Brand:     "-",
 			Sku:       "4",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurUtuh},
@@ -245,7 +245,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Pecah",
 			Brand:     "-",
 			Sku:       "5",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurPecah},
@@ -255,7 +255,7 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Putih",
 			Brand:     "-",
 			Sku:       "6",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurPutih},
@@ -265,32 +265,12 @@ func seedProducts(tx *gorm.DB, createdBy uint, uoms map[string]uint, categories
 			Name:      "Telur Retak",
 			Brand:     "-",
 			Sku:       "7",
-			Uom:       "Butir",
+			Uom:       "Gram",
 			Category:  "Telur",
 			Price:     1,
 			Flags:     []utils.FlagType{utils.FlagTelurRetak},
 			IsVisible: false,
 		},
-		{
-			Name:      "Telur Papacal",
-			Brand:     "-",
-			Sku:       "8",
-			Uom:       "Butir",
-			Category:  "Telur",
-			Price:     1,
-			Flags:     []utils.FlagType{utils.FlagTelur},
-			IsVisible: false,
-		},
-		{
-			Name:      "Telur Jumbo",
-			Brand:     "-",
-			Sku:       "9",
-			Uom:       "Butir",
-			Category:  "Telur",
-			Price:     1,
-			Flags:     []utils.FlagType{utils.FlagTelur},
-			IsVisible: false,
-		},
 	}
 
 	for _, seed := range seeds {

internal/entities/purchase_item.go

@@ -21,7 +21,6 @@ type PurchaseItem struct {
 	Price                 float64 `gorm:"type:numeric(15,3);default:0"`
 	TotalPrice            float64 `gorm:"type:numeric(15,3);default:0"`
 	ExpenseNonstockId     *uint64
-	HasChickin            bool `gorm:"-" json:"-"`
 
 	// Relations
 	ExpenseNonstock  *ExpenseNonstock  `gorm:"foreignKey:ExpenseNonstockId;references:Id"`

internal/modules/marketing/controllers/deliveryorder.controller.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"math"
 	"strconv"
-	"strings"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/dto"
 	service "gitlab.com/mbugroup/lti-api.git/internal/modules/marketing/services"
@@ -24,38 +23,9 @@ func NewDeliveryOrdersController(deliveryOrdersService service.DeliveryOrdersSer
 }
 
 func (u *DeliveryOrdersController) GetAll(c *fiber.Ctx) error {
-	parseUintListParam := func(param string) ([]uint, error) {
-		if param == "" {
-			return nil, nil
-		}
-		parts := strings.Split(param, ",")
-		ids := make([]uint, 0, len(parts))
-		for _, part := range parts {
-			trimmed := strings.TrimSpace(part)
-			if trimmed == "" {
-				return nil, strconv.ErrSyntax
-			}
-			parsed, err := strconv.ParseUint(trimmed, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			ids = append(ids, uint(parsed))
-		}
-		return ids, nil
-	}
-
-	productIDs, err := parseUintListParam(c.Query("product_ids", ""))
-	if err != nil {
-		return fiber.NewError(fiber.StatusBadRequest, "Invalid product_ids")
-	}
-
 	query := &validation.DeliveryOrderQuery{
 		Page:        c.QueryInt("page", 1),
 		Limit:       c.QueryInt("limit", 10),
-		Search:      strings.TrimSpace(c.Query("search", "")),
-		ProductIDs:  productIDs,
-		Status:      strings.ReplaceAll(strings.TrimSpace(c.Query("status", "")), "_", " "),
-		CustomerId:  uint(c.QueryInt("customer_id", 0)),
 		MarketingId: uint(c.QueryInt("marketing_id", 0)),
 	}
 

internal/modules/marketing/dto/deliveryorder.dto.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"math"
 	"sort"
-	"strings"
 	"time"
 
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -18,7 +17,6 @@ import (
 type MarketingRelationDTO struct {
 	Id       uint      `json:"id"`
 	SoNumber string    `json:"so_number"`
-	DoNumber *string   `json:"do_number"`
 	SoDate   time.Time `json:"so_date"`
 	Notes    string    `json:"notes,omitempty"`
 }
@@ -97,16 +95,9 @@ type DeliveryMarketingProductDTO struct {
 }
 
 func ToMarketingRelationDTO(marketing *entity.Marketing) MarketingRelationDTO {
-	var doNumber *string
-	if doNumbers := collectDoNumbers(marketing); len(doNumbers) > 0 {
-		value := doNumbers[0]
-		doNumber = &value
-	}
-
 	return MarketingRelationDTO{
 		Id:       marketing.Id,
 		SoNumber: marketing.SoNumber,
-		DoNumber: doNumber,
 		SoDate:   marketing.SoDate,
 		Notes:    marketing.Notes,
 	}
@@ -191,6 +182,7 @@ func ToMarketingListDTO(marketing *entity.Marketing, deliveryProducts []entity.M
 			salesOrderProducts[i] = ToDeliveryMarketingProductDTO(product, marketing.MarketingType)
 		}
 	}
+
 	return MarketingListDTO{
 		MarketingRelationDTO: ToMarketingRelationDTO(marketing),
 		Customer:             customer,
@@ -247,6 +239,7 @@ func ToMarketingDetailDTO(marketing *entity.Marketing, deliveryProducts []entity
 		mapped := approvalDTO.ToApprovalDTO(*marketing.LatestApproval)
 		latestApproval = mapped
 	}
+
 	return MarketingDetailDTO{
 		MarketingRelationDTO: ToMarketingRelationDTO(marketing),
 		SoDocs:               marketing.SoDocs,
@@ -353,46 +346,11 @@ func groupDeliveryProducts(products []MarketingDeliveryProductDTO, soNumber stri
 }
 
 func GenerateDeliveryOrderNumber(soNumber string, deliveryDate *time.Time, warehouseId uint) string {
-	numberPrefix := soNumber
+	dateStr := ""
-	if strings.HasPrefix(strings.ToUpper(strings.TrimSpace(soNumber)), "SO-") {
+	if deliveryDate != nil {
-		numberPrefix = "DO-" + soNumber[3:]
+		dateStr = deliveryDate.Format("20060102")
 	}
-	return numberPrefix
+	return fmt.Sprintf("%s-%s-%d", soNumber, dateStr, warehouseId)
-}
-
-func collectDoNumbers(marketing *entity.Marketing) []string {
-	if marketing == nil || len(marketing.Products) == 0 {
-		return nil
-	}
-
-	seen := make(map[string]struct{})
-	for _, product := range marketing.Products {
-		if product.DeliveryProduct == nil || product.DeliveryProduct.DeliveryDate == nil {
-			continue
-		}
-		warehouseID := product.ProductWarehouse.WarehouseId
-		if warehouseID == 0 && product.ProductWarehouse.Warehouse.Id != 0 {
-			warehouseID = product.ProductWarehouse.Warehouse.Id
-		}
-		if warehouseID == 0 {
-			continue
-		}
-
-		doNumber := GenerateDeliveryOrderNumber(marketing.SoNumber, product.DeliveryProduct.DeliveryDate, warehouseID)
-		if doNumber != "" {
-			seen[doNumber] = struct{}{}
-		}
-	}
-
-	if len(seen) == 0 {
-		return nil
-	}
-	result := make([]string, 0, len(seen))
-	for value := range seen {
-		result = append(result, value)
-	}
-	sort.Strings(result)
-	return result
 }
 
 func getVehicleNumber(e entity.MarketingProduct) string {

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

@@ -116,71 +116,6 @@ func (s deliveryOrdersService) GetAll(c *fiber.Ctx, params *validation.DeliveryO
 			Preload("Products.ProductWarehouse.Warehouse").
 			Preload("Products.DeliveryProduct")
 
-		if params.Status != "" {
-			latestApprovalSubQuery := s.MarketingRepo.DB().
-				WithContext(c.Context()).
-				Table("approvals").
-				Select("DISTINCT ON (approvable_id) approvable_id, step_name").
-				Where("approvable_type = ?", utils.ApprovalWorkflowMarketing.String()).
-				Order("approvable_id, id DESC")
-			db = db.Where(`EXISTS (
-				SELECT 1
-				FROM (?) AS latest_approval
-				WHERE latest_approval.approvable_id = marketings.id
-					AND LOWER(latest_approval.step_name) = LOWER(?)
-			)`, latestApprovalSubQuery, params.Status)
-		}
-
-		if params.Search != "" {
-			searchPattern := "%" + params.Search + "%"
-			db = db.Where(`(
-				marketings.so_number ILIKE ? OR
-				EXISTS (
-					SELECT 1
-					FROM customers c
-					WHERE c.id = marketings.customer_id
-						AND c.name ILIKE ?
-				) OR
-				EXISTS (
-					SELECT 1
-					FROM users su
-					WHERE su.id = marketings.sales_person_id
-						AND su.name ILIKE ?
-				) OR
-				EXISTS (
-					SELECT 1
-					FROM marketing_products mp
-					JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
-					JOIN products p ON p.id = pw.product_id
-					WHERE mp.marketing_id = marketings.id
-						AND p.name ILIKE ?
-				) OR
-				EXISTS (
-					SELECT 1
-					FROM marketing_products mp
-					JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
-					JOIN warehouses w ON w.id = pw.warehouse_id
-					WHERE mp.marketing_id = marketings.id
-						AND w.name ILIKE ?
-				)
-			)`, searchPattern, searchPattern, searchPattern, searchPattern, searchPattern)
-		}
-
-		if len(params.ProductIDs) > 0 {
-			db = db.Where(`EXISTS (
-				SELECT 1
-				FROM marketing_products mp
-				JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id
-				JOIN products p ON p.id = pw.product_id
-				WHERE mp.marketing_id = marketings.id
-					AND p.id IN ?
-			)`, params.ProductIDs)
-		}
-
-		if params.CustomerId != 0 {
-			db = db.Where("marketings.customer_id = ?", params.CustomerId)
-		}
-
 		if scope.Restrict {
 			if len(scope.IDs) == 0 {
 				return db.Where("1 = 0")

internal/modules/marketing/validations/deliveryorder.validation.go

@@ -19,13 +19,9 @@ type DeliveryOrderUpdate struct {
 }
 
 type DeliveryOrderQuery struct {
-	Page        int    `query:"page" validate:"omitempty,number,min=1,gt=0"`
+	Page        int  `query:"page" validate:"omitempty,number,min=1,gt=0"`
-	Limit       int    `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
+	Limit       int  `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
-	Search      string `query:"search" validate:"omitempty,max=100"`
+	MarketingId uint `query:"marketing_id" validate:"omitempty,gt=0"`
-	ProductIDs  []uint `query:"product_ids" validate:"omitempty,dive,gt=0"`
-	Status      string `query:"status" validate:"omitempty,max=50"`
-	CustomerId  uint   `query:"customer_id" validate:"omitempty,gt=0"`
-	MarketingId uint   `query:"marketing_id" validate:"omitempty,gt=0"`
 }
 
 type DeliveryOrderApprove struct {

internal/modules/master/product-categories/services/product-category.service.go

@@ -52,22 +52,7 @@ func (s productCategoryService) GetAll(c *fiber.Ctx, params *validation.Query) (
 	productCategories, total, err := s.Repository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
 		db = s.withRelations(db)
 		if params.Search != "" {
-			terms := splitSearchTerms(params.Search)
+			return db.Where("name ILIKE ?", "%"+params.Search+"%")
-			if len(terms) == 0 {
-				return db
-			}
-			if len(terms) == 1 {
-				return db.Where("name ILIKE ?", "%"+terms[0]+"%")
-			}
-			for i, term := range terms {
-				like := "%" + term + "%"
-				if i == 0 {
-					db = db.Where("name ILIKE ?", like)
-				} else {
-					db = db.Or("name ILIKE ?", like)
-				}
-			}
-			return db
 		}
 		return db.Order("created_at DESC").Order("updated_at DESC")
 	})
@@ -79,20 +64,6 @@ func (s productCategoryService) GetAll(c *fiber.Ctx, params *validation.Query) (
 	return productCategories, total, nil
 }
 
-func splitSearchTerms(raw string) []string {
-	parts := strings.FieldsFunc(raw, func(r rune) bool {
-		return r == ',' || r == ';' || r == '|'
-	})
-	terms := make([]string, 0, len(parts))
-	for _, part := range parts {
-		trimmed := strings.TrimSpace(part)
-		if trimmed != "" {
-			terms = append(terms, trimmed)
-		}
-	}
-	return terms
-}
-
 func (s productCategoryService) GetOne(c *fiber.Ctx, id uint) (*entity.ProductCategory, error) {
 	productCategory, err := s.Repository.GetByID(c.Context(), id, s.withRelations)
 	if errors.Is(err, gorm.ErrRecordNotFound) {

internal/modules/production/recordings/repositories/recording.repository.go

@@ -40,7 +40,6 @@ type RecordingRepository interface {
 
 	SumRecordingDepletions(tx *gorm.DB, recordingID uint) (float64, error)
 	GetCumulativeDepletionByProjectFlockKandangUntil(tx *gorm.DB, projectFlockKandangId uint, recordTime time.Time) (float64, error)
-	GetUniformityMeanBwByWeek(tx *gorm.DB, projectFlockKandangId uint, week int) (float64, bool, error)
 	FindPreviousRecording(tx *gorm.DB, projectFlockKandangId uint, currentDay int) (*entity.Recording, error)
 	GetTotalChick(tx *gorm.DB, projectFlockKandangId uint) (int64, error)
 	GetTotalChickinByProjectFlockKandang(tx *gorm.DB, projectFlockKandangId uint) (float64, error)
@@ -332,33 +331,6 @@ func (r *RecordingRepositoryImpl) GetCumulativeDepletionByProjectFlockKandangUnt
 	return total, err
 }
 
-func (r *RecordingRepositoryImpl) GetUniformityMeanBwByWeek(tx *gorm.DB, projectFlockKandangId uint, week int) (float64, bool, error) {
-	if projectFlockKandangId == 0 || week <= 0 {
-		return 0, false, nil
-	}
-
-	var row struct {
-		ID     uint
-		MeanUp float64
-	}
-	if err := tx.
-		Table("project_flock_kandang_uniformity").
-		Select("id, mean_up").
-		Where("project_flock_kandang_id = ?", projectFlockKandangId).
-		Where("week = ?", week).
-		Order("id DESC").
-		Limit(1).
-		Scan(&row).Error; err != nil {
-		return 0, false, err
-	}
-	if row.ID == 0 {
-		return 0, false, nil
-	}
-
-	meanBw := row.MeanUp / 1.10
-	return meanBw, true, nil
-}
-
 func (r *RecordingRepositoryImpl) FindPreviousRecording(tx *gorm.DB, projectFlockKandangId uint, currentDay int) (*entity.Recording, error) {
 	if currentDay <= 1 {
 		return nil, nil

internal/modules/production/recordings/services/recording.service.go

@@ -1178,40 +1178,13 @@ func (s *recordingService) computeAndUpdateMetrics(ctx context.Context, tx *gorm
 	}
 
 	var fcrValue float64
-	isGrowing := false
+	if usageInGrams > 0 && totalEggWeightGrams > 0 {
-	if s.ProjectFlockKandangRepo != nil {
+		fcrValue = usageInGrams / totalEggWeightGrams
-		if pfk, err := s.ProjectFlockKandangRepo.GetByID(ctx, recording.ProjectFlockKandangId); err == nil {
-			if strings.EqualFold(pfk.ProjectFlock.Category, string(utils.ProjectFlockCategoryGrowing)) {
-				isGrowing = true
-			}
-		}
-	}
-
-	if isGrowing {
-		week := 0
-		if recording.Day != nil && *recording.Day > 0 {
-			week = (*recording.Day-1)/7 + 1
-		}
-		if week > 0 && s.Repository != nil {
-			meanBw, ok, err := s.Repository.GetUniformityMeanBwByWeek(tx, recording.ProjectFlockKandangId, week)
-			if err != nil {
-				return fmt.Errorf("getUniformityMeanBwByWeek: %w", err)
-			}
-			if ok && meanBw > 0 && feedIntake > 0 {
-				fcrValue = feedIntake / meanBw
-			}
-		}
 		updates["fcr_value"] = fcrValue
 		recording.FcrValue = &fcrValue
 	} else {
-		if usageInGrams > 0 && totalEggWeightGrams > 0 {
+		updates["fcr_value"] = gorm.Expr("NULL")
-			fcrValue = usageInGrams / totalEggWeightGrams
+		recording.FcrValue = nil
-			updates["fcr_value"] = fcrValue
-			recording.FcrValue = &fcrValue
-		} else {
-			updates["fcr_value"] = gorm.Expr("NULL")
-			recording.FcrValue = nil
-		}
 	}
 
 	if usageInGrams > 0 && totalChick > 0 {

internal/modules/production/uniformities/services/uniformity.service.go

@@ -465,16 +465,11 @@ func (s *uniformityService) CreateOne(c *fiber.Ctx, req *validation.Create, file
 		); err != nil {
 			return err
 		}
-		if strings.EqualFold(category, string(utils.ProjectFlockCategoryGrowing)) {
-			if err := s.updateGrowingFcrForWeek(tx, createBody.ProjectFlockKandangId, createBody.Week, calculation.MeanUp); err != nil {
-				return err
-			}
-		}
 		return nil
 	}); err != nil {
 		s.Log.Errorf("Failed to create uniformity: %+v", err)
 		return nil, err
-	} 
+	}
 
 	if s.DocumentSvc != nil {
 		actorIDCopy := actorID
@@ -638,9 +633,6 @@ func (s uniformityService) UpdateOne(c *fiber.Ctx, req *validation.Update, id ui
 			return nil, err
 		}
 
-		if err := s.updateGrowingFcrFromUniformity(c.Context(), id); err != nil {
-			return nil, err
-		}
 		return s.GetOne(c, id)
 	}
 
@@ -702,10 +694,6 @@ func (s uniformityService) UpdateOne(c *fiber.Ctx, req *validation.Update, id ui
 		}
 	}
 
-	if err := s.updateGrowingFcrFromUniformity(c.Context(), id); err != nil {
-		return nil, err
-	}
-
 	return s.GetOne(c, id)
 }
 
@@ -736,48 +724,7 @@ func (s uniformityService) DeleteOne(c *fiber.Ctx, id uint) error {
 		return err
 	}
 
-	type uniformityContext struct {
+	if err := s.Repository.DeleteOne(c.Context(), id); err != nil {
-		ID                    uint
-		Week                  int
-		ProjectFlockKandangId uint
-		Category              string
-	}
-	var ctxRow uniformityContext
-	if err := s.Repository.DB().WithContext(c.Context()).
-		Table("project_flock_kandang_uniformity u").
-		Select("u.id, u.week, u.project_flock_kandang_id, pf.category").
-		Joins("JOIN project_flock_kandangs pfk ON pfk.id = u.project_flock_kandang_id").
-		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
-		Where("u.id = ?", id).
-		Scan(&ctxRow).Error; err != nil {
-		return err
-	}
-
-	if ctxRow.ID == 0 {
-		return fiber.NewError(fiber.StatusNotFound, "Uniformity not found")
-	}
-
-	if err := s.Repository.DB().WithContext(c.Context()).Transaction(func(tx *gorm.DB) error {
-		repoTx := s.Repository.WithTx(tx)
-		if err := repoTx.DeleteOne(c.Context(), id); err != nil {
-			return err
-		}
-
-		if strings.EqualFold(ctxRow.Category, string(utils.ProjectFlockCategoryGrowing)) {
-			startDay := (ctxRow.Week-1)*7 + 1
-			endDay := ctxRow.Week * 7
-			if ctxRow.Week > 0 {
-				if err := tx.Model(&entity.Recording{}).
-					Where("project_flock_kandangs_id = ?", ctxRow.ProjectFlockKandangId).
-					Where("day BETWEEN ? AND ?", startDay, endDay).
-					Update("fcr_value", 0).Error; err != nil {
-					return err
-				}
-			}
-		}
-
-		return nil
-	}); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return fiber.NewError(fiber.StatusNotFound, "Uniformity not found")
 		}
@@ -787,58 +734,6 @@ func (s uniformityService) DeleteOne(c *fiber.Ctx, id uint) error {
 	return nil
 }
 
-func (s *uniformityService) updateGrowingFcrFromUniformity(ctx context.Context, uniformityID uint) error {
-	if uniformityID == 0 {
-		return nil
-	}
-
-	type uniformityRow struct {
-		ID                    uint
-		Week                  int
-		MeanUp                float64
-		ProjectFlockKandangId uint
-		Category              string
-	}
-	var row uniformityRow
-	if err := s.Repository.DB().WithContext(ctx).
-		Table("project_flock_kandang_uniformity u").
-		Select("u.id, u.week, u.mean_up, u.project_flock_kandang_id, pf.category").
-		Joins("JOIN project_flock_kandangs pfk ON pfk.id = u.project_flock_kandang_id").
-		Joins("JOIN project_flocks pf ON pf.id = pfk.project_flock_id").
-		Where("u.id = ?", uniformityID).
-		Scan(&row).Error; err != nil {
-		return err
-	}
-	if row.ID == 0 {
-		return nil
-	}
-	if !strings.EqualFold(row.Category, string(utils.ProjectFlockCategoryGrowing)) {
-		return nil
-	}
-
-	return s.updateGrowingFcrForWeek(s.Repository.DB().WithContext(ctx), row.ProjectFlockKandangId, row.Week, row.MeanUp)
-}
-
-func (s *uniformityService) updateGrowingFcrForWeek(tx *gorm.DB, projectFlockKandangID uint, week int, meanUp float64) error {
-	if tx == nil || projectFlockKandangID == 0 || week <= 0 {
-		return nil
-	}
-	startDay := (week-1)*7 + 1
-	endDay := week * 7
-	meanBw := meanUp / 1.10
-	if meanBw <= 0 {
-		return tx.Model(&entity.Recording{}).
-			Where("project_flock_kandangs_id = ?", projectFlockKandangID).
-			Where("day BETWEEN ? AND ?", startDay, endDay).
-			Update("fcr_value", 0).Error
-	}
-
-	return tx.Model(&entity.Recording{}).
-		Where("project_flock_kandangs_id = ?", projectFlockKandangID).
-		Where("day BETWEEN ? AND ?", startDay, endDay).
-		Update("fcr_value", gorm.Expr("CASE WHEN feed_intake IS NULL OR feed_intake = 0 THEN 0 ELSE feed_intake / ? END", meanBw)).Error
-}
-
 func (s uniformityService) Approval(c *fiber.Ctx, req *validation.Approve) ([]entity.ProjectFlockKandangUniformity, error) {
 	if err := s.Validate.Struct(req); err != nil {
 		return nil, err

internal/modules/purchases/dto/purchase.dto.go

@@ -25,17 +25,17 @@ type PurchaseRelationDTO struct {
 
 type PurchaseListDTO struct {
 	PurchaseRelationDTO
-	Supplier       *supplierDTO.SupplierRelationDTO `json:"supplier"`
+	Supplier       *supplierDTO.SupplierRelationDTO  `json:"supplier"`
-	DueDate        *time.Time                       `json:"due_date"`
+	DueDate        *time.Time                        `json:"due_date"`
-	CreatedUser    *userDTO.UserRelationDTO         `json:"created_user"`
+	CreatedUser    *userDTO.UserRelationDTO          `json:"created_user"`
-	RequesterName  string                           `json:"requester_name"`
+	RequesterName  string                            `json:"requester_name"`
-	PoExpedition   []PoExpeditionDTO                `json:"po_expedition"`
+	PoExpedition   []string                          `json:"po_expedition"`
-	Products       []productDTO.ProductRelationDTO  `json:"products"`
+	Products       []productDTO.ProductRelationDTO   `json:"products"`
-	Location       *locationDTO.LocationRelationDTO `json:"location"`
+	Location       *locationDTO.LocationRelationDTO  `json:"location"`
-	Area           *areaDTO.AreaRelationDTO         `json:"area"`
+	Area           *areaDTO.AreaRelationDTO          `json:"area"`
-	CreatedAt      time.Time                        `json:"created_at"`
+	CreatedAt      time.Time                         `json:"created_at"`
-	UpdatedAt      time.Time                        `json:"updated_at"`
+	UpdatedAt      time.Time                         `json:"updated_at"`
-	LatestApproval *approvalDTO.ApprovalRelationDTO `json:"latest_approval"`
+	LatestApproval *approvalDTO.ApprovalRelationDTO  `json:"latest_approval"`
 }
 
 type PurchaseDetailDTO struct {
@@ -67,12 +67,6 @@ type PurchaseItemDTO struct {
 	VehicleNumber      *string                            `json:"vehicle_number"`
 	TransportPerItem   *float64                           `json:"transport_per_item,omitempty"`
 	ExpeditionVendor   *supplierDTO.SupplierRelationDTO   `json:"expedition_vendor,omitempty"`
-	HasChickin         bool                               `json:"has_chickin"`
-}
-
-type PoExpeditionDTO struct {
-	Id       uint64 `json:"id"`
-	Refrence string `json:"refrence"`
 }
 
 func ToPurchaseRelationDTO(p *entity.Purchase) PurchaseRelationDTO {
@@ -101,7 +95,6 @@ func ToPurchaseItemDTO(item entity.PurchaseItem) PurchaseItemDTO {
 		TravelNumber:       item.TravelNumber,
 		TravelDocumentPath: item.TravelNumberDocs,
 		VehicleNumber:      item.VehicleNumber,
-		HasChickin:         item.HasChickin,
 	}
 
 	if item.Product != nil && item.Product.Id != 0 {
@@ -171,12 +164,12 @@ func ToPurchaseListDTO(p entity.Purchase) PurchaseListDTO {
 	}
 
 	var (
-		poExpedition = make([]PoExpeditionDTO, 0)
+		poExpedition []string
 		location     *locationDTO.LocationRelationDTO
 		area         *areaDTO.AreaRelationDTO
 	)
 	productMap := make(map[uint]productDTO.ProductRelationDTO)
-	expeditionRefSet := make(map[uint64]struct{})
+	expeditionRefSet := make(map[string]struct{})
 	for i := range p.Items {
 		item := p.Items[i]
 		if item.Product != nil && item.Product.Id != 0 {
@@ -185,15 +178,11 @@ func ToPurchaseListDTO(p entity.Purchase) PurchaseListDTO {
 			}
 		}
 		if item.ExpenseNonstock != nil && item.ExpenseNonstock.Expense != nil {
-			exp := item.ExpenseNonstock.Expense
+			ref := strings.TrimSpace(item.ExpenseNonstock.Expense.ReferenceNumber)
-			ref := strings.TrimSpace(exp.ReferenceNumber)
+			if ref != "" {
-			if exp.Id != 0 && ref != "" {
+				if _, exists := expeditionRefSet[ref]; !exists {
-				if _, exists := expeditionRefSet[exp.Id]; !exists {
+					expeditionRefSet[ref] = struct{}{}
-					expeditionRefSet[exp.Id] = struct{}{}
+					poExpedition = append(poExpedition, ref)
-					poExpedition = append(poExpedition, PoExpeditionDTO{
-						Id:       exp.Id,
-						Refrence: ref,
-					})
 				}
 			}
 		}

internal/modules/purchases/services/purchase.service.go

@@ -255,39 +255,6 @@ func (s *purchaseService) GetOne(c *fiber.Ctx, id uint) (*entity.Purchase, error
 	if err := s.attachLatestApproval(c.Context(), purchase); err != nil {
 		s.Log.Warnf("Unable to attach latest approval for purchase %d: %+v", id, err)
 	}
-	if len(purchase.Items) > 0 {
-		itemIDs := make([]uint, 0, len(purchase.Items))
-		for i := range purchase.Items {
-			if purchase.Items[i].Id == 0 {
-				continue
-			}
-			itemIDs = append(itemIDs, purchase.Items[i].Id)
-		}
-		if len(itemIDs) > 0 {
-			var usedIDs []uint
-			if err := s.PurchaseRepo.DB().WithContext(c.Context()).
-				Model(&entity.StockAllocation{}).
-				Distinct("stockable_id").
-				Where("stockable_type = ? AND stockable_id IN ? AND usable_type = ? AND status IN ?",
-					fifo.StockableKeyPurchaseItems.String(),
-					itemIDs,
-					fifo.UsableKeyProjectChickin.String(),
-					[]string{entity.StockAllocationStatusActive, entity.StockAllocationStatusPending},
-				).
-				Pluck("stockable_id", &usedIDs).Error; err != nil {
-				return nil, err
-			}
-			usedSet := make(map[uint]struct{}, len(usedIDs))
-			for _, id := range usedIDs {
-				usedSet[id] = struct{}{}
-			}
-			for i := range purchase.Items {
-				if _, ok := usedSet[purchase.Items[i].Id]; ok {
-					purchase.Items[i].HasChickin = true
-				}
-			}
-		}
-	}
 	s.applyTravelDocumentURLs(c.Context(), purchase)
 
 	return purchase, nil
@@ -531,54 +498,6 @@ func (s *purchaseService) ApproveStaffPurchase(c *fiber.Ctx, id uint, req *valid
 		return nil, utils.BadRequest("Items must not be empty for staff approval")
 	}
 
-	if action == entity.ApprovalActionApproved {
-		itemIDs := make([]uint, 0, len(purchase.Items))
-		itemByID := make(map[uint]entity.PurchaseItem, len(purchase.Items))
-		for i := range purchase.Items {
-			if purchase.Items[i].Id == 0 {
-				continue
-			}
-			itemIDs = append(itemIDs, purchase.Items[i].Id)
-			itemByID[purchase.Items[i].Id] = purchase.Items[i]
-		}
-		if len(itemIDs) > 0 {
-			var usedIDs []uint
-			if err := s.PurchaseRepo.DB().WithContext(ctx).
-				Model(&entity.StockAllocation{}).
-				Distinct("stockable_id").
-				Where("stockable_type = ? AND stockable_id IN ? AND usable_type = ? AND status IN ?",
-					fifo.StockableKeyPurchaseItems.String(),
-					itemIDs,
-					fifo.UsableKeyProjectChickin.String(),
-					[]string{entity.StockAllocationStatusActive, entity.StockAllocationStatusPending},
-				).
-				Pluck("stockable_id", &usedIDs).Error; err != nil {
-				return nil, err
-			}
-			if len(usedIDs) > 0 {
-				usedSet := make(map[uint]struct{}, len(usedIDs))
-				for _, id := range usedIDs {
-					usedSet[id] = struct{}{}
-				}
-				for _, payload := range req.Items {
-					if payload.PurchaseItemID == 0 || payload.Qty == nil {
-						continue
-					}
-					if _, used := usedSet[payload.PurchaseItemID]; !used {
-						continue
-					}
-					item, ok := itemByID[payload.PurchaseItemID]
-					if !ok {
-						continue
-					}
-					if *payload.Qty != item.SubQty {
-						return nil, utils.BadRequest("Purchase sudah chickin, qty tidak bisa diubah")
-					}
-				}
-			}
-		}
-	}
-
 	payload, err := s.buildStaffAdjustmentPayload(c.Context(), purchase, req, syncReceiving)
 	if err != nil {
 		return nil, err
@@ -826,54 +745,6 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			req.Items[idx].TravelDocumentPath = &uploadedURL
 		}
 	}
-	if action == entity.ApprovalActionApproved {
-		itemIDs := make([]uint, 0, len(purchase.Items))
-		itemByID := make(map[uint]entity.PurchaseItem, len(purchase.Items))
-		for i := range purchase.Items {
-			if purchase.Items[i].Id == 0 {
-				continue
-			}
-			itemIDs = append(itemIDs, purchase.Items[i].Id)
-			itemByID[purchase.Items[i].Id] = purchase.Items[i]
-		}
-		if len(itemIDs) > 0 {
-			var usedIDs []uint
-			if err := s.PurchaseRepo.DB().WithContext(ctx).
-				Model(&entity.StockAllocation{}).
-				Distinct("stockable_id").
-				Where("stockable_type = ? AND stockable_id IN ? AND usable_type = ? AND status IN ?",
-					fifo.StockableKeyPurchaseItems.String(),
-					itemIDs,
-					fifo.UsableKeyProjectChickin.String(),
-					[]string{entity.StockAllocationStatusActive, entity.StockAllocationStatusPending},
-				).
-				Pluck("stockable_id", &usedIDs).Error; err != nil {
-				return nil, err
-			}
-			if len(usedIDs) > 0 {
-				usedSet := make(map[uint]struct{}, len(usedIDs))
-				for _, id := range usedIDs {
-					usedSet[id] = struct{}{}
-				}
-				for _, payload := range req.Items {
-					if _, used := usedSet[payload.PurchaseItemID]; !used {
-						continue
-					}
-					item, ok := itemByID[payload.PurchaseItemID]
-					if !ok {
-						continue
-					}
-					receivedQty := item.SubQty
-					if payload.ReceivedQty != nil {
-						receivedQty = *payload.ReceivedQty
-					}
-					if receivedQty != item.TotalQty {
-						return nil, utils.BadRequest("Purchase sudah chickin, qty penerimaan tidak bisa diubah")
-					}
-				}
-			}
-		}
-	}
 
 	itemMap := make(map[uint]*entity.PurchaseItem, len(purchase.Items))
 	for i := range purchase.Items {
@@ -1041,7 +912,6 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 			pwID   uint
 			qty    float64
 		}, 0, len(prepared))
-		resolvePendingIDs := make(map[uint]struct{})
 		logEntries := make([]struct {
 			itemID uint
 			pwID   uint
@@ -1082,7 +952,6 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 						pwID   uint
 						qty    float64
 					}{itemID: item.Id, pwID: *newPWID, qty: deltaQty})
-					resolvePendingIDs[*newPWID] = struct{}{}
 				} else {
 					deltas[*newPWID] += deltaQty
 					totalQtyDeltas[item.Id] += deltaQty
@@ -1095,14 +964,11 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 						qty    float64
 					}{itemID: item.Id, pwID: *newPWID, qty: deltaQty})
 					affected[*newPWID] = struct{}{}
-					resolvePendingIDs[*newPWID] = struct{}{}
 				} else {
 					deltas[*newPWID] += deltaQty // negative
 					affected[*newPWID] = struct{}{}
 					totalQtyDeltas[item.Id] += deltaQty
 				}
-			case newPWID != nil:
-				resolvePendingIDs[*newPWID] = struct{}{}
 			}
 
 			dateCopy := prep.receivedDate
@@ -1200,19 +1066,6 @@ func (s *purchaseService) ReceiveProducts(c *fiber.Ctx, id uint, req *validation
 					return err
 				}
 			}
-			for pwID := range resolvePendingIDs {
-				if pwID == 0 {
-					continue
-				}
-				resolved, err := s.FifoSvc.ResolvePending(c.Context(), commonSvc.PendingResolveRequest{
-					ProductWarehouseID: pwID,
-					Tx:                 tx,
-				})
-				if err != nil {
-					return err
-				}
-				s.Log.Infof("ResolvePending purchase=%d pw=%d resolved=%d", purchase.Id, pwID, len(resolved))
-			}
 		}
 
 		if len(logEntries) > 0 {
@@ -1496,30 +1349,6 @@ func (s *purchaseService) DeletePurchase(c *fiber.Ctx, id uint) error {
 	}
 
 	transactionErr := s.PurchaseRepo.DB().WithContext(ctx).Transaction(func(tx *gorm.DB) error {
-		itemIDs := make([]uint, 0, len(itemsToDelete))
-		for _, item := range itemsToDelete {
-			if item.Id == 0 {
-				continue
-			}
-			itemIDs = append(itemIDs, item.Id)
-		}
-		if len(itemIDs) > 0 {
-			var count int64
-			if err := tx.Model(&entity.StockAllocation{}).
-				Where("stockable_type = ? AND stockable_id IN ? AND usable_type = ? AND status IN ?",
-					fifo.StockableKeyPurchaseItems.String(),
-					itemIDs,
-					fifo.UsableKeyProjectChickin.String(),
-					[]string{entity.StockAllocationStatusActive, entity.StockAllocationStatusPending},
-				).
-				Count(&count).Error; err != nil {
-				return err
-			}
-			if count > 0 {
-				return utils.BadRequest("Purchase already chickin, failed to delete purchase")
-			}
-		}
-
 		if err := s.rollbackPurchaseStock(ctx, tx, itemsToDelete, note, actorID); err != nil {
 			return err
 		}
@@ -1536,10 +1365,6 @@ func (s *purchaseService) DeletePurchase(c *fiber.Ctx, id uint) error {
 		return nil
 	})
 	if transactionErr != nil {
-		var fe *fiber.Error
-		if errors.As(transactionErr, &fe) {
-			return fe
-		}
 		if errors.Is(transactionErr, gorm.ErrRecordNotFound) {
 			return utils.NotFound("Purchase not found")
 		}