Move models from fiches to plans/fiches

app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/Indicateur/detail/useIndicateurServices.ts

@@ -1,7 +1,7 @@
 import { Indicateurs } from '@/api';
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
 /** Met à jour les services pilotes d'un indicateur */
@@ -20,7 +20,7 @@ export const useUpsertIndicateurServices = (indicateurId: number) => {
         services
       );
     },
-    onSuccess: (data, variables) => {
+    onSuccess: () => {
       // recharge les infos complémentaires associées à l'indicateur
       queryClient.invalidateQueries([
         'indicateur_services',

app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/lists/IndicateurCard/IndicateurCardEdit/IndicateurCardEditModal.tsx

@@ -3,7 +3,8 @@ import { useUpdateIndicateurCard } from '@/app/app/pages/collectivite/Indicateur
 import PersonnesDropdown from '@/app/ui/dropdownLists/PersonnesDropdown/PersonnesDropdown';
 import ServicesPilotesDropdown from '@/app/ui/dropdownLists/ServicesPilotesDropdown/ServicesPilotesDropdown';
 import ThematiquesDropdown from '@/app/ui/dropdownLists/ThematiquesDropdown/ThematiquesDropdown';
-import { Tag, Thematique } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
+import { Thematique } from '@/backend/shared';
 import { Field, Modal, ModalFooterOKCancel } from '@/ui';
 import { OpenState } from '@/ui/utils/types';
 import { useEffect, useState } from 'react';

app.territoiresentransitions.react/src/app/pages/collectivite/Indicateurs/lists/IndicateurCard/IndicateurCardEdit/useUpdateIndicateurCard.ts

@@ -2,7 +2,8 @@ import { Indicateurs } from '@/api';
 import { Personne } from '@/api/collectivites';
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag, Thematique } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
+import { Thematique } from '@/backend/shared';
 import { useMutation } from 'react-query';
 
 /** Met à jour les pilotes, les services pilotes, les thématique d'un indicateur */

app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/ActionsGroupees/EditionTagsLibres.tsx

@@ -1,6 +1,6 @@
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
 import TagsSuiviPersoDropdown from '@/app/ui/dropdownLists/TagsSuiviPersoDropdown/TagsSuiviPersoDropdown';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { Button, Field, useEventTracker } from '@/ui';
 import { OpenState } from '@/ui/utils/types';
 import { useState } from 'react';

app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Budget/FinanceursInput.tsx

@@ -1,12 +1,12 @@
 import FinanceursDropdown from '@/app/ui/dropdownLists/FinanceursDropdown/FinanceursDropdown';
-import { Financeur } from '@/backend/plans/fiches';
+import { Financeur, FinanceurUpdate } from '@/backend/plans/fiches';
 import { Button, Field, Input } from '@/ui';
 
 type FinanceurPartial = Omit<Financeur, 'id' | 'ficheId' | 'financeurTagId'>;
 
 type FinanceursInputProps = {
-  financeurs: FinanceurPartial[] | null | undefined;
-  onUpdate: (financeurs: FinanceurPartial[]) => void;
+  financeurs: FinanceurUpdate[] | null | undefined;
+  onUpdate: (financeurs: FinanceurUpdate[]) => void;
 };
 
 const FinanceursInput = ({ financeurs, onUpdate }: FinanceursInputProps) => {
@@ -82,7 +82,12 @@ const FinanceursInput = ({ financeurs, onUpdate }: FinanceursInputProps) => {
               selectedFinanceur &&
               onUpdate([
                 ...(financeurs ?? []),
-                { financeurTag: selectedFinanceur, montantTtc: null },
+                {
+                  financeurTag: selectedFinanceur,
+                  financeurTagId: selectedFinanceur.id,
+                  ficheId: financeurs?.[0].ficheId ?? 0,
+                  montantTtc: null,
+                },
               ])
             }
           />

app.territoiresentransitions.react/src/app/pages/collectivite/PlansActions/FicheAction/Budget/FinanceursListe.tsx

@@ -1,9 +1,9 @@
 import { getFormattedNumber } from '@/app/utils/formatUtils';
-import { Financeur } from '@/backend/plans/fiches';
+import { FinanceurUpdate } from '@/backend/plans/fiches';
 import { Badge } from '@/ui';
 
 type FinanceursListeProps = {
-  financeurs?: Financeur[];
+  financeurs?: FinanceurUpdate[];
 };
 
 const FinanceursListe = ({ financeurs }: FinanceursListeProps) => {

app.territoiresentransitions.react/src/ui/dropdownLists/FinanceursDropdown/FinanceursDropdown.tsx

@@ -1,4 +1,4 @@
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { SelectMultipleProps } from '@/ui';
 import SelectTags from '../tags/SelectTags';
 import { useFinanceursListe } from './useFinanceursListe';

app.territoiresentransitions.react/src/ui/dropdownLists/FinanceursDropdown/useFinanceursListe.ts

@@ -1,6 +1,6 @@
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { useQuery } from 'react-query';
 import { objectToCamel } from 'ts-case-convert';
 

app.territoiresentransitions.react/src/ui/dropdownLists/PartenairesDropdown/PartenairesDropdown.tsx

@@ -1,4 +1,4 @@
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { SelectMultipleProps } from '@/ui';
 import SelectTags from '../tags/SelectTags';
 import { usePartenairesListe } from './usePartenairesListe';

app.territoiresentransitions.react/src/ui/dropdownLists/PartenairesDropdown/usePartenairesListe.ts

@@ -1,6 +1,6 @@
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { useQuery } from 'react-query';
 import { objectToCamel } from 'ts-case-convert';
 

app.territoiresentransitions.react/src/ui/dropdownLists/ServicesPilotesDropdown/ServicesPilotesDropdown.tsx

@@ -1,4 +1,4 @@
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { SelectMultipleProps } from '@/ui';
 import SelectTags from '../tags/SelectTags';
 import { useServicesPilotesListe } from './useServicesPilotesListe';

app.territoiresentransitions.react/src/ui/dropdownLists/ServicesPilotesDropdown/useServicesPilotesListe.ts

@@ -1,6 +1,6 @@
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { useQuery } from 'react-query';
 import { objectToCamel } from 'ts-case-convert';
 

app.territoiresentransitions.react/src/ui/dropdownLists/StructuresDropdown/StructuresDropdown.tsx

@@ -1,4 +1,4 @@
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { SelectMultipleProps } from '@/ui';
 import SelectTags from '../tags/SelectTags';
 import { useStructuresListe } from './useStructuresListe';

app.territoiresentransitions.react/src/ui/dropdownLists/StructuresDropdown/useStructuresListe.ts

@@ -1,6 +1,6 @@
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { useQuery } from 'react-query';
 import { objectToCamel } from 'ts-case-convert';
 

app.territoiresentransitions.react/src/ui/dropdownLists/TagsSuiviPersoDropdown/TagsSuiviPersoDropdown.tsx

@@ -1,4 +1,4 @@
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { SelectMultipleProps } from '@/ui';
 import SelectTags from '../tags/SelectTags';
 import { useTagsSuiviPersoListe } from './useTagsSuiviPersoListe';

app.territoiresentransitions.react/src/ui/dropdownLists/TagsSuiviPersoDropdown/useTagsSuiviPersoListe.ts

@@ -1,6 +1,6 @@
 import { supabaseClient } from '@/app/core-logic/api/supabase';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { useQuery } from 'react-query';
 import { objectToCamel } from 'ts-case-convert';
 

app.territoiresentransitions.react/src/ui/dropdownLists/tags/SelectTags.tsx

@@ -1,6 +1,6 @@
 import { TableTag } from '@/api';
 import { useCollectiviteId } from '@/app/core-logic/hooks/params';
-import { Tag } from '@/backend/shared';
+import { Tag } from '@/backend/collectivites';
 import { Option, OptionValue, SelectFilter, SelectMultipleProps } from '@/ui';
 import { useEffect } from 'react';
 import { QueryKey } from 'react-query';

app.territoiresentransitions.react/src/ui/dropdownLists/tags/useTagCreate.ts

@@ -1,6 +1,6 @@
 import { CollectiviteTag, TableTag } from '@/api';
 import { supabaseClient } from '@/app/core-logic/api/supabase';
-import { TagInsert } from '@/backend/shared';
+import { TagInsert } from '@/backend/collectivites';
 import { QueryKey, useMutation, useQueryClient } from 'react-query';
 import { objectToSnake } from 'ts-case-convert';
 

app.territoiresentransitions.react/src/ui/dropdownLists/tags/useTagUpdate.ts

@@ -1,6 +1,6 @@
 import { TableTag } from '@/api';
 import { supabaseClient } from '@/app/core-logic/api/supabase';
-import { TagUpdate } from '@/backend/shared';
+import { TagUpdate } from '@/backend/collectivites';
 import { QueryKey, useMutation, useQueryClient } from 'react-query';
 import { objectToSnake } from 'ts-case-convert';
 

backend/src/auth/models/dcp.table.ts

@@ -6,6 +6,7 @@ import {
   uuid,
   varchar,
 } from 'drizzle-orm/pg-core';
+import { createSelectSchema } from 'drizzle-zod';
 import { createdAt, modifiedAt } from '../../utils/column.utils';
 
 export const dcpTable = pgTable('dcp', {
@@ -23,3 +24,12 @@ export const dcpTable = pgTable('dcp', {
     mode: 'string',
   }),
 });
+
+export const dcpSchema = createSelectSchema(dcpTable);
+
+export const authorSchema = dcpSchema.pick({
+  userId: true,
+  nom: true,
+  prenom: true,
+  email: true,
+});

backend/src/collectivites/index.ts

@@ -0,0 +1,7 @@
+export * from './shared/models/financeur-tag.table';
+export * from './shared/models/libre-tag.table';
+export * from './shared/models/partenaire-tag.table';
+export * from './shared/models/personne-tag.table';
+export * from './shared/models/service-tag.table';
+export * from './shared/models/structure-tag.table';
+export * from './shared/models/tag.table-base';

backend/src/collectivites/services/personnes.service.ts

@@ -1,6 +1,6 @@
 import { dcpTable, utilisateurDroitTable } from '@/backend/auth';
+import { personneTagTable } from '@/backend/collectivites/shared/models/personne-tag.table';
 import { DatabaseService } from '@/backend/common';
-import { personneTagTable } from '@/backend/taxonomie/models/personne-tag.table';
 import { Injectable } from '@nestjs/common';
 import { and, eq, sql } from 'drizzle-orm';
 import { union } from 'drizzle-orm/pg-core';

backend/src/shared/models/libre-tag.table.ts → backend/src/collectivites/shared/models/libre-tag.table.ts

@@ -1,7 +1,7 @@
 import { pgTable, uniqueIndex } from 'drizzle-orm/pg-core';
 import { createSelectSchema } from 'drizzle-zod';
 import z from 'zod';
-import { createdAt, createdBy } from '../../utils/column.utils';
+import { createdAt, createdBy } from '../../../utils/column.utils';
 import { tagTableBase } from './tag.table-base';
 
 export const libreTagTable = pgTable(

backend/src/shared/models/partenaire-tag.table.ts → backend/src/collectivites/shared/models/partenaire-tag.table.ts

@@ -1,6 +1,6 @@
 import { pgTable, uniqueIndex } from 'drizzle-orm/pg-core';
 import { createSelectSchema } from 'drizzle-zod';
-import { tagTableBase } from '../../shared/models/tag.table-base';
+import { tagTableBase } from './tag.table-base';
 
 export const partenaireTagTable = pgTable(
   'partenaire_tag',

backend/src/taxonomie/models/personne-tag.table.ts → backend/src/collectivites/shared/models/personne-tag.table.ts

@@ -1,5 +1,7 @@
 import { pgTable, uniqueIndex } from 'drizzle-orm/pg-core';
-import { tagTableBase } from '../../shared/models/tag.table-base';
+import { createSelectSchema } from 'drizzle-zod';
+import z from 'zod';
+import { tagTableBase } from './tag.table-base';
 
 export const personneTagTable = pgTable(
   'personne_tag',
@@ -12,3 +14,6 @@ export const personneTagTable = pgTable(
     };
   }
 );
+
+export const personneTagSchema = createSelectSchema(personneTagTable);
+export type PersonneTag = z.infer<typeof personneTagSchema>;

backend/src/shared/models/service-tag.table.ts → backend/src/collectivites/shared/models/service-tag.table.ts

@@ -1,6 +1,6 @@
 import { pgTable, uniqueIndex } from 'drizzle-orm/pg-core';
 import { createSelectSchema } from 'drizzle-zod';
-import { tagTableBase } from '../../shared/models/tag.table-base';
+import { tagTableBase } from './tag.table-base';
 
 export const serviceTagTable = pgTable('service_tag', tagTableBase, (table) => {
   return {

backend/src/shared/models/structure-tag.table.ts → backend/src/collectivites/shared/models/structure-tag.table.ts

@@ -1,6 +1,6 @@
 import { pgTable, uniqueIndex } from 'drizzle-orm/pg-core';
 import { createSelectSchema } from 'drizzle-zod';
-import { tagTableBase } from '../../shared/models/tag.table-base';
+import { tagTableBase } from './tag.table-base';
 
 export const structureTagTable = pgTable(
   'structure_tag',

backend/src/shared/models/tag.table-base.ts → backend/src/collectivites/shared/models/tag.table-base.ts

@@ -1,6 +1,6 @@
 import { integer, serial, text } from 'drizzle-orm/pg-core';
 import z from 'zod';
-import { collectiviteTable } from '../../collectivites/models/collectivite.table';
+import { collectiviteTable } from '../../models/collectivite.table';
 
 export type TagType =
   | 'personne'

backend/src/fiches/bulk-edit/bulk-edit.service.ts

@@ -1,16 +1,16 @@
 import { AuthUser } from '@/backend/auth/models/auth.models';
 import { NiveauAcces } from '@/backend/auth/models/niveau-acces.enum';
 import { DatabaseService } from '@/backend/common';
+import { ficheActionLibreTagTable } from '@/backend/plans/fiches';
 import { Injectable } from '@nestjs/common';
 import { and, inArray, or } from 'drizzle-orm';
 import z from 'zod';
 import { AuthService } from '../../auth/services/auth.service';
+import { ficheActionPiloteTable } from '../../plans/fiches/shared/models/fiche-action-pilote.table';
 import {
   ficheActionSchema,
   ficheActionTable,
 } from '../../plans/fiches/shared/models/fiche-action.table';
-import { ficheActionLibreTagTable } from '../models/fiche-action-libre-tag.table';
-import { ficheActionPiloteTable } from '../models/fiche-action-pilote.table';
 import { updateFicheActionRequestSchema } from '../models/update-fiche-action.request';
 
 @Injectable()

backend/src/fiches/controllers/fiches-action.controller.ts

@@ -1,3 +1,4 @@
+import { ficheActionNoteSchema } from '@/backend/plans/fiches';
 import { createZodDto } from '@anatine/zod-nestjs';
 import {
   Body,
@@ -12,17 +13,16 @@ import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
 import { z } from 'zod';
 import { TokenInfo } from '../../auth/decorators/token-info.decorators';
 import type { AuthenticatedUser } from '../../auth/models/auth.models';
+import FicheService from '../../plans/fiches/fiche.service';
+import FichesActionUpdateService from '../../plans/fiches/fiches-action-update.service';
 import { CountByStatutService } from '../count-by-statut/count-by-statut.service';
-import { ficheActionNoteSchema } from '../models/fiche-action-note.table';
 import { getFichesActionSyntheseSchema } from '../models/get-fiches-action-synthese.response';
 import { getFichesActionFilterRequestSchema } from '../models/get-fiches-actions-filter.request';
 import { updateFicheActionRequestSchema } from '../models/update-fiche-action.request';
 import {
   deleteFicheActionNotesRequestSchema,
   upsertFicheActionNotesRequestSchema,
 } from '../models/upsert-fiche-action-note.request';
-import FicheService from '../services/fiche.service';
-import FichesActionUpdateService from '../services/fiches-action-update.service';
 
 /**
  * Création des classes de réponse à partir du schema pour générer automatiquement la documentation OpenAPI

backend/src/fiches/count-by-statut/count-by-statut.service.ts

@@ -1,3 +1,7 @@
+import {
+  ficheActionPartenaireTagTable,
+  ficheActionServiceTagTable,
+} from '@/backend/plans/fiches';
 import { Injectable, Logger } from '@nestjs/common';
 import {
   and,
@@ -18,14 +22,12 @@ import { getModifiedSinceDate } from '../../common/models/modified-since.enum';
 import DatabaseService from '../../common/services/database.service';
 import { axeTable } from '../../plans/fiches/shared/models/axe.table';
 import { ficheActionAxeTable } from '../../plans/fiches/shared/models/fiche-action-axe.table';
+import { ficheActionPiloteTable } from '../../plans/fiches/shared/models/fiche-action-pilote.table';
 import {
   ficheActionTable,
   SANS_STATUT_FICHE_ACTION_SYNTHESE_KEY,
   statutsEnumValues,
 } from '../../plans/fiches/shared/models/fiche-action.table';
-import { ficheActionPartenaireTagTable } from '../models/fiche-action-partenaire-tag.table';
-import { ficheActionPiloteTable } from '../models/fiche-action-pilote.table';
-import { ficheActionServiceTagTable } from '../models/fiche-action-service.table';
 import { GetFichesActionFilterRequestType } from '../models/get-fiches-actions-filter.request';
 
 @Injectable()

backend/src/fiches/fiche-action-etape/fiche-action-etape.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { and, eq, gt, gte, lt, lte, sql } from 'drizzle-orm';
 import { AuthenticatedUser } from '../../auth/models/auth.models';
 import DatabaseService from '../../common/services/database.service';
-import FicheService from '../services/fiche.service';
+import FicheService from '../../plans/fiches/fiche.service';
 import {
   ficheActionEtapeTable,
   FicheActionEtapeType,

backend/src/fiches/fiches-action.module.ts

@@ -2,6 +2,8 @@ import { Module } from '@nestjs/common';
 import { AuthModule } from '../auth/auth.module';
 import { CollectivitesModule } from '../collectivites/collectivites.module';
 import { CommonModule } from '../common/common.module';
+import FicheService from '../plans/fiches/fiche.service';
+import FichesActionUpdateService from '../plans/fiches/fiches-action-update.service';
 import TagService from '../taxonomie/services/tag.service';
 import { BulkEditRouter } from './bulk-edit/bulk-edit.router';
 import { BulkEditService } from './bulk-edit/bulk-edit.service';
@@ -10,8 +12,6 @@ import { CountByStatutRouter } from './count-by-statut/count-by-statut.router';
 import { CountByStatutService } from './count-by-statut/count-by-statut.service';
 import { FicheActionEtapeRouter } from './fiche-action-etape/fiche-action-etape.router';
 import { FicheActionEtapeService } from './fiche-action-etape/fiche-action-etape.service';
-import FicheService from './services/fiche.service';
-import FichesActionUpdateService from './services/fiches-action-update.service';
 
 @Module({
   imports: [CommonModule, AuthModule, CollectivitesModule],