feat(FON-414): sort members in protocol order

Author: jquagliatini

apps/api/prisma/migrations/20260603152128_adds_member_sort/migration.sql

@@ -0,0 +1,12 @@
+BEGIN;
+
+-- AlterTable
+ALTER TABLE "identity_and_access_context"."users" ADD COLUMN     "sort" SMALLINT NOT NULL DEFAULT 1000;
+
+-- AlterTable
+ALTER TABLE "docs"."official_report_member" ADD COLUMN "sort" SMALLINT NOT NULL DEFAULT 1000;
+
+ALTER TABLE "docs"."official_report_member" ALTER COLUMN "sort" DROP DEFAULT;
+
+
+COMMIT;

apps/api/prisma/schemas/docs.prisma

@@ -125,6 +125,7 @@ model OfficialReportMember {
   firstName String           @map("first_name")
   lastName  String           @map("last_name")
   title     String?
+  sort      Int              @db.SmallInt
 
   officialReport OfficialReport @relation(fields: [officialReportId], references: [id], onDelete: Cascade, onUpdate: NoAction)
 

apps/api/prisma/schemas/identity.prisma

@@ -35,6 +35,7 @@ model User {
   password  String
   gender    PrismaGenderEnum
   createdAt DateTime         @default(now()) @map("created_at") @db.Timestamp(6)
+  sort      Int              @default(1000) @db.SmallInt
 
   title        PrismaUserTitleEnum? @unique()
   duty         PrismaUserDutyEnum?

apps/api/src/modules/docs/domain/official-report.spec.ts

@@ -21,6 +21,7 @@ describe('OfficialReport', () => {
           id: 'chairman-1',
           role: Role.MEMBRE_DU_SIEGE,
           title: 'PRESIDENT_SIEGE',
+          sort: 1,
         },
         formation: Magistrat.Formation.SIEGE,
         hasRenunciation: true,
@@ -63,6 +64,7 @@ describe('OfficialReport', () => {
             lastName: 'descartes',
             gender: Gender.M,
             title: null,
+            sort: 2,
           },
         ],
         absentMembers: new Set(['member-1']),
@@ -77,6 +79,7 @@ describe('OfficialReport', () => {
           id: 'chairman-1',
           role: Role.MEMBRE_DU_SIEGE,
           title: 'PRESIDENT_SIEGE',
+          sort: 1,
         },
         formation: Magistrat.Formation.SIEGE,
         hasRenunciation: true,
@@ -115,6 +118,7 @@ describe('OfficialReport', () => {
 
         authorId: 'author-1',
         chairman: {
+          sort: 1,
           displayTitle: null,
           duty: 'PRESIDENT',
           firstName: 'victor',
@@ -165,6 +169,7 @@ describe('OfficialReport', () => {
             lastName: 'descartes',
             gender: Gender.M,
             title: null,
+            sort: 2,
           },
         ],
         absentMembers: new Set(['member-1']),
@@ -179,6 +184,7 @@ describe('OfficialReport', () => {
           id: 'chairman-1',
           role: Role.MEMBRE_DU_SIEGE,
           title: 'PRESIDENT_SIEGE',
+          sort: 1,
         },
         hasRenunciation: true,
         justiceDepartmentContactId: 'contact-1',

apps/api/src/modules/docs/domain/official-report.ts

@@ -17,6 +17,7 @@ export type OfficialReportUser = {
   displayTitle: string | null;
   title: UserTitleEnum | null;
   duty: UserDutyEnum | null;
+  sort: number;
 };
 
 export class ChairmanIsNotMember extends Error {}
@@ -37,7 +38,7 @@ export class OfficialReportCreated {
     readonly hasRenunciation: boolean,
     readonly justiceDepartmentContactId: string,
     readonly chairman: OfficialReportUser,
-    readonly secretary: OfficialReportUser,
+    readonly secretary: Omit<OfficialReportUser, 'sort'>,
     readonly agendaIds: readonly string[],
     readonly members: readonly {
       id: string;
@@ -46,6 +47,7 @@ export class OfficialReportCreated {
       gender: Gender;
       title: string | null;
       isAbsent: boolean;
+      sort: number;
     }[],
     readonly authorId: string,
   ) {}
@@ -64,7 +66,7 @@ export class OfficialReportUpdated {
     readonly hasRenunciation: boolean,
     readonly justiceDepartmentContactId: string,
     readonly chairman: OfficialReportUser,
-    readonly secretary: OfficialReportUser,
+    readonly secretary: Omit<OfficialReportUser, 'sort'>,
     readonly agendaIds: readonly string[],
     readonly members: readonly {
       id: string;
@@ -73,6 +75,7 @@ export class OfficialReportUpdated {
       gender: Gender;
       title: string | null;
       isAbsent: boolean;
+      sort: number;
     }[],
     readonly authorId: string,
   ) {}
@@ -103,7 +106,7 @@ export class OfficialReport {
     hasRenunciation: boolean;
     justiceDepartmentContactId: string;
     chairman: OfficialReportUser;
-    secretary: OfficialReportUser;
+    secretary: Omit<OfficialReportUser, 'sort'>;
     agendas: readonly {
       id: string;
       formation: Magistrat.Formation;
@@ -190,7 +193,7 @@ export class OfficialReport {
     hasRenunciation: boolean;
     justiceDepartmentContactId: string;
     chairman: OfficialReportUser;
-    secretary: OfficialReportUser;
+    secretary: Omit<OfficialReportUser, 'sort'>;
     agendas: readonly {
       id: string;
       formation: Magistrat.Formation;
@@ -232,7 +235,7 @@ export class OfficialReport {
     hasRenunciation: boolean;
     justiceDepartmentContactId: string;
     chairman: OfficialReportUser;
-    secretary: OfficialReportUser;
+    secretary: Omit<OfficialReportUser, 'sort'>;
     agendas: readonly {
       id: string;
       formation: Magistrat.Formation;

apps/api/src/modules/docs/infrastructure/queries/find-official-report-document.query.ts

@@ -57,6 +57,7 @@ export class FindOfficialReportDocumentQuery {
               gender: true,
               title: true,
               isAbsent: true,
+              sort: true,
             },
           },
           nominationFiles: {
@@ -132,6 +133,7 @@ export class FindOfficialReportDocumentQuery {
           gender: prismaGenderEnumToGenderEnum(m.gender),
           displayTitle: m.title,
           isAbsent: m.isAbsent,
+          sort: m.sort,
         })),
         files: ctx.nominationFiles.flatMap((f) => {
           if (!f.outcome) return [];

apps/api/src/modules/docs/infrastructure/repositories/official-report.repository.ts

@@ -153,6 +153,7 @@ export class OfficialReportRepository {
               gender: m.gender,
               title: m.title,
               isAbsent: m.isAbsent,
+              sort: m.sort,
             })),
           },
         },
@@ -191,6 +192,7 @@ export class OfficialReportRepository {
               gender: m.gender,
               title: m.title,
               isAbsent: m.isAbsent,
+              sort: m.sort,
             })),
           },
         },

apps/api/src/modules/docs/infrastructure/services/renderers/templates/official-report.html.ts

@@ -6,6 +6,7 @@ import { conjunctionList, date, displayTitled, fullname } from '../helpers';
 import { UserTitleEnum } from 'src/modules/administration/domain/user-enum';
 import { DocNominationFileOutcomeEnum } from 'src/modules/docs/domain/doc-nomination-file-outcome';
 import { DateOnly } from 'src/utils/date-only';
+import { unaccent } from 'src/utils/unaccent';
 
 import { commonDocumentCss, documentLayout } from './common.html';
 
@@ -75,6 +76,7 @@ function content(ctx: {
     gender: Gender;
     displayTitle: string | null;
     isAbsent: boolean;
+    sort: number;
   }[];
   chairman: {
     id: string | null;
@@ -107,7 +109,7 @@ function content(ctx: {
       ${ctx.members
         .filter((member) => ctx.chairman.id === null || member.id === null || member.id !== ctx.chairman.id)
         .filter((member) => !member.isAbsent)
-        .sort((a, b) => a.lastName.localeCompare(b.lastName))
+        .sort((a, b) => a.sort - b.sort || unaccent(a.lastName).localeCompare(unaccent(b.lastName)))
         .map((member) => `<li>${displayTitled(member)}</li>`)
         .join('')}
     </ul>

apps/api/src/modules/members/infrastructure/queries/internal-find-members-by-formation.query.ts

@@ -36,6 +36,7 @@ export class InternalFindMembersByFormationQuery {
         title: true,
         displayTitle: true,
         duty: true,
+        sort: true,
       },
     });
 
@@ -48,6 +49,7 @@ export class InternalFindMembersByFormationQuery {
       title: u.title ?? null,
       displayTitle: u.displayTitle ?? null,
       duty: u.duty ?? null,
+      sort: u.sort,
     }));
   }
 }
@@ -62,5 +64,6 @@ export class InternalMemberListDto extends createZodDto(
     title: z.enum(PrismaUserTitleEnum).nullable(),
     displayTitle: z.string().nullable(),
     duty: z.enum(PrismaUserDutyEnum).nullable(),
+    sort: z.number(),
   }),
 ) {}

apps/api/src/modules/members/infrastructure/queries/internal-get-member.query.ts

@@ -29,6 +29,7 @@ export class InternalGetMemberQuery {
         displayTitle: true,
         title: true,
         duty: true,
+        sort: true,
       },
     });
 
@@ -53,5 +54,6 @@ export class InternalMemberDto extends createZodDto(
     displayTitle: z.string().nullable(),
     title: z.enum(PrismaUserTitleEnum).nullable(),
     duty: z.enum(PrismaUserDutyEnum).nullable(),
+    sort: z.number(),
   }),
 ) {}