diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma index 2b1aed1f..5c18dd81 100644 --- a/backend/prisma/schema.prisma +++ b/backend/prisma/schema.prisma @@ -466,7 +466,7 @@ model decision { case_file_guid String @db.Uuid schedule_sector_xref_guid String @db.Uuid discharge_code String @db.VarChar(10) - rationale_code String? @db.VarChar(10) + rationale_text String? @db.VarChar(10) inspection_number Int? lead_agency_code String? @db.VarChar(10) non_compliance_decision_matrix_code String? @db.VarChar(10) @@ -479,7 +479,6 @@ model decision { case_file case_file @relation(fields: [case_file_guid], references: [case_file_guid], onDelete: NoAction, onUpdate: NoAction, map: "fk_decision__case_file_guid") discharge_code_decision_discharge_codeTodischarge_code discharge_code @relation("decision_discharge_codeTodischarge_code", fields: [discharge_code], references: [discharge_code], onDelete: NoAction, onUpdate: NoAction, map: "fk_decision__discharge_code") non_compliance_decision_matrix_code_decision_non_compliance_decision_matrix_codeTonon_compliance_decision_matrix_code non_compliance_decision_matrix_code? @relation("decision_non_compliance_decision_matrix_codeTonon_compliance_decision_matrix_code", fields: [non_compliance_decision_matrix_code], references: [non_compliance_decision_matrix_code], onDelete: NoAction, onUpdate: NoAction, map: "fk_decision__ncdm_code") - rationale_code_decision_rationale_codeTorationale_code rationale_code? @relation("decision_rationale_codeTorationale_code", fields: [rationale_code], references: [rationale_code], onDelete: NoAction, onUpdate: NoAction, map: "fk_decision__rationale_code") schedule_sector_xref schedule_sector_xref @relation(fields: [schedule_sector_xref_guid], references: [schedule_sector_xref_guid], onDelete: NoAction, onUpdate: NoAction, map: "fk_decision__schedule_sector_xref_guid") } @@ -520,20 +519,6 @@ model non_compliance_decision_matrix_code { decision_decision_non_compliance_decision_matrix_codeTonon_compliance_decision_matrix_code decision[] @relation("decision_non_compliance_decision_matrix_codeTonon_compliance_decision_matrix_code") } -/// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments -model rationale_code { - rationale_code String @id(map: "PK_rationale_code") @db.VarChar(10) - short_description String @db.VarChar(50) - long_description String? @db.VarChar(250) - display_order Int - active_ind Boolean - create_user_id String @db.VarChar(32) - create_utc_timestamp DateTime @db.Timestamp(6) - update_user_id String @db.VarChar(32) - update_utc_timestamp DateTime @db.Timestamp(6) - decision_decision_rationale_codeTorationale_code decision[] @relation("decision_rationale_codeTorationale_code") -} - /// This model or at least one of its fields has comments in the database, and requires an additional setup for migrations: Read more: https://pris.ly/d/database-comments model schedule_code { schedule_code String @id(map: "PK_schedule_code") @db.VarChar(10) diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts index 20043019..bb7a3e3c 100644 --- a/backend/src/app.module.ts +++ b/backend/src/app.module.ts @@ -27,7 +27,6 @@ import { HWCRAssessmentActionModule } from "./hwcr_assessment_action/hwcr_assess import { ScheduleCodeModule } from "./code-tables/schedule_code/schedule_code.module"; import { DischargeCodeModule } from "./code-tables/discharge_code/discharge_code,module"; import { NonComplianceCodeModule } from "./code-tables/non_compliance_code/non_compliance_code.module"; -import { RationaleCodeModule } from "./code-tables/rationale_code/rationale_code.module"; import { SectorCodeModule } from "./code-tables/sector_code/sector_code.module"; import { CEEBDecisionActionModule } from "./ceeb_decision_action/ceeb_decision_action.module"; import { AgencyCodeModule } from "./agency_code/agency_code.module"; @@ -60,7 +59,6 @@ import { AgencyCodeModule } from "./agency_code/agency_code.module"; ScheduleCodeModule, DischargeCodeModule, NonComplianceCodeModule, - RationaleCodeModule, SectorCodeModule, CEEBDecisionActionModule, ], diff --git a/backend/src/case_file/case_file.service.ts b/backend/src/case_file/case_file.service.ts index 014dbdb8..37d1ac96 100644 --- a/backend/src/case_file/case_file.service.ts +++ b/backend/src/case_file/case_file.service.ts @@ -303,7 +303,7 @@ export class CaseFileService { select: { decision_guid: true, discharge_code: true, - rationale_code: true, + rationale_text: true, inspection_number: true, lead_agency_code: true, non_compliance_decision_matrix_code: true, @@ -412,7 +412,7 @@ export class CaseFileService { sector: decision[0].schedule_sector_xref.sector_code, discharge: decision[0].discharge_code, nonCompliance: decision[0]?.non_compliance_decision_matrix_code, - rationale: decision[0]?.rationale_code, + rationale: decision[0]?.rationale_text, assignedTo: action[0]?.actor, actionTaken: action[0]?.actionCode, actionTakenDate: action[0]?.date, @@ -2481,7 +2481,7 @@ export class CaseFileService { case_file_guid: caseId, schedule_sector_xref_guid: scheduleSectorXref, discharge_code: discharge, - rationale_code: rationale, + rationale_text: rationale, non_compliance_decision_matrix_code: nonCompliance, active_ind: true, create_user_id: userId, @@ -2670,7 +2670,7 @@ export class CaseFileService { let data: any = { discharge_code: discharge, - rationale_code: rationale, + rationale_text: rationale, non_compliance_decision_matrix_code: nonCompliance, update_user_id: updateUserId, update_utc_timestamp: current, diff --git a/backend/src/code-tables/rationale_code/entities/rationale_code.entity.ts b/backend/src/code-tables/rationale_code/entities/rationale_code.entity.ts deleted file mode 100644 index 3966c30b..00000000 --- a/backend/src/code-tables/rationale_code/entities/rationale_code.entity.ts +++ /dev/null @@ -1,7 +0,0 @@ -export class RationaleCode { - rationaleCode: string; - shortDescription: string; - longDescription: string; - displayOrder: number; - activeIndicator: boolean; -} diff --git a/backend/src/code-tables/rationale_code/rationale_code.graphql b/backend/src/code-tables/rationale_code/rationale_code.graphql deleted file mode 100644 index 999dacf4..00000000 --- a/backend/src/code-tables/rationale_code/rationale_code.graphql +++ /dev/null @@ -1,11 +0,0 @@ -type RationaleCode { - rationaleCode: String - shortDescription: String - longDescription: String - displayOrder: Int - activeIndicator: Boolean -} - -type Query { - rationaleCodes: [RationaleCode]! -} diff --git a/backend/src/code-tables/rationale_code/rationale_code.module.ts b/backend/src/code-tables/rationale_code/rationale_code.module.ts deleted file mode 100644 index 083d4619..00000000 --- a/backend/src/code-tables/rationale_code/rationale_code.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Module } from "@nestjs/common"; -import { PrismaModule } from "nestjs-prisma"; -import { RationaleCodeService } from "./rationale_code.service"; -import { RationaleCodeResolver } from "./rationale_code.resolver"; - -@Module({ - imports: [PrismaModule], - providers: [RationaleCodeResolver, RationaleCodeService], -}) -export class RationaleCodeModule {} diff --git a/backend/src/code-tables/rationale_code/rationale_code.resolver.ts b/backend/src/code-tables/rationale_code/rationale_code.resolver.ts deleted file mode 100644 index 03dc9deb..00000000 --- a/backend/src/code-tables/rationale_code/rationale_code.resolver.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Resolver, Query } from "@nestjs/graphql"; -import { UseGuards } from "@nestjs/common"; -import { JwtRoleGuard } from "src/auth/jwtrole.guard"; -import { Roles } from "src/auth/decorators/roles.decorator"; -import { Role } from "src/enum/role.enum"; -import { RationaleCodeService } from "./rationale_code.service"; - -@UseGuards(JwtRoleGuard) -@Resolver("RationaleCode") -export class RationaleCodeResolver { - constructor(private readonly service: RationaleCodeService) {} - - @Query("rationaleCodes") - @Roles(Role.COS_OFFICER, Role.CEEB) - findAll() { - return this.service.findAll(); - } -} diff --git a/backend/src/code-tables/rationale_code/rationale_code.service.ts b/backend/src/code-tables/rationale_code/rationale_code.service.ts deleted file mode 100644 index aa497975..00000000 --- a/backend/src/code-tables/rationale_code/rationale_code.service.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { Injectable } from "@nestjs/common"; -import { PrismaService } from "nestjs-prisma"; -import { RationaleCode } from "./entities/rationale_code.entity"; - -@Injectable() -export class RationaleCodeService { - constructor(private prisma: PrismaService) {} - - findAll = async (): Promise> => { - const codes = await this.prisma.rationale_code.findMany({ - select: { - rationale_code: true, - short_description: true, - long_description: true, - display_order: true, - active_ind: true, - }, - }); - - return codes.map(({ rationale_code, short_description, long_description, display_order, active_ind }) => ({ - rationaleCode: rationale_code, - shortDescription: short_description, - longDescription: long_description, - displayOrder: display_order, - activeIndicator: active_ind, - })); - }; -} diff --git a/migrations/sql/R__insert_CEEB_decision_codes.sql b/migrations/sql/R__insert_CEEB_decision_codes.sql index 74b36d91..2d83ff3d 100644 --- a/migrations/sql/R__insert_CEEB_decision_codes.sql +++ b/migrations/sql/R__insert_CEEB_decision_codes.sql @@ -1406,56 +1406,6 @@ VALUES CURRENT_TIMESTAMP ) ON CONFLICT DO NOTHING; --- --- INSERT rationale values --- -INSERT INTO - case_management.rationale_code ( - rationale_code, - short_description, - long_description, - display_order, - active_ind, - create_user_id, - create_utc_timestamp, - update_user_id, - update_utc_timestamp - ) -VALUES - ( - 'RATIONAL01', - 'RATIONAL_01', - 'Rationale 01', - 10, - 'Y', - CURRENT_USER, - CURRENT_TIMESTAMP, - CURRENT_USER, - CURRENT_TIMESTAMP - ), - ( - 'RATIONAL02', - 'RATIONAL_02', - 'Rationale 02', - 20, - 'Y', - CURRENT_USER, - CURRENT_TIMESTAMP, - CURRENT_USER, - CURRENT_TIMESTAMP - ), - ( - 'RATIONAL03', - 'RATIONAL_03', - 'Rational 03', - 30, - 'Y', - CURRENT_USER, - CURRENT_TIMESTAMP, - CURRENT_USER, - CURRENT_TIMESTAMP - ) ON CONFLICT DO NOTHING; - -- -- INSERT discharge_code values -- diff --git a/migrations/sql/V1.28.1__CE-1066.sql b/migrations/sql/V1.28.1__CE-1066.sql new file mode 100644 index 00000000..d715b4c2 --- /dev/null +++ b/migrations/sql/V1.28.1__CE-1066.sql @@ -0,0 +1,10 @@ +ALTER TABLE case_management.decision +DROP CONSTRAINT fk_decision__rationale_code; + +ALTER TABLE case_management.decision +RENAME COLUMN rationale_code TO rationale_text; + +ALTER TABLE case_management.decision +ALTER COLUMN rationale_text TYPE varchar(4000); + +DROP TABLE if exists case_management.rationale_code; \ No newline at end of file