feat(j-s): Add a mergeCaseNumber field to case table

apps/judicial-system/api/src/app/modules/case/dto/updateCase.input.ts

@@ -507,6 +507,11 @@ export class UpdateCaseInput {
   @Field(() => ID, { nullable: true })
   readonly mergeCaseId?: string
 
+  @Allow()
+  @IsOptional()
+  @Field(() => String, { nullable: true })
+  readonly mergeCaseNumber?: string
+
   @Allow()
   @IsOptional()
   @Field(() => String, { nullable: true })

apps/judicial-system/api/src/app/modules/case/models/case.model.ts

@@ -454,6 +454,9 @@ export class Case {
   @Field(() => [Case], { nullable: true })
   readonly mergedCases?: Case[]
 
+  @Field(() => String, { nullable: true })
+  readonly mergeCaseNumber?: string
+
   @Field(() => [CivilClaimant], { nullable: true })
   readonly civilClaimants?: CivilClaimant[]
 

apps/judicial-system/backend/migrations/20250115095654-update-case.js

@@ -0,0 +1,24 @@
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    return queryInterface.sequelize.transaction((t) =>
+      Promise.all([
+        queryInterface.addColumn(
+          'case',
+          'merge_case_number',
+          {
+            type: Sequelize.STRING,
+            allowNull: true,
+          },
+          { transaction: t },
+        ),
+      ]),
+    )
+  },
+  async down(queryInterface) {
+    return queryInterface.sequelize.transaction((t) =>
+      queryInterface.removeColumn('case', 'merge_case_number', {
+        transaction: t,
+      }),
+    )
+  },
+}

apps/judicial-system/backend/src/app/modules/case/case.service.ts

@@ -175,6 +175,7 @@ export interface UpdateCase
     | 'judgeId'
     | 'courtSessionType'
     | 'mergeCaseId'
+    | 'mergeCaseNumber'
   > {
   type?: CaseType
   state?: CaseState

apps/judicial-system/backend/src/app/modules/case/dto/updateCase.dto.ts

@@ -532,6 +532,11 @@ export class UpdateCaseDto {
   @ApiPropertyOptional({ type: String })
   readonly mergeCaseId?: string
 
+  @IsOptional()
+  @IsString()
+  @ApiPropertyOptional({ type: String })
+  readonly mergeCaseNumber?: string
+
   @IsOptional()
   @IsString()
   @ApiPropertyOptional({ type: String })

apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts

@@ -106,6 +106,7 @@ const districtCourtFields: (keyof UpdateCaseDto)[] = [
   'indictmentDecision',
   'courtSessionType',
   'mergeCaseId',
+  'mergeCaseNumber',
 ]
 
 const courtOfAppealsFields: (keyof UpdateCaseDto)[] = [

apps/judicial-system/backend/src/app/modules/case/models/case.model.ts

@@ -1061,13 +1061,21 @@ export class Case extends Model {
   @ApiPropertyOptional({ type: () => Case })
   mergeCase?: Case
 
-  // /**********
-  //  * The cases that have been merged in to the current case - only used if the case was merged
-  //  **********/
+  /**********
+   * The cases that have been merged in to the current case - only used if the case was merged
+   **********/
   @HasMany(() => Case, 'mergeCaseId')
   @ApiPropertyOptional({ type: () => Case })
   mergedCases?: Case[]
 
+  /**********
+   * The court case number this case was merged in to - only used if the case was merged
+   * with a case that is not in RVG
+   **********/
+  @Column({ type: DataType.STRING, allowNull: true })
+  @ApiPropertyOptional({ type: String })
+  mergeCaseNumber?: string
+
   /**********
    * Indicates whether a case should include any civil claims -
    * optional

apps/judicial-system/web/src/components/FormProvider/case.graphql

@@ -390,6 +390,7 @@ query Case($input: CaseQueryInput!) {
       caseFilesSharedWithSpokesperson
       isSpokespersonConfirmed
     }
+    mergeCaseNumber
     civilDemands
     hasCivilClaims
   }

apps/judicial-system/web/src/utils/hooks/useCase/updateCase.graphql

@@ -224,5 +224,6 @@ mutation UpdateCase($input: UpdateCaseInput!) {
     mergeCase {
       id
     }
+    mergeCaseNumber
   }
 }