feat: enhance workout details and request DTO with subtype handling and UI updates for current page title

Author: costa-alex

boot/src/main/kotlin/org/freekode/tp2intervals/domain/workout/WorkoutDetails.kt

@@ -8,6 +8,7 @@ import org.freekode.tp2intervals.domain.TrainingType
 
 data class WorkoutDetails(
     val type: TrainingType,
+    val subType: TrainingType,
     val name: String,
     val description: String?,
     val duration: Duration?,

boot/src/main/kotlin/org/freekode/tp2intervals/infrastructure/platform/trainingpeaks/workout/CreateTPWorkoutRequestDTO.kt

@@ -33,8 +33,8 @@ class CreateTPWorkoutRequestDTO(
             return CreateTPWorkoutRequestDTO(
                 athleteId = athleteId,
                 workoutDay = workout.date ?: LocalDate.now(),
-                workoutTypeValueId = TPTrainingTypeMapper.getByType(workout.details.type),
-                workoutSubTypeId = 49,
+                workoutTypeValueId = TPTrainingTypeMapper.getWorkoutTypeValueId(workout.details.type),
+                workoutSubTypeId = TPTrainingTypeMapper.getWorkoutSubTypeValueId(workout.details.type),
                 title = workout.details.name,
                 description = buildDescription(workout),
                 totalTime = null,

boot/src/main/kotlin/org/freekode/tp2intervals/infrastructure/platform/trainingpeaks/workout/TPTrainingTypeMapper.kt

@@ -4,27 +4,46 @@ import org.freekode.tp2intervals.domain.TrainingType
 
 class TPTrainingTypeMapper {
     companion object {
-        private val typeMap = mapOf(
+
+        private val workoutTypeMap = mapOf(
             TrainingType.SWIM to 1,
             TrainingType.BIKE to 2,
             TrainingType.VIRTUAL_BIKE to 2,
+            TrainingType.MTB to 2,
+            TrainingType.RUN to 3,
+            TrainingType.WALK to 3,
+            TrainingType.WEIGHT to 9,
+            TrainingType.NOTE to 7,
+            TrainingType.UNKNOWN to 100
+        )
+
+        private val workoutSubTypeMap = mapOf(
+            TrainingType.SWIM to 1,
+            TrainingType.BIKE to 2,
+            TrainingType.VIRTUAL_BIKE to 49,
             TrainingType.RUN to 3,
             TrainingType.MTB to 8,
             TrainingType.WEIGHT to 9,
-            TrainingType.NOTE to 7, // day off
-            TrainingType.UNKNOWN to 4, // brick
-            TrainingType.UNKNOWN to 5, // crosstrain
-            TrainingType.UNKNOWN to 9, // custom
-            TrainingType.UNKNOWN to 11, // xc-ski
-            TrainingType.UNKNOWN to 12, // rowing
-            TrainingType.UNKNOWN to 13, // walk
-            TrainingType.UNKNOWN to 100 // other
+            TrainingType.NOTE to 7,
+            TrainingType.WALK to 13,
+            TrainingType.UNKNOWN to 100
         )
 
-        fun getByValue(value: Int): TrainingType =
-            typeMap.filterValues { it == value }.keys.firstOrNull() ?: TrainingType.UNKNOWN
+        fun getWorkoutTypeValueId(trainingType: TrainingType): Int =
+            workoutTypeMap[trainingType] ?: workoutTypeMap[TrainingType.UNKNOWN]!!
 
-        fun getByType(trainingType: TrainingType): Int = typeMap[trainingType]!!
+        fun getWorkoutSubTypeValueId(trainingType: TrainingType): Int =
+            workoutSubTypeMap[trainingType] ?: workoutSubTypeMap[TrainingType.UNKNOWN]!!
+
+        fun getByValue(value: Int): TrainingType =
+            workoutSubTypeMap.filterValues { it == value }.keys.firstOrNull()
+                ?: TrainingType.UNKNOWN
 
+        /**
+         * Keep this for backwards compatibility with existing code.
+         * Prefer getWorkoutTypeValueId() or getWorkoutSubTypeValueId().
+         */
+        fun getByType(trainingType: TrainingType): Int =
+            getWorkoutTypeValueId(trainingType)
     }
-}
+}

ui/src/app/top-bar/top-bar.component.html

@@ -9,6 +9,10 @@
       <mat-icon>menu</mat-icon>
     </button>
 
+    <span class="mobile-page-title">
+      {{ currentPageTitle }}
+    </span>
+
   } @else {
 
     <div class="desktop-menu">

ui/src/app/top-bar/top-bar.component.scss

@@ -9,13 +9,13 @@
   gap: 8px;
 }
 
-.mobile-title {
-  display: flex;
-  align-items: center;
-  gap: 8px;
+.mobile-page-title {
   margin-left: 12px;
-  font-weight: 500;
+  font-weight: 600;
+  font-size: 1rem;
   white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .spacer {

ui/src/app/top-bar/top-bar.component.ts

@@ -33,6 +33,16 @@ export class TopBarComponent {
       shareReplay()
     );
 
+  get currentPageTitle(): string {
+    const currentUrl = this.router.url.split('?')[0].split('#')[0];
+
+    const currentButton = this.menuButtons.find(button =>
+      currentUrl === button.url || currentUrl.startsWith(`${button.url}/`)
+    );
+
+    return currentButton?.name ?? '';
+  }
+
   constructor(
     protected router: Router,
     private breakpointObserver: BreakpointObserver