feat: add replaceChangedWorkouts option to CopyFromCalendarToCalendarRequest and refactor workout reconciliation logic

Author: costa-alex

boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/CopyC2CRequest.kt

@@ -10,5 +10,6 @@ data class CopyFromCalendarToCalendarRequest(
     val types: List<TrainingType>,
     val skipSynced: Boolean,
     val sourcePlatform: Platform,
-    val targetPlatform: Platform
+    val targetPlatform: Platform,
+    val replaceChangedWorkouts: Boolean = false
 )

boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/WorkoutService.kt

@@ -289,7 +289,7 @@ class WorkoutService(
         return response
     }
 
-    fun copyWorkoutsNormally(
+    private fun copyWorkoutsNormally(
         request: CopyFromCalendarToCalendarRequest
     ): CopyWorkoutsResponse {
 
@@ -428,177 +428,7 @@ class WorkoutService(
         val workoutRepository = workoutRepositoryMap[request.platform]!!
         workoutRepository.deleteWorkoutsFromCalendar(request.startDate, request.endDate)
     }
-    
-    fun reconcileScheduledTrainerRoadToTrainingPeaks(
-        request: CopyFromCalendarToCalendarRequest
-    ): CopyWorkoutsResponse {
-
-        require(request.sourcePlatform == Platform.TRAINER_ROAD) {
-            "Scheduled reconciliation requires TrainerRoad as source"
-        }
-
-        require(request.targetPlatform == Platform.TRAINING_PEAKS) {
-            "Scheduled reconciliation requires TrainingPeaks as target"
-        }
-
-        log.info(
-            "Starting scheduled TrainerRoad to TrainingPeaks reconciliation: {}",
-            request
-        )
-
-        val sourceRepository =
-            workoutRepositoryMap[request.sourcePlatform]!!
-
-        val targetRepository =
-            workoutRepositoryMap[request.targetPlatform]!!
-
-        val allSourceWorkouts =
-            sourceRepository.getWorkoutsFromCalendar(
-                request.startDate,
-                request.endDate
-            )
-
-        val sourceWorkouts = allSourceWorkouts.filter {
-            request.types.contains(it.details.type)
-        }
-
-        val skippedByType =
-            allSourceWorkouts.size - sourceWorkouts.size
-
-        /*
-        * Important safeguard:
-        * an empty response from TrainerRoad must never cause existing
-        * TrainingPeaks workouts to be deleted.
-        */
-        if (sourceWorkouts.isEmpty()) {
-            log.info(
-                "TrainerRoad returned no matching workouts. " +
-                    "No TrainingPeaks workouts will be removed."
-            )
-
-            return CopyWorkoutsResponse(
-                copied = 0,
-                filteredOut = skippedByType,
-                skippedByType = skippedByType,
-                skippedAlreadySynced = 0,
-                startDate = request.startDate,
-                endDate = request.endDate,
-                externalData = ExternalData.empty()
-            )
-        }
-
-        val sourceWithoutTrainerRoadId = sourceWorkouts.filter {
-            it.details.externalData.trainerRoadId.isNullOrBlank()
-        }
-
-        val validSourceWorkouts = sourceWorkouts.filter {
-            !it.details.externalData.trainerRoadId.isNullOrBlank()
-        }
-
-        val invalidSourceFailures =
-            sourceWithoutTrainerRoadId.map { workout ->
-                WorkoutSyncFailure(
-                    workoutName = workout.details.name,
-                    workoutDate = workout.date,
-                    message = "TrainerRoad workout ID is missing"
-                )
-            }
-
-        val targetWorkouts =
-            targetRepository.getWorkoutsFromCalendar(
-                request.startDate,
-                request.endDate
-            )
-
-        val managedTargetWorkouts = targetWorkouts.filter {
-            isApplicationManagedTrainerRoadWorkout(it)
-        }
-
-        val sourceTrainerRoadIds = validSourceWorkouts
-            .mapNotNull {
-                it.details.externalData.trainerRoadId
-            }
-            .toSet()
-
-        val targetTrainerRoadIds = managedTargetWorkouts
-            .mapNotNull {
-                it.details.externalData.trainerRoadId
-            }
-            .toSet()
-
-        val workoutsToCreate = validSourceWorkouts.filter {
-            it.details.externalData.trainerRoadId !in targetTrainerRoadIds
-        }
-
-        val alreadySynced =
-            validSourceWorkouts.size - workoutsToCreate.size
-
-        val workoutsToRemove = managedTargetWorkouts.filter {
-            it.details.externalData.trainerRoadId !in sourceTrainerRoadIds
-        }
-
-        /*
-        * Create the replacement first.
-        */
-        val saveResult = saveWorkoutsIndividually(
-            repository = targetRepository,
-            workouts = workoutsToCreate
-        )
-
-        val copyFailures =
-            invalidSourceFailures + saveResult.failures
-
-        /*
-        * Do not remove the previous workout if any new workout failed
-        * to be created.
-        */
-        val deleteResult = if (copyFailures.isEmpty()) {
-            deleteWorkoutsIndividually(
-                repository = targetRepository,
-                workouts = workoutsToRemove
-            )
-        } else {
-            log.warn(
-                "Skipping removal of {} replaced workouts because " +
-                    "{} source workouts failed to sync",
-                workoutsToRemove.size,
-                copyFailures.size
-            )
-
-            DeleteWorkoutsResult(
-                removed = 0,
-                failures = emptyList()
-            )
-        }
-
-        val response = CopyWorkoutsResponse(
-            copied = saveResult.copied,
-            filteredOut = skippedByType + alreadySynced,
-            skippedByType = skippedByType,
-            skippedAlreadySynced = alreadySynced,
-            startDate = request.startDate,
-            endDate = request.endDate,
-            externalData = ExternalData.empty(),
-            failed = copyFailures.size,
-            failedWorkouts = copyFailures,
-            removed = deleteResult.removed,
-            failedToRemove = deleteResult.failures.size,
-            failedRemovals = deleteResult.failures
-        )
-
-        log.info(
-            "Scheduled reconciliation completed. copied={}, " +
-                "alreadySynced={}, removed={}, failed={}, failedToRemove={}",
-            response.copied,
-            response.skippedAlreadySynced,
-            response.removed,
-            response.failed,
-            response.failedToRemove
-        )
-
-        return response
-    }
-    
+       
     private fun isApplicationManagedTrainerRoadWorkout(
         workout: Workout
     ): Boolean {

boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/schedule/WorkoutScheduledJob.kt

@@ -8,7 +8,6 @@ import org.slf4j.LoggerFactory
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Service
 import java.util.concurrent.TimeUnit
-import org.freekode.tp2intervals.domain.Platform
 
 @Service
 class WorkoutScheduledJob(
@@ -46,19 +45,9 @@ class WorkoutScheduledJob(
     private fun handleCopyCalendarToCalendarRequest(
         request: C2CTodayScheduledRequest
     ) {
-        val todayRequest = request.forToday()
-
-        if (
-            request.sourcePlatform == Platform.TRAINER_ROAD &&
-            request.targetPlatform == Platform.TRAINING_PEAKS
-        ) {
-            workoutService
-                .reconcileScheduledTrainerRoadToTrainingPeaks(
-                    todayRequest
-                )
-        } else {
-            workoutService.copyWorkoutsC2C(todayRequest)
-        }
+        workoutService.copyWorkoutsC2C(
+            request.forToday()
+        )
     }
 
     private fun ScheduleRequestEntity.toSchedulable(): C2CTodayScheduledRequest {