Merge branch 'feat/BE/Sprint-7' of https://gitlab.com/mbugroup/lti-api into dev/teguh

internal/modules/approvals/route.go

@@ -15,5 +15,5 @@ func ApprovalRoutes(v1 fiber.Router, u user.UserService, s common.ApprovalServic
 	route := v1.Group("/approvals")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", ctrl.GetAll,m.RequirePermissions(m.P_ApprovalGetAll))
 }

internal/modules/closings/controllers/closing.controller.go

@@ -267,3 +267,87 @@ func (u *ClosingController) GetClosingKeuangan(c *fiber.Ctx) error {
 			Data:    result,
 		})
 }
+
+func (u *ClosingController) GetExpeditionHPP(c *fiber.Ctx) error {
+	param := c.Params("project_flock_id")
+
+	projectFlockID, err := strconv.Atoi(param)
+	if err != nil || projectFlockID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
+	}
+
+	var projectFlockKandangID *uint
+	if raw := c.Query("project_flock_kandang_id"); raw != "" {
+		idInt, convErr := strconv.Atoi(raw)
+		if convErr != nil || idInt <= 0 {
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
+		}
+		idUint := uint(idInt)
+		projectFlockKandangID = &idUint
+	}
+
+	result, err := u.ClosingService.GetExpeditionHPP(c, uint(projectFlockID), projectFlockKandangID)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get expedition HPP successfully",
+			Data:    result,
+		})
+}
+
+func (u *ClosingController) GetExpeditionHPPByKandang(c *fiber.Ctx) error {
+	projectParam := c.Params("project_flock_id")
+	kandangParam := c.Params("project_flock_kandang_id")
+
+	projectFlockID, err := strconv.Atoi(projectParam)
+	if err != nil || projectFlockID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_id")
+	}
+
+	pfkID, err := strconv.Atoi(kandangParam)
+	if err != nil || pfkID <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid project_flock_kandang_id")
+	}
+
+	kandangID := uint(pfkID)
+
+	result, err := u.ClosingService.GetExpeditionHPP(c, uint(projectFlockID), &kandangID)
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get expedition HPP successfully",
+			Data:    result,
+		})
+}
+
+func (u *ClosingController) GetClosingDataProduksi(c *fiber.Ctx) error {
+	param := c.Params("projectFlockId")
+
+	id, err := strconv.Atoi(param)
+	if err != nil || id <= 0 {
+		return fiber.NewError(fiber.StatusBadRequest, "Invalid projectFlockId")
+	}
+
+	result, err := u.ClosingService.GetClosingDataProduksi(c, uint(id))
+	if err != nil {
+		return err
+	}
+
+	return c.Status(fiber.StatusOK).
+		JSON(response.Success{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Retrieved production data successfully",
+			Data:    result,
+		})
+}

internal/modules/closings/dto/closing.dto.go

@@ -58,6 +58,52 @@ type ClosingSummaryDTO struct {
 	StatusClosing string `json:"closing_status"`
 }
 
+type ClosingPurchaseDTO struct {
+	InitialPopulation int     `json:"initial_population"`
+	ClaimCulling      int     `json:"claim_culling"`
+	FinalPopulation   int     `json:"final_population"`
+	FeedIn            float64 `json:"feed_in"`
+	FeedUsed          float64 `json:"feed_used"`
+	FeedUsedPerHead   float64 `json:"feed_used_per_head"`
+}
+
+type ClosingSalesDTO struct {
+	SalesPopulation     int     `json:"sales_population"`
+	SalesWeight         float64 `json:"sales_weight"`
+	AverageWeight       float64 `json:"average_weight"`
+	AverageSellingPrice float64 `json:"chicken_average_selling_price"`
+}
+
+type ClosingEggSalesDTO struct {
+	EggPieces           int     `json:"egg_pieces"`
+	EggMassKg           float64 `json:"egg_mass_kg"`
+	AverageEggWeightKg  float64 `json:"average_egg_weight_kg"`
+	AverageSellingPrice float64 `json:"egg_average_selling_price"`
+}
+
+type ClosingPerformanceDTO struct {
+	Depletion     float64 `json:"depletion"`
+	Age           float64 `json:"age_day"`
+	MortalityStd  float64 `json:"mortality_std"`
+	MortalityAct  float64 `json:"mortality_act"`
+	DeffMortality float64 `json:"deff_mortality"`
+	FcrStd        float64 `json:"fcr_std"`
+	FcrAct        float64 `json:"fcr_act"`
+	DeffFcr       float64 `json:"deff_fcr"`
+	Awg           float64 `json:"awg"`
+}
+
+type ClosingSalesGroupDTO struct {
+	Chicken ClosingSalesDTO     `json:"chicken"`
+	Egg     *ClosingEggSalesDTO `json:"egg,omitempty"`
+}
+
+type ClosingProductionReportDTO struct {
+	Purchase    ClosingPurchaseDTO    `json:"purchase"`
+	Sales       ClosingSalesGroupDTO  `json:"sales"`
+	Performance ClosingPerformanceDTO `json:"performance"`
+}
+
 func ToClosingSummaryDTO(project entity.ProjectFlock, statusProject, statusClosing string) ClosingSummaryDTO {
 	history := project.KandangHistory
 

internal/modules/closings/dto/closingExpedition.dto.go

@@ -0,0 +1,14 @@
+package dto
+
+// ExpeditionCostItemDTO merepresentasikan biaya ekspedisi per vendor.
+type ExpeditionCostItemDTO struct {
+	Id                   uint64  `json:"id"`
+	ExpeditionVendorName string  `json:"expedition_vendor_name"`
+	HPPAmount            float64 `json:"hpp_amount"`
+}
+
+// ExpeditionHPPDTO adalah struktur response utama untuk HPP Ekspedisi.
+type ExpeditionHPPDTO struct {
+	ExpeditionCosts []ExpeditionCostItemDTO `json:"expedition_costs"`
+	TotalHPPAmount  float64                 `json:"total_hpp_amount"`
+}

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

@@ -16,6 +16,13 @@ import (
 type ClosingRepository interface {
 	repository.BaseRepository[entity.ProjectFlock]
 	GetSapronak(ctx context.Context, params SapronakQueryParams) ([]SapronakRow, int64, error)
+	SumFeedPurchaseAndUsedByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, error)
+	SumClaimCullingByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, error)
+	SumMarketingWeightAndQtyByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, float64, error)
+	SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error)
+	SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error)
+	GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error)
+	GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error)
 	FetchSapronakIncoming(ctx context.Context, kandangID uint) ([]SapronakIncomingRow, error)
 	FetchSapronakIncomingDetails(ctx context.Context, kandangID uint) (map[uint][]SapronakDetailRow, error)
 	FetchSapronakUsage(ctx context.Context, pfkID uint) ([]SapronakUsageRow, error)
@@ -53,6 +60,11 @@ type SapronakRow struct {
 	Notes                string    `gorm:"column:notes"`
 }
 
+type ExpeditionHPPRow struct {
+	SupplierName string  `gorm:"column:supplier_name"`
+	TotalAmount  float64 `gorm:"column:total_amount"`
+}
+
 type SapronakQueryParams struct {
 	Type                   string
 	WarehouseIDs           []uint
@@ -111,6 +123,202 @@ func (r *ClosingRepositoryImpl) GetSapronak(ctx context.Context, params Sapronak
 	return rows, totalResults, nil
 }
 
+func (r *ClosingRepositoryImpl) SumFeedPurchaseAndUsedByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, error) {
+	if len(projectFlockKandangIDs) == 0 {
+		return 0, 0, nil
+	}
+
+	var purchaseAgg struct {
+		TotalIn float64 `gorm:"column:total_in"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("purchase_items pi").
+		Joins("JOIN flags f ON f.flagable_id = pi.product_id AND f.flagable_type = 'products'").
+		Where("f.name = ?", "PAKAN").
+		Where("pi.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Select("COALESCE(SUM(pi.total_qty), 0) AS total_in").
+		Scan(&purchaseAgg).Error
+	if err != nil {
+		return 0, 0, err
+	}
+
+	var usageAgg struct {
+		TotalUsed float64 `gorm:"column:total_used"`
+	}
+
+	err = r.DB().WithContext(ctx).
+		Table("recording_stocks rs").
+		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("pw.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
+	if err != nil {
+		return 0, 0, err
+	}
+
+	return purchaseAgg.TotalIn, usageAgg.TotalUsed, nil
+}
+
+func (r *ClosingRepositoryImpl) SumClaimCullingByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, error) {
+	if len(projectFlockKandangIDs) == 0 {
+		return 0, nil
+	}
+
+	var agg struct {
+		Total float64 `gorm:"column:total_culling"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("recording_depletions rd").
+		Joins("JOIN product_warehouses pw ON pw.id = rd.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("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Where("f.name = ?", utils.FlagAyamCulling).
+		Select("COALESCE(SUM(rd.qty), 0) AS total_culling").
+		Scan(&agg).Error
+	if err != nil {
+		return 0, err
+	}
+
+	return agg.Total, nil
+}
+
+func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDs(ctx context.Context, projectFlockKandangIDs []uint) (float64, float64, float64, error) {
+	if len(projectFlockKandangIDs) == 0 {
+		return 0, 0, 0, nil
+	}
+
+	var agg struct {
+		TotalWeight float64 `gorm:"column:total_weight"`
+		TotalQty    float64 `gorm:"column:total_qty"`
+		TotalPrice  float64 `gorm:"column:total_price"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("marketing_products mp").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.product_warehouse_id").
+		Where("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Select("COALESCE(SUM(mp.total_weight), 0) AS total_weight, COALESCE(SUM(mp.qty), 0) AS total_qty, COALESCE(SUM(mp.total_price), 0) AS total_price").
+		Scan(&agg).Error
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return agg.TotalWeight, agg.TotalQty, agg.TotalPrice, nil
+}
+
+func (r *ClosingRepositoryImpl) SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, float64, float64, error) {
+	if len(projectFlockKandangIDs) == 0 || len(flagNames) == 0 {
+		return 0, 0, 0, nil
+	}
+
+	var agg struct {
+		TotalWeight float64 `gorm:"column:total_weight"`
+		TotalQty    float64 `gorm:"column:total_qty"`
+		TotalPrice  float64 `gorm:"column:total_price"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("marketing_products mp").
+		Joins("JOIN product_warehouses pw ON pw.id = mp.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("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Where("f.name IN ?", flagNames).
+		Select("COALESCE(SUM(mp.total_weight), 0) AS total_weight, COALESCE(SUM(mp.qty), 0) AS total_qty, COALESCE(SUM(mp.total_price), 0) AS total_price").
+		Scan(&agg).Error
+	if err != nil {
+		return 0, 0, 0, err
+	}
+
+	return agg.TotalWeight, agg.TotalQty, agg.TotalPrice, nil
+}
+
+func (r *ClosingRepositoryImpl) SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(ctx context.Context, projectFlockKandangIDs []uint, flagNames []string) (float64, error) {
+	if len(projectFlockKandangIDs) == 0 || len(flagNames) == 0 {
+		return 0, nil
+	}
+
+	var agg struct {
+		TotalQty float64 `gorm:"column:total_qty"`
+	}
+
+	err := r.DB().WithContext(ctx).
+		Table("recording_eggs re").
+		Joins("JOIN product_warehouses pw ON pw.id = re.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("pw.project_flock_kandang_id IN ?", projectFlockKandangIDs).
+		Where("f.name IN ?", flagNames).
+		Select("COALESCE(SUM(re.qty), 0) AS total_qty").
+		Scan(&agg).Error
+	if err != nil {
+		return 0, err
+	}
+
+	return agg.TotalQty, nil
+}
+
+func (r *ClosingRepositoryImpl) GetFcrStandardsByFcrID(ctx context.Context, fcrID uint) ([]entity.FcrStandard, error) {
+	if fcrID == 0 {
+		return []entity.FcrStandard{}, nil
+	}
+
+	var standards []entity.FcrStandard
+	if err := r.DB().WithContext(ctx).
+		Where("fcr_id = ?", fcrID).
+		Order("weight ASC").
+		Find(&standards).Error; err != nil {
+		return nil, err
+	}
+
+	return standards, nil
+}
+
+func (r *ClosingRepositoryImpl) GetExpeditionHPP(ctx context.Context, projectFlockID uint, projectFlockKandangID *uint) ([]ExpeditionHPPRow, error) {
+	db := r.DB().WithContext(ctx)
+
+	if projectFlockID == 0 {
+		return nil, fmt.Errorf("invalid project flock id")
+	}
+
+	query := db.
+		Table("expense_realizations AS er").
+		Joins("JOIN expense_nonstocks ens ON ens.id = er.expense_nonstock_id").
+		Joins("JOIN expenses e ON e.id = ens.expense_id").
+		Joins("JOIN project_flock_kandangs pfk ON pfk.id = ens.project_flock_kandang_id").
+		Joins("JOIN nonstocks n ON n.id = ens.nonstock_id").
+		Joins("JOIN flags f ON f.flagable_id = n.id AND f.flagable_type = ?", entity.FlagableTypeNonstock).
+		Joins("JOIN suppliers s ON s.id = e.supplier_id").
+		Where("pfk.project_flock_id = ?", projectFlockID).
+		Where("e.category = ?", "BOP").
+		Where("UPPER(f.name) = ?", strings.ToUpper(string(utils.FlagEkspedisi)))
+
+	if projectFlockKandangID != nil && *projectFlockKandangID != 0 {
+		query = query.Where("pfk.id = ?", *projectFlockKandangID)
+	}
+
+	var rows []ExpeditionHPPRow
+	err := query.
+		Select(
+			"e.supplier_id AS supplier_id, " +
+				"s.name AS supplier_name, " +
+				"SUM(er.qty * er.price) AS total_amount",
+		).
+		Group("e.supplier_id, s.name").
+		Scan(&rows).Error
+	if err != nil {
+		return nil, err
+	}
+
+	return rows, nil
+}
+
 const (
 	sapronakIncomingPurchasesSQL = `
 SELECT
@@ -260,7 +468,6 @@ type SapronakDetailRow struct {
 	Price       float64
 }
 
-
 func (r *ClosingRepositoryImpl) withCtx(ctx context.Context) *gorm.DB { return r.DB().WithContext(ctx) }
 
 func applyJoins(db *gorm.DB, joins ...string) *gorm.DB {
@@ -323,7 +530,7 @@ func (r *ClosingRepositoryImpl) usageQuery(
 	`)
 	db = applyJoins(db, joins...)
 	return db.
-		Joins("JOIN product_warehouses pw ON " + pwJoinCond).
+		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
 		Joins("JOIN products p ON p.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct).
 		Where(where, args...)
@@ -356,7 +563,7 @@ func (r *ClosingRepositoryImpl) detailQuery(
 ) *gorm.DB {
 	db := r.withCtx(ctx).
 		Table(table).
-		Joins("JOIN product_warehouses pw ON " + pwJoinCond).
+		Joins("JOIN product_warehouses pw ON "+pwJoinCond).
 		Joins("JOIN products p ON p.id = pw.product_id").
 		Joins("JOIN flags f ON f.flagable_id = p.id AND f.flagable_type = ?", entity.FlagableTypeProduct)
 
@@ -450,7 +657,6 @@ func (r *ClosingRepositoryImpl) FetchSapronakChickinUsageDetails(ctx context.Con
 	)
 }
 
-
 func (r *ClosingRepositoryImpl) incomingPurchaseBase(ctx context.Context, kandangID uint) *gorm.DB {
 	return r.withCtx(ctx).
 		Table("purchase_items AS pi").
@@ -527,7 +733,7 @@ func (r *ClosingRepositoryImpl) fetchStockLogs(ctx context.Context, kandangID ui
 			COALESCE(sl.increase,0) AS increase,
 			COALESCE(sl.decrease,0) AS decrease,
 			COALESCE(p.product_price,0) AS price,
-			` + movementSelect + `
+			`+movementSelect+`
 		`).
 		Joins("JOIN product_warehouses pw ON pw.id = sl.product_warehouse_id").
 		Joins("JOIN products p ON p.id = pw.product_id").
@@ -597,4 +803,4 @@ func (r *ClosingRepositoryImpl) FetchSapronakTransfers(ctx context.Context, kand
 		return fmt.Sprintf("TRF-%d", row.ID)
 	})
 	return in, out, nil
-}
+}

internal/modules/closings/route.go

@@ -1,7 +1,7 @@
 package closings
 
 import (
-	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/controllers"
 	closing "gitlab.com/mbugroup/lti-api.git/internal/modules/closings/services"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -13,6 +13,7 @@ func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService
 	ctrl := controller.NewClosingController(s, sapronakSvc)
 
 	route := v1.Group("/closings")
+	route.Use(m.Auth(u))
 
 	// route.Get("/", m.Auth(u), ctrl.GetAll)
 	// route.Post("/", m.Auth(u), ctrl.CreateOne)
@@ -20,13 +21,15 @@ func ClosingRoutes(v1 fiber.Router, u user.UserService, s closing.ClosingService
 	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
 	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
 
-	route.Get("/", ctrl.GetAll)
-	route.Get("/:project_flock_id/penjualan", ctrl.GetPenjualan)
-	route.Get("/:project_flock_id/overhead", ctrl.GetOverhead)
-	route.Get("/:project_flock_id/:project_flock_kandang_id/perhitungan_sapronak", ctrl.GetSapronakByKandang)
-	route.Get("/:project_flock_id/perhitungan_sapronak", ctrl.GetSapronakByProject)
-	route.Get("/:project_flock_id/keuangan", ctrl.GetClosingKeuangan)
-	route.Get("/:projectFlockId", ctrl.GetClosingSummary)
-	route.Get("/:projectFlockId/sapronak", ctrl.GetClosingSapronak)
-
+	route.Get("/", m.RequirePermissions(m.P_ClosingGetAll), ctrl.GetAll)
+	route.Get("/:project_flock_id/penjualan", m.RequirePermissions(m.P_ClosingPenjualan), ctrl.GetPenjualan)
+	route.Get("/:projectFlockId", m.RequirePermissions(m.P_ClosingGetSummary), ctrl.GetClosingSummary)
+	route.Get("/:project_flock_id/overhead", m.RequirePermissions(m.P_ClosingGetOverhead), ctrl.GetOverhead)
+	route.Get("/:project_flock_id/:project_flock_kandang_id/perhitungan_sapronak", m.RequirePermissions(m.P_ClosingCountSapronakKandang), ctrl.GetSapronakByKandang)
+	route.Get("/:project_flock_id/perhitungan_sapronak", m.RequirePermissions(m.P_ClosingCountSapronak), ctrl.GetSapronakByProject)
+	route.Get("/:projectFlockId/sapronak", m.RequirePermissions(m.P_ClosingSapronak), ctrl.GetClosingSapronak)
+	route.Get("/:project_flock_id/expedition-hpp", m.RequirePermissions(m.P_ClosingExpeditionHpp), ctrl.GetExpeditionHPP)
+	route.Get("/:project_flock_id/:project_flock_kandang_id/expedition-hpp", m.RequirePermissions(m.P_ClosingExpeditionHppByKandang), ctrl.GetExpeditionHPPByKandang)
+	route.Get("/:projectFlockId/data-produksi", m.RequirePermissions(m.P_ClosingDataProduction), ctrl.GetClosingDataProduksi)
+	route.Get("/:projectFlockId/keuangan", m.RequirePermissions(m.P_ClosingKeuangan), ctrl.GetClosingKeuangan)
 }

internal/modules/closings/services/closing.service.go

@@ -3,7 +3,9 @@ package service
 import (
 	"context"
 	"errors"
+	"math"
 	"strconv"
+	"strings"
 
 	commonSvc "gitlab.com/mbugroup/lti-api.git/internal/common/service"
 	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
@@ -32,8 +34,10 @@ type ClosingService interface {
 	GetPenjualan(ctx *fiber.Ctx, projectFlockID uint) ([]entity.MarketingDeliveryProduct, error)
 	GetClosingSummary(ctx *fiber.Ctx, projectFlockID uint) (*dto.ClosingSummaryDTO, error)
 	GetOverhead(ctx *fiber.Ctx, projectFlockID uint) (*dto.OverheadListDTO, error)
+	GetClosingDataProduksi(ctx *fiber.Ctx, projectFlockID uint) (*dto.ClosingProductionReportDTO, error)
 	GetClosingSapronak(ctx *fiber.Ctx, projectFlockID uint, params *validation.ClosingSapronakQuery) ([]dto.ClosingSapronakItemDTO, int64, error)
 	GetClosingKeuangan(ctx *fiber.Ctx, projectFlockID uint) (*dto.ReportResponse, error)
+	GetExpeditionHPP(ctx *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error)
 }
 
 type closingService struct {
@@ -471,3 +475,271 @@ func (s closingService) GetClosingKeuangan(c *fiber.Ctx, projectFlockID uint) (*
 
 	return &report, nil
 }
+
+// GetExpeditionHPP menghitung HPP ekspedisi per vendor untuk sebuah project flock.
+// Jika projectFlockKandangID tidak nil, maka hanya data untuk kandang tersebut yang dihitung.
+func (s closingService) GetExpeditionHPP(c *fiber.Ctx, projectFlockID uint, projectFlockKandangID *uint) (*dto.ExpeditionHPPDTO, error) {
+	if projectFlockID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	}
+
+	rows, err := s.Repository.GetExpeditionHPP(c.Context(), projectFlockID, projectFlockKandangID)
+	if err != nil {
+		s.Log.Errorf("Failed to get expedition HPP for project flock %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch expedition HPP")
+	}
+
+	expeditionCosts := make([]dto.ExpeditionCostItemDTO, 0, len(rows))
+	var totalHPP float64
+
+	for idx, row := range rows {
+		expeditionCosts = append(expeditionCosts, dto.ExpeditionCostItemDTO{
+			Id:                   uint64(idx + 1),
+			ExpeditionVendorName: row.SupplierName,
+			HPPAmount:            row.TotalAmount,
+		})
+
+		totalHPP += row.TotalAmount
+	}
+
+	result := &dto.ExpeditionHPPDTO{
+		ExpeditionCosts: expeditionCosts,
+		TotalHPPAmount:  totalHPP,
+	}
+
+	return result, nil
+}
+
+func (s closingService) GetClosingDataProduksi(c *fiber.Ctx, projectFlockID uint) (*dto.ClosingProductionReportDTO, error) {
+	if projectFlockID == 0 {
+		return nil, fiber.NewError(fiber.StatusBadRequest, "Invalid project flock id")
+	}
+
+	project, err := s.Repository.GetByID(c.Context(), projectFlockID, s.withClosingRelations)
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return nil, fiber.NewError(fiber.StatusNotFound, "Project flock not found")
+	}
+	if err != nil {
+		s.Log.Errorf("Failed get project flock %d for closing data produksi: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock")
+	}
+
+	var population float64
+	for _, history := range project.KandangHistory {
+		for _, chickin := range history.Chickins {
+			population += chickin.UsageQty + chickin.PendingUsageQty
+		}
+	}
+
+	isGrowing := strings.EqualFold(project.Category, string(utils.ProjectFlockCategoryGrowing))
+
+	projectFlockKandangIDs, err := s.getProjectFlockKandangIDs(c.Context(), projectFlockID)
+	if err != nil {
+		s.Log.Errorf("Failed to fetch project flock kandangs for %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch project flock kandangs")
+	}
+
+	feedIn, feedUsed, err := s.Repository.SumFeedPurchaseAndUsedByProjectFlockKandangIDs(c.Context(), projectFlockKandangIDs)
+	if err != nil {
+		s.Log.Errorf("Failed to sum feed purchase/used qty for project flock %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch feed purchase data")
+	}
+
+	claimCulling, err := s.Repository.SumClaimCullingByProjectFlockKandangIDs(c.Context(), projectFlockKandangIDs)
+	if err != nil {
+		s.Log.Errorf("Failed to sum claim culling for project flock %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch claim culling data")
+	}
+
+	finalPopulation := population - claimCulling
+
+	var standards []entity.FcrStandard
+	if project.FcrId > 0 {
+		standards, err = s.Repository.GetFcrStandardsByFcrID(c.Context(), project.FcrId)
+		if err != nil {
+			s.Log.Errorf("Failed to fetch FCR standards for project flock %d: %+v", projectFlockID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch FCR standard data")
+		}
+	}
+	// masih dummy, karena tab penjualan agenya masih dummy
+	age := 1.0
+
+	feedUsedPerHead := 0.0
+	if population > 0 {
+		feedUsedPerHead = feedUsed / population
+	}
+
+	purchase := dto.ClosingPurchaseDTO{
+		InitialPopulation: int(population),
+		ClaimCulling:      int(claimCulling),
+		FinalPopulation:   int(finalPopulation),
+		FeedIn:            feedIn,
+		FeedUsed:          feedUsed,
+		FeedUsedPerHead:   feedUsedPerHead,
+	}
+
+	chickenFlagNames := []string{string(utils.FlagPullet)}
+	chickenSalesWeight, chickenSalesQty, chickenSalesPrice, err := s.Repository.SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, chickenFlagNames)
+	if err != nil {
+		s.Log.Errorf("Failed to fetch chicken sales data for project flock %d: %+v", projectFlockID, err)
+		return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch chicken sales data")
+	}
+
+	var chickenAverageWeight float64
+	if chickenSalesQty > 0 {
+		chickenAverageWeight = chickenSalesWeight / chickenSalesQty
+	}
+
+	var chickenAverageSellingPrice float64
+	if chickenSalesWeight > 0 {
+		chickenAverageSellingPrice = chickenSalesPrice / chickenSalesWeight
+	}
+
+	chickenSales := dto.ClosingSalesDTO{
+		SalesPopulation:     int(chickenSalesQty),
+		SalesWeight:         chickenSalesWeight,
+		AverageWeight:       chickenAverageWeight,
+		AverageSellingPrice: chickenAverageSellingPrice,
+	}
+
+	chickenDepletion := population - chickenSalesQty
+	if chickenDepletion < 0 {
+		chickenDepletion = 0
+	}
+
+	chickenPerformance := calculatePerformanceMetrics(chickenAverageWeight, chickenSalesWeight, feedUsed, population, chickenDepletion, age, standards)
+
+	var eggSales *dto.ClosingEggSalesDTO
+	var eggPerformance *dto.ClosingPerformanceDTO
+	if !isGrowing {
+		eggFlagNames := []string{
+			string(utils.FlagTelur),
+			string(utils.FlagTelurUtuh),
+			string(utils.FlagTelurPecah),
+			string(utils.FlagTelurPutih),
+			string(utils.FlagTelurRetak),
+		}
+
+		eggSalesWeight, eggSalesQty, eggSalesPrice, err := s.Repository.SumMarketingWeightAndQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, eggFlagNames)
+		if err != nil {
+			s.Log.Errorf("Failed to fetch egg sales data for project flock %d: %+v", projectFlockID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch egg sales data")
+		}
+
+		var averageEggWeight float64
+		if eggSalesQty > 0 {
+			averageEggWeight = eggSalesWeight / eggSalesQty
+		}
+
+		var averageEggSellingPrice float64
+		if eggSalesWeight > 0 {
+			averageEggSellingPrice = eggSalesPrice / eggSalesWeight
+		}
+
+		eggSales = &dto.ClosingEggSalesDTO{
+			EggPieces:           int(eggSalesQty),
+			EggMassKg:           eggSalesWeight,
+			AverageEggWeightKg:  averageEggWeight,
+			AverageSellingPrice: averageEggSellingPrice,
+		}
+
+		harvestEggQty, err := s.Repository.SumRecordingEggQtyByProjectFlockKandangIDsAndFlagNames(c.Context(), projectFlockKandangIDs, eggFlagNames)
+		if err != nil {
+			s.Log.Errorf("Failed to fetch recording egg qty for project flock %d: %+v", projectFlockID, err)
+			return nil, fiber.NewError(fiber.StatusInternalServerError, "Failed to fetch egg harvest data")
+		}
+
+		eggDepletion := harvestEggQty - eggSalesQty
+		if eggDepletion < 0 {
+			eggDepletion = 0
+		}
+
+		eggPerf := calculatePerformanceMetrics(averageEggWeight, eggSalesWeight, feedUsed, harvestEggQty, eggDepletion, age, standards)
+		eggPerformance = &eggPerf
+	}
+
+	sales := dto.ClosingSalesGroupDTO{
+		Chicken: chickenSales,
+		Egg:     eggSales,
+	}
+
+	performance := dto.ClosingPerformanceDTO{
+		Depletion:     chickenPerformance.Depletion,
+		Age:           age,
+		MortalityStd:  chickenPerformance.MortalityStd,
+		MortalityAct:  chickenPerformance.MortalityAct,
+		DeffMortality: chickenPerformance.DeffMortality,
+	}
+	if eggPerformance != nil {
+		performance.FcrStd = eggPerformance.FcrStd
+		performance.FcrAct = eggPerformance.FcrAct
+		performance.DeffFcr = eggPerformance.DeffFcr
+		performance.Awg = eggPerformance.Awg
+	} else {
+		performance.FcrStd = chickenPerformance.FcrStd
+		performance.FcrAct = chickenPerformance.FcrAct
+		performance.DeffFcr = chickenPerformance.DeffFcr
+		performance.Awg = chickenPerformance.Awg
+	}
+
+	result := dto.ClosingProductionReportDTO{
+		Purchase:    purchase,
+		Sales:       sales,
+		Performance: performance,
+	}
+
+	return &result, nil
+}
+
+func calculatePerformanceMetrics(averageWeight, totalWeight, feedUsed, basePopulation, depletion, age float64, standards []entity.FcrStandard) dto.ClosingPerformanceDTO {
+	mortalityStd, fcrStd := closestFcrValues(standards, averageWeight)
+
+	fcrAct := 0.0
+	if totalWeight > 0 {
+		fcrAct = feedUsed / totalWeight
+	}
+
+	mortalityAct := 0.0
+	if basePopulation > 0 {
+		mortalityAct = (depletion / basePopulation) * 100
+	}
+
+	deffMortality := mortalityStd - mortalityAct
+	deffFcr := fcrStd - fcrAct
+
+	awg := 0.0
+	if age > 0 {
+		awg = averageWeight / age
+	}
+
+	return dto.ClosingPerformanceDTO{
+		Depletion:     depletion,
+		Age:           age,
+		MortalityStd:  mortalityStd,
+		MortalityAct:  mortalityAct,
+		DeffMortality: deffMortality,
+		FcrStd:        fcrStd,
+		FcrAct:        fcrAct,
+		DeffFcr:       deffFcr,
+		Awg:           awg,
+	}
+}
+
+func closestFcrValues(standards []entity.FcrStandard, averageWeight float64) (float64, float64) {
+	if len(standards) == 0 || averageWeight <= 0 {
+		return 0, 0
+	}
+
+	closest := standards[0]
+	minDiff := math.Abs(closest.Weight - averageWeight)
+	for _, std := range standards[1:] {
+		diff := math.Abs(std.Weight - averageWeight)
+		if diff < minDiff {
+			minDiff = diff
+			closest = std
+		}
+	}
+
+	return closest.Mortality, closest.FcrNumber
+
+}

internal/modules/constants/route.go

@@ -12,6 +12,5 @@ func ConstantRoutes(v1 fiber.Router, s constant.ConstantService) {
 	ctrl := controller.NewConstantController(s)
 
 	route := v1.Group("/constants")
-
 	route.Get("/", ctrl.GetAll)
 }

internal/modules/expenses/route.go

@@ -22,16 +22,16 @@ func ExpenseRoutes(v1 fiber.Router, u user.UserService, s expense.ExpenseService
 	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
 	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
-	route.Post("/approvals/manager", ctrl.Approval)
-	route.Post("/approvals/finance", ctrl.Approval)
-	route.Post("/:id/realizations", ctrl.CreateRealization)
-	route.Patch("/:id/realizations", ctrl.UpdateRealization)
-	route.Post("/:id/complete", ctrl.CompleteExpense)
-	route.Delete("/:id/documents/:documentId", ctrl.DeleteDocument)
-	route.Delete("/:id/realization-documents/:documentId", ctrl.DeleteRealizationDocument)
+	route.Get("/",m.RequirePermissions(m.P_ExpenseGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_ExpenseCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_ExpenseGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_ExpenseUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_ExpenseDeleteOne), ctrl.DeleteOne)
+	route.Post("/approvals/manager",m.RequirePermissions(m.P_ExpenseApprovalManager), ctrl.Approval)
+	route.Post("/approvals/finance",m.RequirePermissions(m.P_ExpenseApprovalFinance), ctrl.Approval)
+	route.Post("/:id/realizations",m.RequirePermissions(m.P_ExpenseCreateRealizations), ctrl.CreateRealization)
+	route.Patch("/:id/realizations",m.RequirePermissions(m.P_ExpenseUpdateRealizations), ctrl.UpdateRealization)
+	route.Post("/:id/complete",m.RequirePermissions(m.P_ExpenseCompleteExpense), ctrl.CompleteExpense)
+	route.Delete("/:id/documents/:documentId",m.RequirePermissions(m.P_ExpenseDocument), ctrl.DeleteDocument)
+	route.Delete("/:id/realization-documents/:documentId",m.RequirePermissions(m.P_ExpenseDocumentRealizations), ctrl.DeleteRealizationDocument)
 }

internal/modules/inventory/adjustments/route.go

@@ -14,9 +14,9 @@ func AdjustmentRoutes(v1 fiber.Router, u user.UserService, s adjustment.Adjustme
 
 	route := v1.Group("/adjustments")
 	route.Use(m.Auth(u))
-
-	route.Get("/", ctrl.AdjustmentHistory)
-	route.Post("/", ctrl.Adjustment)
-	route.Get("/:id", ctrl.GetOne)
+	// Standard CRUD routes following master data pattern
+	route.Get("/",m.RequirePermissions(m.P_AdjustmentGetAll), ctrl.AdjustmentHistory) // Get all with pagination and filters
+	route.Post("/",m.RequirePermissions(m.P_AdjustmentCreate), ctrl.Adjustment)       // Create adjustment
+	route.Get("/:id",m.RequirePermissions(m.P_AdjustmentGetOne), ctrl.GetOne)
 
 }

internal/modules/inventory/product-stocks/route.go

@@ -1,7 +1,7 @@
 package productStocks
 
 import (
-	// m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/controllers"
 	productStock "gitlab.com/mbugroup/lti-api.git/internal/modules/inventory/product-stocks/services"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
@@ -13,13 +13,13 @@ func ProductStockRoutes(v1 fiber.Router, u user.UserService, s productStock.Prod
 	ctrl := controller.NewProductStockController(s)
 
 	route := v1.Group("/product-stocks")
-
+route.Use(m.Auth(u))
 	// route.Get("/", m.Auth(u), ctrl.GetAll)
 	// route.Post("/", m.Auth(u), ctrl.CreateOne)
 	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
 	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
 	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
 
-	route.Get("/", ctrl.GetAll)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/",m.RequirePermissions(m.P_ProductStockGetAll), ctrl.GetAll)
+	route.Get("/:id",m.RequirePermissions(m.P_ProductStockGetOne), ctrl.GetOne)
 }

internal/modules/inventory/product-stocks/services/product-stock.service.go

@@ -64,11 +64,18 @@ func (s productStockService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 	offset := (params.Page - 1) * params.Limit
 
 	productStocks, total, err := s.ProductRepository.GetAll(c.Context(), offset, params.Limit, func(db *gorm.DB) *gorm.DB {
+		db = db.Where(`EXISTS (
+			SELECT 1
+			FROM product_warehouses pw
+			WHERE pw.product_id = products.id
+				AND pw.qty > 0
+		)`)
+
 		db = s.withRelations(db)
 		if params.Search != "" {
-			return db.Where("name ILIKE ?", "%"+params.Search+"%")
+			db = db.Where("products.name ILIKE ?", "%"+params.Search+"%")
 		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
+		return db.Order("products.created_at DESC").Order("products.updated_at DESC")
 	})
 
 	if err != nil {

internal/modules/inventory/product-warehouses/route.go

@@ -15,7 +15,7 @@ func ProductWarehouseRoutes(v1 fiber.Router, u user.UserService, s productWareho
 	route := v1.Group("/product-warehouses")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/",m.RequirePermissions(m.P_ProductWarehousekGetAll), ctrl.GetAll)
+	route.Get("/:id",m.RequirePermissions(m.P_ProductWarehouseGetOne), ctrl.GetOne)
 
 }

internal/modules/inventory/transfers/route.go

@@ -15,8 +15,8 @@ func TransferRoutes(v1 fiber.Router, u user.UserService, s transfer.TransferServ
 	route := v1.Group("/transfers")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/",m.RequirePermissions(m.P_TransferGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_TransferCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_TransferGetOne), ctrl.GetOne)
 
 }

internal/modules/master/areas/route.go

@@ -15,9 +15,9 @@ func AreaRoutes(v1 fiber.Router, u user.UserService, s area.AreaService) {
 	route := v1.Group("/areas")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_AreaGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_AreaCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_AreaGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_AreaUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_AreaDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/banks/route.go

@@ -14,10 +14,9 @@ func BankRoutes(v1 fiber.Router, u user.UserService, s bank.BankService) {
 
 	route := v1.Group("/banks")
 	route.Use(m.Auth(u))
-
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_BanksGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_BanksCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_BanksGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_BanksUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_BanksDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/customers/route.go

@@ -15,9 +15,9 @@ func CustomerRoutes(v1 fiber.Router, u user.UserService, s customer.CustomerServ
 	route := v1.Group("/customers")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_CustomerGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_CustomerCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_CustomerGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_CustomerUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_CustomerDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/fcrs/route.go

@@ -15,9 +15,9 @@ func FcrRoutes(v1 fiber.Router, u user.UserService, s fcr.FcrService) {
 	route := v1.Group("/fcrs")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_FcrGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_FcrCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_FcrGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_FcrUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_FcrDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/flocks/route.go

@@ -15,9 +15,9 @@ func FlockRoutes(v1 fiber.Router, u user.UserService, s flock.FlockService) {
 	route := v1.Group("/flocks")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_FlocksGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_FlocksCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_FlocksGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_FlocksUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_FlocksDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/kandangs/route.go

@@ -15,9 +15,9 @@ func KandangRoutes(v1 fiber.Router, u user.UserService, s kandang.KandangService
 	route := v1.Group("/kandangs")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_KandangsGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_KandangsCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_KandangsGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_KandangsUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_KandangsDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/locations/route.go

@@ -15,9 +15,9 @@ func LocationRoutes(v1 fiber.Router, u user.UserService, s location.LocationServ
 	route := v1.Group("/locations")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_LocationsGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_LocationsCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_LocationsGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_LocationsUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_LocationsDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/nonstocks/route.go

@@ -15,9 +15,9 @@ func NonstockRoutes(v1 fiber.Router, u user.UserService, s nonstock.NonstockServ
 	route := v1.Group("/nonstocks")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_NonstocksGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_NonstocksCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_NonstocksGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_NonstocksUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_NonstocksDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/product-categories/route.go

@@ -15,9 +15,9 @@ func ProductCategoryRoutes(v1 fiber.Router, u user.UserService, s productCategor
 	route := v1.Group("/product-categories")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_ProductCategoriesGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_ProductCategoriesCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_ProductCategoriesGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_ProductCategoriesUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_ProductCategoriesDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/products/route.go

@@ -15,9 +15,9 @@ func ProductRoutes(v1 fiber.Router, u user.UserService, s product.ProductService
 	route := v1.Group("/products")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_ProductsGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_ProductsCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_ProductsGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_ProductsUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_ProductsDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/suppliers/route.go

@@ -15,9 +15,9 @@ func SupplierRoutes(v1 fiber.Router, u user.UserService, s supplier.SupplierServ
 	route := v1.Group("/suppliers")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_SuppliersGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_SuppliersCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_SuppliersGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_SuppliersUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_SuppliersDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/uoms/route.go

@@ -20,4 +20,10 @@ func UomRoutes(v1 fiber.Router, u user.UserService, s uom.UomService) {
 	route.Get("/:id", ctrl.GetOne)
 	route.Patch("/:id", ctrl.UpdateOne)
 	route.Delete("/:id", ctrl.DeleteOne)
+
+	route.Get("/",m.RequirePermissions(m.P_AreaGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_AreaCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_AreaGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_AreaUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_AreaDeleteOne), ctrl.DeleteOne)
 }

internal/modules/master/warehouses/route.go

@@ -15,9 +15,9 @@ func WarehouseRoutes(v1 fiber.Router, u user.UserService, s warehouse.WarehouseS
 	route := v1.Group("/warehouses")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_WarehousesGetAll), ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_WarehousesCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_WarehousesGetOne), ctrl.GetOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_WarehousesUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_WarehousesDeleteOne), ctrl.DeleteOne)
 }

internal/modules/production/chickins/route.go

@@ -16,9 +16,9 @@ func ChickinRoutes(v1 fiber.Router, u user.UserService, s chickin.ChickinService
 	route.Use(m.Auth(u))
 
 	// route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Post("/",m.RequirePermissions(m.P_ChickinsCreateOne), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_ChickinsGetOne), ctrl.GetOne)
 	// route.Patch("/:id", ctrl.UpdateOne)
 	// route.Delete("/:id", ctrl.DeleteOne)
-	route.Post("/approvals", ctrl.Approval)
+	route.Post("/approvals",m.RequirePermissions(m.P_ChickinsApproval), ctrl.Approval)
 }

internal/modules/production/project-flock-kandangs/route.go

@@ -14,14 +14,8 @@ func ProjectFlockKandangRoutes(v1 fiber.Router, u user.UserService, s projectFlo
 
 	route := v1.Group("/project-flock-kandangs")
 	route.Use(m.Auth(u))
-	// route.Get("/", m.Auth(u), ctrl.GetAll)
-	// route.Post("/", m.Auth(u), ctrl.CreateOne)
-	// route.Get("/:id", m.Auth(u), ctrl.GetOne)
-	// route.Patch("/:id", m.Auth(u), ctrl.UpdateOne)
-	// route.Delete("/:id", m.Auth(u), ctrl.DeleteOne)
-
-	route.Get("/", ctrl.GetAll)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/",m.RequirePermissions(m.P_ProjectFlockKandangsGetAll), ctrl.GetAll)
+	route.Get("/:id",m.RequirePermissions(m.P_ProjectFlockKandangsGetOne), ctrl.GetOne)
 	// route.Post("/:id/closing", m.RequirePermissions(m.PermissionProjectFlockClosing), ctrl.Closing)
 	// route.Get("/:id/closing/check", m.RequirePermissions(m.PermissionProjectFlockClosing), ctrl.CheckClosing)
 	route.Post("/:id/closing", ctrl.Closing)

internal/modules/production/project_flocks/route.go

@@ -15,13 +15,13 @@ func ProjectflockRoutes(v1 fiber.Router, u user.UserService, s projectflock.Proj
 	route := v1.Group("/project-flocks")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Delete("/:id", ctrl.DeleteOne)
-	route.Get("/kandangs/lookup", ctrl.LookupProjectFlockKandang)
-	route.Post("/approvals", ctrl.Approval)
-	route.Get("/locations/:location_id/periods", ctrl.GetPeriodSummary)
-	route.Put("/:id/resubmit", ctrl.Resubmit)
+	route.Get("/",m.RequirePermissions(m.P_ProjectFlockGetAll),ctrl.GetAll)
+	route.Post("/",m.RequirePermissions(m.P_ProjectFlockCreate), ctrl.CreateOne)
+	route.Get("/:id",m.RequirePermissions(m.P_ProjectFlockGetOne), ctrl.GetOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_ProjectFlockGetAll), ctrl.DeleteOne)
+	route.Get("/kandangs/lookup",m.RequirePermissions(m.P_ProjectFlockLookup), ctrl.LookupProjectFlockKandang)
+	route.Post("/approvals",m.RequirePermissions(m.P_ProjectFlockApprove), ctrl.Approval)
+	route.Get("/locations/:location_id/periods",m.RequirePermissions(m.P_ProjectFlockNextPeriod), ctrl.GetPeriodSummary)
+	route.Put("/:id/resubmit",m.RequirePermissions(m.P_ProjectFlockResubmit), ctrl.Resubmit)
 
 }

internal/modules/production/recordings/route.go

@@ -15,11 +15,11 @@ func RecordingRoutes(v1 fiber.Router, u user.UserService, s recording.RecordingS
 	route := v1.Group("/recordings")
 	route.Use(m.Auth(u))
 
-	route.Get("/", ctrl.GetAll)
-	route.Get("/next-day", ctrl.GetNextDay)
-	route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
-	route.Patch("/:id", ctrl.UpdateOne)
-	route.Post("/approvals", ctrl.Approve)
-	route.Delete("/:id", ctrl.DeleteOne)
+	route.Get("/",m.RequirePermissions(m.P_RecordingGetAll), ctrl.GetAll)
+	route.Get("/:id",m.RequirePermissions(m.P_RecordingGetOne), ctrl.GetOne)
+	route.Post("/",m.RequirePermissions(m.P_RecordingCreateOne), ctrl.CreateOne)
+	route.Patch("/:id",m.RequirePermissions(m.P_RecordingUpdateOne), ctrl.UpdateOne)
+	route.Delete("/:id",m.RequirePermissions(m.P_RecordingDeleteOne), ctrl.DeleteOne)
+	route.Get("/next-day",m.RequirePermissions(m.P_RecordingNextDay), ctrl.GetNextDay)
+	route.Post("/approvals",m.RequirePermissions(m.P_RecordingApproval), ctrl.Approve)
 }

internal/modules/purchases/route.go

@@ -15,12 +15,12 @@ func Routes(router fiber.Router, purchaseService service.PurchaseService, userSe
 	route := router.Group("/purchases")
 	route.Use(m.Auth(userService))
 
-	route.Get("/", ctrl.GetAll)
-	route.Get("/:id", ctrl.GetOne)
-	route.Post("/", ctrl.CreateOne)
-	route.Post("/:id/approvals/staff", ctrl.ApproveStaffPurchase)
-	route.Post("/:id/approvals/manager", ctrl.ApproveManagerPurchase)
-	route.Post("/:id/receipts", ctrl.ReceiveProducts)
-	route.Delete("/:id", ctrl.DeletePurchase)
-	route.Delete("/:id/items", ctrl.DeleteItems)
+	route.Get("/",m.RequirePermissions(m.P_PurchaseGetAll), ctrl.GetAll)
+	route.Get("/:id",m.RequirePermissions(m.P_PurchaseGetOne), ctrl.GetOne)
+	route.Post("/",m.RequirePermissions(m.P_PurchaseCreateOne), ctrl.CreateOne)
+	route.Post("/:id/approvals/staff",m.RequirePermissions(m.P_PurchaseApprovalStaff), ctrl.ApproveStaffPurchase)
+	route.Post("/:id/approvals/manager",m.RequirePermissions(m.P_PurchaseApprovalManager), ctrl.ApproveManagerPurchase)
+	route.Post("/:id/receipts",m.RequirePermissions(m.P_PurchaseReceive), ctrl.ReceiveProducts)
+	route.Delete("/:id",m.RequirePermissions(m.P_RecordingDeleteOne), ctrl.DeletePurchase)
+	route.Delete("/:id/items",m.RequirePermissions(m.P_PurchaseItemDeleteOne), ctrl.DeleteItems)
 }

internal/modules/repports/controllers/repport.controller.go

@@ -114,3 +114,53 @@ func (c *RepportController) GetMarketing(ctx *fiber.Ctx) error {
 			Total: total,
 		})
 }
+
+func (c *RepportController) GetPurchaseSupplier(ctx *fiber.Ctx) error {
+	query := &validation.PurchaseSupplierQuery{
+		Page:              ctx.QueryInt("page", 1),
+		Limit:             ctx.QueryInt("limit", 10),
+		AreaId:            int64(ctx.QueryInt("area_id", 0)),
+		SupplierId:        int64(ctx.QueryInt("supplier_id", 0)),
+		ProductId:         int64(ctx.QueryInt("product_id", 0)),
+		ProductCategoryId: int64(ctx.QueryInt("product_category_id", 0)),
+		StartDate:         ctx.Query("start_date", ""),
+		EndDate:           ctx.Query("end_date", ""),
+		SortBy:            ctx.Query("sort_by", ""),
+		FilterBy:          ctx.Query("filter_by", ""),
+	}
+
+	if query.Page < 1 || query.Limit < 1 {
+		return fiber.NewError(fiber.StatusBadRequest, "page and limit must be greater than 0")
+	}
+
+	result, totalResults, err := c.RepportService.GetPurchaseSupplier(ctx, query)
+	if err != nil {
+		return err
+	}
+
+	filters := map[string]interface{}{
+		"area_id":             query.AreaId,
+		"supplier_id":         query.SupplierId,
+		"product_id":          query.ProductId,
+		"product_category_id": query.ProductCategoryId,
+		"start_date":          query.StartDate,
+		"end_date":            query.EndDate,
+		"sort_by":             query.SortBy,
+		"filter_by":           query.FilterBy,
+	}
+
+	return ctx.Status(fiber.StatusOK).
+		JSON(response.SuccessWithPaginate[dto.PurchaseSupplierDTO]{
+			Code:    fiber.StatusOK,
+			Status:  "success",
+			Message: "Get supplier purchase recap successfully",
+			Meta: response.Meta{
+				Page:         query.Page,
+				Limit:        query.Limit,
+				TotalPages:   int64(math.Ceil(float64(totalResults) / float64(query.Limit))),
+				TotalResults: totalResults,
+				Filters:      filters,
+			},
+			Data: result,
+		})
+}

internal/modules/repports/dto/repportPurchase.dto.go

@@ -0,0 +1,159 @@
+package dto
+
+import (
+	"math"
+	"time"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	productDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/products/dto"
+	supplierDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/suppliers/dto"
+	warehouseDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/warehouses/dto"
+)
+
+type PurchaseSupplierRowDTO struct {
+	ReceiveDate        string                             `json:"receive_date"`
+	PoDate             string                             `json:"po_date"`
+	PoNumber           string                             `json:"po_number"`
+	Product            *productDTO.ProductRelationDTO     `json:"product,omitempty"`
+	Warehouse          *warehouseDTO.WarehouseRelationDTO `json:"warehouse,omitempty"`
+	Qty                float64                            `json:"qty"`
+	UnitPrice          float64                            `json:"unit_price"`
+	PurchaseValue      float64                            `json:"purchase_value"`
+	TransportUnitPrice float64                            `json:"transport_unit_price"`
+	TransportValue     float64                            `json:"transport_value"`
+	TotalAmount        float64                            `json:"total_amount"`
+	Expedition         string                             `json:"expedition"`
+	DeliveryNumber     string                             `json:"delivery_number"`
+}
+
+type PurchaseSupplierSummaryDTO struct {
+	TotalQty                 float64 `json:"total_qty"`
+	TotalPurchaseValue       float64 `json:"total_purchase_value"`
+	TotalTransportValue      float64 `json:"total_transport_value"`
+	TotalAmount              float64 `json:"total_amount"`
+	TotalUnitPrice           float64 `json:"total_unit_price"`
+	TotalTransportUnitPrice  float64 `json:"total_transport_unit_price"`
+}
+
+type PurchaseSupplierDTO struct {
+	Supplier *supplierDTO.SupplierRelationDTO `json:"supplier"`
+	Rows     []PurchaseSupplierRowDTO         `json:"rows"`
+	Summary  PurchaseSupplierSummaryDTO       `json:"summary"`
+}
+
+func formatDatePtr(t *time.Time) string {
+	if t == nil || t.IsZero() {
+		return ""
+	}
+	return t.Format("02-Jan-2006")
+}
+
+func ToPurchaseSupplierRowDTO(item *entity.PurchaseItem) PurchaseSupplierRowDTO {
+	row := PurchaseSupplierRowDTO{
+		ReceiveDate: formatDatePtr(item.ReceivedDate),
+		Qty:         item.TotalQty,
+		UnitPrice:   item.Price,
+	}
+
+	if item.Purchase != nil {
+		row.PoDate = formatDatePtr(item.Purchase.PoDate)
+		if item.Purchase.PoNumber != nil {
+			row.PoNumber = *item.Purchase.PoNumber
+		}
+	}
+
+	if item.Product != nil && item.Product.Id != 0 {
+		product := productDTO.ToProductRelationDTO(*item.Product)
+		row.Product = &product
+	}
+
+	if item.Warehouse != nil && item.Warehouse.Id != 0 {
+		warehouse := warehouseDTO.ToWarehouseRelationDTO(*item.Warehouse)
+		row.Warehouse = &warehouse
+	}
+
+	qty := row.Qty
+	if qty < 0 {
+		qty = 0
+	}
+
+	row.PurchaseValue = row.UnitPrice * qty
+
+	var transportUnit float64
+	var expeditionName string
+
+	if item.ExpenseNonstock != nil {
+		transportUnit = item.ExpenseNonstock.Price
+
+		if item.ExpenseNonstock.Expense != nil &&
+			item.ExpenseNonstock.Expense.Supplier != nil &&
+			item.ExpenseNonstock.Expense.Supplier.Id != 0 {
+			expSupplier := item.ExpenseNonstock.Expense.Supplier
+			expeditionName = expSupplier.Name
+		}
+	}
+
+	row.TransportUnitPrice = transportUnit
+	row.TransportValue = transportUnit * qty
+	row.TotalAmount = row.PurchaseValue + row.TransportValue
+
+	if expeditionName == "" {
+		row.Expedition = "-"
+	} else {
+		row.Expedition = expeditionName
+	}
+
+	if item.TravelNumber != nil && *item.TravelNumber != "" {
+		row.DeliveryNumber = *item.TravelNumber
+	} else {
+		row.DeliveryNumber = "-"
+	}
+
+	return row
+}
+
+func ToPurchaseSupplierDTO(supplier entity.Supplier, items []entity.PurchaseItem) PurchaseSupplierDTO {
+	var supplierDTORef *supplierDTO.SupplierRelationDTO
+	if supplier.Id != 0 {
+		mapped := supplierDTO.ToSupplierRelationDTO(supplier)
+		supplierDTORef = &mapped
+	}
+
+	rows := make([]PurchaseSupplierRowDTO, 0, len(items))
+	summary := PurchaseSupplierSummaryDTO{}
+
+	var unitPriceSum float64
+	var unitPriceCount int
+	var transportUnitPriceSum float64
+	var transportUnitPriceCount int
+
+	for i := range items {
+		row := ToPurchaseSupplierRowDTO(&items[i])
+		rows = append(rows, row)
+
+		summary.TotalQty += row.Qty
+		summary.TotalPurchaseValue += row.PurchaseValue
+		summary.TotalTransportValue += row.TransportValue
+		summary.TotalAmount += row.TotalAmount
+
+		unitPriceSum += row.UnitPrice
+		unitPriceCount++
+
+		transportUnitPriceSum += row.TransportUnitPrice
+		transportUnitPriceCount++
+	}
+
+	if unitPriceCount > 0 {
+		summary.TotalUnitPrice = math.Round(unitPriceSum / float64(unitPriceCount))
+	}
+
+	if transportUnitPriceCount > 0 {
+		summary.TotalTransportUnitPrice = math.Round(transportUnitPriceSum / float64(transportUnitPriceCount))
+	}
+
+	return PurchaseSupplierDTO{
+		Supplier: supplierDTORef,
+		Rows:     rows,
+		Summary:  summary,
+	}
+}

internal/modules/repports/module.go

@@ -7,6 +7,7 @@ import (
 
 	commonRepo "gitlab.com/mbugroup/lti-api.git/internal/common/repository"
 	approvalService "gitlab.com/mbugroup/lti-api.git/internal/common/service"
+	repportRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/repositories"
 	sRepport "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/services"
 
 	expenseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/expenses/repositories"
@@ -14,6 +15,9 @@ import (
 	chickinRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/chickins/repositories"
 	recordingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
 	purchaseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/purchases/repositories"
+
+	rUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/repositories"
+	sUser "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 )
 
 type RepportModule struct{}
@@ -26,9 +30,12 @@ func (RepportModule) RegisterRoutes(router fiber.Router, db *gorm.DB, validate *
 	chickinRepository := chickinRepo.NewChickinRepository(db)
 	recordingRepository := recordingRepo.NewRecordingRepository(db)
 	approvalRepository := commonRepo.NewApprovalRepository(db)
+	purchaseSupplierRepository := repportRepo.NewPurchaseSupplierRepository(db)
+	userRepository := rUser.NewUserRepository(db)
 
 	approvalSvc := approvalService.NewApprovalService(approvalRepository)
-	repportService := sRepport.NewRepportService(validate, expenseRealizationRepository, marketingDeliveryProductRepository, purchaseRepository, chickinRepository, recordingRepository, approvalSvc)
+	repportService := sRepport.NewRepportService(validate, expenseRealizationRepository, marketingDeliveryProductRepository, purchaseRepository, chickinRepository, recordingRepository, approvalSvc, purchaseSupplierRepository)
+	userService := sUser.NewUserService(userRepository, validate)
 
-	RepportRoutes(router, repportService)
+	RepportRoutes(router, userService, repportService)
 }

internal/modules/repports/repositories/purchase_supplier.repository.go

@@ -0,0 +1,195 @@
+package repositories
+
+import (
+	"context"
+	"fmt"
+	"strings"
+
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/validations"
+	"gitlab.com/mbugroup/lti-api.git/internal/utils"
+
+	"gorm.io/gorm"
+)
+
+type PurchaseSupplierRepository interface {
+	GetSuppliersWithPurchases(ctx context.Context, offset, limit int, filters *validation.PurchaseSupplierQuery) ([]entity.Supplier, int64, error)
+	GetItemsBySuppliers(ctx context.Context, supplierIDs []uint, filters *validation.PurchaseSupplierQuery) ([]entity.PurchaseItem, error)
+}
+
+type purchaseSupplierRepositoryImpl struct {
+	db *gorm.DB
+}
+
+func NewPurchaseSupplierRepository(db *gorm.DB) PurchaseSupplierRepository {
+	return &purchaseSupplierRepositoryImpl{db: db}
+}
+
+func (r *purchaseSupplierRepositoryImpl) baseSupplierQuery(ctx context.Context, filters *validation.PurchaseSupplierQuery) *gorm.DB {
+	dateColumn := "purchase_items.received_date"
+	switch strings.ToLower(strings.TrimSpace(filters.FilterBy)) {
+	case "po_date":
+		dateColumn = "purchases.po_date"
+	case "receive_date", "":
+		dateColumn = "purchase_items.received_date"
+	}
+
+	db := r.db.WithContext(ctx).
+		Model(&entity.Supplier{}).
+		Joins("JOIN purchases ON purchases.supplier_id = suppliers.id").
+		Joins("JOIN purchase_items ON purchase_items.purchase_id = purchases.id")
+
+	if filters.SupplierId > 0 {
+		db = db.Where("suppliers.id = ?", filters.SupplierId)
+	}
+
+	if filters.ProductId > 0 {
+		db = db.Where("purchase_items.product_id = ?", filters.ProductId)
+	}
+
+	if filters.ProductCategoryId > 0 {
+		db = db.
+			Joins("JOIN products ON products.id = purchase_items.product_id").
+			Where("products.product_category_id = ?", filters.ProductCategoryId)
+	}
+
+	if filters.AreaId > 0 {
+		db = db.
+			Joins("JOIN warehouses ON warehouses.id = purchase_items.warehouse_id").
+			Where("warehouses.area_id = ?", filters.AreaId)
+	}
+
+	if filters.StartDate != "" {
+		if dateFrom, err := utils.ParseDateString(filters.StartDate); err == nil {
+			db = db.Where(fmt.Sprintf("DATE(%s) >= ?", dateColumn), dateFrom)
+		}
+	}
+
+	if filters.EndDate != "" {
+		if dateTo, err := utils.ParseDateString(filters.EndDate); err == nil {
+			db = db.Where(fmt.Sprintf("DATE(%s) <= ?", dateColumn), dateTo)
+		}
+	}
+
+	return db
+}
+
+func (r *purchaseSupplierRepositoryImpl) GetSuppliersWithPurchases(ctx context.Context, offset, limit int, filters *validation.PurchaseSupplierQuery) ([]entity.Supplier, int64, error) {
+	query := r.baseSupplierQuery(ctx, filters)
+
+	var totalSuppliers int64
+	if err := query.
+		Distinct("suppliers.id").
+		Count(&totalSuppliers).Error; err != nil {
+		return nil, 0, err
+	}
+
+	if totalSuppliers == 0 {
+		return []entity.Supplier{}, 0, nil
+	}
+
+	if offset < 0 {
+		offset = 0
+	}
+
+	var supplierIDs []uint
+	if err := query.
+		Select("suppliers.id").
+		Order("suppliers.id ASC").
+		Offset(offset).
+		Limit(limit).
+		Pluck("suppliers.id", &supplierIDs).Error; err != nil {
+		return nil, 0, err
+	}
+
+	if len(supplierIDs) == 0 {
+		return []entity.Supplier{}, totalSuppliers, nil
+	}
+
+	var suppliers []entity.Supplier
+	if err := r.db.WithContext(ctx).
+		Where("id IN ?", supplierIDs).
+		Find(&suppliers).Error; err != nil {
+		return nil, 0, err
+	}
+
+	return suppliers, totalSuppliers, nil
+}
+
+func (r *purchaseSupplierRepositoryImpl) GetItemsBySuppliers(ctx context.Context, supplierIDs []uint, filters *validation.PurchaseSupplierQuery) ([]entity.PurchaseItem, error) {
+	if len(supplierIDs) == 0 {
+		return []entity.PurchaseItem{}, nil
+	}
+
+	// Tentukan kolom tanggal yang akan dipakai untuk filter & sort
+	dateColumn := "purchase_items.received_date"
+	switch strings.ToLower(strings.TrimSpace(filters.FilterBy)) {
+	case "po_date":
+		dateColumn = "purchases.po_date"
+	case "receive_date", "":
+		dateColumn = "purchase_items.received_date"
+	}
+
+	orderDirection := "ASC"
+	switch strings.ToUpper(strings.TrimSpace(filters.SortBy)) {
+	case "DESC":
+		orderDirection = "DESC"
+	case "ASC", "":
+		orderDirection = "ASC"
+	}
+
+	db := r.db.WithContext(ctx).
+		Model(&entity.PurchaseItem{}).
+		Preload("Purchase").
+		Preload("Purchase.Supplier").
+		Preload("Product").
+		Preload("Product.ProductCategory").
+		Preload("Warehouse").
+		Preload("Warehouse.Area").
+		Preload("Warehouse.Location").
+		Preload("Warehouse.Kandang").
+		Preload("ExpenseNonstock").
+		Preload("ExpenseNonstock.Expense").
+		Preload("ExpenseNonstock.Expense.Supplier").
+		Joins("JOIN purchases ON purchases.id = purchase_items.purchase_id").
+		Where("purchases.supplier_id IN ?", supplierIDs)
+
+	if filters.ProductId > 0 {
+		db = db.Where("purchase_items.product_id = ?", filters.ProductId)
+	}
+
+	if filters.ProductCategoryId > 0 {
+		db = db.
+			Joins("JOIN products ON products.id = purchase_items.product_id").
+			Where("products.product_category_id = ?", filters.ProductCategoryId)
+	}
+
+	if filters.AreaId > 0 {
+		db = db.
+			Joins("JOIN warehouses ON warehouses.id = purchase_items.warehouse_id").
+			Where("warehouses.area_id = ?", filters.AreaId)
+	}
+
+	if filters.StartDate != "" {
+		if dateFrom, err := utils.ParseDateString(filters.StartDate); err == nil {
+			db = db.Where(fmt.Sprintf("DATE(%s) >= ?", dateColumn), dateFrom)
+		}
+	}
+
+	if filters.EndDate != "" {
+		if dateTo, err := utils.ParseDateString(filters.EndDate); err == nil {
+			db = db.Where(fmt.Sprintf("DATE(%s) <= ?", dateColumn), dateTo)
+		}
+	}
+
+	// Urutkan berdasarkan kolom tanggal yang dipilih dan arah sort
+	db = db.Order(fmt.Sprintf("%s %s", dateColumn, orderDirection)).
+		Order("purchase_items.id ASC")
+
+	var items []entity.PurchaseItem
+	if err := db.Find(&items).Error; err != nil {
+		return nil, err
+	}
+
+	return items, nil
+}

internal/modules/repports/route.go

@@ -1,17 +1,21 @@
 package repports
 
 import (
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/controllers"
 	repport "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/services"
+	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 
 	"github.com/gofiber/fiber/v2"
 )
 
-func RepportRoutes(v1 fiber.Router, s repport.RepportService) {
+func RepportRoutes(v1 fiber.Router, u user.UserService, s repport.RepportService) {
 	ctrl := controller.NewRepportController(s)
 
 	route := v1.Group("/reports")
+	route.Use(m.Auth(u))
 
-	route.Get("/expense", ctrl.GetExpense)
-	route.Get("/marketing", ctrl.GetMarketing)
+	route.Get("/expense", m.RequirePermissions(m.P_ReportExpenseGetAll), ctrl.GetExpense)
+	route.Get("/marketing", m.RequirePermissions(m.P_ReportDeliveryGetAll), ctrl.GetMarketing)
+	route.Get("/purchase-supplier", m.RequirePermissions(m.P_ReportPurchaseSupplierGetAll), ctrl.GetPurchaseSupplier)
 }

internal/modules/repports/services/repport.service.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"gitlab.com/mbugroup/lti-api.git/internal/modules/repports/dto"
+	repportRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/repositories"
 	validation "gitlab.com/mbugroup/lti-api.git/internal/modules/repports/validations"
 	"gitlab.com/mbugroup/lti-api.git/internal/utils"
 
@@ -15,6 +16,8 @@ import (
 	recordingRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/production/recordings/repositories"
 	purchaseRepo "gitlab.com/mbugroup/lti-api.git/internal/modules/purchases/repositories"
 
+	entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
+
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
 	"github.com/sirupsen/logrus"
@@ -24,6 +27,7 @@ import (
 type RepportService interface {
 	GetExpense(ctx *fiber.Ctx, params *validation.ExpenseQuery) ([]dto.RepportExpenseListDTO, int64, error)
 	GetMarketing(ctx *fiber.Ctx, params *validation.MarketingQuery) ([]dto.RepportMarketingItemDTO, int64, error)
+	GetPurchaseSupplier(ctx *fiber.Ctx, params *validation.PurchaseSupplierQuery) ([]dto.PurchaseSupplierDTO, int64, error)
 }
 
 type repportService struct {
@@ -35,9 +39,19 @@ type repportService struct {
 	ChickinRepo            chickinRepo.ProjectChickinRepository
 	RecordingRepo          recordingRepo.RecordingRepository
 	ApprovalSvc            approvalService.ApprovalService
+	PurchaseSupplierRepo   repportRepo.PurchaseSupplierRepository
 }
 
-func NewRepportService(validate *validator.Validate, expenseRealizationRepo expenseRepo.ExpenseRealizationRepository, marketingDeliveryRepo marketingRepo.MarketingDeliveryProductRepository, purchaseRepo purchaseRepo.PurchaseRepository, chickinRepo chickinRepo.ProjectChickinRepository, recordingRepo recordingRepo.RecordingRepository, approvalSvc approvalService.ApprovalService) RepportService {
+func NewRepportService(
+	validate *validator.Validate,
+	expenseRealizationRepo expenseRepo.ExpenseRealizationRepository,
+	marketingDeliveryRepo marketingRepo.MarketingDeliveryProductRepository,
+	purchaseRepo purchaseRepo.PurchaseRepository,
+	chickinRepo chickinRepo.ProjectChickinRepository,
+	recordingRepo recordingRepo.RecordingRepository,
+	approvalSvc approvalService.ApprovalService,
+	purchaseSupplierRepo repportRepo.PurchaseSupplierRepository,
+) RepportService {
 	return &repportService{
 		Log:                    utils.Log,
 		Validate:               validate,
@@ -47,6 +61,7 @@ func NewRepportService(validate *validator.Validate, expenseRealizationRepo expe
 		ChickinRepo:            chickinRepo,
 		RecordingRepo:          recordingRepo,
 		ApprovalSvc:            approvalSvc,
+		PurchaseSupplierRepo:   purchaseSupplierRepo,
 	}
 }
 
@@ -195,3 +210,58 @@ func (s *repportService) getTotalProjectCost(ctx context.Context, projectFlockID
 
 	return cost
 }
+
+func (s *repportService) GetPurchaseSupplier(c *fiber.Ctx, params *validation.PurchaseSupplierQuery) ([]dto.PurchaseSupplierDTO, int64, error) {
+	if err := s.Validate.Struct(params); err != nil {
+		return nil, 0, err
+	}
+
+	offset := (params.Page - 1) * params.Limit
+	if offset < 0 {
+		offset = 0
+	}
+
+	suppliers, totalSuppliers, err := s.PurchaseSupplierRepo.GetSuppliersWithPurchases(c.Context(), offset, params.Limit, params)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	if totalSuppliers == 0 || len(suppliers) == 0 {
+		return []dto.PurchaseSupplierDTO{}, totalSuppliers, nil
+	}
+
+	supplierMap := make(map[uint]entity.Supplier, len(suppliers))
+	supplierIDs := make([]uint, 0, len(suppliers))
+	for _, supplier := range suppliers {
+		supplierMap[supplier.Id] = supplier
+		supplierIDs = append(supplierIDs, supplier.Id)
+	}
+
+	items, err := s.PurchaseSupplierRepo.GetItemsBySuppliers(c.Context(), supplierIDs, params)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	itemsBySupplier := make(map[uint][]entity.PurchaseItem)
+	for _, item := range items {
+		if item.Purchase == nil {
+			continue
+		}
+		supplierID := item.Purchase.SupplierId
+		itemsBySupplier[supplierID] = append(itemsBySupplier[supplierID], item)
+	}
+
+	result := make([]dto.PurchaseSupplierDTO, 0, len(supplierIDs))
+	for _, supplierID := range supplierIDs {
+		supplier, exists := supplierMap[supplierID]
+		if !exists {
+			continue
+		}
+
+		supplierItems := itemsBySupplier[supplierID]
+		dtoItem := dto.ToPurchaseSupplierDTO(supplier, supplierItems)
+		result = append(result, dtoItem)
+	}
+
+	return result, totalSuppliers, nil
+}

internal/modules/repports/validations/repport.validation.go

@@ -29,3 +29,16 @@ type MarketingQuery struct {
 	SortBy        string `query:"sort_by" validate:"omitempty,oneof=so_date realization_date customer warehouse product sales_person vehicle_number sales_amount hpp_amount qty average_weight total_weight sales_price hpp_price aging_days"`
 	SortOrder     string `query:"sort_order" validate:"omitempty,oneof=asc desc"`
 }
+
+type PurchaseSupplierQuery struct {
+	Page              int    `query:"page" validate:"omitempty,min=1,gt=0"`
+	Limit             int    `query:"limit" validate:"omitempty,min=1,gt=0"`
+	AreaId            int64  `query:"area_id" validate:"omitempty"`
+	SupplierId        int64  `query:"supplier_id" validate:"omitempty"`
+	ProductId         int64  `query:"product_id" validate:"omitempty"`
+	ProductCategoryId int64  `query:"product_category_id" validate:"omitempty"`
+	StartDate         string `query:"start_date" validate:"omitempty"`
+	EndDate           string `query:"end_date" validate:"omitempty"`
+	SortBy            string `query:"sort_by" validate:"omitempty"`
+	FilterBy          string `query:"filter_by" validate:"omitempty"`
+}

internal/modules/users/route.go

@@ -3,7 +3,7 @@ package users
 import (
 	"github.com/gofiber/fiber/v2"
 
-	"gitlab.com/mbugroup/lti-api.git/internal/middleware"
+	m "gitlab.com/mbugroup/lti-api.git/internal/middleware"
 	controller "gitlab.com/mbugroup/lti-api.git/internal/modules/users/controllers"
 	user "gitlab.com/mbugroup/lti-api.git/internal/modules/users/services"
 )
@@ -12,11 +12,11 @@ func UserRoutes(v1 fiber.Router, s user.UserService) {
 	ctrl := controller.NewUserController(s)
 
 	route := v1.Group("/users")
-	route.Use(middleware.Auth(s))
+	route.Use(m.Auth(s))
 
-	route.Get("/", ctrl.GetAll)
+	route.Get("/", m.RequirePermissions(m.P_UserGetAll), ctrl.GetAll)
 	// route.Post("/", ctrl.CreateOne)
-	route.Get("/:id", ctrl.GetOne)
+	route.Get("/:id", m.RequirePermissions(m.P_UserGetOne), ctrl.GetOne)
 	// route.Patch("/:id", ctrl.UpdateOne)
 	// route.Delete("/:id", ctrl.DeleteOne)
 }