dev to main

.github/workflows/main-branch.yml → .github/workflows/branch.yml

@@ -1,8 +1,11 @@
-name: Build main branch
+name: Build branches
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, dev ]
+    paths-ignore:
+      - 'README.md'
+      - 'LICENSE'
   workflow_dispatch:
 
 concurrency:

.github/workflows/build-electron.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Cache JDKs
         uses: actions/cache@v4
         with:
-          path: devops/jdktool/jdks
+          path: jdktool/jdks
           key: ${{ runner.os }}-jdks
 
       - name: Build jar in unix

.github/workflows/build-jar.yml

@@ -33,8 +33,16 @@ jobs:
           cache: 'npm'
           cache-dependency-path: 'ui/package-lock.json'
 
-      - name: Build project
-        run: ./devops/build-jar.sh
+      - name: Build UI
+        run: |
+          npm ci --prefix ui
+          npm run build  --prefix ui
+
+      - name: Copy UI
+        run: cp -r ui/dist/ui/browser boot/src/main/resources/static
+
+      - name: Build boot
+        run: cd ./boot && ./gradlew build
 
       - name: Cypress tests
         run: |

README.md

@@ -2,10 +2,16 @@
 [![release](https://img.shields.io/github/release/freekode/tp2intervals)](https://github.com/freekode/tp2intervals/releases/latest)
 
 # Third Party to Intervals.icu
-App to sync workouts and activities between TrainingPeaks and Intervals.icu.
+App to sync workouts between TrainingPeaks, TrainerRoad and Intervals.icu.
 
-* Sync planned workouts between Intervals.icu and TrainingPeaks for today and tomorrow (free TP account)
-* Copy planned workouts for date range from TrainingPeaks to Intervals.icu Training Plan
+**TrainingPeaks related features:**
+* Sync planned workouts from Intervals to TrainingPeaks for today and tomorrow (free TP account)
+* Copy whole training plan from TrainingPeaks
+* Copy planned workouts for date range from TrainingPeaks to Intervals.icu training plan or workout folder
+
+**TrainerRoad related features:**
+* Copy workouts from TrainerRoad library to Intervals
+* Copy planned workouts for date range from TrainerRoad to Intervals.icu training plan or workout folder
 
 Executables for MacOS (DMG), Windows (EXE installer), Linux (AppImage) are available for download [here](https://github.com/freekode/tp2intervals/releases/latest)
 
@@ -53,9 +59,6 @@ services:
 After you successfully started the application and were able to open the web UI page.
 You need to configure it to gain access to Intervals.icu and to TrainingPeaks.
 
-### TrainingPeaks Auth Cookie
-Copy cookie `Production_tpAuth` (key and value, smth like `Production_tpAuth=very_long_string`) from the browser on TrainingPeaks page.
-
 ### Intervals API Key and Athlete Id
 These values available on [Settings page](https://intervals.icu/settings) in Developer Settings section.
 
@@ -65,8 +68,15 @@ If everything is fine, you will be redirected to the home page, where you can pl
 If your configuration is wrong. You will see an error that there is no access to TrainingPeaks or to Intervals.icu.
 Check all your values and save configuration again.
 
+### TrainingPeaks Auth Cookie
+If you want ot use TrainingPeaks you need to configure it. Copy cookie `Production_tpAuth` (key and value, smth like `Production_tpAuth=very_long_string`) from the browser on TrainingPeaks page.
+
+### TrainerRoad Auth Cookie
+If you want to use TrainerRoad you need to configure it. Very similar to TrainerRoad. Copy cookie `TrainerRoadAuth` (key and value, smth like `TrainerRoadAuth=very_long_string`) from the browser on TrainerRoad page.
+
 ## FAQ
-* Only duration based steps in workouts are supported, the app can't work with distance based steps 
+* Only duration based steps in workouts are supported, the app can't work with distance based steps
+* Ramp steps in TrainerRoad are not supported
 * **MacOS** app is not signed. Usually you need to open it twice. After opening it, be patient, it takes some time to start.
 * **Windows** The app will ask to access local network and Internet allow it. After all it makes HTTP requests.
 * Contact me in case of any problems. You can create an issue in [GitHub](https://github.com/freekode/tp2intervals/issues) 

boot/build.gradle.kts

@@ -39,6 +39,7 @@ dependencies {
     implementation("org.xerial:sqlite-jdbc:3.45.0.0")
     implementation("org.liquibase:liquibase-core")
 
+    implementation(group = "org.ehcache", name = "ehcache", classifier = "jakarta")
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")

boot/src/main/kotlin/org/freekode/tp2intervals/Application.kt

@@ -1,13 +1,16 @@
 package org.freekode.tp2intervals
 
+import org.freekode.tp2intervals.infrastructure.dev.DevConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.cache.annotation.EnableCaching
 import org.springframework.cloud.openfeign.EnableFeignClients
 
 @SpringBootApplication
 @EnableFeignClients
 @EnableCaching
+@EnableConfigurationProperties(DevConfiguration::class)
 class Application
 
 fun main(args: Array<String>) {

boot/src/main/kotlin/org/freekode/tp2intervals/app/activity/ActivityService.kt

@@ -1,18 +1,22 @@
 package org.freekode.tp2intervals.app.activity
 
+import org.freekode.tp2intervals.domain.Platform
+import org.freekode.tp2intervals.domain.activity.ActivityRepository
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
 class ActivityService(
-    private val activityRepositoryStrategy: ActivityRepositoryStrategy,
+    repositories: List<ActivityRepository>
 ) {
     private val log = LoggerFactory.getLogger(this.javaClass)
 
+    private val repositoryMap = repositories.associateBy { it.platform() }
+
     fun syncActivities(request: SyncActivitiesRequest) {
         log.info("Sync activities by request $request")
-        val sourceActivityRepository = activityRepositoryStrategy.getRepository(request.sourcePlatform)
-        val targetActivityRepository = activityRepositoryStrategy.getRepository(request.targetPlatform)
+        val sourceActivityRepository = getRepository(request.sourcePlatform)
+        val targetActivityRepository = getRepository(request.targetPlatform)
 
         val targetActivities = targetActivityRepository.getActivities(request.startDate, request.endDate)
             .filter { request.types.contains(it.type) }
@@ -24,4 +28,6 @@ class ActivityService(
         sourceActivities
             .forEach { targetActivityRepository.createActivity(it) }
     }
+
+    private fun getRepository(platform: Platform) = repositoryMap[platform]!!
 }

boot/src/main/kotlin/org/freekode/tp2intervals/app/confguration/ConfigurationService.kt

@@ -1,5 +1,6 @@
 package org.freekode.tp2intervals.app.confguration
 
+import org.freekode.tp2intervals.domain.Platform
 import org.freekode.tp2intervals.domain.config.AppConfiguration
 import org.freekode.tp2intervals.domain.config.AppConfigurationRepository
 import org.freekode.tp2intervals.domain.config.PlatformConfigurationRepository
@@ -12,6 +13,8 @@ class ConfigurationService(
     private val platformConfigurationRepositories: List<PlatformConfigurationRepository>,
     private val appConfigurationRepository: AppConfigurationRepository
 ) {
+    private val repositoryMap = platformConfigurationRepositories.associateBy { it.platform() }
+
     fun getConfiguration(key: String): String? = appConfigurationRepository.getConfiguration(key)
 
     fun getConfigurations(): AppConfiguration = appConfigurationRepository.getConfigurations()
@@ -20,6 +23,10 @@ class ConfigurationService(
         return platformConfigurationRepositories.mapNotNull { updateConfiguration(request, it) }
     }
 
+    fun isValid(platform: Platform): Boolean {
+        return repositoryMap[platform]!!.isValid()
+    }
+
     private fun updateConfiguration(
         request: UpdateConfigurationRequest,
         repository: PlatformConfigurationRepository

boot/src/main/kotlin/org/freekode/tp2intervals/app/plan/CopyLibraryRequest.kt

@@ -0,0 +1,11 @@
+package org.freekode.tp2intervals.app.plan
+
+import org.freekode.tp2intervals.domain.Platform
+import org.freekode.tp2intervals.domain.librarycontainer.LibraryContainer
+
+data class CopyLibraryRequest(
+    val libraryContainer: LibraryContainer,
+    val newName: String,
+    val sourcePlatform: Platform,
+    val targetPlatform: Platform,
+)

boot/src/main/kotlin/org/freekode/tp2intervals/app/plan/CopyPlanResponse.kt

@@ -0,0 +1,6 @@
+package org.freekode.tp2intervals.app.plan
+
+data class CopyPlanResponse(
+    val planName: String,
+    val workouts: Int,
+)

boot/src/main/kotlin/org/freekode/tp2intervals/app/plan/LibraryService.kt

@@ -0,0 +1,33 @@
+package org.freekode.tp2intervals.app.plan
+
+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
+class LibraryService(
+    workoutRepositories: List<WorkoutRepository>,
+    planRepositories: List<LibraryContainerRepository>,
+) {
+    private val workoutRepositoryMap = workoutRepositories.associateBy { it.platform() }
+    private val planRepositoryMap = planRepositories.associateBy { it.platform() }
+
+    fun getLibraryContainers(platform: Platform): List<LibraryContainer> {
+        val repository = planRepositoryMap[platform]!!
+        return repository.getLibraryContainer()
+    }
+
+    fun copyLibrary(request: CopyLibraryRequest): CopyPlanResponse {
+        val targetPlanRepository = planRepositoryMap[request.targetPlatform]!!
+        val sourceWorkoutRepository = workoutRepositoryMap[request.sourcePlatform]!!
+        val targetWorkoutRepository = workoutRepositoryMap[request.targetPlatform]!!
+
+        val workouts = sourceWorkoutRepository.getWorkoutsFromLibrary(request.libraryContainer)
+        val newPlan = targetPlanRepository.createLibraryContainer(request.newName, Date.thisMonday(), true)
+        targetWorkoutRepository.saveWorkoutsToLibrary(newPlan, workouts)
+        return CopyPlanResponse(newPlan.name, workouts.size)
+    }
+}

boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/PlanWorkoutsRequest.kt → boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/CopyFromCalendarToCalendarRequest.kt

@@ -4,7 +4,7 @@ import java.time.LocalDate
 import org.freekode.tp2intervals.domain.Platform
 import org.freekode.tp2intervals.domain.TrainingType
 
-data class PlanWorkoutsRequest(
+class CopyFromCalendarToCalendarRequest(
     val startDate: LocalDate,
     val endDate: LocalDate,
     val types: List<TrainingType>,

boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/CopyWorkoutsRequest.kt → boot/src/main/kotlin/org/freekode/tp2intervals/app/workout/CopyFromCalendarToLibraryRequest.kt

@@ -3,11 +3,10 @@ package org.freekode.tp2intervals.app.workout
 import java.time.LocalDate
 import org.freekode.tp2intervals.domain.Platform
 import org.freekode.tp2intervals.domain.TrainingType
-import org.freekode.tp2intervals.domain.plan.PlanType
 
-data class CopyWorkoutsRequest(
+data class CopyFromCalendarToLibraryRequest(
     val name: String,
-    val planType: PlanType,
+    val isPlan: Boolean,
     val startDate: LocalDate,
     val endDate: LocalDate,
     val types: List<TrainingType>,

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

@@ -0,0 +1,13 @@
+package org.freekode.tp2intervals.app.workout
+
+import org.freekode.tp2intervals.domain.Platform
+import org.freekode.tp2intervals.domain.librarycontainer.LibraryContainer
+import org.freekode.tp2intervals.domain.workout.WorkoutDetails
+import org.freekode.tp2intervals.rest.workout.WorkoutDetailsDTO
+
+class CopyFromLibraryToLibraryRequest(
+    val workoutDetails: WorkoutDetailsDTO,
+    val targetLibraryContainer: LibraryContainer,
+    val sourcePlatform: Platform,
+    val targetPlatform: Platform,
+)