Compare commits

...
Author SHA1 Message Date
jmartin 4007d7010e Merge branch 'develop' of https://git.ptits-pas.fr/jmartin/petitspas into develop 2026-09-24 12:19:40 +02:00
jmartinandCursor 4261667198 feat(#170): sélecteur couple enfant-parent(s) pour AM
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 12:19:26 +02:00
jmartin 15e2d8d850 Merge branch 'feature/171-api-couples-garde-am' into develop
API couples-garde AM (#171).
2026-09-24 12:17:09 +02:00
jmartinandCursor 34a516d509 feat(#169): coquille TdB AM 3 colonnes
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 12:16:44 +02:00
jmartinandCursor da71803852 feat(#171): API couples-garde AM (liste + courant)
Symétrique #168 : GET/PUT /assistantes-maternelles/me/couples-garde
avec parents[] pour le bandeau enfant|foyer. Colonne
id_placement_garde_courant sur assistantes_maternelles.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 12:14:16 +02:00
jmartin 2380aa9826 Merge branch 'develop' of https://git.ptits-pas.fr/jmartin/petitspas into develop 2026-09-24 11:58:52 +02:00
jmartin c952113099 Merge branch 'feature/187-agenda-absences-stub' into develop 2026-09-24 11:58:38 +02:00
jmartinandCursor 8204669ec9 fix(ui): use TokenService to fix 401 Unauthorized when calling absences API
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 11:57:03 +02:00
jmartin 76ab0f340a Merge branch 'feature/195-realtime-cartes' into develop
Realtime SSE Cartes (#195).
2026-09-24 11:55:17 +02:00
jmartinandCursor a0a5e15b04 feat(front): add app icon for android, web and windows + agenda stub
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 11:53:43 +02:00
jmartinandCursor 823ea6cd22 feat(#195): SSE realtime Cartes (stream + emit audience)
GET /api/v1/cards/stream (Bearer ou ?access_token=).
Events card.created|updated|deleted, response.added + heartbeat.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 11:50:30 +02:00
jmartin dfac075a74 fix: JwtModule AbsencesGarde + Cards (AuthGuard DI)
Corrige crash-loop Nest AuthGuard DI.

Co-authored-by: Julien Martin <julien.martin@ptits-pas.fr>
2026-09-24 09:44:00 +00:00
jmartin 2d8b857a84 feat(#194): module Cartes SYSTEM
Closes #194

Co-authored-by: Julien Martin <julien.martin@ptits-pas.fr>
2026-09-24 09:38:39 +00:00
jmartin 147051821a feat(#172): API absences-garde (liste, CRUD, droits parent/AM)
Closes #172

Co-authored-by: Julien Martin <julien.martin@ptits-pas.fr>
2026-09-24 09:18:52 +00:00
jmartin 41f7006073 docs: Epic C — absences back ≠ cartes (§32)
Découpage + mini-spec + décision projet.

Co-authored-by: Julien Martin <julien.martin@ptits-pas.fr>
2026-09-24 09:13:19 +00:00
jmartin 8d8627cf38 feat(#193): table absences_garde + drop evenements
Closes #193

Co-authored-by: Julien Martin <julien.martin@ptits-pas.fr>
2026-09-24 09:09:57 +00:00
jmartin 6a586110e7 docs: norme merge squash (feature→develop→master)
Décision §26 + briefing + API Gitea. Les merges --no-ff #167/#168 restent inchangés.

Co-authored-by: Julien Martin <julien.martin@ptits-pas.fr>
2026-09-23 22:56:04 +00:00
jmartin f9fd8d73a8 Merge branch 'feature/168-api-couples-garde-parent' into develop
Closes #168 — API couples de garde parent.
2026-09-24 00:53:38 +02:00
jmartinandCursor 93ee3a5549 fix(#168): typage colonne placement garde courant compatible TypeORM.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:51:06 +02:00
jmartinandCursor db08aca714 feat(#168): API couples de garde parent (liste + couple courant).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:51:05 +02:00
jmartin 494f0e4c19 Merge branch 'feature/167-selecteur-couple-enfant-nounou' into develop 2026-09-24 00:47:10 +02:00
jmartinandCursor 9a4664a8ea fix(ui): align right tile by reserving chevron space
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:45:01 +02:00
jmartinandCursor bf00933f65 fix(ui): use pencil line asset for separation in CoupleSelectorBandeau
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:43:16 +02:00
jmartinandCursor 7b4650b81b fix(ui): show only first name and increase font size to 22 in CoupleSelectorBandeau
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:41:32 +02:00
jmartinandCursor b7ae07f5aa fix(ui): increase font size for names in CoupleSelectorBandeau
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:39:20 +02:00
jmartinandCursor a88f791317 fix(ui): increase avatar size in CoupleSelectorBandeau
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:38:32 +02:00
jmartinandCursor 138398a4a0 fix(ui): remove opacity on dropdown items and assign unique bandeau colors by index
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:35:52 +02:00
jmartin 7cf30643aa Merge branch 'feature/167-selecteur-couple-enfant-nounou' into develop 2026-09-24 00:33:12 +02:00
jmartinandCursor 5eb3468fe0 fix(ui): prevent dropdown menu from overlapping main button in CoupleSelectorBandeau
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:33:02 +02:00
jmartinandCursor df4f48e864 feat(front): selecteur couple enfant-nounou (#167)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-09-24 00:12:10 +02:00
jmartin 6f9136aae5 Merge branch 'feature/166-tdb-parent-coquille-bandeau' into develop (#166) 2026-09-23 23:39:56 +02:00
87 changed files with 5035 additions and 286 deletions
+4
View File
@@ -16,6 +16,8 @@ import { AllExceptionsFilter } from './common/filters/all_exceptions.filters';
import { EnfantsModule } from './routes/enfants/enfants.module';
import { AppConfigModule } from './modules/config/config.module';
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 { DossiersModule } from './routes/dossiers/dossiers.module';
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
@@ -56,6 +58,8 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
AuthModule,
AppConfigModule,
DocumentsLegauxModule,
AbsencesGardeModule,
CardsModule,
RelaisModule,
DossiersModule,
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;
}
@@ -1,4 +1,4 @@
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn } from 'typeorm';
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn, ManyToOne } from 'typeorm';
import { Users } from './users.entity';
import { AmChildren } from './am_children.entity';
@@ -37,22 +37,32 @@ export class AssistanteMaternelle {
@Column({ name: 'ville_residence', length: 100, nullable: true })
residence_city?: string;
@Column( { name: 'date_agrement', type: 'date', nullable: true })
@Column({ name: 'date_agrement', type: 'date', nullable: true })
agreement_date?: Date;
@Column( { name: 'annee_experience', type: 'smallint', nullable: true })
@Column({ name: 'annee_experience', type: 'smallint', nullable: true })
years_experience?: number;
@Column( { name: 'specialite', length: 100, nullable: true })
@Column({ name: 'specialite', length: 100, nullable: true })
specialty?: string;
@Column( { name: 'place_disponible', type: 'integer', nullable: true })
@Column({ name: 'place_disponible', type: 'integer', nullable: true })
places_available?: number;
/** Numéro de dossier (format AAAA-NNNNNN), même valeur que sur utilisateurs (ticket #103) */
@Column({ name: 'numero_dossier', length: 20, nullable: true })
numero_dossier?: string;
/**
* Placement AM↔enfant sélectionné sur le TdB AM (couple actif) — ticket #171.
*/
@Column({ name: 'id_placement_garde_courant', type: 'uuid', nullable: true })
id_placement_garde_courant?: string;
@ManyToOne(() => AmChildren, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'id_placement_garde_courant', referencedColumnName: 'id' })
placement_garde_courant?: AmChildren;
@OneToMany(() => AmChildren, (ac) => ac.am)
amChildren: AmChildren[];
}
@@ -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;
}
+54
View File
@@ -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;
}
-79
View File
@@ -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;
}
+12
View File
@@ -5,6 +5,7 @@ import {
import { Users } from './users.entity';
import { ParentsChildren } from './parents_children.entity';
import { Dossier } from './dossiers.entity';
import { AmChildren } from './am_children.entity';
@Entity('parents', { schema: 'public' })
export class Parents {
@@ -25,6 +26,17 @@ export class Parents {
@Column({ name: 'numero_dossier', length: 20, nullable: true })
numero_dossier?: string;
/**
* Placement AM↔enfant sélectionné sur le TdB parent (couple actif) — ticket #168.
* Null / absent = le front prend le premier couple actif retourné par lAPI.
*/
@Column({ name: 'id_placement_garde_courant', type: 'uuid', nullable: true })
id_placement_garde_courant?: string;
@ManyToOne(() => AmChildren, { nullable: true, onDelete: 'SET NULL' })
@JoinColumn({ name: 'id_placement_garde_courant', referencedColumnName: 'id' })
placement_garde_courant?: AmChildren;
// Lien vers enfants via la table enfants_parents
@OneToMany(() => ParentsChildren, pc => pc.parent)
parentChildren: ParentsChildren[];
@@ -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 enfantAM.',
})
@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 dabsence / 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,27 @@
import { Module } from '@nestjs/common';
import { ConfigModule, ConfigService } from '@nestjs/config';
import { JwtModule } from '@nestjs/jwt';
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]),
JwtModule.registerAsync({
imports: [ConfigModule],
useFactory: (config: ConfigService) => ({
secret: config.get('jwt.accessSecret'),
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
}),
inject: [ConfigService],
}),
],
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 lAM');
}
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 nest 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 dun congé déjà accepté (S2b)
if (
next === StatutAbsenceGardeType.EN_ATTENTE &&
(row.statut === StatutAbsenceGardeType.REFUSE ||
row.statut === StatutAbsenceGardeType.ACCEPTE)
) {
return;
}
throw new ForbiddenException(
'LAM 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,94 @@
import {
Controller,
Get,
Headers,
MessageEvent,
Query,
Sse,
UnauthorizedException,
UseGuards,
} from '@nestjs/common';
import {
ApiBearerAuth,
ApiOperation,
ApiQuery,
ApiTags,
} from '@nestjs/swagger';
import { ConfigService } from '@nestjs/config';
import { JwtService } from '@nestjs/jwt';
import { Observable } from 'rxjs';
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 { Public } from 'src/common/decorators/public.decorator';
import { User } from 'src/common/decorators/user.decorator';
import { RoleType } from 'src/entities/users.entity';
import { CardsRealtimeService } from './cards-realtime.service';
/**
* SSE Cartes — #195
* Auth : Bearer (recommandé) ou `?access_token=` (EventSource navigateur).
*/
@ApiTags('Cartes')
@Controller('cards')
export class CardsRealtimeController {
constructor(
private readonly realtime: CardsRealtimeService,
private readonly jwtService: JwtService,
private readonly configService: ConfigService,
) {}
@Sse('stream')
@Public()
@ApiOperation({
summary: 'Flux SSE bulles (card.created|updated|deleted, response.added) — #195',
})
@ApiQuery({
name: 'access_token',
required: false,
description: 'JWT si pas de header Authorization (EventSource)',
})
@ApiBearerAuth('access-token')
async stream(
@Headers('authorization') authorization?: string,
@Query('access_token') accessToken?: string,
): Promise<Observable<MessageEvent>> {
const userId = await this.resolveUserId(authorization, accessToken);
return this.realtime.streamFor(userId);
}
/** Variante gardée (clients qui envoient Bearer correctement). */
@Get('stream/info')
@UseGuards(AuthGuard, RolesGuard)
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
@ApiBearerAuth('access-token')
@ApiOperation({ summary: 'Debug : abonnés SSE pour mon user — #195' })
info(@User('id') userId: string) {
return {
user_id: userId,
subscribers: this.realtime.subscriberCount(userId),
};
}
private async resolveUserId(
authorization?: string,
accessToken?: string,
): Promise<string> {
let token = accessToken?.trim();
if (!token && authorization?.startsWith('Bearer ')) {
token = authorization.slice(7).trim();
}
if (!token) {
throw new UnauthorizedException('Token manquant (Bearer ou access_token)');
}
try {
const payload = await this.jwtService.verifyAsync<{ sub: string }>(token, {
secret: this.configService.get<string>('jwt.accessSecret'),
});
if (!payload?.sub) throw new UnauthorizedException('Token invalide');
return payload.sub;
} catch {
throw new UnauthorizedException('Token invalide ou expiré');
}
}
}
@@ -0,0 +1,47 @@
import { MessageEvent } from '@nestjs/common';
import { CardsRealtimeService } from './cards-realtime.service';
describe('CardsRealtimeService (#195)', () => {
let service: CardsRealtimeService;
beforeEach(() => {
service = new CardsRealtimeService();
});
afterEach(() => {
service.onModuleDestroy();
});
it('émet card.created aux abonnés du user', async () => {
const events: MessageEvent[] = [];
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
await new Promise((r) => setTimeout(r, 20));
expect(events[0]?.type).toBe('heartbeat');
expect(service.subscriberCount('user-a')).toBe(1);
service.emitToUsers(['user-a', 'user-b'], 'card.created', 'card-1', {
id: 'card-1',
});
await new Promise((r) => setTimeout(r, 20));
const created = events.find((e) => e.type === 'card.created');
expect(created).toBeDefined();
expect((created!.data as { card_id: string }).card_id).toBe('card-1');
expect(service.subscriberCount('user-b')).toBe(0);
sub.unsubscribe();
expect(service.subscriberCount('user-a')).toBe(0);
});
it('ne diffuse pas aux users non abonnés', async () => {
const events: MessageEvent[] = [];
const sub = service.streamFor('user-a').subscribe((e) => events.push(e));
await new Promise((r) => setTimeout(r, 20));
const before = events.length;
service.emitToUsers(['user-b'], 'card.updated', 'x');
await new Promise((r) => setTimeout(r, 20));
expect(events.length).toBe(before);
sub.unsubscribe();
});
});
@@ -0,0 +1,111 @@
import { Injectable, MessageEvent, OnModuleDestroy } from '@nestjs/common';
import { Observable, Subject, interval, merge, takeUntil } from 'rxjs';
import { map } from 'rxjs/operators';
export type CardRealtimeEventType =
| 'card.created'
| 'card.updated'
| 'card.deleted'
| 'response.added'
| 'heartbeat';
export interface CardRealtimePayload {
event: CardRealtimeEventType;
card_id?: string;
data?: unknown;
at: string;
}
/**
* Bus SSE in-memory par utilisateur (V1 mono-instance).
* Rooms = userId (audience carte).
*/
@Injectable()
export class CardsRealtimeService implements OnModuleDestroy {
private readonly byUser = new Map<string, Set<Subject<CardRealtimePayload>>>();
private readonly destroy$ = new Subject<void>();
onModuleDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
for (const set of this.byUser.values()) {
for (const s of set) s.complete();
}
this.byUser.clear();
}
/** Flux SSE pour un utilisateur authentifié. */
streamFor(userId: string): Observable<MessageEvent> {
const subject = new Subject<CardRealtimePayload>();
let set = this.byUser.get(userId);
if (!set) {
set = new Set();
this.byUser.set(userId, set);
}
set.add(subject);
const heartbeat$ = interval(25_000).pipe(
map(
(): CardRealtimePayload => ({
event: 'heartbeat',
at: new Date().toISOString(),
}),
),
);
return new Observable<MessageEvent>((observer) => {
const sub = merge(subject, heartbeat$)
.pipe(takeUntil(this.destroy$))
.subscribe({
next: (payload) =>
observer.next({
type: payload.event,
data: payload,
} as MessageEvent),
error: (err) => observer.error(err),
complete: () => observer.complete(),
});
// ping initial
subject.next({
event: 'heartbeat',
at: new Date().toISOString(),
});
return () => {
sub.unsubscribe();
set!.delete(subject);
subject.complete();
if (set!.size === 0) this.byUser.delete(userId);
};
});
}
emitToUsers(
userIds: string[],
event: Exclude<CardRealtimeEventType, 'heartbeat'>,
cardId: string | undefined,
data?: unknown,
): void {
const unique = [...new Set(userIds.filter(Boolean))];
const payload: CardRealtimePayload = {
event,
card_id: cardId,
data,
at: new Date().toISOString(),
};
for (const uid of unique) {
const set = this.byUser.get(uid);
if (!set) continue;
for (const s of set) s.next(payload);
}
}
/** Test / debug : nombre dabonnés actifs. */
subscriberCount(userId?: string): number {
if (userId) return this.byUser.get(userId)?.size ?? 0;
let n = 0;
for (const s of this.byUser.values()) n += s.size;
return n;
}
}
@@ -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 lutilisateur — #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);
}
}
+41
View File
@@ -0,0 +1,41 @@
import { Module } from '@nestjs/common';
import { ConfigModule, ConfigService } from '@nestjs/config';
import { JwtModule } from '@nestjs/jwt';
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 { CardsRealtimeController } from './cards-realtime.controller';
import { CardsService } from './cards.service';
import { CardsRealtimeService } from './cards-realtime.service';
@Module({
imports: [
AbsencesGardeModule,
TypeOrmModule.forFeature([
CardType,
CardInstance,
CardAudienceMember,
CardResponse,
AmChildren,
ParentsChildren,
]),
JwtModule.registerAsync({
imports: [ConfigModule],
useFactory: (config: ConfigService) => ({
secret: config.get('jwt.accessSecret'),
signOptions: { expiresIn: config.get('jwt.accessExpiresIn') },
}),
inject: [ConfigService],
}),
],
controllers: [CardsController, CardsRealtimeController],
providers: [CardsService, CardsRealtimeService],
exports: [CardsService, CardsRealtimeService],
})
export class CardsModule {}
@@ -0,0 +1,160 @@
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { ForbiddenException } from '@nestjs/common';
import { CardsService } from './cards.service';
import { CardsRealtimeService } from './cards-realtime.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(),
find: 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(),
};
const realtime = { emitToUsers: 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 },
{ provide: CardsRealtimeService, useValue: realtime },
],
}).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: [
{ id_utilisateur: 'am-1' },
{ id_utilisateur: 'p-1' },
{ id_utilisateur: 'p-2' },
],
});
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(realtime.emitToUsers).toHaveBeenCalledWith(
['am-1', 'p-1', 'p-2'],
'card.created',
'card-1',
expect.any(Object),
);
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);
});
});
+489
View File
@@ -0,0 +1,489 @@
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';
import { CardsRealtimeService } from './cards-realtime.service';
@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,
private readonly realtime: CardsRealtimeService,
) {}
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);
const dtoOut = this.toDto(full, userId);
this.emitAudience(full, 'card.created', dtoOut);
return dtoOut;
}
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 nest 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);
const full = await this.loadCard(cardId);
const dtoOut = this.toDto(full, userId);
this.emitAudience(full, 'response.added', {
action: dto.action,
card: dtoOut,
});
this.emitAudience(full, 'card.updated', dtoOut);
return dtoOut;
}
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);
const full = await this.loadCard(cardId);
const dtoOut = this.toDto(full, userId);
this.emitAudience(full, 'card.updated', dtoOut);
return dtoOut;
}
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');
}
const audienceIds = await this.audienceUserIds(card);
if (card.id_absence) {
const absStatut =
card.statut === CardInstanceStatutType.TRAITEE
? null
: card.id_absence;
// Supprime labsence 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 });
this.realtime.emitToUsers(audienceIds, 'card.deleted', cardId, {
id: cardId,
});
}
private emitAudience(
card: CardInstance,
event: 'card.created' | 'card.updated' | 'response.added',
data: unknown,
): void {
const ids = (card.audience ?? []).map((a) => a.id_utilisateur);
if (ids.length === 0) return;
this.realtime.emitToUsers(ids, event, card.id, data);
}
private async audienceUserIds(card: CardInstance): Promise<string[]> {
if (card.audience?.length) {
return card.audience.map((a) => a.id_utilisateur);
}
const rows = await this.audienceRepo.find({ where: { id_card: card.id } });
return rows.map((r) => r.id_utilisateur);
}
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),
};
}
}
+137
View File
@@ -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[];
}
+3
View File
@@ -0,0 +1,3 @@
export { CardsModule } from './cards.module';
export { CardsService } from './cards.service';
export { CardsRealtimeService } from './cards-realtime.service';
@@ -10,7 +10,10 @@ describe('AssistantesMaternellesController', () => {
const authServiceMock = {
createAmDossierStaff: jest.fn(),
};
const amServiceMock = {};
const amServiceMock = {
listerCouplesGarde: jest.fn(),
definirCoupleGardeCourant: jest.fn(),
};
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
@@ -66,4 +69,29 @@ describe('AssistantesMaternellesController', () => {
);
expect(res.numero_dossier).toBe('2026-000001');
});
it('listerCouplesGarde délègue au service (#171)', async () => {
amServiceMock.listerCouplesGarde.mockResolvedValue({
couples: [],
couple_courant_id: null,
});
const res = await controller.listerCouplesGarde('am-uuid');
expect(amServiceMock.listerCouplesGarde).toHaveBeenCalledWith('am-uuid');
expect(res.couple_courant_id).toBeNull();
});
it('definirCoupleGardeCourant délègue au service (#171)', async () => {
amServiceMock.definirCoupleGardeCourant.mockResolvedValue({
couples: [{ id: 'pl-1', courant: true }],
couple_courant_id: 'pl-1',
});
const res = await controller.definirCoupleGardeCourant('am-uuid', {
couple_id: 'pl-1',
});
expect(amServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
'am-uuid',
'pl-1',
);
expect(res.couple_courant_id).toBe('pl-1');
});
});
@@ -2,6 +2,7 @@ import {
Controller,
Get,
Post,
Put,
Body,
Patch,
Param,
@@ -20,6 +21,8 @@ import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.dto';
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
import { DefinirCoupleGardeCourantAmDto } from './dto/definir-couple-garde-courant-am.dto';
import { RolesGuard } from 'src/common/guards/roles.guard';
import { AuthGuard } from 'src/common/guards/auth.guard';
import { User } from 'src/common/decorators/user.decorator';
@@ -83,6 +86,36 @@ export class AssistantesMaternellesController {
return mapAmsForApi(ams);
}
@Get('me/couples-garde')
@Roles(RoleType.ASSISTANTE_MATERNELLE)
@ApiOperation({
summary: 'Couples de garde de lAM connectée — ticket #171',
description:
'Placements actifs (enfant + parents) pour peupler le bandeau couple TdB AM, ' +
'avec indication du couple courant.',
})
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
listerCouplesGarde(
@User('id') userId: string,
): Promise<CouplesGardeAmResponseDto> {
return this.assistantesMaternellesService.listerCouplesGarde(userId);
}
@Put('me/couples-garde/courant')
@Roles(RoleType.ASSISTANTE_MATERNELLE)
@ApiOperation({ summary: 'Définir le couple de garde courant (AM) — ticket #171' })
@ApiBody({ type: DefinirCoupleGardeCourantAmDto })
@ApiResponse({ status: 200, type: CouplesGardeAmResponseDto })
definirCoupleGardeCourant(
@User('id') userId: string,
@Body() dto: DefinirCoupleGardeCourantAmDto,
): Promise<CouplesGardeAmResponseDto> {
return this.assistantesMaternellesService.definirCoupleGardeCourant(
userId,
dto.couple_id,
);
}
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
@Get(':id')
@ApiParam({ name: 'id', description: "UUID de la nounou" })
@@ -4,13 +4,21 @@ import { AssistantesMaternellesController } from './assistantes_maternelles.cont
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { Children } from 'src/entities/children.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { TypeOrmModule } from '@nestjs/typeorm';
import { Users } from 'src/entities/users.entity';
import { AuthModule } from '../auth/auth.module';
@Module({
imports: [TypeOrmModule.forFeature([AssistanteMaternelle, AmChildren, Children, Users]),
AuthModule
imports: [
TypeOrmModule.forFeature([
AssistanteMaternelle,
AmChildren,
Children,
Users,
ParentsChildren,
]),
AuthModule,
],
controllers: [AssistantesMaternellesController],
providers: [AssistantesMaternellesService],
@@ -19,4 +27,4 @@ import { AuthModule } from '../auth/auth.module';
TypeOrmModule,
],
})
export class AssistantesMaternellesModule { }
export class AssistantesMaternellesModule {}
@@ -1,18 +1,150 @@
import { NotFoundException } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
import { Users } from 'src/entities/users.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { Children } from 'src/entities/children.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
describe('AssistantesMaternellesService', () => {
describe('AssistantesMaternellesService — couples de garde (#171)', () => {
let service: AssistantesMaternellesService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [AssistantesMaternellesService],
}).compile();
const amRepo = { findOne: jest.fn(), update: jest.fn() };
const usersRepo = {};
const amChildrenRepo = { find: jest.fn(), findOne: jest.fn() };
const childrenRepo = {};
const parentsChildrenRepo = { find: jest.fn() };
service = module.get<AssistantesMaternellesService>(AssistantesMaternellesService);
beforeEach(async () => {
jest.clearAllMocks();
const module: TestingModule = await Test.createTestingModule({
providers: [
AssistantesMaternellesService,
{ provide: getRepositoryToken(AssistanteMaternelle), useValue: amRepo },
{ provide: getRepositoryToken(Users), useValue: usersRepo },
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
{ provide: getRepositoryToken(Children), useValue: childrenRepo },
{
provide: getRepositoryToken(ParentsChildren),
useValue: parentsChildrenRepo,
},
],
}).compile();
service = module.get(AssistantesMaternellesService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
describe('listerCouplesGarde', () => {
it('retourne vide si aucun placement', async () => {
amRepo.findOne.mockResolvedValue({
user_id: 'am-1',
id_placement_garde_courant: null,
});
amChildrenRepo.find.mockResolvedValue([]);
const res = await service.listerCouplesGarde('am-1');
expect(res).toEqual({ couples: [], couple_courant_id: null });
expect(parentsChildrenRepo.find).not.toHaveBeenCalled();
});
it('mappe placements + parents et marque le courant', async () => {
amRepo.findOne.mockResolvedValue({
user_id: 'am-1',
id_placement_garde_courant: 'pl-2',
});
amChildrenRepo.find.mockResolvedValue([
{
id: 'pl-1',
enfantId: 'e1',
child: { id: 'e1', first_name: 'Léa', last_name: 'M', photo_url: null },
},
{
id: 'pl-2',
enfantId: 'e2',
child: { id: 'e2', first_name: 'Emma', last_name: 'M', photo_url: null },
},
]);
parentsChildrenRepo.find.mockResolvedValue([
{
parentId: 'p1',
enfantId: 'e1',
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
},
{
parentId: 'p2',
enfantId: 'e1',
parent: { user: { prenom: 'Thomas', nom: 'Martin', photo_url: null } },
},
{
parentId: 'p1',
enfantId: 'e2',
parent: { user: { prenom: 'Claire', nom: 'Martin', photo_url: null } },
},
]);
const res = await service.listerCouplesGarde('am-1');
expect(res.couples).toHaveLength(2);
expect(res.couple_courant_id).toBe('pl-2');
expect(res.couples[1].courant).toBe(true);
expect(res.couples[0].parents).toHaveLength(2);
expect(res.couples[0].parents[0].prenom).toBe('Claire');
expect(res.couples[0].enfant.prenom).toBe('Léa');
});
it('404 si AM inconnue', async () => {
amRepo.findOne.mockResolvedValue(null);
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
NotFoundException,
);
});
});
describe('definirCoupleGardeCourant', () => {
it('persiste si le placement appartient à lAM', async () => {
amRepo.findOne.mockResolvedValue({
user_id: 'am-1',
id_placement_garde_courant: null,
});
amChildrenRepo.findOne.mockResolvedValue({
id: 'pl-1',
amId: 'am-1',
enfantId: 'e1',
});
amRepo.update.mockResolvedValue({ affected: 1 });
amChildrenRepo.find.mockResolvedValue([
{
id: 'pl-1',
enfantId: 'e1',
child: { id: 'e1', first_name: 'Léa', last_name: null, photo_url: null },
},
]);
parentsChildrenRepo.find.mockResolvedValue([
{
parentId: 'p1',
enfantId: 'e1',
parent: { user: { prenom: 'Claire', nom: 'M', photo_url: null } },
},
]);
const res = await service.definirCoupleGardeCourant('am-1', 'pl-1');
expect(amRepo.update).toHaveBeenCalledWith(
{ user_id: 'am-1' },
{ id_placement_garde_courant: 'pl-1' },
);
expect(res.couple_courant_id).toBe('pl-1');
expect(res.couples[0].courant).toBe(true);
});
it('404 si placement dune autre AM', async () => {
amRepo.findOne.mockResolvedValue({ user_id: 'am-1' });
amChildrenRepo.findOne.mockResolvedValue(null);
await expect(
service.definirCoupleGardeCourant('am-1', 'pl-x'),
).rejects.toBeInstanceOf(NotFoundException);
});
});
});
@@ -5,14 +5,16 @@ import {
NotFoundException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { IsNull, Repository } from 'typeorm';
import { In, IsNull, Repository } from 'typeorm';
import { RoleType, Users } from 'src/entities/users.entity';
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { Children, StatutEnfantType } from 'src/entities/children.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
import { CouplesGardeAmResponseDto } from './dto/couples-garde-am.dto';
import { validateNir } from 'src/common/utils/nir.util';
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
@@ -28,6 +30,8 @@ export class AssistantesMaternellesService {
private readonly amChildrenRepository: Repository<AmChildren>,
@InjectRepository(Children)
private readonly childrenRepository: Repository<Children>,
@InjectRepository(ParentsChildren)
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
) {}
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
@@ -264,4 +268,107 @@ export class AssistantesMaternellesService {
await this.assistantesMaternelleRepository.delete(id);
return { message: 'Assistante maternelle supprimée' };
}
/**
* Liste les couples de garde (enfant ↔ parents) de lAM connectée — ticket #171.
* Un couple = un placement actif dans enfants_assistantes_maternelles pour cette AM.
*/
async listerCouplesGarde(amUserId: string): Promise<CouplesGardeAmResponseDto> {
const am = await this.assistantesMaternelleRepository.findOne({
where: { user_id: amUserId },
});
if (!am) {
throw new NotFoundException('Assistante maternelle introuvable');
}
const placements = await this.amChildrenRepository.find({
where: { amId: amUserId, date_fin: IsNull() },
relations: ['child'],
order: { date_debut: 'ASC' },
});
if (placements.length === 0) {
return { couples: [], couple_courant_id: null };
}
const enfantIds = placements.map((p) => p.enfantId);
const liens = await this.parentsChildrenRepository.find({
where: { enfantId: In(enfantIds) },
relations: ['parent', 'parent.user'],
});
const parentsByEnfant = new Map<
string,
{ id: string; prenom: string | null; nom: string | null; photo_url: string | null }[]
>();
for (const l of liens) {
const list = parentsByEnfant.get(l.enfantId) ?? [];
const u = l.parent?.user;
list.push({
id: l.parentId,
prenom: u?.prenom ?? null,
nom: u?.nom ?? null,
photo_url: u?.photo_url ?? null,
});
parentsByEnfant.set(l.enfantId, list);
}
let idCourant = am.id_placement_garde_courant ?? null;
const idsValides = new Set(placements.map((p) => p.id));
if (idCourant && !idsValides.has(idCourant)) {
idCourant = null;
await this.assistantesMaternelleRepository.update(
{ user_id: amUserId },
{ id_placement_garde_courant: () => 'NULL' },
);
}
if (!idCourant && placements.length === 1) {
idCourant = placements[0].id;
}
const couples = placements.map((p) => ({
id: p.id,
enfant: {
id: p.child.id,
prenom: p.child.first_name ?? null,
nom: p.child.last_name ?? null,
photo_url: p.child.photo_url ?? null,
},
parents: parentsByEnfant.get(p.enfantId) ?? [],
courant: idCourant != null && p.id === idCourant,
}));
return {
couples,
couple_courant_id: idCourant,
};
}
/**
* Persiste le couple de garde actif pour lAM — ticket #171.
*/
async definirCoupleGardeCourant(
amUserId: string,
coupleId: string,
): Promise<CouplesGardeAmResponseDto> {
const am = await this.assistantesMaternelleRepository.findOne({
where: { user_id: amUserId },
});
if (!am) {
throw new NotFoundException('Assistante maternelle introuvable');
}
const placement = await this.amChildrenRepository.findOne({
where: { id: coupleId, amId: amUserId, date_fin: IsNull() },
});
if (!placement) {
throw new NotFoundException('Couple de garde introuvable ou inactif pour cette AM');
}
await this.assistantesMaternelleRepository.update(
{ user_id: amUserId },
{ id_placement_garde_courant: coupleId },
);
return this.listerCouplesGarde(amUserId);
}
}
@@ -0,0 +1,67 @@
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
/** Identité minimale enfant — ticket #171 (miroir #168) */
export class CoupleGardeAmEnfantDto {
@ApiProperty({ format: 'uuid' })
id: string;
@ApiPropertyOptional()
prenom?: string | null;
@ApiPropertyOptional()
nom?: string | null;
@ApiPropertyOptional()
photo_url?: string | null;
}
/** Identité minimale parent pour bandeau AM — ticket #171 */
export class CoupleGardeAmParentDto {
@ApiProperty({ format: 'uuid', description: 'UUID utilisateur du parent' })
id: string;
@ApiPropertyOptional()
prenom?: string | null;
@ApiPropertyOptional()
nom?: string | null;
@ApiPropertyOptional()
photo_url?: string | null;
}
/**
* Un couple côté AM = placement actif enfant ↔ foyer parents.
* `id` = enfants_assistantes_maternelles.id (même clé que #168).
*/
export class CoupleGardeAmDto {
@ApiProperty({
format: 'uuid',
description: 'Id du placement (enfants_assistantes_maternelles.id)',
})
id: string;
@ApiProperty({ type: CoupleGardeAmEnfantDto })
enfant: CoupleGardeAmEnfantDto;
@ApiProperty({
type: [CoupleGardeAmParentDto],
description: 'Parents rattachés à lenfant (02 typiquement)',
})
parents: CoupleGardeAmParentDto[];
@ApiProperty({ description: 'True si cest le couple actuellement sélectionné' })
courant: boolean;
}
export class CouplesGardeAmResponseDto {
@ApiProperty({ type: [CoupleGardeAmDto] })
couples: CoupleGardeAmDto[];
@ApiPropertyOptional({
format: 'uuid',
nullable: true,
description: 'Id du couple courant (null si aucun)',
})
couple_courant_id: string | null;
}
@@ -0,0 +1,13 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsUUID } from 'class-validator';
/** Corps PUT couple de garde courant AM — ticket #171 */
export class DefinirCoupleGardeCourantAmDto {
@ApiProperty({
format: 'uuid',
description: 'Id du placement (enfants_assistantes_maternelles.id) à sélectionner',
})
@IsUUID()
@IsNotEmpty()
couple_id: string;
}
@@ -0,0 +1,61 @@
import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
/** Identité minimale enfant pour le bandeau couple — ticket #168 */
export class CoupleGardeEnfantDto {
@ApiProperty({ format: 'uuid' })
id: string;
@ApiPropertyOptional()
prenom?: string | null;
@ApiPropertyOptional()
nom?: string | null;
@ApiPropertyOptional()
photo_url?: string | null;
}
/** Identité minimale AM pour le bandeau couple — ticket #168 */
export class CoupleGardeAmDto {
@ApiProperty({ format: 'uuid', description: 'UUID utilisateur de lAM' })
id: string;
@ApiPropertyOptional()
prenom?: string | null;
@ApiPropertyOptional()
nom?: string | null;
@ApiPropertyOptional()
photo_url?: string | null;
}
/** Un couple de garde = placement actif enfant ↔ AM */
export class CoupleGardeDto {
@ApiProperty({
format: 'uuid',
description: 'Id du placement (enfants_assistantes_maternelles.id)',
})
id: string;
@ApiProperty({ type: CoupleGardeEnfantDto })
enfant: CoupleGardeEnfantDto;
@ApiProperty({ type: CoupleGardeAmDto })
am: CoupleGardeAmDto;
@ApiProperty({ description: 'True si cest le couple actuellement sélectionné' })
courant: boolean;
}
export class CouplesGardeResponseDto {
@ApiProperty({ type: [CoupleGardeDto] })
couples: CoupleGardeDto[];
@ApiPropertyOptional({
format: 'uuid',
nullable: true,
description: 'Id du couple courant (null si aucun / premier couple implicite côté client)',
})
couple_courant_id: string | null;
}
@@ -0,0 +1,13 @@
import { ApiProperty } from '@nestjs/swagger';
import { IsNotEmpty, IsUUID } from 'class-validator';
/** Corps PUT couple de garde courant — ticket #168 */
export class DefinirCoupleGardeCourantDto {
@ApiProperty({
format: 'uuid',
description: 'Id du placement (enfants_assistantes_maternelles.id) à sélectionner',
})
@IsUUID()
@IsNotEmpty()
couple_id: string;
}
@@ -13,7 +13,10 @@ describe('ParentsController', () => {
createParentDossierStaff: jest.fn(),
addCoParentStaff: jest.fn(),
};
const parentsServiceMock = {};
const parentsServiceMock = {
listerCouplesGarde: jest.fn(),
definirCoupleGardeCourant: jest.fn(),
};
const userServiceMock = {};
beforeEach(async () => {
@@ -39,6 +42,31 @@ describe('ParentsController', () => {
expect(controller).toBeDefined();
});
it('listerCouplesGarde délègue au service (#168)', async () => {
parentsServiceMock.listerCouplesGarde.mockResolvedValue({
couples: [],
couple_courant_id: null,
});
const res = await controller.listerCouplesGarde('parent-uuid');
expect(parentsServiceMock.listerCouplesGarde).toHaveBeenCalledWith('parent-uuid');
expect(res.couples).toEqual([]);
});
it('definirCoupleGardeCourant délègue au service (#168)', async () => {
parentsServiceMock.definirCoupleGardeCourant.mockResolvedValue({
couples: [{ id: 'pl-1', courant: true }],
couple_courant_id: 'pl-1',
});
const res = await controller.definirCoupleGardeCourant('parent-uuid', {
couple_id: 'pl-1',
});
expect(parentsServiceMock.definirCoupleGardeCourant).toHaveBeenCalledWith(
'parent-uuid',
'pl-1',
);
expect(res.couple_courant_id).toBe('pl-1');
});
it('createDossier delegates to authService.createParentDossierStaff with CGU accepted', async () => {
authServiceMock.createParentDossierStaff.mockResolvedValue({
message: 'Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.',
@@ -8,6 +8,7 @@ import {
Param,
Patch,
Post,
Put,
UseGuards,
} from '@nestjs/common';
import { ParentsService } from './parents.service';
@@ -39,6 +40,8 @@ import { User } from 'src/common/decorators/user.decorator';
import { PendingFamilyDto } from './dto/pending-family.dto';
import { DossierFamilleCompletDto } from './dto/dossier-famille-complet.dto';
import { mapParentForApi, mapParentsForApi } from './parents.mapper';
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
import { DefinirCoupleGardeCourantDto } from './dto/definir-couple-garde-courant.dto';
@ApiTags('Parents')
@ApiBearerAuth('access-token')
@@ -51,6 +54,39 @@ export class ParentsController {
private readonly authService: AuthService,
) {}
@Get('me/couples-garde')
@Roles(RoleType.PARENT)
@ApiOperation({
summary: 'Lister les couples de garde du parent connecté — ticket #168',
description:
'Retourne les placements actifs enfant↔AM rattachés au parent, ' +
'avec indication du couple courant (bandeau TdB quotidien).',
})
@ApiResponse({ status: 200, type: CouplesGardeResponseDto })
@ApiResponse({ status: 403, description: 'Réservé au rôle parent' })
@ApiResponse({ status: 404, description: 'Parent introuvable' })
listerCouplesGarde(@User('id') userId: string): Promise<CouplesGardeResponseDto> {
return this.parentsService.listerCouplesGarde(userId);
}
@Put('me/couples-garde/courant')
@Roles(RoleType.PARENT)
@ApiOperation({
summary: 'Définir le couple de garde courant — ticket #168',
description:
'Persiste la préférence de couple actif (enfant|nounou) pour contextualiser le TdB.',
})
@ApiBody({ type: DefinirCoupleGardeCourantDto })
@ApiResponse({ status: 200, type: CouplesGardeResponseDto })
@ApiResponse({ status: 400, description: 'Couple hors périmètre du parent' })
@ApiResponse({ status: 404, description: 'Parent ou couple introuvable' })
definirCoupleGardeCourant(
@User('id') userId: string,
@Body() dto: DefinirCoupleGardeCourantDto,
): Promise<CouplesGardeResponseDto> {
return this.parentsService.definirCoupleGardeCourant(userId, dto.couple_id);
}
@Roles(RoleType.SUPER_ADMIN, RoleType.ADMINISTRATEUR, RoleType.GESTIONNAIRE)
@Post('dossier')
@HttpCode(HttpStatus.CREATED)
+9 -1
View File
@@ -5,6 +5,7 @@ import { JwtModule } from '@nestjs/jwt';
import { Parents } from 'src/entities/parents.entity';
import { DossierFamille, DossierFamilleEnfant } from 'src/entities/dossier_famille.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { AmChildren } from 'src/entities/am_children.entity';
import { ParentsController } from './parents.controller';
import { ParentsService } from './parents.service';
import { Users } from 'src/entities/users.entity';
@@ -13,7 +14,14 @@ import { AuthModule } from '../auth/auth.module';
@Module({
imports: [
TypeOrmModule.forFeature([Parents, Users, DossierFamille, DossierFamilleEnfant, ParentsChildren]),
TypeOrmModule.forFeature([
Parents,
Users,
DossierFamille,
DossierFamilleEnfant,
ParentsChildren,
AmChildren,
]),
forwardRef(() => UserModule),
forwardRef(() => AuthModule),
JwtModule.registerAsync({
@@ -1,12 +1,43 @@
import { BadRequestException, NotFoundException } from '@nestjs/common';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { ParentsService } from './parents.service';
import { Parents } from 'src/entities/parents.entity';
import { Users } from 'src/entities/users.entity';
import { DossierFamille } from 'src/entities/dossier_famille.entity';
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { AmChildren } from 'src/entities/am_children.entity';
describe('ParentsService', () => {
describe('ParentsService — couples de garde (#168)', () => {
let service: ParentsService;
const parentsRepository = {
findOne: jest.fn(),
update: jest.fn(),
};
const parentsChildrenRepository = {
find: jest.fn(),
findOne: jest.fn(),
};
const amChildrenRepository = {
find: jest.fn(),
findOne: jest.fn(),
};
beforeEach(async () => {
jest.clearAllMocks();
const module: TestingModule = await Test.createTestingModule({
providers: [ParentsService],
providers: [
ParentsService,
{ provide: getRepositoryToken(Parents), useValue: parentsRepository },
{ provide: getRepositoryToken(Users), useValue: {} },
{ provide: getRepositoryToken(DossierFamille), useValue: {} },
{
provide: getRepositoryToken(ParentsChildren),
useValue: parentsChildrenRepository,
},
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepository },
],
}).compile();
service = module.get<ParentsService>(ParentsService);
@@ -15,4 +46,107 @@ describe('ParentsService', () => {
it('should be defined', () => {
expect(service).toBeDefined();
});
describe('listerCouplesGarde', () => {
it('retourne une liste vide si le parent na pas denfant', async () => {
parentsRepository.findOne.mockResolvedValue({
user_id: 'p1',
id_placement_garde_courant: null,
});
parentsChildrenRepository.find.mockResolvedValue([]);
const res = await service.listerCouplesGarde('p1');
expect(res).toEqual({ couples: [], couple_courant_id: null });
expect(amChildrenRepository.find).not.toHaveBeenCalled();
});
it('mappe les placements actifs en couples et marque le courant', async () => {
parentsRepository.findOne.mockResolvedValue({
user_id: 'p1',
id_placement_garde_courant: 'pl-2',
});
parentsChildrenRepository.find.mockResolvedValue([
{ enfantId: 'e1' },
{ enfantId: 'e2' },
]);
amChildrenRepository.find.mockResolvedValue([
{
id: 'pl-1',
amId: 'am-1',
child: { id: 'e1', first_name: 'Léo', last_name: 'M', photo_url: null },
am: { user: { prenom: 'Marie', nom: 'N', photo_url: '/a.jpg' } },
},
{
id: 'pl-2',
amId: 'am-2',
child: { id: 'e2', first_name: 'Léa', last_name: 'M', photo_url: null },
am: { user: { prenom: 'Sophie', nom: 'P', photo_url: null } },
},
]);
const res = await service.listerCouplesGarde('p1');
expect(res.couples).toHaveLength(2);
expect(res.couple_courant_id).toBe('pl-2');
expect(res.couples[1].courant).toBe(true);
expect(res.couples[0].am.prenom).toBe('Marie');
expect(res.couples[0].enfant.prenom).toBe('Léo');
});
it('404 si parent inconnu', async () => {
parentsRepository.findOne.mockResolvedValue(null);
await expect(service.listerCouplesGarde('x')).rejects.toBeInstanceOf(
NotFoundException,
);
});
});
describe('definirCoupleGardeCourant', () => {
it('persiste le couple si lenfant est rattaché au parent', async () => {
parentsRepository.findOne.mockResolvedValue({
user_id: 'p1',
id_placement_garde_courant: null,
});
amChildrenRepository.findOne.mockResolvedValue({
id: 'pl-1',
enfantId: 'e1',
date_fin: null,
});
parentsChildrenRepository.findOne.mockResolvedValue({
parentId: 'p1',
enfantId: 'e1',
});
parentsRepository.update.mockResolvedValue({ affected: 1 });
// second call via listerCouplesGarde
parentsChildrenRepository.find.mockResolvedValue([{ enfantId: 'e1' }]);
amChildrenRepository.find.mockResolvedValue([
{
id: 'pl-1',
amId: 'am-1',
child: { id: 'e1', first_name: 'Léo', last_name: null, photo_url: null },
am: { user: { prenom: 'Marie', nom: null, photo_url: null } },
},
]);
const res = await service.definirCoupleGardeCourant('p1', 'pl-1');
expect(parentsRepository.update).toHaveBeenCalledWith(
{ user_id: 'p1' },
{ id_placement_garde_courant: 'pl-1' },
);
expect(res.couple_courant_id).toBe('pl-1');
expect(res.couples[0].courant).toBe(true);
});
it('400 si le couple nappartient pas au parent', async () => {
parentsRepository.findOne.mockResolvedValue({ user_id: 'p1' });
amChildrenRepository.findOne.mockResolvedValue({
id: 'pl-1',
enfantId: 'e99',
});
parentsChildrenRepository.findOne.mockResolvedValue(null);
await expect(
service.definirCoupleGardeCourant('p1', 'pl-1'),
).rejects.toBeInstanceOf(BadRequestException);
});
});
});
+109 -1
View File
@@ -5,7 +5,7 @@ import {
NotFoundException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { In, Repository } from 'typeorm';
import { In, IsNull, Repository } from 'typeorm';
import { Parents } from 'src/entities/parents.entity';
import { DossierFamille } from 'src/entities/dossier_famille.entity';
import { RoleType, Users } from 'src/entities/users.entity';
@@ -20,6 +20,8 @@ import {
import { ParentsChildren } from 'src/entities/parents_children.entity';
import { Children } from 'src/entities/children.entity';
import { UpdateParentFicheAdminDto } from './dto/update-parent-fiche-admin.dto';
import { AmChildren } from 'src/entities/am_children.entity';
import { CouplesGardeResponseDto } from './dto/couples-garde.dto';
@Injectable()
export class ParentsService {
@@ -32,6 +34,8 @@ export class ParentsService {
private readonly dossierFamilleRepository: Repository<DossierFamille>,
@InjectRepository(ParentsChildren)
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
@InjectRepository(AmChildren)
private readonly amChildrenRepository: Repository<AmChildren>,
) {}
// Création dun parent
@@ -505,4 +509,108 @@ export class ParentsService {
}
return raw.map((r: { id: string }) => r.id);
}
/**
* Liste les couples de garde (enfant ↔ AM) du parent connecté — ticket #168.
* Un couple = un placement actif dans enfants_assistantes_maternelles pour un enfant du parent.
*/
async listerCouplesGarde(parentUserId: string): Promise<CouplesGardeResponseDto> {
const parent = await this.parentsRepository.findOne({
where: { user_id: parentUserId },
});
if (!parent) {
throw new NotFoundException('Parent introuvable');
}
const liensEnfants = await this.parentsChildrenRepository.find({
where: { parentId: parentUserId },
select: ['enfantId'],
});
const enfantIds = liensEnfants.map((l) => l.enfantId);
if (enfantIds.length === 0) {
return { couples: [], couple_courant_id: null };
}
const placements = await this.amChildrenRepository.find({
where: { enfantId: In(enfantIds), date_fin: IsNull() },
relations: ['child', 'am', 'am.user'],
order: { date_debut: 'ASC' },
});
let idCourant = parent.id_placement_garde_courant ?? null;
const idsValides = new Set(placements.map((p) => p.id));
if (idCourant && !idsValides.has(idCourant)) {
idCourant = null;
await this.parentsRepository.update(
{ user_id: parentUserId },
{ id_placement_garde_courant: () => 'NULL' },
);
}
if (!idCourant && placements.length === 1) {
idCourant = placements[0].id;
}
const couples = placements.map((p) => {
const amUser = p.am?.user;
return {
id: p.id,
enfant: {
id: p.child.id,
prenom: p.child.first_name ?? null,
nom: p.child.last_name ?? null,
photo_url: p.child.photo_url ?? null,
},
am: {
id: p.amId,
prenom: amUser?.prenom ?? null,
nom: amUser?.nom ?? null,
photo_url: amUser?.photo_url ?? null,
},
courant: idCourant != null && p.id === idCourant,
};
});
return {
couples,
couple_courant_id: idCourant,
};
}
/**
* Persiste le couple de garde actif pour le parent — ticket #168.
*/
async definirCoupleGardeCourant(
parentUserId: string,
coupleId: string,
): Promise<CouplesGardeResponseDto> {
const parent = await this.parentsRepository.findOne({
where: { user_id: parentUserId },
});
if (!parent) {
throw new NotFoundException('Parent introuvable');
}
const placement = await this.amChildrenRepository.findOne({
where: { id: coupleId, date_fin: IsNull() },
});
if (!placement) {
throw new NotFoundException('Couple de garde introuvable ou inactif');
}
const lien = await this.parentsChildrenRepository.findOne({
where: { parentId: parentUserId, enfantId: placement.enfantId },
});
if (!lien) {
throw new BadRequestException(
'Ce couple ne concerne pas un enfant rattaché à ce parent',
);
}
await this.parentsRepository.update(
{ user_id: parentUserId },
{ id_placement_garde_courant: coupleId },
);
return this.listerCouplesGarde(parentUserId);
}
}
+59 -22
View File
@@ -35,13 +35,15 @@ DO $$ BEGIN
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'statut_avenant_type') THEN
CREATE TYPE statut_avenant_type AS ENUM ('propose', 'accepte', 'refuse');
END IF;
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'type_evenement_type') THEN
CREATE TYPE type_evenement_type AS ENUM (
'absence_enfant', 'conge_am', 'conge_parent', 'arret_maladie_am', 'evenement_rpe'
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_evenement_type') THEN
CREATE TYPE statut_evenement_type AS ENUM ('propose', 'valide', 'refuse');
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;
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');
@@ -141,7 +143,10 @@ CREATE TABLE assistantes_maternelles (
annee_experience SMALLINT,
specialite VARCHAR(100),
place_disponible INT,
numero_dossier VARCHAR(20)
numero_dossier VARCHAR(20),
-- Préférence couple de garde actif (TdB quotidien AM) — ticket #171
-- FK ajoutée après création de enfants_assistantes_maternelles (voir ALTER plus bas)
id_placement_garde_courant UUID
);
CREATE INDEX idx_assistantes_maternelles_numero_dossier
@@ -154,7 +159,10 @@ CREATE INDEX idx_assistantes_maternelles_numero_dossier
CREATE TABLE parents (
id_utilisateur UUID PRIMARY KEY REFERENCES utilisateurs(id) ON DELETE CASCADE,
id_co_parent UUID REFERENCES utilisateurs(id),
numero_dossier VARCHAR(20)
numero_dossier VARCHAR(20),
-- Préférence couple de garde actif (TdB quotidien) — ticket #168
-- FK ajoutée après création de enfants_assistantes_maternelles (voir ALTER plus bas)
id_placement_garde_courant UUID
);
CREATE INDEX idx_parents_numero_dossier
@@ -206,6 +214,26 @@ CREATE UNIQUE INDEX uq_enfant_garde_active
ON enfants_assistantes_maternelles (id_enfant)
WHERE date_fin IS NULL;
-- FK couple courant parent → placement (#168) — après table enfants_assistantes_maternelles
ALTER TABLE parents
ADD CONSTRAINT fk_parents_placement_garde_courant
FOREIGN KEY (id_placement_garde_courant)
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
CREATE INDEX idx_parents_placement_garde_courant
ON parents(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
-- FK couple courant AM → placement (#171)
ALTER TABLE assistantes_maternelles
ADD CONSTRAINT fk_am_placement_garde_courant
FOREIGN KEY (id_placement_garde_courant)
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
CREATE INDEX idx_am_placement_garde_courant
ON assistantes_maternelles(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
-- ==========================================================
-- Table : dossier_famille (inscription parent — ticket #119)
-- ==========================================================
@@ -294,25 +322,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(),
type type_evenement_type,
id_enfant UUID REFERENCES enfants(id) ON DELETE CASCADE,
id_am UUID REFERENCES utilisateurs(id),
id_parent UUID REFERENCES parents(id_utilisateur),
cree_par UUID REFERENCES utilisateurs(id),
date_debut TIMESTAMPTZ,
date_fin TIMESTAMPTZ,
commentaires TEXT,
statut statut_evenement_type DEFAULT 'propose',
delai_grace TIMESTAMPTZ,
urgent BOOLEAN DEFAULT false,
cree_le TIMESTAMPTZ DEFAULT now(),
modifie_le TIMESTAMPTZ DEFAULT now()
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',
expire_at TIMESTAMPTZ NOT NULL,
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
id_card_instance UUID,
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 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
-- ==========================================================
+10 -10
View File
@@ -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 dabsence de garde — `type`
**Tables/colonnes** : `evenements.type`
**Tables/colonnes** : `absences_garde.type`
**Valeurs autorisées** :
| Valeur | Description |
|---|---|
| `absence_enfant` | Enfant absent |
| `absence_enfant` | Absence déclarée par un parent |
| `conge_am` | Congé de lassistante maternelle |
| `conge_parent` | Congé du parent |
| `arret_maladie_am` | Arrêt maladie AM |
| `evenement_rpe` | Événement RPE |
> Remplace lancien enum `type_evenement_type` / table `evenements` (supprimés ticket #193).
---
## 8) Statut dévénement — `statut`
## 8) Statut dabsence de garde — `statut`
**Tables/colonnes** : `evenements.statut`
**Tables/colonnes** : `absences_garde.statut`
**Valeurs autorisées** :
| Valeur | Description |
|---|---|
| `propose` | Événement proposé |
| `valide` | Événement validé |
| `rejete` | Événement refusé |
| `en_attente` | En attente de validation / ack |
| `accepte` | Accepté / acté (conservé en historique métier) |
| `refuse` | Refusé (temporaire ; purge TTL) |
---
+6 -10
View File
@@ -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é |
| **avenants_contrats(id_contrat)**`contrats(id)` | **CASCADE** | Avenants détruits avec le contrat |
| **avenants_contrats(initie_par)**`utilisateurs(id)` | **SET NULL** | Historiser lavenant sans bloquer |
| **evenements(id_enfant)**`enfants(id)` | **CASCADE** | Événements nont plus de sens |
| **evenements(id_am)**`utilisateurs(id)` | **SET NULL** | Garder la trace même si AM supprimée |
| **evenements(id_parent)**`parents(id_utilisateur)` | **SET NULL** | Garder la trace si parent supprimé |
| **evenements(cree_par)**`utilisateurs(id)` | **SET NULL** | Conserver lhistorique de création |
| **absences_garde(id_placement)**`enfants_assistantes_maternelles(id)` | **CASCADE** | Plus de couple = plus dabsences |
| **absences_garde(cree_par)**`utilisateurs(id)` | **SET NULL** | Conserver la période si user 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 lauteur |
| **notifications(id_utilisateur)**`utilisateurs(id)` | **CASCADE** | Notifications propres à lutilisateur |
@@ -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**
### Événements
- `evenements.id_enfant`**CASCADE**
- `evenements.id_am`**SET NULL**
- `evenements.id_parent`**SET NULL**
- `evenements.cree_par`**SET NULL**
- `absences_garde.id_placement`**CASCADE**
- `absences_garde.cree_par`**SET NULL**
### Divers
- `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 dun enfant**
- 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 dun utilisateur AM**
- 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,10 @@
-- Ticket #171 — Couple de garde courant (préférence AM)
-- Idempotent : safe à rejouer.
ALTER TABLE assistantes_maternelles
ADD COLUMN IF NOT EXISTS id_placement_garde_courant UUID
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
CREATE INDEX IF NOT EXISTS idx_am_placement_garde_courant
ON assistantes_maternelles(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
+123
View File
@@ -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 dattention — collecte, pas vérité métier absences.';
@@ -0,0 +1,10 @@
-- Ticket #168 — Couple de garde courant (préférence parent)
-- Idempotent : safe à rejouer.
ALTER TABLE parents
ADD COLUMN IF NOT EXISTS id_placement_garde_courant UUID
REFERENCES enfants_assistantes_maternelles(id) ON DELETE SET NULL;
CREATE INDEX IF NOT EXISTS idx_parents_placement_garde_courant
ON parents(id_placement_garde_courant)
WHERE id_placement_garde_courant IS NOT NULL;
+2 -16
View File
@@ -161,23 +161,9 @@ VALUES (
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)
+16 -17
View File
@@ -79,12 +79,11 @@ LEFT JOIN avenants_contrats a ON a.id_contrat = c.id
GROUP BY c.id, c.id_dossier, c.statut
ORDER BY c.cree_le DESC;
\echo '=== 9) Evénements par enfant (30 derniers jours) =============='
SELECT ev.id, ev.type, ev.id_enfant, e.prenom AS enfant, ev.date_debut, ev.date_fin, ev.statut
FROM evenements ev
JOIN enfants e ON e.id = ev.id_enfant
WHERE ev.date_debut >= (NOW()::date - INTERVAL '30 days')
ORDER BY ev.date_debut DESC;
\echo '=== 9) Absences_garde (30 derniers jours) ====================='
SELECT ag.id, ag.type, ag.id_placement, ag.date_debut, ag.date_fin, ag.statut, ag.expire_at
FROM absences_garde ag
WHERE ag.date_debut >= (NOW()::date - INTERVAL '30 days')
ORDER BY ag.date_debut DESC;
\echo '=== 10) Uploads & notifications récentes ======================='
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
WHERE c.id IS NULL;
-- Evénements sans enfant
SELECT ev.*
FROM evenements ev
LEFT JOIN enfants e ON e.id = ev.id_enfant
WHERE e.id IS NULL;
-- Absences sans placement
SELECT ag.*
FROM absences_garde ag
LEFT JOIN enfants_assistantes_maternelles eam ON eam.id = ag.id_placement
WHERE eam.id IS NULL;
\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
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
SELECT ev.*
FROM evenements ev
WHERE ev.id_enfant = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
AND ev.date_debut >= '2025-01-01';
SELECT ag.*
FROM absences_garde ag
WHERE ag.id_placement IS NOT NULL
AND ag.date_debut >= '2025-01-01';
-- Notifications non lues (idx_notifications_user_lu_cree_le)
EXPLAIN ANALYZE
@@ -199,7 +198,7 @@ SELECT
(SELECT COUNT(*) FROM messages) AS nb_messages,
(SELECT COUNT(*) FROM contrats) AS nb_contrats,
(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 notifications) AS nb_notifications,
(SELECT COUNT(*) FROM validations) AS nb_validations;
+41 -12
View File
@@ -1,7 +1,7 @@
# 📋 Décisions Projet - P'titsPas
**Version** : 1.2
**Date** : 16 Juin 2026
**Version** : 1.4
**Date** : 24 Septembre 2026
**Auteur** : Équipe PtitsPas
---
@@ -465,19 +465,34 @@ docs/
---
### 26. Branches Git
### 26. Branches Git + merge squash (norme)
**Décision** : ✅ **Stratégie simple : master + feature branches**
**Décision** : ✅ **`develop` + `master` + `feature/*`, merges en squash**
**Justification** :
- Simplicité (petite équipe)
- Flexibilité
- Historique lisible sur `develop` / `master` (1 commit = 1 ticket)
- Déploiement prod uniquement depuis `master`
**Branches** :
- `master` : Production
- `archive/*` : Archives (ex: maquette initiale)
- `migration/*` : Migrations (ex: intégration YNOV)
- `feature/*` : Nouvelles fonctionnalités
- `master` : Production (déploiement auto)
- `develop` : Intégration / recette
- `feature/*` : Ticket en cours (depuis `develop`)
- `archive/*`, `migration/*` : Archives / migrations ponctuelles
**Flux (norme à partir de #169+)** :
1. Branche `feature/N-…` depuis `develop`
2. PR **feature → `develop`** : merge **squash** (`Do: squash` côté Gitea)
3. Quand un lot est prêt : PR **`develop``master`** : merge **squash** également
4. Message squash : `feat(#N): …` / `fix(#N): …` + `Closes #N` si applicable
**Exception** : les merges `--no-ff` déjà poussés (ex. #167, #168) restent tels quels — pas de réécriture dhistorique.
**API Gitea** (rappel) :
```http
POST /repos/jmartin/petitspas/pulls/{index}/merge
{"Do":"squash","MergeTitleField":"feat(#N): ","MergeMessageField":"Closes #N"}
```
---
@@ -555,6 +570,19 @@ docs/
---
### 32. Module Absences + Cartes (séparation back / collecte)
**Décision** : ✅ **Back `absences_garde` = vérité métier** ; **Cartes = file dattention / 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 dinteraction multi-acteurs
- Évite de stocker lhistorique 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
| # | Décision | Statut | Impact |
@@ -575,6 +603,7 @@ docs/
| 14 | Migration données | ❌ Rejeté | N/A |
| 15 | Doc utilisateur | ⏸️ Phase 2 | Formation |
| 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 |
---
@@ -586,11 +615,11 @@ docs/
| 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 |
| 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
**Version** : 1.2
**Dernière mise à jour** : 24 Septembre 2026
**Version** : 1.4
**Statut** : ✅ Document validé
+8 -1
View File
@@ -116,10 +116,17 @@ curl -s -H "Authorization: token $GITEA_TOKEN" \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls?state=open" | jq .
# Créer une PR (head = branche source, base = branche cible)
# Norme : feature/* → develop, puis develop → master
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d '{"head":"develop","base":"master","title":"Titre de la PR"}' \
-d '{"head":"feature/XX-nom","base":"develop","title":"feat(#XX): Titre","body":"Closes #XX"}' \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
# Merger en squash (norme — voir 24_DECISIONS-PROJET.md §26)
curl -s -X POST -H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d '{"Do":"squash","MergeTitleField":"feat(#XX): Titre","MergeMessageField":"Closes #XX"}' \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls/{index}/merge"
```
### 3.4 Branches
+14 -4
View File
@@ -194,6 +194,9 @@ frontend/lib/
## Workflow Git
Norme projet : **squash merge** (voir [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §26).
Cible habituelle : `feature/*``develop` ; puis `develop``master` quand le lot est prêt.
```bash
# 1. Créer une branche feature
git checkout develop
@@ -204,15 +207,22 @@ git checkout -b feature/XX-nom-ticket
git add .
git commit -m "feat(#XX): Description courte"
# 3. Pousser et créer PR
# 3. Pousser et créer PR vers develop
git push -u origin feature/XX-nom-ticket
# 4. Créer PR vers master via Gitea ou API
# 4. Créer PR (base = develop)
curl -X POST \
-H "Authorization: token giteabu_1796c6aace0e2ef7e4fdb49cdc3bc1bf8ee31fbc" \
-H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"master"}' \
-d '{"title":"feat(#XX): Titre","body":"Description\n\nCloses #XX","head":"feature/XX-nom-ticket","base":"develop"}' \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls"
# 5. Merger en squash (pas merge commit)
curl -X POST \
-H "Authorization: token $GITEA_TOKEN" \
-H "Content-Type: application/json" \
-d '{"Do":"squash","MergeTitleField":"feat(#XX): Titre","MergeMessageField":"Closes #XX"}' \
"https://git.ptits-pas.fr/api/v1/repos/jmartin/petitspas/pulls/{index}/merge"
```
---
+31 -20
View File
@@ -1,9 +1,9 @@
# 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)
> **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 dimplé code** tant que le PO na pas validé le backlog.
> **Décision :** [24_DECISIONS-PROJET.md](./24_DECISIONS-PROJET.md) §32 (Cartes ≠ back Absences).
## Intention produit (rappel)
@@ -96,22 +96,31 @@ Liste des enfants / foyers pour lAM + contexte courant (symétrique A3).
---
## Epic C — Cartes (file du quotidien)
## Epic C — Absences + Cartes (file dattention)
### C1 — [Back] Modèle + API cartes / événements de garde
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é.
**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.
### C2 — [Front] Flux de cartes colonne gauche (parent)
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).
### Back (ordre)
### C3 — [Front] Flux de cartes colonne gauche (AM)
Miroir : création congé / maladie / sortie ; lecture absences enfants du jour / à venir.
| Étape | Contenu |
|-------|---------|
| BDD | Table `absences_garde` + drop `evenements` |
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
| Cartes SYSTEM | Module `cards/` types S1S3 (sans sondages V1) |
| Realtime | WS/SSE bulles → **SSE** `GET /cards/stream` (#195) |
| Purge TTL | Job `expire_at` / `purge_at` |
### C4 — [Front] Formulaire déclarer une absence (parent)
Saisie période (+ motif léger si besoin) → crée une carte côté AM.
### Front (après API — hors chantier back immédiat)
### C5 — [Front] Formulaires AM congé / maladie / sortie
Création des cartes correspondantes + ciblage enfants si sortie.
| Ticket | Contenu |
|--------|---------|
| Feed parent / AM | File dattention 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é
1. **A1 → A2 → A3** (coquille + contexte parent)
2. **C1 → C2 / C4** (premières cartes utiles)
3. **D1 → D2 / D3** (blog central)
4. **E1 → E2 → E4** (messagerie AM)
5. **B1 → B2 → B3** + miroirs C3/C5/D3/E5 (AM)
6. **E3 / E5 / E6 / D4** (RPE)
7. **F1 → F2** + **G1** (nav, mobile, seeds)
1. **A1 → A2 → A3** (coquille + contexte parent)*fait*
2. **BDD absences → API absences** puis **Cartes SYSTEM** (congés/absences/arrêt)
3. **Feed / modale bulles** (front) + agenda lignes
4. **D1 → D2 / D3** (blog)
5. **E1 → E2 → E4** (messagerie AM)
6. **B1 → B2 → B3** + miroirs AM
7. Realtime / purge TTL / RPE / F/G
Desktop 2 panneaux (cartes prioritaires sur blog) = **évolution hors 0.2.0**.
---
+13 -7
View File
@@ -61,14 +61,20 @@ Bandeau : **TdB** · **Agenda** · **Contrat** · menu user (recherche AM, param
| **Mess. AM** | Chat foyer ↔ AM (style WhatsApp : texte, emoji, images) |
| **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 |
|------|------------|------------|
| Absence enfant | Parent | Pas de veto AM |
| Congé AM | AM | **1 parent** accepte ou refuse |
| Maladie AM | AM | Parent accuse réception (pas de doc médical in-app) |
| Sortie | AM / RPE | **1 parent** suffit (présence / absence) ; explication aussi via blog |
| Type | Qui initie | Validation / effet |
|------|------------|-------------------|
| 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 (+ motivation) → bounce AM (modif/renvoi ou DELETE) |
| Modification congé AM déjà accepté | AM | Même `id` absence ; re-validation parents ; dates actives = anciennes tant quen attente |
| 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
- Blog auteurs V1 : **AM** + **gestionnaire (RPE)** — parent auteur = plus tard
@@ -2,7 +2,7 @@
<application
android:label="p_tits_pas"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
android:icon="@mipmap/launcher_icon">
<activity
android:name=".MainActivity"
android:exported="true"
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 249 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 277 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 171 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 KiB

+58
View File
@@ -0,0 +1,58 @@
class AbsenceGarde {
final String id;
final String idPlacement;
final String type;
final String dateDebut;
final String dateFin;
final String statut;
final String expireAt;
final String? creePar;
final String? motif;
final String? idEnfant;
final String? prenomEnfant;
final String? idAm;
final String? prenomAm;
final String? nomAm;
final String creeLe;
final String modifieLe;
AbsenceGarde({
required this.id,
required this.idPlacement,
required this.type,
required this.dateDebut,
required this.dateFin,
required this.statut,
required this.expireAt,
this.creePar,
this.motif,
this.idEnfant,
this.prenomEnfant,
this.idAm,
this.prenomAm,
this.nomAm,
required this.creeLe,
required this.modifieLe,
});
factory AbsenceGarde.fromJson(Map<String, dynamic> json) {
return AbsenceGarde(
id: json['id'] ?? '',
idPlacement: json['id_placement'] ?? '',
type: json['type'] ?? '',
dateDebut: json['date_debut'] ?? '',
dateFin: json['date_fin'] ?? '',
statut: json['statut'] ?? '',
expireAt: json['expire_at'] ?? '',
creePar: json['cree_par'],
motif: json['motif'],
idEnfant: json['id_enfant'],
prenomEnfant: json['prenom_enfant'],
idAm: json['id_am'],
prenomAm: json['prenom_am'],
nomAm: json['nom_am'],
creeLe: json['cree_le'] ?? '',
modifieLe: json['modifie_le'] ?? '',
);
}
}
+113
View File
@@ -0,0 +1,113 @@
/// Modèles du couple de garde (enfant ↔ AM) — ticket #167.
/// Contrat backend #168 : GET /parents/me/couples-garde.
/// Identité minimale d'une personne du couple (enfant, AM ou parent).
class CoupleMembre {
final String id;
final String? prenom;
final String? nom;
final String? photoUrl;
const CoupleMembre({
required this.id,
this.prenom,
this.nom,
this.photoUrl,
});
/// Nom d'affichage : prénom seul si dispo, sinon « Prénom Nom », sinon repli.
String displayName({String fallback = ''}) {
final p = (prenom ?? '').trim();
final n = (nom ?? '').trim();
if (p.isNotEmpty && n.isNotEmpty) return '$p $n';
if (p.isNotEmpty) return p;
if (n.isNotEmpty) return n;
return fallback;
}
factory CoupleMembre.fromJson(Map<String, dynamic> json) {
return CoupleMembre(
id: (json['id'] ?? '').toString(),
prenom: json['prenom']?.toString(),
nom: json['nom']?.toString(),
photoUrl: json['photo_url']?.toString(),
);
}
}
/// Un couple de garde = placement actif enfant ↔ AM.
class CoupleGarde {
final String id;
final CoupleMembre enfant;
final CoupleMembre am;
final bool courant;
const CoupleGarde({
required this.id,
required this.enfant,
required this.am,
this.courant = false,
});
factory CoupleGarde.fromJson(Map<String, dynamic> json) {
return CoupleGarde(
id: (json['id'] ?? '').toString(),
enfant: CoupleMembre.fromJson(
Map<String, dynamic>.from(json['enfant'] ?? const {}),
),
am: CoupleMembre.fromJson(
Map<String, dynamic>.from(json['am'] ?? const {}),
),
courant: json['courant'] == true,
);
}
CoupleGarde copyWith({bool? courant}) {
return CoupleGarde(
id: id,
enfant: enfant,
am: am,
courant: courant ?? this.courant,
);
}
}
/// Réponse de l'API couples de garde (liste + id du couple courant).
class CouplesGardeResponse {
final List<CoupleGarde> couples;
final String? coupleCourantId;
const CouplesGardeResponse({
required this.couples,
this.coupleCourantId,
});
bool get isEmpty => couples.isEmpty;
bool get isUnique => couples.length == 1;
/// Couple courant : celui marqué `courant`, sinon celui de [coupleCourantId],
/// sinon le premier (repli implicite côté client, prévu par le back).
CoupleGarde? get coupleCourant {
if (couples.isEmpty) return null;
for (final c in couples) {
if (c.courant) return c;
}
if (coupleCourantId != null) {
for (final c in couples) {
if (c.id == coupleCourantId) return c;
}
}
return couples.first;
}
factory CouplesGardeResponse.fromJson(Map<String, dynamic> json) {
final list = (json['couples'] as List?) ?? const [];
return CouplesGardeResponse(
couples: list
.whereType<Map>()
.map((e) => CoupleGarde.fromJson(Map<String, dynamic>.from(e)))
.toList(),
coupleCourantId: json['couple_courant_id']?.toString(),
);
}
}
+152 -40
View File
@@ -1,11 +1,16 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/widgets/app_footer.dart';
import 'package:p_tits_pas/widgets/dashboard/dashboard_bandeau.dart';
import 'package:p_tits_pas/services/couple_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Dashboard assistante maternelle page blanche avec bandeau générique.
/// Contenu détaillé à venir.
/// Dashboard assistante maternelle coquille 3 colonnes quotidien (#169).
/// Colonne gauche : sélecteur de couple enfantparent(s) (#170).
/// Métier cartes / blog / messagerie : tickets C/D/E.
class AmDashboardScreen extends StatefulWidget {
const AmDashboardScreen({super.key});
@@ -14,13 +19,19 @@ class AmDashboardScreen extends StatefulWidget {
}
class _AmDashboardScreenState extends State<AmDashboardScreen> {
int selectedTabIndex = 0;
QuotidienNavSection _section = QuotidienNavSection.liaison;
AppUser? _user;
List<CoupleGarde> _couples = const [];
String? _selectedCoupleId;
bool _couplesLoading = true;
String? _couplesError;
@override
void initState() {
super.initState();
_loadUser();
_loadCouples();
}
Future<void> _loadUser() async {
@@ -28,51 +39,152 @@ class _AmDashboardScreenState extends State<AmDashboardScreen> {
if (mounted) setState(() => _user = user);
}
Future<void> _loadCouples() async {
setState(() {
_couplesLoading = true;
_couplesError = null;
});
try {
// TODO: Pour l'instant on utilise le service générique de test (CoupleGardeService.getCouplesGarde).
// Dans le futur, l'API pour l'AM (enfants_accueillis) fournira la vraie liste.
final res = await CoupleGardeService.getCouplesGarde();
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id;
_couplesLoading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_couplesError = e.toString().replaceFirst('Exception: ', '');
_couplesLoading = false;
});
}
}
Future<void> _selectCouple(CoupleGarde couple) async {
if (couple.id == _selectedCoupleId) return;
setState(() => _selectedCoupleId = couple.id);
try {
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id ?? couple.id;
});
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
"Impossible de changer d'enfant : "
'${e.toString().replaceFirst('Exception: ', '')}',
),
),
);
}
}
String get _displayName {
final n = _user?.fullName.trim() ?? '';
if (n.isNotEmpty) return n;
final email = _user?.email.trim() ?? '';
if (email.isNotEmpty) return email.split('@').first;
return 'Assistante maternelle';
}
void _soon(String label) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('$label — à venir')),
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: PreferredSize(
preferredSize: const Size.fromHeight(60.0),
child: DashboardBandeau(
tabItems: const [
DashboardTabItem(label: 'Mon tableau de bord'),
DashboardTabItem(label: 'Paramètres'),
],
selectedTabIndex: selectedTabIndex,
onTabSelected: (index) => setState(() => selectedTabIndex = index),
userDisplayName: _user?.fullName.isNotEmpty == true
? _user!.fullName
: 'Assistante maternelle',
return QuotidienShell(
selectedSection: _section,
onSectionSelected: (s) => setState(() => _section = s),
userDisplayName: _displayName,
userEmail: _user?.email,
userRole: _user?.role,
onProfileTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Modification du profil à venir')),
);
},
onSettingsTap: () {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Paramètres à venir')),
);
},
onLogout: () {},
showLogoutConfirmation: true,
onProfileTap: () => _soon('Profil'),
onSettingsTap: () => _soon('Paramètres'),
// L'AM n'a pas de bouton "Recherche AM" dans le bandeau
onSearchAmTap: null,
leftColumn: _LeftColumn(
couples: _couples,
selectedCoupleId: _selectedCoupleId,
loading: _couplesLoading,
error: _couplesError,
onRetry: _loadCouples,
onCoupleSelected: _selectCouple,
),
centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog',
subtitle:
'Fil du quotidien (affichage par défaut)\n(à brancher — ticket #179).',
icon: Icons.auto_stories_outlined,
),
body: Column(
rightColumn: const QuotidienColumnPlaceholder(
title: 'Messagerie',
subtitle:
'Mess. Parents · Mess. RPE\n(à brancher — ticket #185).',
icon: Icons.chat_bubble_outline,
),
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
contratBody: const QuotidienStubPage(
title: 'Contrat',
message: 'Contrat — contenu à venir (stub #187).',
),
);
}
}
class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId;
final bool loading;
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
const _LeftColumn({
required this.couples,
required this.selectedCoupleId,
required this.loading,
required this.error,
required this.onRetry,
required this.onCoupleSelected,
});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: Center(
child: Text(
'Dashboard AM à venir',
style: Theme.of(context).textTheme.titleLarge,
CoupleSelectorBandeau(
mode: CoupleBandeauMode.assistanteMaternelle,
couples: couples,
selectedCoupleId: selectedCoupleId,
loading: loading,
errorMessage: error,
onRetry: onRetry,
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
const Expanded(
child: QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Absences, congés AM, sorties à valider\n(à brancher — ticket #174).',
icon: Icons.style_outlined,
),
),
),
const AppFooter(),
],
),
);
}
}
@@ -1,10 +1,15 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/models/user.dart';
import 'package:p_tits_pas/services/auth_service.dart';
import 'package:p_tits_pas/services/couple_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/couple_selector_bandeau.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
import 'package:p_tits_pas/screens/home/parent_screen/agenda_absences_stub.dart';
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
/// Colonne gauche : sélecteur de couple enfantnounou (#167).
/// Métier cartes / blog / messagerie : tickets C/D/E.
class ParentDashboardScreen extends StatefulWidget {
const ParentDashboardScreen({super.key});
@@ -17,10 +22,16 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
QuotidienNavSection _section = QuotidienNavSection.liaison;
AppUser? _user;
List<CoupleGarde> _couples = const [];
String? _selectedCoupleId;
bool _couplesLoading = true;
String? _couplesError;
@override
void initState() {
super.initState();
_loadUser();
_loadCouples();
}
Future<void> _loadUser() async {
@@ -28,6 +39,52 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
if (mounted) setState(() => _user = user);
}
Future<void> _loadCouples() async {
setState(() {
_couplesLoading = true;
_couplesError = null;
});
try {
final res = await CoupleGardeService.getCouplesGarde();
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id;
_couplesLoading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_couplesError = e.toString().replaceFirst('Exception: ', '');
_couplesLoading = false;
});
}
}
Future<void> _selectCouple(CoupleGarde couple) async {
if (couple.id == _selectedCoupleId) return;
// Optimiste : on bascule tout de suite, l'API persiste ensuite.
setState(() => _selectedCoupleId = couple.id);
try {
final res = await CoupleGardeService.definirCoupleCourant(couple.id);
if (!mounted) return;
setState(() {
_couples = res.couples;
_selectedCoupleId = res.coupleCourant?.id ?? couple.id;
});
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text(
'Impossible de changer de garde : '
'${e.toString().replaceFirst('Exception: ', '')}',
),
),
);
}
}
String get _displayName {
final n = _user?.fullName.trim() ?? '';
if (n.isNotEmpty) return n;
@@ -52,11 +109,13 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
onProfileTap: () => _soon('Profil'),
onSearchAmTap: () => _soon('Recherche AM'),
onSettingsTap: () => _soon('Paramètres'),
leftColumn: const QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Couple enfantnounou et flux de cartes\n(à brancher — tickets #167 / #173).',
icon: Icons.style_outlined,
leftColumn: _LeftColumn(
couples: _couples,
selectedCoupleId: _selectedCoupleId,
loading: _couplesLoading,
error: _couplesError,
onRetry: _loadCouples,
onCoupleSelected: _selectCouple,
),
centerColumn: const QuotidienColumnPlaceholder(
title: 'Blog',
@@ -70,10 +129,7 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
icon: Icons.chat_bubble_outline,
),
agendaBody: const QuotidienStubPage(
title: 'Agenda',
message: 'Agenda — contenu à venir (stub #187).',
),
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
contratBody: const QuotidienStubPage(
title: 'Contrat',
message: 'Contrat — contenu à venir (stub #187).',
@@ -81,3 +137,51 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
);
}
}
/// Colonne gauche : bandeau couple (#167) puis flux de cartes (#173 à venir).
class _LeftColumn extends StatelessWidget {
final List<CoupleGarde> couples;
final String? selectedCoupleId;
final bool loading;
final String? error;
final VoidCallback onRetry;
final ValueChanged<CoupleGarde> onCoupleSelected;
const _LeftColumn({
required this.couples,
required this.selectedCoupleId,
required this.loading,
required this.error,
required this.onRetry,
required this.onCoupleSelected,
});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(14),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
CoupleSelectorBandeau(
couples: couples,
selectedCoupleId: selectedCoupleId,
loading: loading,
errorMessage: error,
onRetry: onRetry,
onCoupleSelected: onCoupleSelected,
),
const SizedBox(height: 14),
const Expanded(
child: QuotidienColumnPlaceholder(
title: 'Cartes',
subtitle:
'Absences, congés AM, sorties à valider\n(à brancher — ticket #173).',
icon: Icons.style_outlined,
),
),
],
),
);
}
}
@@ -0,0 +1,192 @@
import 'package:flutter/material.dart';
import 'package:p_tits_pas/models/absence_garde.dart';
import 'package:p_tits_pas/services/api/absences_garde_service.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
class AgendaAbsencesStub extends StatefulWidget {
final String? placementId;
const AgendaAbsencesStub({super.key, this.placementId});
@override
State<AgendaAbsencesStub> createState() => _AgendaAbsencesStubState();
}
class _AgendaAbsencesStubState extends State<AgendaAbsencesStub> {
List<AbsenceGarde> _absences = [];
bool _loading = true;
String? _error;
@override
void initState() {
super.initState();
_loadAbsences();
}
@override
void didUpdateWidget(covariant AgendaAbsencesStub oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.placementId != widget.placementId) {
_loadAbsences();
}
}
Future<void> _loadAbsences() async {
setState(() {
_loading = true;
_error = null;
});
try {
final absences = await AbsencesGardeService.getAbsences(
placementId: widget.placementId,
);
if (!mounted) return;
setState(() {
_absences = absences;
_loading = false;
});
} catch (e) {
if (!mounted) return;
setState(() {
_error = e.toString();
_loading = false;
});
}
}
@override
Widget build(BuildContext context) {
return Container(
color: QuotidienTheme.ivory,
child: Center(
child: ConstrainedBox(
constraints: const BoxConstraints(maxWidth: 600),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const Icon(
Icons.calendar_month_outlined,
size: 64,
color: QuotidienTheme.peach,
),
const SizedBox(height: 24),
Text(
"Agenda (Stub) - Lignes d'absence",
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.headlineSmall?.copyWith(
color: QuotidienTheme.ink,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 12),
Text(
'ID Placement courant: ${widget.placementId ?? 'Tous'}',
textAlign: TextAlign.center,
style: const TextStyle(color: QuotidienTheme.muted),
),
const SizedBox(height: 24),
Expanded(
child: _buildList(),
),
],
),
),
),
);
}
Widget _buildList() {
if (_loading) {
return const Center(child: CircularProgressIndicator());
}
if (_error != null) {
return Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.error_outline, color: Colors.red, size: 48),
const SizedBox(height: 16),
Text(_error!, style: const TextStyle(color: Colors.red)),
const SizedBox(height: 16),
ElevatedButton(
onPressed: _loadAbsences,
child: const Text('Réessayer'),
),
],
),
);
}
if (_absences.isEmpty) {
return const Center(
child: Text('Aucune absence ou congé trouvé.',
style: TextStyle(color: QuotidienTheme.muted)),
);
}
return ListView.separated(
itemCount: _absences.length,
separatorBuilder: (_, __) => const Divider(),
itemBuilder: (context, index) {
final abs = _absences[index];
return ListTile(
leading: _getIcon(abs.type),
title: Text('${abs.type} (${abs.statut})'),
subtitle: Text(
'Du ${abs.dateDebut} au ${abs.dateFin}\n'
'Enfant: ${abs.prenomEnfant ?? 'N/A'}, AM: ${abs.prenomAm ?? 'N/A'}',
),
trailing: IconButton(
icon: const Icon(Icons.delete_outline, color: Colors.red),
onPressed: () => _confirmDelete(abs),
),
);
},
);
}
Icon _getIcon(String type) {
switch (type) {
case 'absence_enfant':
return const Icon(Icons.child_care, color: QuotidienTheme.coral);
case 'conge_am':
return const Icon(Icons.beach_access, color: QuotidienTheme.turquoise);
case 'arret_maladie_am':
return const Icon(Icons.medical_services, color: QuotidienTheme.coral);
default:
return const Icon(Icons.event);
}
}
Future<void> _confirmDelete(AbsenceGarde abs) async {
final confirm = await showDialog<bool>(
context: context,
builder: (context) => AlertDialog(
title: const Text('Supprimer ?'),
content: Text("Supprimer l'absence ${abs.type} du ${abs.dateDebut} ?"),
actions: [
TextButton(
onPressed: () => Navigator.pop(context, false),
child: const Text('Annuler'),
),
TextButton(
onPressed: () => Navigator.pop(context, true),
style: TextButton.styleFrom(foregroundColor: Colors.red),
child: const Text('Supprimer'),
),
],
),
);
if (confirm == true) {
try {
await AbsencesGardeService.supprimerAbsence(abs.id);
_loadAbsences();
} catch (e) {
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Erreur: $e')),
);
}
}
}
}
@@ -0,0 +1,94 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:p_tits_pas/models/absence_garde.dart';
import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/services/api/tokenService.dart';
class AbsencesGardeService {
static Future<List<AbsenceGarde>> getAbsences({String? placementId}) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse(ApiConfig.baseUrl +
'/absences-garde' +
(placementId != null ? '?placementId=$placementId' : ''));
final res = await http.get(uri, headers: headers);
if (res.statusCode == 200) {
final json = jsonDecode(res.body);
final List items = json['items'] ?? [];
return items.map((e) => AbsenceGarde.fromJson(e)).toList();
} else {
throw Exception('Erreur de chargement des absences : ${res.statusCode}');
}
}
static Future<AbsenceGarde> creerAbsence({
required String idPlacement,
required String type,
required String dateDebut,
required String dateFin,
String? motif,
}) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde');
final res = await http.post(
uri,
headers: headers,
body: jsonEncode({
'id_placement': idPlacement,
'type': type,
'date_debut': dateDebut,
'date_fin': dateFin,
if (motif != null) 'motif': motif,
}),
);
if (res.statusCode == 201) {
return AbsenceGarde.fromJson(jsonDecode(res.body));
} else {
throw Exception("Erreur de création d'absence : ${res.statusCode}");
}
}
static Future<AbsenceGarde> modifierAbsence(
String id, {
String? dateDebut,
String? dateFin,
String? statut,
String? motif,
}) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
final Map<String, dynamic> body = {};
if (dateDebut != null) body['date_debut'] = dateDebut;
if (dateFin != null) body['date_fin'] = dateFin;
if (statut != null) body['statut'] = statut;
if (motif != null) body['motif'] = motif;
final res = await http.patch(
uri,
headers: headers,
body: jsonEncode(body),
);
if (res.statusCode == 200) {
return AbsenceGarde.fromJson(jsonDecode(res.body));
} else {
throw Exception("Erreur de modification d'absence : ${res.statusCode}");
}
}
static Future<void> supprimerAbsence(String id) async {
final token = await TokenService.getToken();
final headers = token != null ? ApiConfig.authHeaders(token) : ApiConfig.headers;
final uri = Uri.parse('${ApiConfig.baseUrl}/absences-garde/$id');
final res = await http.delete(uri, headers: headers);
if (res.statusCode != 204) {
throw Exception("Erreur de suppression d'absence : ${res.statusCode}");
}
}
}
+6 -1
View File
@@ -62,6 +62,10 @@ class ApiConfig {
static const String parents = '/parents';
/// Création dossier famille actif par le staff (#129) — body type register parent.
static const String parentsDossier = '/parents/dossier';
/// Couples de garde du parent connecté (#167 / #168).
static const String parentsCouplesGarde = '/parents/me/couples-garde';
static const String parentsCoupleGardeCourant =
'/parents/me/couples-garde/courant';
static const String assistantesMaternelles = '/assistantes-maternelles';
/// Création dossier AM actif par le staff (#156) — body type register AM.
static const String assistantesMaternellesDossier =
@@ -92,7 +96,8 @@ class ApiConfig {
};
static Map<String, String> authHeaders(String token) => {
...headers,
'Content-Type': 'application/json',
'Accept': 'application/json',
'Authorization': 'Bearer $token',
};
}
+7
View File
@@ -383,6 +383,13 @@ class AuthService {
}
/// Récupère l'utilisateur connecté depuis le cache
static const String tokenKey = 'auth_token';
static Future<String?> getToken() async {
final prefs = await SharedPreferences.getInstance();
return prefs.getString(tokenKey);
}
static Future<AppUser?> getCurrentUser() async {
final prefs = await SharedPreferences.getInstance();
final userJson = prefs.getString(_currentUserKey);
@@ -0,0 +1,76 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/services/api/tokenService.dart';
/// Accès API aux couples de garde du parent connecté — tickets #167 / #168.
/// - GET /parents/me/couples-garde
/// - PUT /parents/me/couples-garde/courant { couple_id }
class CoupleGardeService {
static Future<Map<String, String>> _headers() async {
final token = await TokenService.getToken();
return token != null
? ApiConfig.authHeaders(token)
: Map<String, String>.from(ApiConfig.headers);
}
static String _extractError(String body, String fallback) {
try {
final decoded = jsonDecode(body);
if (decoded is Map<String, dynamic>) {
final message = decoded['message'];
if (message is String && message.trim().isNotEmpty) {
return message;
}
if (message is Map && message['message'] is String) {
return message['message'] as String;
}
}
} catch (_) {}
return fallback;
}
/// Liste les couples de garde et le couple courant du parent connecté.
static Future<CouplesGardeResponse> getCouplesGarde() async {
final response = await http.get(
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.parentsCouplesGarde}'),
headers: await _headers(),
);
if (response.statusCode != 200) {
throw Exception(
_extractError(response.body, 'Erreur chargement des couples de garde'),
);
}
final decoded = jsonDecode(response.body);
return CouplesGardeResponse.fromJson(
Map<String, dynamic>.from(decoded as Map),
);
}
/// Persiste le couple courant (préférence utilisateur) et renvoie la liste
/// à jour.
static Future<CouplesGardeResponse> definirCoupleCourant(
String coupleId,
) async {
final response = await http.put(
Uri.parse('${ApiConfig.baseUrl}${ApiConfig.parentsCoupleGardeCourant}'),
headers: await _headers(),
body: jsonEncode({'couple_id': coupleId}),
);
if (response.statusCode != 200) {
throw Exception(
_extractError(response.body, 'Erreur sélection du couple de garde'),
);
}
final decoded = jsonDecode(response.body);
return CouplesGardeResponse.fromJson(
Map<String, dynamic>.from(decoded as Map),
);
}
}
@@ -0,0 +1,384 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:p_tits_pas/models/couple_garde.dart';
import 'package:p_tits_pas/services/api/api_config.dart';
import 'package:p_tits_pas/widgets/common/auth_network_image.dart';
import 'package:p_tits_pas/widgets/quotidien/quotidien_theme.dart';
/// Rôle qui consulte le bandeau : côté parent (enfant | nounou) ou côté AM
/// (enfant | parent(s)). Le composant est le même, seule la lecture change.
/// Ticket #167 (parent) ; #170 réutilise en mode AM.
enum CoupleBandeauMode { parent, assistanteMaternelle }
/// Bandeau « couple de garde » en haut de la colonne gauche du TdB.
///
/// - Plusieurs couples → contrôle unique avec chevron (dropdown de bascule).
/// - Un seul couple → affichage informatif (pas de chevron, pas de menu).
/// - Aucun couple → état vide discret.
class CoupleSelectorBandeau extends StatelessWidget {
final CoupleBandeauMode mode;
final List<CoupleGarde> couples;
final String? selectedCoupleId;
final ValueChanged<CoupleGarde>? onCoupleSelected;
final bool loading;
final String? errorMessage;
final VoidCallback? onRetry;
const CoupleSelectorBandeau({
super.key,
this.mode = CoupleBandeauMode.parent,
required this.couples,
this.selectedCoupleId,
this.onCoupleSelected,
this.loading = false,
this.errorMessage,
this.onRetry,
});
CoupleGarde? get _selected {
if (couples.isEmpty) return null;
if (selectedCoupleId != null) {
for (final c in couples) {
if (c.id == selectedCoupleId) return c;
}
}
for (final c in couples) {
if (c.courant) return c;
}
return couples.first;
}
@override
Widget build(BuildContext context) {
return LayoutBuilder(builder: (context, constraints) {
if (loading) return const _CoupleBandeauSkeleton();
if (errorMessage != null) {
return _CoupleBandeauError(message: errorMessage!, onRetry: onRetry);
}
if (couples.isEmpty) return const _CoupleBandeauEmpty();
final selected = _selected!;
final multi = couples.length > 1;
final card = _CoupleCard(
mode: mode,
couple: selected,
showChevron: multi,
colorIndex: couples.indexOf(selected),
);
if (!multi) return card;
return Theme(
data: Theme.of(context).copyWith(
hoverColor: Colors.transparent,
splashColor: Colors.transparent,
highlightColor: Colors.transparent,
focusColor: Colors.transparent,
),
child: PopupMenuButton<String>(
tooltip: 'Changer de garde',
// L'offset doit être suffisant pour descendre sous la carte (qui fait 90px).
offset: const Offset(0, 95),
color: Colors.transparent, // Le fond devient invisible
elevation: 0, // Pas d'ombre carrée
constraints: BoxConstraints.tightFor(width: constraints.maxWidth),
padding: EdgeInsets.zero,
onSelected: (id) {
final chosen = couples.firstWhere((c) => c.id == id);
onCoupleSelected?.call(chosen);
},
itemBuilder: (context) => [
for (final c in couples)
if (c.id != selected.id)
PopupMenuItem<String>(
value: c.id,
padding: EdgeInsets.zero,
height: 100, // Hauteur de la carte (90) + un peu de marge (10)
child: Padding(
padding: const EdgeInsets.only(bottom: 10),
child: _CoupleCard(
mode: mode,
couple: c,
showChevron: false,
selected: false,
isMenuItem: true,
colorIndex: couples.indexOf(c),
),
),
),
],
child: card,
),
);
});
}
}
/// Carte principale : enfant à gauche, séparateur, AM/parents à droite.
class _CoupleCard extends StatelessWidget {
final CoupleBandeauMode mode;
final CoupleGarde couple;
final bool showChevron;
final bool selected;
final bool isMenuItem;
final int colorIndex;
const _CoupleCard({
required this.mode,
required this.couple,
required this.showChevron,
this.selected = true,
this.isMenuItem = false,
required this.colorIndex,
});
@override
Widget build(BuildContext context) {
// Parent mode: enfant | AM
// AM mode: enfant | parent(s)
final isParentMode = mode == CoupleBandeauMode.parent;
final fallbackRoleIcon = isParentMode ? Icons.volunteer_activism : Icons.person_outline;
final fallbackRoleName = isParentMode ? 'Nounou' : 'Parent';
// TODO: In AM mode, we should ideally display "parent1+parent2 empilés" or centered.
// For now, CoupleGarde only gives us `am` (which in AM mode might just represent one parent, or the system needs to feed both parents here).
// Assuming backend will populate `am` field with the parent data when called by AM.
return Container(
height: 90,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(QuotidienTheme.bandeauColors[colorIndex % QuotidienTheme.bandeauColors.length]),
fit: BoxFit.fill,
),
),
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
Expanded(
child: Padding(
padding: const EdgeInsets.only(right: 12),
child: _MembreTile(
photoUrl: couple.enfant.photoUrl,
name: (couple.enfant.prenom != null && couple.enfant.prenom!.isNotEmpty)
? couple.enfant.prenom!
: couple.enfant.displayName(fallback: 'Enfant'),
fallbackIcon: Icons.child_care,
),
),
),
Container(
width: 8,
height: 44,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(QuotidienTheme.pencilLineVerticalAsset),
fit: BoxFit.contain,
),
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(left: 12),
child: _MembreTile(
photoUrl: couple.am.photoUrl,
name: (couple.am.prenom != null && couple.am.prenom!.isNotEmpty)
? couple.am.prenom!
: couple.am.displayName(fallback: fallbackRoleName),
fallbackIcon: fallbackRoleIcon,
),
),
),
SizedBox(
width: 28,
child: showChevron
? const Icon(
Icons.keyboard_arrow_down,
color: QuotidienTheme.ink,
)
: null,
),
],
),
);
}
}
/// Photo ronde + nom (une moitié du couple).
class _MembreTile extends StatelessWidget {
final String? photoUrl;
final String name;
final IconData fallbackIcon;
const _MembreTile({
required this.photoUrl,
required this.name,
required this.fallbackIcon,
});
@override
Widget build(BuildContext context) {
return Row(
children: [
_Avatar(photoUrl: photoUrl, fallbackIcon: fallbackIcon, size: 64),
const SizedBox(width: 12),
Expanded(
child: Text(
name,
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: GoogleFonts.merienda(
fontSize: 22,
fontWeight: FontWeight.bold,
color: QuotidienTheme.ink,
),
),
),
],
);
}
}
class _Avatar extends StatelessWidget {
final String? photoUrl;
final IconData fallbackIcon;
final double size;
const _Avatar({
required this.photoUrl,
required this.fallbackIcon,
required this.size,
});
@override
Widget build(BuildContext context) {
final url = ApiConfig.absoluteMediaUrl(photoUrl);
final placeholder = Container(
width: size,
height: size,
color: QuotidienTheme.lavender.withValues(alpha: 0.35),
child: Icon(fallbackIcon, size: size * 0.5, color: QuotidienTheme.ink),
);
return ClipOval(
child: SizedBox(
width: size,
height: size,
child: url.isEmpty
? placeholder
: AuthNetworkImage(
url: url,
width: size,
height: size,
fit: BoxFit.cover,
errorBuilder: (_, __, ___) => placeholder,
),
),
);
}
}
class _CoupleBandeauSkeleton extends StatelessWidget {
const _CoupleBandeauSkeleton();
@override
Widget build(BuildContext context) {
return Container(
height: 90,
decoration: BoxDecoration(
image: DecorationImage(
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
fit: BoxFit.fill,
colorFilter: ColorFilter.mode(
Colors.white.withValues(alpha: 0.5),
BlendMode.lighten,
),
),
),
alignment: Alignment.center,
child: const SizedBox(
width: 26,
height: 26,
child: CircularProgressIndicator(strokeWidth: 2),
),
);
}
}
class _CoupleBandeauEmpty extends StatelessWidget {
const _CoupleBandeauEmpty();
@override
Widget build(BuildContext context) {
return Container(
height: 90,
decoration: const BoxDecoration(
image: DecorationImage(
image: AssetImage(QuotidienTheme.bandeauLime), // Un asset existant par défaut
fit: BoxFit.fill,
),
),
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
const Icon(Icons.info_outline, color: QuotidienTheme.muted),
const SizedBox(width: 12),
Expanded(
child: Text(
'Aucune garde active pour le moment.',
style: GoogleFonts.merriweather(
fontSize: 14,
color: QuotidienTheme.muted,
),
),
),
],
),
);
}
}
class _CoupleBandeauError extends StatelessWidget {
final String message;
final VoidCallback? onRetry;
const _CoupleBandeauError({required this.message, this.onRetry});
@override
Widget build(BuildContext context) {
return Container(
height: 90,
decoration: BoxDecoration(
image: DecorationImage(
image: const AssetImage(QuotidienTheme.bandeauLime), // Un asset existant
fit: BoxFit.fill,
colorFilter: ColorFilter.mode(
QuotidienTheme.coral.withValues(alpha: 0.3),
BlendMode.srcATop,
),
),
),
padding: const EdgeInsets.symmetric(horizontal: 24),
child: Row(
children: [
const Icon(Icons.error_outline, color: QuotidienTheme.ink),
const SizedBox(width: 12),
Expanded(
child: Text(
message,
style: GoogleFonts.merriweather(
fontSize: 13,
color: QuotidienTheme.ink,
),
),
),
if (onRetry != null)
TextButton(
onPressed: onRetry,
child: const Text('Réessayer'),
),
],
),
);
}
}
@@ -183,6 +183,7 @@ class _UserMenu extends StatelessWidget {
title: Text('Profil'),
),
),
if (onSearchAmTap != null)
const PopupMenuItem(
value: 'search_am',
child: ListTile(
@@ -6,6 +6,7 @@ abstract final class QuotidienTheme {
static const Color ink = Color(0xFF2F2F2F);
static const Color ivory = Color(0xFFFFFEF9);
static const Color turquoise = Color(0xFF8AD0C8);
static const Color peach = Color(0xFFFFCCB6);
static const Color lavender = Color(0xFFC6A3D8);
static const Color coral = Color(0xFFF4A28C);
static const Color softGreenPill = Color(0xFFB8D9A8);
@@ -19,6 +20,29 @@ abstract final class QuotidienTheme {
/// couleur charte par section ; l'inactive est la même, plus transparente.
static const double pillInactiveOpacity = 0.45;
static const String pillIvoryAsset = 'assets/images/bg_ivoire_pill.png';
static const String pillBlueAsset = 'assets/images/bg_blue_pill.png';
// Bandeaux pour les couples (ratio 10:1, dessinés au crayon, couleur dynamique)
static const String bandeauLime = 'assets/images/bandeau_lime.png';
static const String bandeauBlue = 'assets/images/bandeau_blue.png';
static const String bandeauPeach = 'assets/images/bandeau_peach.png';
static const String bandeauYellow = 'assets/images/bandeau_yellow.png';
static const String bandeauLavender = 'assets/images/bandeau_lavender.png';
static const List<String> bandeauColors = [
bandeauLime,
bandeauBlue,
bandeauPeach,
bandeauYellow,
bandeauLavender,
];
/// Retourne un asset bandeau fixe pour un couple donné (basé sur son ID)
static String bandeauAssetForCouple(String coupleId) {
if (coupleId.isEmpty) return bandeauLime;
final hash = coupleId.hashCode.abs();
return bandeauColors[hash % bandeauColors.length];
}
static const String pillYellowAsset = 'assets/images/bg_yellow_pill.png';
static const String pillPeachAsset = 'assets/images/bg_peach_pill.png';
static const String pillTurquoiseAsset =
+72
View File
@@ -1,6 +1,22 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
sha256: "6c5bcd986e06b94e3c40244af471750840a3d2341d1f9763a1100a14add517b4"
url: "https://pub.dev"
source: hosted
version: "4.3.0"
args:
dependency: transitive
description:
name: args
sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
url: "https://pub.dev"
source: hosted
version: "2.7.0"
async:
dependency: transitive
description:
@@ -25,6 +41,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.4.0"
checked_yaml:
dependency: transitive
description:
name: checked_yaml
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
url: "https://pub.dev"
source: hosted
version: "2.0.3"
cli_util:
dependency: transitive
description:
name: cli_util
sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
url: "https://pub.dev"
source: hosted
version: "0.4.2"
clock:
dependency: transitive
description:
@@ -150,6 +182,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_launcher_icons:
dependency: "direct dev"
description:
name: flutter_launcher_icons
sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
url: "https://pub.dev"
source: hosted
version: "0.13.1"
flutter_lints:
dependency: "direct dev"
description:
@@ -213,6 +253,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.2"
image:
dependency: transitive
description:
name: image
sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89
url: "https://pub.dev"
source: hosted
version: "4.10.1"
image_picker:
dependency: "direct main"
description:
@@ -293,6 +341,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.6.7"
json_annotation:
dependency: transitive
description:
name: json_annotation
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
url: "https://pub.dev"
source: hosted
version: "4.9.0"
leak_tracker:
dependency: transitive
description:
@@ -461,6 +517,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.8"
posix:
dependency: transitive
description:
name: posix
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
url: "https://pub.dev"
source: hosted
version: "6.5.2"
provider:
dependency: "direct main"
description:
@@ -722,6 +786,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
yaml:
dependency: transitive
description:
name: yaml
sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
url: "https://pub.dev"
source: hosted
version: "3.1.4"
sdks:
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.19.0"
+15
View File
@@ -30,6 +30,21 @@ dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^2.0.0
flutter_launcher_icons: ^0.13.1
flutter_launcher_icons:
android: "launcher_icon"
ios: false
image_path: "assets/images/icon.png"
web:
generate: true
image_path: "assets/images/icon.png"
background_color: "#ffffff"
theme_color: "#ffffff"
windows:
generate: true
image_path: "assets/images/icon.png"
icon_size: 256
flutter:
uses-material-design: true
Binary file not shown.

Before

Width:  |  Height:  |  Size: 917 B

After

Width:  |  Height:  |  Size: 633 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 165 KiB

+4 -4
View File
@@ -3,19 +3,19 @@
"short_name": "P'titsPas",
"start_url": ".",
"display": "standalone",
"background_color": "#FFFEF9",
"theme_color": "#8AD0C8",
"background_color": "#ffffff",
"theme_color": "#ffffff",
"description": "P'titsPas - Grandir pas à pas, sereinement",
"orientation": "portrait-primary",
"prefer_related_applications": false,
"icons": [
{
"src": "assets/images/icon.png",
"src": "icons/Icon-192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "assets/images/icon.png",
"src": "icons/Icon-512.png",
"sizes": "512x512",
"type": "image/png"
},
Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 47 KiB

+1
View File
File diff suppressed because one or more lines are too long