@strong-together/shared 2.2.0 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.cjs CHANGED
@@ -69,14 +69,14 @@ __export(index_exports, {
69
69
  exerciseMapByMuscleRowQueryDtoSchema: () => exerciseMapByMuscleRowQueryDtoSchema,
70
70
  exerciseMetadataQueryDtoSchema: () => exerciseMetadataQueryDtoSchema,
71
71
  exerciseToWorkoutSplitDbSchema: () => exerciseToWorkoutSplitDbSchema,
72
- exerciseToWorkoutSplitExpandedViewDbSchema: () => exerciseToWorkoutSplitExpandedViewDbSchema,
72
+ exerciseToWorkoutSplitSetExpandedViewDbSchema: () => exerciseToWorkoutSplitSetExpandedViewDbSchema,
73
73
  exerciseTrackingAnalysisQueryDtoSchema: () => exerciseTrackingAnalysisQueryDtoSchema,
74
74
  exerciseTrackingAndStatsQueryDtoSchema: () => exerciseTrackingAndStatsQueryDtoSchema,
75
75
  exerciseTrackingAndStatsRowQueryDtoSchema: () => exerciseTrackingAndStatsRowQueryDtoSchema,
76
76
  exerciseTrackingDbSchema: () => exerciseTrackingDbSchema,
77
- exerciseTrackingExpandedViewDbSchema: () => exerciseTrackingExpandedViewDbSchema,
78
77
  exerciseTrackingIdQueryDtoSchema: () => exerciseTrackingIdQueryDtoSchema,
79
78
  exerciseTrackingPrMaxQueryDtoSchema: () => exerciseTrackingPrMaxQueryDtoSchema,
79
+ exerciseTrackingSetExpandedViewDbSchema: () => exerciseTrackingSetExpandedViewDbSchema,
80
80
  exercisesMapByMuscleQueryDtoSchema: () => exercisesMapByMuscleQueryDtoSchema,
81
81
  finishUserWorkoutContract: () => finishUserWorkoutContract,
82
82
  finishUserWorkoutResponseSchema: () => finishUserWorkoutResponseSchema,
@@ -1497,7 +1497,7 @@ var userRelations = (0, import_drizzle_orm27.relations)(user, ({ many, one }) =>
1497
1497
  var import_pg_core31 = require("drizzle-orm/pg-core");
1498
1498
  var import_drizzle_orm28 = require("drizzle-orm");
1499
1499
  var import_pg_core32 = require("drizzle-orm/pg-core");
1500
- var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_workout_split_expanded", {
1500
+ var exerciseToWorkoutSplitSetExpandedView = workoutSchema.view("v_exercise_to_workout_split_set_expanded", {
1501
1501
  id: (0, import_pg_core31.bigint)("id", {
1502
1502
  mode: "number"
1503
1503
  }),
@@ -1559,18 +1559,18 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
1559
1559
  var import_drizzle_orm29 = require("drizzle-orm");
1560
1560
  var import_pg_core33 = require("drizzle-orm/pg-core");
1561
1561
  var import_pg_core34 = require("drizzle-orm/pg-core");
1562
- var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_expanded", {
1562
+ var exerciseTrackingSetExpandedView = analyticsSchema.view("v_exercise_tracking_set_expanded", {
1563
1563
  id: (0, import_pg_core33.bigint)("id", {
1564
1564
  mode: "number"
1565
1565
  }),
1566
1566
  exerciseToSplitId: (0, import_pg_core33.bigint)("exercise_to_split_id", {
1567
1567
  mode: "number"
1568
1568
  }),
1569
- isAssignedToSplit: (0, import_pg_core33.boolean)("is_assigned_to_split"),
1570
1569
  weight: (0, import_pg_core33.real)("weight"),
1571
1570
  reps: (0, import_pg_core33.bigint)("reps", {
1572
1571
  mode: "number"
1573
1572
  }),
1573
+ orderIndex: (0, import_pg_core34.integer)("order_index"),
1574
1574
  setIndex: (0, import_pg_core34.integer)("set_index"),
1575
1575
  exerciseId: (0, import_pg_core33.bigint)("exercise_id", {
1576
1576
  mode: "number"
@@ -1580,6 +1580,8 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
1580
1580
  }),
1581
1581
  splitName: (0, import_pg_core33.text)("split_name"),
1582
1582
  exercise: (0, import_pg_core33.text)("exercise"),
1583
+ targetMuscle: (0, import_pg_core33.text)("target_muscle"),
1584
+ specificTargetMuscle: (0, import_pg_core33.text)("specific_target_muscle"),
1583
1585
  notes: (0, import_pg_core33.text)("notes"),
1584
1586
  workoutSummaryId: (0, import_pg_core33.uuid)("workout_summary_id"),
1585
1587
  workoutStartUtc: (0, import_pg_core33.timestamp)("workout_start_utc", {
@@ -1587,28 +1589,32 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
1587
1589
  }),
1588
1590
  workoutEndUtc: (0, import_pg_core33.timestamp)("workout_end_utc", {
1589
1591
  withTimezone: true
1590
- })
1592
+ }),
1593
+ isAssignedToSplit: (0, import_pg_core33.boolean)("is_assigned_to_split")
1591
1594
  }).with({
1592
1595
  securityInvoker: true
1593
1596
  }).as(import_drizzle_orm29.sql`
1594
1597
  SELECT
1595
1598
  et.id,
1596
1599
  et.exercise_to_split_id,
1597
- CASE
1598
- WHEN et.exercise_to_split_id IS NOT NULL THEN TRUE
1599
- WHEN et.exercise_id IS NOT NULL THEN FALSE
1600
- END AS is_assigned_to_split,
1601
1600
  tracking_set.weight AS weight,
1602
1601
  tracking_set.reps AS reps,
1602
+ ews.order_index AS order_index,
1603
1603
  tracking_set.set_index AS set_index,
1604
1604
  COALESCE(ews.exercise_id, et.exercise_id) AS exercise_id,
1605
1605
  wsumm.workout_split_id,
1606
1606
  ws.name AS split_name,
1607
1607
  ex.name AS exercise,
1608
+ ex.target_muscle AS target_muscle,
1609
+ ex.specific_target_muscle AS specific_target_muscle,
1608
1610
  et.notes,
1609
1611
  et.workout_summary_id,
1610
1612
  wsumm.workout_start_utc,
1611
- wsumm.workout_end_utc
1613
+ wsumm.workout_end_utc,
1614
+ CASE
1615
+ WHEN et.exercise_to_split_id IS NOT NULL THEN TRUE
1616
+ WHEN et.exercise_id IS NOT NULL THEN FALSE
1617
+ END AS is_assigned_to_split
1612
1618
  FROM
1613
1619
  tracking.exercise_tracking et
1614
1620
  LEFT JOIN tracking.workout_summary wsumm ON wsumm.id = et.workout_summary_id
@@ -1621,6 +1627,7 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
1621
1627
  // ../../src/infrastructure/db/schema/drizzle/analytics/views/prs.view.ts
1622
1628
  var import_drizzle_orm30 = require("drizzle-orm");
1623
1629
  var import_pg_core35 = require("drizzle-orm/pg-core");
1630
+ var import_pg_core36 = require("drizzle-orm/pg-core");
1624
1631
  var prsView = analyticsSchema.view("v_prs", {
1625
1632
  id: (0, import_pg_core35.bigint)("id", {
1626
1633
  mode: "number"
@@ -1632,6 +1639,7 @@ var prsView = analyticsSchema.view("v_prs", {
1632
1639
  mode: "number"
1633
1640
  }),
1634
1641
  exercise: (0, import_pg_core35.text)("exercise"),
1642
+ setIndex: (0, import_pg_core36.integer)("set_index"),
1635
1643
  weight: (0, import_pg_core35.real)("weight"),
1636
1644
  reps: (0, import_pg_core35.bigint)("reps", {
1637
1645
  mode: "number"
@@ -1651,13 +1659,14 @@ var prsView = analyticsSchema.view("v_prs", {
1651
1659
  et.exercise_to_split_id,
1652
1660
  et.exercise_id,
1653
1661
  et.exercise,
1662
+ et.set_index,
1654
1663
  et.weight,
1655
1664
  et.reps,
1656
1665
  et.workout_summary_id,
1657
1666
  et.workout_start_utc,
1658
1667
  et.workout_end_utc
1659
1668
  FROM
1660
- analytics.v_exercise_tracking_expanded et
1669
+ analytics.v_exercise_tracking_set_expanded et
1661
1670
  ORDER BY
1662
1671
  et.exercise_id,
1663
1672
  et.weight DESC,
@@ -1675,7 +1684,7 @@ var exerciseDbSchema = (0, import_drizzle_zod.createSelectSchema)(exercise);
1675
1684
  var workoutPlanDbSchema = (0, import_drizzle_zod.createSelectSchema)(workoutPlan);
1676
1685
  var workoutSplitDbSchema = (0, import_drizzle_zod.createSelectSchema)(workoutSplit);
1677
1686
  var exerciseToWorkoutSplitDbSchema = (0, import_drizzle_zod.createSelectSchema)(exerciseToWorkoutSplit);
1678
- var exerciseToWorkoutSplitExpandedViewDbSchema = (0, import_drizzle_zod.createSelectSchema)(exerciseToWorkoutSplitExpandedView);
1687
+ var exerciseToWorkoutSplitSetExpandedViewDbSchema = (0, import_drizzle_zod.createSelectSchema)(exerciseToWorkoutSplitSetExpandedView);
1679
1688
  var workoutSetDbSchema = (0, import_drizzle_zod.createSelectSchema)(workoutSet);
1680
1689
  var workoutSummaryDbSchema = (0, import_drizzle_zod.createSelectSchema)(workoutSummary);
1681
1690
  var exerciseTrackingDbSchema = (0, import_drizzle_zod.createSelectSchema)(exerciseTracking);
@@ -1684,7 +1693,7 @@ var aerobicTrackingDbSchema = (0, import_drizzle_zod.createSelectSchema)(aerobic
1684
1693
  var messageDbSchema = (0, import_drizzle_zod.createSelectSchema)(message);
1685
1694
  var userReminderSettingDbSchema = (0, import_drizzle_zod.createSelectSchema)(userReminderSetting);
1686
1695
  var userSplitInformationDbSchema = (0, import_drizzle_zod.createSelectSchema)(userSplitInformation);
1687
- var exerciseTrackingExpandedViewDbSchema = (0, import_drizzle_zod.createSelectSchema)(exerciseTrackingExpandedView);
1696
+ var exerciseTrackingSetExpandedViewDbSchema = (0, import_drizzle_zod.createSelectSchema)(exerciseTrackingSetExpandedView);
1688
1697
  var prsViewDbSchema = (0, import_drizzle_zod.createSelectSchema)(prsView);
1689
1698
 
1690
1699
  // src/modules/aerobics/aerobics.contracts.ts
@@ -1972,15 +1981,17 @@ var userByIdentifierQueryDtoSchema = import_v413.z.object({
1972
1981
  name: userDbSchema.shape.name,
1973
1982
  username: userDbSchema.shape.username,
1974
1983
  email: userDbSchema.shape.email.optional(),
1975
- password: userDbSchema.shape.passwordHash,
1984
+ passwordHash: userDbSchema.shape.passwordHash,
1976
1985
  role: userDbSchema.shape.role,
1977
1986
  isVerified: userDbSchema.shape.isVerified,
1978
1987
  lastLogin: serializedDateSchema.nullable().optional()
1979
1988
  });
1980
1989
  var userByIdentifierRawQueryDtoSchema = userByIdentifierQueryDtoSchema.omit({
1981
1990
  isVerified: true,
1982
- lastLogin: true
1991
+ lastLogin: true,
1992
+ passwordHash: true
1983
1993
  }).extend({
1994
+ password_hash: userDbSchema.shape.passwordHash,
1984
1995
  is_verified: import_v413.z.boolean(),
1985
1996
  last_login: serializedDateSchema.nullable()
1986
1997
  });
@@ -1988,8 +1999,10 @@ var userByIdentifierRowQueryDtoSchema = import_v413.z.object({
1988
1999
  userData: userByIdentifierRawQueryDtoSchema.nullable()
1989
2000
  });
1990
2001
  var userByUsernameRawQueryDtoSchema = userByIdentifierQueryDtoSchema.omit({
1991
- isVerified: true
2002
+ isVerified: true,
2003
+ passwordHash: true
1992
2004
  }).extend({
2005
+ password_hash: userDbSchema.shape.passwordHash,
1993
2006
  is_verified: import_v413.z.boolean()
1994
2007
  });
1995
2008
  var userByUsernameRowQueryDtoSchema = import_v413.z.object({
@@ -2222,12 +2235,55 @@ var trackingByDateItemQueryDtoSchema = trackingMapItemQueryDtoSchema.omit({
2222
2235
  var trackingBySplitNameItemQueryDtoSchema = trackingMapItemQueryDtoSchema.omit({
2223
2236
  splitName: true
2224
2237
  });
2238
+ var groupedTrackingItemQueryDtoSchema = import_v418.z.object({
2239
+ exerciseTracking: import_v418.z.object({
2240
+ exerciseTrackingId: exerciseTrackingDbSchema.shape.id,
2241
+ sets: import_v418.z.array(import_v418.z.object({
2242
+ setIndex: trackingSetDbSchema.shape.setIndex,
2243
+ weight: trackingSetDbSchema.shape.weight,
2244
+ reps: trackingSetDbSchema.shape.reps
2245
+ })),
2246
+ notes: exerciseTrackingDbSchema.shape.notes,
2247
+ exerciseAssignment: import_v418.z.object({
2248
+ exerciseToSplitId: exerciseTrackingDbSchema.shape.exerciseToSplitId,
2249
+ orderIndex: exerciseToWorkoutSplitDbSchema.shape.orderIndex.nullable(),
2250
+ exerciseId: exerciseDbSchema.shape.id,
2251
+ workoutSplitId: workoutSplitDbSchema.shape.id,
2252
+ workoutSplitName: workoutSplitDbSchema.shape.name,
2253
+ exerciseName: exerciseDbSchema.shape.name,
2254
+ targetMuscle: exerciseDbSchema.shape.targetMuscle,
2255
+ specificTargetMuscle: exerciseDbSchema.shape.specificTargetMuscle
2256
+ })
2257
+ })
2258
+ });
2225
2259
  var exerciseTrackingAndStatsQueryDtoSchema = import_v418.z.object({
2226
- exerciseTrackingAnalysis: exerciseTrackingAnalysisQueryDtoSchema,
2227
- exerciseTrackingMaps: import_v418.z.object({
2228
- byDate: import_v418.z.record(import_v418.z.string(), import_v418.z.array(trackingByDateItemQueryDtoSchema)),
2229
- byExerciseToSplitId: import_v418.z.record(import_v418.z.string(), import_v418.z.array(trackingMapItemQueryDtoSchema)),
2230
- bySplitName: import_v418.z.record(import_v418.z.string(), import_v418.z.array(trackingBySplitNameItemQueryDtoSchema))
2260
+ trackingStats: import_v418.z.object({
2261
+ workoutCount: import_v418.z.coerce.number(),
2262
+ hasExerciseTracking: import_v418.z.boolean(),
2263
+ workoutTargets: import_v418.z.object({
2264
+ workoutCountThisWeek: import_v418.z.coerce.number(),
2265
+ workoutCountScheduledPerWeek: import_v418.z.coerce.number(),
2266
+ weekStreak: import_v418.z.coerce.number()
2267
+ }),
2268
+ lastWorkoutStats: import_v418.z.object({
2269
+ workoutDate: import_v418.z.string().nullable(),
2270
+ workoutSplitName: workoutSplitDbSchema.shape.name.nullable(),
2271
+ exerciseTrackedCount: import_v418.z.coerce.number().nullable(),
2272
+ setTrackedCount: import_v418.z.coerce.number().nullable()
2273
+ }),
2274
+ prs: import_v418.z.array(import_v418.z.object({
2275
+ exerciseToSplitId: exerciseTrackingDbSchema.shape.exerciseToSplitId,
2276
+ exerciseId: exerciseDbSchema.shape.id,
2277
+ exerciseName: exerciseDbSchema.shape.name,
2278
+ prWeight: trackingSetDbSchema.shape.weight,
2279
+ prReps: trackingSetDbSchema.shape.reps,
2280
+ prSetIndex: trackingSetDbSchema.shape.setIndex
2281
+ }))
2282
+ }),
2283
+ trackingMaps: import_v418.z.object({
2284
+ byDate: import_v418.z.record(import_v418.z.string(), import_v418.z.array(groupedTrackingItemQueryDtoSchema)),
2285
+ byExerciseToSplitId: import_v418.z.record(import_v418.z.string(), import_v418.z.array(groupedTrackingItemQueryDtoSchema)),
2286
+ bySplitName: import_v418.z.record(import_v418.z.string(), import_v418.z.array(groupedTrackingItemQueryDtoSchema))
2231
2287
  })
2232
2288
  });
2233
2289
  var exerciseTrackingAndStatsRowQueryDtoSchema = import_v418.z.object({
@@ -2647,14 +2703,14 @@ var finishUserWorkoutContract = {
2647
2703
  exerciseMapByMuscleRowQueryDtoSchema,
2648
2704
  exerciseMetadataQueryDtoSchema,
2649
2705
  exerciseToWorkoutSplitDbSchema,
2650
- exerciseToWorkoutSplitExpandedViewDbSchema,
2706
+ exerciseToWorkoutSplitSetExpandedViewDbSchema,
2651
2707
  exerciseTrackingAnalysisQueryDtoSchema,
2652
2708
  exerciseTrackingAndStatsQueryDtoSchema,
2653
2709
  exerciseTrackingAndStatsRowQueryDtoSchema,
2654
2710
  exerciseTrackingDbSchema,
2655
- exerciseTrackingExpandedViewDbSchema,
2656
2711
  exerciseTrackingIdQueryDtoSchema,
2657
2712
  exerciseTrackingPrMaxQueryDtoSchema,
2713
+ exerciseTrackingSetExpandedViewDbSchema,
2658
2714
  exercisesMapByMuscleQueryDtoSchema,
2659
2715
  finishUserWorkoutContract,
2660
2716
  finishUserWorkoutResponseSchema,