Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba6078feab | ||
|
|
9240d35d9e | ||
|
|
7a3ba178ec | ||
|
|
77832d53c4 | ||
|
|
d127ab4ecb | ||
|
|
f4fce0a1ef | ||
|
|
2daf6c9cda | ||
|
|
aeda636983 | ||
|
|
a7c0864279 | ||
|
|
aae2beeac8 | ||
|
|
f745079f0a | ||
|
|
5b83102a59 | ||
|
|
eb5e4aa915 | ||
|
|
d6d8b299dd | ||
|
|
ea0e97d930 | ||
|
|
84e46162fd | ||
|
|
14580c34e0 | ||
|
|
ae610733cc | ||
|
|
846afed86c | ||
|
|
99a6c17c23 | ||
|
|
04f49cb62f | ||
|
|
3c7f4f6e16 | ||
|
|
dcd407a3da | ||
|
|
fde63f8e72 | ||
|
|
1f8f1b9507 |
@@ -17,7 +17,6 @@ import { EnfantsModule } from './routes/enfants/enfants.module';
|
|||||||
import { AppConfigModule } from './modules/config/config.module';
|
import { AppConfigModule } from './modules/config/config.module';
|
||||||
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
import { DocumentsLegauxModule } from './modules/documents-legaux';
|
||||||
import { AbsencesGardeModule } from './modules/absences-garde';
|
import { AbsencesGardeModule } from './modules/absences-garde';
|
||||||
import { CardsModule } from './modules/cards';
|
|
||||||
import { RelaisModule } from './routes/relais/relais.module';
|
import { RelaisModule } from './routes/relais/relais.module';
|
||||||
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
import { DossiersModule } from './routes/dossiers/dossiers.module';
|
||||||
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||||
@@ -59,7 +58,6 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
|||||||
AppConfigModule,
|
AppConfigModule,
|
||||||
DocumentsLegauxModule,
|
DocumentsLegauxModule,
|
||||||
AbsencesGardeModule,
|
AbsencesGardeModule,
|
||||||
CardsModule,
|
|
||||||
RelaisModule,
|
RelaisModule,
|
||||||
DossiersModule,
|
DossiersModule,
|
||||||
SuppressionsModule,
|
SuppressionsModule,
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn, ManyToOne } from 'typeorm';
|
import { Entity, PrimaryColumn, Column, OneToOne, OneToMany, JoinColumn } from 'typeorm';
|
||||||
import { Users } from './users.entity';
|
import { Users } from './users.entity';
|
||||||
import { AmChildren } from './am_children.entity';
|
import { AmChildren } from './am_children.entity';
|
||||||
|
|
||||||
@@ -53,16 +53,6 @@ export class AssistanteMaternelle {
|
|||||||
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
@Column({ name: 'numero_dossier', length: 20, nullable: true })
|
||||||
numero_dossier?: string;
|
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)
|
@OneToMany(() => AmChildren, (ac) => ac.am)
|
||||||
amChildren: AmChildren[];
|
amChildren: AmChildren[];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
import {
|
|
||||||
Column,
|
|
||||||
CreateDateColumn,
|
|
||||||
Entity,
|
|
||||||
PrimaryColumn,
|
|
||||||
UpdateDateColumn,
|
|
||||||
} from 'typeorm';
|
|
||||||
|
|
||||||
export enum CardResponseModeType {
|
|
||||||
NONE = 'none',
|
|
||||||
ACK = 'ack',
|
|
||||||
ACCEPT_REFUSE = 'accept_refuse',
|
|
||||||
}
|
|
||||||
|
|
||||||
@Entity('card_types', { schema: 'public' })
|
|
||||||
export class CardType {
|
|
||||||
@PrimaryColumn({ name: 'code', type: 'varchar', length: 64 })
|
|
||||||
code: string;
|
|
||||||
|
|
||||||
@Column({ name: 'system', type: 'boolean', default: true })
|
|
||||||
system: boolean;
|
|
||||||
|
|
||||||
@Column({ name: 'titre', type: 'varchar', length: 120 })
|
|
||||||
titre: string;
|
|
||||||
|
|
||||||
@Column({ name: 'emitter_roles', type: 'text', array: true })
|
|
||||||
emitter_roles: string[];
|
|
||||||
|
|
||||||
@Column({ name: 'recipient_roles', type: 'text', array: true })
|
|
||||||
recipient_roles: string[];
|
|
||||||
|
|
||||||
@Column({ name: 'audience_resolver', type: 'varchar', length: 64 })
|
|
||||||
audience_resolver: string;
|
|
||||||
|
|
||||||
@Column({
|
|
||||||
type: 'enum',
|
|
||||||
enum: CardResponseModeType,
|
|
||||||
enumName: 'card_response_mode_type',
|
|
||||||
name: 'response_mode',
|
|
||||||
})
|
|
||||||
response_mode: CardResponseModeType;
|
|
||||||
|
|
||||||
@Column({ name: 'retention_days', type: 'int', default: 14 })
|
|
||||||
retention_days: number;
|
|
||||||
|
|
||||||
@Column({ name: 'couleur', type: 'varchar', length: 32, nullable: true })
|
|
||||||
couleur?: string;
|
|
||||||
|
|
||||||
@CreateDateColumn({ name: 'cree_le', type: 'timestamptz' })
|
|
||||||
cree_le: Date;
|
|
||||||
|
|
||||||
@UpdateDateColumn({ name: 'modifie_le', type: 'timestamptz' })
|
|
||||||
modifie_le: Date;
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { ConfigModule, ConfigService } from '@nestjs/config';
|
|
||||||
import { JwtModule } from '@nestjs/jwt';
|
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
import { AbsencesGarde } from 'src/entities/absences_garde.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
@@ -11,14 +9,6 @@ import { AbsencesGardeService } from './absences-garde.service';
|
|||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [
|
||||||
TypeOrmModule.forFeature([AbsencesGarde, AmChildren, ParentsChildren]),
|
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],
|
controllers: [AbsencesGardeController],
|
||||||
providers: [AbsencesGardeService],
|
providers: [AbsencesGardeService],
|
||||||
|
|||||||
@@ -312,16 +312,15 @@ export class AbsencesGardeService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||||
// Remise en attente après refus OU modification d’un congé déjà accepté (S2b)
|
// Remise en attente après refus (republication)
|
||||||
if (
|
if (
|
||||||
next === StatutAbsenceGardeType.EN_ATTENTE &&
|
row.statut === StatutAbsenceGardeType.REFUSE &&
|
||||||
(row.statut === StatutAbsenceGardeType.REFUSE ||
|
next === StatutAbsenceGardeType.EN_ATTENTE
|
||||||
row.statut === StatutAbsenceGardeType.ACCEPTE)
|
|
||||||
) {
|
) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
throw new ForbiddenException(
|
throw new ForbiddenException(
|
||||||
'L’AM ne valide pas elle-même (sauf republication / modification)',
|
'L’AM ne valide pas elle-même (sauf republication après refus)',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
throw new ForbiddenException('Changement de statut non autorisé');
|
throw new ForbiddenException('Changement de statut non autorisé');
|
||||||
|
|||||||
@@ -1,94 +0,0 @@
|
|||||||
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é');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
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();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,111 +0,0 @@
|
|||||||
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 d’abonné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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
import {
|
|
||||||
Body,
|
|
||||||
Controller,
|
|
||||||
Delete,
|
|
||||||
Get,
|
|
||||||
HttpCode,
|
|
||||||
HttpStatus,
|
|
||||||
Param,
|
|
||||||
ParseUUIDPipe,
|
|
||||||
Patch,
|
|
||||||
Post,
|
|
||||||
Query,
|
|
||||||
UseGuards,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import {
|
|
||||||
ApiBearerAuth,
|
|
||||||
ApiBody,
|
|
||||||
ApiOperation,
|
|
||||||
ApiQuery,
|
|
||||||
ApiResponse,
|
|
||||||
ApiTags,
|
|
||||||
} from '@nestjs/swagger';
|
|
||||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
|
||||||
import { RolesGuard } from 'src/common/guards/roles.guard';
|
|
||||||
import { Roles } from 'src/common/decorators/roles.decorator';
|
|
||||||
import { User } from 'src/common/decorators/user.decorator';
|
|
||||||
import { RoleType } from 'src/entities/users.entity';
|
|
||||||
import { CardsService } from './cards.service';
|
|
||||||
import {
|
|
||||||
CarteDto,
|
|
||||||
CreerCarteDto,
|
|
||||||
ListeCartesDto,
|
|
||||||
MajCarteDto,
|
|
||||||
RepondreCarteDto,
|
|
||||||
} from './dto/cards.dto';
|
|
||||||
|
|
||||||
@ApiTags('Cartes')
|
|
||||||
@ApiBearerAuth('access-token')
|
|
||||||
@Controller('cards')
|
|
||||||
@UseGuards(AuthGuard, RolesGuard)
|
|
||||||
export class CardsController {
|
|
||||||
constructor(private readonly cardsService: CardsService) {}
|
|
||||||
|
|
||||||
@Get('types')
|
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@ApiOperation({ summary: 'Types SYSTEM émissibles pour mon rôle — #194' })
|
|
||||||
listerTypes(@User('role') role: RoleType) {
|
|
||||||
return this.cardsService.listerTypes(role);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Get()
|
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@ApiOperation({ summary: 'Feed bulles de l’utilisateur — #194' })
|
|
||||||
@ApiQuery({ name: 'placementId', required: false })
|
|
||||||
@ApiResponse({ status: 200, type: ListeCartesDto })
|
|
||||||
lister(
|
|
||||||
@User('id') userId: string,
|
|
||||||
@User('role') role: RoleType,
|
|
||||||
@Query('placementId') placementId?: string,
|
|
||||||
): Promise<ListeCartesDto> {
|
|
||||||
return this.cardsService.lister(userId, role, placementId);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post()
|
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@HttpCode(HttpStatus.CREATED)
|
|
||||||
@ApiOperation({
|
|
||||||
summary: 'Créer une bulle (+ hook absences_garde) — #194',
|
|
||||||
})
|
|
||||||
@ApiBody({ type: CreerCarteDto })
|
|
||||||
@ApiResponse({ status: 201, type: CarteDto })
|
|
||||||
creer(
|
|
||||||
@User('id') userId: string,
|
|
||||||
@User('role') role: RoleType,
|
|
||||||
@Body() dto: CreerCarteDto,
|
|
||||||
): Promise<CarteDto> {
|
|
||||||
return this.cardsService.creer(userId, role, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Post(':id/respond')
|
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@ApiOperation({ summary: 'Répondre (accept / refuse / ack) — #194' })
|
|
||||||
@ApiBody({ type: RepondreCarteDto })
|
|
||||||
repondre(
|
|
||||||
@User('id') userId: string,
|
|
||||||
@User('role') role: RoleType,
|
|
||||||
@Param('id', ParseUUIDPipe) id: string,
|
|
||||||
@Body() dto: RepondreCarteDto,
|
|
||||||
): Promise<CarteDto> {
|
|
||||||
return this.cardsService.repondre(userId, role, id, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Patch(':id')
|
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@ApiOperation({
|
|
||||||
summary: 'Modifier dates (créateur, ouverte/refusée) — #194',
|
|
||||||
})
|
|
||||||
@ApiBody({ type: MajCarteDto })
|
|
||||||
maj(
|
|
||||||
@User('id') userId: string,
|
|
||||||
@User('role') role: RoleType,
|
|
||||||
@Param('id', ParseUUIDPipe) id: string,
|
|
||||||
@Body() dto: MajCarteDto,
|
|
||||||
): Promise<CarteDto> {
|
|
||||||
return this.cardsService.majEnAttente(userId, role, id, dto);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Delete(':id')
|
|
||||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@HttpCode(HttpStatus.NO_CONTENT)
|
|
||||||
@ApiOperation({ summary: 'Supprimer bulle (+ absence si non traitée) — #194' })
|
|
||||||
async supprimer(
|
|
||||||
@User('id') userId: string,
|
|
||||||
@User('role') role: RoleType,
|
|
||||||
@Param('id', ParseUUIDPipe) id: string,
|
|
||||||
): Promise<void> {
|
|
||||||
await this.cardsService.supprimer(userId, role, id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
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 {}
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
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);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -1,489 +0,0 @@
|
|||||||
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 n’est plus ouverte');
|
|
||||||
}
|
|
||||||
if (card.cree_par === userId) {
|
|
||||||
throw new ForbiddenException('Le créateur ne répond pas à sa propre carte');
|
|
||||||
}
|
|
||||||
|
|
||||||
const mode = card.type.response_mode;
|
|
||||||
if (mode === CardResponseModeType.NONE) {
|
|
||||||
throw new BadRequestException('Ce type de carte ne demande pas de réponse');
|
|
||||||
}
|
|
||||||
if (mode === CardResponseModeType.ACK && dto.action !== CardResponseActionType.ACK) {
|
|
||||||
throw new BadRequestException('Action attendue : ack');
|
|
||||||
}
|
|
||||||
if (
|
|
||||||
mode === CardResponseModeType.ACCEPT_REFUSE &&
|
|
||||||
dto.action !== CardResponseActionType.ACCEPT &&
|
|
||||||
dto.action !== CardResponseActionType.REFUSE
|
|
||||||
) {
|
|
||||||
throw new BadRequestException('Action attendue : accept ou refuse');
|
|
||||||
}
|
|
||||||
if (dto.action === CardResponseActionType.REFUSE && !dto.comment?.trim()) {
|
|
||||||
throw new BadRequestException('Motivation obligatoire en cas de refus');
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.responsesRepo.save(
|
|
||||||
this.responsesRepo.create({
|
|
||||||
id_card: card.id,
|
|
||||||
id_utilisateur: userId,
|
|
||||||
action: dto.action,
|
|
||||||
comment: dto.comment?.trim(),
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (card.id_absence) {
|
|
||||||
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
|
||||||
await this.absencesService.maj(userId, role, card.id_absence, {
|
|
||||||
statut: StatutAbsenceGardeType.ACCEPTE,
|
|
||||||
});
|
|
||||||
card.statut = CardInstanceStatutType.TRAITEE;
|
|
||||||
} else if (dto.action === CardResponseActionType.REFUSE) {
|
|
||||||
await this.absencesService.maj(userId, role, card.id_absence, {
|
|
||||||
statut: StatutAbsenceGardeType.REFUSE,
|
|
||||||
motif: dto.comment!.trim(),
|
|
||||||
});
|
|
||||||
card.statut = CardInstanceStatutType.REFUSEE;
|
|
||||||
}
|
|
||||||
} else if (dto.action === CardResponseActionType.ACK) {
|
|
||||||
card.statut = CardInstanceStatutType.TRAITEE;
|
|
||||||
}
|
|
||||||
|
|
||||||
card.purge_at = this.purgeAt(card.type.retention_days, card.statut);
|
|
||||||
await this.cardsRepo.save(card);
|
|
||||||
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 l’absence liée si pas encore acceptée définitivement
|
|
||||||
if (
|
|
||||||
card.statut === CardInstanceStatutType.OUVERTE ||
|
|
||||||
card.statut === CardInstanceStatutType.REFUSEE
|
|
||||||
) {
|
|
||||||
await this.absencesService.supprimer(userId, role, card.id_absence);
|
|
||||||
}
|
|
||||||
void absStatut;
|
|
||||||
}
|
|
||||||
await this.cardsRepo.delete({ id: cardId });
|
|
||||||
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),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,137 +0,0 @@
|
|||||||
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[];
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export { CardsModule } from './cards.module';
|
|
||||||
export { CardsService } from './cards.service';
|
|
||||||
export { CardsRealtimeService } from './cards-realtime.service';
|
|
||||||
@@ -10,10 +10,7 @@ describe('AssistantesMaternellesController', () => {
|
|||||||
const authServiceMock = {
|
const authServiceMock = {
|
||||||
createAmDossierStaff: jest.fn(),
|
createAmDossierStaff: jest.fn(),
|
||||||
};
|
};
|
||||||
const amServiceMock = {
|
const amServiceMock = {};
|
||||||
listerCouplesGarde: jest.fn(),
|
|
||||||
definirCoupleGardeCourant: jest.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
@@ -69,29 +66,4 @@ describe('AssistantesMaternellesController', () => {
|
|||||||
);
|
);
|
||||||
expect(res.numero_dossier).toBe('2026-000001');
|
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,7 +2,6 @@ import {
|
|||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
Post,
|
Post,
|
||||||
Put,
|
|
||||||
Body,
|
Body,
|
||||||
Patch,
|
Patch,
|
||||||
Param,
|
Param,
|
||||||
@@ -21,8 +20,6 @@ import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
|||||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.dto';
|
||||||
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
|
import { StaffCreateAmDossierDto } from './dto/staff-create-am-dossier.dto';
|
||||||
import { StaffCreateAmDossierResponseDto } from './dto/staff-create-am-dossier-response.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 { RolesGuard } from 'src/common/guards/roles.guard';
|
||||||
import { AuthGuard } from 'src/common/guards/auth.guard';
|
import { AuthGuard } from 'src/common/guards/auth.guard';
|
||||||
import { User } from 'src/common/decorators/user.decorator';
|
import { User } from 'src/common/decorators/user.decorator';
|
||||||
@@ -86,36 +83,6 @@ export class AssistantesMaternellesController {
|
|||||||
return mapAmsForApi(ams);
|
return mapAmsForApi(ams);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get('me/couples-garde')
|
|
||||||
@Roles(RoleType.ASSISTANTE_MATERNELLE)
|
|
||||||
@ApiOperation({
|
|
||||||
summary: 'Couples de garde de l’AM 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)
|
@Roles(RoleType.SUPER_ADMIN, RoleType.GESTIONNAIRE, RoleType.ADMINISTRATEUR)
|
||||||
@Get(':id')
|
@Get(':id')
|
||||||
@ApiParam({ name: 'id', description: "UUID de la nounou" })
|
@ApiParam({ name: 'id', description: "UUID de la nounou" })
|
||||||
|
|||||||
@@ -4,21 +4,13 @@ import { AssistantesMaternellesController } from './assistantes_maternelles.cont
|
|||||||
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { Children } from 'src/entities/children.entity';
|
import { Children } from 'src/entities/children.entity';
|
||||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
|
||||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||||
import { Users } from 'src/entities/users.entity';
|
import { Users } from 'src/entities/users.entity';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [
|
imports: [TypeOrmModule.forFeature([AssistanteMaternelle, AmChildren, Children, Users]),
|
||||||
TypeOrmModule.forFeature([
|
AuthModule
|
||||||
AssistanteMaternelle,
|
|
||||||
AmChildren,
|
|
||||||
Children,
|
|
||||||
Users,
|
|
||||||
ParentsChildren,
|
|
||||||
]),
|
|
||||||
AuthModule,
|
|
||||||
],
|
],
|
||||||
controllers: [AssistantesMaternellesController],
|
controllers: [AssistantesMaternellesController],
|
||||||
providers: [AssistantesMaternellesService],
|
providers: [AssistantesMaternellesService],
|
||||||
|
|||||||
@@ -1,150 +1,18 @@
|
|||||||
import { NotFoundException } from '@nestjs/common';
|
|
||||||
import { Test, TestingModule } from '@nestjs/testing';
|
import { Test, TestingModule } from '@nestjs/testing';
|
||||||
import { getRepositoryToken } from '@nestjs/typeorm';
|
|
||||||
import { AssistantesMaternellesService } from './assistantes_maternelles.service';
|
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 — couples de garde (#171)', () => {
|
describe('AssistantesMaternellesService', () => {
|
||||||
let service: AssistantesMaternellesService;
|
let service: AssistantesMaternellesService;
|
||||||
|
|
||||||
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() };
|
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
jest.clearAllMocks();
|
|
||||||
const module: TestingModule = await Test.createTestingModule({
|
const module: TestingModule = await Test.createTestingModule({
|
||||||
providers: [
|
providers: [AssistantesMaternellesService],
|
||||||
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();
|
}).compile();
|
||||||
service = module.get(AssistantesMaternellesService);
|
|
||||||
|
service = module.get<AssistantesMaternellesService>(AssistantesMaternellesService);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should be defined', () => {
|
it('should be defined', () => {
|
||||||
expect(service).toBeDefined();
|
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 à l’AM', 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 d’une 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,16 +5,14 @@ import {
|
|||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { InjectRepository } from '@nestjs/typeorm';
|
import { InjectRepository } from '@nestjs/typeorm';
|
||||||
import { In, IsNull, Repository } from 'typeorm';
|
import { IsNull, Repository } from 'typeorm';
|
||||||
import { RoleType, Users } from 'src/entities/users.entity';
|
import { RoleType, Users } from 'src/entities/users.entity';
|
||||||
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
import { AssistanteMaternelle } from 'src/entities/assistantes_maternelles.entity';
|
||||||
import { AmChildren } from 'src/entities/am_children.entity';
|
import { AmChildren } from 'src/entities/am_children.entity';
|
||||||
import { Children, StatutEnfantType } from 'src/entities/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 { CreateAssistanteDto } from '../user/dto/create_assistante.dto';
|
||||||
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
import { UpdateAssistanteDto } from '../user/dto/update_assistante.dto';
|
||||||
import { UpdateAmFicheAdminDto } from './dto/update-am-fiche-admin.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';
|
import { validateNir } from 'src/common/utils/nir.util';
|
||||||
|
|
||||||
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
const AM_CHILDREN_RELATIONS = ['user', 'amChildren', 'amChildren.child'] as const;
|
||||||
@@ -30,8 +28,6 @@ export class AssistantesMaternellesService {
|
|||||||
private readonly amChildrenRepository: Repository<AmChildren>,
|
private readonly amChildrenRepository: Repository<AmChildren>,
|
||||||
@InjectRepository(Children)
|
@InjectRepository(Children)
|
||||||
private readonly childrenRepository: Repository<Children>,
|
private readonly childrenRepository: Repository<Children>,
|
||||||
@InjectRepository(ParentsChildren)
|
|
||||||
private readonly parentsChildrenRepository: Repository<ParentsChildren>,
|
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
async create(dto: CreateAssistanteDto): Promise<AssistanteMaternelle> {
|
||||||
@@ -268,107 +264,4 @@ export class AssistantesMaternellesService {
|
|||||||
await this.assistantesMaternelleRepository.delete(id);
|
await this.assistantesMaternelleRepository.delete(id);
|
||||||
return { message: 'Assistante maternelle supprimée' };
|
return { message: 'Assistante maternelle supprimée' };
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Liste les couples de garde (enfant ↔ parents) de l’AM 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 l’AM — 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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
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 à l’enfant (0–2 typiquement)',
|
|
||||||
})
|
|
||||||
parents: CoupleGardeAmParentDto[];
|
|
||||||
|
|
||||||
@ApiProperty({ description: 'True si c’est 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;
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
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,28 @@
|
|||||||
|
Stack trace:
|
||||||
|
Frame Function Args
|
||||||
|
0007FFFFAC10 00021005FEBA (000210285F48, 00021026AB6E, 000000000000, 0007FFFF9B10) msys-2.0.dll+0x1FEBA
|
||||||
|
0007FFFFAC10 0002100467F9 (000000000000, 000000000000, 000000000000, 0007FFFFAEE8) msys-2.0.dll+0x67F9
|
||||||
|
0007FFFFAC10 000210046832 (000210285FF9, 0007FFFFAAC8, 000000000000, 000000000000) msys-2.0.dll+0x6832
|
||||||
|
0007FFFFAC10 000210068F86 (000000000000, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x28F86
|
||||||
|
0007FFFFAC10 0002100690B4 (0007FFFFAC20, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x290B4
|
||||||
|
0007FFFFAEF0 00021006A49D (0007FFFFAC20, 000000000000, 000000000000, 000000000000) msys-2.0.dll+0x2A49D
|
||||||
|
End of stack trace
|
||||||
|
Loaded modules:
|
||||||
|
000100400000 bash.exe
|
||||||
|
7FFE2CD00000 ntdll.dll
|
||||||
|
7FFE2C1F0000 KERNEL32.DLL
|
||||||
|
7FFE29C90000 KERNELBASE.dll
|
||||||
|
7FFE2B8C0000 USER32.dll
|
||||||
|
7FFE2A090000 win32u.dll
|
||||||
|
7FFE2C410000 GDI32.dll
|
||||||
|
7FFE29730000 gdi32full.dll
|
||||||
|
7FFE29860000 msvcp_win.dll
|
||||||
|
7FFE2A930000 ucrtbase.dll
|
||||||
|
000210040000 msys-2.0.dll
|
||||||
|
7FFE2C350000 advapi32.dll
|
||||||
|
7FFE2B810000 msvcrt.dll
|
||||||
|
7FFE2CC10000 sechost.dll
|
||||||
|
7FFE2AB30000 RPCRT4.dll
|
||||||
|
7FFE28D10000 CRYPTBASE.DLL
|
||||||
|
7FFE29B50000 bcryptPrimitives.dll
|
||||||
|
7FFE2CAD0000 IMM32.DLL
|
||||||
@@ -143,10 +143,7 @@ CREATE TABLE assistantes_maternelles (
|
|||||||
annee_experience SMALLINT,
|
annee_experience SMALLINT,
|
||||||
specialite VARCHAR(100),
|
specialite VARCHAR(100),
|
||||||
place_disponible INT,
|
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
|
CREATE INDEX idx_assistantes_maternelles_numero_dossier
|
||||||
@@ -224,16 +221,6 @@ CREATE INDEX idx_parents_placement_garde_courant
|
|||||||
ON parents(id_placement_garde_courant)
|
ON parents(id_placement_garde_courant)
|
||||||
WHERE id_placement_garde_courant IS NOT NULL;
|
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)
|
-- Table : dossier_famille (inscription parent — ticket #119)
|
||||||
-- ==========================================================
|
-- ==========================================================
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
-- 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;
|
|
||||||
@@ -1,123 +0,0 @@
|
|||||||
-- Ticket #194 — Module Cartes SYSTEM (collecte absences/congés/arrêt)
|
|
||||||
-- Idempotent.
|
|
||||||
|
|
||||||
DO $$
|
|
||||||
BEGIN
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_response_mode_type') THEN
|
|
||||||
CREATE TYPE card_response_mode_type AS ENUM (
|
|
||||||
'none', 'ack', 'accept_refuse'
|
|
||||||
);
|
|
||||||
END IF;
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_instance_statut_type') THEN
|
|
||||||
CREATE TYPE card_instance_statut_type AS ENUM (
|
|
||||||
'ouverte', 'refusee', 'traitee'
|
|
||||||
);
|
|
||||||
END IF;
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_operation_type') THEN
|
|
||||||
CREATE TYPE card_operation_type AS ENUM ('create', 'update');
|
|
||||||
END IF;
|
|
||||||
IF NOT EXISTS (SELECT 1 FROM pg_type WHERE typname = 'card_response_action_type') THEN
|
|
||||||
CREATE TYPE card_response_action_type AS ENUM (
|
|
||||||
'accept', 'refuse', 'ack'
|
|
||||||
);
|
|
||||||
END IF;
|
|
||||||
END $$;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS card_types (
|
|
||||||
code VARCHAR(64) PRIMARY KEY,
|
|
||||||
system BOOLEAN NOT NULL DEFAULT true,
|
|
||||||
titre VARCHAR(120) NOT NULL,
|
|
||||||
emitter_roles TEXT[] NOT NULL,
|
|
||||||
recipient_roles TEXT[] NOT NULL,
|
|
||||||
audience_resolver VARCHAR(64) NOT NULL,
|
|
||||||
response_mode card_response_mode_type NOT NULL,
|
|
||||||
retention_days INT NOT NULL DEFAULT 14,
|
|
||||||
couleur VARCHAR(32),
|
|
||||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS card_instances (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
type_code VARCHAR(64) NOT NULL REFERENCES card_types(code),
|
|
||||||
id_placement UUID NOT NULL
|
|
||||||
REFERENCES enfants_assistantes_maternelles(id) ON DELETE CASCADE,
|
|
||||||
id_absence UUID REFERENCES absences_garde(id) ON DELETE SET NULL,
|
|
||||||
cree_par UUID REFERENCES utilisateurs(id) ON DELETE SET NULL,
|
|
||||||
operation card_operation_type NOT NULL DEFAULT 'create',
|
|
||||||
statut card_instance_statut_type NOT NULL DEFAULT 'ouverte',
|
|
||||||
payload JSONB NOT NULL DEFAULT '{}'::jsonb,
|
|
||||||
purge_at TIMESTAMPTZ NOT NULL,
|
|
||||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
||||||
modifie_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_card_instances_placement
|
|
||||||
ON card_instances (id_placement, statut, cree_le DESC);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_card_instances_purge
|
|
||||||
ON card_instances (purge_at);
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_card_instances_absence
|
|
||||||
ON card_instances (id_absence)
|
|
||||||
WHERE id_absence IS NOT NULL;
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS card_audience_members (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
id_card UUID NOT NULL REFERENCES card_instances(id) ON DELETE CASCADE,
|
|
||||||
id_utilisateur UUID NOT NULL REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
|
||||||
role_snapshot VARCHAR(64) NOT NULL,
|
|
||||||
is_creator BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
UNIQUE (id_card, id_utilisateur)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_card_audience_user
|
|
||||||
ON card_audience_members (id_utilisateur, id_card);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS card_responses (
|
|
||||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
|
||||||
id_card UUID NOT NULL REFERENCES card_instances(id) ON DELETE CASCADE,
|
|
||||||
id_utilisateur UUID NOT NULL REFERENCES utilisateurs(id) ON DELETE CASCADE,
|
|
||||||
action card_response_action_type NOT NULL,
|
|
||||||
comment TEXT,
|
|
||||||
cree_le TIMESTAMPTZ NOT NULL DEFAULT now()
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE INDEX IF NOT EXISTS idx_card_responses_card
|
|
||||||
ON card_responses (id_card, cree_le DESC);
|
|
||||||
|
|
||||||
-- Seeds SYSTEM
|
|
||||||
INSERT INTO card_types (
|
|
||||||
code, system, titre, emitter_roles, recipient_roles,
|
|
||||||
audience_resolver, response_mode, retention_days, couleur
|
|
||||||
) VALUES
|
|
||||||
(
|
|
||||||
'absence_enfant', true, 'Absence enfant',
|
|
||||||
ARRAY['parent'], ARRAY['assistante_maternelle'],
|
|
||||||
'couple_am', 'none', 7, 'peach'
|
|
||||||
),
|
|
||||||
(
|
|
||||||
'absence_enfant_modif', true, 'Absence enfant modifiée',
|
|
||||||
ARRAY['parent'], ARRAY['assistante_maternelle'],
|
|
||||||
'couple_am', 'ack', 7, 'peach'
|
|
||||||
),
|
|
||||||
(
|
|
||||||
'conge_am', true, 'Congé AM',
|
|
||||||
ARRAY['assistante_maternelle'], ARRAY['parent'],
|
|
||||||
'couple_parents', 'accept_refuse', 14, 'lavender'
|
|
||||||
),
|
|
||||||
(
|
|
||||||
'arret_maladie_am', true, 'Arrêt maladie AM',
|
|
||||||
ARRAY['assistante_maternelle'], ARRAY['parent'],
|
|
||||||
'couple_parents', 'ack', 14, 'pink'
|
|
||||||
)
|
|
||||||
ON CONFLICT (code) DO UPDATE SET
|
|
||||||
titre = EXCLUDED.titre,
|
|
||||||
emitter_roles = EXCLUDED.emitter_roles,
|
|
||||||
recipient_roles = EXCLUDED.recipient_roles,
|
|
||||||
audience_resolver = EXCLUDED.audience_resolver,
|
|
||||||
response_mode = EXCLUDED.response_mode,
|
|
||||||
retention_days = EXCLUDED.retention_days,
|
|
||||||
couleur = EXCLUDED.couleur,
|
|
||||||
modifie_le = now();
|
|
||||||
|
|
||||||
COMMENT ON TABLE card_types IS 'Catalogue types de cartes (SYSTEM seeds #194 ; OPTIONNEL plus tard).';
|
|
||||||
COMMENT ON TABLE card_instances IS 'Bulles / file d’attention — collecte, pas vérité métier absences.';
|
|
||||||
@@ -107,7 +107,7 @@ Liste des enfants / foyers pour l’AM + contexte courant (symétrique A3).
|
|||||||
| BDD | Table `absences_garde` + drop `evenements` |
|
| BDD | Table `absences_garde` + drop `evenements` |
|
||||||
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
| API | CRUD + **GET liste** (`placementId` \| tous les placements du user) |
|
||||||
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
| Cartes SYSTEM | Module `cards/` types S1–S3 (sans sondages V1) |
|
||||||
| Realtime | WS/SSE bulles → **SSE** `GET /cards/stream` (#195) |
|
| Realtime | WS/SSE bulles |
|
||||||
| Purge TTL | Job `expire_at` / `purge_at` |
|
| Purge TTL | Job `expire_at` / `purge_at` |
|
||||||
|
|
||||||
### Front (après API — hors chantier back immédiat)
|
### Front (après API — hors chantier back immédiat)
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
# Mini-spec API — POST /parents/dossier (#129)
|
||||||
|
|
||||||
|
Contrat pour le **plan front** (wizard création dossier famille staff).
|
||||||
|
|
||||||
|
Miroir de **#156** (`POST /assistantes-maternelles/dossier`).
|
||||||
|
|
||||||
|
## Endpoint
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|--|--|
|
||||||
|
| **Méthode** | `POST` |
|
||||||
|
| **URL** | `{base}/parents/dossier` |
|
||||||
|
| **Auth** | Bearer JWT |
|
||||||
|
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
||||||
|
| **Content-Type** | `application/json` |
|
||||||
|
|
||||||
|
Ne **pas** appeler `POST /auth/register/parent` depuis le dashboard.
|
||||||
|
|
||||||
|
## Body (JSON)
|
||||||
|
|
||||||
|
Aligné `RegisterParentCompletDto`, **sans** CGU/privacy obligatoires (acceptées serveur).
|
||||||
|
|
||||||
|
### Parent 1 (obligatoire)
|
||||||
|
|
||||||
|
| Champ | Type | Obligatoire | Notes |
|
||||||
|
|-------|------|-------------|--------|
|
||||||
|
| `email` | string | oui | unique |
|
||||||
|
| `prenom` | string | oui | |
|
||||||
|
| `nom` | string | oui | |
|
||||||
|
| `telephone` | string | oui | `0X…` ou `+33…` |
|
||||||
|
| `adresse` | string | non | |
|
||||||
|
| `code_postal` | string | non | |
|
||||||
|
| `ville` | string | non | |
|
||||||
|
|
||||||
|
### Co-parent (optionnel)
|
||||||
|
|
||||||
|
`co_parent_email`, `co_parent_prenom`, `co_parent_nom`, `co_parent_telephone`,
|
||||||
|
`co_parent_meme_adresse`, `co_parent_adresse`, `co_parent_code_postal`, `co_parent_ville`.
|
||||||
|
|
||||||
|
Si co-parent fourni : e-mail distinct ; mêmes règles téléphone / adresse que register.
|
||||||
|
|
||||||
|
### Enfants (≥ 1)
|
||||||
|
|
||||||
|
| Champ | Type | Notes |
|
||||||
|
|-------|------|--------|
|
||||||
|
| `enfants` | `EnfantInscriptionDto[]` | `prenom`, `nom`, `date_naissance` / `date_previsionnelle_naissance`, `genre`, `photo_base64`, `photo_filename`, etc. |
|
||||||
|
|
||||||
|
### Présentation
|
||||||
|
|
||||||
|
| Champ | Type | Obligatoire |
|
||||||
|
|-------|------|-------------|
|
||||||
|
| `presentation_dossier` | string | non (max 2000) |
|
||||||
|
|
||||||
|
## Réponses
|
||||||
|
|
||||||
|
### 201 Created
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"message": "Dossier famille créé et validé. Un e-mail de création de mot de passe a été envoyé.",
|
||||||
|
"numero_dossier": "2026-000043",
|
||||||
|
"parent_user_id": "uuid-pivot",
|
||||||
|
"co_parent_user_id": "uuid-ou-null",
|
||||||
|
"statut": "actif",
|
||||||
|
"enfant_ids": ["uuid", "..."]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Effets serveur : user(s) parent **actif**, fiches `parents`, enfants + foyer, n° dossier,
|
||||||
|
**e-mail création MDP** pour chaque compte sans MDP (pas d’accusé « en attente »).
|
||||||
|
|
||||||
|
### Erreurs
|
||||||
|
|
||||||
|
| Code | Cas |
|
||||||
|
|------|-----|
|
||||||
|
| 400 | Validation DTO / métier (enfants vides, dates, etc.) |
|
||||||
|
| 401 | Token manquant / invalide |
|
||||||
|
| 403 | Rôle non staff |
|
||||||
|
| 409 | Conflit e-mail (pivot et/ou co-parent) |
|
||||||
|
|
||||||
|
## Front
|
||||||
|
|
||||||
|
- `UserService.createParentDossier(body)` → cet endpoint
|
||||||
|
- Wizard create basé sur `ValidationFamilyWizard`
|
||||||
|
- Ne pas envoyer `acceptation_cgu` / `acceptation_privacy` (optionnels)
|
||||||
|
|
||||||
|
## Branche
|
||||||
|
|
||||||
|
`feature/129-creation-dossier-parent`
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# Mini-spec API — POST /parents/:id/co-parent (#135)
|
||||||
|
|
||||||
|
Contrat back pour l’ajout d’un **2ᵉ parent** sur un foyer mono-parent (staff).
|
||||||
|
|
||||||
|
## Endpoint
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|--|--|
|
||||||
|
| **Méthode** | `POST` |
|
||||||
|
| **URL** | `{base}/api/v1/parents/{parentUserId}/co-parent` |
|
||||||
|
| **Auth** | Bearer JWT |
|
||||||
|
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
||||||
|
| **Succès** | **201** |
|
||||||
|
|
||||||
|
`parentUserId` = UUID du **parent pivot** (déjà dans le dossier).
|
||||||
|
|
||||||
|
Ne **pas** appeler `POST /auth/register/parent` ni `POST /parents/dossier`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Body (JSON)
|
||||||
|
|
||||||
|
| Champ | Type | Obligatoire | Notes |
|
||||||
|
|-------|------|-------------|--------|
|
||||||
|
| `email` | string | oui | unique |
|
||||||
|
| `prenom` | string | oui | |
|
||||||
|
| `nom` | string | oui | |
|
||||||
|
| `telephone` | string | oui | `0X…` ou `+33…` |
|
||||||
|
| `meme_adresse` | bool | non | défaut **true** → copie adresse du pivot |
|
||||||
|
| `adresse` | string | si `meme_adresse=false` | |
|
||||||
|
| `code_postal` | string | si `meme_adresse=false` | |
|
||||||
|
| `ville` | string | si `meme_adresse=false` | |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Comportement 201
|
||||||
|
|
||||||
|
- User co-parent **actif** + token création MDP
|
||||||
|
- Fiche `parents` + liens pivot ↔ co-parent + même `numero_dossier`
|
||||||
|
- Enfants du foyer rattachés au co-parent
|
||||||
|
- E-mail **création MDP** (pas mail « en attente »)
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"message": "Co-parent ajouté au foyer. Un e-mail de création de mot de passe a été envoyé.",
|
||||||
|
"numero_dossier": "2026-000043",
|
||||||
|
"parent_user_id": "uuid-pivot",
|
||||||
|
"co_parent_user_id": "uuid-co",
|
||||||
|
"statut": "actif"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Erreurs
|
||||||
|
|
||||||
|
| Code | Cas |
|
||||||
|
|------|-----|
|
||||||
|
| 400 | Déjà un co-parent / 2 responsables / validation adresse |
|
||||||
|
| 401 | Token invalide |
|
||||||
|
| 403 | Rôle non staff |
|
||||||
|
| 404 | Pivot introuvable |
|
||||||
|
| 409 | Email déjà pris |
|
||||||
|
|
||||||
|
## Réemploi édition identité
|
||||||
|
|
||||||
|
| Endpoint | Usage |
|
||||||
|
|----------|--------|
|
||||||
|
| `GET /dossiers/:numero` | Préremplir wizard edit |
|
||||||
|
| `PATCH /parents/:id/fiche` | Sauver identité pivot / co-parent existant |
|
||||||
|
| `PATCH /assistantes-maternelles/:id/fiche` | Édition AM |
|
||||||
|
|
||||||
|
## Branche
|
||||||
|
|
||||||
|
`feature/135-edition-dossier`
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
# Mini-spec front — Mode édition dossier + ajout 2ᵉ parent (#135)
|
||||||
|
|
||||||
|
Branche : `feature/135-edition-dossier`
|
||||||
|
Ticket : **#135** (full-stack)
|
||||||
|
|
||||||
|
Prérequis : **#153** (liste Dossiers) livré.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Objectif
|
||||||
|
|
||||||
|
1. Clic sur un dossier (liste #153) → ouvrir le wizard en mode **`edit`**
|
||||||
|
2. Foyer **mono-parent** : page co-parent → **switch** ajouter un 2ᵉ parent
|
||||||
|
3. Sauvegarder les champs via APIs existantes + nouvel endpoint co-parent
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Modes wizard
|
||||||
|
|
||||||
|
| Mode | Famille | AM |
|
||||||
|
|------|---------|-----|
|
||||||
|
| `review` | déjà | déjà |
|
||||||
|
| `create` | déjà (#129) | déjà (#156) |
|
||||||
|
| **`edit`** | **à faire** | **à faire** |
|
||||||
|
|
||||||
|
Factories : `ParentDossierWizard.edit(...)` / `AmDossierWizard.edit(...)`
|
||||||
|
Préremplir via `UserService.getDossierByNumero(numero)`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## APIs
|
||||||
|
|
||||||
|
| Action | Endpoint |
|
||||||
|
|--------|----------|
|
||||||
|
| Charger | `GET /dossiers/:numero` |
|
||||||
|
| Sauver parent | `PATCH /parents/:id/fiche` |
|
||||||
|
| Sauver AM | `PATCH /assistantes-maternelles/:id/fiche` |
|
||||||
|
| **Ajouter co-parent** | **`POST /parents/:pivotUserId/co-parent`** — voir `docs/tmp/135-contrat-api-ajout-co-parent.md` |
|
||||||
|
|
||||||
|
Body co-parent :
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"email": "thomas@…",
|
||||||
|
"prenom": "Thomas",
|
||||||
|
"nom": "MARTIN",
|
||||||
|
"telephone": "0678456789",
|
||||||
|
"meme_adresse": true
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
`UserService.addCoParent(pivotUserId, body)` → cet endpoint.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## UX
|
||||||
|
|
||||||
|
- Depuis `DossiersManagementWidget` / carte liste : clic → edit (plus seulement review pending)
|
||||||
|
- Pending : garder validation (review) ; dossiers actifs → edit
|
||||||
|
- Mono-parent : switch « Ajouter un co-parent » (comme create) → au save, `POST …/co-parent` si nouveau
|
||||||
|
- Déjà 2 parents : éditer les deux fiches ; pas de 3ᵉ
|
||||||
|
- Pas de bouton créer dans l’onglet Dossiers
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Hors scope
|
||||||
|
|
||||||
|
- Famille N responsables (#139)
|
||||||
|
- Suppressions (#154)
|
||||||
|
- Création dossier initial (#129 / #156)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Critères d’acceptation
|
||||||
|
|
||||||
|
- [ ] Clic dossier actif → wizard edit prérempli
|
||||||
|
- [ ] PATCH fiche enregistre les modifs
|
||||||
|
- [ ] Mono-parent + switch → co-parent créé (actif + mail MDP)
|
||||||
|
- [ ] review / create inchangés
|
||||||
|
|
||||||
|
## Branche
|
||||||
|
|
||||||
|
`feature/135-edition-dossier`
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
# Mini-spec — Suppression complète grossesse multiple / `est_multiple`
|
||||||
|
|
||||||
|
**Ticket** : **#152** — https://git.ptits-pas.fr/jmartin/petitspas/issues/152
|
||||||
|
**Branche** : `feature/152-remove-est-multiple` (depuis `develop`)
|
||||||
|
**Périmètre** : **full stack** — BDD + back + front + scripts + docs. **Aucun fantôme.**
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Décision
|
||||||
|
|
||||||
|
On **supprime tout**. Pas de DTO « ignorés », pas de compat payload.
|
||||||
|
|
||||||
|
`forbidNonWhitelisted: true` ⇒ back et front **partent ensemble** (même feature / même déploiement).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Alias retirés
|
||||||
|
|
||||||
|
`est_multiple` · `is_multiple` · `grossesse_multiple` · `multipleBirth` · `estMultiple` · `isMultiple` · `jumeau_multiple`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Back / BDD (fait sur la branche)
|
||||||
|
|
||||||
|
- [x] Migration `database/migrations/2026_drop_enfants_est_multiple.sql`
|
||||||
|
- [x] `BDD.sql`, seeds, CSV test
|
||||||
|
- [x] Entity `Children` sans colonne
|
||||||
|
- [x] DTO create/inscription/réponse/dossier famille **sans** le champ
|
||||||
|
- [x] Services auth / enfants / parents : plus de mapping
|
||||||
|
- [x] Prisma legacy `isMultiple` retiré
|
||||||
|
|
||||||
|
## Front (fait sur la branche)
|
||||||
|
|
||||||
|
- [x] Modèles admin / dossier / inscription
|
||||||
|
- [x] Payloads inscription + reprise
|
||||||
|
- [x] Modale enfant + wizard dossier famille
|
||||||
|
- [x] Step3 inscription parent
|
||||||
|
|
||||||
|
## Scripts / docs
|
||||||
|
|
||||||
|
- [x] `tests/scripts/register-parent-*.mjs`
|
||||||
|
- [x] `docs/10_DATABASE.md`, `docs/99_REGLES-CODAGE.md`
|
||||||
|
- Docs tmp/archive #112 : mentions historiques OK (archive)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Déploiement
|
||||||
|
|
||||||
|
1. Appliquer la migration SQL sur la BDD vivante
|
||||||
|
2. Deploy back **et** front de cette branche
|
||||||
|
3. Smoke : création enfant staff, inscription parent, reprise, wizard famille
|
||||||
|
|
||||||
|
## Vérif
|
||||||
|
|
||||||
|
```bash
|
||||||
|
rg -n 'est_multiple|is_multiple|grossesse_multiple|multipleBirth|estMultiple|isMultiple|jumeau_multiple' \
|
||||||
|
backend/src frontend/lib database tests/scripts docs/10_DATABASE.md docs/99_REGLES-CODAGE.md
|
||||||
|
```
|
||||||
|
→ **0** hit (hors ce fichier mini-spec / archives).
|
||||||
|
|
||||||
|
## Hors scope
|
||||||
|
|
||||||
|
- Métier futur « fratrie / jumeaux » → nouveau ticket
|
||||||
|
- #155 rename Admin*
|
||||||
|
- Ticket modales staff
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
# Mini-spec API — GET /dossiers (#153)
|
||||||
|
|
||||||
|
Contrat pour le **plan front** (onglet permanent Dossiers).
|
||||||
|
|
||||||
|
## Endpoint
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|--|--|
|
||||||
|
| **Méthode** | `GET` |
|
||||||
|
| **URL** | `{base}/api/v1/dossiers` |
|
||||||
|
| **Auth** | Bearer JWT |
|
||||||
|
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
||||||
|
| **Query** | `q` (optionnel) — recherche n° / libellé / email |
|
||||||
|
|
||||||
|
Complète `GET /dossiers/:numeroDossier` (#119) déjà existant.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Réponse 200
|
||||||
|
|
||||||
|
Tableau de lignes (1 entrée = 1 `numero_dossier`) :
|
||||||
|
|
||||||
|
```json
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"type": "famille",
|
||||||
|
"numero_dossier": "2026-000043",
|
||||||
|
"libelle": "Claire MARTIN & Thomas MARTIN",
|
||||||
|
"emails": ["claire@test.fr", "thomas@test.fr"],
|
||||||
|
"user_ids": ["uuid-pivot", "uuid-co"],
|
||||||
|
"statut": "actif",
|
||||||
|
"a_valider": false,
|
||||||
|
"date_reference": "2026-01-12T10:00:00.000Z"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "assistante_maternelle",
|
||||||
|
"numero_dossier": "2026-000042",
|
||||||
|
"libelle": "Marie DUPONT",
|
||||||
|
"emails": ["marie@test.fr"],
|
||||||
|
"user_ids": ["uuid-am"],
|
||||||
|
"statut": "en_attente",
|
||||||
|
"a_valider": true,
|
||||||
|
"date_reference": "2026-02-01T08:00:00.000Z"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Champs
|
||||||
|
|
||||||
|
| Champ | Notes |
|
||||||
|
|-------|--------|
|
||||||
|
| `type` | `famille` \| `assistante_maternelle` |
|
||||||
|
| `numero_dossier` | Clé d’unité |
|
||||||
|
| `libelle` | Noms formatés (foyer : `A & B`) |
|
||||||
|
| `emails` / `user_ids` | Membres du foyer ou AM |
|
||||||
|
| `statut` | Agrégé : `en_attente` si au moins un user pending |
|
||||||
|
| `a_valider` | `true` si pending → section haute UI |
|
||||||
|
| `date_reference` | `MIN(cree_le)` des users |
|
||||||
|
|
||||||
|
**Tri** : `a_valider` d’abord, puis `numero_dossier` décroissant.
|
||||||
|
|
||||||
|
**Famille** : dédupliquée par `numero_dossier` (pivot + co-parent = 1 ligne).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Front
|
||||||
|
|
||||||
|
- `UserService.getDossiers({ q? })` → cet endpoint
|
||||||
|
- Section haute : filtrer `a_valider == true` **ou** continuer pending APIs existantes
|
||||||
|
- Section basse : liste complète (ou hors pending selon règle UX)
|
||||||
|
- Clic → `GET /dossiers/:numero` (détail) / validation review
|
||||||
|
|
||||||
|
Composition client `getParents`+`getAM` **plus nécessaire** si cet endpoint est déployé.
|
||||||
|
|
||||||
|
## Branche
|
||||||
|
|
||||||
|
`feature/153-onglet-dossiers`
|
||||||
@@ -0,0 +1,167 @@
|
|||||||
|
# Mini-spec front — Onglet permanent « Dossiers » (#153)
|
||||||
|
|
||||||
|
Branche Git (front + back) : `feature/153-onglet-dossiers`
|
||||||
|
Ticket Gitea : **#153** (ticket normal, plus epic)
|
||||||
|
|
||||||
|
> Suite prévue : **#135** = au clic, mode **édition** wizard + ajout 2ᵉ parent.
|
||||||
|
> **#153** = onglet + listes + navigation / validation pending. **Pas** de création, **pas** d’édition complète.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Contexte / objectif
|
||||||
|
|
||||||
|
Remplacer l’onglet conditionnel **« À valider »** (apparaît/disparaît selon pending) par un onglet **permanent « Dossiers »** dans le dashboard admin/gestionnaire.
|
||||||
|
|
||||||
|
Quand on ouvre **Dossiers** :
|
||||||
|
|
||||||
|
1. **En haut** — section **Dossiers à valider** (AM + familles pending)
|
||||||
|
2. **En dessous** — liste de **tous les dossiers** (familles **et** AM), 1 ligne = 1 `numero_dossier`
|
||||||
|
3. Différenciation visuelle famille vs AM : **couleur + icône**
|
||||||
|
4. **Barre de recherche** (n° dossier, nom, email…)
|
||||||
|
|
||||||
|
**Pas** de bouton « Créer un dossier » ici (création via **+ Parents** #129 / **+ Asmat** #156).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## UX cible
|
||||||
|
|
||||||
|
### Onglets dashboard (`UserManagementPanel`)
|
||||||
|
|
||||||
|
| Avant (#107) | Après (#153) |
|
||||||
|
|--------------|--------------|
|
||||||
|
| « À valider » **conditionnel** si pending | **« Dossiers » toujours visible** (admin + gestionnaire) |
|
||||||
|
| Contenu = seulement pending | Pending **en haut** + liste complète **en bas** |
|
||||||
|
|
||||||
|
Ordre suggéré des onglets :
|
||||||
|
|
||||||
|
`Dossiers` | `Parents` | `Enfants` | `Assistantes maternelles` | `Gestionnaires` | (`Administrateurs`)
|
||||||
|
|
||||||
|
### Section haute — À valider
|
||||||
|
|
||||||
|
- Réutiliser / adapter `PendingValidationWidget` (ou extraire la liste dans un sous-widget).
|
||||||
|
- Sources déjà branchées :
|
||||||
|
- `UserService.getPendingUsers(role: 'assistante_maternelle')`
|
||||||
|
- `UserService.getPendingFamilies()`
|
||||||
|
- Clic ligne pending → **`ValidationDossierModal`** / wizards `.review` (inchangé).
|
||||||
|
- Si section vide : ne pas afficher de gros vide ; masquer la section ou message court « Aucun dossier en attente ».
|
||||||
|
|
||||||
|
### Section basse — Tous les dossiers
|
||||||
|
|
||||||
|
1 ligne = **1 dossier** (`numero_dossier`), type :
|
||||||
|
|
||||||
|
| Type | Libellé UI | Couleur (suggestion) |
|
||||||
|
|------|------------|----------------------|
|
||||||
|
| `famille` | Famille / Parents | teinte existante parents (ex. violet / rose dashboard) |
|
||||||
|
| `assistante_maternelle` | AM | teinte existante AM (ex. teal / bleu) |
|
||||||
|
|
||||||
|
Colonnes / infos utiles (cartes style `AdminUserCard` ou lignes type pending) :
|
||||||
|
|
||||||
|
- n° dossier
|
||||||
|
- type (pastille couleur + icône)
|
||||||
|
- libellé (noms parents ou AM)
|
||||||
|
- email(s) principal(aux)
|
||||||
|
- statut user / dossier si dispo (`actif`, `en_attente`, …)
|
||||||
|
- date utile si dispo
|
||||||
|
|
||||||
|
**Déduplication** : un foyer (pivot + co-parent) = **une** ligne famille (même `numero_dossier`). Idem AM.
|
||||||
|
|
||||||
|
### Recherche
|
||||||
|
|
||||||
|
- La search bar du panel (aujourd’hui désactivée / hint « pas de recherche » sur À valider) doit **filtrer la liste unifiée** (et idéalement aussi le pending affiché).
|
||||||
|
- Critères **minimum** : `numero_dossier`, nom, prénom, email.
|
||||||
|
- Harmoniser le hint : `Rechercher un dossier (n°, nom, email)…`
|
||||||
|
|
||||||
|
### État vide liste complète
|
||||||
|
|
||||||
|
Aide optionnelle : *« Pour créer un dossier → onglet Parents (+ Parents) ou Assistantes maternelles (+ Asmat) »*.
|
||||||
|
|
||||||
|
### Clic sur un dossier de la liste complète (#153)
|
||||||
|
|
||||||
|
| Cas | Comportement #153 |
|
||||||
|
|-----|-------------------|
|
||||||
|
| Pending | Ouvrir validation (review) — déjà en place |
|
||||||
|
| Dossier **actif** / non pending | Ouvrir consultation via `GET /dossiers/:numeroDossier` (`UserService.getDossierByNumero`) en **lecture / review** si possible **sans** save édition |
|
||||||
|
|
||||||
|
**Ne pas** implémenter le mode `edit` ni le switch 2ᵉ parent → **#135**.
|
||||||
|
|
||||||
|
Si l’ouverture « review » d’un dossier actif est trop lourde pour ce ticket : clic peut temporairement no-op / snackbar *« Édition dossier : prochainement (#135) »* — **à éviter** si `getDossierByNumero` + wizard review marche déjà pour les deux types.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Données / APIs (front)
|
||||||
|
|
||||||
|
### Déjà disponibles (préférer composer côté front pour #153)
|
||||||
|
|
||||||
|
| Besoin | API / service |
|
||||||
|
|--------|----------------|
|
||||||
|
| Pending AM | `getPendingUsers(role: assistante_maternelle)` |
|
||||||
|
| Pending familles | `getPendingFamilies()` |
|
||||||
|
| Parents (avec `numero_dossier`) | `getParents()` |
|
||||||
|
| AM (avec `numero_dossier`) | `getAssistantesMaternelles()` |
|
||||||
|
| Détail unifié | `getDossierByNumero(numero)` → `GET /dossiers/:numeroDossier` |
|
||||||
|
|
||||||
|
**Pas d’endpoint `GET /dossiers` liste** aujourd’hui. Pour #153 :
|
||||||
|
|
||||||
|
- Construire la liste unifiée **côté client** à partir de `getParents()` + `getAssistantesMaternelles()` (group by `numero_dossier`).
|
||||||
|
- Exclure ou marquer les pending déjà dans la section haute (éviter doublons visuels, ou les laisser dans les deux avec badge « à valider » — **préférence** : pending **uniquement** en haut ; liste basse = tous **hors** pending **ou** tous avec badge ; choisir une règle claire et documenter dans le PR).
|
||||||
|
|
||||||
|
**Règle recommandée** :
|
||||||
|
- Haut = pending only
|
||||||
|
- Bas = **tous** les dossiers ayant un `numero_dossier` (y compris pending) **OU** bas = non-pending only
|
||||||
|
→ **Recommandation produit** : bas = **tous** (vision complète), pending aussi en haut pour action rapide. Si doublon gênant : bas = non-pending only.
|
||||||
|
|
||||||
|
### Si le back ajoute plus tard `GET /dossiers`
|
||||||
|
|
||||||
|
Brancher `UserService.getDossiers()` — hors scope bloquant #153 front si composition client OK.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Fichiers front probables
|
||||||
|
|
||||||
|
| Fichier | Rôle |
|
||||||
|
|---------|------|
|
||||||
|
| `frontend/lib/widgets/admin/user_management_panel.dart` | Onglet permanent **Dossiers** ; retirer logique conditionnelle À valider ; search sur cet onglet |
|
||||||
|
| `frontend/lib/widgets/admin/pending_validation_widget.dart` | Réemploi section haute (ou refactor léger) |
|
||||||
|
| **Nouveau** `…/dossiers_management_widget.dart` (nom libre) | Shell onglet : pending + liste unifiée + refresh |
|
||||||
|
| **Nouveau** modèle léger `DossierListItem` (type, numero, libelle, emails, statut…) | Mapping parents/AM → ligne |
|
||||||
|
| `user_service.dart` / `api_config.dart` | Seulement si helper `getDossiersUnified()` côté client (pas forcément nouvel endpoint) |
|
||||||
|
| `validation_dossier_modal.dart` | Réemploi ouverture pending / détail |
|
||||||
|
|
||||||
|
Réutiliser look & feel cartes / hover « Ouvrir » de `_PendingValidationRow` / `AdminUserCard`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Hors scope (#153)
|
||||||
|
|
||||||
|
- Bouton créer dossier
|
||||||
|
- Mode `edit` wizard + ajout 2ᵉ parent → **#135**
|
||||||
|
- Suppressions → **#154**
|
||||||
|
- Famille N responsables → **#139**
|
||||||
|
- Changer les onglets Parents / AM / Enfants (restent)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Critères d’acceptation front
|
||||||
|
|
||||||
|
- [ ] Onglet **Dossiers** toujours visible (même 0 pending)
|
||||||
|
- [ ] Plus d’onglet conditionnel **« À valider »**
|
||||||
|
- [ ] Section haute pending si non vide ; validation au clic OK
|
||||||
|
- [ ] Liste unifiée familles + AM en dessous ; 1 ligne / `numero_dossier`
|
||||||
|
- [ ] Couleur + icône différencient famille / AM
|
||||||
|
- [ ] Recherche filtre (n° + nom + email minimum)
|
||||||
|
- [ ] **Aucun** bouton créer dans cet onglet
|
||||||
|
- [ ] Pas de régression validation pending (valider / refuser)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Back (info — Cursor back séparé si besoin)
|
||||||
|
|
||||||
|
- Liste unifiée : **pas bloquante** si composition front
|
||||||
|
- Optionnel : `GET /api/v1/dossiers` (liste) pour perf / pagination plus tard
|
||||||
|
- `GET /dossiers/:numero` déjà là (#119)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Branche
|
||||||
|
|
||||||
|
`feature/153-onglet-dossiers` (depuis `develop`)
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
# Matrice suppression — #154 / back **#159** / front **#160**
|
||||||
|
|
||||||
|
**Statut** : cadrage PO validé (sept. 2026)
|
||||||
|
**Milestone** : 0.1.0
|
||||||
|
**Email** : pas d’email de suppression (cas rare)
|
||||||
|
|
||||||
|
## Droits
|
||||||
|
|
||||||
|
| Cible | Qui peut supprimer |
|
||||||
|
|-------|-------------------|
|
||||||
|
| Dossier / parent / enfant / AM | `GESTIONNAIRE`, `ADMINISTRATEUR`, `SUPER_ADMIN` |
|
||||||
|
| Gestionnaire (user) | `ADMINISTRATEUR`, `SUPER_ADMIN` |
|
||||||
|
| Administrateur (user) | Autre admin OK ; **self interdit** ; **dernier admin** = `SUPER_ADMIN` only ; `SUPER_ADMIN` non supprimable |
|
||||||
|
|
||||||
|
## Matrice métier
|
||||||
|
|
||||||
|
| Point d’entrée | Action | Effet |
|
||||||
|
|----------------|--------|--------|
|
||||||
|
| Dossiers | Delete dossier **famille** | Tous **parents** + tous **enfants** ; clore placements AM des enfants |
|
||||||
|
| Dossiers / AM | Delete dossier **AM** ou compte AM | **Compte AM + dossier AM** ; enfants **conservés** ; placements **clos** |
|
||||||
|
| Parents | Co-parent (autre parent reste) | Compte parent seul ; dossier + enfants restent |
|
||||||
|
| Parents | Dernier parent | Parent + **enfants** rattachés |
|
||||||
|
| Enfants | Pas dernier | Enfant seul (retiré du dossier) |
|
||||||
|
| Enfants | Dernier + `deleteDossier=true` | Cascade dossier famille (parents + enfants) |
|
||||||
|
| Enfants | Dernier + `deleteDossier=false` | Enfant seul ; dossier peut apparaître **`sans_enfant`** |
|
||||||
|
| Pending / validé | — | **Mêmes règles** (pas de différenciation) |
|
||||||
|
|
||||||
|
## Warning
|
||||||
|
|
||||||
|
- `sans_enfant` sur liste `GET /dossiers` (dossier famille sans enfant lié).
|
||||||
|
- Miroir de `sans_responsable` (#157) côté enfants.
|
||||||
|
|
||||||
|
## Hors scope
|
||||||
|
|
||||||
|
Soft-delete RGPD, audit (#128), famille N (#139), restriction admin-only métier (plus tard).
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
# Mini-spec front — Suppressions dashboard
|
||||||
|
|
||||||
|
**Ticket front** : **#160** — https://git.ptits-pas.fr/jmartin/petitspas/issues/160
|
||||||
|
**Ticket back** : **#159** — https://git.ptits-pas.fr/jmartin/petitspas/issues/159
|
||||||
|
**Epic** : #154 (complète #133)
|
||||||
|
**Branche back** : `feature/159-suppressions-backend`
|
||||||
|
**Doc matrice** : [154-matrice-suppression.md](./154-matrice-suppression.md)
|
||||||
|
|
||||||
|
Travail **en parallèle** : ce contrat est la source de vérité UI ↔ API.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## UX commune
|
||||||
|
|
||||||
|
Sur chaque ligne / carte des listes :
|
||||||
|
|
||||||
|
- Icône **poubelle** en bout de ligne
|
||||||
|
- Clic → **dialog de confirmation** (texte d’impact) → DELETE → **refresh** liste
|
||||||
|
- Pending = **mêmes** règles que validés
|
||||||
|
- **Pas** d’email
|
||||||
|
|
||||||
|
| Liste | Poubelle visible si |
|
||||||
|
|-------|---------------------|
|
||||||
|
| Dossiers, Parents, Enfants, AM | gestionnaire **ou** admin |
|
||||||
|
| Gestionnaires | **admin** only |
|
||||||
|
| Administrateurs | admin+ ; **pas** sur sa propre ligne ; dernier admin : UI warning + réservé super_admin |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Contrat API
|
||||||
|
|
||||||
|
Base : auth Bearer. Erreurs : `400` / `403` / `404` / `409` avec `message` FR.
|
||||||
|
|
||||||
|
### 1. `DELETE /dossiers/:numeroDossier`
|
||||||
|
|
||||||
|
- **Famille** → supprime tous parents + enfants du n° ; clos placements AM des enfants.
|
||||||
|
- **AM** → compte AM + dossier AM ; enfants gardés ; placements clos.
|
||||||
|
|
||||||
|
**Réponse 200** (exemple) :
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "famille",
|
||||||
|
"numero_dossier": "2026-000043",
|
||||||
|
"deleted_user_ids": ["…"],
|
||||||
|
"deleted_enfant_ids": ["…"],
|
||||||
|
"message": "Dossier famille supprimé."
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
ou
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"type": "assistante_maternelle",
|
||||||
|
"numero_dossier": "2026-000015",
|
||||||
|
"deleted_user_ids": ["…"],
|
||||||
|
"deleted_enfant_ids": [],
|
||||||
|
"message": "Dossier assistante maternelle supprimé."
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Dialog UI** : lister libellé + n° + « X parent(s), Y enfant(s) » (ou « compte AM, enfants conservés »).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 2. `DELETE /users/:id`
|
||||||
|
|
||||||
|
Comportement selon le **rôle** de la cible :
|
||||||
|
|
||||||
|
| Cible | Effet |
|
||||||
|
|-------|--------|
|
||||||
|
| Parent **co-parent** | Delete ce user seul |
|
||||||
|
| Parent **dernier** du dossier | Delete user + enfants du foyer |
|
||||||
|
| AM | Delete user AM + dossier AM ; enfants conservés ; placements clos |
|
||||||
|
| Gestionnaire | Admin only ; self → 403 |
|
||||||
|
| Administrateur | Self → 403 ; dernier admin → super_admin only sinon 403 ; super_admin → 403 |
|
||||||
|
|
||||||
|
**Réponse 200** :
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"deleted_user_ids": ["…"],
|
||||||
|
"deleted_enfant_ids": ["…"],
|
||||||
|
"message": "…"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Dialogs** :
|
||||||
|
|
||||||
|
- Co-parent : « Ce parent sera retiré / supprimé du dossier {n°}. Les enfants restent avec le co-parent. »
|
||||||
|
- Dernier parent : « Dernier parent du dossier {n°}. Les enfants rattachés seront aussi supprimés. »
|
||||||
|
- AM : « Le compte et le dossier AM seront supprimés. Les enfants accueillis ne seront pas supprimés. »
|
||||||
|
|
||||||
|
Optionnel (si exposé) : `GET /users/:id/suppression-impact` — sinon calculer depuis données déjà en liste / détail dossier.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 3. `DELETE /enfants/:id?deleteDossier=true|false`
|
||||||
|
|
||||||
|
- Pas dernier enfant → delete enfant (`deleteDossier` ignoré ou false).
|
||||||
|
- Dernier enfant + `deleteDossier=false` → delete enfant ; dossier famille peut passer `sans_enfant`.
|
||||||
|
- Dernier enfant + `deleteDossier=true` → cascade dossier famille (parents + enfants).
|
||||||
|
|
||||||
|
**Réponse 200** :
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"deleted_enfant_ids": ["…"],
|
||||||
|
"deleted_user_ids": ["…"],
|
||||||
|
"dossier_supprime": false,
|
||||||
|
"message": "…"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Dialog** :
|
||||||
|
|
||||||
|
- Standard : « L’enfant sera supprimé du dossier de {famille} ({n°}). »
|
||||||
|
- Dernier : proposer **deux actions** :
|
||||||
|
1. Supprimer l’enfant seulement (`deleteDossier=false`)
|
||||||
|
2. Supprimer aussi le dossier / parents (`deleteDossier=true`)
|
||||||
|
|
||||||
|
Pour savoir si dernier : compter enfants du `numero_dossier` (détail dossier ou champ impact API).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 4. `GET /dossiers` — flag `sans_enfant`
|
||||||
|
|
||||||
|
Chaque item famille peut exposer :
|
||||||
|
|
||||||
|
```json
|
||||||
|
"sans_enfant": true
|
||||||
|
```
|
||||||
|
|
||||||
|
- `true` si dossier **famille** sans enfant lié.
|
||||||
|
- AM : `false` ou omis.
|
||||||
|
|
||||||
|
**UI** : badge / warning vigilance (comme `sans_responsable` / alertes AM).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## UserService (Flutter) — signatures cibles
|
||||||
|
|
||||||
|
```dart
|
||||||
|
Future<void> deleteDossier(String numeroDossier);
|
||||||
|
Future<Map<String, dynamic>> deleteUser(String userId);
|
||||||
|
Future<Map<String, dynamic>> deleteEnfant(String enfantId, {bool deleteDossier = false});
|
||||||
|
```
|
||||||
|
|
||||||
|
(Adapter le parsing au JSON réel une fois le back mergé ; en parallèle, stubber sur ce contrat.)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Fichiers front probables
|
||||||
|
|
||||||
|
- Cartes listes : `admin_user_card.dart`, `admin_enfant_user_card.dart`, cartes dossiers
|
||||||
|
- Listes : `dossiers_management_widget.dart`, `parent_managmant_widget.dart`, `enfant_management_widget.dart`, `assistante_maternelle_management_widget.dart`, `gestionnaire_management_widget.dart`, `admin_management_widget.dart`
|
||||||
|
- `user_service.dart`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Critères front (#160)
|
||||||
|
|
||||||
|
- [ ] Poubelle selon droits
|
||||||
|
- [ ] Confirmations avec impact
|
||||||
|
- [ ] Refresh après succès
|
||||||
|
- [ ] Dernier enfant : choix dossier oui/non
|
||||||
|
- [ ] Warning `sans_enfant`
|
||||||
|
- [ ] Self-admin / dernier admin gérés côté UI (masquer ou message 403)
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
# Mini-spec — Rename préfixe `Admin*` dashboard partagé (#155)
|
||||||
|
|
||||||
|
**Ticket** : **#155**
|
||||||
|
**Branche** : `feature/155-rename-admin-prefix-dashboard` (depuis `develop`)
|
||||||
|
**Décision naming** : **option C** — dossier neutre `widgets/dashboard/` + noms **sans** préfixe `Admin`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Principe
|
||||||
|
|
||||||
|
Les widgets partagés **admin + gestionnaire** ne doivent plus s’appeler `Admin*`.
|
||||||
|
On garde `Admin*` seulement là où c’est vraiment le rôle administrateur.
|
||||||
|
|
||||||
|
## Gardé `Admin*` (hors rename)
|
||||||
|
|
||||||
|
| Élément | Raison |
|
||||||
|
|---------|--------|
|
||||||
|
| `AdminManagementWidget` | Onglet **Administrateurs** |
|
||||||
|
| `screens/administrateurs/*` | `AdminDashboardScreen`, `AdminCreateDialog`, `AdminUserFormDialog` |
|
||||||
|
| `EnfantAdminModel` | Modèle API (pas un widget) — hors scope ticket |
|
||||||
|
|
||||||
|
## Renames faits
|
||||||
|
|
||||||
|
| Avant | Après |
|
||||||
|
|-------|--------|
|
||||||
|
| `widgets/admin/common/admin_child_detail_modal.dart` → `AdminChildDetailModal` | `widgets/dashboard/child_detail_modal.dart` → `ChildDetailModal` |
|
||||||
|
| `admin_am_edit_modal` → `AdminAmEditModal` | `am_edit_modal` → `AmEditModal` |
|
||||||
|
| `admin_parent_edit_modal` → `AdminParentEditModal` | `parent_edit_modal` → `ParentEditModal` |
|
||||||
|
| `admin_user_card` → `AdminUserCard` | `user_card` → `UserCard` |
|
||||||
|
| `admin_enfant_user_card` → `AdminEnfantUserCard` | `enfant_user_card` → `EnfantUserCard` |
|
||||||
|
| `admin_am_photo_frame` → `AdminAmPhotoFrame` | `am_photo_frame` → `AmPhotoFrame` |
|
||||||
|
| `admin_am_children_capacity_grid` | `am_children_capacity_grid` → `AmChildrenCapacityGrid` |
|
||||||
|
| `admin_children_affiliation_panel` | `children_affiliation_panel` → `ChildrenAffiliationPanel` |
|
||||||
|
| `admin_select_*` / `AdminSelect*` / `AdminFamilleFoyer` | `select_*` / `Select*` / `FamilleFoyer` |
|
||||||
|
| `admin_status_capsule` | `status_capsule` → `StatusCapsule` |
|
||||||
|
| `admin_list_state` → `AdminListState` | `user_list_state` → `UserListState` |
|
||||||
|
| `admin_detail_modal` → `AdminDetailModal` / `AdminDetailField` | `detail_modal` → `DetailModal` / `DetailField` |
|
||||||
|
| `dashboard_admin.dart` | `user_management_sub_bar.dart` (`DashboardUserManagementSubBar` inchangé) |
|
||||||
|
|
||||||
|
Dossier `widgets/admin/` conserve encore les panels métier (`user_management_panel`, wizards, etc.) + `AdminManagementWidget`.
|
||||||
|
|
||||||
|
**Phase 2** (même ticket #155) : déplacer ces panels → `widgets/dashboard/` — voir [155-suite-move-admin-panels-to-dashboard.md](./155-suite-move-admin-panels-to-dashboard.md).
|
||||||
|
|
||||||
|
## Hors scope
|
||||||
|
|
||||||
|
- Refonte UX modales (ticket dédié)
|
||||||
|
- Rename API / back
|
||||||
|
- Déplacer tout `widgets/admin/` → `widgets/dashboard/` (panels) — possible follow-up
|
||||||
|
|
||||||
|
## Critères
|
||||||
|
|
||||||
|
- [x] Plus de préfixe `Admin` sur les composants **partagés** listés
|
||||||
|
- [ ] Build Flutter / recette dashboard admin + gestionnaire OK
|
||||||
|
- [x] Pas de changement comportemental (rename mécanique)
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
# Mini-spec — Déplacer les panels `widgets/admin/` → `widgets/dashboard/`
|
||||||
|
|
||||||
|
**Ticket** : **#155** (phase 2 — même ticket que le rename `Admin*`)
|
||||||
|
**Phase 1** : widgets `Admin*` → `widgets/dashboard/` (déjà sur `feature/155-rename-admin-prefix-dashboard`)
|
||||||
|
**Branche** : poursuivre / rebaser `feature/155-rename-admin-prefix-dashboard` (ou nouvelle branche depuis `develop` après merge phase 1)
|
||||||
|
**Nature** : rename / move mécanique — **zéro** changement UX / métier
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Contexte
|
||||||
|
|
||||||
|
Après la phase 1 (#155), la situation est **hybride** :
|
||||||
|
|
||||||
|
| Emplacement | Contenu |
|
||||||
|
|-------------|---------|
|
||||||
|
| `widgets/dashboard/` | Composants partagés sans préfixe `Admin*` (modales, cartes, selects, sub-bar…) |
|
||||||
|
| `widgets/admin/` | **Panels** du dashboard staff (listes, wizards, validation, shell `UserManagementPanel`…) + `AdminManagementWidget` |
|
||||||
|
|
||||||
|
Le dossier `admin/` laisse encore croire « réservé administrateur », alors que **gestionnaire** consomme les mêmes panels (`GestionnaireDashboardScreen` → `UserManagementPanel`).
|
||||||
|
|
||||||
|
Ce ticket **termine l’option C** au niveau dossier : tout le dashboard staff vit sous `widgets/dashboard/`, sauf ce qui est **vraiment** rôle admin.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Objectif
|
||||||
|
|
||||||
|
```
|
||||||
|
frontend/lib/widgets/admin/<panels & common partagés>
|
||||||
|
↓ git mv + update imports
|
||||||
|
frontend/lib/widgets/dashboard/…
|
||||||
|
```
|
||||||
|
|
||||||
|
Critère : un nouveau dev ne doit plus ouvrir `widgets/admin/` pour du code partagé admin+gestionnaire.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Cible d’arborescence (proposée)
|
||||||
|
|
||||||
|
```
|
||||||
|
widgets/dashboard/
|
||||||
|
├── (déjà là #155) child_detail_modal.dart, am_edit_modal.dart, user_card.dart, …
|
||||||
|
├── user_management_panel.dart ← shell onglets
|
||||||
|
├── user_management_sub_bar.dart ← déjà déplacé #155
|
||||||
|
├── dossiers_management_widget.dart
|
||||||
|
├── dossier_list_card.dart
|
||||||
|
├── parent_management_widget.dart ← corriger le typo managmant au passage ?
|
||||||
|
├── enfant_management_widget.dart
|
||||||
|
├── assistante_maternelle_management_widget.dart
|
||||||
|
├── gestionnaire_management_widget.dart
|
||||||
|
├── pending_validation_widget.dart
|
||||||
|
├── parent_dossier_create_modal.dart
|
||||||
|
├── parent_dossier_wizard.dart
|
||||||
|
├── am_dossier_create_modal.dart
|
||||||
|
├── am_dossier_wizard.dart
|
||||||
|
├── validation_*.dart ← family/am wizards, refus, theme, confirm
|
||||||
|
├── parametres_panel.dart ← utilisé par écran admin (OK dans dashboard)
|
||||||
|
├── relais_management_panel.dart
|
||||||
|
├── common/ ← sous-dossier optionnel
|
||||||
|
│ ├── suppression_confirm_dialog.dart
|
||||||
|
│ ├── user_list.dart
|
||||||
|
│ └── validation_detail_section.dart
|
||||||
|
└── …
|
||||||
|
|
||||||
|
widgets/admin/ ← mince, rôle admin seulement
|
||||||
|
└── admin_management_widget.dart ← onglet Administrateurs
|
||||||
|
```
|
||||||
|
|
||||||
|
### Variante B (plus stricte)
|
||||||
|
|
||||||
|
`AdminManagementWidget` + éventuels helpers purement admin →
|
||||||
|
`screens/administrateurs/widgets/`
|
||||||
|
et **suppression** du dossier `widgets/admin/`.
|
||||||
|
|
||||||
|
**Reco** : **variante A** (garder `widgets/admin/` minimal avec seulement `AdminManagementWidget`) — moins de churn screens, clair.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Inventaire à déplacer (état actuel)
|
||||||
|
|
||||||
|
### Racine `widgets/admin/` → `widgets/dashboard/`
|
||||||
|
|
||||||
|
| Fichier actuel | Notes |
|
||||||
|
|----------------|--------|
|
||||||
|
| `user_management_panel.dart` | Shell partagé admin + gestionnaire |
|
||||||
|
| `dossiers_management_widget.dart` | |
|
||||||
|
| `dossier_list_card.dart` | |
|
||||||
|
| `parent_managmant_widget.dart` | Typo historique `managmant` — **option** : renommer → `parent_management_widget.dart` dans le même ticket ou ticket typo séparé |
|
||||||
|
| `enfant_management_widget.dart` | |
|
||||||
|
| `assistante_maternelle_management_widget.dart` | |
|
||||||
|
| `gestionnaire_management_widget.dart` | |
|
||||||
|
| `pending_validation_widget.dart` | |
|
||||||
|
| `parent_dossier_create_modal.dart` | |
|
||||||
|
| `parent_dossier_wizard.dart` | |
|
||||||
|
| `am_dossier_create_modal.dart` | |
|
||||||
|
| `am_dossier_wizard.dart` | |
|
||||||
|
| `validation_am_wizard.dart` | |
|
||||||
|
| `validation_family_wizard.dart` | |
|
||||||
|
| `validation_dossier_modal.dart` | |
|
||||||
|
| `validation_modal_theme.dart` | |
|
||||||
|
| `validation_refus_form.dart` | |
|
||||||
|
| `validation_valider_confirm_dialog.dart` | |
|
||||||
|
| `parametres_panel.dart` | Écran admin seulement, mais pas préfixé Admin — OK dashboard |
|
||||||
|
| `relais_management_panel.dart` | |
|
||||||
|
|
||||||
|
### `widgets/admin/common/` → `widgets/dashboard/common/` (ou plat)
|
||||||
|
|
||||||
|
| Fichier | Notes |
|
||||||
|
|---------|--------|
|
||||||
|
| `suppression_confirm_dialog.dart` | Partagé (y compris `screens/administrateurs/creation/*`) |
|
||||||
|
| `user_list.dart` | |
|
||||||
|
| `validation_detail_section.dart` | |
|
||||||
|
|
||||||
|
### **Ne pas** déplacer
|
||||||
|
|
||||||
|
| Fichier | Destination |
|
||||||
|
|---------|-------------|
|
||||||
|
| `admin_management_widget.dart` | Reste `widgets/admin/` (ou variante B → screens) |
|
||||||
|
|
||||||
|
### Déjà fait (#155) — ne pas retraiter
|
||||||
|
|
||||||
|
Tout ce qui est déjà sous `widgets/dashboard/` (`child_detail_modal`, `am_edit_modal`, `user_card`, `select_*`, `user_management_sub_bar`, …).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Consommateurs d’imports (à mettre à jour)
|
||||||
|
|
||||||
|
### Screens
|
||||||
|
- `screens/administrateurs/admin_dashboardScreen.dart` — `UserManagementPanel`, `ParametresPanel`
|
||||||
|
- `screens/gestionnaire/gestionnaire_dashboard_screen.dart` — `UserManagementPanel`
|
||||||
|
- `screens/administrateurs/creation/admin_create.dart` — `suppression_confirm_dialog`
|
||||||
|
- `screens/administrateurs/creation/gestionnaires_create.dart` — idem
|
||||||
|
|
||||||
|
### Widgets déjà en `dashboard/`
|
||||||
|
- `am_edit_modal`, `child_detail_modal`, `parent_edit_modal`, `select_*` — imports vers `widgets/admin/common/*` ou panels
|
||||||
|
|
||||||
|
### Divers
|
||||||
|
- `widgets/common/identity_block.dart` (si import admin)
|
||||||
|
- Tous les fichiers **déplacés** entre eux (imports relatifs / package)
|
||||||
|
|
||||||
|
### Hors scope rename classes
|
||||||
|
Sauf décision explicite sur le typo `parent_managmant_widget` → pas de rename de **classes** métier dans ce ticket (seulement chemins de fichiers + imports).
|
||||||
|
`AdminManagementWidget` **conserve** son nom.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Plan d’exécution
|
||||||
|
|
||||||
|
1. Partir de `feature/155-rename-admin-prefix-dashboard` (phase 1) **ou** `develop` si phase 1 déjà mergée
|
||||||
|
2. `git mv` fichiers selon inventaire
|
||||||
|
3. Remplacer globalement
|
||||||
|
`package:p_tits_pas/widgets/admin/` → `package:p_tits_pas/widgets/dashboard/`
|
||||||
|
**sauf** `…/widgets/admin/admin_management_widget.dart`
|
||||||
|
4. Corriger imports relatifs cassés
|
||||||
|
5. Grep de contrôle (ci-dessous)
|
||||||
|
6. Build Flutter web (Docker) + smoke dashboard admin **et** gestionnaire
|
||||||
|
7. Merge → squash master si flux habituel
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Vérifs
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Plus de panels partagés sous admin (seul AdminManagement attendu)
|
||||||
|
find frontend/lib/widgets/admin -name '*.dart'
|
||||||
|
|
||||||
|
# Plus d’imports panels vers l’ancien chemin (sauf AdminManagement)
|
||||||
|
rg -n "widgets/admin/(user_management|dossiers_|parent_|enfant_|assistante|gestionnaire|pending|validation_|parametres|relais|am_dossier|parent_dossier|dossier_list|common/)" frontend/lib
|
||||||
|
|
||||||
|
# Screens OK
|
||||||
|
rg -n "widgets/admin/" frontend/lib/screens
|
||||||
|
```
|
||||||
|
|
||||||
|
Attendu screens : **0** hit vers panels ; éventuellement plus aucun hit `widgets/admin/` sauf si import explicite `AdminManagementWidget` depuis `user_management_panel` (chemin `widgets/admin/admin_management_widget.dart`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Hors scope
|
||||||
|
|
||||||
|
- Refonte UX des modales / panels (ticket dédié annoncé)
|
||||||
|
- Rename `EnfantAdminModel`
|
||||||
|
- Rename `screens/administrateurs/`
|
||||||
|
- Rename `AdminUserFormDialog` / `AdminCreateDialog`
|
||||||
|
- Changement API / back
|
||||||
|
- #152 (`est_multiple`) — autre branche
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Critères d’acceptation
|
||||||
|
|
||||||
|
- [ ] Inventaire déplacé selon tableau
|
||||||
|
- [ ] `widgets/admin/` ne contient plus que `admin_management_widget.dart` (variante A)
|
||||||
|
- [ ] Imports screens + widgets à jour
|
||||||
|
- [ ] Build Flutter OK
|
||||||
|
- [ ] Recette : dashboard **administrateur** et **gestionnaire** (listes, ouverture fiches, validation, création dossier) sans régression
|
||||||
|
- [ ] Aucun changement comportemental volontaire
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Risques / notes
|
||||||
|
|
||||||
|
- **Conflits de merge** si d’autres features touchent les panels → faire ce ticket quand la surface dashboard est calme (fin 0.1.0 OK)
|
||||||
|
- Typo `parent_managmant_widget` : soit inclus (bonus), soit ticket cleanup 1-ligne séparé
|
||||||
|
- Docs d’archive citant `widgets/admin/…` : pas obligatoire de mettre à jour ; `docs/27_BRIEFING-FRONTEND.md` oui si encore listé
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
# Mini-spec API — POST /assistantes-maternelles/dossier (#156)
|
||||||
|
|
||||||
|
Contrat pour le **plan front** (wizard création AM staff).
|
||||||
|
|
||||||
|
## Endpoint
|
||||||
|
|
||||||
|
| | |
|
||||||
|
|--|--|
|
||||||
|
| **Méthode** | `POST` |
|
||||||
|
| **URL** | `{base}/assistantes-maternelles/dossier` |
|
||||||
|
| **Auth** | Bearer JWT |
|
||||||
|
| **Rôles** | `gestionnaire`, `administrateur`, `super_admin` |
|
||||||
|
| **Content-Type** | `application/json` |
|
||||||
|
|
||||||
|
Ne **pas** appeler `POST /auth/register/am` depuis le dashboard.
|
||||||
|
|
||||||
|
## Body (JSON)
|
||||||
|
|
||||||
|
Aligné inscription AM publique, **sans** CGU/privacy obligatoires (acceptées serveur).
|
||||||
|
|
||||||
|
| Champ | Type | Obligatoire | Notes |
|
||||||
|
|-------|------|-------------|--------|
|
||||||
|
| `email` | string | oui | unique |
|
||||||
|
| `prenom` | string | oui | |
|
||||||
|
| `nom` | string | oui | |
|
||||||
|
| `telephone` | string | oui | `0X…` ou `+33…` |
|
||||||
|
| `adresse` | string | non | |
|
||||||
|
| `code_postal` | string | non | |
|
||||||
|
| `ville` | string | non | |
|
||||||
|
| `photo_base64` | string | non | data-URL `data:image/…;base64,…` |
|
||||||
|
| `photo_filename` | string | non | hint nom fichier |
|
||||||
|
| `consentement_photo` | bool | oui | |
|
||||||
|
| `date_naissance` | date ISO | non | `YYYY-MM-DD` |
|
||||||
|
| `lieu_naissance_ville` | string | oui | |
|
||||||
|
| `lieu_naissance_pays` | string | oui | |
|
||||||
|
| `nir` | string | oui | 15 car. (Corse 2A/2B OK) |
|
||||||
|
| `numero_agrement` | string | oui | unique |
|
||||||
|
| `date_agrement` | date ISO | non | |
|
||||||
|
| `capacite_accueil` | int | oui | 1–10 |
|
||||||
|
| `places_disponibles` | int | oui | 0–10, ≤ capacité |
|
||||||
|
| `biographie` | string | non | max 2000 |
|
||||||
|
|
||||||
|
## Réponses
|
||||||
|
|
||||||
|
### 201 Created
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"message": "Dossier AM créé et validé. Un e-mail de création de mot de passe a été envoyé.",
|
||||||
|
"user_id": "uuid",
|
||||||
|
"statut": "actif",
|
||||||
|
"numero_dossier": "2026-000042"
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Effets serveur : user AM **actif**, fiche `assistantes_maternelles`, n° dossier, **e-mail création MDP** (pas d’accusé « en attente »).
|
||||||
|
|
||||||
|
### Erreurs
|
||||||
|
|
||||||
|
| Code | Cas |
|
||||||
|
|------|-----|
|
||||||
|
| 400 | Validation / NIR / places > capacité |
|
||||||
|
| 403 | Rôle non staff |
|
||||||
|
| 409 | Email, NIR ou agrément déjà pris |
|
||||||
|
| 401 | Token manquant / invalide |
|
||||||
|
|
||||||
|
## Front
|
||||||
|
|
||||||
|
- `UserService.createAmDossier(body)` → cet endpoint
|
||||||
|
- Après 201 : refresh liste AM ; snackbar OK
|
||||||
|
- Wizard create : ne pas envoyer `acceptation_cgu` / `acceptation_privacy` (optionnels)
|
||||||
|
|
||||||
|
## Branche
|
||||||
|
|
||||||
|
`feature/156-creation-dossier-am`
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
# Mini-spec — Uniformisation modale staff (Gestionnaire / Administrateur)
|
||||||
|
|
||||||
|
**Ticket** : **#164** — https://git.ptits-pas.fr/jmartin/petitspas/issues/164
|
||||||
|
**Branche** : `feature/164-staff-modal-uniformisation` (depuis `develop`)
|
||||||
|
**Périmètre** : **front only** — pas d’API / BDD
|
||||||
|
**Milestone** : **0.1.0**
|
||||||
|
|
||||||
|
Voir le corps du ticket #164 pour la spec complète.
|
||||||
|
|
||||||
|
## Livré
|
||||||
|
|
||||||
|
- `frontend/lib/widgets/dashboard/staff_user_form_modal.dart` → `StaffUserFormModal`
|
||||||
|
- Ancien `AdminUserFormDialog` / `gestionnaires_create.dart` retiré
|
||||||
|
- Imports : `user_management_panel`, `gestionnaire_management_widget`, `admin_management_widget`
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<application
|
<application
|
||||||
android:label="p_tits_pas"
|
android:label="p_tits_pas"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
android:icon="@mipmap/launcher_icon">
|
android:icon="@mipmap/ic_launcher">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:exported="true"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
After Width: | Height: | Size: 261 KiB |
|
After Width: | Height: | Size: 276 KiB |
@@ -1,58 +0,0 @@
|
|||||||
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'] ?? '',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -6,7 +6,6 @@ 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/couple_selector_bandeau.dart';
|
||||||
import 'package:p_tits_pas/widgets/quotidien/quotidien_shell.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/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).
|
/// Tableau de bord parent — coquille 3 colonnes quotidien (#166).
|
||||||
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
|
/// Colonne gauche : sélecteur de couple enfant–nounou (#167).
|
||||||
@@ -129,7 +128,10 @@ class _ParentDashboardScreenState extends State<ParentDashboardScreen> {
|
|||||||
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
|
'Mess. AM · Mess. RPE\n(à brancher — ticket #184).',
|
||||||
icon: Icons.chat_bubble_outline,
|
icon: Icons.chat_bubble_outline,
|
||||||
),
|
),
|
||||||
agendaBody: AgendaAbsencesStub(placementId: _selectedCoupleId),
|
agendaBody: const QuotidienStubPage(
|
||||||
|
title: 'Agenda',
|
||||||
|
message: 'Agenda — contenu à venir (stub #187).',
|
||||||
|
),
|
||||||
contratBody: const QuotidienStubPage(
|
contratBody: const QuotidienStubPage(
|
||||||
title: 'Contrat',
|
title: 'Contrat',
|
||||||
message: 'Contrat — contenu à venir (stub #187).',
|
message: 'Contrat — contenu à venir (stub #187).',
|
||||||
|
|||||||
@@ -1,192 +0,0 @@
|
|||||||
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')),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
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}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -96,8 +96,7 @@ class ApiConfig {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static Map<String, String> authHeaders(String token) => {
|
static Map<String, String> authHeaders(String token) => {
|
||||||
'Content-Type': 'application/json',
|
...headers,
|
||||||
'Accept': 'application/json',
|
|
||||||
'Authorization': 'Bearer $token',
|
'Authorization': 'Bearer $token',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -383,13 +383,6 @@ class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Récupère l'utilisateur connecté depuis le cache
|
/// 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 {
|
static Future<AppUser?> getCurrentUser() async {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
final userJson = prefs.getString(_currentUserKey);
|
final userJson = prefs.getString(_currentUserKey);
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ abstract final class QuotidienTheme {
|
|||||||
static const Color ink = Color(0xFF2F2F2F);
|
static const Color ink = Color(0xFF2F2F2F);
|
||||||
static const Color ivory = Color(0xFFFFFEF9);
|
static const Color ivory = Color(0xFFFFFEF9);
|
||||||
static const Color turquoise = Color(0xFF8AD0C8);
|
static const Color turquoise = Color(0xFF8AD0C8);
|
||||||
static const Color peach = Color(0xFFFFCCB6);
|
|
||||||
static const Color lavender = Color(0xFFC6A3D8);
|
static const Color lavender = Color(0xFFC6A3D8);
|
||||||
static const Color coral = Color(0xFFF4A28C);
|
static const Color coral = Color(0xFFF4A28C);
|
||||||
static const Color softGreenPill = Color(0xFFB8D9A8);
|
static const Color softGreenPill = Color(0xFFB8D9A8);
|
||||||
|
|||||||
@@ -1,22 +1,6 @@
|
|||||||
# Generated by pub
|
# Generated by pub
|
||||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
# See https://dart.dev/tools/pub/glossary#lockfile
|
||||||
packages:
|
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:
|
async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -41,22 +25,6 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.4.0"
|
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:
|
clock:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -182,14 +150,6 @@ packages:
|
|||||||
description: flutter
|
description: flutter
|
||||||
source: sdk
|
source: sdk
|
||||||
version: "0.0.0"
|
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:
|
flutter_lints:
|
||||||
dependency: "direct dev"
|
dependency: "direct dev"
|
||||||
description:
|
description:
|
||||||
@@ -253,14 +213,6 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "4.0.2"
|
version: "4.0.2"
|
||||||
image:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: image
|
|
||||||
sha256: a1e7f4951e538a568e14b856702afc9ae1d2f4b202daced8d22c1b9cd211ce89
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "4.10.1"
|
|
||||||
image_picker:
|
image_picker:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -341,14 +293,6 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.6.7"
|
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:
|
leak_tracker:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
@@ -517,14 +461,6 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.1.8"
|
version: "2.1.8"
|
||||||
posix:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: posix
|
|
||||||
sha256: bc1bad54ad2b735816e31f8d4600cfde6c7839975085ddfbca48b6c9f7c4044e
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "6.5.2"
|
|
||||||
provider:
|
provider:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
@@ -786,14 +722,6 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.1.0"
|
version: "1.1.0"
|
||||||
yaml:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: yaml
|
|
||||||
sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea
|
|
||||||
url: "https://pub.dev"
|
|
||||||
source: hosted
|
|
||||||
version: "3.1.4"
|
|
||||||
sdks:
|
sdks:
|
||||||
dart: ">=3.7.0-0 <4.0.0"
|
dart: ">=3.7.0-0 <4.0.0"
|
||||||
flutter: ">=3.19.0"
|
flutter: ">=3.19.0"
|
||||||
|
|||||||
@@ -30,21 +30,6 @@ dev_dependencies:
|
|||||||
flutter_test:
|
flutter_test:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
flutter_lints: ^2.0.0
|
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:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 633 B After Width: | Height: | Size: 917 B |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 20 KiB |
@@ -3,19 +3,19 @@
|
|||||||
"short_name": "P'titsPas",
|
"short_name": "P'titsPas",
|
||||||
"start_url": ".",
|
"start_url": ".",
|
||||||
"display": "standalone",
|
"display": "standalone",
|
||||||
"background_color": "#ffffff",
|
"background_color": "#FFFEF9",
|
||||||
"theme_color": "#ffffff",
|
"theme_color": "#8AD0C8",
|
||||||
"description": "P'titsPas - Grandir pas à pas, sereinement",
|
"description": "P'titsPas - Grandir pas à pas, sereinement",
|
||||||
"orientation": "portrait-primary",
|
"orientation": "portrait-primary",
|
||||||
"prefer_related_applications": false,
|
"prefer_related_applications": false,
|
||||||
"icons": [
|
"icons": [
|
||||||
{
|
{
|
||||||
"src": "icons/Icon-192.png",
|
"src": "assets/images/icon.png",
|
||||||
"sizes": "192x192",
|
"sizes": "192x192",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"src": "icons/Icon-512.png",
|
"src": "assets/images/icon.png",
|
||||||
"sizes": "512x512",
|
"sizes": "512x512",
|
||||||
"type": "image/png"
|
"type": "image/png"
|
||||||
},
|
},
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 33 KiB |
@@ -0,0 +1,144 @@
|
|||||||
|
/**
|
||||||
|
* Liste les issues Gitea ouvertes pour un milestone donné (ex. 0.1.0).
|
||||||
|
* Usage : node scripts/gitea-list-open-issues-by-milestone.js [milestone]
|
||||||
|
* Token : .gitea-token (racine), GITEA_TOKEN, ou docs/27_BRIEFING-FRONTEND.md
|
||||||
|
*/
|
||||||
|
const https = require('https');
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
|
||||||
|
const repoRoot = path.join(__dirname, '..');
|
||||||
|
const REPO = 'jmartin/petitspas';
|
||||||
|
const milestoneWanted = (process.argv[2] || '0.1.0').trim();
|
||||||
|
|
||||||
|
let token = process.env.GITEA_TOKEN;
|
||||||
|
if (!token) {
|
||||||
|
try {
|
||||||
|
const tokenFile = path.join(repoRoot, '.gitea-token');
|
||||||
|
if (fs.existsSync(tokenFile)) token = fs.readFileSync(tokenFile, 'utf8').trim();
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
if (!token) {
|
||||||
|
try {
|
||||||
|
const briefing = fs.readFileSync(
|
||||||
|
path.join(repoRoot, 'docs/27_BRIEFING-FRONTEND.md'),
|
||||||
|
'utf8',
|
||||||
|
);
|
||||||
|
const m = briefing.match(/Token:\s*(giteabu_[a-f0-9]+)/);
|
||||||
|
if (m) token = m[1].trim();
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
if (!token) {
|
||||||
|
console.error('Token non trouvé : .gitea-token ou GITEA_TOKEN');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getJson(apiPath) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const opts = {
|
||||||
|
hostname: 'git.ptits-pas.fr',
|
||||||
|
path: `/api/v1/repos/${REPO}${apiPath}`,
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
Authorization: 'token ' + token,
|
||||||
|
Accept: 'application/json',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
const req = https.request(opts, (res) => {
|
||||||
|
let d = '';
|
||||||
|
res.on('data', (c) => (d += c));
|
||||||
|
res.on('end', () => {
|
||||||
|
if (res.statusCode !== 200) {
|
||||||
|
reject(new Error(`HTTP ${res.statusCode}: ${d.slice(0, 500)}`));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
resolve(JSON.parse(d));
|
||||||
|
} catch (e) {
|
||||||
|
reject(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
req.on('error', reject);
|
||||||
|
req.end();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function fetchAllOpenIssues() {
|
||||||
|
const out = [];
|
||||||
|
let page = 1;
|
||||||
|
const limit = 50;
|
||||||
|
for (;;) {
|
||||||
|
const qs = new URLSearchParams({
|
||||||
|
state: 'open',
|
||||||
|
type: 'all',
|
||||||
|
page: String(page),
|
||||||
|
limit: String(limit),
|
||||||
|
});
|
||||||
|
const batch = await getJson(`/issues?${qs}`);
|
||||||
|
if (!Array.isArray(batch) || batch.length === 0) break;
|
||||||
|
out.push(...batch);
|
||||||
|
if (batch.length < limit) break;
|
||||||
|
page += 1;
|
||||||
|
if (page > 40) break;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
function milestoneMatches(m, wanted) {
|
||||||
|
if (!m) return false;
|
||||||
|
const t = (m.title || '').trim();
|
||||||
|
return t === wanted || t === `v${wanted}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function main() {
|
||||||
|
let milestones;
|
||||||
|
try {
|
||||||
|
milestones = await getJson('/milestones?state=all');
|
||||||
|
} catch (e) {
|
||||||
|
milestones = [];
|
||||||
|
console.warn('Milestones non lisibles:', e.message);
|
||||||
|
}
|
||||||
|
|
||||||
|
const known = Array.isArray(milestones)
|
||||||
|
? milestones.map((m) => m.title).filter(Boolean)
|
||||||
|
: [];
|
||||||
|
if (known.length) {
|
||||||
|
console.log('Milestones connus sur le dépôt :', known.join(', '));
|
||||||
|
}
|
||||||
|
|
||||||
|
const issues = await fetchAllOpenIssues();
|
||||||
|
const filtered = issues.filter((i) => milestoneMatches(i.milestone, milestoneWanted));
|
||||||
|
|
||||||
|
console.log('');
|
||||||
|
console.log(`## Issues ouvertes — milestone « ${milestoneWanted} » (${filtered.length})`);
|
||||||
|
console.log('');
|
||||||
|
if (filtered.length === 0) {
|
||||||
|
console.log(
|
||||||
|
'Aucune issue ouverte avec ce milestone. Vérifier sur Gitea que les tickets ' +
|
||||||
|
'0.1.0 portent bien le milestone, ou élargir la requête.',
|
||||||
|
);
|
||||||
|
console.log('');
|
||||||
|
console.log(`(Total issues ouvertes sans filtre milestone : ${issues.length})`);
|
||||||
|
const withM = issues.filter((i) => i.milestone);
|
||||||
|
if (withM.length) {
|
||||||
|
console.log('');
|
||||||
|
console.log('Issues ouvertes qui ont *un* milestone :');
|
||||||
|
for (const i of withM) {
|
||||||
|
console.log(`- #${i.number} [${i.milestone.title}] ${i.title}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
process.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const i of filtered.sort((a, b) => a.number - b.number)) {
|
||||||
|
const labels = (i.labels || []).map((l) => l.name).join(', ');
|
||||||
|
console.log(`- **#${i.number}** — ${i.title}`);
|
||||||
|
if (labels) console.log(` - Labels : ${labels}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch((e) => {
|
||||||
|
console.error(e);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
/**
|
||||||
|
* POST /api/v1/auth/register/parent — foyer mono-parent (1 parent + 1 enfant).
|
||||||
|
* Inspiré de register-parent-lecomte-test.mjs.
|
||||||
|
* Email : sophie.bernard@example.com
|
||||||
|
*
|
||||||
|
* Usage : node tests/scripts/register-parent-bernard-test.mjs [BASE_URL]
|
||||||
|
*/
|
||||||
|
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
import https from 'https';
|
||||||
|
import http from 'http';
|
||||||
|
import { fileURLToPath } from 'url';
|
||||||
|
|
||||||
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
||||||
|
const photosDir = path.join(__dirname, '..', 'ressources', 'photos');
|
||||||
|
|
||||||
|
function toDataUri(filePath) {
|
||||||
|
const buf = fs.readFileSync(filePath);
|
||||||
|
return `data:image/png;base64,${buf.toString('base64')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const presentationDossier =
|
||||||
|
"Je suis Sophie BERNARD, mère isolée de Jules. J'ai la garde complète de mon fils. " +
|
||||||
|
"Je recherche une assistante maternelle bienveillante à Bezons. " +
|
||||||
|
"Merci pour l'étude de notre dossier.";
|
||||||
|
|
||||||
|
const body = {
|
||||||
|
email: 'sophie.bernard@example.com',
|
||||||
|
prenom: 'Sophie',
|
||||||
|
nom: 'BERNARD',
|
||||||
|
telephone: '0611223344',
|
||||||
|
adresse: '12 Rue des Lilas',
|
||||||
|
code_postal: '95870',
|
||||||
|
ville: 'Bezons',
|
||||||
|
// Pas de co-parent (mono-parent).
|
||||||
|
enfants: [
|
||||||
|
{
|
||||||
|
prenom: 'Jules',
|
||||||
|
nom: 'BERNARD',
|
||||||
|
date_naissance: '2024-06-10',
|
||||||
|
genre: 'H',
|
||||||
|
// Réutilise une photo de test existante.
|
||||||
|
photo_base64: toDataUri(path.join(photosDir, 'lecomte-maxime.png')),
|
||||||
|
photo_filename: 'jules_bernard.png',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
presentation_dossier: presentationDossier,
|
||||||
|
acceptation_cgu: true,
|
||||||
|
acceptation_privacy: true,
|
||||||
|
};
|
||||||
|
|
||||||
|
const json = JSON.stringify(body);
|
||||||
|
const baseArg = process.argv[2] || 'https://app.ptits-pas.fr';
|
||||||
|
const base = new URL(baseArg.endsWith('/') ? baseArg.slice(0, -1) : baseArg);
|
||||||
|
const url = new URL('/api/v1/auth/register/parent', `${base.protocol}//${base.host}`);
|
||||||
|
|
||||||
|
const opts = {
|
||||||
|
hostname: url.hostname,
|
||||||
|
port: url.port || (url.protocol === 'https:' ? 443 : 80),
|
||||||
|
path: url.pathname,
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
Accept: 'application/json',
|
||||||
|
'Content-Length': Buffer.byteLength(json, 'utf8'),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
const lib = url.protocol === 'https:' ? https : http;
|
||||||
|
|
||||||
|
console.error(`POST ${url.href} (payload ~${Math.round(json.length / 1024)} Ko)`);
|
||||||
|
|
||||||
|
const req = lib.request(opts, (res) => {
|
||||||
|
let data = '';
|
||||||
|
res.on('data', (c) => {
|
||||||
|
data += c;
|
||||||
|
});
|
||||||
|
res.on('end', () => {
|
||||||
|
console.log('HTTP', res.statusCode);
|
||||||
|
try {
|
||||||
|
const j = JSON.parse(data);
|
||||||
|
console.log(JSON.stringify(j, null, 2));
|
||||||
|
} catch {
|
||||||
|
console.log(data.slice(0, 4000));
|
||||||
|
}
|
||||||
|
if (res.statusCode < 200 || res.statusCode >= 300) process.exit(1);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
req.on('error', (e) => {
|
||||||
|
console.error('Erreur réseau:', e.message);
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
req.setTimeout(120000, () => {
|
||||||
|
req.destroy();
|
||||||
|
console.error('Timeout 120s');
|
||||||
|
process.exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
req.write(json);
|
||||||
|
req.end();
|
||||||