Merge pull request #69 from freekode/fix-tp-copy-plan

Fix TP copy plan
freekode · Jun 3, 2024 · bf22be5 · bf22be5
2 parents 16159d2 + 42d9d2c
commit bf22be5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/boot/src/main/kotlin/org/freekode/tp2intervals/app/plan/LibraryService.kt b/boot/src/main/kotlin/org/freekode/tp2intervals/app/plan/LibraryService.kt
@@ -4,7 +4,6 @@ import org.freekode.tp2intervals.domain.Platform
 import org.freekode.tp2intervals.domain.librarycontainer.LibraryContainer
 import org.freekode.tp2intervals.domain.librarycontainer.LibraryContainerRepository
 import org.freekode.tp2intervals.domain.workout.WorkoutRepository
-import org.freekode.tp2intervals.infrastructure.utils.Date
 import org.springframework.stereotype.Service
 
 @Service
@@ -26,7 +25,11 @@ class LibraryService(
         val targetWorkoutRepository = workoutRepositoryMap[request.targetPlatform]!!
 
         val workouts = sourceWorkoutRepository.getWorkoutsFromLibrary(request.libraryContainer)
-        val newPlan = targetPlanRepository.createLibraryContainer(request.newName, Date.thisMonday(), request.libraryContainer.isPlan)
+        val newPlan = targetPlanRepository.createLibraryContainer(
+            request.newName,
+            workouts.first().date,
+            request.libraryContainer.isPlan
+        )
         targetWorkoutRepository.saveWorkoutsToLibrary(newPlan, workouts)
         return CopyPlanResponse(newPlan.name, workouts.size)
     }

diff --git a/.../org/freekode/tp2intervals/infrastructure/platform/trainingpeaks/plan/TPPlanRepository.kt b/.../org/freekode/tp2intervals/infrastructure/platform/trainingpeaks/plan/TPPlanRepository.kt
@@ -59,10 +59,8 @@ class TPPlanRepository(
     }
 
     private fun toLibraryContainer(planDto: TPPlanDto): LibraryContainer {
-        return LibraryContainer(
+        return LibraryContainer.planFromMonday(
             planDto.title,
-            planDto.startDate ?: Date.thisMonday(),
-            true,
             planDto.workoutCount,
             ExternalData.empty().withTrainingPeaks(planDto.planId)
         )

diff --git a/...eekode/tp2intervals/infrastructure/platform/trainingpeaks/workout/TPToWorkoutConverter.kt b/...eekode/tp2intervals/infrastructure/platform/trainingpeaks/workout/TPToWorkoutConverter.kt
@@ -38,8 +38,8 @@ class TPToWorkoutConverter {
         val workoutsStructure = tpWorkout.structure?.let {
             try {
                 toWorkoutStructure(it)
-            } catch (e: Exception) {
-                log.warn("Can't convert workout - ${tpWorkout.title}, error - ${e.message}'", e)
+            } catch (e: IllegalArgumentException) {
+                log.warn("Can't convert workout - ${tpWorkout.title}, error - ${e.message}'")
                 null
             }
         }

diff --git a/...intervals/infrastructure/platform/trainingpeaks/workout/TrainingPeaksWorkoutRepository.kt b/...intervals/infrastructure/platform/trainingpeaks/workout/TrainingPeaksWorkoutRepository.kt
@@ -1,9 +1,7 @@
 package org.freekode.tp2intervals.infrastructure.platform.trainingpeaks.workout
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import java.time.DayOfWeek
 import java.time.LocalDate
-import java.time.temporal.TemporalAdjusters
 import org.freekode.tp2intervals.domain.ExternalData
 import org.freekode.tp2intervals.domain.Platform
 import org.freekode.tp2intervals.domain.librarycontainer.LibraryContainer
@@ -127,20 +125,17 @@ class TrainingPeaksWorkoutRepository(
 
     private fun getWorkoutsFromTPPlan(libraryContainer: LibraryContainer): List<Workout> {
         val planId = libraryContainer.externalData.trainingPeaksId!!
-        val planApplyDate = getPlanApplyDate()
+        val planStartDateShift = trainingPeaksConfigurationRepository.getConfiguration().planDaysShift
+        val planStartDate = Date.thisMonday()
+        val planApplyDate = planStartDate.plusDays(planStartDateShift)
         val response = tpPlanRepository.applyPlan(planId, planApplyDate)
 
         try {
             val planEndDate = response.endDate.toLocalDate()
 
-            val workoutDateShiftDays = Date.daysDiff(libraryContainer.startDate, planApplyDate)
             val workouts = getWorkoutsFromCalendar(planApplyDate, planEndDate).map {
-                it.withDate(
-                    it.date!!.minusDays(workoutDateShiftDays.toLong())
-                )
+                it.withDate(it.date!!.minusDays(planStartDateShift))
             }
-            val tpPlan = tpPlanRepository.getPlan(planId)
-            assert(tpPlan.workoutCount == workouts.size)
             return workouts
         } catch (e: Exception) {
             throw e
@@ -153,10 +148,6 @@ class TrainingPeaksWorkoutRepository(
         return tpWorkoutLibraryRepository.getLibraryWorkouts(library.externalData.trainingPeaksId!!)
     }
 
-    private fun getPlanApplyDate(): LocalDate = LocalDate.now()
-        .plusDays(trainingPeaksConfigurationRepository.getConfiguration().planDaysShift)
-        .with(TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY))
-
     private fun getNoteEndDateForFilter(startDate: LocalDate, endDate: LocalDate): LocalDate =
         if (startDate == endDate) endDate.plusDays(1) else endDate
 

diff --git a/...de/tp2intervals/infrastructure/platform/trainingpeaks/workout/structure/TPTargetMapper.kt b/...de/tp2intervals/infrastructure/platform/trainingpeaks/workout/structure/TPTargetMapper.kt
@@ -1,8 +1,6 @@
 package org.freekode.tp2intervals.infrastructure.platform.trainingpeaks.workout.structure
 
-import org.freekode.tp2intervals.domain.Platform
 import org.freekode.tp2intervals.domain.workout.structure.WorkoutStructure
-import org.freekode.tp2intervals.infrastructure.PlatformException
 
 class TPTargetMapper {
     companion object {