@aneuhold/be-ts-db-lib 4.2.22 → 4.2.24

package/CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 🔖 [4.2.24] (2026-04-17)
+
+### 🏗️ Changed
+
+- Updated dependencies on `@aneuhold/be-ts-lib` to `^3.1.11` and `@aneuhold/core-ts-db-lib` to `^5.0.6`.
+
+## 🔖 [4.2.23] (2026-04-15)
+
+### ✅ Added
+
+- `WorkoutExerciseRepository.buildExerciseCTOs` now runs a third parallel aggregation pipeline to populate `lastSessionExercise`/`lastSessionSets` from the true latest completed session (any cycle type, including deloads and free-form).
+
+### 🏗️ Changed
+
+- Repository now populates `lastAccumulationSessionExercise`/`lastAccumulationSessionSets` alongside `lastSessionExercise`/`lastSessionSets` in each `WorkoutExerciseCTO`.
+- Updated dependencies on `@aneuhold/be-ts-lib` to `^3.1.10` and `@aneuhold/core-ts-db-lib` to `^5.0.5`.
+
 ## 🔖 [4.2.22] (2026-03-26)
 
 ### 🏗️ Changed
@@ -378,6 +395,8 @@ Updated dependencies: now requires `@aneuhold/core-ts-db-lib@^3.0.0`, `@aneuhold
 - Updated workflow permissions to allow repository write access
 
 <!-- Link References -->
+[4.2.24]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.23...be-ts-db-lib-v4.2.24
+[4.2.23]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.22...be-ts-db-lib-v4.2.23
 [4.2.22]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.21...be-ts-db-lib-v4.2.22
 [4.2.21]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.20...be-ts-db-lib-v4.2.21
 [4.2.20]: https://github.com/aneuhold/ts-libs/compare/be-ts-db-lib-v4.2.19...be-ts-db-lib-v4.2.20

package/lib/repositories/workout/WorkoutExerciseRepository.d.ts

@@ -13,9 +13,12 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
     static getRepo(): WorkoutExerciseRepository;
     /**
      * Builds {@link WorkoutExerciseCTO} objects for all exercises belonging to a user.
-     * Uses two parallel MongoDB aggregation pipelines:
+     * Uses three parallel MongoDB aggregation pipelines:
      * - Pipeline A: exercise + equipmentType + bestCalibration + bestSet
-     * - Pipeline B: lastSessionExercise + lastSessionSets (from most recent non-deload session)
+     * - Pipeline B (true latest): lastSessionExercise + lastSessionSets from the most
+     *   recent completed session, regardless of cycle type / deload status.
+     * - Pipeline C (accumulation): lastAccumulationSessionExercise +
+     *   lastAccumulationSessionSets from the most recent completed non-deload session.
      *
      * @param userId The user whose exercise CTOs to build.
      */

package/lib/repositories/workout/WorkoutExerciseRepository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/workout/WorkoutExerciseRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAEJ,eAAe,EAEf,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAWlC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,+BAA+B,MAAM,sCAAsC,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,+BAA+B,CAAC,eAAe,CAAC;IACrG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAA4B;IAE7D,OAAO;IAIP,MAAM,CAAC,uBAAuB,IAAI,aAAa,CAAC,IAAI,CAAC;IAYrD,SAAS,CAAC,gBAAgB,IAAI,IAAI;WAIpB,OAAO,IAAI,yBAAyB;IAOlD;;;;;;;OAOG;IACG,wBAAwB,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;CAkN5E"}
+{"version":3,"file":"WorkoutExerciseRepository.d.ts","sourceRoot":"","sources":["../../../src/repositories/workout/WorkoutExerciseRepository.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EAEJ,eAAe,EAEf,kBAAkB,EAGnB,MAAM,0BAA0B,CAAC;AAWlC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,+BAA+B,MAAM,sCAAsC,CAAC;AAGnF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,yBAA0B,SAAQ,+BAA+B,CAAC,eAAe,CAAC;IACrG,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAA4B;IAE7D,OAAO;IAIP,MAAM,CAAC,uBAAuB,IAAI,aAAa,CAAC,IAAI,CAAC;IAYrD,SAAS,CAAC,gBAAgB,IAAI,IAAI;WAIpB,OAAO,IAAI,yBAAyB;IAOlD;;;;;;;;;;OAUG;IACG,wBAAwB,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;CA+N5E"}

package/lib/repositories/workout/WorkoutExerciseRepository.js

@@ -32,9 +32,12 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
     }
     /**
      * Builds {@link WorkoutExerciseCTO} objects for all exercises belonging to a user.
-     * Uses two parallel MongoDB aggregation pipelines:
+     * Uses three parallel MongoDB aggregation pipelines:
      * - Pipeline A: exercise + equipmentType + bestCalibration + bestSet
-     * - Pipeline B: lastSessionExercise + lastSessionSets (from most recent non-deload session)
+     * - Pipeline B (true latest): lastSessionExercise + lastSessionSets from the most
+     *   recent completed session, regardless of cycle type / deload status.
+     * - Pipeline C (accumulation): lastAccumulationSessionExercise +
+     *   lastAccumulationSessionSets from the most recent completed non-deload session.
      *
      * @param userId The user whose exercise CTOs to build.
      */
@@ -114,107 +117,123 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
             }
         ])
             .toArray();
-        // Pipeline B: lastSessionExercise + lastFirstSet per exercise
-        const pipelineBPromise = collection
-            .aggregate([
-            // Start with all completed sessions for this user
-            { $match: { docType: WorkoutSession_docType, userId, complete: true } },
-            // Most recent sessions first
-            { $sort: { startTime: -1 } },
-            // Join each session's session exercises
-            {
-                $lookup: {
-                    from: collName,
-                    let: { sessId: '$_id' },
-                    pipeline: [
-                        {
-                            $match: {
-                                $expr: { $eq: ['$workoutSessionId', '$$sessId'] },
-                                docType: WorkoutSessionExercise_docType
-                            }
+        // Builds the pipeline that finds, per exercise, the most recent session
+        // exercise from a completed session — optionally restricted to non-deload
+        // sessions (where plannedRir is not null on at least one set).
+        const buildLastSessionPipeline = (accumulationOnly) => {
+            const accumulationFilter = accumulationOnly
+                ? [
+                    // Check for non-deload sets (plannedRir is not null)
+                    {
+                        $lookup: {
+                            from: collName,
+                            let: { seId: '$_se._id' },
+                            pipeline: [
+                                {
+                                    $match: {
+                                        $expr: { $eq: ['$workoutSessionExerciseId', '$$seId'] },
+                                        docType: WorkoutSet_docType,
+                                        plannedRir: { $ne: null }
+                                    }
+                                },
+                                { $limit: 1 }
+                            ],
+                            as: '_nonDeload'
                         }
-                    ],
-                    as: '_se'
-                }
-            },
-            // One row per session exercise (unwind coalescence optimization)
-            { $unwind: '$_se' },
-            // Check for non-deload sets (plannedRir is not null)
-            {
-                $lookup: {
-                    from: collName,
-                    let: { seId: '$_se._id' },
-                    pipeline: [
-                        {
-                            $match: {
-                                $expr: { $eq: ['$workoutSessionExerciseId', '$$seId'] },
-                                docType: WorkoutSet_docType,
-                                plannedRir: { $ne: null }
-                            }
-                        },
-                        { $limit: 1 }
-                    ],
-                    as: '_nonDeload'
-                }
-            },
-            // Keep only session exercises with at least one non-deload set
-            { $match: { '_nonDeload.0': { $exists: true } } },
-            // Per exercise, keep only the most recent session exercise ($first after sort)
-            {
-                $group: {
-                    _id: '$_se.workoutExerciseId',
-                    lastSessionExercise: { $first: '$_se' }
-                }
-            },
-            // Join all sets from the session exercise's setOrder
-            {
-                $lookup: {
-                    from: collName,
-                    let: { setIds: '$lastSessionExercise.setOrder' },
-                    pipeline: [
-                        {
-                            $match: {
-                                $expr: { $in: ['$_id', '$$setIds'] },
-                                docType: WorkoutSet_docType
+                    },
+                    // Keep only session exercises with at least one non-deload set
+                    { $match: { '_nonDeload.0': { $exists: true } } }
+                ]
+                : [];
+            return [
+                // Start with all completed sessions for this user
+                { $match: { docType: WorkoutSession_docType, userId, complete: true } },
+                // Most recent sessions first
+                { $sort: { startTime: -1 } },
+                // Join each session's session exercises
+                {
+                    $lookup: {
+                        from: collName,
+                        let: { sessId: '$_id' },
+                        pipeline: [
+                            {
+                                $match: {
+                                    $expr: { $eq: ['$workoutSessionId', '$$sessId'] },
+                                    docType: WorkoutSessionExercise_docType
+                                }
                             }
-                        },
-                        // Preserve the original setOrder by sorting on index position
-                        {
-                            $addFields: {
-                                _sortIdx: { $indexOfArray: ['$$setIds', '$_id'] }
-                            }
-                        },
-                        { $sort: { _sortIdx: 1 } },
-                        { $project: { _sortIdx: 0 } }
-                    ],
-                    as: '_lastSessionSetsArr'
+                        ],
+                        as: '_se'
+                    }
+                },
+                // One row per session exercise (unwind coalescence optimization)
+                { $unwind: '$_se' },
+                ...accumulationFilter,
+                // Per exercise, keep only the most recent session exercise ($first after sort)
+                {
+                    $group: {
+                        _id: '$_se.workoutExerciseId',
+                        lastSessionExercise: { $first: '$_se' }
+                    }
+                },
+                // Join all sets from the session exercise's setOrder
+                {
+                    $lookup: {
+                        from: collName,
+                        let: { setIds: '$lastSessionExercise.setOrder' },
+                        pipeline: [
+                            {
+                                $match: {
+                                    $expr: { $in: ['$_id', '$$setIds'] },
+                                    docType: WorkoutSet_docType
+                                }
+                            },
+                            // Preserve the original setOrder by sorting on index position
+                            {
+                                $addFields: {
+                                    _sortIdx: { $indexOfArray: ['$$setIds', '$_id'] }
+                                }
+                            },
+                            { $sort: { _sortIdx: 1 } },
+                            { $project: { _sortIdx: 0 } }
+                        ],
+                        as: '_lastSessionSetsArr'
+                    }
                 }
-            }
-        ])
+            ];
+        };
+        // Pipeline B: most recent session exercise per exercise (any cycle type)
+        const pipelineBPromise = collection
+            .aggregate(buildLastSessionPipeline(false))
             .toArray();
-        const [rawExercises, rawLastSessions] = await Promise.all([pipelineAPromise, pipelineBPromise]);
-        // Build lookup map from Pipeline B
-        const lastSessionMap = new Map();
-        for (const row of rawLastSessions) {
-            lastSessionMap.set(row._id, {
-                lastSessionExercise: row.lastSessionExercise,
-                lastSessionSets: row._lastSessionSetsArr
-            });
-        }
+        // Pipeline C: most recent accumulation (non-deload) session exercise per exercise
+        const pipelineCPromise = collection
+            .aggregate(buildLastSessionPipeline(true))
+            .toArray();
+        const [rawExercises, rawLastSessions, rawLastAccumulationSessions] = await Promise.all([
+            pipelineAPromise,
+            pipelineBPromise,
+            pipelineCPromise
+        ]);
+        const lastSessionMap = new Map(rawLastSessions.map((row) => [row._id, row]));
+        const lastAccumulationMap = new Map(rawLastAccumulationSessions.map((row) => [row._id, row]));
         // Assemble and validate CTOs
         return rawExercises.map((raw) => {
             const { _equipArr, _bestCalArr, _bestSetArr, ...exerciseFields } = raw;
             if (_equipArr.length === 0) {
                 throw new Error(`Equipment type not found for exercise ${raw._id}`);
             }
-            const lastData = lastSessionMap.get(raw._id);
+            const lastRow = lastSessionMap.get(raw._id);
+            const lastAccumulationRow = lastAccumulationMap.get(raw._id);
             return WorkoutExerciseCTOSchema.parse({
                 ...exerciseFields,
                 equipmentType: _equipArr[0],
                 bestCalibration: _bestCalArr[0] ?? null,
                 bestSet: _bestSetArr[0] ?? null,
-                lastSessionExercise: lastData?.lastSessionExercise ?? null,
-                lastSessionSets: lastData?.lastSessionSets
+                lastSessionExercise: lastRow?.lastSessionExercise ?? null,
+                lastSessionSets: lastRow?._lastSessionSetsArr,
+                lastAccumulationSessionExercise: lastAccumulationRow?.lastSessionExercise ?? null,
+                lastAccumulationSessionSets: lastAccumulationRow?._lastSessionSetsArr
             });
         });
     }

package/lib/repositories/workout/WorkoutExerciseRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkoutExerciseRepository.js","sourceRoot":"","sources":["../../../src/repositories/workout/WorkoutExerciseRepository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkoutExerciseRepository.js","sourceRoot":"","sources":["../../../src/repositories/workout/WorkoutExerciseRepository.ts"],"names":[],"mappings":"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"}

package/lib/repositories/workout/WorkoutExerciseRepository.ts

@@ -18,6 +18,7 @@ import {
   WorkoutSet_docType
 } from '@aneuhold/core-ts-db-lib';
 import type { UUID } from 'crypto';
+import type { Document } from 'mongodb';
 import type { RepoListeners } from '../../services/RepoSubscriptionService.js';
 import WorkoutExerciseValidator from '../../validators/workout/ExerciseValidator.js';
 import WorkoutBaseWithUserIdRepository from './WorkoutBaseWithUserIdRepository.js';
@@ -58,9 +59,12 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
 
   /**
    * Builds {@link WorkoutExerciseCTO} objects for all exercises belonging to a user.
-   * Uses two parallel MongoDB aggregation pipelines:
+   * Uses three parallel MongoDB aggregation pipelines:
    * - Pipeline A: exercise + equipmentType + bestCalibration + bestSet
-   * - Pipeline B: lastSessionExercise + lastSessionSets (from most recent non-deload session)
+   * - Pipeline B (true latest): lastSessionExercise + lastSessionSets from the most
+   *   recent completed session, regardless of cycle type / deload status.
+   * - Pipeline C (accumulation): lastAccumulationSessionExercise +
+   *   lastAccumulationSessionSets from the most recent completed non-deload session.
    *
    * @param userId The user whose exercise CTOs to build.
    */
@@ -72,8 +76,8 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
       _bestSetArr: WorkoutSet[];
     }
 
-    /** Raw shape of Pipeline B results. */
-    interface PipelineBRow {
+    /** Raw shape of Pipeline B/C results. */
+    interface LastSessionRow {
       _id: string;
       lastSessionExercise: WorkoutSessionExercise;
       _lastSessionSetsArr: WorkoutSet[];
@@ -159,9 +163,36 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
       ])
       .toArray();
 
-    // Pipeline B: lastSessionExercise + lastFirstSet per exercise
-    const pipelineBPromise = collection
-      .aggregate<PipelineBRow>([
+    // Builds the pipeline that finds, per exercise, the most recent session
+    // exercise from a completed session — optionally restricted to non-deload
+    // sessions (where plannedRir is not null on at least one set).
+    const buildLastSessionPipeline = (accumulationOnly: boolean): Document[] => {
+      const accumulationFilter: Document[] = accumulationOnly
+        ? [
+            // Check for non-deload sets (plannedRir is not null)
+            {
+              $lookup: {
+                from: collName,
+                let: { seId: '$_se._id' },
+                pipeline: [
+                  {
+                    $match: {
+                      $expr: { $eq: ['$workoutSessionExerciseId', '$$seId'] },
+                      docType: WorkoutSet_docType,
+                      plannedRir: { $ne: null }
+                    }
+                  },
+                  { $limit: 1 }
+                ],
+                as: '_nonDeload'
+              }
+            },
+            // Keep only session exercises with at least one non-deload set
+            { $match: { '_nonDeload.0': { $exists: true } } }
+          ]
+        : [];
+
+      return [
         // Start with all completed sessions for this user
         { $match: { docType: WorkoutSession_docType, userId, complete: true } },
         // Most recent sessions first
@@ -184,26 +215,7 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
         },
         // One row per session exercise (unwind coalescence optimization)
         { $unwind: '$_se' },
-        // Check for non-deload sets (plannedRir is not null)
-        {
-          $lookup: {
-            from: collName,
-            let: { seId: '$_se._id' },
-            pipeline: [
-              {
-                $match: {
-                  $expr: { $eq: ['$workoutSessionExerciseId', '$$seId'] },
-                  docType: WorkoutSet_docType,
-                  plannedRir: { $ne: null }
-                }
-              },
-              { $limit: 1 }
-            ],
-            as: '_nonDeload'
-          }
-        },
-        // Keep only session exercises with at least one non-deload set
-        { $match: { '_nonDeload.0': { $exists: true } } },
+        ...accumulationFilter,
         // Per exercise, keep only the most recent session exercise ($first after sort)
         {
           $group: {
@@ -235,25 +247,27 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
             as: '_lastSessionSetsArr'
           }
         }
-      ])
+      ];
+    };
+
+    // Pipeline B: most recent session exercise per exercise (any cycle type)
+    const pipelineBPromise = collection
+      .aggregate<LastSessionRow>(buildLastSessionPipeline(false))
       .toArray();
 
-    const [rawExercises, rawLastSessions] = await Promise.all([pipelineAPromise, pipelineBPromise]);
+    // Pipeline C: most recent accumulation (non-deload) session exercise per exercise
+    const pipelineCPromise = collection
+      .aggregate<LastSessionRow>(buildLastSessionPipeline(true))
+      .toArray();
 
-    // Build lookup map from Pipeline B
-    const lastSessionMap = new Map<
-      string,
-      {
-        lastSessionExercise: WorkoutSessionExercise;
-        lastSessionSets: WorkoutSet[];
-      }
-    >();
-    for (const row of rawLastSessions) {
-      lastSessionMap.set(row._id, {
-        lastSessionExercise: row.lastSessionExercise,
-        lastSessionSets: row._lastSessionSetsArr
-      });
-    }
+    const [rawExercises, rawLastSessions, rawLastAccumulationSessions] = await Promise.all([
+      pipelineAPromise,
+      pipelineBPromise,
+      pipelineCPromise
+    ]);
+
+    const lastSessionMap = new Map(rawLastSessions.map((row) => [row._id, row]));
+    const lastAccumulationMap = new Map(rawLastAccumulationSessions.map((row) => [row._id, row]));
 
     // Assemble and validate CTOs
     return rawExercises.map((raw) => {
@@ -262,15 +276,18 @@ export default class WorkoutExerciseRepository extends WorkoutBaseWithUserIdRepo
         throw new Error(`Equipment type not found for exercise ${raw._id}`);
       }
 
-      const lastData = lastSessionMap.get(raw._id as string);
+      const lastRow = lastSessionMap.get(raw._id as string);
+      const lastAccumulationRow = lastAccumulationMap.get(raw._id as string);
 
       return WorkoutExerciseCTOSchema.parse({
         ...exerciseFields,
         equipmentType: _equipArr[0],
         bestCalibration: _bestCalArr[0] ?? null,
         bestSet: _bestSetArr[0] ?? null,
-        lastSessionExercise: lastData?.lastSessionExercise ?? null,
-        lastSessionSets: lastData?.lastSessionSets
+        lastSessionExercise: lastRow?.lastSessionExercise ?? null,
+        lastSessionSets: lastRow?._lastSessionSetsArr,
+        lastAccumulationSessionExercise: lastAccumulationRow?.lastSessionExercise ?? null,
+        lastAccumulationSessionSets: lastAccumulationRow?._lastSessionSetsArr
       });
     });
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aneuhold/be-ts-db-lib",
   "author": "Anton G. Neuhold Jr.",
   "license": "MIT",
-  "version": "4.2.22",
+  "version": "4.2.24",
   "description": "A backend database library meant to actually interact with various databases in personal projects",
   "packageManager": "pnpm@10.25.0",
   "type": "module",
@@ -58,8 +58,8 @@
     "MongoDB"
   ],
   "dependencies": {
-    "@aneuhold/be-ts-lib": "^3.1.9",
-    "@aneuhold/core-ts-db-lib": "^5.0.4",
+    "@aneuhold/be-ts-lib": "^3.1.11",
+    "@aneuhold/core-ts-db-lib": "^5.0.6",
     "@aneuhold/core-ts-lib": "^2.4.3",
     "bson": "^7.0.0",
     "google-auth-library": "^10.6.1",