fix(resolve): fix resolve mismatch conflict path on merge

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 = () => {

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 = () => {

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[] = [
   {

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({

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,

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) => {

src/services/api/flock.ts

@@ -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');

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');