diff --git a/src/app/production/recording/detail/edit/page.tsx b/src/app/production/recording/detail/edit/page.tsx index 0718731c..0ab55785 100644 --- a/src/app/production/recording/detail/edit/page.tsx +++ b/src/app/production/recording/detail/edit/page.tsx @@ -3,7 +3,7 @@ import { useRouter, useSearchParams } from 'next/navigation'; import useSWR from 'swr'; import RecordingForm from '@/components/pages/flock/recording/form/RecordingForm'; -import { RecordingApi } from '@/services/api/flock'; // Import RecordingApi +import { RecordingApi } from '@/services/api/production'; import { isResponseError, isResponseSuccess } from '@/lib/api-helper'; const RecordingEdit = () => { diff --git a/src/app/production/recording/detail/page.tsx b/src/app/production/recording/detail/page.tsx index a25fe998..66a6202a 100644 --- a/src/app/production/recording/detail/page.tsx +++ b/src/app/production/recording/detail/page.tsx @@ -3,7 +3,7 @@ import { useRouter, useSearchParams } from 'next/navigation'; import useSWR from 'swr'; import RecordingForm from '@/components/pages/flock/recording/form/RecordingForm'; -import { RecordingApi } from '@/services/api/flock'; +import { RecordingApi } from '@/services/api/production'; import { isResponseError, isResponseSuccess } from '@/lib/api-helper'; const RecordingDetail = () => { diff --git a/src/components/pages/flock/recording/RecordingTable.tsx b/src/components/pages/flock/recording/RecordingTable.tsx index 0ca0d880..04a6fce6 100644 --- a/src/components/pages/flock/recording/RecordingTable.tsx +++ b/src/components/pages/flock/recording/RecordingTable.tsx @@ -15,7 +15,7 @@ import Table from '@/components/Table'; import RowDropdownOptions from '@/components/table/RowDropdownOptions'; import RowCollapseOptions from '@/components/table/RowCollapseOptions'; import { type CellContext } from '@tanstack/react-table'; -import { type Recording } from '@/types/api/flock/recording'; +import { type Recording } from '@/types/api/production/recording'; const dummyRecordings: Recording[] = [ { diff --git a/src/components/pages/flock/recording/form/RecordingForm.schema.ts b/src/components/pages/flock/recording/form/RecordingForm.schema.ts index 5b31e54a..4b0b37dd 100644 --- a/src/components/pages/flock/recording/form/RecordingForm.schema.ts +++ b/src/components/pages/flock/recording/form/RecordingForm.schema.ts @@ -1,6 +1,6 @@ import * as Yup from 'yup'; import { RECORDING_FLAG_OPTIONS } from '@/config/constant'; -import { Recording } from '@/types/api/flock/recording'; +import { Recording } from '@/types/api/production/recording'; export const RecordingFormSchema = Yup.object({ flock: Yup.object({ diff --git a/src/components/pages/flock/recording/form/RecordingForm.tsx b/src/components/pages/flock/recording/form/RecordingForm.tsx index aa866c81..6d4f90a7 100644 --- a/src/components/pages/flock/recording/form/RecordingForm.tsx +++ b/src/components/pages/flock/recording/form/RecordingForm.tsx @@ -11,7 +11,10 @@ import SelectInput, { OptionType } from '@/components/input/SelectInput'; import ConfirmationModal from '@/components/modal/ConfirmationModal'; import { FormHeader } from '@/components/helper/form/FormHeader'; import { FormActions } from '@/components/helper/form/FormActions'; -import { CreateRecordingPayload, Recording } from '@/types/api/flock/recording'; +import { + CreateRecordingPayload, + Recording, +} from '@/types/api/production/recording'; import { RecordingFormSchema, RecordingFormValues, diff --git a/src/components/pages/flock/recording/form/useRecordingFormHandlers.ts b/src/components/pages/flock/recording/form/useRecordingFormHandlers.ts index a508806f..334b791d 100644 --- a/src/components/pages/flock/recording/form/useRecordingFormHandlers.ts +++ b/src/components/pages/flock/recording/form/useRecordingFormHandlers.ts @@ -2,11 +2,11 @@ import { useCallback, useState } from 'react'; import { useRouter } from 'next/navigation'; import { toast } from 'react-hot-toast'; import { useModal } from '@/components/Modal'; -import { RecordingApi } from '@/services/api/flock'; +import { RecordingApi } from '@/services/api/production'; import { CreateRecordingPayload, UpdateRecordingPayload, -} from '@/types/api/flock/recording'; +} from '@/types/api/production/recording'; import { isResponseError } from '@/lib/api-helper'; export const useRecordingFormHandlers = (initialValuesId?: number) => { diff --git a/src/services/api/flock.ts b/src/services/api/flock.ts deleted file mode 100644 index ff8c641a..00000000 --- a/src/services/api/flock.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { - CreateFlockPayload, - Flock, - UpdateFlockPayload, -} from '@/types/api/master-data/flock'; -import { - CreateRecordingPayload, - Recording, - UpdateRecordingPayload, -} from '@/types/api/flock/recording'; -import { BaseApiService } from '@/services/api/base'; - -export const FlockApi = new BaseApiService< - Flock, - CreateFlockPayload, - UpdateFlockPayload ->('/flock/flocks'); -export const RecordingApi = new BaseApiService< - Recording, - CreateRecordingPayload, - UpdateRecordingPayload ->('/flock/recordings'); diff --git a/src/services/api/production.ts b/src/services/api/production.ts index 49f0b133..d4d3d4b7 100644 --- a/src/services/api/production.ts +++ b/src/services/api/production.ts @@ -4,9 +4,19 @@ import { ProjectFlock, UpdateProjectFlockPayload, } from '@/types/api/production/project-flock'; +import { + CreateRecordingPayload, + Recording, + UpdateRecordingPayload, +} from '@/types/api/production/recording'; export const ProjectFlockApi = new BaseApiService< ProjectFlock, CreateProjectFlockPayload, UpdateProjectFlockPayload >('/production/project_flocks'); +export const RecordingApi = new BaseApiService< + Recording, + CreateRecordingPayload, + UpdateRecordingPayload +>('/flock/recordings'); diff --git a/src/types/api/flock/recording.d.ts b/src/types/api/production/recording.d.ts similarity index 100% rename from src/types/api/flock/recording.d.ts rename to src/types/api/production/recording.d.ts