fix(exercice): suppression d'exercice ne casse plus les programmes (ticket #62)
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:
@ -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,12 +948,12 @@ final class ActiveWorkoutSessionUseCases {
|
||||
await sessionRepository.saveScoreStopwatchState(stopped);
|
||||
}
|
||||
final runningStepTimers =
|
||||
(await sessionRepository.listExerciseStepProgressStates(sessionId))
|
||||
.where(
|
||||
(state) =>
|
||||
state.status ==
|
||||
ActiveExerciseStepProgressStatus.runningTimer,
|
||||
);
|
||||
(await sessionRepository.listExerciseStepProgressStates(
|
||||
sessionId,
|
||||
)).where(
|
||||
(state) =>
|
||||
state.status == ActiveExerciseStepProgressStatus.runningTimer,
|
||||
);
|
||||
for (final state in runningStepTimers) {
|
||||
final pausedStep = state.copyWith(
|
||||
metadata: state.metadata.touch(now),
|
||||
@ -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,26 +2694,28 @@ List<ExerciseStep> _exerciseStepsFromSnapshot(Object? value) {
|
||||
if (value is! List) {
|
||||
return const [];
|
||||
}
|
||||
return value.map((item) {
|
||||
final json = Map<String, dynamic>.from(item as Map);
|
||||
return ExerciseStep(
|
||||
id: json['id'] as String,
|
||||
position: json['position'] as int,
|
||||
name: json['name'] as String,
|
||||
type: switch (json['type']) {
|
||||
'time' => ExerciseStepType.time,
|
||||
'reps' => ExerciseStepType.reps,
|
||||
_ => throw const DomainException('Unknown exercise step type.'),
|
||||
},
|
||||
defaultTargetValue: json['defaultTargetValue'] as int,
|
||||
hasScore: json['hasScore'] == true,
|
||||
scoreInputMode: _scoreInputModeFromSnapshot(json['scoreInputMode']),
|
||||
scoreLabel: json['scoreLabel'] as String?,
|
||||
scoreUnit: json['scoreUnit'] as String?,
|
||||
defaultTargetScore: (json['defaultTargetScore'] as num?)?.toDouble(),
|
||||
defaultTargetScoreTimeMs: json['defaultTargetScoreTimeMs'] as int?,
|
||||
);
|
||||
}).toList(growable: false);
|
||||
return value
|
||||
.map((item) {
|
||||
final json = Map<String, dynamic>.from(item as Map);
|
||||
return ExerciseStep(
|
||||
id: json['id'] as String,
|
||||
position: json['position'] as int,
|
||||
name: json['name'] as String,
|
||||
type: switch (json['type']) {
|
||||
'time' => ExerciseStepType.time,
|
||||
'reps' => ExerciseStepType.reps,
|
||||
_ => throw const DomainException('Unknown exercise step type.'),
|
||||
},
|
||||
defaultTargetValue: json['defaultTargetValue'] as int,
|
||||
hasScore: json['hasScore'] == true,
|
||||
scoreInputMode: _scoreInputModeFromSnapshot(json['scoreInputMode']),
|
||||
scoreLabel: json['scoreLabel'] as String?,
|
||||
scoreUnit: json['scoreUnit'] as String?,
|
||||
defaultTargetScore: (json['defaultTargetScore'] as num?)?.toDouble(),
|
||||
defaultTargetScoreTimeMs: json['defaultTargetScoreTimeMs'] as int?,
|
||||
);
|
||||
})
|
||||
.toList(growable: false);
|
||||
}
|
||||
|
||||
List<WorkoutHistoryStepResult> _historyStepResultsFromActiveResults({
|
||||
|
||||
Reference in New Issue
Block a user