init adjustment recording

internal/modules/closings/repositories/closing.repository.go

@@ -98,6 +98,9 @@ func sapronakIncomingPurchaseQueryParts(params SapronakQueryParams) (string, []a
 			fifo.StockableKeyPurchaseItems.String(),
 			entity.StockAllocationStatusActive,
 			entity.StockAllocationPurposeConsume,
+			fifo.UsableKeyRecordingStock.String(),
+			params.ProjectFlockKandangIDs,
+			fifo.UsableKeyProjectChickin.String(),
 			params.ProjectFlockKandangIDs,
 			params.ProjectFlockKandangIDs,
 			params.WarehouseIDs,
@@ -323,7 +326,7 @@ func (r *ClosingRepositoryImpl) SumFeedPurchaseAndUsedByProjectFlockKandangIDs(c
 		Joins("JOIN product_warehouses pw ON pw.id = rs.product_warehouse_id").
 		Joins("JOIN products prod ON prod.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = prod.id AND f.flagable_type = ?", "products").
-		Where("rec.project_flock_kandangs_id IN ?", projectFlockKandangIDs).
+		Where("rs.project_flock_kandang_id IN ?", projectFlockKandangIDs).
 		Where("f.name = ?", "PAKAN").
 		Select("COALESCE(SUM(COALESCE(rs.usage_qty, 0) + COALESCE(rs.pending_qty, 0)), 0) AS total_used").
 		Scan(&usageAgg).Error
@@ -905,7 +908,11 @@ WITH scoped_farm_allocations AS (
 	WHERE sa.stockable_type = ?
 		AND sa.status = ?
 		AND sa.allocation_purpose = ?
-		AND COALESCE(rec.project_flock_kandangs_id, pc.project_flock_kandang_id) IN ?
+		AND (
+			(sa.usable_type = ? AND rs.project_flock_kandang_id IN ?)
+			OR
+			(sa.usable_type = ? AND pc.project_flock_kandang_id IN ?)
+		)
 	GROUP BY sa.stockable_id
 )
 SELECT
@@ -1167,7 +1174,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsage(ctx context.Context, pfkID ui
 		"recording_stocks rs",
 		"pw.id = rs.product_warehouse_id",
 		[]string{"JOIN recordings r ON r.id = rs.recording_id AND r.deleted_at IS NULL"},
-		"r.project_flock_kandangs_id = ? AND f.name IN ?",
+		"rs.project_flock_kandang_id = ? AND f.name IN ?",
 		pfkID,
 		sapronakFlagsUsage,
 	)
@@ -1208,7 +1215,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageDetails(ctx context.Context, p
 			COALESCE(rs.usage_qty,0) AS qty_out,
 			COALESCE(p.product_price,0) AS price
 		`,
-		"r.project_flock_kandangs_id = ? AND f.name IN ?",
+		"rs.project_flock_kandang_id = ? AND f.name IN ?",
 		pfkID,
 		sapronakFlagsUsage,
 	)
@@ -1294,7 +1301,7 @@ func (r *ClosingRepositoryImpl) FetchSapronakUsageAllocatedDetails(ctx context.C
 		Where("sa.stockable_type <> ?", fifo.StockableKeyProjectFlockPopulation.String()).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where(`
-			(sa.usable_type = ? AND r.project_flock_kandangs_id = ? AND f.name IN ?)
+			(sa.usable_type = ? AND rs.project_flock_kandang_id = ? AND f.name IN ?)
 			OR
 			(sa.usable_type = ? AND pc_used.project_flock_kandang_id = ? AND f.name IN ?)
 		`,
@@ -1347,7 +1354,12 @@ func (r *ClosingRepositoryImpl) incomingFarmPurchaseAllocationBase(ctx context.C
 		Where("sa.status = ?", entity.StockAllocationStatusActive).
 		Where("sa.allocation_purpose = ?", entity.StockAllocationPurposeConsume).
 		Where("w.kandang_id IS NULL").
-		Where("COALESCE(rec.project_flock_kandangs_id, pc.project_flock_kandang_id) = ?", projectFlockKandangID).
+		Where("(sa.usable_type = ? AND rs.project_flock_kandang_id = ?) OR (sa.usable_type = ? AND pc.project_flock_kandang_id = ?)",
+			fifo.UsableKeyRecordingStock.String(),
+			projectFlockKandangID,
+			fifo.UsableKeyProjectChickin.String(),
+			projectFlockKandangID,
+		).
 		Where("f.name IN ?", sapronakFlagsAll).
 		Where("pi.received_date IS NOT NULL")
 	db = applyDateRange(db, "pi.received_date", start, end)

internal/modules/closings/repositories/closing.repository_test.go

@@ -20,8 +20,8 @@ func TestSapronakIncomingPurchaseQueryPartsUsesAttributedPurchasesWhenProjectFlo
 	if sql != sapronakIncomingPurchasesScopedSQL() {
 		t.Fatalf("expected scoped purchase SQL, got %q", sql)
 	}
-	if len(args) != 8 {
-		t.Fatalf("expected 8 argument groups, got %d", len(args))
+	if len(args) != 11 {
+		t.Fatalf("expected 11 argument groups, got %d", len(args))
 	}
 }
 
@@ -42,7 +42,7 @@ func TestFetchSapronakIncomingIncludesAttributedFarmPurchasesAndHistoricalWareho
 			(2, 10, 'products', 'OBAT')`,
 		`INSERT INTO purchases (id, po_number, deleted_at) VALUES (1, 'PO-LTI-0005', NULL)`,
 		`INSERT INTO recordings (id, project_flock_kandangs_id, deleted_at) VALUES (11, 101, NULL), (12, 999, NULL)`,
-		`INSERT INTO recording_stocks (id, recording_id, product_warehouse_id, usage_qty) VALUES (21, 11, 501, 150), (22, 12, 502, 10)`,
+		`INSERT INTO recording_stocks (id, recording_id, product_warehouse_id, usage_qty, project_flock_kandang_id) VALUES (21, 11, 501, 150, 101), (22, 12, 502, 10, 999)`,
 		`INSERT INTO purchase_items (id, purchase_id, product_id, warehouse_id, project_flock_kandang_id, total_qty, price, received_date) VALUES
 			(1, 1, 10, 1, NULL, 100, 261700, '` + receivedAt.Format(time.RFC3339) + `'),
 			(2, 1, 20, 1, NULL, 50, 15000, '` + receivedAt.Format(time.RFC3339) + `'),
@@ -145,11 +145,12 @@ func setupClosingRepositoryTestDB(t *testing.T) *gorm.DB {
 			deleted_at TIMESTAMP NULL
 		)`,
 		`CREATE TABLE recording_stocks (
-			id INTEGER PRIMARY KEY,
-			recording_id INTEGER NOT NULL,
-			product_warehouse_id INTEGER NOT NULL,
-			usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0
-		)`,
+				id INTEGER PRIMARY KEY,
+				recording_id INTEGER NOT NULL,
+				product_warehouse_id INTEGER NOT NULL,
+				usage_qty NUMERIC(15,3) NOT NULL DEFAULT 0,
+				project_flock_kandang_id INTEGER NULL
+			)`,
 		`CREATE TABLE project_chickins (
 			id INTEGER PRIMARY KEY,
 			project_flock_kandang_id INTEGER NOT NULL