Compare commits
76
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f547f76b1c | ||
|
|
af7d1b4da4 | ||
|
|
25d030601d | ||
|
|
a972285787 | ||
|
|
d84cc7e13e | ||
|
|
38af471054 | ||
|
|
7f554e2ba3 | ||
|
|
d05a5e22b2 | ||
|
|
e6be1dffc4 | ||
|
|
cec1fc2ba7 | ||
|
|
1c0ff71f26 | ||
|
|
a5d1616a17 | ||
|
|
1e4e2d5198 | ||
|
|
8af579be53 | ||
|
|
a36e9ef176 | ||
|
|
5d36b0f4c1 | ||
|
|
ad48ab28cc | ||
|
|
342686f4e0 | ||
|
|
d42927297d | ||
|
|
1d3ec0b759 | ||
|
|
608e62d662 | ||
|
|
dc491470db | ||
|
|
5a73da898b | ||
|
|
0c736f5605 | ||
|
|
6c8ef32a11 | ||
|
|
f3b2da4b4d | ||
|
|
edab253296 | ||
|
|
d61e34a1e6 | ||
|
|
484fb9a3e5 | ||
|
|
72982f792b | ||
|
|
32f6eeeeed | ||
|
|
8b1c4555ad | ||
|
|
f978e65dfd | ||
|
|
6683139429 | ||
|
|
da12418aa0 | ||
|
|
8c778d1a6d | ||
|
|
1d68f86b3e | ||
|
|
2a24c0a061 | ||
|
|
07d3160bff | ||
|
|
bace0edd96 | ||
|
|
e267cdf8bc | ||
|
|
9c021c56b3 | ||
|
|
c922421919 | ||
|
|
e91468616b | ||
|
|
1f985f5b37 | ||
|
|
7705a14bb5 | ||
|
|
535af3b146 | ||
|
|
2832499d3e | ||
|
|
676e22665a | ||
|
|
5eb0f13e75 | ||
|
|
2c461abc82 | ||
|
|
42163826fe | ||
|
|
7ff169d4c9 | ||
|
|
ebf77b1ebb | ||
|
|
d53682110d | ||
|
|
290d442123 | ||
|
|
2114748d44 | ||
|
|
0842f66df8 | ||
|
|
c3fd098464 | ||
|
|
ed3546d196 | ||
|
|
da6836cda3 | ||
|
|
91f2c3e1ef | ||
|
|
4007d7010e | ||
|
|
4261667198 | ||
|
|
15e2d8d850 | ||
|
|
34a516d509 | ||
|
|
da71803852 | ||
|
|
2380aa9826 | ||
|
|
c952113099 | ||
|
|
8204669ec9 | ||
|
|
76ab0f340a | ||
|
|
a0a5e15b04 | ||
|
|
823ea6cd22 | ||
|
|
dfac075a74 | ||
|
|
2d8b857a84 | ||
|
|
147051821a |
@@ -12,6 +12,7 @@ import {
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { AgendaLotStatutType } from 'src/entities/agenda_lots.entity';
|
||||
|
||||
export class CreerEvenementAgendaDto {
|
||||
@ApiProperty({ description: 'Placement AM↔enfant (couple)' })
|
||||
@@ -63,6 +64,25 @@ export class MajEvenementAgendaDto {
|
||||
motif?: string;
|
||||
}
|
||||
|
||||
/** Droits calculés pour l’utilisateur courant — #215 */
|
||||
export class EvenementAgendaActionsDto {
|
||||
@ApiProperty({ description: 'Peut modifier dates / resoumettre (créateur)' })
|
||||
peut_modifier: boolean;
|
||||
|
||||
@ApiProperty({ description: 'Peut annuler / soft-cancel (créateur)' })
|
||||
peut_supprimer: boolean;
|
||||
|
||||
@ApiProperty({
|
||||
description: 'Peut accept/refuse (parent habilité, congé en attente)',
|
||||
})
|
||||
peut_accepter_refuser: boolean;
|
||||
|
||||
@ApiProperty({
|
||||
description: 'Peut ack informatif (ex. arrêt maladie)',
|
||||
})
|
||||
peut_ack: boolean;
|
||||
}
|
||||
|
||||
export class EvenementAgendaDto {
|
||||
@ApiProperty()
|
||||
id: string;
|
||||
@@ -70,27 +90,82 @@ export class EvenementAgendaDto {
|
||||
@ApiProperty()
|
||||
id_placement: string;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
description: 'Lot collectif (congé/arrêt/absence groupés)',
|
||||
nullable: true,
|
||||
})
|
||||
id_lot?: string | null;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
description: 'Carte de collecte liée',
|
||||
nullable: true,
|
||||
})
|
||||
id_card_instance?: string | null;
|
||||
|
||||
@ApiProperty({ enum: TypeEvenementAgendaType })
|
||||
type: TypeEvenementAgendaType;
|
||||
|
||||
@ApiProperty()
|
||||
@ApiProperty({ example: '2026-10-01' })
|
||||
date_debut: string;
|
||||
|
||||
@ApiProperty()
|
||||
@ApiProperty({ example: '2026-10-05' })
|
||||
date_fin: string;
|
||||
|
||||
@ApiProperty({ enum: StatutEvenementAgendaType })
|
||||
@ApiPropertyOptional({
|
||||
example: '18:19',
|
||||
description: 'Heure métier (soin), HH:mm',
|
||||
nullable: true,
|
||||
})
|
||||
heure?: string | null;
|
||||
|
||||
@ApiProperty({
|
||||
enum: StatutEvenementAgendaType,
|
||||
description: 'Statut de cet événement (membre du lot si lot)',
|
||||
})
|
||||
statut: StatutEvenementAgendaType;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
enum: AgendaLotStatutType,
|
||||
description: 'Statut global du lot ; null si hors lot',
|
||||
nullable: true,
|
||||
})
|
||||
statut_lot?: AgendaLotStatutType | null;
|
||||
|
||||
@ApiProperty({
|
||||
enum: StatutEvenementAgendaType,
|
||||
description:
|
||||
'Statut à afficher pour l’utilisateur courant (peut différer du membre si lot refusé / nouvel accueil)',
|
||||
})
|
||||
statut_effectif: StatutEvenementAgendaType;
|
||||
|
||||
@ApiProperty()
|
||||
expire_at: string;
|
||||
|
||||
@ApiPropertyOptional({ nullable: true })
|
||||
verrouille_le?: string | null;
|
||||
|
||||
@ApiPropertyOptional({ nullable: true })
|
||||
refuse_le?: string | null;
|
||||
|
||||
@ApiPropertyOptional({ nullable: true })
|
||||
annule_le?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
cree_par?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
@ApiPropertyOptional({
|
||||
description: 'Motif créateur ou texte de refus (sans nommer la famille)',
|
||||
nullable: true,
|
||||
})
|
||||
motif?: string | null;
|
||||
|
||||
@ApiPropertyOptional({
|
||||
description:
|
||||
'Libellé de refus anonymisé : « Refusé par une autre famille » / « Refusé par l\'autre parent »',
|
||||
nullable: true,
|
||||
})
|
||||
libelle_refus?: string | null;
|
||||
|
||||
@ApiPropertyOptional()
|
||||
id_enfant?: string | null;
|
||||
|
||||
@@ -106,6 +181,9 @@ export class EvenementAgendaDto {
|
||||
@ApiPropertyOptional()
|
||||
nom_am?: string | null;
|
||||
|
||||
@ApiProperty({ type: EvenementAgendaActionsDto })
|
||||
actions: EvenementAgendaActionsDto;
|
||||
|
||||
@ApiProperty()
|
||||
cree_le: string;
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ describe('EvenementsAgendaController (#172)', () => {
|
||||
let controller: EvenementsAgendaController;
|
||||
const serviceMock = {
|
||||
lister: jest.fn(),
|
||||
getById: jest.fn(),
|
||||
creer: jest.fn(),
|
||||
maj: jest.fn(),
|
||||
supprimer: jest.fn(),
|
||||
@@ -70,4 +71,14 @@ describe('EvenementsAgendaController (#172)', () => {
|
||||
dto,
|
||||
);
|
||||
});
|
||||
|
||||
it('getById délègue au service — #215', async () => {
|
||||
serviceMock.getById.mockResolvedValue({ id: 'ev-1', actions: {} });
|
||||
await controller.getById('u1', RoleType.PARENT, 'ev-1');
|
||||
expect(serviceMock.getById).toHaveBeenCalledWith(
|
||||
'ev-1',
|
||||
'u1',
|
||||
RoleType.PARENT,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -47,16 +47,18 @@ export class EvenementsAgendaController {
|
||||
@Get()
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({
|
||||
summary: 'Lister les absences / congés / arrêts — ticket #205 / ex-#172',
|
||||
summary: 'Lister les événements agenda — #217 / #205',
|
||||
description:
|
||||
'Sans placementId : tous les placements du user (parent = famille multi-AM ; AM = tous accueils). ' +
|
||||
'Avec placementId : un couple enfant–AM.',
|
||||
'Sans placementId : tous les placements du user (actifs **et** terminés — historique). ' +
|
||||
'Avec placementId : un couple enfant–AM (terminé OK). ' +
|
||||
'Filtres from/to inclusifs (chevauchement). Annulés exclus sauf si statut=annule. ' +
|
||||
'Dates YYYY-MM-DD calendaires (DST-safe).',
|
||||
})
|
||||
@ApiQuery({ name: 'placementId', required: false })
|
||||
@ApiQuery({ name: 'type', required: false, enum: TypeEvenementAgendaType })
|
||||
@ApiQuery({ name: 'statut', required: false, enum: StatutEvenementAgendaType })
|
||||
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD' })
|
||||
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD' })
|
||||
@ApiQuery({ name: 'from', required: false, description: 'YYYY-MM-DD (inclus)' })
|
||||
@ApiQuery({ name: 'to', required: false, description: 'YYYY-MM-DD (inclus)' })
|
||||
@ApiResponse({ status: 200, type: ListeEvenementsAgendaDto })
|
||||
lister(
|
||||
@User('id') userId: string,
|
||||
@@ -76,6 +78,24 @@ export class EvenementsAgendaController {
|
||||
});
|
||||
}
|
||||
|
||||
@Get(':id')
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({
|
||||
summary: 'Détail d’un événement agenda — #215',
|
||||
description:
|
||||
'DTO enrichi : id_lot, heure, statut_lot, statut_effectif, actions. ' +
|
||||
'Lecture autorisée sur placement terminé (historique). ' +
|
||||
'Aucun secret sur l’auteur d’un refus d’une autre famille.',
|
||||
})
|
||||
@ApiResponse({ status: 200, type: EvenementAgendaDto })
|
||||
getById(
|
||||
@User('id') userId: string,
|
||||
@User('role') role: RoleType,
|
||||
@Param('id', ParseUUIDPipe) id: string,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
return this.evenementsAgendaService.getById(id, userId, role);
|
||||
}
|
||||
|
||||
@Post()
|
||||
@Roles(RoleType.PARENT, RoleType.ASSISTANTE_MATERNELLE)
|
||||
@ApiOperation({ summary: 'Créer une période d’absence / congé / arrêt — #172' })
|
||||
|
||||
@@ -165,4 +165,211 @@ describe('EvenementsAgendaService (#172)', () => {
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
|
||||
it('getById enrichit le DTO — #215', async () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'ev-1',
|
||||
id_placement: 'pl-1',
|
||||
id_lot: 'lot-1',
|
||||
id_card_instance: 'card-1',
|
||||
type: TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
date_debut: '2026-10-16',
|
||||
date_fin: '2026-10-16',
|
||||
heure: '18:19:00',
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_par: 'am-1',
|
||||
motif: 'Piqûre',
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
lot: null,
|
||||
placement: {
|
||||
enfantId: 'e-1',
|
||||
amId: 'am-1',
|
||||
child: { id: 'e-1', first_name: 'Léo' },
|
||||
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||
},
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: '2026-12-01',
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
|
||||
const res = await service.getById('ev-1', 'p-1', RoleType.PARENT);
|
||||
expect(res.id_lot).toBe('lot-1');
|
||||
expect(res.id_card_instance).toBe('card-1');
|
||||
expect(res.heure).toBe('18:19');
|
||||
expect(res.statut_effectif).toBe(StatutEvenementAgendaType.ACCEPTE);
|
||||
expect(res.actions.peut_ack).toBe(true);
|
||||
expect(res.actions.peut_accepter_refuser).toBe(false);
|
||||
});
|
||||
|
||||
it('getById autorise placement terminé (historique) — #215', async () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'ev-old',
|
||||
id_placement: 'pl-ended',
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-01-01',
|
||||
date_fin: '2026-01-05',
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_par: 'p-1',
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
placement: {
|
||||
enfantId: 'e-1',
|
||||
amId: 'am-1',
|
||||
child: { id: 'e-1', first_name: 'Léo' },
|
||||
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||
},
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-ended',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: '2026-06-01',
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
|
||||
const res = await service.getById('ev-old', 'p-1', RoleType.PARENT);
|
||||
expect(res.id).toBe('ev-old');
|
||||
expect(res.actions.peut_modifier).toBe(true);
|
||||
});
|
||||
|
||||
describe('lister — #217', () => {
|
||||
const andWhere = jest.fn().mockReturnThis();
|
||||
const qb = {
|
||||
leftJoinAndSelect: jest.fn().mockReturnThis(),
|
||||
where: jest.fn().mockReturnThis(),
|
||||
andWhere,
|
||||
orderBy: jest.fn().mockReturnThis(),
|
||||
getMany: jest.fn().mockResolvedValue([]),
|
||||
};
|
||||
|
||||
beforeEach(() => {
|
||||
andWhere.mockClear();
|
||||
absencesRepo.createQueryBuilder.mockReturnValue(qb);
|
||||
amChildrenRepo.find.mockResolvedValue([{ id: 'pl-1' }, { id: 'pl-ended' }]);
|
||||
});
|
||||
|
||||
it('from > to → BadRequest', async () => {
|
||||
await expect(
|
||||
service.lister('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
from: '2026-10-31',
|
||||
to: '2026-10-01',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
|
||||
it('date invalide (31 nov) → BadRequest', async () => {
|
||||
await expect(
|
||||
service.lister('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
from: '2026-11-31',
|
||||
to: '2026-12-01',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
|
||||
it('exclut les annulés par défaut + bornes inclusives', async () => {
|
||||
await service.lister('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
from: '2026-10-01',
|
||||
to: '2026-10-31',
|
||||
});
|
||||
expect(amChildrenRepo.find).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
where: expect.objectContaining({ amId: 'am-1' }),
|
||||
}),
|
||||
);
|
||||
// pas de date_fin: IsNull() → historique inclus
|
||||
const whereArg = amChildrenRepo.find.mock.calls[0][0].where;
|
||||
expect(whereArg.date_fin).toBeUndefined();
|
||||
expect(andWhere).toHaveBeenCalledWith('ag.statut != :annule', {
|
||||
annule: StatutEvenementAgendaType.ANNULE,
|
||||
});
|
||||
expect(andWhere).toHaveBeenCalledWith('ag.date_fin >= :from', {
|
||||
from: '2026-10-01',
|
||||
});
|
||||
expect(andWhere).toHaveBeenCalledWith('ag.date_debut <= :to', {
|
||||
to: '2026-10-31',
|
||||
});
|
||||
});
|
||||
|
||||
it('DST octobre : bornes calendaires acceptées (2026-10-25)', async () => {
|
||||
// dernier dimanche d’octobre 2026 = 25 oct. — strings YYYY-MM-DD, pas Date UTC
|
||||
await expect(
|
||||
service.lister('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
from: '2026-10-25',
|
||||
to: '2026-10-26',
|
||||
}),
|
||||
).resolves.toEqual({ items: [] });
|
||||
expect(andWhere).toHaveBeenCalledWith('ag.date_fin >= :from', {
|
||||
from: '2026-10-25',
|
||||
});
|
||||
});
|
||||
|
||||
it('année bissextile : 2024-02-29 valide', async () => {
|
||||
await expect(
|
||||
service.lister('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
from: '2024-02-29',
|
||||
to: '2024-03-01',
|
||||
}),
|
||||
).resolves.toEqual({ items: [] });
|
||||
});
|
||||
|
||||
it('2025-02-29 invalide (non bissextile)', async () => {
|
||||
await expect(
|
||||
service.lister('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
from: '2025-02-29',
|
||||
to: '2025-03-01',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
});
|
||||
|
||||
it('libelle_refus n’expose pas l’auteur — #215', async () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'ev-ref',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.CONGE_AM,
|
||||
date_debut: '2026-11-01',
|
||||
date_fin: '2026-11-10',
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
expire_at: new Date(),
|
||||
cree_par: 'am-1',
|
||||
motif: 'Vacances scolaires',
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
lot: { statut: 'refuse' },
|
||||
placement: {
|
||||
enfantId: 'e-1',
|
||||
amId: 'am-1',
|
||||
child: { id: 'e-1', first_name: 'Léo' },
|
||||
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||
},
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
|
||||
const res = await service.getById('ev-ref', 'p-1', RoleType.PARENT);
|
||||
expect(res.libelle_refus).toBe('Refusé par une autre famille');
|
||||
expect(res.statut_effectif).toBe(StatutEvenementAgendaType.REFUSE);
|
||||
expect(res.libelle_refus).not.toMatch(/p-2|Dupont|famille B/i);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -11,11 +11,13 @@ import {
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { AgendaLotStatutType } from 'src/entities/agenda_lots.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 {
|
||||
EvenementAgendaDto,
|
||||
EvenementAgendaActionsDto,
|
||||
CreerEvenementAgendaDto,
|
||||
ListeEvenementsAgendaDto,
|
||||
MajEvenementAgendaDto,
|
||||
@@ -48,10 +50,14 @@ export class EvenementsAgendaService {
|
||||
to?: string;
|
||||
},
|
||||
): Promise<ListeEvenementsAgendaDto> {
|
||||
this.assertDateRange(opts.from, opts.to);
|
||||
|
||||
// Agenda : historique inclus (placements terminés) — #217
|
||||
const placementIds = await this.resolvePlacementIds(
|
||||
userId,
|
||||
role,
|
||||
opts.placementId,
|
||||
{ includeEnded: true },
|
||||
);
|
||||
if (placementIds.length === 0) {
|
||||
return { items: [] };
|
||||
@@ -63,15 +69,22 @@ export class EvenementsAgendaService {
|
||||
.leftJoinAndSelect('placement.child', 'child')
|
||||
.leftJoinAndSelect('placement.am', 'am')
|
||||
.leftJoinAndSelect('am.user', 'amUser')
|
||||
.leftJoinAndSelect('ag.lot', 'lot')
|
||||
.where('ag.id_placement IN (:...placementIds)', { placementIds })
|
||||
.orderBy('ag.date_debut', 'DESC');
|
||||
|
||||
if (opts.type) {
|
||||
qb.andWhere('ag.type = :type', { type: opts.type });
|
||||
}
|
||||
// Exclusion des annulés par défaut ; statut=annule demande explicitement les annulés
|
||||
if (opts.statut) {
|
||||
qb.andWhere('ag.statut = :statut', { statut: opts.statut });
|
||||
} else {
|
||||
qb.andWhere('ag.statut != :annule', {
|
||||
annule: StatutEvenementAgendaType.ANNULE,
|
||||
});
|
||||
}
|
||||
// Chevauchement inclusif : date_debut <= to AND date_fin >= from
|
||||
if (opts.from) {
|
||||
qb.andWhere('ag.date_fin >= :from', { from: opts.from });
|
||||
}
|
||||
@@ -80,7 +93,18 @@ export class EvenementsAgendaService {
|
||||
}
|
||||
|
||||
const rows = await qb.getMany();
|
||||
return { items: rows.map((r) => this.toDto(r)) };
|
||||
return {
|
||||
items: rows.map((r) => this.toDto(r, userId, role)),
|
||||
};
|
||||
}
|
||||
|
||||
/** GET :id — #215 */
|
||||
async getById(
|
||||
id: string,
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
return this.getByIdForUser(id, userId, role);
|
||||
}
|
||||
|
||||
async creer(
|
||||
@@ -186,13 +210,22 @@ export class EvenementsAgendaService {
|
||||
): Promise<EvenementAgendaDto> {
|
||||
const row = await this.absencesRepo.findOne({
|
||||
where: { id },
|
||||
relations: ['placement', 'placement.child', 'placement.am', 'placement.am.user'],
|
||||
relations: [
|
||||
'placement',
|
||||
'placement.child',
|
||||
'placement.am',
|
||||
'placement.am.user',
|
||||
'lot',
|
||||
],
|
||||
});
|
||||
if (!row) {
|
||||
throw new NotFoundException('Absence introuvable');
|
||||
throw new NotFoundException('Événement introuvable');
|
||||
}
|
||||
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||
return this.toDto(row);
|
||||
// Lecture : historique autorisé même si placement terminé (B1 / prépare B3)
|
||||
await this.assertCanAccessPlacement(userId, role, row.id_placement, {
|
||||
allowEnded: true,
|
||||
});
|
||||
return this.toDto(row, userId, role);
|
||||
}
|
||||
|
||||
private statutInitial(type: TypeEvenementAgendaType): StatutEvenementAgendaType {
|
||||
@@ -221,6 +254,33 @@ export class EvenementsAgendaService {
|
||||
}
|
||||
}
|
||||
|
||||
/** Bornes calendaires YYYY-MM-DD (comparaison lexicographique = calendaire, DST-safe). #217 */
|
||||
private assertDateRange(from?: string, to?: string): void {
|
||||
if (from) this.assertCalendarDate(from, 'from');
|
||||
if (to) this.assertCalendarDate(to, 'to');
|
||||
if (from && to && from > to) {
|
||||
throw new BadRequestException('from doit être inférieure ou égale à to');
|
||||
}
|
||||
}
|
||||
|
||||
private assertCalendarDate(value: string, field: string): void {
|
||||
if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
|
||||
throw new BadRequestException(
|
||||
`${field} doit être une date YYYY-MM-DD`,
|
||||
);
|
||||
}
|
||||
const [y, m, d] = value.split('-').map(Number);
|
||||
// UTC : évite qu’un parse local fasse glisser le jour à l’heure d’hiver
|
||||
const dt = new Date(Date.UTC(y, m - 1, d));
|
||||
if (
|
||||
dt.getUTCFullYear() !== y ||
|
||||
dt.getUTCMonth() !== m - 1 ||
|
||||
dt.getUTCDate() !== d
|
||||
) {
|
||||
throw new BadRequestException(`${field} n’est pas une date calendaire valide`);
|
||||
}
|
||||
}
|
||||
|
||||
private assertCanCreateType(role: RoleType, type: TypeEvenementAgendaType): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
if (type !== TypeEvenementAgendaType.ABSENCE_ENFANT) {
|
||||
@@ -332,9 +392,12 @@ export class EvenementsAgendaService {
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
placementId?: string,
|
||||
opts?: { includeEnded?: boolean },
|
||||
): Promise<string[]> {
|
||||
if (placementId) {
|
||||
await this.assertCanAccessPlacement(userId, role, placementId);
|
||||
await this.assertCanAccessPlacement(userId, role, placementId, {
|
||||
allowEnded: opts?.includeEnded === true,
|
||||
});
|
||||
return [placementId];
|
||||
}
|
||||
|
||||
@@ -346,7 +409,9 @@ export class EvenementsAgendaService {
|
||||
const enfantIds = liens.map((l) => l.enfantId);
|
||||
if (enfantIds.length === 0) return [];
|
||||
const placements = await this.amChildrenRepo.find({
|
||||
where: { enfantId: In(enfantIds), date_fin: IsNull() },
|
||||
where: opts?.includeEnded
|
||||
? { enfantId: In(enfantIds) }
|
||||
: { enfantId: In(enfantIds), date_fin: IsNull() },
|
||||
select: ['id'],
|
||||
});
|
||||
return placements.map((p) => p.id);
|
||||
@@ -354,7 +419,9 @@ export class EvenementsAgendaService {
|
||||
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
const placements = await this.amChildrenRepo.find({
|
||||
where: { amId: userId, date_fin: IsNull() },
|
||||
where: opts?.includeEnded
|
||||
? { amId: userId }
|
||||
: { amId: userId, date_fin: IsNull() },
|
||||
select: ['id'],
|
||||
});
|
||||
return placements.map((p) => p.id);
|
||||
@@ -367,12 +434,19 @@ export class EvenementsAgendaService {
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
placementId: string,
|
||||
opts?: { allowEnded?: boolean },
|
||||
): Promise<AmChildren> {
|
||||
const placement = await this.amChildrenRepo.findOne({
|
||||
where: { id: placementId, date_fin: IsNull() },
|
||||
where: opts?.allowEnded
|
||||
? { id: placementId }
|
||||
: { id: placementId, date_fin: IsNull() },
|
||||
});
|
||||
if (!placement) {
|
||||
throw new NotFoundException('Placement / couple introuvable ou inactif');
|
||||
throw new NotFoundException(
|
||||
opts?.allowEnded
|
||||
? 'Placement / couple introuvable'
|
||||
: 'Placement / couple introuvable ou inactif',
|
||||
);
|
||||
}
|
||||
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
@@ -397,26 +471,187 @@ export class EvenementsAgendaService {
|
||||
throw new ForbiddenException('Rôle non autorisé');
|
||||
}
|
||||
|
||||
private toDto(row: EvenementsAgenda): EvenementAgendaDto {
|
||||
private toDto(
|
||||
row: EvenementsAgenda,
|
||||
userId?: string,
|
||||
role?: RoleType,
|
||||
): EvenementAgendaDto {
|
||||
const child = row.placement?.child;
|
||||
const amUser = row.placement?.am?.user;
|
||||
const statutLot = (row.lot?.statut as AgendaLotStatutType | undefined) ?? null;
|
||||
const statutEffectif = this.statutEffectif(row, statutLot);
|
||||
return {
|
||||
id: row.id,
|
||||
id_placement: row.id_placement,
|
||||
id_lot: row.id_lot ?? null,
|
||||
id_card_instance: row.id_card_instance ?? null,
|
||||
type: row.type,
|
||||
date_debut: row.date_debut,
|
||||
date_fin: row.date_fin,
|
||||
heure: this.formatHeure(row.heure),
|
||||
statut: row.statut,
|
||||
statut_lot: statutLot,
|
||||
statut_effectif: statutEffectif,
|
||||
expire_at: row.expire_at?.toISOString?.() ?? String(row.expire_at),
|
||||
verrouille_le: row.verrouille_le
|
||||
? row.verrouille_le.toISOString?.() ?? String(row.verrouille_le)
|
||||
: null,
|
||||
refuse_le: row.refuse_le
|
||||
? row.refuse_le.toISOString?.() ?? String(row.refuse_le)
|
||||
: null,
|
||||
annule_le: row.annule_le
|
||||
? row.annule_le.toISOString?.() ?? String(row.annule_le)
|
||||
: null,
|
||||
cree_par: row.cree_par ?? null,
|
||||
motif: row.motif ?? null,
|
||||
libelle_refus: this.libelleRefus(row, statutLot, userId, role),
|
||||
id_enfant: child?.id ?? row.placement?.enfantId ?? null,
|
||||
prenom_enfant: child?.first_name ?? null,
|
||||
id_am: row.placement?.amId ?? null,
|
||||
prenom_am: amUser?.prenom ?? null,
|
||||
nom_am: amUser?.nom ?? null,
|
||||
actions: this.actionsPour(row, statutLot, userId, role),
|
||||
cree_le: row.cree_le?.toISOString?.() ?? String(row.cree_le),
|
||||
modifie_le: row.modifie_le?.toISOString?.() ?? String(row.modifie_le),
|
||||
};
|
||||
}
|
||||
|
||||
private formatHeure(heure?: string | null): string | null {
|
||||
if (!heure) return null;
|
||||
const s = String(heure);
|
||||
return s.length >= 5 ? s.slice(0, 5) : s;
|
||||
}
|
||||
|
||||
private statutEffectif(
|
||||
row: EvenementsAgenda,
|
||||
statutLot: AgendaLotStatutType | null,
|
||||
): StatutEvenementAgendaType {
|
||||
if (row.statut === StatutEvenementAgendaType.ANNULE) {
|
||||
return StatutEvenementAgendaType.ANNULE;
|
||||
}
|
||||
if (statutLot === AgendaLotStatutType.ANNULE) {
|
||||
return StatutEvenementAgendaType.ANNULE;
|
||||
}
|
||||
if (statutLot === AgendaLotStatutType.REFUSE) {
|
||||
return StatutEvenementAgendaType.REFUSE;
|
||||
}
|
||||
return row.statut;
|
||||
}
|
||||
|
||||
/**
|
||||
* Anonymise l’auteur du refus : jamais le nom d’une autre famille.
|
||||
* B1 : si refusé et viewer ≠ créateur → « autre famille » ;
|
||||
* si viewer est parent créateur/foyer et motif présent → « autre parent » pour co-parent
|
||||
* (sans id répondant en B1 : défaut « autre famille » pour parent destinataire).
|
||||
*/
|
||||
private libelleRefus(
|
||||
row: EvenementsAgenda,
|
||||
statutLot: AgendaLotStatutType | null,
|
||||
userId?: string,
|
||||
role?: RoleType,
|
||||
): string | null {
|
||||
const refuse =
|
||||
row.statut === StatutEvenementAgendaType.REFUSE ||
|
||||
statutLot === AgendaLotStatutType.REFUSE;
|
||||
if (!refuse) return null;
|
||||
if (!userId || !role) return 'Refusé';
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
return 'Refusé par une famille';
|
||||
}
|
||||
// Parent : ne jamais citer quelle famille. Si ce n’est pas le créateur AM, message générique.
|
||||
if (row.cree_par && row.cree_par === userId) {
|
||||
return null;
|
||||
}
|
||||
return 'Refusé par une autre famille';
|
||||
}
|
||||
|
||||
private actionsPour(
|
||||
row: EvenementsAgenda,
|
||||
statutLot: AgendaLotStatutType | null,
|
||||
userId?: string,
|
||||
role?: RoleType,
|
||||
): EvenementAgendaActionsDto {
|
||||
const none: EvenementAgendaActionsDto = {
|
||||
peut_modifier: false,
|
||||
peut_supprimer: false,
|
||||
peut_accepter_refuser: false,
|
||||
peut_ack: false,
|
||||
};
|
||||
if (!userId || !role) return none;
|
||||
if (
|
||||
row.statut === StatutEvenementAgendaType.ANNULE ||
|
||||
statutLot === AgendaLotStatutType.ANNULE
|
||||
) {
|
||||
return none;
|
||||
}
|
||||
|
||||
const isCreator = row.cree_par === userId;
|
||||
const today = new Date().toISOString().slice(0, 10);
|
||||
const notStarted = row.date_debut > today;
|
||||
const enAttente =
|
||||
row.statut === StatutEvenementAgendaType.EN_ATTENTE ||
|
||||
statutLot === AgendaLotStatutType.EN_ATTENTE;
|
||||
const refuse =
|
||||
row.statut === StatutEvenementAgendaType.REFUSE ||
|
||||
statutLot === AgendaLotStatutType.REFUSE;
|
||||
const accepte =
|
||||
row.statut === StatutEvenementAgendaType.ACCEPTE ||
|
||||
statutLot === AgendaLotStatutType.ACCEPTE;
|
||||
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE && isCreator) {
|
||||
const congeFuturModifiable =
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
accepte &&
|
||||
notStarted;
|
||||
return {
|
||||
peut_modifier:
|
||||
enAttente || refuse || congeFuturModifiable ||
|
||||
(row.type !== TypeEvenementAgendaType.CONGE_AM &&
|
||||
row.type !== TypeEvenementAgendaType.SOIN_ENFANT &&
|
||||
accepte),
|
||||
peut_supprimer:
|
||||
enAttente ||
|
||||
refuse ||
|
||||
(row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
accepte &&
|
||||
notStarted) ||
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM ||
|
||||
row.type === TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
peut_accepter_refuser: false,
|
||||
peut_ack: false,
|
||||
};
|
||||
}
|
||||
|
||||
if (role === RoleType.PARENT && !isCreator) {
|
||||
const congeEnAttente =
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
row.statut === StatutEvenementAgendaType.EN_ATTENTE &&
|
||||
statutLot !== AgendaLotStatutType.REFUSE &&
|
||||
statutLot !== AgendaLotStatutType.ANNULE;
|
||||
const arretAck =
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM;
|
||||
const soinAck = row.type === TypeEvenementAgendaType.SOIN_ENFANT;
|
||||
return {
|
||||
peut_modifier: false,
|
||||
peut_supprimer: false,
|
||||
peut_accepter_refuser: congeEnAttente,
|
||||
peut_ack: arretAck || soinAck,
|
||||
};
|
||||
}
|
||||
|
||||
if (
|
||||
role === RoleType.PARENT &&
|
||||
isCreator &&
|
||||
row.type === TypeEvenementAgendaType.ABSENCE_ENFANT
|
||||
) {
|
||||
return {
|
||||
peut_modifier: true,
|
||||
peut_supprimer: true,
|
||||
peut_accepter_refuser: false,
|
||||
peut_ack: false,
|
||||
};
|
||||
}
|
||||
|
||||
return none;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user