Compare commits
79
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8f8974d65e | ||
|
|
df130aedd9 | ||
|
|
0ac8526053 | ||
|
|
6419f4e8d3 | ||
|
|
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 |
Generated
+49
@@ -15,6 +15,7 @@
|
||||
"@nestjs/jwt": "^11.0.0",
|
||||
"@nestjs/mapped-types": "^2.1.0",
|
||||
"@nestjs/platform-express": "^11.0.1",
|
||||
"@nestjs/schedule": "^12.0.2",
|
||||
"@nestjs/swagger": "^11.2.0",
|
||||
"@nestjs/typeorm": "^11.0.0",
|
||||
"@sentry/nestjs": "^10.10.0",
|
||||
@@ -2544,6 +2545,22 @@
|
||||
"node": ">= 0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/@nestjs/schedule": {
|
||||
"version": "12.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@nestjs/schedule/-/schedule-12.0.2.tgz",
|
||||
"integrity": "sha512-5iAvJEtk0njbfTrG4JQr+SXw8ZrqgDM1wJH9nUs6tVLCX5pWGd1LJ0a8b089UT1FDeDWaThRRfSLixFz9zztcA==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cron": "4.4.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20.19.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@nestjs/common": "^11.0.0 || ^12.0.0",
|
||||
"@nestjs/core": "^11.0.0 || ^12.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@nestjs/schematics": {
|
||||
"version": "11.0.7",
|
||||
"resolved": "https://registry.npmjs.org/@nestjs/schematics/-/schematics-11.0.7.tgz",
|
||||
@@ -3767,6 +3784,12 @@
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/luxon": {
|
||||
"version": "3.7.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.6.tgz",
|
||||
"integrity": "sha512-6KSjliQAXK8ZLgFQO4B7iE4Rpf/B3rItzCFuXezBY/XIAGxOdLd7vRNK9/StRPwiS/yJsVbB7HKpW46B8tcEuQ==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@types/methods": {
|
||||
"version": "1.1.4",
|
||||
"resolved": "https://registry.npmjs.org/@types/methods/-/methods-1.1.4.tgz",
|
||||
@@ -5856,6 +5879,23 @@
|
||||
"devOptional": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cron": {
|
||||
"version": "4.4.0",
|
||||
"resolved": "https://registry.npmjs.org/cron/-/cron-4.4.0.tgz",
|
||||
"integrity": "sha512-fkdfq+b+AHI4cKdhZlppHveI/mgz2qpiYxcm+t5E5TsxX7QrLS1VE0+7GENEk9z0EeGPcpSciGv6ez24duWhwQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/luxon": "~3.7.0",
|
||||
"luxon": "~3.7.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18.x"
|
||||
},
|
||||
"funding": {
|
||||
"type": "ko-fi",
|
||||
"url": "https://ko-fi.com/intcreator"
|
||||
}
|
||||
},
|
||||
"node_modules/cross-spawn": {
|
||||
"version": "7.0.6",
|
||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
|
||||
@@ -8786,6 +8826,15 @@
|
||||
"yallist": "^3.0.2"
|
||||
}
|
||||
},
|
||||
"node_modules/luxon": {
|
||||
"version": "3.7.2",
|
||||
"resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
|
||||
"integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
}
|
||||
},
|
||||
"node_modules/magic-string": {
|
||||
"version": "0.30.17",
|
||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
"@nestjs/jwt": "^11.0.0",
|
||||
"@nestjs/mapped-types": "^2.1.0",
|
||||
"@nestjs/platform-express": "^11.0.1",
|
||||
"@nestjs/schedule": "^12.0.2",
|
||||
"@nestjs/swagger": "^11.2.0",
|
||||
"@nestjs/typeorm": "^11.0.0",
|
||||
"@sentry/nestjs": "^10.10.0",
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||
import { ScheduleModule } from '@nestjs/schedule';
|
||||
import { AppController } from './app.controller';
|
||||
import { AppService } from './app.service';
|
||||
import appConfig from './config/app.config';
|
||||
@@ -58,6 +59,7 @@ import { SuppressionsModule } from './routes/suppressions/suppressions.module';
|
||||
AuthModule,
|
||||
AppConfigModule,
|
||||
DocumentsLegauxModule,
|
||||
ScheduleModule.forRoot(),
|
||||
EvenementsAgendaModule,
|
||||
CardsModule,
|
||||
RelaisModule,
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
/** Dates calendaires Europe/Paris — comparaison lexicographique YYYY-MM-DD = calendaire (DST-safe). */
|
||||
|
||||
const PARIS_YMD = new Intl.DateTimeFormat('en-CA', {
|
||||
timeZone: 'Europe/Paris',
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
});
|
||||
|
||||
/** Aujourd’hui civil à Paris (YYYY-MM-DD). */
|
||||
export function todayParis(): string {
|
||||
return PARIS_YMD.format(new Date());
|
||||
}
|
||||
|
||||
/** Décale une date calendaire YYYY-MM-DD de `deltaDays` (UTC, sans glissement DST). */
|
||||
export function shiftYmd(ymd: string, deltaDays: number): string {
|
||||
const [y, m, d] = ymd.split('-').map(Number);
|
||||
const dt = new Date(Date.UTC(y, m - 1, d + deltaDays));
|
||||
const yy = dt.getUTCFullYear();
|
||||
const mm = String(dt.getUTCMonth() + 1).padStart(2, '0');
|
||||
const dd = String(dt.getUTCDate()).padStart(2, '0');
|
||||
return `${yy}-${mm}-${dd}`;
|
||||
}
|
||||
|
||||
export function yesterdayParis(): string {
|
||||
return shiftYmd(todayParis(), -1);
|
||||
}
|
||||
|
||||
/** Fenêtre temporelle exacte en ms (ex. 7×24 h = 168 h). */
|
||||
export const MS_24H = 24 * 60 * 60 * 1000;
|
||||
export const MS_7X24H = 7 * MS_24H;
|
||||
@@ -373,4 +373,80 @@ describe('CardsService (#194)', () => {
|
||||
]),
|
||||
);
|
||||
});
|
||||
|
||||
describe('B2 — #216 soft-cancel + ack arrêt', () => {
|
||||
it('ack arrêt maladie → pas de maj événement + carte traitée', async () => {
|
||||
cardsRepo.findOne.mockResolvedValue({
|
||||
id: 'card-arret',
|
||||
type_code: 'arret_maladie_am',
|
||||
id_placement: 'pl-1',
|
||||
id_evenement: 'ev-arret',
|
||||
cree_par: 'am-1',
|
||||
statut: CardInstanceStatutType.OUVERTE,
|
||||
purge_at: new Date(Date.now() - 60_000), // déjà hors fil
|
||||
payload: {},
|
||||
type: {
|
||||
titre: 'Arrêt',
|
||||
response_mode: CardResponseModeType.ACK,
|
||||
retention_days: 7,
|
||||
},
|
||||
responses: [],
|
||||
audience: [
|
||||
{ id_utilisateur: 'am-1' },
|
||||
{ id_utilisateur: 'p-1' },
|
||||
],
|
||||
});
|
||||
audienceRepo.findOne.mockResolvedValue({
|
||||
id_card: 'card-arret',
|
||||
id_utilisateur: 'p-1',
|
||||
});
|
||||
|
||||
const res = await service.repondre('p-1', RoleType.PARENT, 'card-arret', {
|
||||
action: 'ack' as never,
|
||||
});
|
||||
|
||||
expect(evenementsService.maj).not.toHaveBeenCalled();
|
||||
expect(cardsRepo.update).toHaveBeenCalledWith(
|
||||
{ id: 'card-arret' },
|
||||
expect.objectContaining({ statut: CardInstanceStatutType.TRAITEE }),
|
||||
);
|
||||
expect(res.statut).toBe(CardInstanceStatutType.TRAITEE);
|
||||
});
|
||||
|
||||
it('supprimer carte → soft-cancel (update ANNULEE), pas delete', async () => {
|
||||
cardsRepo.findOne.mockResolvedValue({
|
||||
id: 'card-1',
|
||||
type_code: 'absence_enfant',
|
||||
id_placement: 'pl-1',
|
||||
id_evenement: 'ev-1',
|
||||
cree_par: 'p-1',
|
||||
statut: CardInstanceStatutType.OUVERTE,
|
||||
cree_le: new Date(),
|
||||
audience: [{ id_utilisateur: 'p-1' }, { id_utilisateur: 'am-1' }],
|
||||
type: { retention_days: 14 },
|
||||
});
|
||||
evenementsService.supprimer.mockResolvedValue(undefined);
|
||||
|
||||
await service.supprimer('p-1', RoleType.PARENT, 'card-1');
|
||||
|
||||
expect(cardsRepo.delete).not.toHaveBeenCalled();
|
||||
expect(evenementsService.supprimer).toHaveBeenCalledWith(
|
||||
'p-1',
|
||||
RoleType.PARENT,
|
||||
'ev-1',
|
||||
);
|
||||
expect(cardsRepo.update).toHaveBeenCalledWith(
|
||||
{ id: 'card-1' },
|
||||
expect.objectContaining({
|
||||
statut: CardInstanceStatutType.ANNULEE,
|
||||
}),
|
||||
);
|
||||
expect(realtime.emitToUsers).toHaveBeenCalledWith(
|
||||
expect.any(Array),
|
||||
'card.deleted',
|
||||
'card-1',
|
||||
expect.any(Object),
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -92,11 +92,11 @@ export class CardsService {
|
||||
.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');
|
||||
.andWhere('c.statut != :annulee', {
|
||||
annulee: CardInstanceStatutType.ANNULEE,
|
||||
})
|
||||
// Tri fil : COALESCE(remonte_le, cree_le) DESC (mini-spec §10)
|
||||
.orderBy('COALESCE(c.remonte_le, c.cree_le)', 'DESC');
|
||||
|
||||
if (placementId) {
|
||||
await this.assertPlacementAccess(userId, role, placementId);
|
||||
@@ -251,6 +251,10 @@ export class CardsService {
|
||||
): Promise<CarteDto> {
|
||||
const card = await this.loadCard(cardId);
|
||||
await this.assertInAudience(card, userId);
|
||||
// Respond OK même après purge_at (sortie du fil) — AC #216
|
||||
if (card.statut === CardInstanceStatutType.ANNULEE) {
|
||||
throw new BadRequestException('Cette carte est annulée');
|
||||
}
|
||||
if (card.statut !== CardInstanceStatutType.OUVERTE) {
|
||||
throw new BadRequestException('Cette carte n’est plus ouverte');
|
||||
}
|
||||
@@ -285,8 +289,11 @@ export class CardsService {
|
||||
}),
|
||||
);
|
||||
|
||||
if (card.id_evenement) {
|
||||
if (dto.action === CardResponseActionType.ACCEPT || dto.action === CardResponseActionType.ACK) {
|
||||
// ACK informatif (arrêt / soin) : n’écrit plus sur l’événement (#216)
|
||||
if (dto.action === CardResponseActionType.ACK) {
|
||||
card.statut = CardInstanceStatutType.TRAITEE;
|
||||
} else if (card.id_evenement) {
|
||||
if (dto.action === CardResponseActionType.ACCEPT) {
|
||||
await this.evenementsService.maj(userId, role, card.id_evenement, {
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
});
|
||||
@@ -298,8 +305,6 @@ export class CardsService {
|
||||
});
|
||||
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);
|
||||
@@ -456,22 +461,21 @@ export class CardsService {
|
||||
}
|
||||
|
||||
const audienceIds = await this.audienceUserIds(card);
|
||||
// Soft-cancel événement lié (matrice temporelle côté evenements) — #216
|
||||
if (card.id_evenement) {
|
||||
const absStatut =
|
||||
card.statut === CardInstanceStatutType.TRAITEE
|
||||
? null
|
||||
: card.id_evenement;
|
||||
// Supprime l’absence liée si pas encore acceptée définitivement (ou si soin_enfant dans les 24h)
|
||||
if (
|
||||
card.statut === CardInstanceStatutType.OUVERTE ||
|
||||
card.statut === CardInstanceStatutType.REFUSEE ||
|
||||
card.type_code === 'soin_enfant'
|
||||
) {
|
||||
await this.evenementsService.supprimer(userId, role, card.id_evenement);
|
||||
}
|
||||
void absStatut;
|
||||
await this.evenementsService.supprimer(userId, role, card.id_evenement);
|
||||
}
|
||||
await this.cardsRepo.delete({ id: cardId });
|
||||
// Soft-cancel carte — aucun DELETE physique applicatif (#216)
|
||||
const now = new Date();
|
||||
await this.cardsRepo.update(
|
||||
{ id: cardId },
|
||||
{
|
||||
statut: CardInstanceStatutType.ANNULEE,
|
||||
annule_le: now,
|
||||
annule_par: userId,
|
||||
purge_at: now,
|
||||
},
|
||||
);
|
||||
this.realtime.emitToUsers(audienceIds, 'card.deleted', cardId, {
|
||||
id: cardId,
|
||||
});
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
jest.mock('@nestjs/schedule', () => ({
|
||||
Cron: () => () => undefined,
|
||||
CronExpression: { EVERY_HOUR: '0 * * * *' },
|
||||
}));
|
||||
|
||||
import { AgendaExpirationCron } from './agenda-expiration.cron';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
|
||||
describe('AgendaExpirationCron (#216)', () => {
|
||||
const evenements = {
|
||||
autoValiderCongesExpires: jest.fn().mockResolvedValue(2),
|
||||
softCancelRefusesExpires: jest.fn().mockResolvedValue(1),
|
||||
};
|
||||
|
||||
beforeEach(() => jest.clearAllMocks());
|
||||
|
||||
it('runOnce agrège auto-valid + soft-cancel', async () => {
|
||||
const cron = new AgendaExpirationCron(
|
||||
evenements as unknown as EvenementsAgendaService,
|
||||
);
|
||||
const res = await cron.runOnce();
|
||||
expect(res).toEqual({ autoValid: 2, softCancel: 1 });
|
||||
expect(evenements.autoValiderCongesExpires).toHaveBeenCalledTimes(1);
|
||||
expect(evenements.softCancelRefusesExpires).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('double appel concurrent : 2e skip (lock)', async () => {
|
||||
let release!: () => void;
|
||||
const gate = new Promise<void>((r) => {
|
||||
release = r;
|
||||
});
|
||||
evenements.autoValiderCongesExpires.mockImplementation(async () => {
|
||||
await gate;
|
||||
return 1;
|
||||
});
|
||||
evenements.softCancelRefusesExpires.mockResolvedValue(0);
|
||||
|
||||
const cron = new AgendaExpirationCron(
|
||||
evenements as unknown as EvenementsAgendaService,
|
||||
);
|
||||
const p1 = cron.runOnce();
|
||||
const p2 = cron.runOnce();
|
||||
release();
|
||||
const [a, b] = await Promise.all([p1, p2]);
|
||||
const skipped = [a, b].filter((x) => x.autoValid === 0 && x.softCancel === 0);
|
||||
const ran = [a, b].filter((x) => x.autoValid === 1);
|
||||
expect(skipped).toHaveLength(1);
|
||||
expect(ran).toHaveLength(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,38 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { Cron, CronExpression } from '@nestjs/schedule';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
|
||||
/**
|
||||
* Échéances Agenda (#216) : auto-valid congés J+7, soft-cancel refusés J+7.
|
||||
* Idempotent ; rattrapage au redémarrage via le prochain tick.
|
||||
*/
|
||||
@Injectable()
|
||||
export class AgendaExpirationCron {
|
||||
private readonly logger = new Logger(AgendaExpirationCron.name);
|
||||
private running = false;
|
||||
|
||||
constructor(private readonly evenements: EvenementsAgendaService) {}
|
||||
|
||||
@Cron(CronExpression.EVERY_HOUR)
|
||||
async tick(): Promise<void> {
|
||||
await this.runOnce();
|
||||
}
|
||||
|
||||
/** Exposé pour tests / appel manuel (double-appel = no-op côté rows déjà traités). */
|
||||
async runOnce(
|
||||
now = new Date(),
|
||||
): Promise<{ autoValid: number; softCancel: number }> {
|
||||
if (this.running) {
|
||||
this.logger.debug('Cron agenda déjà en cours — skip');
|
||||
return { autoValid: 0, softCancel: 0 };
|
||||
}
|
||||
this.running = true;
|
||||
try {
|
||||
const autoValid = await this.evenements.autoValiderCongesExpires(now);
|
||||
const softCancel = await this.evenements.softCancelRefusesExpires(now);
|
||||
return { autoValid, softCancel };
|
||||
} finally {
|
||||
this.running = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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' })
|
||||
|
||||
@@ -3,14 +3,23 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
|
||||
import { JwtModule } from '@nestjs/jwt';
|
||||
import { TypeOrmModule } from '@nestjs/typeorm';
|
||||
import { EvenementsAgenda } from 'src/entities/evenements_agenda.entity';
|
||||
import { AgendaLots } from 'src/entities/agenda_lots.entity';
|
||||
import { CardInstance } from 'src/entities/card_instances.entity';
|
||||
import { AmChildren } from 'src/entities/am_children.entity';
|
||||
import { ParentsChildren } from 'src/entities/parents_children.entity';
|
||||
import { EvenementsAgendaController } from './evenements-agenda.controller';
|
||||
import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
import { AgendaExpirationCron } from './agenda-expiration.cron';
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
TypeOrmModule.forFeature([EvenementsAgenda, AmChildren, ParentsChildren]),
|
||||
TypeOrmModule.forFeature([
|
||||
EvenementsAgenda,
|
||||
AgendaLots,
|
||||
CardInstance,
|
||||
AmChildren,
|
||||
ParentsChildren,
|
||||
]),
|
||||
JwtModule.registerAsync({
|
||||
imports: [ConfigModule],
|
||||
useFactory: (config: ConfigService) => ({
|
||||
@@ -21,7 +30,7 @@ import { EvenementsAgendaService } from './evenements-agenda.service';
|
||||
}),
|
||||
],
|
||||
controllers: [EvenementsAgendaController],
|
||||
providers: [EvenementsAgendaService],
|
||||
providers: [EvenementsAgendaService, AgendaExpirationCron],
|
||||
exports: [EvenementsAgendaService],
|
||||
})
|
||||
export class EvenementsAgendaModule {}
|
||||
|
||||
@@ -7,9 +7,22 @@ import {
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import { AgendaLots } from 'src/entities/agenda_lots.entity';
|
||||
import { CardInstance } from 'src/entities/card_instances.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 { todayParis, yesterdayParis } from 'src/common/utils/paris-date';
|
||||
|
||||
function qbUpdateMock() {
|
||||
const chain: Record<string, jest.Mock> = {};
|
||||
chain.update = jest.fn().mockReturnValue(chain);
|
||||
chain.set = jest.fn().mockReturnValue(chain);
|
||||
chain.where = jest.fn().mockReturnValue(chain);
|
||||
chain.andWhere = jest.fn().mockReturnValue(chain);
|
||||
chain.execute = jest.fn().mockResolvedValue({ affected: 1 });
|
||||
return chain;
|
||||
}
|
||||
|
||||
describe('EvenementsAgendaService (#172)', () => {
|
||||
let service: EvenementsAgendaService;
|
||||
@@ -22,9 +35,19 @@ describe('EvenementsAgendaService (#172)', () => {
|
||||
modifie_le: new Date(),
|
||||
})),
|
||||
findOne: jest.fn(),
|
||||
find: jest.fn(),
|
||||
update: jest.fn(async () => ({ affected: 1 })),
|
||||
delete: jest.fn(),
|
||||
createQueryBuilder: jest.fn(),
|
||||
};
|
||||
const lotsRepo = {
|
||||
findOne: jest.fn(),
|
||||
update: jest.fn(async () => ({ affected: 1 })),
|
||||
createQueryBuilder: jest.fn(() => qbUpdateMock()),
|
||||
};
|
||||
const cardsRepo = {
|
||||
createQueryBuilder: jest.fn(() => qbUpdateMock()),
|
||||
};
|
||||
const amChildrenRepo = {
|
||||
find: jest.fn(),
|
||||
findOne: jest.fn(),
|
||||
@@ -39,6 +62,8 @@ describe('EvenementsAgendaService (#172)', () => {
|
||||
providers: [
|
||||
EvenementsAgendaService,
|
||||
{ provide: getRepositoryToken(EvenementsAgenda), useValue: absencesRepo },
|
||||
{ provide: getRepositoryToken(AgendaLots), useValue: lotsRepo },
|
||||
{ provide: getRepositoryToken(CardInstance), useValue: cardsRepo },
|
||||
{ provide: getRepositoryToken(AmChildren), useValue: amChildrenRepo },
|
||||
{
|
||||
provide: getRepositoryToken(ParentsChildren),
|
||||
@@ -48,6 +73,8 @@ describe('EvenementsAgendaService (#172)', () => {
|
||||
}).compile();
|
||||
service = module.get(EvenementsAgendaService);
|
||||
jest.clearAllMocks();
|
||||
lotsRepo.createQueryBuilder.mockImplementation(() => qbUpdateMock());
|
||||
cardsRepo.createQueryBuilder.mockImplementation(() => qbUpdateMock());
|
||||
});
|
||||
|
||||
it('should be defined', () => {
|
||||
@@ -165,4 +192,477 @@ 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);
|
||||
});
|
||||
|
||||
describe('B2 — #216 matrice + soft-cancel + cron', () => {
|
||||
it('arrêt maladie créé → statut accepte + verrouille_le', async () => {
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.ARRET_MALADIE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
verrouille_le: new Date(),
|
||||
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' } },
|
||||
},
|
||||
});
|
||||
|
||||
await service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.ARRET_MALADIE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
});
|
||||
|
||||
const saved = absencesRepo.save.mock.calls[0][0];
|
||||
expect(saved.statut).toBe(StatutEvenementAgendaType.ACCEPTE);
|
||||
expect(saved.verrouille_le).toBeInstanceOf(Date);
|
||||
});
|
||||
|
||||
it('parent maj statut arrêt → 400 (ack n’écrit pas sur l’événement)', async () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.ARRET_MALADIE_AM,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-05',
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_le: new Date(),
|
||||
verrouille_le: new Date(),
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.maj('p-1', RoleType.PARENT, 'abs-1', {
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
|
||||
it('soin hors [hier, auj.] → BadRequest', async () => {
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
await expect(
|
||||
service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
date_debut: '2020-01-01',
|
||||
date_fin: '2020-01-01',
|
||||
}),
|
||||
).rejects.toBeInstanceOf(BadRequestException);
|
||||
});
|
||||
|
||||
it('soin daté aujourd’hui (Paris) → OK', async () => {
|
||||
const auj = todayParis();
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
date_debut: auj,
|
||||
date_fin: auj,
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
placement: {
|
||||
enfantId: 'e-1',
|
||||
amId: 'am-1',
|
||||
child: { id: 'e-1', first_name: 'Léo' },
|
||||
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||
},
|
||||
});
|
||||
await expect(
|
||||
service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
date_debut: auj,
|
||||
date_fin: auj,
|
||||
}),
|
||||
).resolves.toBeDefined();
|
||||
// hier aussi OK
|
||||
const hier = yesterdayParis();
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-2',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
date_debut: hier,
|
||||
date_fin: hier,
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: new Date('9999-12-31'),
|
||||
cree_le: new Date(),
|
||||
modifie_le: new Date(),
|
||||
placement: {
|
||||
enfantId: 'e-1',
|
||||
amId: 'am-1',
|
||||
child: { id: 'e-1', first_name: 'Léo' },
|
||||
am: { user: { prenom: 'Marie', nom: 'AM' } },
|
||||
},
|
||||
});
|
||||
await expect(
|
||||
service.creer('am-1', RoleType.ASSISTANTE_MATERNELLE, {
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.SOIN_ENFANT,
|
||||
date_debut: hier,
|
||||
date_fin: hier,
|
||||
}),
|
||||
).resolves.toBeDefined();
|
||||
});
|
||||
|
||||
it('supprimer → soft-cancel (update ANNULE), pas delete physique', async () => {
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'abs-1',
|
||||
id_placement: 'pl-1',
|
||||
type: TypeEvenementAgendaType.ABSENCE_ENFANT,
|
||||
date_debut: '2026-10-01',
|
||||
date_fin: '2026-10-02',
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
cree_le: new Date(),
|
||||
verrouille_le: new Date(),
|
||||
cree_par: 'p-1',
|
||||
});
|
||||
amChildrenRepo.findOne.mockResolvedValue({
|
||||
id: 'pl-1',
|
||||
amId: 'am-1',
|
||||
enfantId: 'e-1',
|
||||
date_fin: null,
|
||||
});
|
||||
parentsChildrenRepo.findOne.mockResolvedValue({
|
||||
parentId: 'p-1',
|
||||
enfantId: 'e-1',
|
||||
});
|
||||
|
||||
await service.supprimer('p-1', RoleType.PARENT, 'abs-1');
|
||||
expect(absencesRepo.delete).not.toHaveBeenCalled();
|
||||
expect(absencesRepo.update).toHaveBeenCalledWith(
|
||||
{ id: 'abs-1' },
|
||||
expect.objectContaining({
|
||||
statut: StatutEvenementAgendaType.ANNULE,
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('cron auto-valid + soft-cancel refusés ; double appel idempotent', async () => {
|
||||
const old = new Date(Date.now() - 8 * 24 * 60 * 60 * 1000);
|
||||
absencesRepo.find.mockResolvedValue([
|
||||
{
|
||||
id: 'c1',
|
||||
type: TypeEvenementAgendaType.CONGE_AM,
|
||||
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
verrouille_le: old,
|
||||
},
|
||||
]);
|
||||
const legacyQb = {
|
||||
where: jest.fn().mockReturnThis(),
|
||||
andWhere: jest.fn().mockReturnThis(),
|
||||
getMany: jest.fn().mockResolvedValue([]),
|
||||
};
|
||||
const refuseQb = {
|
||||
where: jest.fn().mockReturnThis(),
|
||||
andWhere: jest.fn().mockReturnThis(),
|
||||
getMany: jest.fn().mockResolvedValue([
|
||||
{
|
||||
id: 'r1',
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
refuse_le: old,
|
||||
},
|
||||
]),
|
||||
};
|
||||
absencesRepo.createQueryBuilder
|
||||
.mockReturnValueOnce(legacyQb) // autoValider legacy
|
||||
.mockReturnValueOnce(refuseQb); // softCancelRefuses
|
||||
absencesRepo.findOne.mockImplementation(async ({ where }) => {
|
||||
if (where?.id === 'r1') {
|
||||
return {
|
||||
id: 'r1',
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
refuse_le: old,
|
||||
};
|
||||
}
|
||||
return null;
|
||||
});
|
||||
|
||||
const n1 = await service.autoValiderCongesExpires();
|
||||
expect(n1).toBe(1);
|
||||
expect(absencesRepo.update).toHaveBeenCalledWith(
|
||||
{ id: 'c1', statut: StatutEvenementAgendaType.EN_ATTENTE },
|
||||
expect.objectContaining({
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
}),
|
||||
);
|
||||
|
||||
absencesRepo.find.mockResolvedValue([]); // déjà validés
|
||||
const emptyQb = {
|
||||
where: jest.fn().mockReturnThis(),
|
||||
andWhere: jest.fn().mockReturnThis(),
|
||||
getMany: jest.fn().mockResolvedValue([]),
|
||||
};
|
||||
absencesRepo.createQueryBuilder.mockReset();
|
||||
absencesRepo.createQueryBuilder.mockReturnValue(emptyQb);
|
||||
const n2 = await service.autoValiderCongesExpires();
|
||||
expect(n2).toBe(0);
|
||||
|
||||
// soft-cancel refusés
|
||||
absencesRepo.createQueryBuilder.mockReturnValue(refuseQb);
|
||||
refuseQb.getMany.mockResolvedValue([
|
||||
{ id: 'r1', statut: StatutEvenementAgendaType.REFUSE, refuse_le: old },
|
||||
]);
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'r1',
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
refuse_le: old,
|
||||
});
|
||||
const sc1 = await service.softCancelRefusesExpires();
|
||||
expect(sc1).toBe(1);
|
||||
// 2e passage : déjà ANNULE → 0
|
||||
absencesRepo.findOne.mockResolvedValue({
|
||||
id: 'r1',
|
||||
statut: StatutEvenementAgendaType.ANNULE,
|
||||
});
|
||||
refuseQb.getMany.mockResolvedValue([
|
||||
{ id: 'r1', statut: StatutEvenementAgendaType.ANNULE },
|
||||
]);
|
||||
const sc2 = await service.softCancelRefusesExpires();
|
||||
expect(sc2).toBe(0);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -2,35 +2,58 @@ import {
|
||||
BadRequestException,
|
||||
ForbiddenException,
|
||||
Injectable,
|
||||
Logger,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { In, IsNull, Repository } from 'typeorm';
|
||||
import { In, IsNull, LessThanOrEqual, Repository } from 'typeorm';
|
||||
import {
|
||||
EvenementsAgenda,
|
||||
StatutEvenementAgendaType,
|
||||
TypeEvenementAgendaType,
|
||||
} from 'src/entities/evenements_agenda.entity';
|
||||
import {
|
||||
AgendaLots,
|
||||
AgendaLotStatutType,
|
||||
} from 'src/entities/agenda_lots.entity';
|
||||
import {
|
||||
CardInstance,
|
||||
CardInstanceStatutType,
|
||||
} from 'src/entities/card_instances.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,
|
||||
} from './dto/evenements-agenda.dto';
|
||||
import {
|
||||
MS_24H,
|
||||
MS_7X24H,
|
||||
todayParis,
|
||||
yesterdayParis,
|
||||
} from 'src/common/utils/paris-date';
|
||||
|
||||
const TTL_EN_ATTENTE_MS = 15 * 24 * 60 * 60 * 1000;
|
||||
const TTL_REFUSE_MS = 7 * 24 * 60 * 60 * 1000;
|
||||
/** Auto-valid / soft-cancel refusés = 7×24 h (mini-spec §5). */
|
||||
const TTL_EN_ATTENTE_MS = MS_7X24H;
|
||||
const TTL_REFUSE_MS = MS_7X24H;
|
||||
/** Sentinel « pas de purge » pour les périodes acceptées */
|
||||
const EXPIRE_ACCEPTE = new Date('9999-12-31T23:59:59.999Z');
|
||||
|
||||
@Injectable()
|
||||
export class EvenementsAgendaService {
|
||||
private readonly logger = new Logger(EvenementsAgendaService.name);
|
||||
|
||||
constructor(
|
||||
@InjectRepository(EvenementsAgenda)
|
||||
private readonly absencesRepo: Repository<EvenementsAgenda>,
|
||||
@InjectRepository(AgendaLots)
|
||||
private readonly lotsRepo: Repository<AgendaLots>,
|
||||
@InjectRepository(CardInstance)
|
||||
private readonly cardsRepo: Repository<CardInstance>,
|
||||
@InjectRepository(AmChildren)
|
||||
private readonly amChildrenRepo: Repository<AmChildren>,
|
||||
@InjectRepository(ParentsChildren)
|
||||
@@ -48,10 +71,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 +90,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 +114,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(
|
||||
@@ -89,17 +134,23 @@ export class EvenementsAgendaService {
|
||||
dto: CreerEvenementAgendaDto,
|
||||
): Promise<EvenementAgendaDto> {
|
||||
this.assertDates(dto.date_debut, dto.date_fin);
|
||||
this.assertCalendarDate(dto.date_debut, 'date_debut');
|
||||
this.assertCalendarDate(dto.date_fin, 'date_fin');
|
||||
await this.assertCanAccessPlacement(userId, role, dto.id_placement);
|
||||
this.assertCanCreateType(role, dto.type);
|
||||
this.assertTemporalCreate(dto.type, dto.date_debut, dto.date_fin);
|
||||
|
||||
const statut = this.statutInitial(dto.type);
|
||||
const now = new Date();
|
||||
const entity = this.absencesRepo.create({
|
||||
id_placement: dto.id_placement,
|
||||
type: dto.type,
|
||||
date_debut: dto.date_debut,
|
||||
date_fin: dto.date_fin,
|
||||
statut,
|
||||
expire_at: this.expireAtFor(statut),
|
||||
expire_at: this.expireAtFor(statut, now),
|
||||
// verrouille_le à la soumission seulement — jamais en GET (#216)
|
||||
verrouille_le: now,
|
||||
cree_par: userId,
|
||||
motif: dto.motif?.trim() || undefined,
|
||||
});
|
||||
@@ -117,38 +168,76 @@ export class EvenementsAgendaService {
|
||||
if (!row) {
|
||||
throw new NotFoundException('Absence introuvable');
|
||||
}
|
||||
if (row.statut === StatutEvenementAgendaType.ANNULE) {
|
||||
throw new BadRequestException('Événement annulé');
|
||||
}
|
||||
await this.assertCanAccessPlacement(userId, role, row.id_placement);
|
||||
|
||||
const datesChange =
|
||||
(dto.date_debut !== undefined && dto.date_debut !== row.date_debut) ||
|
||||
(dto.date_fin !== undefined && dto.date_fin !== row.date_fin);
|
||||
|
||||
if (dto.date_debut !== undefined || dto.date_fin !== undefined) {
|
||||
const debut = dto.date_debut ?? row.date_debut;
|
||||
const fin = dto.date_fin ?? row.date_fin;
|
||||
this.assertDates(debut, fin);
|
||||
// Parent : peut modifier ses absences enfant
|
||||
// AM : peut modifier congé/arrêt en_attente (avant accept) ou dates si créateur
|
||||
this.assertCalendarDate(debut, 'date_debut');
|
||||
this.assertCalendarDate(fin, 'date_fin');
|
||||
this.assertCanEditDates(role, row);
|
||||
this.assertTemporalEdit(row);
|
||||
row.date_debut = debut;
|
||||
row.date_fin = fin;
|
||||
if (row.statut === StatutEvenementAgendaType.EN_ATTENTE) {
|
||||
row.expire_at = this.expireAtFor(StatutEvenementAgendaType.EN_ATTENTE);
|
||||
|
||||
// Toute modif de dates d’un événement soumis à validation → nouvelle revision
|
||||
if (datesChange && this.needsRevalidationOnDateChange(row)) {
|
||||
await this.bumpRevisionForDateChange(row, userId);
|
||||
} else if (row.statut === StatutEvenementAgendaType.EN_ATTENTE) {
|
||||
row.expire_at = this.expireAtFor(
|
||||
StatutEvenementAgendaType.EN_ATTENTE,
|
||||
row.verrouille_le ?? row.cree_le,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (dto.statut !== undefined && dto.statut !== row.statut) {
|
||||
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
||||
if (dto.statut !== undefined) {
|
||||
// Ack arrêt = informatif carte seulement — toute maj statut parent sur arrêt → 400
|
||||
if (
|
||||
dto.statut === StatutEvenementAgendaType.REFUSE &&
|
||||
(!dto.motif || !dto.motif.trim())
|
||||
role === RoleType.PARENT &&
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'Une motivation est obligatoire en cas de refus',
|
||||
'L’accusé de réception d’un arrêt maladie n’écrit pas sur l’événement',
|
||||
);
|
||||
}
|
||||
row.statut = dto.statut;
|
||||
row.expire_at = this.expireAtFor(dto.statut);
|
||||
if (dto.motif?.trim()) {
|
||||
row.motif = dto.motif.trim();
|
||||
if (dto.statut !== row.statut) {
|
||||
this.assertCanChangeStatut(role, row, dto.statut, dto.motif);
|
||||
if (
|
||||
dto.statut === StatutEvenementAgendaType.REFUSE &&
|
||||
(!dto.motif || !dto.motif.trim())
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'Une motivation est obligatoire en cas de refus',
|
||||
);
|
||||
}
|
||||
const now = new Date();
|
||||
row.statut = dto.statut;
|
||||
row.expire_at = this.expireAtFor(dto.statut, now);
|
||||
if (dto.statut === StatutEvenementAgendaType.REFUSE) {
|
||||
row.refuse_le = now;
|
||||
}
|
||||
if (
|
||||
dto.statut === StatutEvenementAgendaType.EN_ATTENTE &&
|
||||
datesChange
|
||||
) {
|
||||
// resoumission : nouveau verrou (pas un GET)
|
||||
row.verrouille_le = now;
|
||||
}
|
||||
if (dto.motif?.trim()) {
|
||||
row.motif = dto.motif.trim();
|
||||
}
|
||||
}
|
||||
} else if (dto.motif !== undefined) {
|
||||
// Motif seul ne relance pas l’unanimité
|
||||
row.motif = dto.motif.trim() || undefined;
|
||||
}
|
||||
|
||||
@@ -156,6 +245,10 @@ export class EvenementsAgendaService {
|
||||
return this.getByIdForUser(id, userId, role);
|
||||
}
|
||||
|
||||
/**
|
||||
* Soft-cancel applicatif — remplace tout DELETE physique événement (#216).
|
||||
* Idempotent si déjà annulé.
|
||||
*/
|
||||
async supprimer(
|
||||
userId: string,
|
||||
role: RoleType,
|
||||
@@ -176,7 +269,140 @@ export class EvenementsAgendaService {
|
||||
);
|
||||
}
|
||||
|
||||
await this.absencesRepo.delete({ id });
|
||||
this.assertCanSoftCancel(role, row);
|
||||
await this.softCancelEvent(row, userId);
|
||||
}
|
||||
|
||||
/** Soft-cancel sans re-check role (cron / carte liée). Idempotent. */
|
||||
async softCancelById(id: string, userId?: string | null): Promise<boolean> {
|
||||
const row = await this.absencesRepo.findOne({ where: { id } });
|
||||
if (!row) return false;
|
||||
return this.softCancelEvent(row, userId ?? null);
|
||||
}
|
||||
|
||||
private async softCancelEvent(
|
||||
row: EvenementsAgenda,
|
||||
userId: string | null,
|
||||
): Promise<boolean> {
|
||||
if (row.statut === StatutEvenementAgendaType.ANNULE) {
|
||||
return false;
|
||||
}
|
||||
const now = new Date();
|
||||
await this.absencesRepo.update(
|
||||
{ id: row.id },
|
||||
{
|
||||
statut: StatutEvenementAgendaType.ANNULE,
|
||||
annule_le: now,
|
||||
annule_par: userId ?? undefined,
|
||||
expire_at: now,
|
||||
},
|
||||
);
|
||||
// Cartes liées : soft-cancel (pas de DELETE physique)
|
||||
await this.cardsRepo
|
||||
.createQueryBuilder()
|
||||
.update(CardInstance)
|
||||
.set({
|
||||
statut: CardInstanceStatutType.ANNULEE,
|
||||
annule_le: now,
|
||||
annule_par: userId ?? undefined,
|
||||
purge_at: now,
|
||||
})
|
||||
.where('id_evenement = :eid', { eid: row.id })
|
||||
.andWhere('statut != :annulee', {
|
||||
annulee: CardInstanceStatutType.ANNULEE,
|
||||
})
|
||||
.execute();
|
||||
if (row.id_lot) {
|
||||
await this.lotsRepo
|
||||
.createQueryBuilder()
|
||||
.update(AgendaLots)
|
||||
.set({
|
||||
statut: AgendaLotStatutType.ANNULE,
|
||||
annule_le: now,
|
||||
annule_par: userId ?? undefined,
|
||||
})
|
||||
.where('id = :id', { id: row.id_lot })
|
||||
.andWhere('statut != :annule', { annule: AgendaLotStatutType.ANNULE })
|
||||
.execute();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cron : auto-valide les congés encore en_attente après 7×24 h depuis verrouille_le.
|
||||
* Idempotent. Retourne le nombre mis à jour.
|
||||
*/
|
||||
async autoValiderCongesExpires(now = new Date()): Promise<number> {
|
||||
const threshold = new Date(now.getTime() - TTL_EN_ATTENTE_MS);
|
||||
const rows = await this.absencesRepo.find({
|
||||
where: {
|
||||
type: TypeEvenementAgendaType.CONGE_AM,
|
||||
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
verrouille_le: LessThanOrEqual(threshold),
|
||||
},
|
||||
});
|
||||
// Fallback cree_le si verrouille_le null (données pré-B2)
|
||||
const legacy = await this.absencesRepo
|
||||
.createQueryBuilder('ag')
|
||||
.where('ag.type = :type', { type: TypeEvenementAgendaType.CONGE_AM })
|
||||
.andWhere('ag.statut = :statut', {
|
||||
statut: StatutEvenementAgendaType.EN_ATTENTE,
|
||||
})
|
||||
.andWhere('ag.verrouille_le IS NULL')
|
||||
.andWhere('ag.cree_le <= :threshold', { threshold })
|
||||
.getMany();
|
||||
|
||||
const byId = new Map<string, EvenementsAgenda>();
|
||||
for (const r of [...rows, ...legacy]) byId.set(r.id, r);
|
||||
|
||||
let n = 0;
|
||||
for (const row of byId.values()) {
|
||||
await this.absencesRepo.update(
|
||||
{ id: row.id, statut: StatutEvenementAgendaType.EN_ATTENTE },
|
||||
{
|
||||
statut: StatutEvenementAgendaType.ACCEPTE,
|
||||
expire_at: EXPIRE_ACCEPTE,
|
||||
},
|
||||
);
|
||||
if (row.id_lot) {
|
||||
await this.lotsRepo.update(
|
||||
{ id: row.id_lot, statut: AgendaLotStatutType.EN_ATTENTE },
|
||||
{ statut: AgendaLotStatutType.ACCEPTE },
|
||||
);
|
||||
}
|
||||
n += 1;
|
||||
}
|
||||
if (n > 0) {
|
||||
this.logger.log(`Cron auto-valid congés : ${n} événement(s)`);
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
/**
|
||||
* Cron : soft-cancel des refusés après 7×24 h (refuse_le / expire_at).
|
||||
* Idempotent.
|
||||
*/
|
||||
async softCancelRefusesExpires(now = new Date()): Promise<number> {
|
||||
const threshold = new Date(now.getTime() - TTL_REFUSE_MS);
|
||||
const rows = await this.absencesRepo
|
||||
.createQueryBuilder('ag')
|
||||
.where('ag.statut = :statut', {
|
||||
statut: StatutEvenementAgendaType.REFUSE,
|
||||
})
|
||||
.andWhere(
|
||||
'(ag.refuse_le IS NOT NULL AND ag.refuse_le <= :threshold) OR (ag.refuse_le IS NULL AND ag.expire_at <= :now)',
|
||||
{ threshold, now },
|
||||
)
|
||||
.getMany();
|
||||
|
||||
let n = 0;
|
||||
for (const row of rows) {
|
||||
if (await this.softCancelEvent(row, null)) n += 1;
|
||||
}
|
||||
if (n > 0) {
|
||||
this.logger.log(`Cron soft-cancel refusés : ${n} événement(s)`);
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
private async getByIdForUser(
|
||||
@@ -186,31 +412,171 @@ 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 {
|
||||
if (type === TypeEvenementAgendaType.ABSENCE_ENFANT || type === TypeEvenementAgendaType.SOIN_ENFANT) {
|
||||
// Arrêt maladie : accepté dès soumission (ack parent informatif seulement) — #216
|
||||
if (
|
||||
type === TypeEvenementAgendaType.ABSENCE_ENFANT ||
|
||||
type === TypeEvenementAgendaType.SOIN_ENFANT ||
|
||||
type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
) {
|
||||
return StatutEvenementAgendaType.ACCEPTE;
|
||||
}
|
||||
return StatutEvenementAgendaType.EN_ATTENTE;
|
||||
}
|
||||
|
||||
private expireAtFor(statut: StatutEvenementAgendaType): Date {
|
||||
const now = Date.now();
|
||||
if (statut === StatutEvenementAgendaType.ACCEPTE) {
|
||||
return EXPIRE_ACCEPTE;
|
||||
private expireAtFor(
|
||||
statut: StatutEvenementAgendaType,
|
||||
from: Date = new Date(),
|
||||
): Date {
|
||||
const t = from.getTime();
|
||||
if (
|
||||
statut === StatutEvenementAgendaType.ACCEPTE ||
|
||||
statut === StatutEvenementAgendaType.ANNULE
|
||||
) {
|
||||
return statut === StatutEvenementAgendaType.ANNULE
|
||||
? from
|
||||
: EXPIRE_ACCEPTE;
|
||||
}
|
||||
if (statut === StatutEvenementAgendaType.REFUSE) {
|
||||
return new Date(now + TTL_REFUSE_MS);
|
||||
return new Date(t + TTL_REFUSE_MS);
|
||||
}
|
||||
return new Date(t + TTL_EN_ATTENTE_MS);
|
||||
}
|
||||
|
||||
/** Soin : date ∈ [hier, aujourd’hui] Paris. Autres : passé OK. */
|
||||
private assertTemporalCreate(
|
||||
type: TypeEvenementAgendaType,
|
||||
debut: string,
|
||||
fin: string,
|
||||
): void {
|
||||
if (type !== TypeEvenementAgendaType.SOIN_ENFANT) return;
|
||||
const hier = yesterdayParis();
|
||||
const auj = todayParis();
|
||||
if (debut < hier || debut > auj || fin < hier || fin > auj) {
|
||||
throw new BadRequestException(
|
||||
'Un soin enfant doit être daté entre hier et aujourd’hui',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Fenêtres d’édition (#216) :
|
||||
* - soin : ≤ 24 h depuis cree_le
|
||||
* - congé futur accepté : libre tant que date_debut non commencé
|
||||
* - sinon congé/arrêt/absence : ≤ 7×24 h depuis verrouille_le (soumission)
|
||||
*/
|
||||
private assertTemporalEdit(row: EvenementsAgenda): void {
|
||||
const now = Date.now();
|
||||
if (row.type === TypeEvenementAgendaType.SOIN_ENFANT) {
|
||||
const since = now - new Date(row.cree_le).getTime();
|
||||
if (since > MS_24H) {
|
||||
throw new BadRequestException(
|
||||
'Délai de correction de 24 h dépassé pour ce soin',
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const today = todayParis();
|
||||
if (
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
row.statut === StatutEvenementAgendaType.ACCEPTE &&
|
||||
row.date_debut > today
|
||||
) {
|
||||
return; // futur validé : modifiable/annulable
|
||||
}
|
||||
|
||||
const anchor = row.verrouille_le ?? row.cree_le;
|
||||
const since = now - new Date(anchor).getTime();
|
||||
if (since > MS_7X24H) {
|
||||
throw new BadRequestException(
|
||||
'Délai d’édition de 7×24 h dépassé pour cet événement',
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private assertCanSoftCancel(role: RoleType, row: EvenementsAgenda): void {
|
||||
if (row.statut === StatutEvenementAgendaType.ANNULE) return;
|
||||
if (row.type === TypeEvenementAgendaType.SOIN_ENFANT) {
|
||||
const since = Date.now() - new Date(row.cree_le).getTime();
|
||||
if (since > MS_24H) {
|
||||
throw new BadRequestException(
|
||||
'Délai de suppression de 24 h dépassé pour ce soin',
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
const today = todayParis();
|
||||
if (
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
row.statut === StatutEvenementAgendaType.ACCEPTE &&
|
||||
row.date_debut > today
|
||||
) {
|
||||
return; // congé futur validé annulable
|
||||
}
|
||||
if (
|
||||
row.statut === StatutEvenementAgendaType.EN_ATTENTE ||
|
||||
row.statut === StatutEvenementAgendaType.REFUSE
|
||||
) {
|
||||
return;
|
||||
}
|
||||
// Absence / arrêt acceptés : fenêtre 7×24 h
|
||||
const anchor = row.verrouille_le ?? row.cree_le;
|
||||
if (Date.now() - new Date(anchor).getTime() <= MS_7X24H) {
|
||||
return;
|
||||
}
|
||||
throw new BadRequestException('Cet événement ne peut plus être annulé');
|
||||
}
|
||||
|
||||
private needsRevalidationOnDateChange(row: EvenementsAgenda): boolean {
|
||||
return (
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
row.statut !== StatutEvenementAgendaType.ANNULE
|
||||
);
|
||||
}
|
||||
|
||||
/** Nouvelle revision + repasse en_attente + nouveau verrouille_le. */
|
||||
private async bumpRevisionForDateChange(
|
||||
row: EvenementsAgenda,
|
||||
_userId: string,
|
||||
): Promise<void> {
|
||||
const now = new Date();
|
||||
row.statut = StatutEvenementAgendaType.EN_ATTENTE;
|
||||
row.verrouille_le = now;
|
||||
row.expire_at = this.expireAtFor(StatutEvenementAgendaType.EN_ATTENTE, now);
|
||||
row.refuse_le = undefined;
|
||||
if (row.id_lot) {
|
||||
await this.lotsRepo
|
||||
.createQueryBuilder()
|
||||
.update(AgendaLots)
|
||||
.set({
|
||||
revision: () => 'revision + 1',
|
||||
statut: AgendaLotStatutType.EN_ATTENTE,
|
||||
verrouille_le: now,
|
||||
soumis_le: now,
|
||||
refuse_le: () => 'NULL',
|
||||
})
|
||||
.where('id = :id', { id: row.id_lot })
|
||||
.execute();
|
||||
}
|
||||
return new Date(now + TTL_EN_ATTENTE_MS);
|
||||
}
|
||||
|
||||
private assertDates(debut: string, fin: string): void {
|
||||
@@ -221,6 +587,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) {
|
||||
@@ -258,6 +651,9 @@ export class EvenementsAgendaService {
|
||||
return;
|
||||
}
|
||||
if (role === RoleType.ASSISTANTE_MATERNELLE) {
|
||||
if (row.type === TypeEvenementAgendaType.SOIN_ENFANT) {
|
||||
return; // fenêtre 24 h gérée par assertTemporalEdit
|
||||
}
|
||||
if (
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM ||
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
@@ -269,7 +665,6 @@ export class EvenementsAgendaService {
|
||||
) {
|
||||
throw new ForbiddenException('Statut incompatible avec une modification');
|
||||
}
|
||||
// Accepté : autorisé (S2b — re-validation via cartes plus tard ; API permet update dates)
|
||||
return;
|
||||
}
|
||||
throw new ForbiddenException('Type non modifiable par l’AM');
|
||||
@@ -284,25 +679,20 @@ export class EvenementsAgendaService {
|
||||
_motif?: string,
|
||||
): void {
|
||||
if (role === RoleType.PARENT) {
|
||||
// Accept / refuse congé ; ack arrêt (accepte)
|
||||
if (
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM ||
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM
|
||||
) {
|
||||
// Arrêt : déjà accepté à la soumission — ack carte n’écrit plus ici (#216)
|
||||
if (row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM) {
|
||||
throw new BadRequestException(
|
||||
'L’accusé de réception d’un arrêt maladie n’écrit pas sur l’événement',
|
||||
);
|
||||
}
|
||||
// Accept / refuse congé uniquement
|
||||
if (row.type === TypeEvenementAgendaType.CONGE_AM) {
|
||||
if (
|
||||
next !== StatutEvenementAgendaType.ACCEPTE &&
|
||||
next !== StatutEvenementAgendaType.REFUSE
|
||||
) {
|
||||
throw new BadRequestException('Transition de statut invalide');
|
||||
}
|
||||
if (
|
||||
row.type === TypeEvenementAgendaType.ARRET_MALADIE_AM &&
|
||||
next === StatutEvenementAgendaType.REFUSE
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'Un arrêt maladie ne se refuse pas (accusé seulement)',
|
||||
);
|
||||
}
|
||||
if (row.statut !== StatutEvenementAgendaType.EN_ATTENTE) {
|
||||
throw new BadRequestException('Cette demande n’est plus en attente');
|
||||
}
|
||||
@@ -332,9 +722,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 +739,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 +749,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 +764,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 +801,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) {
|
||||
// ANNULE déjà exclu en tête de actionsPour (narrowing TS)
|
||||
const congeEnAttente =
|
||||
row.type === TypeEvenementAgendaType.CONGE_AM &&
|
||||
row.statut === StatutEvenementAgendaType.EN_ATTENTE &&
|
||||
statutLot !== AgendaLotStatutType.REFUSE;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-1
@@ -14,10 +14,12 @@ services:
|
||||
networks:
|
||||
- ptitspas_network
|
||||
|
||||
# Interface d'administration DB
|
||||
# Interface d'administration DB (optionnel — pas démarré par défaut)
|
||||
# Relancer : docker compose --profile tools up -d pgadmin
|
||||
pgadmin:
|
||||
image: dpage/pgadmin4
|
||||
container_name: ptitspas-pgadmin
|
||||
profiles: ["tools"]
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
|
||||
|
||||
Reference in New Issue
Block a user