@dssp/supervision 1.0.0-alpha.4 → 1.0.0-alpha.40

package/dist-server/service/building-inspection/building-inspection.d.ts

@@ -1,6 +1,7 @@
 import { User } from '@things-factory/auth-base';
 import { BuildingLevel } from '@dssp/building-complex';
 import { Checklist } from '../checklist/checklist';
+import { BuildingInspectionDailyWorklog } from '../building-inspection-daily-worklog/building-inspection-daily-worklog';
 export declare enum BuildingInspectionStatus {
     WAIT = "WAIT",
     OVERALL_WAIT = "OVERALL_WAIT",
@@ -9,15 +10,27 @@ export declare enum BuildingInspectionStatus {
     PASS = "PASS",
     FAIL = "FAIL"
 }
+export declare enum ProjectType {
+    DSSP = "DSSP",
+    DCSP = "DCSP"
+}
 export declare class BuildingInspection {
     readonly id: string;
+    projectType?: ProjectType;
     status?: BuildingInspectionStatus;
     requestDate?: string;
     drawingMarker?: string;
+    cellX?: number;
+    cellY?: number;
+    memo?: string;
     buildingLevel?: BuildingLevel;
     buildingLevelId?: string;
     checklist?: Checklist;
     checklistId?: string;
+    manager?: User;
+    managerId?: string;
+    worklog?: BuildingInspectionDailyWorklog;
+    worklogId?: string;
     createdAt?: Date;
     updatedAt?: Date;
     deletedAt?: Date;

package/dist-server/service/building-inspection/building-inspection.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BuildingInspection = exports.BuildingInspectionStatus = void 0;
+exports.BuildingInspection = exports.ProjectType = exports.BuildingInspectionStatus = void 0;
 const tslib_1 = require("tslib");
 const typeorm_1 = require("typeorm");
 const type_graphql_1 = require("type-graphql");
 const auth_base_1 = require("@things-factory/auth-base");
 const building_complex_1 = require("@dssp/building-complex");
 const checklist_1 = require("../checklist/checklist");
+const building_inspection_type_1 = require("./building-inspection-type");
+const building_inspection_daily_worklog_1 = require("../building-inspection-daily-worklog/building-inspection-daily-worklog");
 var BuildingInspectionStatus;
 (function (BuildingInspectionStatus) {
     BuildingInspectionStatus["WAIT"] = "WAIT";
@@ -16,10 +18,19 @@ var BuildingInspectionStatus;
     BuildingInspectionStatus["PASS"] = "PASS";
     BuildingInspectionStatus["FAIL"] = "FAIL";
 })(BuildingInspectionStatus || (exports.BuildingInspectionStatus = BuildingInspectionStatus = {}));
+var ProjectType;
+(function (ProjectType) {
+    ProjectType["DSSP"] = "DSSP";
+    ProjectType["DCSP"] = "DCSP";
+})(ProjectType || (exports.ProjectType = ProjectType = {}));
 (0, type_graphql_1.registerEnumType)(BuildingInspectionStatus, {
     name: 'BuildingInspectionStatus',
     description: '검측 상태'
 });
+(0, type_graphql_1.registerEnumType)(ProjectType, {
+    name: 'ProjectType',
+    description: '프로젝트 타입'
+});
 let BuildingInspection = class BuildingInspection {
 };
 exports.BuildingInspection = BuildingInspection;
@@ -28,6 +39,11 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => type_graphql_1.ID),
     tslib_1.__metadata("design:type", String)
 ], BuildingInspection.prototype, "id", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: false, comment: '프로젝트 타입', default: ProjectType.DSSP }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], BuildingInspection.prototype, "projectType", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.Column)({
         nullable: false,
@@ -47,6 +63,21 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => String, { nullable: true }),
     tslib_1.__metadata("design:type", String)
 ], BuildingInspection.prototype, "drawingMarker", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: true, comment: 'X좌표' }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", Number)
+], BuildingInspection.prototype, "cellX", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: true, comment: 'Y좌표' }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", Number)
+], BuildingInspection.prototype, "cellY", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: true, comment: '메모 - DSSP: 검측 메모, DCSP: 검측 요청서 메모' }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], BuildingInspection.prototype, "memo", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.ManyToOne)(type => building_complex_1.BuildingLevel),
     (0, type_graphql_1.Field)(() => building_complex_1.BuildingLevel, { nullable: true }),
@@ -66,6 +97,24 @@ tslib_1.__decorate([
     (0, typeorm_1.RelationId)((buildingInspection) => buildingInspection.checklist),
     tslib_1.__metadata("design:type", String)
 ], BuildingInspection.prototype, "checklistId", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
+    (0, type_graphql_1.Field)(type => building_inspection_type_1.ProjectManagerOutput, { nullable: true }),
+    tslib_1.__metadata("design:type", auth_base_1.User)
+], BuildingInspection.prototype, "manager", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.RelationId)((buildingInspection) => buildingInspection.manager),
+    tslib_1.__metadata("design:type", String)
+], BuildingInspection.prototype, "managerId", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.ManyToOne)(type => building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog, { nullable: true }),
+    (0, type_graphql_1.Field)(type => building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog, { nullable: true }),
+    tslib_1.__metadata("design:type", building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog)
+], BuildingInspection.prototype, "worklog", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.RelationId)((buildingInspection) => buildingInspection.worklog),
+    tslib_1.__metadata("design:type", String)
+], BuildingInspection.prototype, "worklogId", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.CreateDateColumn)(),
     (0, type_graphql_1.Field)({ nullable: true }),
@@ -101,7 +150,11 @@ tslib_1.__decorate([
 ], BuildingInspection.prototype, "updaterId", void 0);
 exports.BuildingInspection = BuildingInspection = tslib_1.__decorate([
     (0, typeorm_1.Entity)({ comment: '시공 검측 (층별 도면의 검측 리스트)' }),
-    (0, typeorm_1.Index)('ix_building_inspection_0', (buildingInspection) => [buildingInspection.buildingLevel], {
+    (0, typeorm_1.Index)('ix_building_inspection_0', (buildingInspection) => [
+        buildingInspection.buildingLevel,
+        buildingInspection.cellX,
+        buildingInspection.cellY
+    ], {
         where: '"deleted_at" IS NULL'
     }),
     (0, typeorm_1.Index)('ix_building_inspection_1', (buildingInspection) => [buildingInspection.checklist], {

package/dist-server/service/building-inspection/building-inspection.js.map

@@ -1 +1 @@
-{"version":3,"file":"building-inspection.js","sourceRoot":"","sources":["../../../server/service/building-inspection/building-inspection.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CreateDateColumn,\n  UpdateDateColumn,\n  DeleteDateColumn,\n  Entity,\n  Index,\n  Column,\n  RelationId,\n  ManyToOne,\n  OneToOne,\n  PrimaryGeneratedColumn,\n  JoinColumn\n} from 'typeorm'\nimport { ObjectType, Field, ID, registerEnumType } from 'type-graphql'\nimport { User } from '@things-factory/auth-base'\nimport { BuildingLevel } from '@dssp/building-complex'\nimport { Checklist } from '../checklist/checklist'\n\nexport enum BuildingInspectionStatus {\n  WAIT = 'WAIT',\n  OVERALL_WAIT = 'OVERALL_WAIT',\n  REQUEST = 'REQUEST',\n  OVERALL_REQUEST = 'OVERALL_REQUEST',\n  PASS = 'PASS',\n  FAIL = 'FAIL'\n}\n\nregisterEnumType(BuildingInspectionStatus, {\n  name: 'BuildingInspectionStatus',\n  description: '검측 상태'\n})\n\n@Entity({ comment: '시공 검측 (층별 도면의 검측 리스트)' })\n@Index('ix_building_inspection_0', (buildingInspection: BuildingInspection) => [buildingInspection.buildingLevel], {\n  where: '\"deleted_at\" IS NULL'\n})\n@Index('ix_building_inspection_1', (buildingInspection: BuildingInspection) => [buildingInspection.checklist], {\n  where: '\"deleted_at\" IS NULL'\n})\n@Index('ix_building_inspection_2', (buildingInspection: BuildingInspection) => [buildingInspection.requestDate], {\n  where: '\"deleted_at\" IS NULL'\n})\n@ObjectType()\nexport class BuildingInspection {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @Column({\n    nullable: false,\n    comment:\n      '상태(WAIT: 검측 대기, OVERALL_WAIT: 총괄자 검측 대기, REQUEST: 검측 요청, OVERALL_REQUEST: 총괄자 검측 요청, PASS: 합격, FAIL: 불합격)',\n    default: BuildingInspectionStatus.WAIT\n  })\n  @Field({ nullable: true })\n  status?: BuildingInspectionStatus\n\n  @Column({ type: 'date', default: () => 'CURRENT_DATE', nullable: true, comment: '검측 요청일' })\n  @Field(type => String, { nullable: true })\n  requestDate?: string\n\n  @Column({ type: 'simple-json', nullable: true, comment: '도면 마커' })\n  @Field(type => String, { nullable: true })\n  drawingMarker?: string\n\n  // 층 정보 (1:1 상위 테이블 참조)\n  @ManyToOne(type => BuildingLevel)\n  @Field(() => BuildingLevel, { nullable: true })\n  buildingLevel?: BuildingLevel\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.buildingLevel)\n  buildingLevelId?: string\n\n  // 체크리스트 (1:1 상위 테이블 참조)\n  @OneToOne(type => Checklist)\n  @JoinColumn()\n  @Field(() => Checklist, { nullable: true })\n  checklist?: Checklist\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.checklist)\n  checklistId?: string\n\n  @CreateDateColumn()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @UpdateDateColumn()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @DeleteDateColumn()\n  @Field({ nullable: true })\n  deletedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  creator?: User\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  updater?: User\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.updater)\n  updaterId?: string\n}\n"]}
+{"version":3,"file":"building-inspection.js","sourceRoot":"","sources":["../../../server/service/building-inspection/building-inspection.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CreateDateColumn,\n  UpdateDateColumn,\n  DeleteDateColumn,\n  Entity,\n  Index,\n  Column,\n  RelationId,\n  ManyToOne,\n  OneToOne,\n  PrimaryGeneratedColumn,\n  JoinColumn\n} from 'typeorm'\nimport { ObjectType, Field, ID, registerEnumType } from 'type-graphql'\nimport { User } from '@things-factory/auth-base'\nimport { BuildingLevel } from '@dssp/building-complex'\nimport { Checklist } from '../checklist/checklist'\nimport { ProjectManagerOutput } from './building-inspection-type'\nimport { BuildingInspectionDailyWorklog } from '../building-inspection-daily-worklog/building-inspection-daily-worklog'\n\nexport enum BuildingInspectionStatus {\n  WAIT = 'WAIT',\n  OVERALL_WAIT = 'OVERALL_WAIT',\n  REQUEST = 'REQUEST',\n  OVERALL_REQUEST = 'OVERALL_REQUEST',\n  PASS = 'PASS',\n  FAIL = 'FAIL'\n}\nexport enum ProjectType {\n  DSSP = 'DSSP',\n  DCSP = 'DCSP'\n}\n\nregisterEnumType(BuildingInspectionStatus, {\n  name: 'BuildingInspectionStatus',\n  description: '검측 상태'\n})\nregisterEnumType(ProjectType, {\n  name: 'ProjectType',\n  description: '프로젝트 타입'\n})\n\n@Entity({ comment: '시공 검측 (층별 도면의 검측 리스트)' })\n@Index(\n  'ix_building_inspection_0',\n  (buildingInspection: BuildingInspection) => [\n    buildingInspection.buildingLevel,\n    buildingInspection.cellX,\n    buildingInspection.cellY\n  ],\n  {\n    where: '\"deleted_at\" IS NULL'\n  }\n)\n@Index('ix_building_inspection_1', (buildingInspection: BuildingInspection) => [buildingInspection.checklist], {\n  where: '\"deleted_at\" IS NULL'\n})\n@Index('ix_building_inspection_2', (buildingInspection: BuildingInspection) => [buildingInspection.requestDate], {\n  where: '\"deleted_at\" IS NULL'\n})\n@ObjectType()\nexport class BuildingInspection {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @Column({ nullable: false, comment: '프로젝트 타입', default: ProjectType.DSSP })\n  @Field({ nullable: true })\n  projectType?: ProjectType\n\n  @Column({\n    nullable: false,\n    comment:\n      '상태(WAIT: 검측 대기, OVERALL_WAIT: 총괄자 검측 대기, REQUEST: 검측 요청, OVERALL_REQUEST: 총괄자 검측 요청, PASS: 합격, FAIL: 불합격)',\n    default: BuildingInspectionStatus.WAIT\n  })\n  @Field({ nullable: true })\n  status?: BuildingInspectionStatus\n\n  @Column({ type: 'date', default: () => 'CURRENT_DATE', nullable: true, comment: '검측 요청일' })\n  @Field(type => String, { nullable: true })\n  requestDate?: string\n\n  @Column({ type: 'simple-json', nullable: true, comment: '도면 마커' })\n  @Field(type => String, { nullable: true })\n  drawingMarker?: string\n\n  @Column({ nullable: true, comment: 'X좌표' })\n  @Field({ nullable: true })\n  cellX?: number\n\n  @Column({ nullable: true, comment: 'Y좌표' })\n  @Field({ nullable: true })\n  cellY?: number\n\n  @Column({ nullable: true, comment: '메모 - DSSP: 검측 메모, DCSP: 검측 요청서 메모' })\n  @Field({ nullable: true })\n  memo?: string\n\n  // 층 정보 (N:1 상위 테이블 참조)\n  @ManyToOne(type => BuildingLevel)\n  @Field(() => BuildingLevel, { nullable: true })\n  buildingLevel?: BuildingLevel\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.buildingLevel)\n  buildingLevelId?: string\n\n  // 체크리스트 (1:1 상위 테이블 참조)\n  @OneToOne(type => Checklist)\n  @JoinColumn()\n  @Field(() => Checklist, { nullable: true })\n  checklist?: Checklist\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.checklist)\n  checklistId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => ProjectManagerOutput, { nullable: true })\n  manager?: User\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.manager)\n  managerId?: string\n\n  // 일일 업무 일지가 생성되면 ID를 넣어줌 (상위 테이블 참조)\n  @ManyToOne(type => BuildingInspectionDailyWorklog, { nullable: true })\n  @Field(type => BuildingInspectionDailyWorklog, { nullable: true })\n  worklog?: BuildingInspectionDailyWorklog\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.worklog)\n  worklogId?: string\n\n  @CreateDateColumn()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @UpdateDateColumn()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @DeleteDateColumn()\n  @Field({ nullable: true })\n  deletedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  creator?: User\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  updater?: User\n\n  @RelationId((buildingInspection: BuildingInspection) => buildingInspection.updater)\n  updaterId?: string\n}\n"]}

package/dist-server/service/building-inspection/index.d.ts

@@ -1,10 +1,7 @@
-import { BuildingInspection, BuildingInspectionStatus } from './building-inspection';
+import { BuildingInspection, BuildingInspectionStatus, ProjectType } from './building-inspection';
 import { BuildingInspectionQuery } from './building-inspection-query';
 import { BuildingInspectionMutation } from './building-inspection-mutation';
-import { BuildingInspectionSummary } from './building-inspection-type';
-import { BuildingInspectionHistory } from './building-inspection-history';
-import { BuildingInspectionHistoryEntitySubscriber } from './event-subscriber';
-export declare const entities: (typeof BuildingInspection | typeof BuildingInspectionHistory)[];
-export declare const resolvers: (typeof BuildingInspectionQuery | typeof BuildingInspectionMutation)[];
-export declare const subscribers: (typeof BuildingInspectionHistoryEntitySubscriber)[];
-export declare const types: (typeof BuildingInspectionStatus | typeof BuildingInspectionSummary)[];
+import { BuildingInspectionSummary, ChecklistInputType, ChecklistItemInputType, ChecklistSubmitInputType, ChecklistItemSubmitInputType } from './building-inspection-type';
+export declare const entities: (typeof BuildingInspection)[];
+export declare const resolvers: (typeof BuildingInspectionMutation | typeof BuildingInspectionQuery)[];
+export declare const types: (typeof ProjectType | typeof BuildingInspectionStatus | typeof BuildingInspectionSummary | typeof ChecklistInputType | typeof ChecklistItemInputType | typeof ChecklistSubmitInputType | typeof ChecklistItemSubmitInputType)[];

package/dist-server/service/building-inspection/index.js

@@ -1,14 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.types = exports.subscribers = exports.resolvers = exports.entities = void 0;
+exports.types = exports.resolvers = exports.entities = void 0;
 const building_inspection_1 = require("./building-inspection");
 const building_inspection_query_1 = require("./building-inspection-query");
 const building_inspection_mutation_1 = require("./building-inspection-mutation");
 const building_inspection_type_1 = require("./building-inspection-type");
-const building_inspection_history_1 = require("./building-inspection-history");
-const event_subscriber_1 = require("./event-subscriber");
-exports.entities = [building_inspection_1.BuildingInspection, building_inspection_history_1.BuildingInspectionHistory];
+exports.entities = [building_inspection_1.BuildingInspection];
 exports.resolvers = [building_inspection_query_1.BuildingInspectionQuery, building_inspection_mutation_1.BuildingInspectionMutation];
-exports.subscribers = [event_subscriber_1.BuildingInspectionHistoryEntitySubscriber];
-exports.types = [building_inspection_1.BuildingInspectionStatus, building_inspection_type_1.BuildingInspectionSummary];
+exports.types = [
+    building_inspection_1.BuildingInspectionStatus,
+    building_inspection_type_1.BuildingInspectionSummary,
+    building_inspection_1.ProjectType,
+    building_inspection_type_1.ChecklistInputType,
+    building_inspection_type_1.ChecklistItemInputType,
+    building_inspection_type_1.ChecklistSubmitInputType,
+    building_inspection_type_1.ChecklistItemSubmitInputType
+];
 //# sourceMappingURL=index.js.map

package/dist-server/service/building-inspection/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/building-inspection/index.ts"],"names":[],"mappings":";;;AAAA,+DAAoF;AACpF,2EAAqE;AACrE,iFAA2E;AAC3E,yEAAsE;AACtE,+EAAyE;AACzE,yDAA8E;AAEjE,QAAA,QAAQ,GAAG,CAAC,wCAAkB,EAAE,uDAAyB,CAAC,CAAA;AAC1D,QAAA,SAAS,GAAG,CAAC,mDAAuB,EAAE,yDAA0B,CAAC,CAAA;AACjE,QAAA,WAAW,GAAG,CAAC,4DAAyC,CAAC,CAAA;AACzD,QAAA,KAAK,GAAG,CAAC,8CAAwB,EAAE,oDAAyB,CAAC,CAAA","sourcesContent":["import { BuildingInspection, BuildingInspectionStatus } from './building-inspection'\nimport { BuildingInspectionQuery } from './building-inspection-query'\nimport { BuildingInspectionMutation } from './building-inspection-mutation'\nimport { BuildingInspectionSummary } from './building-inspection-type'\nimport { BuildingInspectionHistory } from './building-inspection-history'\nimport { BuildingInspectionHistoryEntitySubscriber } from './event-subscriber'\n\nexport const entities = [BuildingInspection, BuildingInspectionHistory]\nexport const resolvers = [BuildingInspectionQuery, BuildingInspectionMutation]\nexport const subscribers = [BuildingInspectionHistoryEntitySubscriber]\nexport const types = [BuildingInspectionStatus, BuildingInspectionSummary]\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/building-inspection/index.ts"],"names":[],"mappings":";;;AAAA,+DAAiG;AACjG,2EAAqE;AACrE,iFAA2E;AAC3E,yEAMmC;AAEtB,QAAA,QAAQ,GAAG,CAAC,wCAAkB,CAAC,CAAA;AAC/B,QAAA,SAAS,GAAG,CAAC,mDAAuB,EAAE,yDAA0B,CAAC,CAAA;AACjE,QAAA,KAAK,GAAG;IACnB,8CAAwB;IACxB,oDAAyB;IACzB,iCAAW;IACX,6CAAkB;IAClB,iDAAsB;IACtB,mDAAwB;IACxB,uDAA4B;CAC7B,CAAA","sourcesContent":["import { BuildingInspection, BuildingInspectionStatus, ProjectType } from './building-inspection'\nimport { BuildingInspectionQuery } from './building-inspection-query'\nimport { BuildingInspectionMutation } from './building-inspection-mutation'\nimport {\n  BuildingInspectionSummary,\n  ChecklistInputType,\n  ChecklistItemInputType,\n  ChecklistSubmitInputType,\n  ChecklistItemSubmitInputType\n} from './building-inspection-type'\n\nexport const entities = [BuildingInspection]\nexport const resolvers = [BuildingInspectionQuery, BuildingInspectionMutation]\nexport const types = [\n  BuildingInspectionStatus,\n  BuildingInspectionSummary,\n  ProjectType,\n  ChecklistInputType,\n  ChecklistItemInputType,\n  ChecklistSubmitInputType,\n  ChecklistItemSubmitInputType\n]\n"]}

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-mutation.d.ts

@@ -0,0 +1,6 @@
+import { BuildingInspectionDailyWorklog } from './building-inspection-daily-worklog';
+import { BuildingInspectionDailyWorklogPatch, BuildingInspectionDailyWorklogNew } from './building-inspection-daily-worklog-type';
+export declare class BuildingInspectionDailyWorklogMutation {
+    createBuildingInspectionDailyWorklog(patch: BuildingInspectionDailyWorklogNew, context: ResolverContext): Promise<BuildingInspectionDailyWorklog>;
+    updateBuildingInspectionDailyWorklog(patch: BuildingInspectionDailyWorklogPatch, context: ResolverContext): Promise<BuildingInspectionDailyWorklog>;
+}

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-mutation.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BuildingInspectionDailyWorklogMutation = void 0;
+const tslib_1 = require("tslib");
+const type_graphql_1 = require("type-graphql");
+const building_inspection_daily_worklog_1 = require("./building-inspection-daily-worklog");
+const building_inspection_daily_worklog_type_1 = require("./building-inspection-daily-worklog-type");
+const building_inspection_1 = require("../building-inspection/building-inspection");
+const building_inspection_daily_worklog_query_1 = require("./building-inspection-daily-worklog-query");
+let BuildingInspectionDailyWorklogMutation = class BuildingInspectionDailyWorklogMutation {
+    async createBuildingInspectionDailyWorklog(patch, context) {
+        const { user, domain, tx } = context.state;
+        const worklogRepo = tx.getRepository(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog);
+        const buildingInspectionRepo = tx.getRepository(building_inspection_1.BuildingInspection);
+        if (!patch.projectId)
+            throw new Error('projectId 가 없습니다.');
+        if (!patch.date)
+            throw new Error('date 가 없습니다.');
+        const result = await worklogRepo.save(Object.assign(Object.assign({}, patch), { overallSupervisory: patch.overallSupervisoryId ? { id: patch.overallSupervisoryId } : undefined, taskSupervisory: patch.taskSupervisoryId ? { id: patch.taskSupervisoryId } : undefined, documentNo: await (0, building_inspection_daily_worklog_query_1.generateDailyWorklogDocumentNo)(patch.projectId), domain: domain, creator: user, updater: user }));
+        for (const buildingInspectionId of patch.buildingInspectionIds) {
+            const buildingInspection = await buildingInspectionRepo.findOne({ where: { id: buildingInspectionId } });
+            await buildingInspectionRepo.save(Object.assign(Object.assign({}, buildingInspection), { worklog: result }));
+        }
+        return result;
+    }
+    async updateBuildingInspectionDailyWorklog(patch, context) {
+        const { user, tx } = context.state;
+        const worklogRepo = tx.getRepository(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog);
+        const origin = await worklogRepo.findOne({ where: { id: patch.id } });
+        const result = await worklogRepo.save(Object.assign(Object.assign(Object.assign({}, origin), patch), { updater: user }));
+        return result;
+    }
+};
+exports.BuildingInspectionDailyWorklogMutation = BuildingInspectionDailyWorklogMutation;
+tslib_1.__decorate([
+    (0, type_graphql_1.Directive)('@transaction'),
+    (0, type_graphql_1.Mutation)(returns => building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog, { description: 'Create Daily Worklog by projectId+date' }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('patch')),
+    tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_type_1.BuildingInspectionDailyWorklogNew, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogMutation.prototype, "createBuildingInspectionDailyWorklog", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.Directive)('@transaction'),
+    (0, type_graphql_1.Mutation)(returns => building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog, { description: 'Update Daily Worklog' }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('patch')),
+    tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_type_1.BuildingInspectionDailyWorklogPatch, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogMutation.prototype, "updateBuildingInspectionDailyWorklog", null);
+exports.BuildingInspectionDailyWorklogMutation = BuildingInspectionDailyWorklogMutation = tslib_1.__decorate([
+    (0, type_graphql_1.Resolver)(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog)
+], BuildingInspectionDailyWorklogMutation);
+//# sourceMappingURL=building-inspection-daily-worklog-mutation.js.map

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-mutation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"building-inspection-daily-worklog-mutation.js","sourceRoot":"","sources":["../../../server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-mutation.ts"],"names":[],"mappings":";;;;AAAA,+CAAsE;AACtE,2FAAoF;AACpF,qGAAiI;AACjI,oFAA+E;AAC/E,uGAA0F;AAGnF,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAG3C,AAAN,KAAK,CAAC,oCAAoC,CAC1B,KAAwC,EAC/C,OAAwB;QAE/B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,kEAA8B,CAAC,CAAA;QACpE,MAAM,sBAAsB,GAAG,EAAE,CAAC,aAAa,CAAC,wCAAkB,CAAC,CAAA;QAEnE,IAAI,CAAC,KAAK,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAC1D,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;QAEhD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,iCAChC,KAAK,KACR,kBAAkB,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAE,EAAE,EAAE,EAAE,KAAK,CAAC,oBAAoB,EAAU,CAAC,CAAC,CAAC,SAAS,EACxG,eAAe,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAE,EAAE,EAAE,EAAE,KAAK,CAAC,iBAAiB,EAAU,CAAC,CAAC,CAAC,SAAS,EAC/F,UAAU,EAAE,MAAM,IAAA,wEAA8B,EAAC,KAAK,CAAC,SAAS,CAAC,EACjE,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,KAAK,MAAM,oBAAoB,IAAI,KAAK,CAAC,qBAAqB,EAAE,CAAC;YAC/D,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAA;YACxG,MAAM,sBAAsB,CAAC,IAAI,iCAAM,kBAAkB,KAAE,OAAO,EAAE,MAAM,IAAG,CAAA;QAC/E,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAIK,AAAN,KAAK,CAAC,oCAAoC,CAC1B,KAA0C,EACjD,OAAwB;QAE/B,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAClC,MAAM,WAAW,GAAG,EAAE,CAAC,aAAa,CAAC,kEAA8B,CAAC,CAAA;QAEpE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAA;QACrE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,IAAI,+CAChC,MAAM,GACN,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC;CACF,CAAA;AAlDY,wFAAsC;AAG3C;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,kEAA8B,EAAE,EAAE,WAAW,EAAE,wCAAwC,EAAE,CAAC;IAE5G,mBAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IACZ,mBAAA,IAAA,kBAAG,GAAE,CAAA;;6CADe,0EAAiC;;kGA0BvD;AAIK;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,kEAA8B,EAAE,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IAE1F,mBAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IACZ,mBAAA,IAAA,kBAAG,GAAE,CAAA;;6CADe,4EAAmC;;kGAczD;iDAjDU,sCAAsC;IADlD,IAAA,uBAAQ,EAAC,kEAA8B,CAAC;GAC5B,sCAAsC,CAkDlD","sourcesContent":["import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'\nimport { BuildingInspectionDailyWorklog } from './building-inspection-daily-worklog'\nimport { BuildingInspectionDailyWorklogPatch, BuildingInspectionDailyWorklogNew } from './building-inspection-daily-worklog-type'\nimport { BuildingInspection } from '../building-inspection/building-inspection'\nimport { generateDailyWorklogDocumentNo } from './building-inspection-daily-worklog-query'\n\n@Resolver(BuildingInspectionDailyWorklog)\nexport class BuildingInspectionDailyWorklogMutation {\n  @Directive('@transaction')\n  @Mutation(returns => BuildingInspectionDailyWorklog, { description: 'Create Daily Worklog by projectId+date' })\n  async createBuildingInspectionDailyWorklog(\n    @Arg('patch') patch: BuildingInspectionDailyWorklogNew,\n    @Ctx() context: ResolverContext\n  ): Promise<BuildingInspectionDailyWorklog> {\n    const { user, domain, tx } = context.state\n    const worklogRepo = tx.getRepository(BuildingInspectionDailyWorklog)\n    const buildingInspectionRepo = tx.getRepository(BuildingInspection)\n\n    if (!patch.projectId) throw new Error('projectId 가 없습니다.')\n    if (!patch.date) throw new Error('date 가 없습니다.')\n\n    const result = await worklogRepo.save({\n      ...patch,\n      overallSupervisory: patch.overallSupervisoryId ? ({ id: patch.overallSupervisoryId } as any) : undefined,\n      taskSupervisory: patch.taskSupervisoryId ? ({ id: patch.taskSupervisoryId } as any) : undefined,\n      documentNo: await generateDailyWorklogDocumentNo(patch.projectId),\n      domain: domain,\n      creator: user,\n      updater: user\n    })\n\n    for (const buildingInspectionId of patch.buildingInspectionIds) {\n      const buildingInspection = await buildingInspectionRepo.findOne({ where: { id: buildingInspectionId } })\n      await buildingInspectionRepo.save({ ...buildingInspection, worklog: result })\n    }\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => BuildingInspectionDailyWorklog, { description: 'Update Daily Worklog' })\n  async updateBuildingInspectionDailyWorklog(\n    @Arg('patch') patch: BuildingInspectionDailyWorklogPatch,\n    @Ctx() context: ResolverContext\n  ): Promise<BuildingInspectionDailyWorklog> {\n    const { user, tx } = context.state\n    const worklogRepo = tx.getRepository(BuildingInspectionDailyWorklog)\n\n    const origin = await worklogRepo.findOne({ where: { id: patch.id } })\n    const result = await worklogRepo.save({\n      ...origin,\n      ...patch,\n      updater: user\n    })\n\n    return result\n  }\n}\n"]}

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-query.d.ts

@@ -0,0 +1,16 @@
+import { Domain } from '@things-factory/shell';
+import { User } from '@things-factory/auth-base';
+import { BuildingInspectionDailyWorklog } from './building-inspection-daily-worklog';
+export declare class BuildingInspectionDailyWorklogQuery {
+    /**
+     * 프로젝트와 날짜로 일일업무일지 조회. 없으면 새 문서번호를 생성해 빈 데이터를 반환
+     */
+    buildingInspectionDailyWorklogByProjectIdAndDate(projectId: string, date: string, context: ResolverContext): Promise<BuildingInspectionDailyWorklog>;
+    dailyWorklogDatesOfProject(projectId: string, startDate: string, endDate: string, context: ResolverContext): Promise<BuildingInspectionDailyWorklog[]>;
+    domain(worklog: BuildingInspectionDailyWorklog): Promise<Domain>;
+    updater(worklog: BuildingInspectionDailyWorklog): Promise<User>;
+    creator(worklog: BuildingInspectionDailyWorklog): Promise<User>;
+    overallSupervisory(worklog: BuildingInspectionDailyWorklog): Promise<User>;
+    taskSupervisory(worklog: BuildingInspectionDailyWorklog): Promise<User>;
+}
+export declare function generateDailyWorklogDocumentNo(projectId: string): Promise<string>;

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-query.js

@@ -0,0 +1,171 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BuildingInspectionDailyWorklogQuery = void 0;
+exports.generateDailyWorklogDocumentNo = generateDailyWorklogDocumentNo;
+const tslib_1 = require("tslib");
+const type_graphql_1 = require("type-graphql");
+const shell_1 = require("@things-factory/shell");
+const auth_base_1 = require("@things-factory/auth-base");
+const building_inspection_daily_worklog_1 = require("./building-inspection-daily-worklog");
+const checklist_1 = require("../checklist/checklist");
+const building_inspection_1 = require("../building-inspection/building-inspection");
+const env_1 = require("@things-factory/env");
+const moment_timezone_1 = tslib_1.__importDefault(require("moment-timezone"));
+const typeorm_1 = require("typeorm");
+const projectType = env_1.config.get('projectType', building_inspection_1.ProjectType.DSSP);
+let BuildingInspectionDailyWorklogQuery = class BuildingInspectionDailyWorklogQuery {
+    /**
+     * 프로젝트와 날짜로 일일업무일지 조회. 없으면 새 문서번호를 생성해 빈 데이터를 반환
+     */
+    async buildingInspectionDailyWorklogByProjectIdAndDate(projectId, date, context) {
+        const repository = (0, shell_1.getRepository)(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog);
+        const worklogs = await repository.findOne({ where: { projectId, date } });
+        // 워크로그가 존재하면 해당 데이터를 반환
+        if (worklogs)
+            return worklogs;
+        // 존재하지 않으면 새 문서번호와 검측되지 않은 검측 데이터를 반환
+        const requestDate = (0, moment_timezone_1.default)(date).format('YYYY-MM-DD');
+        const documentNo = await generateDailyWorklogDocumentNo(projectId);
+        const buildingInspections = await (0, shell_1.getRepository)('projects')
+            .createQueryBuilder('p')
+            .select('bi.id', 'buildingInspectionId')
+            .addSelect('c.location', 'location')
+            .addSelect('c.construction_type', 'constructionType')
+            .addSelect('c.id', 'checklistId')
+            .addSelect('c.task_supervisory_signature', 'taskSupervisorySignature')
+            .addSelect('c.overall_supervisory_signature', 'overallSupervisorySignature')
+            .addSelect('c.task_supervisory_id', 'taskSupervisoryId')
+            .addSelect('c.overall_supervisory_id', 'overallSupervisoryId')
+            .addSelect('u.name', 'taskSupervisoryName')
+            .addSelect('u2.name', 'overallSupervisoryName')
+            .leftJoin('building_complexes', 'bc', 'p.building_complex_id = bc.id')
+            .leftJoin('buildings', 'b', 'b.building_complex_id = bc.id')
+            .leftJoin('building_levels', 'bl', 'bl.building_id = b.id')
+            .leftJoin('building_inspections', 'bi', 'bi.building_level_id = bl.id')
+            .leftJoin('checklists', 'c', 'bi.checklist_id = c.id')
+            .leftJoin('users', 'u', 'u.id = c.task_supervisory_id')
+            .leftJoin('users', 'u2', 'u2.id = c.overall_supervisory_id')
+            .where('p.id = :projectId', { projectId })
+            .andWhere('bi.project_type = :projectType', { projectType })
+            .andWhere('bi.worklog_id IS NULL')
+            .andWhere('c.inspection_result_updated_at IS NOT NULL') // 검측 결과 요청서가 생성된 경우
+            .andWhere('bi.request_date <= :requestDate', { requestDate })
+            .getRawMany();
+        // 선택된 검측 정보들의 정보 셋팅하여 신규 일일 업무일지에 기본 셋팅
+        const worklogsData = buildingInspections.map(inspection => ({
+            constructionType: inspection.constructionType,
+            supervisoryTitle: inspection.constructionType,
+            supervisorContent: `${inspection.location} - ${inspection.constructionType} 검측 완료`
+        }));
+        const buildingInspectionsData = buildingInspections.map(inspection => ({
+            id: inspection.buildingInspectionId,
+            checklistId: inspection.checklistId
+        }));
+        return {
+            documentNo,
+            worklogs: worklogsData,
+            buildingInspections: buildingInspectionsData
+        };
+    }
+    async dailyWorklogDatesOfProject(projectId, startDate, endDate, context) {
+        const result = await (0, shell_1.getRepository)(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog).find({
+            where: { projectId, date: (0, typeorm_1.Between)(startDate, endDate) },
+            order: { date: 'ASC' }
+        });
+        return result;
+    }
+    async domain(worklog) {
+        return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: worklog.domainId });
+    }
+    async updater(worklog) {
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: worklog.updaterId });
+    }
+    async creator(worklog) {
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: worklog.creatorId });
+    }
+    async overallSupervisory(worklog) {
+        return worklog.overallSupervisoryId
+            ? await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: worklog.overallSupervisoryId })
+            : undefined;
+    }
+    async taskSupervisory(worklog) {
+        return worklog.taskSupervisoryId ? await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: worklog.taskSupervisoryId }) : undefined;
+    }
+};
+exports.BuildingInspectionDailyWorklogQuery = BuildingInspectionDailyWorklogQuery;
+tslib_1.__decorate([
+    (0, type_graphql_1.Query)(returns => building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog, { nullable: true }),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('projectId')),
+    tslib_1.__param(1, (0, type_graphql_1.Arg)('date')),
+    tslib_1.__param(2, (0, type_graphql_1.Ctx)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "buildingInspectionDailyWorklogByProjectIdAndDate", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.Query)(returns => [building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog]),
+    tslib_1.__param(0, (0, type_graphql_1.Arg)('projectId')),
+    tslib_1.__param(1, (0, type_graphql_1.Arg)('startDate')),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('endDate')),
+    tslib_1.__param(3, (0, type_graphql_1.Ctx)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "dailyWorklogDatesOfProject", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "domain", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "updater", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "creator", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "overallSupervisory", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog]),
+    tslib_1.__metadata("design:returntype", Promise)
+], BuildingInspectionDailyWorklogQuery.prototype, "taskSupervisory", null);
+exports.BuildingInspectionDailyWorklogQuery = BuildingInspectionDailyWorklogQuery = tslib_1.__decorate([
+    (0, type_graphql_1.Resolver)(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog)
+], BuildingInspectionDailyWorklogQuery);
+async function generateDailyWorklogDocumentNo(projectId) {
+    // 프로젝트의 documentNaming을 가져오고, 일일업무일지(04) 최신 번호를 찾아 +1
+    const project = await (0, shell_1.getRepository)('projects').findOne({ where: { id: projectId } });
+    const naming = (project === null || project === void 0 ? void 0 : project.documentNaming) || '';
+    const latest = await (0, shell_1.getRepository)(building_inspection_daily_worklog_1.BuildingInspectionDailyWorklog)
+        .createQueryBuilder('d')
+        .where('d.project_id = :projectId', { projectId })
+        .andWhere('d.document_no LIKE :pattern', { pattern: `${naming} 검측 제${checklist_1.DocumentNoType.DAILY_WORKLOG}-%` })
+        .orderBy('d.created_at', 'DESC')
+        .getOne();
+    let sequence = '00001';
+    if (latest === null || latest === void 0 ? void 0 : latest.documentNo) {
+        const match = latest.documentNo.match(/\-(\d{5})호$/);
+        if (match)
+            sequence = (Number(match[1]) + 1).toString().padStart(5, '0');
+    }
+    return `${naming} 검측 제04-${sequence}호`;
+}
+//# sourceMappingURL=building-inspection-daily-worklog-query.js.map

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"building-inspection-daily-worklog-query.js","sourceRoot":"","sources":["../../../server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Query, FieldResolver, Root, Arg, Ctx } from 'type-graphql'\nimport { Domain, getRepository } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { BuildingInspectionDailyWorklog } from './building-inspection-daily-worklog'\nimport { DocumentNoType } from '../checklist/checklist'\nimport { BuildingInspection, ProjectType } from '../building-inspection/building-inspection'\nimport { config } from '@things-factory/env'\nimport moment from 'moment-timezone'\nimport { Between } from 'typeorm'\n\nconst projectType = config.get('projectType', ProjectType.DSSP)\n\n@Resolver(BuildingInspectionDailyWorklog)\nexport class BuildingInspectionDailyWorklogQuery {\n  /**\n   * 프로젝트와 날짜로 일일업무일지 조회. 없으면 새 문서번호를 생성해 빈 데이터를 반환\n   */\n  @Query(returns => BuildingInspectionDailyWorklog, { nullable: true })\n  async buildingInspectionDailyWorklogByProjectIdAndDate(\n    @Arg('projectId') projectId: string,\n    @Arg('date') date: string,\n    @Ctx() context: ResolverContext\n  ): Promise<BuildingInspectionDailyWorklog> {\n    const repository = getRepository(BuildingInspectionDailyWorklog)\n    const worklogs = await repository.findOne({ where: { projectId, date } })\n\n    // 워크로그가 존재하면 해당 데이터를 반환\n    if (worklogs) return worklogs\n\n    // 존재하지 않으면 새 문서번호와 검측되지 않은 검측 데이터를 반환\n    const requestDate = moment(date).format('YYYY-MM-DD')\n    const documentNo = await generateDailyWorklogDocumentNo(projectId)\n    const buildingInspections = await getRepository('projects')\n      .createQueryBuilder('p')\n      .select('bi.id', 'buildingInspectionId')\n      .addSelect('c.location', 'location')\n      .addSelect('c.construction_type', 'constructionType')\n      .addSelect('c.id', 'checklistId')\n      .addSelect('c.task_supervisory_signature', 'taskSupervisorySignature')\n      .addSelect('c.overall_supervisory_signature', 'overallSupervisorySignature')\n      .addSelect('c.task_supervisory_id', 'taskSupervisoryId')\n      .addSelect('c.overall_supervisory_id', 'overallSupervisoryId')\n      .addSelect('u.name', 'taskSupervisoryName')\n      .addSelect('u2.name', 'overallSupervisoryName')\n      .leftJoin('building_complexes', 'bc', 'p.building_complex_id = bc.id')\n      .leftJoin('buildings', 'b', 'b.building_complex_id = bc.id')\n      .leftJoin('building_levels', 'bl', 'bl.building_id = b.id')\n      .leftJoin('building_inspections', 'bi', 'bi.building_level_id = bl.id')\n      .leftJoin('checklists', 'c', 'bi.checklist_id = c.id')\n      .leftJoin('users', 'u', 'u.id = c.task_supervisory_id')\n      .leftJoin('users', 'u2', 'u2.id = c.overall_supervisory_id')\n      .where('p.id = :projectId', { projectId })\n      .andWhere('bi.project_type = :projectType', { projectType })\n      .andWhere('bi.worklog_id IS NULL')\n      .andWhere('c.inspection_result_updated_at IS NOT NULL') // 검측 결과 요청서가 생성된 경우\n      .andWhere('bi.request_date <= :requestDate', { requestDate })\n      .getRawMany()\n\n    // 선택된 검측 정보들의 정보 셋팅하여 신규 일일 업무일지에 기본 셋팅\n    const worklogsData = buildingInspections.map(inspection => ({\n      constructionType: inspection.constructionType,\n      supervisoryTitle: inspection.constructionType,\n      supervisorContent: `${inspection.location} - ${inspection.constructionType} 검측 완료`\n    }))\n    const buildingInspectionsData = buildingInspections.map(inspection => ({\n      id: inspection.buildingInspectionId,\n      checklistId: inspection.checklistId\n    }))\n\n    return {\n      documentNo,\n      worklogs: worklogsData,\n      buildingInspections: buildingInspectionsData as BuildingInspection[]\n    } as BuildingInspectionDailyWorklog\n  }\n\n  @Query(returns => [BuildingInspectionDailyWorklog])\n  async dailyWorklogDatesOfProject(\n    @Arg('projectId') projectId: string,\n    @Arg('startDate') startDate: string,\n    @Arg('endDate') endDate: string,\n    @Ctx() context: ResolverContext\n  ): Promise<BuildingInspectionDailyWorklog[]> {\n    const result = await getRepository(BuildingInspectionDailyWorklog).find({\n      where: { projectId, date: Between(startDate, endDate) },\n      order: { date: 'ASC' }\n    })\n\n    return result\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() worklog: BuildingInspectionDailyWorklog): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: worklog.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() worklog: BuildingInspectionDailyWorklog): Promise<User> {\n    return await getRepository(User).findOneBy({ id: worklog.updaterId })\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() worklog: BuildingInspectionDailyWorklog): Promise<User> {\n    return await getRepository(User).findOneBy({ id: worklog.creatorId })\n  }\n\n  @FieldResolver(type => User)\n  async overallSupervisory(@Root() worklog: BuildingInspectionDailyWorklog): Promise<User> {\n    return worklog.overallSupervisoryId\n      ? await getRepository(User).findOneBy({ id: worklog.overallSupervisoryId })\n      : (undefined as any)\n  }\n\n  @FieldResolver(type => User)\n  async taskSupervisory(@Root() worklog: BuildingInspectionDailyWorklog): Promise<User> {\n    return worklog.taskSupervisoryId ? await getRepository(User).findOneBy({ id: worklog.taskSupervisoryId }) : (undefined as any)\n  }\n}\n\nexport async function generateDailyWorklogDocumentNo(projectId: string): Promise<string> {\n  // 프로젝트의 documentNaming을 가져오고, 일일업무일지(04) 최신 번호를 찾아 +1\n  const project = await getRepository<any>('projects').findOne({ where: { id: projectId } })\n  const naming: string = project?.documentNaming || ''\n\n  const latest = await getRepository(BuildingInspectionDailyWorklog)\n    .createQueryBuilder('d')\n    .where('d.project_id = :projectId', { projectId })\n    .andWhere('d.document_no LIKE :pattern', { pattern: `${naming} 검측 제${DocumentNoType.DAILY_WORKLOG}-%` })\n    .orderBy('d.created_at', 'DESC')\n    .getOne()\n\n  let sequence = '00001'\n  if (latest?.documentNo) {\n    const match = latest.documentNo.match(/\\-(\\d{5})호$/)\n    if (match) sequence = (Number(match[1]) + 1).toString().padStart(5, '0')\n  }\n\n  return `${naming} 검측 제04-${sequence}호`\n}\n"]}

package/dist-server/service/building-inspection-daily-worklog/building-inspection-daily-worklog-type.d.ts

@@ -0,0 +1,23 @@
+import { BuildingInspectionDailyWorklog } from './building-inspection-daily-worklog';
+export declare class BuildingInspectionDailyWorklogNew {
+    projectId: string;
+    date?: string;
+    worklogs?: any;
+    memo?: string;
+    directiveMemo?: string;
+    overallSupervisoryId?: string;
+    taskSupervisoryId?: string;
+    overallSupervisorySignature?: string;
+    taskSupervisorySignature?: string;
+    buildingInspectionIds?: string[];
+}
+export declare class BuildingInspectionDailyWorklogPatch {
+    id?: string;
+    worklogs?: any;
+    memo?: string;
+    directiveMemo?: string;
+}
+export declare class BuildingInspectionDailyWorklogList {
+    items: BuildingInspectionDailyWorklog[];
+    total: number;
+}