From 12e6d607456b1e23415760284063be08ec935f4f Mon Sep 17 00:00:00 2001 From: rstubryan Date: Wed, 17 Dec 2025 10:37:05 +0700 Subject: [PATCH] feat(FE-357): Rename HppPerkandang types and update API path --- src/services/api/report/marketing-sale.ts | 10 +++++----- src/types/api/report/hpp-per-kandang.d.ts | 19 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/services/api/report/marketing-sale.ts b/src/services/api/report/marketing-sale.ts index c18871e3..e15d2a8b 100644 --- a/src/services/api/report/marketing-sale.ts +++ b/src/services/api/report/marketing-sale.ts @@ -1,9 +1,9 @@ import { BaseApiService } from '@/services/api/base'; import { BaseApiResponse } from '@/types/api/api-general'; -import { HppPerkandang } from '@/types/api/report/hpp-per-kandang'; +import { HppPerKandangReport } from '@/types/api/report/hpp-per-kandang'; export class MarketingSaleReportService extends BaseApiService< - HppPerkandang, + HppPerKandangReport, unknown, unknown > { @@ -22,8 +22,8 @@ export class MarketingSaleReportService extends BaseApiService< show_unrecorded?: boolean, page?: number, limit?: number - ): Promise | undefined> { - return await this.customRequest>( + ): Promise | undefined> { + return await this.customRequest>( `hpp-per-kandang`, { method: 'GET', @@ -46,5 +46,5 @@ export class MarketingSaleReportService extends BaseApiService< // TODO: REPLACE WITH PRODUCTION URL export const SaleReportApi = new MarketingSaleReportService( - 'http://localhost:4010/api/reports/marketings/hpp-per-kandang' + 'http://localhost:4010/api/reports/marketings' ); diff --git a/src/types/api/report/hpp-per-kandang.d.ts b/src/types/api/report/hpp-per-kandang.d.ts index fab7b5c6..2b4522a0 100644 --- a/src/types/api/report/hpp-per-kandang.d.ts +++ b/src/types/api/report/hpp-per-kandang.d.ts @@ -1,8 +1,7 @@ -import { BaseMetadata } from '@/types/api/api-general'; -import { Supplier } from '@/types/api/supplier/supplier'; +import { Supplier } from '@/types/api/master-data/supplier'; import { Kandang } from '@/types/api/master-data/kandang'; -export type BaseHppPerKandangSummary = { +export type HppPerKandangSummary = { total_remaining_chicken_birds: number; total_remaining_chicken_weight_kg: number; average_weight_kg: number; @@ -13,7 +12,7 @@ export type BaseHppPerKandangSummary = { total_egg_value_rp: number; }; -export type BaseHppPerkandang = { +export type HppPerKandangRow = { id: number; kandang: Kandang; weight_range: { @@ -27,15 +26,15 @@ export type BaseHppPerkandang = { egg_production_kg: number; egg_hpp_rp_per_kg: number; egg_value_rp: number; - feed_suppliers: Supplier; - doc_suppliers: Supplier; + feed_suppliers: Supplier[]; + doc_suppliers: Supplier[]; average_doc_price_rp: number; hpp_rp: number; remaining_value_rp: number; }; -export type HppPerkandang = BaseMetadata & { - periods: string; - rows: SalesReport[]; - summary: BaseSalesReportSummary; +export type HppPerKandangReport = { + period: string; + rows: HppPerKandangRow[]; + summary: HppPerKandangSummary; };