(merge) 대표님/최겸 작업사항 머지

1 files changed, 8 insertions, 5 deletions

diff --git a/db/schema/evaluationCriteria.ts b/db/schema/evaluationCriteria.ts
index 23a987cf..788d0f3e 100644
--- a/db/schema/evaluationCriteria.ts
+++ b/db/schema/evaluationCriteria.ts
@@ -7,9 +7,9 @@ import {
   serial,

   text,

   timestamp,

-  varchar,

+  varchar

 } from 'drizzle-orm/pg-core';

-import { eq, relations } from 'drizzle-orm';

+import { eq, relations, sql } from 'drizzle-orm';

 

 // ----------------------------------------------------------------------------------------------------

 

@@ -47,7 +47,7 @@ const REG_EVAL_CRITERIA_ITEM_ENUM = REG_EVAL_CRITERIA_ITEM.map(c => c.value) as
 const regEvalCriteria = pgTable('reg_eval_criteria', {

   id: serial('id').primaryKey(),

   category: varchar('category', { enum: REG_EVAL_CRITERIA_CATEGORY_ENUM, length: 32 }).default('quality').notNull(),

-  category2: varchar('category', { enum: REG_EVAL_CRITERIA_CATEGORY_ENUM2, length: 32 }).default('processScore').notNull(),

+  category2: varchar('category2', { enum: REG_EVAL_CRITERIA_CATEGORY_ENUM2, length: 32 }).default('processScore').notNull(),

   item: varchar('item', { enum: REG_EVAL_CRITERIA_ITEM_ENUM, length: 32 }).default('quality').notNull(),

   classification: varchar('classification', { length: 255 }).notNull(),

   range: varchar('range', { length: 255 }),

@@ -76,18 +76,20 @@ const regEvalCriteriaDetails = pgTable('reg_eval_criteria_details', {
 const regEvalCriteriaView = pgView('reg_eval_criteria_view').as((qb) =>

   qb

     .select({

-      id: regEvalCriteria.id,

+      id: regEvalCriteriaDetails.id,

+      criteriaId: regEvalCriteriaDetails.criteriaId,

       category: regEvalCriteria.category,

+      scoreCategory: regEvalCriteria.category2,

       item: regEvalCriteria.item,

       classification: regEvalCriteria.classification,

       range: regEvalCriteria.range,

-      detailId: regEvalCriteriaDetails.id,

       detail: regEvalCriteriaDetails.detail,

       orderIndex: regEvalCriteriaDetails.orderIndex,

       scoreEquipShip: regEvalCriteriaDetails.scoreEquipShip,

       scoreEquipMarine: regEvalCriteriaDetails.scoreEquipMarine,

       scoreBulkShip: regEvalCriteriaDetails.scoreBulkShip,

       scoreBulkMarine: regEvalCriteriaDetails.scoreBulkMarine,

+      remarks: regEvalCriteria.remarks,

     })

     .from(regEvalCriteria)

     .leftJoin(regEvalCriteriaDetails, eq(regEvalCriteria.id, regEvalCriteriaDetails.criteriaId))

@@ -128,6 +130,7 @@ export {
   regEvalCriteriaDetailsRelations,

   regEvalCriteriaRelations,

   regEvalCriteriaView,

+  REG_EVAL_CRITERIA_CATEGORY2,

   type NewRegEvalCriteria,

   type NewRegEvalCriteriaDetails,

   type RegEvalCriteriaView,