feat(#214): migration Agenda B0 — lots, soft-cancel, prefs

Ajoute agenda_lots versionnés, colonnes soft-cancel / heure / id_lot
sur evenements_agenda, soft-cancel + remonte_le sur card_instances,
revision_lot sur card_responses, preferences JSONB utilisateurs.
Met à jour BDD.sql, ENUMS, verify.sql et entités TypeORM.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-10-16 16:16:34 +02:00
co-authored by Cursor
parent 38af471054
commit d84cc7e13e
9 changed files with 416 additions and 9 deletions
@@ -0,0 +1,87 @@
import {
Column,
CreateDateColumn,
Entity,
JoinColumn,
ManyToOne,
PrimaryGeneratedColumn,
UpdateDateColumn,
} from 'typeorm';
import { Users } from './users.entity';
/** Aligné sur type_evenement_agenda_type (évite import circulaire avec EvenementsAgenda). */
export enum AgendaLotTypeType {
ABSENCE_ENFANT = 'absence_enfant',
CONGE_AM = 'conge_am',
ARRET_MALADIE_AM = 'arret_maladie_am',
SOIN_ENFANT = 'soin_enfant',
}
export enum AgendaLotStatutType {
EN_ATTENTE = 'en_attente',
ACCEPTE = 'accepte',
REFUSE = 'refuse',
ANNULE = 'annule',
}
/**
* Lot collectif Agenda (congé / arrêt / absence groupés) — cycle versionné.
* Ticket #214 (B0).
*/
@Entity('agenda_lots', { schema: 'public' })
export class AgendaLots {
@PrimaryGeneratedColumn('uuid')
id: string;
@Column({
type: 'enum',
enum: AgendaLotTypeType,
enumName: 'type_evenement_agenda_type',
name: 'type',
})
type: AgendaLotTypeType;
@Column({
type: 'enum',
enum: AgendaLotStatutType,
enumName: 'agenda_lot_statut_type',
name: 'statut',
default: AgendaLotStatutType.EN_ATTENTE,
})
statut: AgendaLotStatutType;
@Column({ name: 'revision', type: 'int', default: 1 })
revision: number;
@Column({ name: 'soumis_le', type: 'timestamptz', default: () => 'now()' })
soumis_le: Date;
@Column({ name: 'verrouille_le', type: 'timestamptz', nullable: true })
verrouille_le?: Date;
@Column({ name: 'refuse_le', type: 'timestamptz', nullable: true })
refuse_le?: Date;
@Column({ name: 'annule_le', type: 'timestamptz', nullable: true })
annule_le?: Date;
@Column({ name: 'annule_par', type: 'uuid', nullable: true })
annule_par?: string;
@ManyToOne(() => Users, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'annule_par', referencedColumnName: 'id' })
annulePar?: Users;
@Column({ name: 'cree_par', type: 'uuid', nullable: true })
cree_par?: string;
@ManyToOne(() => Users, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'cree_par', referencedColumnName: 'id' })
createdBy?: Users;
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
cree_le: Date;
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
modifie_le: Date;
}
@@ -14,16 +14,19 @@ import { Users } from './users.entity';
import { CardType } from './card_types.entity';
import { CardAudienceMember } from './card_audience_members.entity';
import { CardResponse } from './card_responses.entity';
import { AgendaLots } from './agenda_lots.entity';
export enum CardInstanceStatutType {
OUVERTE = 'ouverte',
REFUSEE = 'refusee',
TRAITEE = 'traitee',
ANNULEE = 'annulee',
}
export enum CardOperationType {
CREATE = 'create',
UPDATE = 'update',
CANCEL = 'cancel',
}
@Entity('card_instances', { schema: 'public' })
@@ -83,6 +86,27 @@ export class CardInstance {
@Column({ name: 'purge_at', type: 'timestamptz' })
purge_at: Date;
@Column({ name: 'id_lot', type: 'uuid', nullable: true })
id_lot?: string;
@ManyToOne(() => AgendaLots, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'id_lot', referencedColumnName: 'id' })
lot?: AgendaLots;
@Column({ name: 'annule_le', type: 'timestamptz', nullable: true })
annule_le?: Date;
@Column({ name: 'annule_par', type: 'uuid', nullable: true })
annule_par?: string;
@ManyToOne(() => Users, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'annule_par', referencedColumnName: 'id' })
annulePar?: Users;
/** Réanimation dans le fil (tri COALESCE(remonte_le, cree_le)). */
@Column({ name: 'remonte_le', type: 'timestamptz', nullable: true })
remonte_le?: Date;
@OneToMany(() => CardAudienceMember, (m) => m.card)
audience: CardAudienceMember[];
@@ -47,6 +47,10 @@ export class CardResponse {
@Column({ name: 'comment', type: 'text', nullable: true })
comment?: string;
/** Doit matcher agenda_lots.revision pour compter dans l'unanimité (#214). */
@Column({ name: 'revision_lot', type: 'int', default: 1 })
revision_lot: number;
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
cree_le: Date;
}
@@ -9,6 +9,7 @@ import {
} from 'typeorm';
import { AmChildren } from './am_children.entity';
import { Users } from './users.entity';
import { AgendaLots } from './agenda_lots.entity';
export enum TypeEvenementAgendaType {
ABSENCE_ENFANT = 'absence_enfant',
@@ -21,12 +22,13 @@ export enum StatutEvenementAgendaType {
EN_ATTENTE = 'en_attente',
ACCEPTE = 'accepte',
REFUSE = 'refuse',
ANNULE = 'annule',
}
/**
* Vérité métier agenda par couple AM↔enfant (placement).
* Types V1 : absences / congés / arrêts ; extensible (soins, école, mairie…).
* Les cartes collectent ; cette table historise. Ticket #205.
* Les cartes collectent ; cette table historise. Tickets #205 / #214.
*/
@Entity('evenements_agenda', { schema: 'public' })
export class EvenementsAgenda {
@@ -74,13 +76,40 @@ export class EvenementsAgenda {
@JoinColumn({ name: 'cree_par', referencedColumnName: 'id' })
createdBy?: Users;
/** Réf. carte de collecte (FK quand module Cartes existera). */
/** Réf. carte de collecte (module Cartes). */
@Column({ name: 'id_card_instance', type: 'uuid', nullable: true })
id_card_instance?: string;
@Column({ name: 'motif', type: 'text', nullable: true })
motif?: string;
/** Heure métier (soin) — durable hors payload carte. */
@Column({ name: 'heure', type: 'time', nullable: true })
heure?: string;
@Column({ name: 'id_lot', type: 'uuid', nullable: true })
id_lot?: string;
@ManyToOne(() => AgendaLots, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'id_lot', referencedColumnName: 'id' })
lot?: AgendaLots;
@Column({ name: 'verrouille_le', type: 'timestamptz', nullable: true })
verrouille_le?: Date;
@Column({ name: 'refuse_le', type: 'timestamptz', nullable: true })
refuse_le?: Date;
@Column({ name: 'annule_le', type: 'timestamptz', nullable: true })
annule_le?: Date;
@Column({ name: 'annule_par', type: 'uuid', nullable: true })
annule_par?: string;
@ManyToOne(() => Users, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'annule_par', referencedColumnName: 'id' })
annulePar?: Users;
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
cree_le: Date;
+4
View File
@@ -177,6 +177,10 @@ export class Users {
@Column({ nullable: true, name: 'numero_dossier', length: 20 })
numero_dossier?: string;
/** Préférences UI (ex. jours_affiches_semaine) — #214 */
@Column({ name: 'preferences', type: 'jsonb', default: {} })
preferences: Record<string, unknown>;
@ManyToOne(() => Relais, relais => relais.gestionnaires, { nullable: true })
@JoinColumn({ name: 'relais_id' })
relais?: Relais;