blomios/GameTime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(exercice): suppression d'exercice ne casse plus les programmes (ticket #62)

Browse Source 
Corrige ExerciseUseCases.delete() qui cascadait à tort vers les
ProgramExercise référents, violant le pattern snapshot (un exercice
supprimé ne doit jamais affecter les programmes déjà composés). Ajoute
le test de régression associé. Met à jour le texte de confirmation
_confirmDelete dans exercise_library_screen.dart, devenu incohérent
avec ce fix (il affirmait à tort que la suppression retirerait
l'exercice des programmes). Trouvé pendant la QA finale du chantier
"Exercice à plusieurs étapes" (#54). flutter analyze propre (mêmes
infos préexistantes), 103/103 tests verts, build APK debug validé.
Dernier ticket du chantier (#56/#58/#59/#60/#61/#62 tous faits).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blomios
2026-07-19 20:56:28 +02:00
parent fa3beb05d4
commit b7ba885b07
4 changed files with 181 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/application/use_cases.dart
View File

@ -291,22 +291,6 @@ final class ExerciseUseCases {
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;
}
@ -964,11 +948,11 @@ final class ActiveWorkoutSessionUseCases {
await sessionRepository.saveScoreStopwatchState(stopped);
}
final runningStepTimers =
(await sessionRepository.listExerciseStepProgressStates(sessionId))
.where(
(await sessionRepository.listExerciseStepProgressStates(
sessionId,
)).where(
(state) =>
state.status ==
ActiveExerciseStepProgressStatus.runningTimer,
state.status == ActiveExerciseStepProgressStatus.runningTimer,
);
for (final state in runningStepTimers) {
final pausedStep = state.copyWith(
@ -1510,7 +1494,8 @@ final class ActiveExerciseStepUseCases {
exerciseIndex: exerciseIndex,
setIndex: setIndex,
);
final state = existing ??
final state =
existing ??
_initialStepProgressState(
sessionId: sessionId,
context: context,
@ -2158,47 +2143,6 @@ 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,
exerciseImageMediaIdsSnapshot:
exercises[index].exerciseImageMediaIdsSnapshot,
exerciseVideoMediaIdSnapshot:
exercises[index].exerciseVideoMediaIdSnapshot,
exerciseStepsSnapshot: exercises[index].exerciseStepsSnapshot,
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,
@ -2494,7 +2438,8 @@ _ResolvedExerciseSnapshot? _findExerciseSnapshot({
}
final programSnapshot =
jsonDecode(programSnapshotJson) as Map<String, dynamic>;
final exercises = (programSnapshot['exercises'] as List<dynamic>? ?? const []);
final exercises =
(programSnapshot['exercises'] as List<dynamic>? ?? const []);
if (exerciseIndex < 0 || exerciseIndex >= exercises.length) {
return null;
}
@ -2749,7 +2694,8 @@ List<ExerciseStep> _exerciseStepsFromSnapshot(Object? value) {
if (value is! List) {
return const [];
}
return value.map((item) {
return value
.map((item) {
final json = Map<String, dynamic>.from(item as Map);
return ExerciseStep(
id: json['id'] as String,
@ -2768,7 +2714,8 @@ List<ExerciseStep> _exerciseStepsFromSnapshot(Object? value) {
defaultTargetScore: (json['defaultTargetScore'] as num?)?.toDouble(),
defaultTargetScoreTimeMs: json['defaultTargetScoreTimeMs'] as int?,
);
}).toList(growable: false);
})
.toList(growable: false);
}
List<WorkoutHistoryStepResult> _historyStepResultsFromActiveResults({

28
lib/presentation/exercise_library_screen.dart
View File

@ -220,7 +220,8 @@ final class _ExerciseLibraryScreenState extends State<ExerciseLibraryScreen> {
content: Text(
used
? 'Cet exercice est utilisé dans un ou plusieurs programmes. '
'Le supprimer le retirera de ces programmes. Continuer ?'
'Il sera retiré de la bibliothèque. '
'Les programmes existants restent inchangés. Continuer ?'
: 'Cette action est irréversible.',
),
actions: [
@ -885,8 +886,9 @@ final class _ExerciseFormScreenState extends State<ExerciseFormScreen> {
controller: draft.targetController,
decoration: InputDecoration(labelText: targetLabel),
keyboardType: TextInputType.number,
validator: (value) =>
_stepsEnabled ? _positiveIntValidator(value, targetMessage) : null,
validator: (value) => _stepsEnabled
? _positiveIntValidator(value, targetMessage)
: null,
onChanged: (_) => setState(() {}),
),
const SizedBox(height: 8),
@ -898,7 +900,10 @@ final class _ExerciseFormScreenState extends State<ExerciseFormScreen> {
onChanged: (value) => setState(() => draft.hasScore = value),
),
if (draft.hasScore) ...[
Text('Mode de score', style: Theme.of(context).textTheme.titleSmall),
Text(
'Mode de score',
style: Theme.of(context).textTheme.titleSmall,
),
RadioListTile<ScoreInputMode>(
contentPadding: EdgeInsets.zero,
title: const Text('Saisie libre'),
@ -922,7 +927,9 @@ final class _ExerciseFormScreenState extends State<ExerciseFormScreen> {
if (draft.scoreInputMode == ScoreInputMode.manual) ...[
TextFormField(
controller: draft.scoreLabelController,
decoration: const InputDecoration(labelText: 'Score à saisir'),
decoration: const InputDecoration(
labelText: 'Score à saisir',
),
validator: (value) {
if (!_stepsEnabled || !draft.hasScore) return null;
if (draft.scoreInputMode != ScoreInputMode.manual) {
@ -1081,9 +1088,10 @@ final class _ExerciseFormScreenState extends State<ExerciseFormScreen> {
}
setState(() {
_stepError = null;
_stepDrafts.insert(index + 1, _stepDrafts[index].duplicate(
'step-draft-${_nextStepDraftId++}',
));
_stepDrafts.insert(
index + 1,
_stepDrafts[index].duplicate('step-draft-${_nextStepDraftId++}'),
);
});
}
@ -1143,8 +1151,8 @@ final class _ExerciseFormScreenState extends State<ExerciseFormScreen> {
for (var index = 0; index < _stepDrafts.length; index++)
_stepDrafts[index].toExerciseStep(
position: index,
defaultTargetScoreTimeMs: _stepDrafts[index].scoreInputMode ==
ScoreInputMode.stopwatch
defaultTargetScoreTimeMs:
_stepDrafts[index].scoreInputMode == ScoreInputMode.stopwatch
? _optionalSecondsToMilliseconds(
_stepDrafts[index].scoreTargetController.text,
)

114
test/application/use_cases_test.dart
View File

@ -479,7 +479,7 @@ void main() {
);
});
test('delete exercise removes it from referencing programs', () async {
test('delete exercise keeps existing program snapshots unchanged', () async {
final exerciseRepository = _FakeExerciseRepository()
..exercise = Exercise(
metadata: _metadata('exercise-1'),
@ -502,12 +502,6 @@ void main() {
sourceExerciseId: 'exercise-1',
position: 0,
),
_programExercise(
id: 'program-exercise-2',
programId: 'program-1',
sourceExerciseId: 'exercise-2',
position: 1,
),
],
),
);
@ -523,7 +517,11 @@ void main() {
expect(programRepository.programs.single.exercises, hasLength(1));
expect(
programRepository.programs.single.exercises.single.sourceExerciseId,
'exercise-2',
'exercise-1',
);
expect(
programRepository.programs.single.exercises.single.exerciseNameSnapshot,
'Exercise program-exercise-1',
);
expect(programRepository.programs.single.exercises.single.position, 0);
});
@ -1020,6 +1018,95 @@ void main() {
expect(stopped.accumulatedMs, 4000);
});
test(
'exercise step progress auto-advances consecutive elapsed timers after kill',
() async {
final clock = _FakeClock(DateTime.utc(2026, 7, 17, 12));
final session = _sessionWithSnapshot(
currentProgramIndex: 0,
currentExerciseIndex: 0,
currentSetIndex: 0,
setsCount: 1,
targetReps: 2,
exerciseSteps: [
_step(
id: 'step-1',
position: 0,
name: 'Gauche',
type: ExerciseStepType.time,
defaultTargetValue: 1,
),
_step(
id: 'step-2',
position: 1,
name: 'Droite',
type: ExerciseStepType.time,
defaultTargetValue: 1,
),
],
);
final repository = _FakeActiveSessionRepository()..session = session;
final useCase = ActiveExerciseStepUseCases(
sessionRepository: repository,
clock: clock,
ids: _FakeIds(),
originDeviceId: 'device-1',
);
await useCase.startOrResumeProgress(
sessionId: session.metadata.id,
programIndex: 0,
exerciseIndex: 0,
setIndex: 0,
);
await useCase.startTimer(
sessionId: session.metadata.id,
programIndex: 0,
exerciseIndex: 0,
setIndex: 0,
);
clock.value = clock.value.add(const Duration(milliseconds: 4500));
final reconstructed = ActiveExerciseStepUseCases(
sessionRepository: repository,
clock: clock,
ids: _FakeIds(),
originDeviceId: 'device-1',
);
final view = await reconstructed.startOrResumeProgress(
sessionId: session.metadata.id,
programIndex: 0,
exerciseIndex: 0,
setIndex: 0,
);
expect(
view.state.status,
ActiveExerciseStepProgressStatus.sequenceComplete,
);
expect(repository.stepResults, hasLength(4));
expect(repository.stepResults.map((result) => result.passageIndex), [
0,
0,
1,
1,
]);
expect(repository.stepResults.map((result) => result.stepIndex), [
0,
1,
0,
1,
]);
expect(repository.stepResults.map((result) => result.actualTimeMs), [
1000,
1000,
1000,
1000,
]);
},
);
test('score result enforces manual xor stopwatch values', () {
expect(
() => ActiveSetResult(
@ -1431,9 +1518,7 @@ final class _FakeActiveSessionRepository implements ActiveSessionRepository {
}
@override
Future<void> saveExerciseStepResult(
ActiveExerciseStepResult result,
) async {
Future<void> saveExerciseStepResult(ActiveExerciseStepResult result) async {
stepResults.removeWhere(
(existing) =>
existing.activeWorkoutSessionId == result.activeWorkoutSessionId &&
@ -1484,6 +1569,8 @@ ActiveWorkoutSession _sessionWithSnapshot({
required int currentExerciseIndex,
required int currentSetIndex,
int setsCount = 2,
int targetReps = 10,
List<ExerciseStep> exerciseSteps = const [],
}) {
return ActiveWorkoutSession(
metadata: _metadata('session-1'),
@ -1508,7 +1595,10 @@ ActiveWorkoutSession _sessionWithSnapshot({
'timeEnabled': false,
'repsEnabled': true,
'scoreEnabled': false,
'targetReps': 10,
'targetReps': targetReps,
'exerciseStepsSnapshot': exerciseSteps
.map((step) => step.toSnapshotJson())
.toList(),
},
],
}),

37
test/presentation/exercise_library_screen_test.dart
View File

@ -226,7 +226,10 @@ void main() {
await _pumpExerciseForm(tester, exerciseRepository);
await tester.tap(
find.widgetWithText(SwitchListTile, 'Rythmer cet exercice avec des étapes'),
find.widgetWithText(
SwitchListTile,
'Rythmer cet exercice avec des étapes',
),
);
await tester.pump();
await tester.tap(find.text('Ajouter une étape'));
@ -256,7 +259,10 @@ void main() {
await _pumpExerciseForm(tester, exerciseRepository);
await tester.tap(
find.widgetWithText(SwitchListTile, 'Rythmer cet exercice avec des étapes'),
find.widgetWithText(
SwitchListTile,
'Rythmer cet exercice avec des étapes',
),
);
await tester.pump();
await tester.tap(find.text('Ajouter une étape'));
@ -300,7 +306,10 @@ void main() {
await _pumpExerciseForm(tester, exerciseRepository);
await tester.tap(
find.widgetWithText(SwitchListTile, 'Rythmer cet exercice avec des étapes'),
find.widgetWithText(
SwitchListTile,
'Rythmer cet exercice avec des étapes',
),
);
await tester.pump();
await tester.tap(find.text('Ajouter une étape'));
@ -334,7 +343,10 @@ void main() {
await _pumpExerciseForm(tester, exerciseRepository);
await tester.tap(
find.widgetWithText(SwitchListTile, 'Rythmer cet exercice avec des étapes'),
find.widgetWithText(
SwitchListTile,
'Rythmer cet exercice avec des étapes',
),
);
await tester.pump();
await tester.tap(find.text('Ajouter une étape'));
@ -363,7 +375,10 @@ void main() {
await _pumpExerciseForm(tester, exerciseRepository);
await tester.tap(
find.widgetWithText(SwitchListTile, 'Rythmer cet exercice avec des étapes'),
find.widgetWithText(
SwitchListTile,
'Rythmer cet exercice avec des étapes',
),
);
await tester.pump();
for (var index = 0; index < 8; index++) {
@ -372,7 +387,10 @@ void main() {
}
expect(find.text('Limite atteinte'), findsOneWidget);
expect(find.text('Un exercice peut contenir jusqu’à 8 étapes.'), findsOneWidget);
expect(
find.text('Un exercice peut contenir jusqu’à 8 étapes.'),
findsOneWidget,
);
expect(find.text('Ajouter une étape'), findsNothing);
});
@ -389,7 +407,10 @@ void main() {
'30',
);
await tester.tap(
find.widgetWithText(SwitchListTile, 'Rythmer cet exercice avec des étapes'),
find.widgetWithText(
SwitchListTile,
'Rythmer cet exercice avec des étapes',
),
);
await tester.pump();
await tester.tap(find.text('Ajouter une étape'));
@ -512,7 +533,7 @@ void main() {
expect(find.text('Supprimer Squat ?'), findsOneWidget);
expect(
find.textContaining('Le supprimer le retirera de ces programmes.'),
find.textContaining('Les programmes existants restent inchangés.'),
findsOneWidget,
);