feat(FON-241): session status

jquagliatini · jquagliatini · commit 77f3fba33424 · 2026-05-28T18:22:10.000+02:00
diff --git a/apps/api/prisma/sql/findReportedSessionIds.sql b/apps/api/prisma/sql/findReportedSessionIds.sql
@@ -0,0 +1,22 @@
+-- @param $1:sessionIds
+
+SELECT s.id
+FROM nominations_context.session AS s
+WHERE
+  s.id = ANY(/* sessionIds */$1::UUID[])
+  AND s.deleted_at IS NULL
+  AND s.archived_at IS NULL
+  AND s.is_validated = TRUE
+
+  AND NOT EXISTS (
+    SELECT 1
+    FROM nominations_context.dossier_de_nomination 
+    WHERE session_id = s.id AND outcome != ALL('{VALIDATED,NON_VALIDATED,WITHDRAWN}'::nominations_context.nomination_file_outcome_enum[])
+  )
+
+  AND NOT EXISTS (
+    SELECT 1
+    FROM nominations_context.dossier_de_nomination ddn
+      LEFT JOIN docs.official_report_nomination_file ornf ON ornf.nomination_file_id = ddn.id
+    WHERE ddn.session_id = s.id AND ornf.nomination_file_id IS NULL
+  );
diff --git a/apps/api/src/modules/session/infrastructure/queries/detail-nomination-session.query.ts b/apps/api/src/modules/session/infrastructure/queries/detail-nomination-session.query.ts
@@ -5,6 +5,7 @@ import z from 'zod';
 import { dateOnlyJsonSchema, Magistrat, TypeDeSaisine } from 'shared-models';
 
 import { AffectationVersionFinder } from '../finders/affectation-version.finder';
+import { UnreportedSessionFilesCountFinder } from '../finders/count-unreported-files.finder';
 import { Prisma } from 'src/generated/prisma/client';
 import { PrismaService } from 'src/modules/framework/database';
 import { prismaFormationEnumToFormationEnum } from 'src/modules/shared/mappers/formation.mapper';
@@ -16,6 +17,7 @@ export class DetailNominationSessionQuery {
   constructor(
     private readonly prisma: PrismaService,
     private readonly affectationVersionFinder: AffectationVersionFinder,
+    private readonly unreportedSessionFilesCountFinder: UnreportedSessionFilesCountFinder,
   ) {}
 
   async handle(query: {
@@ -59,6 +61,12 @@ export class DetailNominationSessionQuery {
     const affectationsCount = session.affectationVersions[0]?._count.affectations ?? 0;
     const isDeletable = session._count.attachments === 0 && affectationsCount === 0;
 
+    const unreportedCount = await this.unreportedSessionFilesCountFinder.find({
+      sessionId: query.sessionId,
+      tx: query.tx,
+    });
+    const isArchivable = session.isValidated && !session.archivedAt && unreportedCount === 0;
+
     return {
       id: session.id,
       name: session.name,
@@ -73,6 +81,7 @@ export class DetailNominationSessionQuery {
       isValidated: session.isValidated,
       isDeletable,
       isArchived: !!session.archivedAt,
+      isArchivable,
     };
   }
 }
@@ -90,5 +99,6 @@ export class DetailedNominationSessionDto extends createZodDto(
     isValidated: z.boolean(),
     isDeletable: z.boolean(),
     isArchived: z.boolean(),
+    isArchivable: z.boolean(),
   }),
 ) {}
diff --git a/apps/api/src/modules/session/infrastructure/queries/list-nomination-sessions.query.ts b/apps/api/src/modules/session/infrastructure/queries/list-nomination-sessions.query.ts
@@ -5,14 +5,15 @@ import { dateOnlyJsonSchema, Magistrat, TypeDeSaisine } from 'shared-models';
 
 import { ListGdsNominationSessionsQueryDto } from '../dtos/nomination-session.dto';
 import { Prisma } from 'src/generated/prisma/client';
+import { findReportedSessionIds } from 'src/generated/prisma/sql';
 import { PrismaService } from 'src/modules/framework/database';
 import { createPaginatedZodDto, paginate, Pagination } from 'src/modules/framework/pagination';
 import { Sortable } from 'src/modules/framework/sorting';
 import { prismaFormationEnumToFormationEnum } from 'src/modules/shared/mappers/formation.mapper';
 import { prismaTypeDeSaisineEnumToTypeDeSaisine } from 'src/modules/shared/mappers/type-de-saisine-enum.mapper';
 import { DateOnly } from 'src/utils/date-only';
 
-const SESSION_STATUSES = ['TO_VALIDATE', 'READY'] as const;
+const SESSION_STATUSES = ['TO_VALIDATE', 'READY', 'REPORTED'] as const;
 type SessionStatus = (typeof SESSION_STATUSES)[number];
 
 @Injectable()
@@ -28,6 +29,7 @@ export class ListNominationSessionsQuery {
   }): Promise<ListedNominationSessionsDto> {
     const where: Prisma.SessionWhereInput = {
       deletedAt: null,
+      archivedAt: null,
       typeDeSaisine: query.typeDeSaisine,
       ...(query.formations?.length && {
         formation: { in: [...query.formations] },
@@ -38,16 +40,12 @@ export class ListNominationSessionsQuery {
     };
 
     const orderBy: Prisma.SessionOrderByWithRelationInput[] = query.sorting.sortBy
-      ? [
-          {
-            [query.sorting.sortBy]: query.sorting.sortDesc ? ('desc' as const) : ('asc' as const),
-          },
-        ]
+      ? [{ [query.sorting.sortBy]: query.sorting.sortDesc ? ('desc' as const) : ('asc' as const) }]
       : [{ date: 'desc' as const }, { createdAt: 'asc' as const }];
 
-    const [totalCount, sessions] = await this.prisma.$transaction([
-      this.prisma.session.count({ where }),
-      this.prisma.session.findMany({
+    const [totalCount, sessions, reportedIds] = await this.prisma.$transaction(async (tx) => {
+      const txCount = await tx.session.count({ where });
+      const txSessions = await tx.session.findMany({
         where,
         orderBy,
         skip: (query.pagination.page - 1) * query.pagination.limit,
@@ -61,8 +59,13 @@ export class ListNominationSessionsQuery {
           typeDeSaisine: true,
           isValidated: true,
         },
-      }),
-    ]);
+      });
+
+      const reportedRows = await tx.$queryRawTyped(findReportedSessionIds(txSessions.map((s) => s.id)));
+      const txReportedIds = new Set(reportedRows.map(({ id }) => id));
+
+      return [txCount, txSessions, txReportedIds];
+    });
 
     const items = sessions.map((s) => ({
       id: s.id,
@@ -71,14 +74,18 @@ export class ListNominationSessionsQuery {
       date: DateOnly.fromDate(s.date).toJson(),
       dueDate: s.dueDate ? DateOnly.fromDate(s.dueDate).toJson() : null,
       typeDeSaisine: prismaTypeDeSaisineEnumToTypeDeSaisine(s.typeDeSaisine),
-      status: ListNominationSessionsQuery.computeStatus(s),
+      status: ListNominationSessionsQuery.computeStatus(s, reportedIds),
     }));
 
     return paginate({ items, totalCount, pagination: query.pagination });
   }
 
-  private static computeStatus(session: { isValidated: boolean }): SessionStatus {
+  private static computeStatus(
+    session: { id: string; isValidated: boolean },
+    reportedIds: ReadonlySet<string>,
+  ): SessionStatus {
     if (!session.isValidated) return 'TO_VALIDATE';
+    if (reportedIds.has(session.id)) return 'REPORTED';
     return 'READY';
   }
 }
diff --git a/apps/client/src/components/reports/components/ReportList/ReportListPage.tsx b/apps/client/src/components/reports/components/ReportList/ReportListPage.tsx
@@ -7,7 +7,7 @@ import { generatePath, useParams } from 'react-router';
 
 import { PageContentLayout } from '../../../shared/PageContentLayout';
 import { useDataTable, useQueryDataTableState } from '@/components/shared/data-table';
-import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchivedSessionUpdater';
+import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchiveBannerPortal';
 import { ObservationLinks } from '@/components/shared/ObservationLinks';
 import { PriorityBadgeList } from '@/components/shared/priorities/PriorityBadge';
 import {
diff --git a/apps/client/src/components/reports/components/ReportOverview/ReportOverview.tsx b/apps/client/src/components/reports/components/ReportOverview/ReportOverview.tsx
@@ -8,7 +8,7 @@ import {
 } from '../../../../utils/transparences-breadcrumb.utils';
 import { Breadcrumb } from '../../../shared/Breadcrumb';
 import { ScrollToTop } from '../../../shared/ScrollToTop';
-import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchivedSessionUpdater';
+import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchiveBannerPortal';
 import type { ReportStatusEnum } from '@/types/enums.types';
 import {
   useAttachReportFilesMutation,
diff --git a/apps/client/src/components/secretariat-general/session/SessionStatusBadge.tsx b/apps/client/src/components/secretariat-general/session/SessionStatusBadge.tsx
@@ -1,13 +1,23 @@
+import { colors } from '@codegouvfr/react-dsfr';
 import Badge from '@codegouvfr/react-dsfr/Badge';
 
-export function SessionStatusBadge(props: { status: 'READY' | 'TO_VALIDATE' }) {
+const reportedBgColor = colors.decisions.artwork.background.purpleGlycine.default;
+const reportedTextColor = colors.decisions.text.actionHigh.purpleGlycine.default;
+
+export function SessionStatusBadge(props: { status: 'READY' | 'TO_VALIDATE' | 'REPORTED' }) {
   switch (props.status) {
     case 'TO_VALIDATE':
       return (
         <Badge small severity="new">
           NOUVEAU
         </Badge>
       );
+    case 'REPORTED':
+      return (
+        <Badge noIcon as="span" small style={{ color: reportedTextColor, background: reportedBgColor }}>
+          RESTITUÉE
+        </Badge>
+      );
     default:
       return (
         <Badge small severity="info" noIcon>
diff --git a/apps/client/src/components/secretariat-general/transparence/content/Transparence.tsx b/apps/client/src/components/secretariat-general/transparence/content/Transparence.tsx
@@ -4,7 +4,7 @@ import { useParams } from 'react-router';
 
 import { AlertsProvider } from '@/components/shared/alerts/AlertsProvider';
 import { Breadcrumb } from '@/components/shared/Breadcrumb';
-import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchivedSessionUpdater';
+import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchiveBannerPortal';
 import { NominationFilesTable } from '@/components/shared/nomination-files-table/NominationFilesTable';
 import type { BreadcrumbVM } from '@/models/breadcrumb-vm.model';
 import { ROUTE_PATHS } from '@/utils/route-path.utils';
diff --git a/apps/client/src/components/secretariat-general/transparence/content/tableau-de-bord/resume/TableauDeBordResume.tsx b/apps/client/src/components/secretariat-general/transparence/content/tableau-de-bord/resume/TableauDeBordResume.tsx
@@ -12,6 +12,7 @@ import { dateOnlyToDate } from '@/utils/date-only.util';
 import { ROUTE_PATHS } from '@/utils/route-path.utils';
 import type { DetailedNominationSessionDto } from '@api/types';
 import {
+  useArchiveNominationSessionMutation,
   useDeleteNominationSessionMutation,
   useListNominationFilesAsExcelMutation,
 } from '@queries/nomination-sessions.queries';
@@ -23,8 +24,34 @@ export const TableauDeBordResume = (transparence: DetailedNominationSessionDto)
   const navigate = useNavigate();
   const confirmation = useConfirmation();
 
-  const { mutate: exportAsExcel } = useListNominationFilesAsExcelMutation();
+  const exportAsExcelMutation = useListNominationFilesAsExcelMutation();
   const deleteSessionMutation = useDeleteNominationSessionMutation({ sessionId: transparence.id });
+  const archiveSessionMutation = useArchiveNominationSessionMutation({ sessionId: transparence.id });
+
+  const onArchive = React.useCallback(async () => {
+    const { isConfirmed } = await confirmation.waitForConfirmation({
+      title: `Confirmer l'archivage`,
+      content: (
+        <>
+          <p>
+            <FormattedMessage
+              defaultMessage={'Vous allez archiver la transparence «\u00A0{name}\u00A0».'}
+              values={{ name: transparence.name }}
+            />
+          </p>
+          <p>
+            <FormattedMessage defaultMessage={'Souhaitez-vous continuer\u00A0?'} />
+          </p>
+        </>
+      ),
+    });
+
+    if (!isConfirmed) return;
+
+    archiveSessionMutation.mutate(undefined, {
+      onSuccess: () => navigate(ROUTE_PATHS.SG.MANAGE_SESSION),
+    });
+  }, [confirmation, transparence.name, archiveSessionMutation, navigate]);
 
   const onDelete = React.useCallback(async () => {
     const { isConfirmed } = await confirmation.waitForConfirmation({
@@ -55,18 +82,21 @@ export const TableauDeBordResume = (transparence: DetailedNominationSessionDto)
     deleteSessionMutation.mutate(undefined, {
       onSuccess: () => navigate(ROUTE_PATHS.SG.MANAGE_SESSION),
     });
-  }, [confirmation, transparence, deleteSessionMutation, navigate]);
+  }, [confirmation, transparence.name, deleteSessionMutation, navigate]);
+
+  const isMutationPending =
+    deleteSessionMutation.isPending || archiveSessionMutation.isPending || exportAsExcelMutation.isPending;
 
   return (
     <div className="flex max-w-[63%] flex-col gap-y-2 px-2">
       <h1 className="mb-0 flex items-center justify-between gap-2">
         <span className="hyphens-auto">{transparence.name}</span>
-        <MenuRoot>
+        <MenuRoot disabled={isMutationPending}>
           <MenuTrigger
-            disabled={deleteSessionMutation.isPending}
-            iconId={deleteSessionMutation.isPending ? 'ri-loader-4-line' : 'ri-menu-fill'}
+            disabled={isMutationPending}
+            iconId={isMutationPending ? 'ri-loader-4-line' : 'ri-menu-fill'}
             className={clsx('shrink-0 grow-0 rounded-full', {
-              "before:animate-spin before:content-['']": deleteSessionMutation.isPending,
+              "before:animate-spin before:content-['']": isMutationPending,
             })}
             priority="tertiary no outline"
             title={`Actions sur la transparence "${transparence.name}"`}
@@ -84,6 +114,7 @@ export const TableauDeBordResume = (transparence: DetailedNominationSessionDto)
                   Éditer
                 </MenuItem>
                 <MenuItem
+                  disabled={isMutationPending}
                   iconId="fr-icon-file-add-line"
                   nativeButtonProps={importAttachments.modal.buttonProps}
                 >
@@ -92,17 +123,32 @@ export const TableauDeBordResume = (transparence: DetailedNominationSessionDto)
               </>
             )}
             <MenuItem
+              disabled={isMutationPending}
               iconId="ri-file-download-line"
               onClick={() => {
-                exportAsExcel({ sessionId: transparence.id });
+                exportAsExcelMutation.mutate({ sessionId: transparence.id });
               }}
             >
               Export .xlsx
             </MenuItem>
 
-            {transparence.isDeletable && (
+            {transparence.isArchivable && (
+              <MenuItem
+                disabled={isMutationPending}
+                nativeButtonProps={confirmation.buttonProps}
+                iconId={archiveSessionMutation.isPending ? 'ri-loader-4-fill' : 'fr-icon-archive-fill'}
+                onClick={onArchive}
+                className={clsx({
+                  "before:animate-spin before:content-['']": archiveSessionMutation.isPending,
+                })}
+              >
+                Archiver
+              </MenuItem>
+            )}
+
+            {!isArchived && transparence.isDeletable && (
               <MenuItem
-                disabled={deleteSessionMutation.isPending}
+                disabled={isMutationPending}
                 nativeButtonProps={confirmation.buttonProps}
                 iconId={deleteSessionMutation.isPending ? `ri-loader-4-fill` : 'ri-delete-bin-fill'}
                 onClick={onDelete}
diff --git a/apps/client/src/components/shared/layouts/archived-banner/ArchiveBannerPortal.tsx b/apps/client/src/components/shared/layouts/archived-banner/ArchiveBannerPortal.tsx
diff --git a/apps/client/src/generated/api/types.ts b/apps/client/src/generated/api/types.ts
@@ -260,7 +260,7 @@ export type ListedNominationSessionsDto = {
             day: number;
         } | null;
         typeDeSaisine: 'TRANSPARENCE_GDS';
-        status: 'TO_VALIDATE' | 'READY';
+        status: 'TO_VALIDATE' | 'READY' | 'REPORTED';
     }>;
     totalCount: number;
     currentPageIndex: number;
@@ -500,6 +500,7 @@ export type DetailedNominationSessionDto = {
     isValidated: boolean;
     isDeletable: boolean;
     isArchived: boolean;
+    isArchivable: boolean;
 };
 
 export type UpdateNominationSessionDto = {
diff --git a/apps/client/src/pages/secretariat-general/observations/ObservationDetailsPage.tsx b/apps/client/src/pages/secretariat-general/observations/ObservationDetailsPage.tsx
@@ -5,7 +5,7 @@ import { ObservationDetailsContent } from '../../../components/shared/Observatio
 import { PageContentLayout } from '../../../components/shared/PageContentLayout';
 import { getDetailSessionGdsPath, ROUTE_PATHS } from '../../../utils/route-path.utils';
 import type { FilesUploader } from '@/components/reports/components/ReportOverview/TipTapEditor/extensions/editor-file-uploader';
-import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchivedSessionUpdater';
+import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchiveBannerPortal';
 import { ObservationFollowUpCommentProvider } from '@/components/shared/observations/follow-up-selector/ObservationFollowUpCommentDialogProvider';
 import { useIsSgNavigation } from '@/hooks/roles.hook';
 import {
diff --git a/apps/client/src/pages/summary/SummaryPage.tsx b/apps/client/src/pages/summary/SummaryPage.tsx
@@ -1,7 +1,7 @@
 import { useParams } from 'react-router';
 
 import { AuthGuard } from '@/components/guards/AuthGuard';
-import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchivedSessionUpdater';
+import { ArchiveBannerPortal } from '@/components/shared/layouts/archived-banner/ArchiveBannerPortal';
 import { SummaryContainer } from '@/components/summary/components/SummaryContainer';
 import { Summary } from '@/components/summary/Summary';
 import { useVisibleSummarySections } from '@/components/summary/useVisibleSummarySections';
diff --git a/apps/client/src/queries/agenda.queries.ts b/apps/client/src/queries/agenda.queries.ts
@@ -6,6 +6,8 @@ import type { PlainDateOnly } from '@/utils/date-only.util';
 import * as $api from '@api/sdk';
 import type { FoundDocsMembersDto, FoundJusticeContactsDto } from '@api/types';
 
+import { sessionKeys } from './nomination-sessions.queries';
+
 export const agendaKeys = {
   findAgendaNominationFiles: (query: { sessionId: string; ignoreAgendaId?: string }) =>
     ['agenda', 'findAgendaNominationFiles', query.sessionId, query.ignoreAgendaId] as const,
@@ -288,6 +290,7 @@ export const useListSecretariesGeneralQuery = () =>
   });
 
 export function useCreateOfficialReportMutation() {
+  const queryClient = useQueryClient();
   return useMutation({
     mutationFn: (command: {
       sessionId: string;
@@ -317,6 +320,10 @@ export function useCreateOfficialReportMutation() {
           },
         })
         .then(({ data }) => data!),
+    onSuccess(_, { sessionId }) {
+      queryClient.invalidateQueries({ queryKey: agendaKeys.findSessionDocs(sessionId) });
+      queryClient.invalidateQueries({ queryKey: sessionKeys.detailSession({ sessionId }) });
+    },
   });
 }
 
@@ -450,6 +457,7 @@ export function useUpdateOfficialReportMutation(sessionId: string) {
 
     onSuccess: (_, { officialReportId }) => {
       queryClient.invalidateQueries({ queryKey: agendaKeys.findSessionDocs(sessionId) });
+      queryClient.invalidateQueries({ queryKey: sessionKeys.detailSession({ sessionId }) });
       queryClient.invalidateQueries({ queryKey: officialReportKeys.details(officialReportId) });
     },
   });
diff --git a/apps/client/src/queries/nomination-sessions.queries.ts b/apps/client/src/queries/nomination-sessions.queries.ts
