@dssp/supervision 1.0.16 → 1.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-client/pages/project-checklist/project-checklist-management.d.ts +15 -6
- package/dist-client/pages/project-checklist/project-checklist-management.js +243 -103
- package/dist-client/pages/project-checklist/project-checklist-management.js.map +1 -1
- package/dist-client/route.d.ts +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/service/index.d.ts +1 -1
- package/dist-server/service/project-checklist/project-checklist-mutation.d.ts +4 -3
- package/dist-server/service/project-checklist/project-checklist-mutation.js +21 -10
- package/dist-server/service/project-checklist/project-checklist-mutation.js.map +1 -1
- package/dist-server/service/project-checklist/project-checklist-type.d.ts +4 -0
- package/dist-server/service/project-checklist/project-checklist-type.js +16 -1
- package/dist-server/service/project-checklist/project-checklist-type.js.map +1 -1
- package/dist-server/service/project-checklist/spec-matching-service.d.ts +14 -6
- package/dist-server/service/project-checklist/spec-matching-service.js +101 -46
- package/dist-server/service/project-checklist/spec-matching-service.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -16,7 +16,7 @@ export * from './project-checklist-item/project-checklist-item';
|
|
|
16
16
|
export * from './building-inspection/building-inspection';
|
|
17
17
|
export * from './building-inspection/building-inspection-type';
|
|
18
18
|
export * from './building-inspection-daily-worklog/building-inspection-daily-worklog';
|
|
19
|
-
export declare const entities: (typeof import("./checklist-
|
|
19
|
+
export declare const entities: (typeof import("./project-checklist/project-checklist").ProjectChecklist | typeof import("./project-checklist-item/project-checklist-item").ProjectChecklistItem | typeof import("./field-document/field-document").FieldDocument | typeof import("./action-plan/action-plan").ActionPlan | typeof import("./issue/issue").Issue | typeof import("./project-report/project-report").ProjectReport | typeof import("./supervisor/supervisor").Supervisor | typeof import("./checklist/checklist").Checklist | typeof import("./checklist-history/checklist-history").ChecklistHistory | typeof import("./checklist-item/checklist-item").ChecklistItem | typeof import("./checklist-item-history/checklist-item-history").ChecklistItemHistory | typeof import("./checklist-item-comment/checklist-item-comment").ChecklistItemComment | typeof import("./checklist-type/checklist-type").ChecklistType | typeof import("./checklist-template-item/checklist-template-item").ChecklistTemplateItem | typeof import("./checklist-template/checklist-template").ChecklistTemplate | typeof import("./construction-checklist-template/construction-checklist-template").ConstructionChecklistTemplate | typeof import("./construction-checklist-template-item/construction-checklist-template-item").ConstructionChecklistTemplateItem | typeof import("./building-inspection/building-inspection").BuildingInspection | typeof import("./building-inspection-history/building-inspection-history").BuildingInspectionHistory | typeof import("./building-inspection-daily-worklog/building-inspection-daily-worklog").BuildingInspectionDailyWorklog)[];
|
|
20
20
|
export declare const schema: {
|
|
21
21
|
resolverClasses: typeof import("./project-checklist-item/project-checklist-item-mutation").ProjectChecklistItemMutation[];
|
|
22
22
|
};
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { ProjectChecklist } from './project-checklist';
|
|
2
|
-
import { ProjectChecklistItemInput } from './project-checklist-type';
|
|
2
|
+
import { ProjectChecklistItemInput, SiteSpecFileInput } from './project-checklist-type';
|
|
3
3
|
export declare class ProjectChecklistMutation {
|
|
4
|
-
createProjectChecklist(projectId: string, constructionTypeId: string, constructionDetailTypeId: string, name: string, items: ProjectChecklistItemInput[],
|
|
5
|
-
updateProjectChecklist(id: string, name: string, items: ProjectChecklistItemInput[],
|
|
4
|
+
createProjectChecklist(projectId: string, constructionTypeId: string, constructionDetailTypeId: string, name: string, items: ProjectChecklistItemInput[], context: ResolverContext): Promise<ProjectChecklist>;
|
|
5
|
+
updateProjectChecklist(id: string, name: string, items: ProjectChecklistItemInput[], context: ResolverContext): Promise<ProjectChecklist>;
|
|
6
|
+
syncProjectSiteSpecs(projectId: string, specFiles: SiteSpecFileInput[]): Promise<number>;
|
|
6
7
|
deleteProjectChecklists(ids: string[], context: ResolverContext): Promise<boolean>;
|
|
7
8
|
}
|
|
@@ -9,7 +9,7 @@ const project_checklist_type_1 = require("./project-checklist-type");
|
|
|
9
9
|
const project_checklist_item_1 = require("../project-checklist-item/project-checklist-item");
|
|
10
10
|
const spec_matching_service_1 = require("./spec-matching-service");
|
|
11
11
|
let ProjectChecklistMutation = class ProjectChecklistMutation {
|
|
12
|
-
async createProjectChecklist(projectId, constructionTypeId, constructionDetailTypeId, name, items,
|
|
12
|
+
async createProjectChecklist(projectId, constructionTypeId, constructionDetailTypeId, name, items, context) {
|
|
13
13
|
const { domain, user, tx } = context.state;
|
|
14
14
|
const checklistRepo = tx.getRepository(project_checklist_1.ProjectChecklist);
|
|
15
15
|
const itemRepo = tx.getRepository(project_checklist_item_1.ProjectChecklistItem);
|
|
@@ -36,10 +36,10 @@ let ProjectChecklistMutation = class ProjectChecklistMutation {
|
|
|
36
36
|
savedItems.push(saved);
|
|
37
37
|
}
|
|
38
38
|
// 검사항목별 KCS 표준 / 공사 시방서 기준 매칭을 백그라운드(비동기)로 트리거
|
|
39
|
-
(0, spec_matching_service_1.queueUpdateProjectChecklistCriteria)(savedItems.map(v => v.id),
|
|
39
|
+
(0, spec_matching_service_1.queueUpdateProjectChecklistCriteria)(savedItems.map(v => v.id), projectId);
|
|
40
40
|
return checklist;
|
|
41
41
|
}
|
|
42
|
-
async updateProjectChecklist(id, name, items,
|
|
42
|
+
async updateProjectChecklist(id, name, items, context) {
|
|
43
43
|
const { user, tx } = context.state;
|
|
44
44
|
const checklistRepo = tx.getRepository(project_checklist_1.ProjectChecklist);
|
|
45
45
|
const itemRepo = tx.getRepository(project_checklist_item_1.ProjectChecklistItem);
|
|
@@ -64,9 +64,14 @@ let ProjectChecklistMutation = class ProjectChecklistMutation {
|
|
|
64
64
|
savedItems.push(saved);
|
|
65
65
|
}
|
|
66
66
|
// 검사항목별 KCS 표준 / 공사 시방서 기준 매칭을 백그라운드(비동기)로 트리거
|
|
67
|
-
(0, spec_matching_service_1.queueUpdateProjectChecklistCriteria)(savedItems.map(v => v.id),
|
|
67
|
+
(0, spec_matching_service_1.queueUpdateProjectChecklistCriteria)(savedItems.map(v => v.id), checklist.projectId);
|
|
68
68
|
return checklist;
|
|
69
69
|
}
|
|
70
|
+
// 프로젝트의 공사 시방서 첨부 목록을 매칭 엔진에 등록(재등록)한다.
|
|
71
|
+
// 첨부 업로드/삭제 직후 클라이언트가 현재 목록 전체를 넘겨 호출한다.
|
|
72
|
+
async syncProjectSiteSpecs(projectId, specFiles) {
|
|
73
|
+
return await (0, spec_matching_service_1.syncProjectSiteSpecs)(projectId, specFiles);
|
|
74
|
+
}
|
|
70
75
|
async deleteProjectChecklists(ids, context) {
|
|
71
76
|
const { domain, tx } = context.state;
|
|
72
77
|
await tx.getRepository(project_checklist_1.ProjectChecklist).softDelete({
|
|
@@ -85,10 +90,9 @@ tslib_1.__decorate([
|
|
|
85
90
|
tslib_1.__param(2, (0, type_graphql_1.Arg)('constructionDetailTypeId')),
|
|
86
91
|
tslib_1.__param(3, (0, type_graphql_1.Arg)('name')),
|
|
87
92
|
tslib_1.__param(4, (0, type_graphql_1.Arg)('items', type => [project_checklist_type_1.ProjectChecklistItemInput])),
|
|
88
|
-
tslib_1.__param(5, (0, type_graphql_1.
|
|
89
|
-
tslib_1.__param(6, (0, type_graphql_1.Ctx)()),
|
|
93
|
+
tslib_1.__param(5, (0, type_graphql_1.Ctx)()),
|
|
90
94
|
tslib_1.__metadata("design:type", Function),
|
|
91
|
-
tslib_1.__metadata("design:paramtypes", [String, String, String, String, Array,
|
|
95
|
+
tslib_1.__metadata("design:paramtypes", [String, String, String, String, Array, Object]),
|
|
92
96
|
tslib_1.__metadata("design:returntype", Promise)
|
|
93
97
|
], ProjectChecklistMutation.prototype, "createProjectChecklist", null);
|
|
94
98
|
tslib_1.__decorate([
|
|
@@ -97,12 +101,19 @@ tslib_1.__decorate([
|
|
|
97
101
|
tslib_1.__param(0, (0, type_graphql_1.Arg)('id')),
|
|
98
102
|
tslib_1.__param(1, (0, type_graphql_1.Arg)('name')),
|
|
99
103
|
tslib_1.__param(2, (0, type_graphql_1.Arg)('items', type => [project_checklist_type_1.ProjectChecklistItemInput])),
|
|
100
|
-
tslib_1.__param(3, (0, type_graphql_1.
|
|
101
|
-
tslib_1.__param(4, (0, type_graphql_1.Ctx)()),
|
|
104
|
+
tslib_1.__param(3, (0, type_graphql_1.Ctx)()),
|
|
102
105
|
tslib_1.__metadata("design:type", Function),
|
|
103
|
-
tslib_1.__metadata("design:paramtypes", [String, String, Array,
|
|
106
|
+
tslib_1.__metadata("design:paramtypes", [String, String, Array, Object]),
|
|
104
107
|
tslib_1.__metadata("design:returntype", Promise)
|
|
105
108
|
], ProjectChecklistMutation.prototype, "updateProjectChecklist", null);
|
|
109
|
+
tslib_1.__decorate([
|
|
110
|
+
(0, type_graphql_1.Mutation)(returns => type_graphql_1.Int, { description: '프로젝트 공사 시방서를 매칭 엔진에 등록' }),
|
|
111
|
+
tslib_1.__param(0, (0, type_graphql_1.Arg)('projectId')),
|
|
112
|
+
tslib_1.__param(1, (0, type_graphql_1.Arg)('specFiles', type => [project_checklist_type_1.SiteSpecFileInput])),
|
|
113
|
+
tslib_1.__metadata("design:type", Function),
|
|
114
|
+
tslib_1.__metadata("design:paramtypes", [String, Array]),
|
|
115
|
+
tslib_1.__metadata("design:returntype", Promise)
|
|
116
|
+
], ProjectChecklistMutation.prototype, "syncProjectSiteSpecs", null);
|
|
106
117
|
tslib_1.__decorate([
|
|
107
118
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
108
119
|
(0, type_graphql_1.Mutation)(returns => Boolean, { description: '프로젝트 체크리스트 삭제' }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-checklist-mutation.js","sourceRoot":"","sources":["../../../server/service/project-checklist/project-checklist-mutation.ts"],"names":[],"mappings":";;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"project-checklist-mutation.js","sourceRoot":"","sources":["../../../server/service/project-checklist/project-checklist-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Mutation, Arg, Ctx, Directive, Int } from 'type-graphql'\nimport { In } from 'typeorm'\nimport { ProjectChecklist } from './project-checklist'\nimport { ProjectChecklistItemInput, SiteSpecFileInput } from './project-checklist-type'\nimport { ProjectChecklistItem } from '../project-checklist-item/project-checklist-item'\nimport {\n queueUpdateProjectChecklistCriteria,\n syncProjectSiteSpecs as registerSiteSpecs\n} from './spec-matching-service'\n\n@Resolver(ProjectChecklist)\nexport class ProjectChecklistMutation {\n @Directive('@transaction')\n @Mutation(returns => ProjectChecklist, { description: '프로젝트 체크리스트 생성' })\n async createProjectChecklist(\n @Arg('projectId') projectId: string,\n @Arg('constructionTypeId') constructionTypeId: string,\n @Arg('constructionDetailTypeId') constructionDetailTypeId: string,\n @Arg('name') name: string,\n @Arg('items', type => [ProjectChecklistItemInput]) items: ProjectChecklistItemInput[],\n @Ctx() context: ResolverContext\n ): Promise<ProjectChecklist> {\n const { domain, user, tx } = context.state\n\n const checklistRepo = tx.getRepository(ProjectChecklist)\n const itemRepo = tx.getRepository(ProjectChecklistItem)\n\n const checklist = await checklistRepo.save({\n domain,\n projectId,\n constructionTypeId,\n constructionDetailTypeId,\n name,\n creator: user,\n updater: user\n })\n\n const savedItems = []\n for (let i = 0; i < items.length; i++) {\n const item = items[i]\n const saved = await itemRepo.save({\n projectChecklist: checklist,\n mainType: item.mainType || null,\n name: item.name,\n sequence: i,\n creator: user,\n updater: user\n })\n savedItems.push(saved)\n }\n\n // 검사항목별 KCS 표준 / 공사 시방서 기준 매칭을 백그라운드(비동기)로 트리거\n queueUpdateProjectChecklistCriteria(savedItems.map(v => v.id), projectId)\n\n return checklist\n }\n\n @Directive('@transaction')\n @Mutation(returns => ProjectChecklist, { description: '프로젝트 체크리스트 수정' })\n async updateProjectChecklist(\n @Arg('id') id: string,\n @Arg('name') name: string,\n @Arg('items', type => [ProjectChecklistItemInput]) items: ProjectChecklistItemInput[],\n @Ctx() context: ResolverContext\n ): Promise<ProjectChecklist> {\n const { user, tx } = context.state\n\n const checklistRepo = tx.getRepository(ProjectChecklist)\n const itemRepo = tx.getRepository(ProjectChecklistItem)\n\n const checklist = await checklistRepo.findOneBy({ id })\n\n // 이름 수정\n checklist.name = name\n checklist.updater = user\n await checklistRepo.save(checklist)\n\n // 기존 아이템 삭제 후 재삽입\n await itemRepo.delete({ projectChecklist: { id } })\n\n const savedItems = []\n for (let i = 0; i < items.length; i++) {\n const item = items[i]\n const saved = await itemRepo.save({\n projectChecklist: checklist,\n mainType: item.mainType || null,\n name: item.name,\n sequence: i,\n creator: user,\n updater: user\n })\n savedItems.push(saved)\n }\n\n // 검사항목별 KCS 표준 / 공사 시방서 기준 매칭을 백그라운드(비동기)로 트리거\n queueUpdateProjectChecklistCriteria(savedItems.map(v => v.id), checklist.projectId)\n\n return checklist\n }\n\n // 프로젝트의 공사 시방서 첨부 목록을 매칭 엔진에 등록(재등록)한다.\n // 첨부 업로드/삭제 직후 클라이언트가 현재 목록 전체를 넘겨 호출한다.\n @Mutation(returns => Int, { description: '프로젝트 공사 시방서를 매칭 엔진에 등록' })\n async syncProjectSiteSpecs(\n @Arg('projectId') projectId: string,\n @Arg('specFiles', type => [SiteSpecFileInput]) specFiles: SiteSpecFileInput[]\n ): Promise<number> {\n return await registerSiteSpecs(projectId, specFiles)\n }\n\n @Directive('@transaction')\n @Mutation(returns => Boolean, { description: '프로젝트 체크리스트 삭제' })\n async deleteProjectChecklists(\n @Arg('ids', type => [String]) ids: string[],\n @Ctx() context: ResolverContext\n ): Promise<boolean> {\n const { domain, tx } = context.state\n\n await tx.getRepository(ProjectChecklist).softDelete({\n domain: { id: domain.id },\n id: In(ids)\n })\n\n return true\n }\n}\n"]}
|
|
@@ -12,6 +12,10 @@ export declare class ProjectChecklistItemInput {
|
|
|
12
12
|
inspctionCriteria?: string;
|
|
13
13
|
sequence?: number;
|
|
14
14
|
}
|
|
15
|
+
export declare class SiteSpecFileInput {
|
|
16
|
+
url: string;
|
|
17
|
+
name: string;
|
|
18
|
+
}
|
|
15
19
|
export declare class ProjectChecklistList {
|
|
16
20
|
items: ProjectChecklist[];
|
|
17
21
|
total: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ProjectChecklistList = exports.ProjectChecklistItemInput = exports.ProjectChecklistPatch = void 0;
|
|
3
|
+
exports.ProjectChecklistList = exports.SiteSpecFileInput = exports.ProjectChecklistItemInput = exports.ProjectChecklistPatch = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const type_graphql_1 = require("type-graphql");
|
|
6
6
|
const project_checklist_1 = require("./project-checklist");
|
|
@@ -52,6 +52,21 @@ tslib_1.__decorate([
|
|
|
52
52
|
exports.ProjectChecklistItemInput = ProjectChecklistItemInput = tslib_1.__decorate([
|
|
53
53
|
(0, type_graphql_1.InputType)()
|
|
54
54
|
], ProjectChecklistItemInput);
|
|
55
|
+
// 공사 시방서 파일 1건 (프로젝트 첨부 → 매칭 엔진 등록용)
|
|
56
|
+
let SiteSpecFileInput = class SiteSpecFileInput {
|
|
57
|
+
};
|
|
58
|
+
exports.SiteSpecFileInput = SiteSpecFileInput;
|
|
59
|
+
tslib_1.__decorate([
|
|
60
|
+
(0, type_graphql_1.Field)(),
|
|
61
|
+
tslib_1.__metadata("design:type", String)
|
|
62
|
+
], SiteSpecFileInput.prototype, "url", void 0);
|
|
63
|
+
tslib_1.__decorate([
|
|
64
|
+
(0, type_graphql_1.Field)(),
|
|
65
|
+
tslib_1.__metadata("design:type", String)
|
|
66
|
+
], SiteSpecFileInput.prototype, "name", void 0);
|
|
67
|
+
exports.SiteSpecFileInput = SiteSpecFileInput = tslib_1.__decorate([
|
|
68
|
+
(0, type_graphql_1.InputType)()
|
|
69
|
+
], SiteSpecFileInput);
|
|
55
70
|
let ProjectChecklistList = class ProjectChecklistList {
|
|
56
71
|
};
|
|
57
72
|
exports.ProjectChecklistList = ProjectChecklistList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-checklist-type.js","sourceRoot":"","sources":["../../../server/service/project-checklist/project-checklist-type.ts"],"names":[],"mappings":";;;;AAAA,+CAAoE;AACpE,2DAAsD;AAG/C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAejC,CAAA;AAfY,sDAAqB;AAEhC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iEACC;AAG3B;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uEACO;AAGjC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACb;gCAdF,qBAAqB;IADjC,IAAA,wBAAS,GAAE;GACC,qBAAqB,CAejC;AAGM,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;CAYrC,CAAA;AAZY,8DAAyB;AAEpC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACT;AAGjB;IADC,IAAA,oBAAK,GAAE;;uDACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oEACA;AAG1B;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACtB;oCAXN,yBAAyB;IADrC,IAAA,wBAAS,GAAE;GACC,yBAAyB,CAYrC;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;CAMhC,CAAA;AANY,oDAAoB;AAE/B;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oCAAgB,CAAC,CAAC;;mDACT;AAGzB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;mDACN;+BALF,oBAAoB;IADhC,IAAA,yBAAU,GAAE;GACA,oBAAoB,CAMhC","sourcesContent":["import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'\nimport { ProjectChecklist } from './project-checklist'\n\n@InputType()\nexport class ProjectChecklistPatch {\n @Field(type => ID, { nullable: true })\n id?: string\n\n @Field({ nullable: true })\n projectId?: string\n\n @Field({ nullable: true })\n constructionTypeId?: string\n\n @Field({ nullable: true })\n constructionDetailTypeId?: string\n\n @Field({ nullable: true })\n name?: string\n}\n\n@InputType()\nexport class ProjectChecklistItemInput {\n @Field({ nullable: true })\n mainType?: string\n\n @Field()\n name: string\n\n @Field({ nullable: true })\n inspctionCriteria?: string\n\n @Field(type => Int, { nullable: true })\n sequence?: number\n}\n\n@ObjectType()\nexport class ProjectChecklistList {\n @Field(type => [ProjectChecklist])\n items: ProjectChecklist[]\n\n @Field(type => Int)\n total: number\n}\n"]}
|
|
1
|
+
{"version":3,"file":"project-checklist-type.js","sourceRoot":"","sources":["../../../server/service/project-checklist/project-checklist-type.ts"],"names":[],"mappings":";;;;AAAA,+CAAoE;AACpE,2DAAsD;AAG/C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAejC,CAAA;AAfY,sDAAqB;AAEhC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACR;AAGlB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iEACC;AAG3B;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uEACO;AAGjC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACb;gCAdF,qBAAqB;IADjC,IAAA,wBAAS,GAAE;GACC,qBAAqB,CAejC;AAGM,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;CAYrC,CAAA;AAZY,8DAAyB;AAEpC;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACT;AAGjB;IADC,IAAA,oBAAK,GAAE;;uDACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oEACA;AAG1B;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACtB;oCAXN,yBAAyB;IADrC,IAAA,wBAAS,GAAE;GACC,yBAAyB,CAYrC;AAED,qCAAqC;AAE9B,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAQ7B,CAAA;AARY,8CAAiB;AAG5B;IADC,IAAA,oBAAK,GAAE;;8CACG;AAIX;IADC,IAAA,oBAAK,GAAE;;+CACI;4BAPD,iBAAiB;IAD7B,IAAA,wBAAS,GAAE;GACC,iBAAiB,CAQ7B;AAGM,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;CAMhC,CAAA;AANY,oDAAoB;AAE/B;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,oCAAgB,CAAC,CAAC;;mDACT;AAGzB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;mDACN;+BALF,oBAAoB;IADhC,IAAA,yBAAU,GAAE;GACA,oBAAoB,CAMhC","sourcesContent":["import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'\nimport { ProjectChecklist } from './project-checklist'\n\n@InputType()\nexport class ProjectChecklistPatch {\n @Field(type => ID, { nullable: true })\n id?: string\n\n @Field({ nullable: true })\n projectId?: string\n\n @Field({ nullable: true })\n constructionTypeId?: string\n\n @Field({ nullable: true })\n constructionDetailTypeId?: string\n\n @Field({ nullable: true })\n name?: string\n}\n\n@InputType()\nexport class ProjectChecklistItemInput {\n @Field({ nullable: true })\n mainType?: string\n\n @Field()\n name: string\n\n @Field({ nullable: true })\n inspctionCriteria?: string\n\n @Field(type => Int, { nullable: true })\n sequence?: number\n}\n\n// 공사 시방서 파일 1건 (프로젝트 첨부 → 매칭 엔진 등록용)\n@InputType()\nexport class SiteSpecFileInput {\n // 첨부 전체 URL (https~/attachment/{key}) — 서버가 내려받아 매칭 엔진에 전달한다\n @Field()\n url: string\n\n // 원본 파일명 — 엔진이 확장자로 HWP/PDF 파서를 분기하므로 반드시 필요\n @Field()\n name: string\n}\n\n@ObjectType()\nexport class ProjectChecklistList {\n @Field(type => [ProjectChecklist])\n items: ProjectChecklist[]\n\n @Field(type => Int)\n total: number\n}\n"]}
|
|
@@ -1,17 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 프로젝트의 공사 시방서 첨부 목록을 매칭 엔진에 등록한다 (프로젝트별로 분리 보관됨).
|
|
3
|
+
* 엔진에 개별 삭제 API가 없어 '전체 삭제 후 현재 목록 재등록' 방식이다.
|
|
4
|
+
* 파일이 없으면 삭제만 하고 끝낸다.
|
|
5
|
+
*/
|
|
6
|
+
export declare function syncProjectSiteSpecs(projectId: string, specFiles: {
|
|
7
|
+
url: string;
|
|
8
|
+
name: string;
|
|
9
|
+
}[]): Promise<number>;
|
|
1
10
|
export interface MatchedCriteria {
|
|
2
11
|
kcsCriteria: string | null;
|
|
3
12
|
siteSpecCriteria: string | null;
|
|
4
13
|
}
|
|
5
14
|
/**
|
|
6
15
|
* 검사항목(query) 1건에 대해 KCS 표준 기준과 공사 시방서 기준을 매칭 API로 조회한다.
|
|
7
|
-
* - KCS 표준은
|
|
8
|
-
* - 공사 시방서는
|
|
9
|
-
* - 첨부파일이 없으면 site_spec_pdf_url 파라미터는 생략한다.
|
|
16
|
+
* - KCS 표준은 매칭 서버에 이미 구축되어 있다.
|
|
17
|
+
* - 공사 시방서는 projectId 로 등록된 것(syncProjectSiteSpecs)을 검색한다.
|
|
10
18
|
*/
|
|
11
|
-
export declare function matchInspectionCriteria(query: string,
|
|
19
|
+
export declare function matchInspectionCriteria(query: string, projectId?: string, constructionTypeName?: string, constructionDetailTypeName?: string): Promise<MatchedCriteria>;
|
|
12
20
|
/**
|
|
13
21
|
* 검사항목 ID 목록에 대해 KCS/공사 시방서 기준을 매칭하여 저장한다.
|
|
14
22
|
* (트랜잭션 커밋 후 백그라운드에서 실행되므로 전역 repository 사용)
|
|
15
23
|
*/
|
|
16
|
-
export declare function updateProjectChecklistCriteria(itemIds: string[],
|
|
17
|
-
export declare function queueUpdateProjectChecklistCriteria(itemIds: string[],
|
|
24
|
+
export declare function updateProjectChecklistCriteria(itemIds: string[], projectId?: string): Promise<void>;
|
|
25
|
+
export declare function queueUpdateProjectChecklistCriteria(itemIds: string[], projectId?: string): void;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.syncProjectSiteSpecs = syncProjectSiteSpecs;
|
|
3
4
|
exports.matchInspectionCriteria = matchInspectionCriteria;
|
|
4
5
|
exports.updateProjectChecklistCriteria = updateProjectChecklistCriteria;
|
|
5
6
|
exports.queueUpdateProjectChecklistCriteria = queueUpdateProjectChecklistCriteria;
|
|
@@ -46,63 +47,119 @@ async function toDownloadableUrl(siteSpecPdfUrl) {
|
|
|
46
47
|
return siteSpecPdfUrl;
|
|
47
48
|
}
|
|
48
49
|
}
|
|
50
|
+
// 엔진 파서가 지원하는 확장자 (hwpx 는 미지원 — spec_parser.parse_document 기준)
|
|
51
|
+
const SITE_SPEC_EXTS = ['pdf', 'hwp'];
|
|
52
|
+
// 매칭 서버 nginx client_max_body_size(20MB) 대비 여유를 둔 1회 전송 한도
|
|
53
|
+
const UPLOAD_BATCH_BYTES = 15 * 1024 * 1024;
|
|
54
|
+
/** 파일들을 합계 크기가 limit 을 넘지 않는 묶음으로 나눈다 (한 개가 limit 보다 커도 단독 묶음으로 보낸다). */
|
|
55
|
+
function splitBySize(files, limit) {
|
|
56
|
+
const batches = [];
|
|
57
|
+
let batch = [];
|
|
58
|
+
let size = 0;
|
|
59
|
+
for (const file of files) {
|
|
60
|
+
if (batch.length && size + file.data.length > limit) {
|
|
61
|
+
batches.push(batch);
|
|
62
|
+
batch = [];
|
|
63
|
+
size = 0;
|
|
64
|
+
}
|
|
65
|
+
batch.push(file);
|
|
66
|
+
size += file.data.length;
|
|
67
|
+
}
|
|
68
|
+
if (batch.length)
|
|
69
|
+
batches.push(batch);
|
|
70
|
+
return batches;
|
|
71
|
+
}
|
|
72
|
+
function authHeader() {
|
|
73
|
+
return { Authorization: `Basic ${Buffer.from(`${API_USERNAME}:${API_PASSWORD}`).toString('base64')}` };
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* spec-matching 모듈 호출 공통부.
|
|
77
|
+
* operato-runner 는 multipart 폼필드 'input'(JSON 문자열) + 'files'(선택)로 입력을 받는다.
|
|
78
|
+
* 반환은 모듈 main() 의 { status, result } (runner 응답의 result 필드).
|
|
79
|
+
*/
|
|
80
|
+
async function callSpecMatching(params, files = []) {
|
|
81
|
+
const form = new FormData();
|
|
82
|
+
form.append('input', JSON.stringify(params));
|
|
83
|
+
for (const f of files) {
|
|
84
|
+
form.append('files', new Blob([new Uint8Array(f.data)]), f.name);
|
|
85
|
+
}
|
|
86
|
+
// Content-Type은 FormData가 boundary와 함께 자동 설정하므로 지정하지 않음
|
|
87
|
+
const response = await fetch(SPEC_MATCHING_API_URL, { method: 'POST', headers: authHeader(), body: form });
|
|
88
|
+
const outer = await (response === null || response === void 0 ? void 0 : response.json());
|
|
89
|
+
return outer === null || outer === void 0 ? void 0 : outer.result;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* 프로젝트의 공사 시방서 첨부 목록을 매칭 엔진에 등록한다 (프로젝트별로 분리 보관됨).
|
|
93
|
+
* 엔진에 개별 삭제 API가 없어 '전체 삭제 후 현재 목록 재등록' 방식이다.
|
|
94
|
+
* 파일이 없으면 삭제만 하고 끝낸다.
|
|
95
|
+
*/
|
|
96
|
+
async function syncProjectSiteSpecs(projectId, specFiles) {
|
|
97
|
+
var _a;
|
|
98
|
+
await callSpecMatching({ action: 'clear-site-spec', project_id: projectId });
|
|
99
|
+
const files = [];
|
|
100
|
+
for (const spec of specFiles || []) {
|
|
101
|
+
const ext = (spec.name || '').toLowerCase().split('.').pop() || '';
|
|
102
|
+
if (!SITE_SPEC_EXTS.includes(ext)) {
|
|
103
|
+
console.warn('공사 시방서 등록 제외 (지원하지 않는 형식) :', spec.name);
|
|
104
|
+
continue;
|
|
105
|
+
}
|
|
106
|
+
try {
|
|
107
|
+
// 앱 프록시 URL(/attachment/...) → S3 presigned URL 변환 후 내려받아 러너로 전달
|
|
108
|
+
const url = await toDownloadableUrl(spec.url);
|
|
109
|
+
const res = await fetch(url);
|
|
110
|
+
if (!res.ok)
|
|
111
|
+
throw new Error(`HTTP ${res.status}`);
|
|
112
|
+
files.push({ name: spec.name, data: Buffer.from(await res.arrayBuffer()) });
|
|
113
|
+
}
|
|
114
|
+
catch (error) {
|
|
115
|
+
console.error('공사 시방서 다운로드 실패 :', spec.name, error);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
if (files.length === 0) {
|
|
119
|
+
console.log('공사 시방서 등록 대상 없음 (프로젝트 :', projectId, ')');
|
|
120
|
+
return 0;
|
|
121
|
+
}
|
|
122
|
+
// 매칭 서버 nginx 본문 제한(20MB)을 넘지 않도록 나눠 보낸다.
|
|
123
|
+
// add-site-spec 은 기존 인덱스에 누적 추가되므로 여러 번 호출해도 된다.
|
|
124
|
+
let siteItems = 0;
|
|
125
|
+
for (const batch of splitBySize(files, UPLOAD_BATCH_BYTES)) {
|
|
126
|
+
const moduleReturn = await callSpecMatching({ action: 'add-site-spec', project_id: projectId }, batch);
|
|
127
|
+
if ((moduleReturn === null || moduleReturn === void 0 ? void 0 : moduleReturn.status) !== 'success') {
|
|
128
|
+
console.error('공사 시방서 등록 실패 :', batch.map(f => f.name).join(', '), moduleReturn === null || moduleReturn === void 0 ? void 0 : moduleReturn.error);
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
siteItems = ((_a = moduleReturn.result) === null || _a === void 0 ? void 0 : _a.site_items) || siteItems;
|
|
132
|
+
console.log('공사 시방서 등록 :', batch.map(f => f.name).join(', '), '→ 누적', siteItems, '항목');
|
|
133
|
+
}
|
|
134
|
+
return siteItems;
|
|
135
|
+
}
|
|
49
136
|
/**
|
|
50
137
|
* 검사항목(query) 1건에 대해 KCS 표준 기준과 공사 시방서 기준을 매칭 API로 조회한다.
|
|
51
|
-
* - KCS 표준은
|
|
52
|
-
* - 공사 시방서는
|
|
53
|
-
* - 첨부파일이 없으면 site_spec_pdf_url 파라미터는 생략한다.
|
|
138
|
+
* - KCS 표준은 매칭 서버에 이미 구축되어 있다.
|
|
139
|
+
* - 공사 시방서는 projectId 로 등록된 것(syncProjectSiteSpecs)을 검색한다.
|
|
54
140
|
*/
|
|
55
|
-
async function matchInspectionCriteria(query,
|
|
56
|
-
var _a, _b, _c
|
|
57
|
-
// operato-runner /api/run/{module} 은 multipart 폼필드 'input'(JSON 문자열)으로 입력을 받는다
|
|
141
|
+
async function matchInspectionCriteria(query, projectId, constructionTypeName, constructionDetailTypeName) {
|
|
142
|
+
var _a, _b, _c;
|
|
58
143
|
const params = { query, top_k: 1 };
|
|
59
144
|
// 공종/세부공종을 주면 매칭 엔진이 해당 KCS 문서 범위로 좁혀 검색한다 (미전달 시 전체 문서 전역 검색)
|
|
60
145
|
if (constructionTypeName)
|
|
61
146
|
params['공종'] = constructionTypeName;
|
|
62
147
|
if (constructionDetailTypeName)
|
|
63
148
|
params['세부공종'] = constructionDetailTypeName;
|
|
64
|
-
//
|
|
65
|
-
if (
|
|
66
|
-
params.
|
|
67
|
-
}
|
|
68
|
-
const form = new FormData();
|
|
69
|
-
form.append('input', JSON.stringify(params));
|
|
70
|
-
// Content-Type은 FormData가 boundary와 함께 자동 설정하므로 지정하지 않음
|
|
71
|
-
const headers = {
|
|
72
|
-
Authorization: `Basic ${Buffer.from(`${API_USERNAME}:${API_PASSWORD}`).toString('base64')}`
|
|
73
|
-
};
|
|
149
|
+
// 프로젝트별로 등록된 공사 시방서 인덱스를 사용 (미전달 시 공용 인덱스)
|
|
150
|
+
if (projectId)
|
|
151
|
+
params.project_id = projectId;
|
|
74
152
|
try {
|
|
75
|
-
const
|
|
76
|
-
method: 'POST',
|
|
77
|
-
headers,
|
|
78
|
-
body: form
|
|
79
|
-
});
|
|
80
|
-
const outer = await (response === null || response === void 0 ? void 0 : response.json());
|
|
81
|
-
console.log('data :', outer);
|
|
82
|
-
// 공사 시방서 매칭 결과 로그 (PDF URL 전달 여부 / 매칭 결과 / 에러)
|
|
83
|
-
if (siteSpecPdfUrl) {
|
|
84
|
-
const innerResult = ((_a = outer === null || outer === void 0 ? void 0 : outer.result) === null || _a === void 0 ? void 0 : _a.result) || {};
|
|
85
|
-
console.log('공사 시방서 query :', query);
|
|
86
|
-
console.log('공사 시방서 pdf_url :', siteSpecPdfUrl);
|
|
87
|
-
console.log('공사 시방서 matches :', innerResult.site_spec_matches);
|
|
88
|
-
if (innerResult.site_spec_error) {
|
|
89
|
-
console.error('공사 시방서 매칭 에러 :', innerResult.site_spec_error);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
console.log('공사 시방서 pdf_url 없음 → KCS 매칭만 수행 (query :', query, ')');
|
|
94
|
-
}
|
|
95
|
-
// runner 응답: { result: <모듈 main() 반환>, exit_code, ... }, 모듈 반환: { status, result: {...} }
|
|
96
|
-
const moduleReturn = outer === null || outer === void 0 ? void 0 : outer.result;
|
|
153
|
+
const moduleReturn = await callSpecMatching(params);
|
|
97
154
|
if ((moduleReturn === null || moduleReturn === void 0 ? void 0 : moduleReturn.status) === 'success') {
|
|
98
155
|
const result = moduleReturn.result || {};
|
|
99
|
-
const kcsMatch = ((
|
|
156
|
+
const kcsMatch = ((_a = result.kcs_matches) === null || _a === void 0 ? void 0 : _a[0]) || null;
|
|
100
157
|
// 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈 (저장 시 1회 파싱)
|
|
101
158
|
if (kcsMatch === null || kcsMatch === void 0 ? void 0 : kcsMatch.text)
|
|
102
159
|
kcsMatch.text = formatClauses(kcsMatch.text);
|
|
103
160
|
return {
|
|
104
161
|
kcsCriteria: kcsMatch ? JSON.stringify(kcsMatch) : null,
|
|
105
|
-
siteSpecCriteria: formatClauses((
|
|
162
|
+
siteSpecCriteria: formatClauses((_c = (_b = result.site_spec_matches) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.text) || null
|
|
106
163
|
};
|
|
107
164
|
}
|
|
108
165
|
}
|
|
@@ -115,10 +172,8 @@ async function matchInspectionCriteria(query, siteSpecPdfUrl, constructionTypeNa
|
|
|
115
172
|
* 검사항목 ID 목록에 대해 KCS/공사 시방서 기준을 매칭하여 저장한다.
|
|
116
173
|
* (트랜잭션 커밋 후 백그라운드에서 실행되므로 전역 repository 사용)
|
|
117
174
|
*/
|
|
118
|
-
async function updateProjectChecklistCriteria(itemIds,
|
|
175
|
+
async function updateProjectChecklistCriteria(itemIds, projectId) {
|
|
119
176
|
const repository = (0, shell_1.getRepository)(project_checklist_item_1.ProjectChecklistItem);
|
|
120
|
-
// 앱 프록시 URL(/attachment/...) → S3 presigned URL 변환 (배치당 1회)
|
|
121
|
-
const downloadableUrl = await toDownloadableUrl(siteSpecPdfUrl);
|
|
122
177
|
// 체크리스트별 공종/세부공종 이름 캐시 — 매칭 엔진이 이 값으로 KCS 문서 범위를 좁힌다
|
|
123
178
|
const typeNameCache = {};
|
|
124
179
|
for (const id of itemIds) {
|
|
@@ -139,7 +194,7 @@ async function updateProjectChecklistCriteria(itemIds, siteSpecPdfUrl) {
|
|
|
139
194
|
typeNames = { gongjong: ct === null || ct === void 0 ? void 0 : ct.name, sebu: cdt === null || cdt === void 0 ? void 0 : cdt.name };
|
|
140
195
|
typeNameCache[checklist.id] = typeNames;
|
|
141
196
|
}
|
|
142
|
-
const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(item.name,
|
|
197
|
+
const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(item.name, projectId, typeNames === null || typeNames === void 0 ? void 0 : typeNames.gongjong, typeNames === null || typeNames === void 0 ? void 0 : typeNames.sebu);
|
|
143
198
|
await repository.update({ id }, { kcsCriteria, siteSpecCriteria });
|
|
144
199
|
}
|
|
145
200
|
catch (error) {
|
|
@@ -148,11 +203,11 @@ async function updateProjectChecklistCriteria(itemIds, siteSpecPdfUrl) {
|
|
|
148
203
|
}
|
|
149
204
|
}
|
|
150
205
|
// 검사 기준 매칭을 백그라운드(비동기)로 트리거 — 저장 응답을 막지 않는다.
|
|
151
|
-
function queueUpdateProjectChecklistCriteria(itemIds,
|
|
206
|
+
function queueUpdateProjectChecklistCriteria(itemIds, projectId) {
|
|
152
207
|
if (!itemIds || itemIds.length === 0)
|
|
153
208
|
return;
|
|
154
209
|
setTimeout(() => {
|
|
155
|
-
updateProjectChecklistCriteria(itemIds,
|
|
210
|
+
updateProjectChecklistCriteria(itemIds, projectId).catch(err => {
|
|
156
211
|
console.error('Background spec-matching update failed (project-checklist):', err);
|
|
157
212
|
});
|
|
158
213
|
}, 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec-matching-service.js","sourceRoot":"","sources":["../../../server/service/project-checklist/spec-matching-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\nimport { ProjectChecklistItem } from '../project-checklist-item/project-checklist-item'\n\nconst STORAGE: any = config.get('storage', {})\n\nconst SPEC_MATCHING_API_URL: string = 'https://hatiolab-korea-uni.nruing.com/api/run/spec-matching'\nconst API_USERNAME: string = 'admin'\nconst API_PASSWORD: string = 'admin1234'\n\n// 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈\nfunction formatClauses(text?: string): string {\n return (text || '').replace(/\\s*(?=\\(\\d+\\))/g, '\\n').trim()\n}\n\n/**\n * 공사 시방서 URL을 매칭 서버가 접근 가능한 URL로 변환한다.\n * 저장된 URL은 앱 프록시 경로(/attachment/{s3-key})라서 외부 매칭 서버가 접근할 수 없으므로,\n * S3 스토리지인 경우 해당 key에 대한 presigned GET URL(1시간)을 생성해서 반환한다.\n */\nasync function toDownloadableUrl(siteSpecPdfUrl?: string): Promise<string | undefined> {\n if (!siteSpecPdfUrl) return undefined\n\n const matched = siteSpecPdfUrl.match(/\\/attachment\\/([^/?#]+)/)\n if (!matched || STORAGE?.type !== 's3') {\n console.log('공사 시방서 URL 변환 생략 (원본 그대로 사용) :', siteSpecPdfUrl)\n return siteSpecPdfUrl\n }\n\n try {\n const client = new S3Client({\n credentials: {\n accessKeyId: STORAGE.accessKeyId,\n secretAccessKey: STORAGE.secretAccessKey\n },\n region: STORAGE.region\n })\n const signedUrl = await getSignedUrl(\n client,\n new GetObjectCommand({ Bucket: STORAGE.bucketName, Key: decodeURIComponent(matched[1]) }),\n { expiresIn: 3600 }\n )\n console.log('공사 시방서 presigned URL 생성 완료 (key :', decodeURIComponent(matched[1]), ')')\n return signedUrl\n } catch (error) {\n console.error('공사 시방서 presigned URL 생성 실패:', error)\n return siteSpecPdfUrl\n }\n}\n\nexport interface MatchedCriteria {\n // KCS 시방서 기준: kcs_matches[0] 오브젝트 전체를 JSON 문자열로 저장 (file_label 등 포함)\n kcsCriteria: string | null\n // 공사 시방서 기준: site_spec_matches[0].text\n siteSpecCriteria: string | null\n}\n\n/**\n * 검사항목(query) 1건에 대해 KCS 표준 기준과 공사 시방서 기준을 매칭 API로 조회한다.\n * - KCS 표준은 API 서버에 파일(kcs.csv)이 이미 존재한다.\n * - 공사 시방서는 업로드한 PDF URL(siteSpecPdfUrl)을 넘길 때만 매칭된다.\n * - 첨부파일이 없으면 site_spec_pdf_url 파라미터는 생략한다.\n */\nexport async function matchInspectionCriteria(\n query: string,\n siteSpecPdfUrl?: string,\n constructionTypeName?: string,\n constructionDetailTypeName?: string\n): Promise<MatchedCriteria> {\n // operato-runner /api/run/{module} 은 multipart 폼필드 'input'(JSON 문자열)으로 입력을 받는다\n const params: any = { query, top_k: 1 }\n // 공종/세부공종을 주면 매칭 엔진이 해당 KCS 문서 범위로 좁혀 검색한다 (미전달 시 전체 문서 전역 검색)\n if (constructionTypeName) params['공종'] = constructionTypeName\n if (constructionDetailTypeName) params['세부공종'] = constructionDetailTypeName\n // 첨부파일(공사 시방서 PDF)이 없으면 site_spec_pdf_url 은 생략\n if (siteSpecPdfUrl) {\n params.site_spec_pdf_url = siteSpecPdfUrl\n }\n\n const form = new FormData()\n form.append('input', JSON.stringify(params))\n\n // Content-Type은 FormData가 boundary와 함께 자동 설정하므로 지정하지 않음\n const headers: any = {\n Authorization: `Basic ${Buffer.from(`${API_USERNAME}:${API_PASSWORD}`).toString('base64')}`\n }\n\n try {\n const response = await fetch(SPEC_MATCHING_API_URL, {\n method: 'POST',\n headers,\n body: form\n })\n\n const outer = await response?.json()\n\n console.log('data :', outer)\n\n // 공사 시방서 매칭 결과 로그 (PDF URL 전달 여부 / 매칭 결과 / 에러)\n if (siteSpecPdfUrl) {\n const innerResult = outer?.result?.result || {}\n console.log('공사 시방서 query :', query)\n console.log('공사 시방서 pdf_url :', siteSpecPdfUrl)\n console.log('공사 시방서 matches :', innerResult.site_spec_matches)\n if (innerResult.site_spec_error) {\n console.error('공사 시방서 매칭 에러 :', innerResult.site_spec_error)\n }\n } else {\n console.log('공사 시방서 pdf_url 없음 → KCS 매칭만 수행 (query :', query, ')')\n }\n // runner 응답: { result: <모듈 main() 반환>, exit_code, ... }, 모듈 반환: { status, result: {...} }\n const moduleReturn = outer?.result\n if (moduleReturn?.status === 'success') {\n const result = moduleReturn.result || {}\n const kcsMatch = result.kcs_matches?.[0] || null\n // 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈 (저장 시 1회 파싱)\n if (kcsMatch?.text) kcsMatch.text = formatClauses(kcsMatch.text)\n\n return {\n kcsCriteria: kcsMatch ? JSON.stringify(kcsMatch) : null,\n siteSpecCriteria: formatClauses(result.site_spec_matches?.[0]?.text) || null\n }\n }\n } catch (error) {\n console.error('spec-matching API 호출 실패:', error)\n }\n\n return { kcsCriteria: null, siteSpecCriteria: null }\n}\n\n/**\n * 검사항목 ID 목록에 대해 KCS/공사 시방서 기준을 매칭하여 저장한다.\n * (트랜잭션 커밋 후 백그라운드에서 실행되므로 전역 repository 사용)\n */\nexport async function updateProjectChecklistCriteria(itemIds: string[], siteSpecPdfUrl?: string): Promise<void> {\n const repository = getRepository(ProjectChecklistItem)\n\n // 앱 프록시 URL(/attachment/...) → S3 presigned URL 변환 (배치당 1회)\n const downloadableUrl = await toDownloadableUrl(siteSpecPdfUrl)\n\n // 체크리스트별 공종/세부공종 이름 캐시 — 매칭 엔진이 이 값으로 KCS 문서 범위를 좁힌다\n const typeNameCache: { [checklistId: string]: { gongjong?: string; sebu?: string } } = {}\n\n for (const id of itemIds) {\n try {\n const item = await repository.findOne({ where: { id }, relations: ['projectChecklist'] })\n if (!item) continue\n\n const checklist = item.projectChecklist\n let typeNames = checklist ? typeNameCache[checklist.id] : undefined\n if (checklist && !typeNames) {\n // 공종/세부공종 이름 조회 (@dssp/project 테이블 — 패키지 의존 없이 raw query)\n const [ct] = await repository.manager.query(`SELECT name FROM construction_types WHERE id = $1`, [\n checklist.constructionTypeId\n ])\n const [cdt] = await repository.manager.query(`SELECT name FROM construction_detail_types WHERE id = $1`, [\n checklist.constructionDetailTypeId\n ])\n typeNames = { gongjong: ct?.name, sebu: cdt?.name }\n typeNameCache[checklist.id] = typeNames\n }\n\n const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(\n item.name,\n downloadableUrl,\n typeNames?.gongjong,\n typeNames?.sebu\n )\n await repository.update({ id }, { kcsCriteria, siteSpecCriteria })\n } catch (error) {\n console.error('project-checklist 검사 기준 매칭 실패:', error)\n }\n }\n}\n\n// 검사 기준 매칭을 백그라운드(비동기)로 트리거 — 저장 응답을 막지 않는다.\nexport function queueUpdateProjectChecklistCriteria(itemIds: string[], siteSpecPdfUrl?: string): void {\n if (!itemIds || itemIds.length === 0) return\n\n setTimeout(() => {\n updateProjectChecklistCriteria(itemIds, siteSpecPdfUrl).catch(err => {\n console.error('Background spec-matching update failed (project-checklist):', err)\n })\n }, 0)\n}\n"]}
|
|
1
|
+
{"version":3,"file":"spec-matching-service.js","sourceRoot":"","sources":["../../../server/service/project-checklist/spec-matching-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\nimport { ProjectChecklistItem } from '../project-checklist-item/project-checklist-item'\n\nconst STORAGE: any = config.get('storage', {})\n\nconst SPEC_MATCHING_API_URL: string = 'https://hatiolab-korea-uni.nruing.com/api/run/spec-matching'\nconst API_USERNAME: string = 'admin'\nconst API_PASSWORD: string = 'admin1234'\n\n// 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈\nfunction formatClauses(text?: string): string {\n return (text || '').replace(/\\s*(?=\\(\\d+\\))/g, '\\n').trim()\n}\n\n/**\n * 공사 시방서 URL을 매칭 서버가 접근 가능한 URL로 변환한다.\n * 저장된 URL은 앱 프록시 경로(/attachment/{s3-key})라서 외부 매칭 서버가 접근할 수 없으므로,\n * S3 스토리지인 경우 해당 key에 대한 presigned GET URL(1시간)을 생성해서 반환한다.\n */\nasync function toDownloadableUrl(siteSpecPdfUrl?: string): Promise<string | undefined> {\n if (!siteSpecPdfUrl) return undefined\n\n const matched = siteSpecPdfUrl.match(/\\/attachment\\/([^/?#]+)/)\n if (!matched || STORAGE?.type !== 's3') {\n console.log('공사 시방서 URL 변환 생략 (원본 그대로 사용) :', siteSpecPdfUrl)\n return siteSpecPdfUrl\n }\n\n try {\n const client = new S3Client({\n credentials: {\n accessKeyId: STORAGE.accessKeyId,\n secretAccessKey: STORAGE.secretAccessKey\n },\n region: STORAGE.region\n })\n const signedUrl = await getSignedUrl(\n client,\n new GetObjectCommand({ Bucket: STORAGE.bucketName, Key: decodeURIComponent(matched[1]) }),\n { expiresIn: 3600 }\n )\n console.log('공사 시방서 presigned URL 생성 완료 (key :', decodeURIComponent(matched[1]), ')')\n return signedUrl\n } catch (error) {\n console.error('공사 시방서 presigned URL 생성 실패:', error)\n return siteSpecPdfUrl\n }\n}\n\n// 엔진 파서가 지원하는 확장자 (hwpx 는 미지원 — spec_parser.parse_document 기준)\nconst SITE_SPEC_EXTS = ['pdf', 'hwp']\n// 매칭 서버 nginx client_max_body_size(20MB) 대비 여유를 둔 1회 전송 한도\nconst UPLOAD_BATCH_BYTES = 15 * 1024 * 1024\n\n/** 파일들을 합계 크기가 limit 을 넘지 않는 묶음으로 나눈다 (한 개가 limit 보다 커도 단독 묶음으로 보낸다). */\nfunction splitBySize<T extends { data: Buffer }>(files: T[], limit: number): T[][] {\n const batches: T[][] = []\n let batch: T[] = []\n let size = 0\n for (const file of files) {\n if (batch.length && size + file.data.length > limit) {\n batches.push(batch)\n batch = []\n size = 0\n }\n batch.push(file)\n size += file.data.length\n }\n if (batch.length) batches.push(batch)\n return batches\n}\n\nfunction authHeader(): any {\n return { Authorization: `Basic ${Buffer.from(`${API_USERNAME}:${API_PASSWORD}`).toString('base64')}` }\n}\n\n/**\n * spec-matching 모듈 호출 공통부.\n * operato-runner 는 multipart 폼필드 'input'(JSON 문자열) + 'files'(선택)로 입력을 받는다.\n * 반환은 모듈 main() 의 { status, result } (runner 응답의 result 필드).\n */\nasync function callSpecMatching(params: any, files: { name: string; data: Buffer }[] = []): Promise<any> {\n const form = new FormData()\n form.append('input', JSON.stringify(params))\n for (const f of files) {\n form.append('files', new Blob([new Uint8Array(f.data)]), f.name)\n }\n\n // Content-Type은 FormData가 boundary와 함께 자동 설정하므로 지정하지 않음\n const response = await fetch(SPEC_MATCHING_API_URL, { method: 'POST', headers: authHeader(), body: form })\n const outer = await response?.json()\n return outer?.result\n}\n\n/**\n * 프로젝트의 공사 시방서 첨부 목록을 매칭 엔진에 등록한다 (프로젝트별로 분리 보관됨).\n * 엔진에 개별 삭제 API가 없어 '전체 삭제 후 현재 목록 재등록' 방식이다.\n * 파일이 없으면 삭제만 하고 끝낸다.\n */\nexport async function syncProjectSiteSpecs(\n projectId: string,\n specFiles: { url: string; name: string }[]\n): Promise<number> {\n await callSpecMatching({ action: 'clear-site-spec', project_id: projectId })\n\n const files: { name: string; data: Buffer }[] = []\n for (const spec of specFiles || []) {\n const ext = (spec.name || '').toLowerCase().split('.').pop() || ''\n if (!SITE_SPEC_EXTS.includes(ext)) {\n console.warn('공사 시방서 등록 제외 (지원하지 않는 형식) :', spec.name)\n continue\n }\n try {\n // 앱 프록시 URL(/attachment/...) → S3 presigned URL 변환 후 내려받아 러너로 전달\n const url = await toDownloadableUrl(spec.url)\n const res = await fetch(url)\n if (!res.ok) throw new Error(`HTTP ${res.status}`)\n files.push({ name: spec.name, data: Buffer.from(await res.arrayBuffer()) })\n } catch (error) {\n console.error('공사 시방서 다운로드 실패 :', spec.name, error)\n }\n }\n\n if (files.length === 0) {\n console.log('공사 시방서 등록 대상 없음 (프로젝트 :', projectId, ')')\n return 0\n }\n\n // 매칭 서버 nginx 본문 제한(20MB)을 넘지 않도록 나눠 보낸다.\n // add-site-spec 은 기존 인덱스에 누적 추가되므로 여러 번 호출해도 된다.\n let siteItems = 0\n for (const batch of splitBySize(files, UPLOAD_BATCH_BYTES)) {\n const moduleReturn = await callSpecMatching({ action: 'add-site-spec', project_id: projectId }, batch)\n if (moduleReturn?.status !== 'success') {\n console.error('공사 시방서 등록 실패 :', batch.map(f => f.name).join(', '), moduleReturn?.error)\n continue\n }\n siteItems = moduleReturn.result?.site_items || siteItems\n console.log('공사 시방서 등록 :', batch.map(f => f.name).join(', '), '→ 누적', siteItems, '항목')\n }\n return siteItems\n}\n\nexport interface MatchedCriteria {\n // KCS 시방서 기준: kcs_matches[0] 오브젝트 전체를 JSON 문자열로 저장 (file_label 등 포함)\n kcsCriteria: string | null\n // 공사 시방서 기준: site_spec_matches[0].text\n siteSpecCriteria: string | null\n}\n\n/**\n * 검사항목(query) 1건에 대해 KCS 표준 기준과 공사 시방서 기준을 매칭 API로 조회한다.\n * - KCS 표준은 매칭 서버에 이미 구축되어 있다.\n * - 공사 시방서는 projectId 로 등록된 것(syncProjectSiteSpecs)을 검색한다.\n */\nexport async function matchInspectionCriteria(\n query: string,\n projectId?: string,\n constructionTypeName?: string,\n constructionDetailTypeName?: string\n): Promise<MatchedCriteria> {\n const params: any = { query, top_k: 1 }\n // 공종/세부공종을 주면 매칭 엔진이 해당 KCS 문서 범위로 좁혀 검색한다 (미전달 시 전체 문서 전역 검색)\n if (constructionTypeName) params['공종'] = constructionTypeName\n if (constructionDetailTypeName) params['세부공종'] = constructionDetailTypeName\n // 프로젝트별로 등록된 공사 시방서 인덱스를 사용 (미전달 시 공용 인덱스)\n if (projectId) params.project_id = projectId\n\n try {\n const moduleReturn = await callSpecMatching(params)\n\n if (moduleReturn?.status === 'success') {\n const result = moduleReturn.result || {}\n const kcsMatch = result.kcs_matches?.[0] || null\n // 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈 (저장 시 1회 파싱)\n if (kcsMatch?.text) kcsMatch.text = formatClauses(kcsMatch.text)\n\n return {\n kcsCriteria: kcsMatch ? JSON.stringify(kcsMatch) : null,\n siteSpecCriteria: formatClauses(result.site_spec_matches?.[0]?.text) || null\n }\n }\n } catch (error) {\n console.error('spec-matching API 호출 실패:', error)\n }\n\n return { kcsCriteria: null, siteSpecCriteria: null }\n}\n\n/**\n * 검사항목 ID 목록에 대해 KCS/공사 시방서 기준을 매칭하여 저장한다.\n * (트랜잭션 커밋 후 백그라운드에서 실행되므로 전역 repository 사용)\n */\nexport async function updateProjectChecklistCriteria(itemIds: string[], projectId?: string): Promise<void> {\n const repository = getRepository(ProjectChecklistItem)\n\n // 체크리스트별 공종/세부공종 이름 캐시 — 매칭 엔진이 이 값으로 KCS 문서 범위를 좁힌다\n const typeNameCache: { [checklistId: string]: { gongjong?: string; sebu?: string } } = {}\n\n for (const id of itemIds) {\n try {\n const item = await repository.findOne({ where: { id }, relations: ['projectChecklist'] })\n if (!item) continue\n\n const checklist = item.projectChecklist\n let typeNames = checklist ? typeNameCache[checklist.id] : undefined\n if (checklist && !typeNames) {\n // 공종/세부공종 이름 조회 (@dssp/project 테이블 — 패키지 의존 없이 raw query)\n const [ct] = await repository.manager.query(`SELECT name FROM construction_types WHERE id = $1`, [\n checklist.constructionTypeId\n ])\n const [cdt] = await repository.manager.query(`SELECT name FROM construction_detail_types WHERE id = $1`, [\n checklist.constructionDetailTypeId\n ])\n typeNames = { gongjong: ct?.name, sebu: cdt?.name }\n typeNameCache[checklist.id] = typeNames\n }\n\n const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(\n item.name,\n projectId,\n typeNames?.gongjong,\n typeNames?.sebu\n )\n await repository.update({ id }, { kcsCriteria, siteSpecCriteria })\n } catch (error) {\n console.error('project-checklist 검사 기준 매칭 실패:', error)\n }\n }\n}\n\n// 검사 기준 매칭을 백그라운드(비동기)로 트리거 — 저장 응답을 막지 않는다.\nexport function queueUpdateProjectChecklistCriteria(itemIds: string[], projectId?: string): void {\n if (!itemIds || itemIds.length === 0) return\n\n setTimeout(() => {\n updateProjectChecklistCriteria(itemIds, projectId).catch(err => {\n console.error('Background spec-matching update failed (project-checklist):', err)\n })\n }, 0)\n}\n"]}
|