Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8829e8c4f9 | ||
|
|
c784de8198 | ||
|
|
147051821a | ||
|
|
41f7006073 | ||
|
|
8d8627cf38 | ||
|
|
6a586110e7 |
@@ -16,6 +16,8 @@ import { AllExceptionsFilter } from './common/filters/all_exceptions.filters';
|
|||||||
import { EnfantsModule } from './routes/enfants/enfants.module';
|
import { EnfantsModule } from './routes/enfants/enfants.module';
|
||||||
import { AppConfigModule } from './modules/config/config.module';
|
import { AppConfigModule } from './modules/config/config.module';
|
||||||
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
||||||
|
import { AbsencesGardeModule } from './modules/absences-garde';
|
||||||
|
import { CardsModule } from './modules/cards';
|
||||||
import { RelaisModule } from './routes/relais/relais.module';
|
import { RelaisModule } from './routes/relais/relais.module';
|
||||||
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
||||||
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||||
@@ -56,6 +58,8 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
|||||||
AuthModule,
|
AuthModule,
|
||||||
AppConfigModule,
|
AppConfigModule,
|
||||||
DocumentsLegauxModule,
|
DocumentsLegauxModule,
|
||||||
|
AbsencesGardeModule,
|
||||||
|
CardsModule,
|
||||||
RelaisModule,
|
RelaisModule,
|
||||||
DossiersModule,
|
DossiersModule,
|
||||||
SuppressionsModule,
|
SuppressionsModule,
|
||||||
|
|||||||
@@ -0,0 +1,88 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
UpdateDateColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { AmChildren } from './am_children.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
|
export enum TypeAbsenceGardeType {
|
||||||
|
ABSENCE_ENFANT = 'absence_enfant',
|
||||||
|
CONGE_AM = 'conge_am',
|
||||||
|
ARRET_MALADIE_AM = 'arret_maladie_am',
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum StatutAbsenceGardeType {
|
||||||
|
EN_ATTENTE = 'en_attente',
|
||||||
|
ACCEPTE = 'accepte',
|
||||||
|
REFUSE = 'refuse',
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Vérité métier des absences / congés / arrêts par couple AM↔enfant.
|
||||||
|
* Les cartes (module ultérieur) collectent ; cette table stocke.
|
||||||
|
* Ticket #193.
|
||||||
|
*/
|
||||||
|
@Entity('absences_garde', { schema: 'public' })
|
||||||
|
export class AbsencesGarde {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'id_placement', type: 'uuid' })
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AmChildren, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_placement', referencedColumnName: 'id' })
|
||||||
|
placement: AmChildren;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: TypeAbsenceGardeType,
|
||||||
|
enumName: 'type_absence_garde_type',
|
||||||
|
name: 'type',
|
||||||
|
})
|
||||||
|
type: TypeAbsenceGardeType;
|
||||||
|
|
||||||
|
@Column({ name: 'date_debut', type: 'date' })
|
||||||
|
date_debut: string;
|
||||||
|
|
||||||
|
@Column({ name: 'date_fin', type: 'date' })
|
||||||
|
date_fin: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: StatutAbsenceGardeType,
|
||||||
|
enumName: 'statut_absence_garde_type',
|
||||||
|
name: 'statut',
|
||||||
|
default: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
})
|
||||||
|
statut: StatutAbsenceGardeType;
|
||||||
|
|
||||||
|
/** Purge auto pour en_attente/refuse ; accepte → infinity. */
|
||||||
|
@Column({ name: 'expire_at', type: 'timestamptz' })
|
||||||
|
expire_at: Date;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
|
||||||
|
/** Réf. carte de collecte (FK quand module Cartes existera). */
|
||||||
|
@Column({ name: 'id_card_instance', type: 'uuid', nullable: true })
|
||||||
|
id_card_instance?: string;
|
||||||
|
|
||||||
|
@Column({ name: 'motif', type: 'text', nullable: true })
|
||||||
|
motif?: string;
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||||
|
modifie_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { CardInstance } from './card_instances.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
|
@Entity('card_audience_members', { schema: 'public' })
|
||||||
|
export class CardAudienceMember {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'id_card', type: 'uuid' })
|
||||||
|
id_card: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardInstance, (c) => c.audience, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_card', referencedColumnName: 'id' })
|
||||||
|
card: CardInstance;
|
||||||
|
|
||||||
|
@Column({ name: 'id_utilisateur', type: 'uuid' })
|
||||||
|
id_utilisateur: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => Users, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_utilisateur', referencedColumnName: 'id' })
|
||||||
|
user: Users;
|
||||||
|
|
||||||
|
@Column({ name: 'role_snapshot', type: 'varchar', length: 64 })
|
||||||
|
role_snapshot: string;
|
||||||
|
|
||||||
|
@Column({ name: 'is_creator', type: 'boolean', default: false })
|
||||||
|
is_creator: boolean;
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
OneToMany,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
UpdateDateColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { AmChildren } from './am_children.entity';
|
||||||
|
import { AbsencesGarde } from './absences_garde.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
import { CardType } from './card_types.entity';
|
||||||
|
import { CardAudienceMember } from './card_audience_members.entity';
|
||||||
|
import { CardResponse } from './card_responses.entity';
|
||||||
|
|
||||||
|
export enum CardInstanceStatutType {
|
||||||
|
OUVERTE = 'ouverte',
|
||||||
|
REFUSEE = 'refusee',
|
||||||
|
TRAITEE = 'traitee',
|
||||||
|
}
|
||||||
|
|
||||||
|
export enum CardOperationType {
|
||||||
|
CREATE = 'create',
|
||||||
|
UPDATE = 'update',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_instances', { schema: 'public' })
|
||||||
|
export class CardInstance {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'type_code', type: 'varchar', length: 64 })
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardType, { onDelete: 'RESTRICT' })
|
||||||
|
@JoinColumn({ name: 'type_code', referencedColumnName: 'code' })
|
||||||
|
type: CardType;
|
||||||
|
|
||||||
|
@Column({ name: 'id_placement', type: 'uuid' })
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AmChildren, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_placement', referencedColumnName: 'id' })
|
||||||
|
placement: AmChildren;
|
||||||
|
|
||||||
|
@Column({ name: 'id_absence', type: 'uuid', nullable: true })
|
||||||
|
id_absence?: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => AbsencesGarde, { nullable: true, onDelete: 'SET NULL' })
|
||||||
|
@JoinColumn({ name: 'id_absence', referencedColumnName: 'id' })
|
||||||
|
absence?: AbsencesGarde;
|
||||||
|
|
||||||
|
@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;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardOperationType,
|
||||||
|
enumName: 'card_operation_type',
|
||||||
|
name: 'operation',
|
||||||
|
default: CardOperationType.CREATE,
|
||||||
|
})
|
||||||
|
operation: CardOperationType;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardInstanceStatutType,
|
||||||
|
enumName: 'card_instance_statut_type',
|
||||||
|
name: 'statut',
|
||||||
|
default: CardInstanceStatutType.OUVERTE,
|
||||||
|
})
|
||||||
|
statut: CardInstanceStatutType;
|
||||||
|
|
||||||
|
@Column({ name: 'payload', type: 'jsonb', default: {} })
|
||||||
|
payload: Record<string, unknown>;
|
||||||
|
|
||||||
|
@Column({ name: 'purge_at', type: 'timestamptz' })
|
||||||
|
purge_at: Date;
|
||||||
|
|
||||||
|
@OneToMany(() => CardAudienceMember, (m) => m.card)
|
||||||
|
audience: CardAudienceMember[];
|
||||||
|
|
||||||
|
@OneToMany(() => CardResponse, (r) => r.card)
|
||||||
|
responses: CardResponse[];
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||||
|
modifie_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
JoinColumn,
|
||||||
|
ManyToOne,
|
||||||
|
PrimaryGeneratedColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
import { CardInstance } from './card_instances.entity';
|
||||||
|
import { Users } from './users.entity';
|
||||||
|
|
||||||
|
export enum CardResponseActionType {
|
||||||
|
ACCEPT = 'accept',
|
||||||
|
REFUSE = 'refuse',
|
||||||
|
ACK = 'ack',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_responses', { schema: 'public' })
|
||||||
|
export class CardResponse {
|
||||||
|
@PrimaryGeneratedColumn('uuid')
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@Column({ name: 'id_card', type: 'uuid' })
|
||||||
|
id_card: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => CardInstance, (c) => c.responses, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_card', referencedColumnName: 'id' })
|
||||||
|
card: CardInstance;
|
||||||
|
|
||||||
|
@Column({ name: 'id_utilisateur', type: 'uuid' })
|
||||||
|
id_utilisateur: string;
|
||||||
|
|
||||||
|
@ManyToOne(() => Users, { onDelete: 'CASCADE' })
|
||||||
|
@JoinColumn({ name: 'id_utilisateur', referencedColumnName: 'id' })
|
||||||
|
user: Users;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardResponseActionType,
|
||||||
|
enumName: 'card_response_action_type',
|
||||||
|
name: 'action',
|
||||||
|
})
|
||||||
|
action: CardResponseActionType;
|
||||||
|
|
||||||
|
@Column({ name: 'comment', type: 'text', nullable: true })
|
||||||
|
comment?: string;
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
}
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import {
|
||||||
|
Column,
|
||||||
|
CreateDateColumn,
|
||||||
|
Entity,
|
||||||
|
PrimaryColumn,
|
||||||
|
UpdateDateColumn,
|
||||||
|
} from 'typeorm';
|
||||||
|
|
||||||
|
export enum CardResponseModeType {
|
||||||
|
NONE = 'none',
|
||||||
|
ACK = 'ack',
|
||||||
|
ACCEPT_REFUSE = 'accept_refuse',
|
||||||
|
}
|
||||||
|
|
||||||
|
@Entity('card_types', { schema: 'public' })
|
||||||
|
export class CardType {
|
||||||
|
@PrimaryColumn({ name: 'code', type: 'varchar', length: 64 })
|
||||||
|
code: string;
|
||||||
|
|
||||||
|
@Column({ name: 'system', type: 'boolean', default: true })
|
||||||
|
system: boolean;
|
||||||
|
|
||||||
|
@Column({ name: 'titre', type: 'varchar', length: 120 })
|
||||||
|
titre: string;
|
||||||
|
|
||||||
|
@Column({ name: 'emitter_roles', type: 'text', array: true })
|
||||||
|
emitter_roles: string[];
|
||||||
|
|
||||||
|
@Column({ name: 'recipient_roles', type: 'text', array: true })
|
||||||
|
recipient_roles: string[];
|
||||||
|
|
||||||
|
@Column({ name: 'audience_resolver', type: 'varchar', length: 64 })
|
||||||
|
audience_resolver: string;
|
||||||
|
|
||||||
|
@Column({
|
||||||
|
type: 'enum',
|
||||||
|
enum: CardResponseModeType,
|
||||||
|
enumName: 'card_response_mode_type',
|
||||||
|
name: 'response_mode',
|
||||||
|
})
|
||||||
|
response_mode: CardResponseModeType;
|
||||||
|
|
||||||
|
@Column({ name: 'retention_days', type: 'int', default: 14 })
|
||||||
|
retention_days: number;
|
||||||
|
|
||||||
|
@Column({ name: 'couleur', type: 'varchar', length: 32, nullable: true })
|
||||||
|
couleur?: string;
|
||||||
|
|
||||||
|
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
||||||
|
cree_le: Date;
|
||||||
|
|
||||||
|
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
||||||
|
modifie_le: Date;
|
||||||
|
}
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
import { Column, CreateDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
|
|
||||||
import { Children } from "./children.entity";
|
|
||||||
import { Users } from "./users.entity";
|
|
||||||
import { Parents } from "./parents.entity";
|
|
||||||
|
|
||||||
export enum TypeEvenementType {
|
|
||||||
ABSENCE_ENFANT = 'absence_enfant',
|
|
||||||
CONGE_AM = 'conge_am',
|
|
||||||
CONGE_PARENT = 'conge_parent',
|
|
||||||
ARRET_MALADIE_AM = 'arret_maladie_am',
|
|
||||||
EVENEMENT_RPE = 'evenement_rpe',
|
|
||||||
}
|
|
||||||
|
|
||||||
export enum StatutEvenementType {
|
|
||||||
PROPOSE = 'propose',
|
|
||||||
VALIDE = 'valide',
|
|
||||||
REFUSE = 'refuse',
|
|
||||||
}
|
|
||||||
|
|
||||||
@Entity('evenements')
|
|
||||||
export class Evenement {
|
|
||||||
// Define your columns and relationships here
|
|
||||||
@PrimaryGeneratedColumn('uuid')
|
|
||||||
id: string;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
type: 'enum',
|
|
||||||
enum: TypeEvenementType,
|
|
||||||
enumName: 'type_evenement_type',
|
|
||||||
name: 'type'
|
|
||||||
})
|
|
||||||
type: TypeEvenementType;
|
|
||||||
|
|
||||||
@ManyToOne(() => Children, { onDelete: 'CASCADE', nullable: true })
|
|
||||||
@JoinColumn({ name: 'id_enfant', referencedColumnName: 'id' })
|
|
||||||
child?: Children;
|
|
||||||
|
|
||||||
@ManyToOne(() => Users, { nullable: true })
|
|
||||||
@JoinColumn({ name: 'id_am', referencedColumnName: 'id' })
|
|
||||||
assistanteMaternelle?: Users;
|
|
||||||
|
|
||||||
@ManyToOne(() => Parents, { nullable: true })
|
|
||||||
@JoinColumn({ name: 'id_parent', referencedColumnName: 'user_id' })
|
|
||||||
parent?: Parents;
|
|
||||||
|
|
||||||
@ManyToOne(() => Users, { nullable: true })
|
|
||||||
@JoinColumn({ name: 'cree_par', referencedColumnName: 'id' })
|
|
||||||
created_by?: Users;
|
|
||||||
|
|
||||||
@Column({ type: 'timestamptz', nullable: true, name: 'date_debut' })
|
|
||||||
start_date?: Date;
|
|
||||||
|
|
||||||
@Column({ type: 'timestamptz', nullable: true, name: 'date_fin' })
|
|
||||||
end_date?: Date;
|
|
||||||
|
|
||||||
@Column({ type: 'text', nullable: true, name: 'commentaires' })
|
|
||||||
comments?: string;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
type: 'enum',
|
|
||||||
enum: StatutEvenementType,
|
|
||||||
enumName: 'statut_evenement_type',
|
|
||||||
name: 'statut',
|
|
||||||
default: StatutEvenementType.PROPOSE
|
|
||||||
})
|
|
||||||
status: StatutEvenementType;
|
|
||||||
|
|
||||||
@Column({type: 'timestamptz', nullable: true, name: 'delai_grace'})
|
|
||||||
grace_deadline?: Date;
|
|
||||||
|
|
||||||
@Column({type: 'boolean', default: false, name: 'urgent'})
|
|
||||||
urgent: boolean;
|
|
||||||
|
|
||||||
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
|
||||||
created_at: Date;
|
|
||||||
|
|
||||||
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
|
||||||
updated_at: Date;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { AbsencesGardeController } from './absences-garde.controller';
|
||||||
|
import { AbsencesGardeService } from './absences-garde.service';
|
||||||
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
||||||
|
|
||||||
|
describe('AbsencesGardeController (#172)', () => {
|
||||||
|
let controller: AbsencesGardeController;
|
||||||
|
const serviceMock = {
|
||||||
|
lister: jest.fn(),
|
||||||
|
creer: jest.fn(),
|
||||||
|
maj: jest.fn(),
|
||||||
|
supprimer: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
controllers: [AbsencesGardeController],
|
||||||
|
providers: [{ provide: AbsencesGardeService, useValue: serviceMock }],
|
||||||
|
})
|
||||||
|
.overrideGuard(AuthGuard)
|
||||||
|
.useValue({ canActivate: () => true })
|
||||||
|
.overrideGuard(RolesGuard)
|
||||||
|
.useValue({ canActivate: () => true })
|
||||||
|
.compile();
|
||||||
|
|
||||||
|
controller = module.get(AbsencesGardeController);
|
||||||
|
jest.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(controller).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('lister délègue au service', async () => {
|
||||||
|
serviceMock.lister.mockResolvedValue({ items: [] });
|
||||||
|
const res = await controller.lister(
|
||||||
|
'u1',
|
||||||
|
RoleType.PARENT,
|
||||||
|
'pl-1',
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
'2026-01-01',
|
||||||
|
'2026-12-31',
|
||||||
|
);
|
||||||
|
expect(serviceMock.lister).toHaveBeenCalledWith('u1', RoleType.PARENT, {
|
||||||
|
placementId: 'pl-1',
|
||||||
|
type: undefined,
|
||||||
|
statut: undefined,
|
||||||
|
from: '2026-01-01',
|
||||||
|
to: '2026-12-31',
|
||||||
|
});
|
||||||
|
expect(res.items).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creer délègue au service', async () => {
|
||||||
|
serviceMock.creer.mockResolvedValue({ id: 'a1' });
|
||||||
|
const dto = {
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||||
|
date_debut: '2026-10-01',
|
||||||
|
date_fin: '2026-10-02',
|
||||||
|
};
|
||||||
|
await controller.creer('u1', RoleType.PARENT, dto);
|
||||||
|
expect(serviceMock.creer).toHaveBeenCalledWith(
|
||||||
|
'u1',
|
||||||
|
RoleType.PARENT,
|
||||||
|
dto,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
Param,
|
||||||
|
ParseUUIDPipe,
|
||||||
|
Patch,
|
||||||
|
Post,
|
||||||
|
Query,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ApiBearerAuth,
|
||||||
|
ApiBody,
|
||||||
|
ApiOperation,
|
||||||
|
ApiQuery,
|
||||||
|
ApiResponse,
|
||||||
|
ApiTags,
|
||||||
|
} from '@nestjs/swagger';
|
||||||
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
|
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||||
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
|
import {
|
||||||
|
StatutAbsenceGardeType,
|
||||||
|
TypeAbsenceGardeType,
|
||||||
|
} from 'src/entities/absences_garde.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { AbsencesGardeService } from './absences-garde.service';
|
||||||
|
import {
|
||||||
|
AbsenceGardeDto,
|
||||||
|
CreerAbsenceGardeDto,
|
||||||
|
ListeAbsencesGardeDto,
|
||||||
|
MajAbsenceGardeDto,
|
||||||
|
} from './dto/absences-garde.dto';
|
||||||
|
|
||||||
|
@ApiTags('Absences garde')
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
@Controller('absences-garde')
|
||||||
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
|
export class AbsencesGardeController {
|
||||||
|
constructor(private readonly absencesGardeService: AbsencesGardeService) {}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Lister les absences / congés / arrêts — ticket #172',
|
||||||
|
description:
|
||||||
|
'Sans placementId : tous les placements du user (parent = famille multi-AM ; AM = tous accueils). ' +
|
||||||
|
'Avec placementId : un couple enfant–AM.',
|
||||||
|
})
|
||||||
|
@ApiQuery({ name: 'placementId', required: false })
|
||||||
|
@ApiQuery({ name: 'type', required: false, enum: TypeAbsenceGardeType })
|
||||||
|
@ApiQuery({ name: 'statut', required: false, enum: StatutAbsenceGardeType })
|
||||||
|
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD' })
|
||||||
|
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD' })
|
||||||
|
@ApiResponse({ status: 200, type: ListeAbsencesGardeDto })
|
||||||
|
lister(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Query('placementId') placementId?: string,
|
||||||
|
@Query('type') type?: TypeAbsenceGardeType,
|
||||||
|
@Query('statut') statut?: StatutAbsenceGardeType,
|
||||||
|
@Query('from') from?: string,
|
||||||
|
@Query('to') to?: string,
|
||||||
|
): Promise<ListeAbsencesGardeDto> {
|
||||||
|
return this.absencesGardeService.lister(userId, role, {
|
||||||
|
placementId,
|
||||||
|
type,
|
||||||
|
statut,
|
||||||
|
from,
|
||||||
|
to,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Créer une période d’absence / congé / arrêt — #172' })
|
||||||
|
@ApiBody({ type: CreerAbsenceGardeDto })
|
||||||
|
@ApiResponse({ status: 201, type: AbsenceGardeDto })
|
||||||
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
creer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Body() dto: CreerAbsenceGardeDto,
|
||||||
|
): Promise<AbsenceGardeDto> {
|
||||||
|
return this.absencesGardeService.creer(userId, role, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Mettre à jour dates / statut / motif — #172',
|
||||||
|
description:
|
||||||
|
'Parent : accept/refuse congé (motivation si refus), ack arrêt. ' +
|
||||||
|
'AM : modifier dates (en attente / refuse / accepté), republication après refus.',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: MajAbsenceGardeDto })
|
||||||
|
@ApiResponse({ status: 200, type: AbsenceGardeDto })
|
||||||
|
maj(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: MajAbsenceGardeDto,
|
||||||
|
): Promise<AbsenceGardeDto> {
|
||||||
|
return this.absencesGardeService.maj(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
@ApiOperation({ summary: 'Supprimer une absence (hard delete) — #172' })
|
||||||
|
@ApiResponse({ status: 204 })
|
||||||
|
async supprimer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.absencesGardeService.supprimer(userId, role, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { AbsencesGardeController } from './absences-garde.controller';
|
||||||
|
import { AbsencesGardeService } from './absences-garde.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
||||||
|
],
|
||||||
|
controllers: [AbsencesGardeController],
|
||||||
|
providers: [AbsencesGardeService],
|
||||||
|
exports: [AbsencesGardeService],
|
||||||
|
})
|
||||||
|
export class AbsencesGardeModule {}
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
|
import { ForbiddenException, BadRequestException } from '@nestjs/common';
|
||||||
|
import { AbsencesGardeService } from './absences-garde.service';
|
||||||
|
import {
|
||||||
|
AbsencesGarde,
|
||||||
|
StatutAbsenceGardeType,
|
||||||
|
TypeAbsenceGardeType,
|
||||||
|
} from 'src/entities/absences_garde.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
|
||||||
|
describe('AbsencesGardeService (#172)', () => {
|
||||||
|
let service: AbsencesGardeService;
|
||||||
|
const absencesRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(async (x) => ({
|
||||||
|
...x,
|
||||||
|
id: x.id ?? 'abs-1',
|
||||||
|
cree_le: new Date(),
|
||||||
|
modifie_le: new Date(),
|
||||||
|
})),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
delete: jest.fn(),
|
||||||
|
createQueryBuilder: jest.fn(),
|
||||||
|
};
|
||||||
|
const amChildrenRepo = {
|
||||||
|
find: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
};
|
||||||
|
const parentsChildrenRepo = {
|
||||||
|
find: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
AbsencesGardeService,
|
||||||
|
{ provide: getRepositoryToken(AbsencesGarde), useValue: absencesRepo },
|
||||||
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
|
{
|
||||||
|
provide: getRepositoryToken(ParentsChildren),
|
||||||
|
useValue: parentsChildrenRepo,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
service = module.get(AbsencesGardeService);
|
||||||
|
jest.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parent crée absence_enfant → statut accepte', async () => {
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
parentId: 'p-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
});
|
||||||
|
absencesRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'abs-1',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||||
|
date_debut: '2026-10-01',
|
||||||
|
date_fin: '2026-10-02',
|
||||||
|
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||||
|
expire_at: new Date('9999-12-31'),
|
||||||
|
cree_le: new Date(),
|
||||||
|
modifie_le: new Date(),
|
||||||
|
placement: {
|
||||||
|
enfantId: 'e-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
child: { id: 'e-1', first_name: 'Léo' },
|
||||||
|
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await service.creer('p-1', RoleType.PARENT, {
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||||
|
date_debut: '2026-10-01',
|
||||||
|
date_fin: '2026-10-02',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(absencesRepo.save).toHaveBeenCalled();
|
||||||
|
const savedArg = absencesRepo.save.mock.calls[0][0];
|
||||||
|
expect(savedArg.statut).toBe(StatutAbsenceGardeType.ACCEPTE);
|
||||||
|
expect(res.type).toBe(TypeAbsenceGardeType.ABSENCE_ENFANT);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parent ne peut pas créer un congé AM', async () => {
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
parentId: 'p-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
type: TypeAbsenceGardeType.CONGE_AM,
|
||||||
|
date_debut: '2026-10-01',
|
||||||
|
date_fin: '2026-10-05',
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(ForbiddenException);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('refus congé sans motif → BadRequest', async () => {
|
||||||
|
absencesRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'abs-1',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
type: TypeAbsenceGardeType.CONGE_AM,
|
||||||
|
date_debut: '2026-10-01',
|
||||||
|
date_fin: '2026-10-05',
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
expire_at: new Date(),
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
parentId: 'p-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.maj('p-1', RoleType.PARENT, 'abs-1', {
|
||||||
|
statut: StatutAbsenceGardeType.REFUSE,
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(BadRequestException);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('dates invalides → BadRequest', async () => {
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
parentId: 'p-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
type: TypeAbsenceGardeType.ABSENCE_ENFANT,
|
||||||
|
date_debut: '2026-10-10',
|
||||||
|
date_fin: '2026-10-01',
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(BadRequestException);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,421 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { In, IsNull, Repository } from 'typeorm';
|
||||||
|
import {
|
||||||
|
AbsencesGarde,
|
||||||
|
StatutAbsenceGardeType,
|
||||||
|
TypeAbsenceGardeType,
|
||||||
|
} from 'src/entities/absences_garde.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import {
|
||||||
|
AbsenceGardeDto,
|
||||||
|
CreerAbsenceGardeDto,
|
||||||
|
ListeAbsencesGardeDto,
|
||||||
|
MajAbsenceGardeDto,
|
||||||
|
} from './dto/absences-garde.dto';
|
||||||
|
|
||||||
|
const TTL_EN_ATTENTE_MS = 15 * 24 * 60 * 60 * 1000;
|
||||||
|
const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
||||||
|
/** Sentinel « pas de purge » pour les périodes acceptées */
|
||||||
|
const EXPIRE_ACCEPTE = new Date('9999-12-31T23:59:59.999Z');
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class AbsencesGardeService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(AbsencesGarde)
|
||||||
|
private readonly absencesRepo: Repository<AbsencesGarde>,
|
||||||
|
@InjectRepository(AmChildren)
|
||||||
|
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||||
|
@InjectRepository(ParentsChildren)
|
||||||
|
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async lister(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
opts: {
|
||||||
|
placementId?: string;
|
||||||
|
type?: TypeAbsenceGardeType;
|
||||||
|
statut?: StatutAbsenceGardeType;
|
||||||
|
from?: string;
|
||||||
|
to?: string;
|
||||||
|
},
|
||||||
|
): Promise<ListeAbsencesGardeDto> {
|
||||||
|
const placementIds = await this.resolvePlacementIds(
|
||||||
|
userId,
|
||||||
|
role,
|
||||||
|
opts.placementId,
|
||||||
|
);
|
||||||
|
if (placementIds.length === 0) {
|
||||||
|
return { items: [] };
|
||||||
|
}
|
||||||
|
|
||||||
|
const qb = this.absencesRepo
|
||||||
|
.createQueryBuilder('ag')
|
||||||
|
.leftJoinAndSelect('ag.placement', 'placement')
|
||||||
|
.leftJoinAndSelect('placement.child', 'child')
|
||||||
|
.leftJoinAndSelect('placement.am', 'am')
|
||||||
|
.leftJoinAndSelect('am.user', 'amUser')
|
||||||
|
.where('ag.id_placement IN (:...placementIds)', { placementIds })
|
||||||
|
.orderBy('ag.date_debut', 'DESC');
|
||||||
|
|
||||||
|
if (opts.type) {
|
||||||
|
qb.andWhere('ag.type = :type', { type: opts.type });
|
||||||
|
}
|
||||||
|
if (opts.statut) {
|
||||||
|
qb.andWhere('ag.statut = :statut', { statut: opts.statut });
|
||||||
|
}
|
||||||
|
if (opts.from) {
|
||||||
|
qb.andWhere('ag.date_fin >= :from', { from: opts.from });
|
||||||
|
}
|
||||||
|
if (opts.to) {
|
||||||
|
qb.andWhere('ag.date_debut <= :to', { to: opts.to });
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = await qb.getMany();
|
||||||
|
return { items: rows.map((r) => this.toDto(r)) };
|
||||||
|
}
|
||||||
|
|
||||||
|
async creer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
dto: CreerAbsenceGardeDto,
|
||||||
|
): Promise<AbsenceGardeDto> {
|
||||||
|
this.assertDates(dto.date_debut, dto.date_fin);
|
||||||
|
await this.assertCanAccessPlacement(userId, role, dto.id_placement);
|
||||||
|
this.assertCanCreateType(role, dto.type);
|
||||||
|
|
||||||
|
const statut = this.statutInitial(dto.type);
|
||||||
|
const entity = this.absencesRepo.create({
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
type: dto.type,
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
statut,
|
||||||
|
expire_at: this.expireAtFor(statut),
|
||||||
|
cree_par: userId,
|
||||||
|
motif: dto.motif?.trim() || undefined,
|
||||||
|
});
|
||||||
|
const saved = await this.absencesRepo.save(entity);
|
||||||
|
return this.getByIdForUser(saved.id, userId, role);
|
||||||
|
}
|
||||||
|
|
||||||
|
async maj(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
id: string,
|
||||||
|
dto: MajAbsenceGardeDto,
|
||||||
|
): Promise<AbsenceGardeDto> {
|
||||||
|
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||||
|
if (!row) {
|
||||||
|
throw new NotFoundException('Absence introuvable');
|
||||||
|
}
|
||||||
|
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||||
|
|
||||||
|
if (dto.date_debut !== undefined || dto.date_fin !== undefined) {
|
||||||
|
const debut = dto.date_debut ?? row.date_debut;
|
||||||
|
const fin = dto.date_fin ?? row.date_fin;
|
||||||
|
this.assertDates(debut, fin);
|
||||||
|
// Parent : peut modifier ses absences enfant
|
||||||
|
// AM : peut modifier congé/arrêt en_attente (avant accept) ou dates si créateur
|
||||||
|
this.assertCanEditDates(role, row);
|
||||||
|
row.date_debut = debut;
|
||||||
|
row.date_fin = fin;
|
||||||
|
if (row.statut === StatutAbsenceGardeType.EN_ATTENTE) {
|
||||||
|
row.expire_at = this.expireAtFor(StatutAbsenceGardeType.EN_ATTENTE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dto.statut !== undefined && dto.statut !== row.statut) {
|
||||||
|
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
||||||
|
if (
|
||||||
|
dto.statut === StatutAbsenceGardeType.REFUSE &&
|
||||||
|
(!dto.motif || !dto.motif.trim())
|
||||||
|
) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'Une motivation est obligatoire en cas de refus',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
row.statut = dto.statut;
|
||||||
|
row.expire_at = this.expireAtFor(dto.statut);
|
||||||
|
if (dto.motif?.trim()) {
|
||||||
|
row.motif = dto.motif.trim();
|
||||||
|
}
|
||||||
|
} else if (dto.motif !== undefined) {
|
||||||
|
row.motif = dto.motif.trim() || undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.absencesRepo.save(row);
|
||||||
|
return this.getByIdForUser(id, userId, role);
|
||||||
|
}
|
||||||
|
|
||||||
|
async supprimer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||||
|
if (!row) {
|
||||||
|
throw new NotFoundException('Absence introuvable');
|
||||||
|
}
|
||||||
|
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||||
|
|
||||||
|
if (
|
||||||
|
role === RoleType.PARENT &&
|
||||||
|
row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT
|
||||||
|
) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'Un parent ne peut supprimer que les absences enfant',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.absencesRepo.delete({ id });
|
||||||
|
}
|
||||||
|
|
||||||
|
private async getByIdForUser(
|
||||||
|
id: string,
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
): Promise<AbsenceGardeDto> {
|
||||||
|
const row = await this.absencesRepo.findOne({
|
||||||
|
where: { id },
|
||||||
|
relations: ['placement', 'placement.child', 'placement.am', 'placement.am.user'],
|
||||||
|
});
|
||||||
|
if (!row) {
|
||||||
|
throw new NotFoundException('Absence introuvable');
|
||||||
|
}
|
||||||
|
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||||
|
return this.toDto(row);
|
||||||
|
}
|
||||||
|
|
||||||
|
private statutInitial(type: TypeAbsenceGardeType): StatutAbsenceGardeType {
|
||||||
|
if (type === TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||||
|
return StatutAbsenceGardeType.ACCEPTE;
|
||||||
|
}
|
||||||
|
return StatutAbsenceGardeType.EN_ATTENTE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private expireAtFor(statut: StatutAbsenceGardeType): Date {
|
||||||
|
const now = Date.now();
|
||||||
|
if (statut === StatutAbsenceGardeType.ACCEPTE) {
|
||||||
|
return EXPIRE_ACCEPTE;
|
||||||
|
}
|
||||||
|
if (statut === StatutAbsenceGardeType.REFUSE) {
|
||||||
|
return new Date(now + TTL_REFUSE_MS);
|
||||||
|
}
|
||||||
|
return new Date(now + TTL_EN_ATTENTE_MS);
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertDates(debut: string, fin: string): void {
|
||||||
|
if (fin < debut) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'date_fin doit être supérieure ou égale à date_debut',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertCanCreateType(role: RoleType, type: TypeAbsenceGardeType): void {
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
if (type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'Un parent ne peut créer que des absences enfant',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
if (
|
||||||
|
type !== TypeAbsenceGardeType.CONGE_AM &&
|
||||||
|
type !== TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||||
|
) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'Une AM ne peut créer que congé ou arrêt maladie',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Rôle non autorisé à créer une absence');
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertCanEditDates(
|
||||||
|
role: RoleType,
|
||||||
|
row: AbsencesGarde,
|
||||||
|
): void {
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
if (row.type !== TypeAbsenceGardeType.ABSENCE_ENFANT) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'Un parent ne peut modifier que les absences enfant',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
if (
|
||||||
|
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
||||||
|
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||||
|
) {
|
||||||
|
if (
|
||||||
|
row.statut !== StatutAbsenceGardeType.EN_ATTENTE &&
|
||||||
|
row.statut !== StatutAbsenceGardeType.REFUSE &&
|
||||||
|
row.statut !== StatutAbsenceGardeType.ACCEPTE
|
||||||
|
) {
|
||||||
|
throw new ForbiddenException('Statut incompatible avec une modification');
|
||||||
|
}
|
||||||
|
// Accepté : autorisé (S2b — re-validation via cartes plus tard ; API permet update dates)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Type non modifiable par l’AM');
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Modification non autorisée');
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertCanChangeStatut(
|
||||||
|
role: RoleType,
|
||||||
|
row: AbsencesGarde,
|
||||||
|
next: StatutAbsenceGardeType,
|
||||||
|
_motif?: string,
|
||||||
|
): void {
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
// Accept / refuse congé ; ack arrêt (accepte)
|
||||||
|
if (
|
||||||
|
row.type === TypeAbsenceGardeType.CONGE_AM ||
|
||||||
|
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM
|
||||||
|
) {
|
||||||
|
if (
|
||||||
|
next !== StatutAbsenceGardeType.ACCEPTE &&
|
||||||
|
next !== StatutAbsenceGardeType.REFUSE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Transition de statut invalide');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
row.type === TypeAbsenceGardeType.ARRET_MALADIE_AM &&
|
||||||
|
next === StatutAbsenceGardeType.REFUSE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'Un arrêt maladie ne se refuse pas (accusé seulement)',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (row.statut !== StatutAbsenceGardeType.EN_ATTENTE) {
|
||||||
|
throw new BadRequestException('Cette demande n’est plus en attente');
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'Pas de changement de statut sur ce type pour un parent',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
// Remise en attente après refus OU modification d’un congé déjà accepté (S2b)
|
||||||
|
if (
|
||||||
|
next === StatutAbsenceGardeType.EN_ATTENTE &&
|
||||||
|
(row.statut === StatutAbsenceGardeType.REFUSE ||
|
||||||
|
row.statut === StatutAbsenceGardeType.ACCEPTE)
|
||||||
|
) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'L’AM ne valide pas elle-même (sauf republication / modification)',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Changement de statut non autorisé');
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolvePlacementIds(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId?: string,
|
||||||
|
): Promise<string[]> {
|
||||||
|
if (placementId) {
|
||||||
|
await this.assertCanAccessPlacement(userId, role, placementId);
|
||||||
|
return [placementId];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
const liens = await this.parentsChildrenRepo.find({
|
||||||
|
where: { parentId: userId },
|
||||||
|
select: ['enfantId'],
|
||||||
|
});
|
||||||
|
const enfantIds = liens.map((l) => l.enfantId);
|
||||||
|
if (enfantIds.length === 0) return [];
|
||||||
|
const placements = await this.amChildrenRepo.find({
|
||||||
|
where: { enfantId: In(enfantIds), date_fin: IsNull() },
|
||||||
|
select: ['id'],
|
||||||
|
});
|
||||||
|
return placements.map((p) => p.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
const placements = await this.amChildrenRepo.find({
|
||||||
|
where: { amId: userId, date_fin: IsNull() },
|
||||||
|
select: ['id'],
|
||||||
|
});
|
||||||
|
return placements.map((p) => p.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ForbiddenException('Rôle non autorisé');
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertCanAccessPlacement(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId: string,
|
||||||
|
): Promise<AmChildren> {
|
||||||
|
const placement = await this.amChildrenRepo.findOne({
|
||||||
|
where: { id: placementId, date_fin: IsNull() },
|
||||||
|
});
|
||||||
|
if (!placement) {
|
||||||
|
throw new NotFoundException('Placement / couple introuvable ou inactif');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
if (placement.amId !== userId) {
|
||||||
|
throw new ForbiddenException('Ce placement ne vous appartient pas');
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
const lien = await this.parentsChildrenRepo.findOne({
|
||||||
|
where: { parentId: userId, enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
if (!lien) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
'Ce placement ne concerne pas un de vos enfants',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new ForbiddenException('Rôle non autorisé');
|
||||||
|
}
|
||||||
|
|
||||||
|
private toDto(row: AbsencesGarde): AbsenceGardeDto {
|
||||||
|
const child = row.placement?.child;
|
||||||
|
const amUser = row.placement?.am?.user;
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
id_placement: row.id_placement,
|
||||||
|
type: row.type,
|
||||||
|
date_debut: row.date_debut,
|
||||||
|
date_fin: row.date_fin,
|
||||||
|
statut: row.statut,
|
||||||
|
expire_at: row.expire_at?.toISOString?.() ?? String(row.expire_at),
|
||||||
|
cree_par: row.cree_par ?? null,
|
||||||
|
motif: row.motif ?? null,
|
||||||
|
id_enfant: child?.id ?? row.placement?.enfantId ?? null,
|
||||||
|
prenom_enfant: child?.first_name ?? null,
|
||||||
|
id_am: row.placement?.amId ?? null,
|
||||||
|
prenom_am: amUser?.prenom ?? null,
|
||||||
|
nom_am: amUser?.nom ?? null,
|
||||||
|
cree_le: row.cree_le?.toISOString?.() ?? String(row.cree_le),
|
||||||
|
modifie_le: row.modifie_le?.toISOString?.() ?? String(row.modifie_le),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
import {
|
||||||
|
IsDateString,
|
||||||
|
IsEnum,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
|
MaxLength,
|
||||||
|
MinLength,
|
||||||
|
} from 'class-validator';
|
||||||
|
import {
|
||||||
|
StatutAbsenceGardeType,
|
||||||
|
TypeAbsenceGardeType,
|
||||||
|
} from 'src/entities/absences_garde.entity';
|
||||||
|
|
||||||
|
export class CreerAbsenceGardeDto {
|
||||||
|
@ApiProperty({ description: 'Placement AM↔enfant (couple)' })
|
||||||
|
@IsUUID()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: TypeAbsenceGardeType })
|
||||||
|
@IsEnum(TypeAbsenceGardeType)
|
||||||
|
type: TypeAbsenceGardeType;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2026-10-01' })
|
||||||
|
@IsDateString()
|
||||||
|
date_debut: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2026-10-05' })
|
||||||
|
@IsDateString()
|
||||||
|
date_fin: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class MajAbsenceGardeDto {
|
||||||
|
@ApiPropertyOptional({ example: '2026-10-02' })
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_debut?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ example: '2026-10-06' })
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_fin?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ enum: StatutAbsenceGardeType })
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(StatutAbsenceGardeType)
|
||||||
|
statut?: StatutAbsenceGardeType;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({
|
||||||
|
description: 'Motivation de refus (parent) ou motif créateur',
|
||||||
|
})
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MinLength(1)
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class AbsenceGardeDto {
|
||||||
|
@ApiProperty()
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: TypeAbsenceGardeType })
|
||||||
|
type: TypeAbsenceGardeType;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
date_debut: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
date_fin: string;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: StatutAbsenceGardeType })
|
||||||
|
statut: StatutAbsenceGardeType;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
expire_at: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
cree_par?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
motif?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
id_enfant?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
prenom_enfant?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
id_am?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
prenom_am?: string | null;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
nom_am?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
cree_le: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
modifie_le: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ListeAbsencesGardeDto {
|
||||||
|
@ApiProperty({ type: [AbsenceGardeDto] })
|
||||||
|
items: AbsenceGardeDto[];
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
export { AbsencesGardeModule } from './absences-garde.module';
|
||||||
|
export { AbsencesGardeService } from './absences-garde.service';
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
import {
|
||||||
|
Body,
|
||||||
|
Controller,
|
||||||
|
Delete,
|
||||||
|
Get,
|
||||||
|
HttpCode,
|
||||||
|
HttpStatus,
|
||||||
|
Param,
|
||||||
|
ParseUUIDPipe,
|
||||||
|
Patch,
|
||||||
|
Post,
|
||||||
|
Query,
|
||||||
|
UseGuards,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ApiBearerAuth,
|
||||||
|
ApiBody,
|
||||||
|
ApiOperation,
|
||||||
|
ApiQuery,
|
||||||
|
ApiResponse,
|
||||||
|
ApiTags,
|
||||||
|
} from '@nestjs/swagger';
|
||||||
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
|
import { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
|
import { Roles } from 'src/common/decorators/roles.decorator';
|
||||||
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import {
|
||||||
|
CarteDto,
|
||||||
|
CreerCarteDto,
|
||||||
|
ListeCartesDto,
|
||||||
|
MajCarteDto,
|
||||||
|
RepondreCarteDto,
|
||||||
|
} from './dto/cards.dto';
|
||||||
|
|
||||||
|
@ApiTags('Cartes')
|
||||||
|
@ApiBearerAuth('access-token')
|
||||||
|
@Controller('cards')
|
||||||
|
@UseGuards(AuthGuard, RolesGuard)
|
||||||
|
export class CardsController {
|
||||||
|
constructor(private readonly cardsService: CardsService) {}
|
||||||
|
|
||||||
|
@Get('types')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Types SYSTEM émissibles pour mon rôle — #194' })
|
||||||
|
listerTypes(@User('role') role: RoleType) {
|
||||||
|
return this.cardsService.listerTypes(role);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Feed bulles de l’utilisateur — #194' })
|
||||||
|
@ApiQuery({ name: 'placementId', required: false })
|
||||||
|
@ApiResponse({ status: 200, type: ListeCartesDto })
|
||||||
|
lister(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Query('placementId') placementId?: string,
|
||||||
|
): Promise<ListeCartesDto> {
|
||||||
|
return this.cardsService.lister(userId, role, placementId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post()
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.CREATED)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Créer une bulle (+ hook absences_garde) — #194',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: CreerCarteDto })
|
||||||
|
@ApiResponse({ status: 201, type: CarteDto })
|
||||||
|
creer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Body() dto: CreerCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.creer(userId, role, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post(':id/respond')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({ summary: 'Répondre (accept / refuse / ack) — #194' })
|
||||||
|
@ApiBody({ type: RepondreCarteDto })
|
||||||
|
repondre(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: RepondreCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.repondre(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@ApiOperation({
|
||||||
|
summary: 'Modifier dates (créateur, ouverte/refusée) — #194',
|
||||||
|
})
|
||||||
|
@ApiBody({ type: MajCarteDto })
|
||||||
|
maj(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
@Body() dto: MajCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
return this.cardsService.majEnAttente(userId, role, id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete(':id')
|
||||||
|
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||||
|
@HttpCode(HttpStatus.NO_CONTENT)
|
||||||
|
@ApiOperation({ summary: 'Supprimer bulle (+ absence si non traitée) — #194' })
|
||||||
|
async supprimer(
|
||||||
|
@User('id') userId: string,
|
||||||
|
@User('role') role: RoleType,
|
||||||
|
@Param('id', ParseUUIDPipe) id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.cardsService.supprimer(userId, role, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { Module } from '@nestjs/common';
|
||||||
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
|
import { AbsencesGardeModule } from '../absences-garde';
|
||||||
|
import { CardType } from 'src/entities/card_types.entity';
|
||||||
|
import { CardInstance } from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import { CardResponse } from 'src/entities/card_responses.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { CardsController } from './cards.controller';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
|
||||||
|
@Module({
|
||||||
|
imports: [
|
||||||
|
AbsencesGardeModule,
|
||||||
|
TypeOrmModule.forFeature([
|
||||||
|
CardType,
|
||||||
|
CardInstance,
|
||||||
|
CardAudienceMember,
|
||||||
|
CardResponse,
|
||||||
|
AmChildren,
|
||||||
|
ParentsChildren,
|
||||||
|
]),
|
||||||
|
],
|
||||||
|
controllers: [CardsController],
|
||||||
|
providers: [CardsService],
|
||||||
|
exports: [CardsService],
|
||||||
|
})
|
||||||
|
export class CardsModule {}
|
||||||
@@ -0,0 +1,146 @@
|
|||||||
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
|
import { getRepositoryToken } from '@nestjs/typeorm';
|
||||||
|
import { ForbiddenException } from '@nestjs/common';
|
||||||
|
import { CardsService } from './cards.service';
|
||||||
|
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||||
|
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||||
|
import {
|
||||||
|
CardInstance,
|
||||||
|
CardInstanceStatutType,
|
||||||
|
CardOperationType,
|
||||||
|
} from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import { CardResponse } from 'src/entities/card_responses.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { StatutAbsenceGardeType, TypeAbsenceGardeType } from 'src/entities/absences_garde.entity';
|
||||||
|
|
||||||
|
describe('CardsService (#194)', () => {
|
||||||
|
let service: CardsService;
|
||||||
|
|
||||||
|
const typesRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
|
const cardsRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(async (x) => ({ ...x, id: x.id ?? 'card-1', cree_le: new Date(), modifie_le: new Date() })),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
delete: jest.fn(),
|
||||||
|
createQueryBuilder: jest.fn(),
|
||||||
|
manager: { query: jest.fn() },
|
||||||
|
};
|
||||||
|
const audienceRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(),
|
||||||
|
findOne: jest.fn(),
|
||||||
|
};
|
||||||
|
const responsesRepo = {
|
||||||
|
create: jest.fn((x) => x),
|
||||||
|
save: jest.fn(),
|
||||||
|
};
|
||||||
|
const amChildrenRepo = { findOne: jest.fn() };
|
||||||
|
const parentsChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
|
||||||
|
const absencesService = {
|
||||||
|
creer: jest.fn(),
|
||||||
|
maj: jest.fn(),
|
||||||
|
supprimer: jest.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
|
providers: [
|
||||||
|
CardsService,
|
||||||
|
{ provide: getRepositoryToken(CardType), useValue: typesRepo },
|
||||||
|
{ provide: getRepositoryToken(CardInstance), useValue: cardsRepo },
|
||||||
|
{ provide: getRepositoryToken(CardAudienceMember), useValue: audienceRepo },
|
||||||
|
{ provide: getRepositoryToken(CardResponse), useValue: responsesRepo },
|
||||||
|
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||||
|
{ provide: getRepositoryToken(ParentsChildren), useValue: parentsChildrenRepo },
|
||||||
|
{ provide: AbsencesGardeService, useValue: absencesService },
|
||||||
|
],
|
||||||
|
}).compile();
|
||||||
|
service = module.get(CardsService);
|
||||||
|
jest.clearAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be defined', () => {
|
||||||
|
expect(service).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('AM crée congé → absence + carte ouverte + audience parents', async () => {
|
||||||
|
typesRepo.findOne.mockResolvedValue({
|
||||||
|
code: 'conge_am',
|
||||||
|
system: true,
|
||||||
|
titre: 'Congé AM',
|
||||||
|
emitter_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||||
|
recipient_roles: [RoleType.PARENT],
|
||||||
|
audience_resolver: 'couple_parents',
|
||||||
|
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||||
|
retention_days: 14,
|
||||||
|
couleur: 'lavender',
|
||||||
|
});
|
||||||
|
amChildrenRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'pl-1',
|
||||||
|
amId: 'am-1',
|
||||||
|
enfantId: 'e-1',
|
||||||
|
date_fin: null,
|
||||||
|
});
|
||||||
|
absencesService.creer.mockResolvedValue({
|
||||||
|
id: 'abs-1',
|
||||||
|
type: TypeAbsenceGardeType.CONGE_AM,
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
});
|
||||||
|
parentsChildrenRepo.find.mockResolvedValue([
|
||||||
|
{ parentId: 'p-1', enfantId: 'e-1' },
|
||||||
|
{ parentId: 'p-2', enfantId: 'e-1' },
|
||||||
|
]);
|
||||||
|
cardsRepo.findOne.mockResolvedValue({
|
||||||
|
id: 'card-1',
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
id_absence: 'abs-1',
|
||||||
|
cree_par: 'am-1',
|
||||||
|
operation: CardOperationType.CREATE,
|
||||||
|
statut: CardInstanceStatutType.OUVERTE,
|
||||||
|
payload: { date_debut: '2026-11-01', date_fin: '2026-11-07' },
|
||||||
|
purge_at: new Date(),
|
||||||
|
cree_le: new Date(),
|
||||||
|
modifie_le: new Date(),
|
||||||
|
type: {
|
||||||
|
titre: 'Congé AM',
|
||||||
|
couleur: 'lavender',
|
||||||
|
response_mode: CardResponseModeType.ACCEPT_REFUSE,
|
||||||
|
retention_days: 14,
|
||||||
|
},
|
||||||
|
responses: [],
|
||||||
|
audience: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
const res = await service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
date_debut: '2026-11-01',
|
||||||
|
date_fin: '2026-11-07',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(absencesService.creer).toHaveBeenCalled();
|
||||||
|
expect(audienceRepo.save).toHaveBeenCalled();
|
||||||
|
expect(res.type_code).toBe('conge_am');
|
||||||
|
expect(res.statut).toBe(CardInstanceStatutType.OUVERTE);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('parent ne peut pas émettre conge_am', async () => {
|
||||||
|
typesRepo.findOne.mockResolvedValue({
|
||||||
|
code: 'conge_am',
|
||||||
|
system: true,
|
||||||
|
emitter_roles: [RoleType.ASSISTANTE_MATERNELLE],
|
||||||
|
});
|
||||||
|
await expect(
|
||||||
|
service.creer('p-1', RoleType.PARENT, {
|
||||||
|
type_code: 'conge_am',
|
||||||
|
id_placement: 'pl-1',
|
||||||
|
date_debut: '2026-11-01',
|
||||||
|
date_fin: '2026-11-07',
|
||||||
|
}),
|
||||||
|
).rejects.toBeInstanceOf(ForbiddenException);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,453 @@
|
|||||||
|
import {
|
||||||
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
|
Injectable,
|
||||||
|
NotFoundException,
|
||||||
|
} from '@nestjs/common';
|
||||||
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
|
import { IsNull, Repository } from 'typeorm';
|
||||||
|
import { AbsencesGardeService } from '../absences-garde/absences-garde.service';
|
||||||
|
import {
|
||||||
|
StatutAbsenceGardeType,
|
||||||
|
TypeAbsenceGardeType,
|
||||||
|
} from 'src/entities/absences_garde.entity';
|
||||||
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
|
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||||
|
import { RoleType } from 'src/entities/users.entity';
|
||||||
|
import { CardType, CardResponseModeType } from 'src/entities/card_types.entity';
|
||||||
|
import {
|
||||||
|
CardInstance,
|
||||||
|
CardInstanceStatutType,
|
||||||
|
CardOperationType,
|
||||||
|
} from 'src/entities/card_instances.entity';
|
||||||
|
import { CardAudienceMember } from 'src/entities/card_audience_members.entity';
|
||||||
|
import {
|
||||||
|
CardResponse,
|
||||||
|
CardResponseActionType,
|
||||||
|
} from 'src/entities/card_responses.entity';
|
||||||
|
import {
|
||||||
|
CarteDto,
|
||||||
|
CreerCarteDto,
|
||||||
|
ListeCartesDto,
|
||||||
|
MajCarteDto,
|
||||||
|
RepondreCarteDto,
|
||||||
|
} from './dto/cards.dto';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class CardsService {
|
||||||
|
constructor(
|
||||||
|
@InjectRepository(CardType)
|
||||||
|
private readonly typesRepo: Repository<CardType>,
|
||||||
|
@InjectRepository(CardInstance)
|
||||||
|
private readonly cardsRepo: Repository<CardInstance>,
|
||||||
|
@InjectRepository(CardAudienceMember)
|
||||||
|
private readonly audienceRepo: Repository<CardAudienceMember>,
|
||||||
|
@InjectRepository(CardResponse)
|
||||||
|
private readonly responsesRepo: Repository<CardResponse>,
|
||||||
|
@InjectRepository(AmChildren)
|
||||||
|
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||||
|
@InjectRepository(ParentsChildren)
|
||||||
|
private readonly parentsChildrenRepo: Repository<ParentsChildren>,
|
||||||
|
private readonly absencesService: AbsencesGardeService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async listerTypes(role: RoleType): Promise<CardType[]> {
|
||||||
|
const all = await this.typesRepo.find({ where: { system: true } });
|
||||||
|
return all.filter((t) => t.emitter_roles.includes(role));
|
||||||
|
}
|
||||||
|
|
||||||
|
async lister(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId?: string,
|
||||||
|
): Promise<ListeCartesDto> {
|
||||||
|
const qb = this.cardsRepo
|
||||||
|
.createQueryBuilder('c')
|
||||||
|
.innerJoin('c.audience', 'aud', 'aud.id_utilisateur = :userId', { userId })
|
||||||
|
.leftJoinAndSelect('c.type', 'type')
|
||||||
|
.leftJoinAndSelect('c.responses', 'responses')
|
||||||
|
.where('c.purge_at > now()')
|
||||||
|
.orderBy(
|
||||||
|
`CASE c.statut WHEN 'refusee' THEN 0 WHEN 'ouverte' THEN 1 ELSE 2 END`,
|
||||||
|
'ASC',
|
||||||
|
)
|
||||||
|
.addOrderBy('c.modifie_le', 'DESC');
|
||||||
|
|
||||||
|
if (placementId) {
|
||||||
|
await this.assertPlacementAccess(userId, role, placementId);
|
||||||
|
qb.andWhere('c.id_placement = :placementId', { placementId });
|
||||||
|
}
|
||||||
|
|
||||||
|
const rows = await qb.getMany();
|
||||||
|
return {
|
||||||
|
items: rows.map((c) => this.toDto(c, userId)),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async creer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
dto: CreerCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
if (dto.date_fin < dto.date_debut) {
|
||||||
|
throw new BadRequestException('date_fin < date_debut');
|
||||||
|
}
|
||||||
|
|
||||||
|
const type = await this.typesRepo.findOne({ where: { code: dto.type_code } });
|
||||||
|
if (!type || !type.system) {
|
||||||
|
throw new NotFoundException('Type de carte inconnu');
|
||||||
|
}
|
||||||
|
if (!type.emitter_roles.includes(role)) {
|
||||||
|
throw new ForbiddenException('Vous ne pouvez pas émettre ce type de carte');
|
||||||
|
}
|
||||||
|
|
||||||
|
const placement = await this.assertPlacementAccess(
|
||||||
|
userId,
|
||||||
|
role,
|
||||||
|
dto.id_placement,
|
||||||
|
);
|
||||||
|
const operation = dto.operation ?? CardOperationType.CREATE;
|
||||||
|
|
||||||
|
let absenceId = dto.id_absence;
|
||||||
|
const absenceType = this.mapAbsenceType(dto.type_code);
|
||||||
|
|
||||||
|
if (operation === CardOperationType.CREATE) {
|
||||||
|
const absence = await this.absencesService.creer(userId, role, {
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
type: absenceType,
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
});
|
||||||
|
absenceId = absence.id;
|
||||||
|
} else {
|
||||||
|
if (!absenceId) {
|
||||||
|
throw new BadRequestException('id_absence requis pour operation=update');
|
||||||
|
}
|
||||||
|
await this.absencesService.maj(userId, role, absenceId, {
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
// Congé accepté modifié → repasse en attente via cartes respond flow;
|
||||||
|
// pour absence enfant update immédiat déjà fait.
|
||||||
|
...(dto.type_code === 'conge_am'
|
||||||
|
? { statut: StatutAbsenceGardeType.EN_ATTENTE }
|
||||||
|
: {}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
const statutInitial =
|
||||||
|
type.response_mode === CardResponseModeType.NONE
|
||||||
|
? CardInstanceStatutType.TRAITEE
|
||||||
|
: CardInstanceStatutType.OUVERTE;
|
||||||
|
|
||||||
|
const card = this.cardsRepo.create({
|
||||||
|
type_code: type.code,
|
||||||
|
id_placement: dto.id_placement,
|
||||||
|
id_absence: absenceId,
|
||||||
|
cree_par: userId,
|
||||||
|
operation,
|
||||||
|
statut: statutInitial,
|
||||||
|
payload: {
|
||||||
|
date_debut: dto.date_debut,
|
||||||
|
date_fin: dto.date_fin,
|
||||||
|
motif: dto.motif ?? null,
|
||||||
|
},
|
||||||
|
purge_at: this.purgeAt(type.retention_days, statutInitial),
|
||||||
|
});
|
||||||
|
const saved = await this.cardsRepo.save(card);
|
||||||
|
|
||||||
|
if (absenceId) {
|
||||||
|
await this.linkAbsenceCard(absenceId, saved.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.buildAudience(saved, type, placement, userId, role);
|
||||||
|
|
||||||
|
const full = await this.loadCard(saved.id);
|
||||||
|
return this.toDto(full, userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async repondre(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
dto: RepondreCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
await this.assertInAudience(card, userId);
|
||||||
|
if (card.statut !== CardInstanceStatutType.OUVERTE) {
|
||||||
|
throw new BadRequestException('Cette carte n’est plus ouverte');
|
||||||
|
}
|
||||||
|
if (card.cree_par === userId) {
|
||||||
|
throw new ForbiddenException('Le créateur ne répond pas à sa propre carte');
|
||||||
|
}
|
||||||
|
|
||||||
|
const mode = card.type.response_mode;
|
||||||
|
if (mode === CardResponseModeType.NONE) {
|
||||||
|
throw new BadRequestException('Ce type de carte ne demande pas de réponse');
|
||||||
|
}
|
||||||
|
if (mode === CardResponseModeType.ACK && dto.action !== CardResponseActionType.ACK) {
|
||||||
|
throw new BadRequestException('Action attendue : ack');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
mode === CardResponseModeType.ACCEPT_REFUSE &&
|
||||||
|
dto.action !== CardResponseActionType.ACCEPT &&
|
||||||
|
dto.action !== CardResponseActionType.REFUSE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Action attendue : accept ou refuse');
|
||||||
|
}
|
||||||
|
if (dto.action === CardResponseActionType.REFUSE && !dto.comment?.trim()) {
|
||||||
|
throw new BadRequestException('Motivation obligatoire en cas de refus');
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.responsesRepo.save(
|
||||||
|
this.responsesRepo.create({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: userId,
|
||||||
|
action: dto.action,
|
||||||
|
comment: dto.comment?.trim(),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (card.id_absence) {
|
||||||
|
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
statut: StatutAbsenceGardeType.ACCEPTE,
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
} else if (dto.action === CardResponseActionType.REFUSE) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
statut: StatutAbsenceGardeType.REFUSE,
|
||||||
|
motif: dto.comment!.trim(),
|
||||||
|
});
|
||||||
|
card.statut = CardInstanceStatutType.REFUSEE;
|
||||||
|
}
|
||||||
|
} else if (dto.action === CardResponseActionType.ACK) {
|
||||||
|
card.statut = CardInstanceStatutType.TRAITEE;
|
||||||
|
}
|
||||||
|
|
||||||
|
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||||
|
await this.cardsRepo.save(card);
|
||||||
|
return this.toDto(await this.loadCard(cardId), userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async majEnAttente(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
dto: MajCarteDto,
|
||||||
|
): Promise<CarteDto> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
if (card.cree_par !== userId) {
|
||||||
|
throw new ForbiddenException('Seul le créateur peut modifier cette carte');
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
card.statut !== CardInstanceStatutType.OUVERTE &&
|
||||||
|
card.statut !== CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
throw new BadRequestException('Carte non modifiable dans cet état');
|
||||||
|
}
|
||||||
|
|
||||||
|
const debut =
|
||||||
|
dto.date_debut ?? String(card.payload?.['date_debut'] ?? '');
|
||||||
|
const fin = dto.date_fin ?? String(card.payload?.['date_fin'] ?? '');
|
||||||
|
if (!debut || !fin || fin < debut) {
|
||||||
|
throw new BadRequestException('Dates invalides');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (card.id_absence) {
|
||||||
|
await this.absencesService.maj(userId, role, card.id_absence, {
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif,
|
||||||
|
statut: StatutAbsenceGardeType.EN_ATTENTE,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
card.payload = {
|
||||||
|
...card.payload,
|
||||||
|
date_debut: debut,
|
||||||
|
date_fin: fin,
|
||||||
|
motif: dto.motif ?? card.payload?.['motif'] ?? null,
|
||||||
|
};
|
||||||
|
card.statut = CardInstanceStatutType.OUVERTE;
|
||||||
|
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
||||||
|
await this.cardsRepo.save(card);
|
||||||
|
return this.toDto(await this.loadCard(cardId), userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async supprimer(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
cardId: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const card = await this.loadCard(cardId);
|
||||||
|
if (card.cree_par !== userId) {
|
||||||
|
throw new ForbiddenException('Seul le créateur peut supprimer cette carte');
|
||||||
|
}
|
||||||
|
if (card.id_absence) {
|
||||||
|
const absStatut =
|
||||||
|
card.statut === CardInstanceStatutType.TRAITEE
|
||||||
|
? null
|
||||||
|
: card.id_absence;
|
||||||
|
// Supprime l’absence liée si pas encore acceptée définitivement
|
||||||
|
if (
|
||||||
|
card.statut === CardInstanceStatutType.OUVERTE ||
|
||||||
|
card.statut === CardInstanceStatutType.REFUSEE
|
||||||
|
) {
|
||||||
|
await this.absencesService.supprimer(userId, role, card.id_absence);
|
||||||
|
}
|
||||||
|
void absStatut;
|
||||||
|
}
|
||||||
|
await this.cardsRepo.delete({ id: cardId });
|
||||||
|
}
|
||||||
|
|
||||||
|
private mapAbsenceType(typeCode: string): TypeAbsenceGardeType {
|
||||||
|
if (typeCode === 'absence_enfant' || typeCode === 'absence_enfant_modif') {
|
||||||
|
return TypeAbsenceGardeType.ABSENCE_ENFANT;
|
||||||
|
}
|
||||||
|
if (typeCode === 'conge_am') return TypeAbsenceGardeType.CONGE_AM;
|
||||||
|
if (typeCode === 'arret_maladie_am') {
|
||||||
|
return TypeAbsenceGardeType.ARRET_MALADIE_AM;
|
||||||
|
}
|
||||||
|
throw new BadRequestException(`Type non mappé à une absence: ${typeCode}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async linkAbsenceCard(absenceId: string, cardId: string): Promise<void> {
|
||||||
|
// Update direct pour éviter droits maj vides
|
||||||
|
await this.cardsRepo.manager.query(
|
||||||
|
`UPDATE absences_garde SET id_card_instance = $1, modifie_le = now() WHERE id = $2`,
|
||||||
|
[cardId, absenceId],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async buildAudience(
|
||||||
|
card: CardInstance,
|
||||||
|
type: CardType,
|
||||||
|
placement: AmChildren,
|
||||||
|
creatorId: string,
|
||||||
|
creatorRole: RoleType,
|
||||||
|
): Promise<void> {
|
||||||
|
const members: Partial<CardAudienceMember>[] = [
|
||||||
|
{
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: creatorId,
|
||||||
|
role_snapshot: creatorRole,
|
||||||
|
is_creator: true,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
if (type.audience_resolver === 'couple_am') {
|
||||||
|
members.push({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: placement.amId,
|
||||||
|
role_snapshot: RoleType.ASSISTANTE_MATERNELLE,
|
||||||
|
is_creator: false,
|
||||||
|
});
|
||||||
|
} else if (type.audience_resolver === 'couple_parents') {
|
||||||
|
const liens = await this.parentsChildrenRepo.find({
|
||||||
|
where: { enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
for (const l of liens) {
|
||||||
|
if (l.parentId === creatorId) continue;
|
||||||
|
members.push({
|
||||||
|
id_card: card.id,
|
||||||
|
id_utilisateur: l.parentId,
|
||||||
|
role_snapshot: RoleType.PARENT,
|
||||||
|
is_creator: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// dédup
|
||||||
|
const seen = new Set<string>();
|
||||||
|
const unique = members.filter((m) => {
|
||||||
|
const k = m.id_utilisateur!;
|
||||||
|
if (seen.has(k)) return false;
|
||||||
|
seen.add(k);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
await this.audienceRepo.save(this.audienceRepo.create(unique));
|
||||||
|
}
|
||||||
|
|
||||||
|
private purgeAt(
|
||||||
|
retentionDays: number,
|
||||||
|
statut: CardInstanceStatutType,
|
||||||
|
): Date {
|
||||||
|
const days =
|
||||||
|
statut === CardInstanceStatutType.OUVERTE
|
||||||
|
? Math.max(retentionDays, 15)
|
||||||
|
: retentionDays;
|
||||||
|
return new Date(Date.now() + days * 24 * 60 * 60 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async loadCard(id: string): Promise<CardInstance> {
|
||||||
|
const card = await this.cardsRepo.findOne({
|
||||||
|
where: { id },
|
||||||
|
relations: ['type', 'responses', 'audience'],
|
||||||
|
});
|
||||||
|
if (!card) throw new NotFoundException('Carte introuvable');
|
||||||
|
return card;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertInAudience(card: CardInstance, userId: string): Promise<void> {
|
||||||
|
const ok = (card.audience ?? []).some((a) => a.id_utilisateur === userId);
|
||||||
|
if (!ok) {
|
||||||
|
const row = await this.audienceRepo.findOne({
|
||||||
|
where: { id_card: card.id, id_utilisateur: userId },
|
||||||
|
});
|
||||||
|
if (!row) throw new ForbiddenException('Carte hors de votre audience');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async assertPlacementAccess(
|
||||||
|
userId: string,
|
||||||
|
role: RoleType,
|
||||||
|
placementId: string,
|
||||||
|
): Promise<AmChildren> {
|
||||||
|
const placement = await this.amChildrenRepo.findOne({
|
||||||
|
where: { id: placementId, date_fin: IsNull() },
|
||||||
|
});
|
||||||
|
if (!placement) {
|
||||||
|
throw new NotFoundException('Placement introuvable ou inactif');
|
||||||
|
}
|
||||||
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
|
if (placement.amId !== userId) {
|
||||||
|
throw new ForbiddenException('Placement non autorisé');
|
||||||
|
}
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
if (role === RoleType.PARENT) {
|
||||||
|
const lien = await this.parentsChildrenRepo.findOne({
|
||||||
|
where: { parentId: userId, enfantId: placement.enfantId },
|
||||||
|
});
|
||||||
|
if (!lien) throw new ForbiddenException('Placement non autorisé');
|
||||||
|
return placement;
|
||||||
|
}
|
||||||
|
throw new ForbiddenException('Rôle non autorisé');
|
||||||
|
}
|
||||||
|
|
||||||
|
private toDto(card: CardInstance, userId: string): CarteDto {
|
||||||
|
const lastRefuse = [...(card.responses ?? [])]
|
||||||
|
.reverse()
|
||||||
|
.find((r) => r.action === CardResponseActionType.REFUSE);
|
||||||
|
return {
|
||||||
|
id: card.id,
|
||||||
|
type_code: card.type_code,
|
||||||
|
titre: card.type?.titre ?? card.type_code,
|
||||||
|
couleur: card.type?.couleur ?? null,
|
||||||
|
id_placement: card.id_placement,
|
||||||
|
id_absence: card.id_absence ?? null,
|
||||||
|
operation: card.operation,
|
||||||
|
statut: card.statut,
|
||||||
|
payload: card.payload ?? {},
|
||||||
|
purge_at: card.purge_at?.toISOString?.() ?? String(card.purge_at),
|
||||||
|
cree_par: card.cree_par ?? null,
|
||||||
|
is_creator: card.cree_par === userId,
|
||||||
|
response_mode: card.type?.response_mode,
|
||||||
|
last_refuse_comment: lastRefuse?.comment ?? null,
|
||||||
|
cree_le: card.cree_le?.toISOString?.() ?? String(card.cree_le),
|
||||||
|
modifie_le: card.modifie_le?.toISOString?.() ?? String(card.modifie_le),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
|
||||||
|
import {
|
||||||
|
IsDateString,
|
||||||
|
IsEnum,
|
||||||
|
IsOptional,
|
||||||
|
IsString,
|
||||||
|
IsUUID,
|
||||||
|
MaxLength,
|
||||||
|
MinLength,
|
||||||
|
ValidateIf,
|
||||||
|
} from 'class-validator';
|
||||||
|
import { CardInstanceStatutType, CardOperationType } from 'src/entities/card_instances.entity';
|
||||||
|
import { CardResponseActionType } from 'src/entities/card_responses.entity';
|
||||||
|
|
||||||
|
export class CreerCarteDto {
|
||||||
|
@ApiProperty({
|
||||||
|
description: 'absence_enfant | absence_enfant_modif | conge_am | arret_maladie_am',
|
||||||
|
})
|
||||||
|
@IsString()
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
@IsUUID()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2026-10-01' })
|
||||||
|
@IsDateString()
|
||||||
|
date_debut: string;
|
||||||
|
|
||||||
|
@ApiProperty({ example: '2026-10-05' })
|
||||||
|
@IsDateString()
|
||||||
|
date_fin: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({
|
||||||
|
description: 'Requis pour operation=update (même id absences_garde)',
|
||||||
|
})
|
||||||
|
@IsOptional()
|
||||||
|
@IsUUID()
|
||||||
|
id_absence?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ enum: CardOperationType, default: CardOperationType.CREATE })
|
||||||
|
@IsOptional()
|
||||||
|
@IsEnum(CardOperationType)
|
||||||
|
operation?: CardOperationType;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RepondreCarteDto {
|
||||||
|
@ApiProperty({ enum: CardResponseActionType })
|
||||||
|
@IsEnum(CardResponseActionType)
|
||||||
|
action: CardResponseActionType;
|
||||||
|
|
||||||
|
@ApiPropertyOptional({ description: 'Obligatoire si action=refuse' })
|
||||||
|
@ValidateIf((o) => o.action === CardResponseActionType.REFUSE)
|
||||||
|
@IsString()
|
||||||
|
@MinLength(1)
|
||||||
|
@MaxLength(2000)
|
||||||
|
comment?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class MajCarteDto {
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_debut?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsDateString()
|
||||||
|
date_fin?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(2000)
|
||||||
|
motif?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class CarteDto {
|
||||||
|
@ApiProperty()
|
||||||
|
id: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
type_code: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
titre: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
couleur?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
id_placement: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
id_absence?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: CardOperationType })
|
||||||
|
operation: CardOperationType;
|
||||||
|
|
||||||
|
@ApiProperty({ enum: CardInstanceStatutType })
|
||||||
|
statut: CardInstanceStatutType;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
payload: Record<string, unknown>;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
purge_at: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
cree_par?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
is_creator: boolean;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
response_mode?: string;
|
||||||
|
|
||||||
|
@ApiPropertyOptional()
|
||||||
|
last_refuse_comment?: string | null;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
cree_le: string;
|
||||||
|
|
||||||
|
@ApiProperty()
|
||||||
|
modifie_le: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ListeCartesDto {
|
||||||
|
@ApiProperty({ type: [CarteDto] })
|
||||||
|
items: CarteDto[];
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
export { CardsModule } from './cards.module';
|
||||||
|
export { CardsService } from './cards.service';
|
||||||
+31
-20
@@ -35,13 +35,15 @@ DO $$ BEGIN
|
|||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
|
||||||
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
|
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type') THEN
|
||||||
CREATE TYPE type_evenement_type AS ENUM (
|
CREATE TYPE type_absence_garde_type AS ENUM (
|
||||||
'absence_enfant', 'conge_am', 'conge_parent', 'arret_maladie_am', 'evenement_rpe'
|
'absence_enfant', 'conge_am', 'arret_maladie_am'
|
||||||
);
|
);
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
||||||
CREATE TYPE statut_evenement_type AS ENUM ('propose', 'valide', 'refuse');
|
CREATE TYPE statut_absence_garde_type AS ENUM (
|
||||||
|
'en_attente', 'accepte', 'refuse'
|
||||||
|
);
|
||||||
END IF;
|
END IF;
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_validation_type') THEN
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_validation_type') THEN
|
||||||
CREATE TYPE statut_validation_type AS ENUM ('en_attente', 'valide', 'refuse');
|
CREATE TYPE statut_validation_type AS ENUM ('en_attente', 'valide', 'refuse');
|
||||||
@@ -307,25 +309,34 @@ CREATE TABLE avenants_contrats (
|
|||||||
);
|
);
|
||||||
|
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
-- Table : evenements
|
-- Table : absences_garde (vérité métier absences/congés/arrêt)
|
||||||
|
-- 1 ligne = 1 période ; rattachement = placement AM↔enfant (#193)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
CREATE TABLE evenements (
|
CREATE TABLE absences_garde (
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
type type_evenement_type,
|
id_placement UUID NOT NULL
|
||||||
id_enfant UUID REFERENCES enfants(id) ON DELETE CASCADE,
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||||
id_am UUID REFERENCES utilisateurs(id),
|
type type_absence_garde_type NOT NULL,
|
||||||
id_parent UUID REFERENCES parents(id_utilisateur),
|
date_debut DATE NOT NULL,
|
||||||
cree_par UUID REFERENCES utilisateurs(id),
|
date_fin DATE NOT NULL,
|
||||||
date_debut TIMESTAMPTZ,
|
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
||||||
date_fin TIMESTAMPTZ,
|
expire_at TIMESTAMPTZ NOT NULL,
|
||||||
commentaires TEXT,
|
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||||
statut statut_evenement_type DEFAULT 'propose',
|
id_card_instance UUID,
|
||||||
delai_grace TIMESTAMPTZ,
|
motif TEXT,
|
||||||
urgent BOOLEAN DEFAULT false,
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
cree_le TIMESTAMPTZ DEFAULT now(),
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
modifie_le TIMESTAMPTZ DEFAULT now()
|
CONSTRAINT chk_absences_garde_dates CHECK (date_fin >= date_debut)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE INDEX idx_absences_garde_placement_dates
|
||||||
|
ON absences_garde (id_placement, date_debut, date_fin);
|
||||||
|
CREATE INDEX idx_absences_garde_placement_type_statut
|
||||||
|
ON absences_garde (id_placement, type, statut);
|
||||||
|
CREATE INDEX idx_absences_garde_expire_at
|
||||||
|
ON absences_garde (expire_at)
|
||||||
|
WHERE statut IN ('en_attente', 'refuse');
|
||||||
|
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
-- Table : signalements_bugs
|
-- Table : signalements_bugs
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
|
|||||||
+10
-10
@@ -104,31 +104,31 @@ Ce document recense **toutes les valeurs énumérées** utilisées dans la base
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 7) Type d’événement — `type`
|
## 7) Type d’absence de garde — `type`
|
||||||
|
|
||||||
**Tables/colonnes** : `evenements.type`
|
**Tables/colonnes** : `absences_garde.type`
|
||||||
**Valeurs autorisées** :
|
**Valeurs autorisées** :
|
||||||
|
|
||||||
| Valeur | Description |
|
| Valeur | Description |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `absence_enfant` | Enfant absent |
|
| `absence_enfant` | Absence déclarée par un parent |
|
||||||
| `conge_am` | Congé de l’assistante maternelle |
|
| `conge_am` | Congé de l’assistante maternelle |
|
||||||
| `conge_parent` | Congé du parent |
|
|
||||||
| `arret_maladie_am` | Arrêt maladie AM |
|
| `arret_maladie_am` | Arrêt maladie AM |
|
||||||
| `evenement_rpe` | Événement RPE |
|
|
||||||
|
> Remplace l’ancien enum `type_evenement_type` / table `evenements` (supprimés ticket #193).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## 8) Statut d’événement — `statut`
|
## 8) Statut d’absence de garde — `statut`
|
||||||
|
|
||||||
**Tables/colonnes** : `evenements.statut`
|
**Tables/colonnes** : `absences_garde.statut`
|
||||||
**Valeurs autorisées** :
|
**Valeurs autorisées** :
|
||||||
|
|
||||||
| Valeur | Description |
|
| Valeur | Description |
|
||||||
|---|---|
|
|---|---|
|
||||||
| `propose` | Événement proposé |
|
| `en_attente` | En attente de validation / ack |
|
||||||
| `valide` | Événement validé |
|
| `accepte` | Accepté / acté (conservé en historique métier) |
|
||||||
| `rejete` | Événement refusé |
|
| `refuse` | Refusé (temporaire ; purge TTL) |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -42,10 +42,8 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
|||||||
| **contrats(id_dossier)** → `dossiers(id)` | **CASCADE** | 1:1, contrat détruit si dossier supprimé |
|
| **contrats(id_dossier)** → `dossiers(id)` | **CASCADE** | 1:1, contrat détruit si dossier supprimé |
|
||||||
| **avenants_contrats(id_contrat)** → `contrats(id)` | **CASCADE** | Avenants détruits avec le contrat |
|
| **avenants_contrats(id_contrat)** → `contrats(id)` | **CASCADE** | Avenants détruits avec le contrat |
|
||||||
| **avenants_contrats(initie_par)** → `utilisateurs(id)` | **SET NULL** | Historiser l’avenant sans bloquer |
|
| **avenants_contrats(initie_par)** → `utilisateurs(id)` | **SET NULL** | Historiser l’avenant sans bloquer |
|
||||||
| **evenements(id_enfant)** → `enfants(id)` | **CASCADE** | Événements n’ont plus de sens |
|
| **absences_garde(id_placement)** → `enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus d’absences |
|
||||||
| **evenements(id_am)** → `utilisateurs(id)` | **SET NULL** | Garder la trace même si AM supprimée |
|
| **absences_garde(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver la période si user supprimé |
|
||||||
| **evenements(id_parent)** → `parents(id_utilisateur)` | **SET NULL** | Garder la trace si parent supprimé |
|
|
||||||
| **evenements(cree_par)** → `utilisateurs(id)` | **SET NULL** | Conserver l’historique de création |
|
|
||||||
| **signalements_bugs(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Conserver le ticket même si compte supprimé |
|
| **signalements_bugs(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Conserver le ticket même si compte supprimé |
|
||||||
| **uploads(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Fichier reste référencé sans l’auteur |
|
| **uploads(id_utilisateur)** → `utilisateurs(id)` | **SET NULL** | Fichier reste référencé sans l’auteur |
|
||||||
| **notifications(id_utilisateur)** → `utilisateurs(id)` | **CASCADE** | Notifications propres à l’utilisateur |
|
| **notifications(id_utilisateur)** → `utilisateurs(id)` | **CASCADE** | Notifications propres à l’utilisateur |
|
||||||
@@ -79,10 +77,8 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
|||||||
- `avenants_contrats.initie_par` → **SET NULL**
|
- `avenants_contrats.initie_par` → **SET NULL**
|
||||||
|
|
||||||
### Événements
|
### Événements
|
||||||
- `evenements.id_enfant` → **CASCADE**
|
- `absences_garde.id_placement` → **CASCADE**
|
||||||
- `evenements.id_am` → **SET NULL**
|
- `absences_garde.cree_par` → **SET NULL**
|
||||||
- `evenements.id_parent` → **SET NULL**
|
|
||||||
- `evenements.cree_par` → **SET NULL**
|
|
||||||
|
|
||||||
### Divers
|
### Divers
|
||||||
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
- `signalements_bugs.id_utilisateur` → **SET NULL**
|
||||||
@@ -109,11 +105,11 @@ Documenter, de façon unique et partagée, les règles de suppression/mise à jo
|
|||||||
|
|
||||||
4. **Suppression d’un enfant**
|
4. **Suppression d’un enfant**
|
||||||
- Supprimer `enfants(id=childA)`
|
- Supprimer `enfants(id=childA)`
|
||||||
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `evenements` du childA (CASCADE).
|
- Attendu : `enfants_parents` (CASCADE), `dossiers` du childA (CASCADE), `absences_garde` des placements du childA (CASCADE via EAM).
|
||||||
|
|
||||||
5. **Suppression d’un utilisateur AM**
|
5. **Suppression d’un utilisateur AM**
|
||||||
- Supprimer `utilisateurs(id=amB)`
|
- Supprimer `utilisateurs(id=amB)`
|
||||||
- Attendu : `evenements.id_am` devient **NULL** (historique conservé).
|
- Attendu : absences liées via placement AM (CASCADE si le lien EAM est retiré).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
-- Ticket #193 — Back métier absences / congés / arrêt (périodes par placement)
|
||||||
|
-- Idempotent : safe à rejouer.
|
||||||
|
-- Remplace la table legacy `evenements` (mal conçue, non utilisée en API).
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- Enums
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_absence_garde_type') THEN
|
||||||
|
CREATE TYPE type_absence_garde_type AS ENUM (
|
||||||
|
'absence_enfant',
|
||||||
|
'conge_am',
|
||||||
|
'arret_maladie_am'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_absence_garde_type') THEN
|
||||||
|
CREATE TYPE statut_absence_garde_type AS ENUM (
|
||||||
|
'en_attente',
|
||||||
|
'accepte',
|
||||||
|
'refuse'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- Table absences_garde (1 ligne = 1 période)
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
CREATE TABLE IF NOT EXISTS absences_garde (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
id_placement UUID NOT NULL
|
||||||
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||||
|
type type_absence_garde_type NOT NULL,
|
||||||
|
date_debut DATE NOT NULL,
|
||||||
|
date_fin DATE NOT NULL,
|
||||||
|
statut statut_absence_garde_type NOT NULL DEFAULT 'en_attente',
|
||||||
|
-- TTL purge : obligatoire ; pour statut=accepte utiliser 'infinity' (pas de purge métier)
|
||||||
|
expire_at TIMESTAMPTZ NOT NULL,
|
||||||
|
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||||
|
id_card_instance UUID NULL,
|
||||||
|
motif TEXT,
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
CONSTRAINT chk_absences_garde_dates CHECK (date_fin >= date_debut)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_absences_garde_placement_dates
|
||||||
|
ON absences_garde (id_placement, date_debut, date_fin);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_absences_garde_placement_type_statut
|
||||||
|
ON absences_garde (id_placement, type, statut);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_absences_garde_expire_at
|
||||||
|
ON absences_garde (expire_at)
|
||||||
|
WHERE statut IN ('en_attente', 'refuse');
|
||||||
|
|
||||||
|
COMMENT ON TABLE absences_garde IS
|
||||||
|
'Vérité métier des absences/congés/arrêts par couple AM↔enfant (placement). Les cartes collectent ; cette table stocke.';
|
||||||
|
COMMENT ON COLUMN absences_garde.expire_at IS
|
||||||
|
'Purge auto (job ultérieur) pour en_attente/refuse. accepte → infinity.';
|
||||||
|
COMMENT ON COLUMN absences_garde.id_card_instance IS
|
||||||
|
'Réf. carte de collecte (FK cards quand le module Cartes existera).';
|
||||||
|
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
-- Drop legacy evenements (+ enums si plus référencés)
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
DROP TABLE IF EXISTS evenements CASCADE;
|
||||||
|
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_type')
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE udt_name = 'type_evenement_type'
|
||||||
|
) THEN
|
||||||
|
DROP TYPE type_evenement_type;
|
||||||
|
END IF;
|
||||||
|
IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_evenement_type')
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM information_schema.columns
|
||||||
|
WHERE udt_name = 'statut_evenement_type'
|
||||||
|
) THEN
|
||||||
|
DROP TYPE statut_evenement_type;
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
-- Ticket #194 — Module Cartes SYSTEM (collecte absences/congés/arrêt)
|
||||||
|
-- Idempotent.
|
||||||
|
|
||||||
|
DO $$
|
||||||
|
BEGIN
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_response_mode_type') THEN
|
||||||
|
CREATE TYPE card_response_mode_type AS ENUM (
|
||||||
|
'none', 'ack', 'accept_refuse'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_instance_statut_type') THEN
|
||||||
|
CREATE TYPE card_instance_statut_type AS ENUM (
|
||||||
|
'ouverte', 'refusee', 'traitee'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_operation_type') THEN
|
||||||
|
CREATE TYPE card_operation_type AS ENUM ('create', 'update');
|
||||||
|
END IF;
|
||||||
|
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_response_action_type') THEN
|
||||||
|
CREATE TYPE card_response_action_type AS ENUM (
|
||||||
|
'accept', 'refuse', 'ack'
|
||||||
|
);
|
||||||
|
END IF;
|
||||||
|
END $$;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_types (
|
||||||
|
code VARCHAR(64) PRIMARY KEY,
|
||||||
|
system BOOLEAN NOT NULL DEFAULT true,
|
||||||
|
titre VARCHAR(120) NOT NULL,
|
||||||
|
emitter_roles TEXT[] NOT NULL,
|
||||||
|
recipient_roles TEXT[] NOT NULL,
|
||||||
|
audience_resolver VARCHAR(64) NOT NULL,
|
||||||
|
response_mode card_response_mode_type NOT NULL,
|
||||||
|
retention_days INT NOT NULL DEFAULT 14,
|
||||||
|
couleur VARCHAR(32),
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_instances (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
type_code VARCHAR(64) NOT NULL REFERENCES card_types(code),
|
||||||
|
id_placement UUID NOT NULL
|
||||||
|
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
||||||
|
id_absence UUID REFERENCES absences_garde(id) ON DELETE SET NULL,
|
||||||
|
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
||||||
|
operation card_operation_type NOT NULL DEFAULT 'create',
|
||||||
|
statut card_instance_statut_type NOT NULL DEFAULT 'ouverte',
|
||||||
|
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
||||||
|
purge_at TIMESTAMPTZ NOT NULL,
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||||
|
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_instances_placement
|
||||||
|
ON card_instances (id_placement, statut, cree_le DESC);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_instances_purge
|
||||||
|
ON card_instances (purge_at);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_instances_absence
|
||||||
|
ON card_instances (id_absence)
|
||||||
|
WHERE id_absence IS NOT NULL;
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_audience_members (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
id_card UUID NOT NULL REFERENCES card_instances(id) ON DELETE CASCADE,
|
||||||
|
id_utilisateur UUID NOT NULL REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||||
|
role_snapshot VARCHAR(64) NOT NULL,
|
||||||
|
is_creator BOOLEAN NOT NULL DEFAULT false,
|
||||||
|
UNIQUE (id_card, id_utilisateur)
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_audience_user
|
||||||
|
ON card_audience_members (id_utilisateur, id_card);
|
||||||
|
|
||||||
|
CREATE TABLE IF NOT EXISTS card_responses (
|
||||||
|
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||||
|
id_card UUID NOT NULL REFERENCES card_instances(id) ON DELETE CASCADE,
|
||||||
|
id_utilisateur UUID NOT NULL REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
||||||
|
action card_response_action_type NOT NULL,
|
||||||
|
comment TEXT,
|
||||||
|
cree_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_card_responses_card
|
||||||
|
ON card_responses (id_card, cree_le DESC);
|
||||||
|
|
||||||
|
-- Seeds SYSTEM
|
||||||
|
INSERT INTO card_types (
|
||||||
|
code, system, titre, emitter_roles, recipient_roles,
|
||||||
|
audience_resolver, response_mode, retention_days, couleur
|
||||||
|
) VALUES
|
||||||
|
(
|
||||||
|
'absence_enfant', true, 'Absence enfant',
|
||||||
|
ARRAY['parent'], ARRAY['assistante_maternelle'],
|
||||||
|
'couple_am', 'none', 7, 'peach'
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'absence_enfant_modif', true, 'Absence enfant modifiée',
|
||||||
|
ARRAY['parent'], ARRAY['assistante_maternelle'],
|
||||||
|
'couple_am', 'ack', 7, 'peach'
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'conge_am', true, 'Congé AM',
|
||||||
|
ARRAY['assistante_maternelle'], ARRAY['parent'],
|
||||||
|
'couple_parents', 'accept_refuse', 14, 'lavender'
|
||||||
|
),
|
||||||
|
(
|
||||||
|
'arret_maladie_am', true, 'Arrêt maladie AM',
|
||||||
|
ARRAY['assistante_maternelle'], ARRAY['parent'],
|
||||||
|
'couple_parents', 'ack', 14, 'pink'
|
||||||
|
)
|
||||||
|
ON CONFLICT (code) DO UPDATE SET
|
||||||
|
titre = EXCLUDED.titre,
|
||||||
|
emitter_roles = EXCLUDED.emitter_roles,
|
||||||
|
recipient_roles = EXCLUDED.recipient_roles,
|
||||||
|
audience_resolver = EXCLUDED.audience_resolver,
|
||||||
|
response_mode = EXCLUDED.response_mode,
|
||||||
|
retention_days = EXCLUDED.retention_days,
|
||||||
|
couleur = EXCLUDED.couleur,
|
||||||
|
modifie_le = now();
|
||||||
|
|
||||||
|
COMMENT ON TABLE card_types IS 'Catalogue types de cartes (SYSTEM seeds #194 ; OPTIONNEL plus tard).';
|
||||||
|
COMMENT ON TABLE card_instances IS 'Bulles / file d’attention — collecte, pas vérité métier absences.';
|
||||||
@@ -161,23 +161,9 @@ VALUES (
|
|||||||
ON CONFLICT (id) DO NOTHING;
|
ON CONFLICT (id) DO NOTHING;
|
||||||
|
|
||||||
-- ------------------------------------------------------------
|
-- ------------------------------------------------------------
|
||||||
-- Événement (absence enfant)
|
-- Absences_garde : seeds quand placements EAM présents (API / ticket peuplement)
|
||||||
|
-- Legacy evenements supprimée (#193).
|
||||||
-- ------------------------------------------------------------
|
-- ------------------------------------------------------------
|
||||||
INSERT INTO evenements (id, type, id_enfant, id_am, id_parent, cree_par, date_debut, date_fin, commentaires, statut, urgence)
|
|
||||||
VALUES (
|
|
||||||
'e0000000-0000-0000-0000-000000000001',
|
|
||||||
'absence_enfant',
|
|
||||||
'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa',
|
|
||||||
'66666666-6666-6666-6666-666666666666',
|
|
||||||
'33333333-3333-3333-3333-333333333333',
|
|
||||||
'33333333-3333-3333-3333-333333333333',
|
|
||||||
'2025-09-12',
|
|
||||||
'2025-09-12',
|
|
||||||
'Enfant malade (rhume).',
|
|
||||||
'propose',
|
|
||||||
false
|
|
||||||
)
|
|
||||||
ON CONFLICT (id) DO NOTHING;
|
|
||||||
|
|
||||||
-- ------------------------------------------------------------
|
-- ------------------------------------------------------------
|
||||||
-- Upload (justificatif lié au dossier)
|
-- Upload (justificatif lié au dossier)
|
||||||
|
|||||||
@@ -79,12 +79,11 @@ LEFT JOIN avenants_contrats a ON a.id_contrat = c.id
|
|||||||
GROUP BY c.id, c.id_dossier, c.statut
|
GROUP BY c.id, c.id_dossier, c.statut
|
||||||
ORDER BY c.cree_le DESC;
|
ORDER BY c.cree_le DESC;
|
||||||
|
|
||||||
\echo '=== 9) Evénements par enfant (30 derniers jours) =============='
|
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
|
||||||
SELECT ev.id, ev.type, ev.id_enfant, e.prenom AS enfant, ev.date_debut, ev.date_fin, ev.statut
|
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
|
||||||
FROM evenements ev
|
FROM absences_garde ag
|
||||||
JOIN enfants e ON e.id = ev.id_enfant
|
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
|
||||||
WHERE ev.date_debut >= (NOW()::date - INTERVAL '30 days')
|
ORDER BY ag.date_debut DESC;
|
||||||
ORDER BY ev.date_debut DESC;
|
|
||||||
|
|
||||||
\echo '=== 10) Uploads & notifications récentes ======================='
|
\echo '=== 10) Uploads & notifications récentes ======================='
|
||||||
SELECT u.courriel, up.fichier_url, up.type_fichier, up.cree_le
|
SELECT u.courriel, up.fichier_url, up.type_fichier, up.cree_le
|
||||||
@@ -135,11 +134,11 @@ FROM avenants_contrats a
|
|||||||
LEFT JOIN contrats c ON c.id = a.id_contrat
|
LEFT JOIN contrats c ON c.id = a.id_contrat
|
||||||
WHERE c.id IS NULL;
|
WHERE c.id IS NULL;
|
||||||
|
|
||||||
-- Evénements sans enfant
|
-- Absences sans placement
|
||||||
SELECT ev.*
|
SELECT ag.*
|
||||||
FROM evenements ev
|
FROM absences_garde ag
|
||||||
LEFT JOIN enfants e ON e.id = ev.id_enfant
|
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
|
||||||
WHERE e.id IS NULL;
|
WHERE eam.id IS NULL;
|
||||||
|
|
||||||
\echo '=== 13) Performance : EXPLAIN sur requêtes clés ==============='
|
\echo '=== 13) Performance : EXPLAIN sur requêtes clés ==============='
|
||||||
|
|
||||||
@@ -151,12 +150,12 @@ WHERE m.id_dossier = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
|
|||||||
ORDER BY m.cree_le DESC
|
ORDER BY m.cree_le DESC
|
||||||
LIMIT 20;
|
LIMIT 20;
|
||||||
|
|
||||||
-- Evénements par enfant et période (idx_evenements_id_enfant_date_debut)
|
-- Absences par placement et période (idx_absences_garde_placement_dates)
|
||||||
EXPLAIN ANALYZE
|
EXPLAIN ANALYZE
|
||||||
SELECT ev.*
|
SELECT ag.*
|
||||||
FROM evenements ev
|
FROM absences_garde ag
|
||||||
WHERE ev.id_enfant = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
|
WHERE ag.id_placement IS NOT NULL
|
||||||
AND ev.date_debut >= '2025-01-01';
|
AND ag.date_debut >= '2025-01-01';
|
||||||
|
|
||||||
-- Notifications non lues (idx_notifications_user_lu_cree_le)
|
-- Notifications non lues (idx_notifications_user_lu_cree_le)
|
||||||
EXPLAIN ANALYZE
|
EXPLAIN ANALYZE
|
||||||
@@ -199,7 +198,7 @@ SELECT
|
|||||||
(SELECT COUNT(*) FROM messages) AS nb_messages,
|
(SELECT COUNT(*) FROM messages) AS nb_messages,
|
||||||
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
|
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
|
||||||
(SELECT COUNT(*) FROM avenants_contrats) AS nb_avenants,
|
(SELECT COUNT(*) FROM avenants_contrats) AS nb_avenants,
|
||||||
(SELECT COUNT(*) FROM evenements) AS nb_evenements,
|
(SELECT COUNT(*) FROM absences_garde) AS nb_absences_garde,
|
||||||
(SELECT COUNT(*) FROM uploads) AS nb_uploads,
|
(SELECT COUNT(*) FROM uploads) AS nb_uploads,
|
||||||
(SELECT COUNT(*) FROM notifications) AS nb_notifications,
|
(SELECT COUNT(*) FROM notifications) AS nb_notifications,
|
||||||
(SELECT COUNT(*) FROM validations) AS nb_validations;
|
(SELECT COUNT(*) FROM validations) AS nb_validations;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# 📋 Décisions Projet - P'titsPas
|
# 📋 Décisions Projet - P'titsPas
|
||||||
|
|
||||||
**Version** : 1.3
|
**Version** : 1.4
|
||||||
**Date** : 24 Septembre 2026
|
**Date** : 24 Septembre 2026
|
||||||
**Auteur** : Équipe PtitsPas
|
**Auteur** : Équipe PtitsPas
|
||||||
|
|
||||||
@@ -570,6 +570,19 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
### 32. Module Absences + Cartes (séparation back / collecte)
|
||||||
|
|
||||||
|
**Décision** : ✅ **Back `absences_garde` = vérité métier** ; **Cartes = file d’attention / collecte** (plugin isolé). Types SYSTEM (absence, congé, arrêt) indéboulonnables ; types OPTIONNELS (sondages…) plus tard. Annulation = DELETE. `expire_at` dès V1.
|
||||||
|
|
||||||
|
**Justification** :
|
||||||
|
- Premier vrai module d’interaction multi-acteurs
|
||||||
|
- Évite de stocker l’historique congés dans des bulles éphémères
|
||||||
|
- Portabilité / généricité des cartes sans coupler le métier garde
|
||||||
|
|
||||||
|
**Flux V1** : BDD absences → API liste/CRUD → module Cartes SYSTEM → front bulles (séparé).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## 📋 Résumé des décisions critiques
|
## 📋 Résumé des décisions critiques
|
||||||
|
|
||||||
| # | Décision | Statut | Impact |
|
| # | Décision | Statut | Impact |
|
||||||
@@ -590,6 +603,7 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
|||||||
| 14 | Migration données | ❌ Rejeté | N/A |
|
| 14 | Migration données | ❌ Rejeté | N/A |
|
||||||
| 15 | Doc utilisateur | ⏸️ Phase 2 | Formation |
|
| 15 | Doc utilisateur | ⏸️ Phase 2 | Formation |
|
||||||
| 31 | Logs Winston | ✅ Phase 1 | Monitoring |
|
| 31 | Logs Winston | ✅ Phase 1 | Monitoring |
|
||||||
|
| 32 | Absences back + Cartes collecte | ✅ 0.2.0 | Métier / archi |
|
||||||
| 5bis | Familles recomposées — 2ᵉ compte v1.0.0 | ✅ v1.0.0 | Métier / dossier |
|
| 5bis | Familles recomposées — 2ᵉ compte v1.0.0 | ✅ v1.0.0 | Métier / dossier |
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -601,11 +615,11 @@ POST /repos/jmartin/petitspas/pulls/{index}/merge
|
|||||||
| 25/11/2025 | 1.0 | Création du document - Toutes les décisions initiales |
|
| 25/11/2025 | 1.0 | Création du document - Toutes les décisions initiales |
|
||||||
| 09/02/2026 | 1.1 | Configuration initiale : un seul panneau Paramètres (3 sections) dans le dashboard, plus de Setup Wizard dédié ; navigation bloquée jusqu'à sauvegarde |
|
| 09/02/2026 | 1.1 | Configuration initiale : un seul panneau Paramètres (3 sections) dans le dashboard, plus de Setup Wizard dédié ; navigation bloquée jusqu'à sauvegarde |
|
||||||
| 16/06/2026 | 1.2 | Décision 5bis — familles recomposées, contournement v1.0.0 ; lien doc [28](./28_EVOLUTION-FAMILLE-ET-RESPONSABLES.md) |
|
| 16/06/2026 | 1.2 | Décision 5bis — familles recomposées, contournement v1.0.0 ; lien doc [28](./28_EVOLUTION-FAMILLE-ET-RESPONSABLES.md) |
|
||||||
| 16/06/2026 | 1.3 | Précision 5bis — cible post-1.0.0 : parcours gestionnaire § 7.5 (#139), visibilité par enfant |
|
| 24/09/2026 | 1.4 | Décision 32 — Absences (`absences_garde`) ≠ Cartes ; Epic C recentré ; drop `evenements` |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Dernière mise à jour** : 16 Juin 2026
|
**Dernière mise à jour** : 24 Septembre 2026
|
||||||
**Version** : 1.2
|
**Version** : 1.4
|
||||||
**Statut** : ✅ Document validé
|
**Statut** : ✅ Document validé
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
# Découpage tickets — Quotidien parent / AM
|
# Découpage tickets — Quotidien parent / AM
|
||||||
|
|
||||||
> **Statut :** backlog Gitea créé (**milestone `0.2.0`**, **#165–#189**) — *création anticipée avant validation PO* ; **descriptions enrichies** ensuite à partir de la mini-spec / découpage.
|
> **Statut :** backlog Gitea **0.2.0** / épic [#165](https://git.ptits-pas.fr/jmartin/petitspas/issues/165) — architecture absences + cartes recentrée (sept. 2026).
|
||||||
> **Réf. visuelle :** [maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png](./maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png)
|
> **Réf. visuelle :** [maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png](./maquettes/courantes/maquette-dashboard-parent-quotidien-v4.png)
|
||||||
> **Mini-spec :** [31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md)
|
> **Mini-spec :** [31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md](./31_MINI-SPEC-QUOTIDIEN-PARENT-AM.md)
|
||||||
> **Règle :** tickets **front** / **back** séparés · widgets partagés parent↔AM · **pas d’implé code** tant que le PO n’a pas validé le backlog.
|
> **Décision :** [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §32 (Cartes ≠ back Absences).
|
||||||
|
|
||||||
## Intention produit (rappel)
|
## Intention produit (rappel)
|
||||||
|
|
||||||
@@ -96,22 +96,31 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## Epic C — Cartes (file du quotidien)
|
## Epic C — Absences + Cartes (file d’attention)
|
||||||
|
|
||||||
### C1 — [Back] Modèle + API cartes / événements de garde
|
**Séparation :** back **`absences_garde`** = vérité métier (périodes / placement) ; module **Cartes** = collecte / bulles / workflow. Annulation = DELETE. `expire_at` dès le modèle.
|
||||||
Types V1 : absence enfant, congé AM, maladie AM (« arrêt »), sortie à valider. CRUD / transitions de statut ; liaison couple / agenda (hook minimal). Règles : absence enfant sans veto AM ; congé AM accepter/refuser (**1 parent suffit**) ; maladie AM accusé parent ; sortie **1 parent suffit**. Aucun doc médical stocké.
|
|
||||||
|
|
||||||
### C2 — [Front] Flux de cartes colonne gauche (parent)
|
### Back (ordre)
|
||||||
Liste scroll pastel (palette `assets/cards/` — 7 couleurs) ; ouverture détail ; actions valider / refuser / accusé selon type. Bouton **Déclarer une absence** (+ autres actions TBD plus tard).
|
|
||||||
|
|
||||||
### C3 — [Front] Flux de cartes colonne gauche (AM)
|
| Étape | Contenu |
|
||||||
Miroir : création congé / maladie / sortie ; lecture absences enfants du jour / à venir.
|
|-------|---------|
|
||||||
|
| BDD | Table `absences_garde` + drop `evenements` |
|
||||||
|
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||||
|
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||||
|
| Realtime | WS/SSE bulles |
|
||||||
|
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||||
|
|
||||||
### C4 — [Front] Formulaire déclarer une absence (parent)
|
### Front (après API — hors chantier back immédiat)
|
||||||
Saisie période (+ motif léger si besoin) → crée une carte côté AM.
|
|
||||||
|
|
||||||
### C5 — [Front] Formulaires AM congé / maladie / sortie
|
| Ticket | Contenu |
|
||||||
Création des cartes correspondantes + ciblage enfants si sortie.
|
|--------|---------|
|
||||||
|
| Feed parent / AM | File d’attention bulles (widget partagé) |
|
||||||
|
| Modale « Ajouter une bulle » | Générique + absence parent / congé·arrêt AM |
|
||||||
|
| Agenda | Consommer GET liste (lignes) |
|
||||||
|
|
||||||
|
### Hors V1 cartes
|
||||||
|
|
||||||
|
Sondages / catalogue admin OPTIONNEL / sortie riche / desktop 2 panneaux (évolution séparée).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -185,13 +194,15 @@ Scripts / seeds : foyer 2 parents, AM, enfant(s), quelques cartes, posts blog, f
|
|||||||
|
|
||||||
## Ordre de réalisation suggéré
|
## Ordre de réalisation suggéré
|
||||||
|
|
||||||
1. **A1 → A2 → A3** (coquille + contexte parent)
|
1. **A1 → A2 → A3** (coquille + contexte parent) — *fait*
|
||||||
2. **C1 → C2 / C4** (premières cartes utiles)
|
2. **BDD absences → API absences** puis **Cartes SYSTEM** (congés/absences/arrêt)
|
||||||
3. **D1 → D2 / D3** (blog central)
|
3. **Feed / modale bulles** (front) + agenda lignes
|
||||||
4. **E1 → E2 → E4** (messagerie AM)
|
4. **D1 → D2 / D3** (blog)
|
||||||
5. **B1 → B2 → B3** + miroirs C3/C5/D3/E5 (AM)
|
5. **E1 → E2 → E4** (messagerie AM)
|
||||||
6. **E3 / E5 / E6 / D4** (RPE)
|
6. **B1 → B2 → B3** + miroirs AM
|
||||||
7. **F1 → F2** + **G1** (nav, mobile, seeds)
|
7. Realtime / purge TTL / RPE / F/G
|
||||||
|
|
||||||
|
Desktop 2 panneaux (cartes prioritaires sur blog) = **évolution hors 0.2.0**.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -61,14 +61,20 @@ Bandeau : **TdB** · **Agenda** · **Contrat** · menu user (recherche AM, param
|
|||||||
| **Mess. AM** | Chat foyer ↔ AM (style WhatsApp : texte, emoji, images) |
|
| **Mess. AM** | Chat foyer ↔ AM (style WhatsApp : texte, emoji, images) |
|
||||||
| **Mess. RPE** | Privée par défaut ; ajout de participants pour médiation / conflit |
|
| **Mess. RPE** | Privée par défaut ; ajout de participants pour médiation / conflit |
|
||||||
|
|
||||||
## 5. Règles métier V1
|
## 5. Règles métier V1 (absences / congés)
|
||||||
|
|
||||||
| Type | Qui initie | Validation |
|
| Type | Qui initie | Validation / effet |
|
||||||
|------|------------|------------|
|
|------|------------|-------------------|
|
||||||
| Absence enfant | Parent | Pas de veto AM |
|
| Absence enfant | Parent | Pas de veto AM ; période **acceptée** tout de suite ; bulle info AM |
|
||||||
| Congé AM | AM | **1 parent** accepte ou refuse |
|
| Congé AM | AM | **1 parent** accepte **ou** refuse (+ motivation) → bounce AM (modif/renvoi ou DELETE) |
|
||||||
| Maladie AM | AM | Parent accuse réception (pas de doc médical in-app) |
|
| Modification congé AM déjà accepté | AM | Même `id` absence ; re-validation parents ; dates actives = anciennes tant qu’en attente |
|
||||||
| Sortie | AM / RPE | **1 parent** suffit (présence / absence) ; explication aussi via blog |
|
| Modification absence enfant | Parent | Update immédiat + bulle **ack** AM (OK) |
|
||||||
|
| Maladie AM | AM | Parent **ack** (« bien reçu ») ; **aucun** doc médical |
|
||||||
|
| Sortie / sondage | — | **Plus tard** (types optionnels) |
|
||||||
|
|
||||||
|
**Stockage :** table `absences_garde` (1 ligne = période, `id_placement`, `expire_at`). Les **cartes** collectent ; elles ne sont pas la source de vérité. Annulation = DELETE.
|
||||||
|
|
||||||
|
**Péremption cartes :** mémoire courte (`retention_days` / `purge_at`) — pas un historique de vie (≠ messagerie).
|
||||||
|
|
||||||
- Mess. AM : les **2 parents** voient le **même** fil — **pas** de masquage V1
|
- Mess. AM : les **2 parents** voient le **même** fil — **pas** de masquage V1
|
||||||
- Blog auteurs V1 : **AM** + **gestionnaire (RPE)** — parent auteur = plus tard
|
- Blog auteurs V1 : **AM** + **gestionnaire (RPE)** — parent auteur = plus tard
|
||||||
|
|||||||
Reference in New Issue
Block a user