@strong-together/shared 2.2.0 → 2.4.0

package/dist/index.js

@@ -1291,7 +1291,7 @@ var userRelations = relations14(user, ({ many, one }) => ({
 import { bigint as bigint12, boolean as boolean7, text as text9, timestamp as timestamp11 } from "drizzle-orm/pg-core";
 import { sql as drizzleSql25 } from "drizzle-orm";
 import { integer as integer5 } from "drizzle-orm/pg-core";
-var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_workout_split_expanded", {
+var exerciseToWorkoutSplitSetExpandedView = workoutSchema.view("v_exercise_to_workout_split_set_expanded", {
   id: bigint12("id", {
     mode: "number"
   }),
@@ -1353,18 +1353,18 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
 import { sql as drizzleSql26 } from "drizzle-orm";
 import { bigint as bigint13, boolean as boolean8, real as real2, text as text10, timestamp as timestamp12, uuid as uuid12 } from "drizzle-orm/pg-core";
 import { integer as integer6 } from "drizzle-orm/pg-core";
-var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_expanded", {
+var exerciseTrackingSetExpandedView = analyticsSchema.view("v_exercise_tracking_set_expanded", {
   id: bigint13("id", {
     mode: "number"
   }),
   exerciseToSplitId: bigint13("exercise_to_split_id", {
     mode: "number"
   }),
-  isAssignedToSplit: boolean8("is_assigned_to_split"),
   weight: real2("weight"),
   reps: bigint13("reps", {
     mode: "number"
   }),
+  orderIndex: integer6("order_index"),
   setIndex: integer6("set_index"),
   exerciseId: bigint13("exercise_id", {
     mode: "number"
@@ -1374,6 +1374,8 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
   }),
   splitName: text10("split_name"),
   exercise: text10("exercise"),
+  targetMuscle: text10("target_muscle"),
+  specificTargetMuscle: text10("specific_target_muscle"),
   notes: text10("notes"),
   workoutSummaryId: uuid12("workout_summary_id"),
   workoutStartUtc: timestamp12("workout_start_utc", {
@@ -1381,28 +1383,32 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
   }),
   workoutEndUtc: timestamp12("workout_end_utc", {
     withTimezone: true
-  })
+  }),
+  isAssignedToSplit: boolean8("is_assigned_to_split")
 }).with({
   securityInvoker: true
 }).as(drizzleSql26`
     SELECT
       et.id,
       et.exercise_to_split_id,
-      CASE
-        WHEN et.exercise_to_split_id IS NOT NULL THEN TRUE
-        WHEN et.exercise_id IS NOT NULL THEN FALSE
-      END AS is_assigned_to_split,
       tracking_set.weight AS weight,
       tracking_set.reps AS reps,
+      ews.order_index AS order_index,
       tracking_set.set_index AS set_index,
       COALESCE(ews.exercise_id, et.exercise_id) AS exercise_id,
       wsumm.workout_split_id,
       ws.name AS split_name,
       ex.name AS exercise,
+      ex.target_muscle AS target_muscle,
+      ex.specific_target_muscle AS specific_target_muscle,
       et.notes,
       et.workout_summary_id,
       wsumm.workout_start_utc,
-      wsumm.workout_end_utc
+      wsumm.workout_end_utc,
+      CASE
+        WHEN et.exercise_to_split_id IS NOT NULL THEN TRUE
+        WHEN et.exercise_id IS NOT NULL THEN FALSE
+      END AS is_assigned_to_split
     FROM
       tracking.exercise_tracking et
       LEFT JOIN tracking.workout_summary wsumm ON wsumm.id = et.workout_summary_id
@@ -1415,6 +1421,7 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
 // ../../src/infrastructure/db/schema/drizzle/analytics/views/prs.view.ts
 import { sql as drizzleSql27 } from "drizzle-orm";
 import { bigint as bigint14, real as real3, text as text11, timestamp as timestamp13, uuid as uuid13 } from "drizzle-orm/pg-core";
+import { integer as integer7 } from "drizzle-orm/pg-core";
 var prsView = analyticsSchema.view("v_prs", {
   id: bigint14("id", {
     mode: "number"
@@ -1426,6 +1433,7 @@ var prsView = analyticsSchema.view("v_prs", {
     mode: "number"
   }),
   exercise: text11("exercise"),
+  setIndex: integer7("set_index"),
   weight: real3("weight"),
   reps: bigint14("reps", {
     mode: "number"
@@ -1445,13 +1453,14 @@ var prsView = analyticsSchema.view("v_prs", {
       et.exercise_to_split_id,
       et.exercise_id,
       et.exercise,
+      et.set_index,
       et.weight,
       et.reps,
       et.workout_summary_id,
       et.workout_start_utc,
       et.workout_end_utc
     FROM
-      analytics.v_exercise_tracking_expanded et
+      analytics.v_exercise_tracking_set_expanded et
     ORDER BY
       et.exercise_id,
       et.weight DESC,
@@ -1469,7 +1478,7 @@ var exerciseDbSchema = createSelectSchema(exercise);
 var workoutPlanDbSchema = createSelectSchema(workoutPlan);
 var workoutSplitDbSchema = createSelectSchema(workoutSplit);
 var exerciseToWorkoutSplitDbSchema = createSelectSchema(exerciseToWorkoutSplit);
-var exerciseToWorkoutSplitExpandedViewDbSchema = createSelectSchema(exerciseToWorkoutSplitExpandedView);
+var exerciseToWorkoutSplitSetExpandedViewDbSchema = createSelectSchema(exerciseToWorkoutSplitSetExpandedView);
 var workoutSetDbSchema = createSelectSchema(workoutSet);
 var workoutSummaryDbSchema = createSelectSchema(workoutSummary);
 var exerciseTrackingDbSchema = createSelectSchema(exerciseTracking);
@@ -1478,7 +1487,7 @@ var aerobicTrackingDbSchema = createSelectSchema(aerobicTracking);
 var messageDbSchema = createSelectSchema(message);
 var userReminderSettingDbSchema = createSelectSchema(userReminderSetting);
 var userSplitInformationDbSchema = createSelectSchema(userSplitInformation);
-var exerciseTrackingExpandedViewDbSchema = createSelectSchema(exerciseTrackingExpandedView);
+var exerciseTrackingSetExpandedViewDbSchema = createSelectSchema(exerciseTrackingSetExpandedView);
 var prsViewDbSchema = createSelectSchema(prsView);
 
 // src/modules/aerobics/aerobics.contracts.ts
@@ -1766,15 +1775,17 @@ var userByIdentifierQueryDtoSchema = z13.object({
   name: userDbSchema.shape.name,
   username: userDbSchema.shape.username,
   email: userDbSchema.shape.email.optional(),
-  password: userDbSchema.shape.passwordHash,
+  passwordHash: userDbSchema.shape.passwordHash,
   role: userDbSchema.shape.role,
   isVerified: userDbSchema.shape.isVerified,
   lastLogin: serializedDateSchema.nullable().optional()
 });
 var userByIdentifierRawQueryDtoSchema = userByIdentifierQueryDtoSchema.omit({
   isVerified: true,
-  lastLogin: true
+  lastLogin: true,
+  passwordHash: true
 }).extend({
+  password_hash: userDbSchema.shape.passwordHash,
   is_verified: z13.boolean(),
   last_login: serializedDateSchema.nullable()
 });
@@ -1782,8 +1793,10 @@ var userByIdentifierRowQueryDtoSchema = z13.object({
   userData: userByIdentifierRawQueryDtoSchema.nullable()
 });
 var userByUsernameRawQueryDtoSchema = userByIdentifierQueryDtoSchema.omit({
-  isVerified: true
+  isVerified: true,
+  passwordHash: true
 }).extend({
+  password_hash: userDbSchema.shape.passwordHash,
   is_verified: z13.boolean()
 });
 var userByUsernameRowQueryDtoSchema = z13.object({
@@ -2016,12 +2029,55 @@ var trackingByDateItemQueryDtoSchema = trackingMapItemQueryDtoSchema.omit({
 var trackingBySplitNameItemQueryDtoSchema = trackingMapItemQueryDtoSchema.omit({
   splitName: true
 });
+var groupedTrackingItemQueryDtoSchema = z18.object({
+  exerciseTracking: z18.object({
+    exerciseTrackingId: exerciseTrackingDbSchema.shape.id,
+    sets: z18.array(z18.object({
+      setIndex: trackingSetDbSchema.shape.setIndex,
+      weight: trackingSetDbSchema.shape.weight,
+      reps: trackingSetDbSchema.shape.reps
+    })),
+    notes: exerciseTrackingDbSchema.shape.notes,
+    exerciseAssignment: z18.object({
+      exerciseToSplitId: exerciseTrackingDbSchema.shape.exerciseToSplitId,
+      orderIndex: exerciseToWorkoutSplitDbSchema.shape.orderIndex.nullable(),
+      exerciseId: exerciseDbSchema.shape.id,
+      workoutSplitId: workoutSplitDbSchema.shape.id,
+      workoutSplitName: workoutSplitDbSchema.shape.name,
+      exerciseName: exerciseDbSchema.shape.name,
+      targetMuscle: exerciseDbSchema.shape.targetMuscle,
+      specificTargetMuscle: exerciseDbSchema.shape.specificTargetMuscle
+    })
+  })
+});
 var exerciseTrackingAndStatsQueryDtoSchema = z18.object({
-  exerciseTrackingAnalysis: exerciseTrackingAnalysisQueryDtoSchema,
-  exerciseTrackingMaps: z18.object({
-    byDate: z18.record(z18.string(), z18.array(trackingByDateItemQueryDtoSchema)),
-    byExerciseToSplitId: z18.record(z18.string(), z18.array(trackingMapItemQueryDtoSchema)),
-    bySplitName: z18.record(z18.string(), z18.array(trackingBySplitNameItemQueryDtoSchema))
+  trackingStats: z18.object({
+    workoutCount: z18.coerce.number(),
+    hasExerciseTracking: z18.boolean(),
+    workoutTargets: z18.object({
+      workoutCountThisWeek: z18.coerce.number(),
+      workoutCountScheduledPerWeek: z18.coerce.number(),
+      weekStreak: z18.coerce.number()
+    }),
+    lastWorkoutStats: z18.object({
+      workoutDate: z18.string().nullable(),
+      workoutSplitName: workoutSplitDbSchema.shape.name.nullable(),
+      exerciseTrackedCount: z18.coerce.number().nullable(),
+      setTrackedCount: z18.coerce.number().nullable()
+    }),
+    prs: z18.array(z18.object({
+      exerciseToSplitId: exerciseTrackingDbSchema.shape.exerciseToSplitId,
+      exerciseId: exerciseDbSchema.shape.id,
+      exerciseName: exerciseDbSchema.shape.name,
+      prWeight: trackingSetDbSchema.shape.weight,
+      prReps: trackingSetDbSchema.shape.reps,
+      prSetIndex: trackingSetDbSchema.shape.setIndex
+    }))
+  }),
+  trackingMaps: z18.object({
+    byDate: z18.record(z18.string(), z18.array(groupedTrackingItemQueryDtoSchema)),
+    byExerciseToSplitId: z18.record(z18.string(), z18.array(groupedTrackingItemQueryDtoSchema)),
+    bySplitName: z18.record(z18.string(), z18.array(groupedTrackingItemQueryDtoSchema))
   })
 });
 var exerciseTrackingAndStatsRowQueryDtoSchema = z18.object({
@@ -2440,14 +2496,14 @@ export {
   exerciseMapByMuscleRowQueryDtoSchema,
   exerciseMetadataQueryDtoSchema,
   exerciseToWorkoutSplitDbSchema,
-  exerciseToWorkoutSplitExpandedViewDbSchema,
+  exerciseToWorkoutSplitSetExpandedViewDbSchema,
   exerciseTrackingAnalysisQueryDtoSchema,
   exerciseTrackingAndStatsQueryDtoSchema,
   exerciseTrackingAndStatsRowQueryDtoSchema,
   exerciseTrackingDbSchema,
-  exerciseTrackingExpandedViewDbSchema,
   exerciseTrackingIdQueryDtoSchema,
   exerciseTrackingPrMaxQueryDtoSchema,
+  exerciseTrackingSetExpandedViewDbSchema,
   exercisesMapByMuscleQueryDtoSchema,
   finishUserWorkoutContract,
   finishUserWorkoutResponseSchema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strong-together/shared",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",