feat(gestion): suppression en cascade exercice/programme/séance-modèle (ticket #37)
Ajoute la suppression avec gestion des dépendances en cascade sur les écrans bibliothèque d'exercices, programme et séance-modèle, avec les use cases et le bootstrap applicatif associés. flutter analyze propre, 58/58 tests verts, build APK debug validé. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@ -58,6 +58,7 @@ final class AppBootstrap implements AppDependencies {
|
||||
database: database,
|
||||
exerciseUseCases: ExerciseUseCases(
|
||||
repository: exerciseRepository,
|
||||
programRepository: programRepository,
|
||||
clock: clock,
|
||||
ids: ids,
|
||||
originDeviceId: originDeviceId,
|
||||
@ -73,6 +74,7 @@ final class AppBootstrap implements AppDependencies {
|
||||
programUseCases: ProgramUseCases(
|
||||
programRepository: programRepository,
|
||||
exerciseRepository: exerciseRepository,
|
||||
templateRepository: templateRepository,
|
||||
clock: clock,
|
||||
ids: ids,
|
||||
originDeviceId: originDeviceId,
|
||||
|
||||
@ -8,12 +8,14 @@ const Object _useCaseUnchanged = Object();
|
||||
final class ExerciseUseCases {
|
||||
const ExerciseUseCases({
|
||||
required this.repository,
|
||||
required this.programRepository,
|
||||
required this.clock,
|
||||
required this.ids,
|
||||
required this.originDeviceId,
|
||||
});
|
||||
|
||||
final ExerciseRepository repository;
|
||||
final ProgramRepository programRepository;
|
||||
final Clock clock;
|
||||
final IdGenerator ids;
|
||||
final String originDeviceId;
|
||||
@ -181,6 +183,35 @@ final class ExerciseUseCases {
|
||||
await repository.save(archived);
|
||||
return archived;
|
||||
}
|
||||
|
||||
Future<Exercise> delete(String id) async {
|
||||
final exercise = await repository.findById(id);
|
||||
if (exercise == null) {
|
||||
throw const DomainException('Exercise not found.');
|
||||
}
|
||||
final now = clock.now();
|
||||
final deleted = exercise.copyWith(
|
||||
metadata: exercise.metadata.markDeleted(now),
|
||||
);
|
||||
final programs = await programRepository.listActive();
|
||||
for (final program in programs) {
|
||||
final keptExercises = program.exercises
|
||||
.where((programExercise) => programExercise.sourceExerciseId != id)
|
||||
.toList();
|
||||
if (keptExercises.length == program.exercises.length) {
|
||||
continue;
|
||||
}
|
||||
await programRepository.replaceExercises(
|
||||
program.copyWith(
|
||||
metadata: program.metadata.touch(now),
|
||||
exercises: _repositionProgramExercises(keptExercises, now),
|
||||
),
|
||||
now,
|
||||
);
|
||||
}
|
||||
await repository.save(deleted);
|
||||
return deleted;
|
||||
}
|
||||
}
|
||||
|
||||
final class MediaUseCases {
|
||||
@ -272,6 +303,7 @@ final class ProgramUseCases {
|
||||
const ProgramUseCases({
|
||||
required this.programRepository,
|
||||
required this.exerciseRepository,
|
||||
required this.templateRepository,
|
||||
required this.clock,
|
||||
required this.ids,
|
||||
required this.originDeviceId,
|
||||
@ -279,6 +311,7 @@ final class ProgramUseCases {
|
||||
|
||||
final ProgramRepository programRepository;
|
||||
final ExerciseRepository exerciseRepository;
|
||||
final WorkoutTemplateRepository templateRepository;
|
||||
final Clock clock;
|
||||
final IdGenerator ids;
|
||||
final String originDeviceId;
|
||||
@ -287,6 +320,14 @@ final class ProgramUseCases {
|
||||
|
||||
Future<List<Program>> listActive() => programRepository.listActive();
|
||||
|
||||
Future<bool> isUsedInWorkoutTemplates(String id) async {
|
||||
final templates = await templateRepository.listActive();
|
||||
return templates.any(
|
||||
(template) =>
|
||||
template.programs.any((program) => program.sourceProgramId == id),
|
||||
);
|
||||
}
|
||||
|
||||
Future<Program> create({
|
||||
required String name,
|
||||
required int defaultRestSeconds,
|
||||
@ -399,6 +440,50 @@ final class ProgramUseCases {
|
||||
await programRepository.saveExercise(programExercise);
|
||||
return programExercise;
|
||||
}
|
||||
|
||||
Future<Program> delete(String id) async {
|
||||
final program = await programRepository.findById(id);
|
||||
if (program == null) {
|
||||
throw const DomainException('Program not found.');
|
||||
}
|
||||
final now = clock.now();
|
||||
final deleted = program.copyWith(
|
||||
metadata: program.metadata.markDeleted(now),
|
||||
);
|
||||
final templates = await templateRepository.listActive();
|
||||
for (final template in templates) {
|
||||
final keptPrograms = template.programs
|
||||
.where((templateProgram) => templateProgram.sourceProgramId != id)
|
||||
.toList();
|
||||
if (keptPrograms.length == template.programs.length) {
|
||||
continue;
|
||||
}
|
||||
final repositionedPrograms = _repositionWorkoutTemplatePrograms(
|
||||
keptPrograms,
|
||||
now,
|
||||
);
|
||||
final keptProgramIds = repositionedPrograms
|
||||
.map((templateProgram) => templateProgram.metadata.id)
|
||||
.toSet();
|
||||
await templateRepository.replaceComposition(
|
||||
WorkoutTemplate(
|
||||
metadata: template.metadata.touch(now),
|
||||
name: template.name,
|
||||
lastStartedAt: template.lastStartedAt,
|
||||
programs: repositionedPrograms,
|
||||
overrides: template.overrides
|
||||
.where(
|
||||
(override) =>
|
||||
keptProgramIds.contains(override.workoutTemplateProgramId),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
now,
|
||||
);
|
||||
}
|
||||
await programRepository.save(deleted);
|
||||
return deleted;
|
||||
}
|
||||
}
|
||||
|
||||
final class ProgramExerciseConfig {
|
||||
@ -608,6 +693,21 @@ final class WorkoutTemplateUseCases {
|
||||
await templateRepository.saveOverride(override);
|
||||
return override;
|
||||
}
|
||||
|
||||
Future<WorkoutTemplate> delete(String id) async {
|
||||
final template = await templateRepository.findById(id);
|
||||
if (template == null) {
|
||||
throw const DomainException('Workout template not found.');
|
||||
}
|
||||
final now = clock.now();
|
||||
final deleted = WorkoutTemplate(
|
||||
metadata: template.metadata.markDeleted(now),
|
||||
name: template.name,
|
||||
lastStartedAt: template.lastStartedAt,
|
||||
);
|
||||
await templateRepository.save(deleted);
|
||||
return deleted;
|
||||
}
|
||||
}
|
||||
|
||||
final class WorkoutTemplateProgramConfig {
|
||||
@ -1323,6 +1423,62 @@ final class SetResultPositionState {
|
||||
final ActiveSetResult? result;
|
||||
}
|
||||
|
||||
List<ProgramExercise> _repositionProgramExercises(
|
||||
List<ProgramExercise> exercises,
|
||||
DateTime now,
|
||||
) {
|
||||
return [
|
||||
for (var index = 0; index < exercises.length; index++)
|
||||
ProgramExercise(
|
||||
metadata: exercises[index].metadata.touch(now),
|
||||
programId: exercises[index].programId,
|
||||
sourceExerciseId: exercises[index].sourceExerciseId,
|
||||
position: index,
|
||||
exerciseNameSnapshot: exercises[index].exerciseNameSnapshot,
|
||||
exerciseDescriptionSnapshot:
|
||||
exercises[index].exerciseDescriptionSnapshot,
|
||||
exerciseImageMediaIdSnapshot:
|
||||
exercises[index].exerciseImageMediaIdSnapshot,
|
||||
exerciseVideoMediaIdSnapshot:
|
||||
exercises[index].exerciseVideoMediaIdSnapshot,
|
||||
exerciseArchivedSnapshot: exercises[index].exerciseArchivedSnapshot,
|
||||
availableTimeSnapshot: exercises[index].availableTimeSnapshot,
|
||||
availableRepsSnapshot: exercises[index].availableRepsSnapshot,
|
||||
availableScoreSnapshot: exercises[index].availableScoreSnapshot,
|
||||
scoreInputModeSnapshot: exercises[index].scoreInputModeSnapshot,
|
||||
scoreLabelSnapshot: exercises[index].scoreLabelSnapshot,
|
||||
scoreUnitSnapshot: exercises[index].scoreUnitSnapshot,
|
||||
setsCount: exercises[index].setsCount,
|
||||
timeEnabled: exercises[index].timeEnabled,
|
||||
repsEnabled: exercises[index].repsEnabled,
|
||||
scoreEnabled: exercises[index].scoreEnabled,
|
||||
targetTimeSeconds: exercises[index].targetTimeSeconds,
|
||||
targetReps: exercises[index].targetReps,
|
||||
targetScore: exercises[index].targetScore,
|
||||
targetScoreTimeMs: exercises[index].targetScoreTimeMs,
|
||||
restSecondsOverride: exercises[index].restSecondsOverride,
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
List<WorkoutTemplateProgram> _repositionWorkoutTemplatePrograms(
|
||||
List<WorkoutTemplateProgram> programs,
|
||||
DateTime now,
|
||||
) {
|
||||
return [
|
||||
for (var index = 0; index < programs.length; index++)
|
||||
WorkoutTemplateProgram(
|
||||
metadata: programs[index].metadata.touch(now),
|
||||
workoutTemplateId: programs[index].workoutTemplateId,
|
||||
sourceProgramId: programs[index].sourceProgramId,
|
||||
position: index,
|
||||
programNameSnapshot: programs[index].programNameSnapshot,
|
||||
defaultRestSecondsSnapshot: programs[index].defaultRestSecondsSnapshot,
|
||||
programSnapshotJson: programs[index].programSnapshotJson,
|
||||
),
|
||||
];
|
||||
}
|
||||
|
||||
void _validateExerciseDefaultTargets({
|
||||
required bool hasTimeMeasure,
|
||||
required bool hasRepsMeasure,
|
||||
|
||||
@ -157,6 +157,7 @@ final class _ExerciseLibraryScreenState extends State<ExerciseLibraryScreen> {
|
||||
return ExerciseListTile(
|
||||
exercise: exercise,
|
||||
onTap: () => _openForm(exercise: exercise),
|
||||
onDelete: () => _confirmDelete(exercise),
|
||||
);
|
||||
}, childCount: filtered.length * 2 - 1),
|
||||
),
|
||||
@ -203,13 +204,64 @@ final class _ExerciseLibraryScreenState extends State<ExerciseLibraryScreen> {
|
||||
_reload();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _confirmDelete(Exercise exercise) async {
|
||||
final used = await widget.exerciseUseCases.isUsedInPrograms(
|
||||
exercise.metadata.id,
|
||||
);
|
||||
if (!mounted) return;
|
||||
final confirmed = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text('Supprimer ${exercise.name} ?'),
|
||||
content: Text(
|
||||
used
|
||||
? 'Cet exercice est utilisé dans un ou plusieurs programmes. '
|
||||
'Le supprimer le retirera de ces programmes. Continuer ?'
|
||||
: 'Cette action est irréversible.',
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton.icon(
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
label: const Text('Supprimer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (confirmed != true) return;
|
||||
try {
|
||||
await widget.exerciseUseCases.delete(exercise.metadata.id);
|
||||
if (!mounted) return;
|
||||
_reload();
|
||||
} on Exception catch (error) {
|
||||
_showSnackBar(error.toString());
|
||||
}
|
||||
}
|
||||
|
||||
void _showSnackBar(String message) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text(message)));
|
||||
}
|
||||
}
|
||||
|
||||
final class ExerciseListTile extends StatelessWidget {
|
||||
const ExerciseListTile({required this.exercise, this.onTap, super.key});
|
||||
const ExerciseListTile({
|
||||
required this.exercise,
|
||||
this.onTap,
|
||||
this.onDelete,
|
||||
super.key,
|
||||
});
|
||||
|
||||
final Exercise exercise;
|
||||
final VoidCallback? onTap;
|
||||
final VoidCallback? onDelete;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@ -258,7 +310,19 @@ final class ExerciseListTile extends StatelessWidget {
|
||||
),
|
||||
],
|
||||
),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
trailing: onDelete == null
|
||||
? const Icon(Icons.chevron_right)
|
||||
: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: 'Supprimer l’exercice',
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
onPressed: onDelete,
|
||||
),
|
||||
const Icon(Icons.chevron_right),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,7 +69,17 @@ final class _ProgramListScreenState extends State<ProgramListScreen> {
|
||||
return ListTile(
|
||||
title: Text(program.name),
|
||||
subtitle: Text(_programSummary(program)),
|
||||
trailing: const Icon(Icons.chevron_right),
|
||||
trailing: Wrap(
|
||||
spacing: 8,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: 'Supprimer le programme',
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
onPressed: () => _confirmDelete(program),
|
||||
),
|
||||
const Icon(Icons.chevron_right),
|
||||
],
|
||||
),
|
||||
onTap: () => _openForm(program: program),
|
||||
);
|
||||
},
|
||||
@ -100,6 +110,51 @@ final class _ProgramListScreenState extends State<ProgramListScreen> {
|
||||
_reload();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _confirmDelete(Program program) async {
|
||||
final used = await widget.programUseCases.isUsedInWorkoutTemplates(
|
||||
program.metadata.id,
|
||||
);
|
||||
if (!mounted) return;
|
||||
final confirmed = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text('Supprimer ${program.name} ?'),
|
||||
content: Text(
|
||||
used
|
||||
? 'Ce programme est utilisé dans une ou plusieurs séances. '
|
||||
'Le supprimer le retirera de ces séances. Continuer ?'
|
||||
: 'Cette action est irréversible.',
|
||||
),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton.icon(
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
label: const Text('Supprimer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (confirmed != true) return;
|
||||
try {
|
||||
await widget.programUseCases.delete(program.metadata.id);
|
||||
if (!mounted) return;
|
||||
_reload();
|
||||
} on Exception catch (error) {
|
||||
_showSnackBar(error.toString());
|
||||
}
|
||||
}
|
||||
|
||||
void _showSnackBar(String message) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text(message)));
|
||||
}
|
||||
}
|
||||
|
||||
final class ProgramFormScreen extends StatefulWidget {
|
||||
|
||||
@ -72,6 +72,11 @@ final class _WorkoutTemplateListScreenState
|
||||
trailing: Wrap(
|
||||
spacing: 8,
|
||||
children: [
|
||||
IconButton(
|
||||
tooltip: 'Supprimer la séance',
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
onPressed: () => _confirmDelete(template),
|
||||
),
|
||||
TextButton(
|
||||
onPressed: () => _start(template),
|
||||
child: const Text('Lancer'),
|
||||
@ -140,6 +145,42 @@ final class _WorkoutTemplateListScreenState
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _confirmDelete(WorkoutTemplate template) async {
|
||||
final confirmed = await showDialog<bool>(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text('Supprimer ${template.name} ?'),
|
||||
content: const Text('Cette action est irréversible.'),
|
||||
actions: [
|
||||
TextButton(
|
||||
onPressed: () => Navigator.of(context).pop(false),
|
||||
child: const Text('Annuler'),
|
||||
),
|
||||
FilledButton.icon(
|
||||
onPressed: () => Navigator.of(context).pop(true),
|
||||
icon: const Icon(Icons.delete_outline),
|
||||
label: const Text('Supprimer'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
if (confirmed != true) return;
|
||||
try {
|
||||
await widget.workoutTemplateUseCases.delete(template.metadata.id);
|
||||
if (!mounted) return;
|
||||
_reload();
|
||||
} on Exception catch (error) {
|
||||
_showSnackBar(error.toString());
|
||||
}
|
||||
}
|
||||
|
||||
void _showSnackBar(String message) {
|
||||
if (!mounted) return;
|
||||
ScaffoldMessenger.of(
|
||||
context,
|
||||
).showSnackBar(SnackBar(content: Text(message)));
|
||||
}
|
||||
}
|
||||
|
||||
final class WorkoutTemplateFormScreen extends StatefulWidget {
|
||||
|
||||
Reference in New Issue
Block a user