Merge branch 'main' into feature/screen-management

backend-node/src/services/screenManagementService.ts

@@ -71,8 +71,9 @@ export class ScreenManagementService {
     // 화면 생성 (Raw Query)
     const [screen] = await query<any>(
       `INSERT INTO screen_definitions (
-        screen_name, screen_code, table_name, company_code, description, created_by
-      ) VALUES ($1, $2, $3, $4, $5, $6)
+        screen_name, screen_code, table_name, company_code, description, created_by,
+        db_source_type, db_connection_id
+      ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
       RETURNING *`,
       [
         screenData.screenName,
@@ -81,6 +82,8 @@ export class ScreenManagementService {
         screenData.companyCode,
         screenData.description || null,
         screenData.createdBy,
+        screenData.dbSourceType || "internal",
+        screenData.dbConnectionId || null,
       ]
     );
 
@@ -1779,6 +1782,8 @@ export class ScreenManagementService {
       createdBy: data.created_by,
       updatedDate: data.updated_date,
       updatedBy: data.updated_by,
+      dbSourceType: data.db_source_type || "internal",
+      dbConnectionId: data.db_connection_id || undefined,
     };
   }
 

backend-node/src/types/screen.ts

@@ -151,6 +151,8 @@ export interface ScreenDefinition {
   createdBy?: string;
   updatedDate: Date;
   updatedBy?: string;
+  dbSourceType?: "internal" | "external";
+  dbConnectionId?: number;
 }
 
 // 화면 생성 요청
@@ -161,6 +163,8 @@ export interface CreateScreenRequest {
   companyCode: string;
   description?: string;
   createdBy?: string;
+  dbSourceType?: "internal" | "external";
+  dbConnectionId?: number;
 }
 
 // 화면 수정 요청