260322:1648 Correct Coresspondence / Doing RFA / Correct CI
CI Pipeline / build (push) Failing after 12m41s
Build and Deploy / deploy (push) Failing after 2m44s

This commit is contained in:
admin
2026-03-22 16:48:12 +07:00
parent e5deedb42e
commit 11984bfa29
683 changed files with 105251 additions and 29068 deletions
+44 -43
View File
@@ -1,19 +1,19 @@
// File: lib/services/master-data.service.ts
import apiClient from "@/lib/api/client";
import apiClient from '@/lib/api/client';
// Import DTOs
import { CreateTagDto, UpdateTagDto, SearchTagDto } from "@/types/dto/master/tag.dto";
import { CreateDisciplineDto } from "@/types/dto/master/discipline.dto";
import { CreateSubTypeDto } from "@/types/dto/master/sub-type.dto";
import { SaveNumberFormatDto } from "@/types/dto/master/number-format.dto";
import { CreateRfaTypeDto, UpdateRfaTypeDto } from "@/types/dto/master/rfa-type.dto";
import { CreateCorrespondenceTypeDto, UpdateCorrespondenceTypeDto } from "@/types/dto/master/correspondence-type.dto";
import { Organization } from "@/types/organization";
import { CreateTagDto, UpdateTagDto, SearchTagDto } from '@/types/dto/master/tag.dto';
import { CreateDisciplineDto } from '@/types/dto/master/discipline.dto';
import { CreateSubTypeDto } from '@/types/dto/master/sub-type.dto';
import { SaveNumberFormatDto } from '@/types/dto/master/number-format.dto';
import { CreateRfaTypeDto, UpdateRfaTypeDto } from '@/types/dto/master/rfa-type.dto';
import { CreateCorrespondenceTypeDto, UpdateCorrespondenceTypeDto } from '@/types/dto/master/correspondence-type.dto';
import { Organization } from '@/types/organization';
import {
CreateOrganizationDto,
UpdateOrganizationDto,
SearchOrganizationDto,
} from "@/types/dto/organization/organization.dto";
} from '@/types/dto/organization/organization.dto';
const extractArrayData = <T>(value: unknown): T[] => {
let current: unknown = value;
@@ -23,7 +23,7 @@ const extractArrayData = <T>(value: unknown): T[] => {
return current as T[];
}
if (!current || typeof current !== "object" || !("data" in current)) {
if (!current || typeof current !== 'object' || !('data' in current)) {
return [];
}
@@ -38,14 +38,14 @@ export const masterDataService = {
/** ดึงรายการ Tags ทั้งหมด (Search & Pagination) */
getTags: async (params?: SearchTagDto) => {
const response = await apiClient.get("/master/tags", { params });
const response = await apiClient.get('/master/tags', { params });
// Support both wrapped and unwrapped scenarios
return response.data.data || response.data;
},
/** สร้าง Tag ใหม่ */
createTag: async (data: CreateTagDto) => {
const response = await apiClient.post("/master/tags", data);
const response = await apiClient.post('/master/tags', data);
return response.data;
},
@@ -65,14 +65,14 @@ export const masterDataService = {
/** ดึงรายชื่อองค์กรทั้งหมด */
getOrganizations: async (params?: SearchOrganizationDto) => {
const response = await apiClient.get<Organization[] | { data: Organization[] }>("/organizations", { params });
const response = await apiClient.get<Organization[] | { data: Organization[] }>('/organizations', { params });
// Support paginated response
if (response.data && Array.isArray((response.data as { data: Organization[] }).data)) {
return (response.data as { data: Organization[] }).data;
return (response.data as { data: Organization[] }).data;
}
// If response.data itself is an array
if (Array.isArray(response.data)) {
return response.data;
return response.data;
}
// If we're here, it might be { data: [], total: ... } but data is missing? or empty?
// Or it returned the object but data.data check failed (shouldn't happen if it follows schema).
@@ -82,8 +82,10 @@ export const masterDataService = {
// Fallback: Check if response.data is object?
// If it's the paginated object, return the data array if it exists
if (response.data && (response.data as { data: Organization[] }).data) {
// Maybe it's not an array?
return Array.isArray((response.data as { data: Organization[] }).data) ? (response.data as { data: Organization[] }).data : [];
// Maybe it's not an array?
return Array.isArray((response.data as { data: Organization[] }).data)
? (response.data as { data: Organization[] }).data
: [];
}
return []; // Return empty array to prevent map errors
@@ -91,7 +93,7 @@ export const masterDataService = {
/** สร้างองค์กรใหม่ */
createOrganization: async (data: CreateOrganizationDto) => {
const response = await apiClient.post("/organizations", data);
const response = await apiClient.post('/organizations', data);
return response.data;
},
@@ -107,20 +109,19 @@ export const masterDataService = {
return response.data;
},
// --- Disciplines Management (Admin / Req 6B) ---
/** ดึงรายชื่อสาขางาน (มักจะกรองตาม Contract ID) */
getDisciplines: async (contractId?: number | string) => {
const response = await apiClient.get("/master/disciplines", {
params: { contractId }
const response = await apiClient.get('/master/disciplines', {
params: { contractId },
});
return extractArrayData(response.data);
},
/** สร้างสาขางานใหม่ */
createDiscipline: async (data: CreateDisciplineDto) => {
const response = await apiClient.post("/master/disciplines", data);
const response = await apiClient.post('/master/disciplines', data);
return response.data;
},
@@ -134,15 +135,15 @@ export const masterDataService = {
/** ดึงรายชื่อประเภทย่อย (กรองตาม Contract และ Type) */
getSubTypes: async (contractId?: number | string, typeId?: number) => {
const response = await apiClient.get("/master/sub-types", {
params: { contractId, correspondenceTypeId: typeId }
const response = await apiClient.get('/master/sub-types', {
params: { contractId, correspondenceTypeId: typeId },
});
return extractArrayData(response.data);
},
/** สร้างประเภทย่อยใหม่ */
createSubType: async (data: CreateSubTypeDto) => {
const response = await apiClient.post("/master/sub-types", data);
const response = await apiClient.post('/master/sub-types', data);
return response.data;
},
@@ -150,55 +151,55 @@ export const masterDataService = {
/** ดึงประเภท RFA ทั้งหมด */
getRfaTypes: async (contractId?: number | string) => {
const response = await apiClient.get("/master/rfa-types", {
params: { contractId }
const response = await apiClient.get('/master/rfa-types', {
params: { contractId },
});
return extractArrayData(response.data);
},
/** สร้างประเภท RFA ใหม่ */
createRfaType: async (data: CreateRfaTypeDto) => {
return apiClient.post("/master/rfa-types", data).then(res => res.data);
return apiClient.post('/master/rfa-types', data).then((res) => res.data);
},
updateRfaType: async (id: number, data: UpdateRfaTypeDto) => {
return apiClient.patch(`/master/rfa-types/${id}`, data).then(res => res.data);
return apiClient.patch(`/master/rfa-types/${id}`, data).then((res) => res.data);
},
deleteRfaType: async (id: number) => {
return apiClient.delete(`/master/rfa-types/${id}`).then(res => res.data);
return apiClient.delete(`/master/rfa-types/${id}`).then((res) => res.data);
},
// --- Document Numbering Format (Admin Config) ---
// --- Correspondence Types Management ---
getCorrespondenceTypes: async () => {
const response = await apiClient.get("/master/correspondence-types");
const response = await apiClient.get('/master/correspondence-types');
return extractArrayData(response.data);
},
createCorrespondenceType: async (data: CreateCorrespondenceTypeDto) => {
return apiClient.post("/master/correspondence-types", data).then(res => res.data);
return apiClient.post('/master/correspondence-types', data).then((res) => res.data);
},
updateCorrespondenceType: async (id: number, data: UpdateCorrespondenceTypeDto) => {
return apiClient.patch(`/master/correspondence-types/${id}`, data).then(res => res.data);
return apiClient.patch(`/master/correspondence-types/${id}`, data).then((res) => res.data);
},
deleteCorrespondenceType: async (id: number) => {
return apiClient.delete(`/master/correspondence-types/${id}`).then(res => res.data);
return apiClient.delete(`/master/correspondence-types/${id}`).then((res) => res.data);
},
/** บันทึกรูปแบบเลขที่เอกสาร */
saveNumberFormat: async (data: SaveNumberFormatDto) => {
const response = await apiClient.post("/document-numbering/formats", data);
const response = await apiClient.post('/document-numbering/formats', data);
return response.data;
},
/** ดึงรูปแบบเลขที่เอกสารปัจจุบัน (เพื่อมาแก้ไข) */
getNumberFormat: async (projectId: number, typeId: number) => {
const response = await apiClient.get("/document-numbering/formats", {
params: { projectId, correspondenceTypeId: typeId }
const response = await apiClient.get('/document-numbering/formats', {
params: { projectId, correspondenceTypeId: typeId },
});
return response.data;
},
@@ -206,21 +207,21 @@ export const masterDataService = {
// --- Drawing Categories ---
getContractDrawingCategories: async (projectId?: number | string) => {
const response = await apiClient.get("/drawings/contract/categories", {
params: { projectId }
const response = await apiClient.get('/drawings/contract/categories', {
params: { projectId },
});
return extractArrayData(response.data);
},
getShopMainCategories: async (projectId: number) => {
const response = await apiClient.get("/drawings/shop/main-categories", { params: { projectId } });
const response = await apiClient.get('/drawings/shop/main-categories', { params: { projectId } });
return extractArrayData(response.data);
},
getShopSubCategories: async (projectId: number, mainCategoryId?: number) => {
const response = await apiClient.get("/drawings/shop/sub-categories", {
params: { projectId, mainCategoryId }
const response = await apiClient.get('/drawings/shop/sub-categories', {
params: { projectId, mainCategoryId },
});
return extractArrayData(response.data);
}
},
};