Beta - update 1

Dockerfile.api

@@ -1,11 +1,12 @@
 FROM node:22-slim
 
-# Install sharp dependencies for Debian ARM
+# Install sharp dependencies and procps for Debian ARM
 RUN apt-get update && apt-get install -y \
     bash \
     curl \
     git \
     libvips-dev \
+    procps \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app

backend/src/v1/auth/dto/UserWithoutPassword.dto.ts

@@ -20,12 +20,24 @@ export class UserWithoutPasswordDto {
   @ApiProperty({ default: true })
   showRpe: boolean;
 
+  @ApiProperty({ default: 3 })
+  weeklyWorkoutGoal: number;
+
+  @ApiProperty({ default: 0 })
+  currentStreak: number;
+
+  @ApiProperty({ default: 0 })
+  currentWeekWorkouts: number;
+
   constructor(user: User) {
     this.id = user.id;
     this.email = user.email;
     this.firstName = user.firstName;
     this.lastName = user.lastName;
     this.avatar = user.avatar;
     this.showRpe = user.showRpe ?? true;
+    this.weeklyWorkoutGoal = user.weeklyWorkoutGoal ?? 3;
+    this.currentStreak = user.currentStreak ?? 0;
+    this.currentWeekWorkouts = user.currentWeekWorkouts ?? 0;
   }
 }

backend/src/v1/exercise/dto/exerciseResponse.dto.ts

@@ -20,6 +20,12 @@ export class ExerciseResponseDto {
   })
   isNameCustom?: boolean;
 
+  @ApiProperty({
+    required: false,
+    description: 'If true, the user has customized this exercise after importing it',
+  })
+  isCustomized?: boolean;
+
   @ApiProperty({
     required: false,
     description:

backend/src/v1/exercise/exercise.service.ts

@@ -23,6 +23,7 @@ export class ExerciseService {
       name: exercise.name,
       i18nKey: exercise.i18nKey,
       isNameCustom: exercise.isNameCustom,
+      isCustomized: exercise.isCustomized,
       globalExerciseId: exercise.globalExercise?.id,
       description: exercise.description,
       image: exercise.image,

backend/src/v1/migrations/1768754686-AddStreakToUser.ts

@@ -0,0 +1,52 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+export class AddStreakToUser1768754686 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Add weeklyWorkoutGoal column
+    await queryRunner.addColumn(
+      'user',
+      new TableColumn({
+        name: 'weeklyWorkoutGoal',
+        type: 'int',
+        default: 3,
+      }),
+    );
+
+    // Add currentStreak column
+    await queryRunner.addColumn(
+      'user',
+      new TableColumn({
+        name: 'currentStreak',
+        type: 'int',
+        default: 0,
+      }),
+    );
+
+    // Add lastStreakCheckDate column
+    await queryRunner.addColumn(
+      'user',
+      new TableColumn({
+        name: 'lastStreakCheckDate',
+        type: 'timestamp',
+        isNullable: true,
+      }),
+    );
+
+    // Add currentWeekWorkouts column
+    await queryRunner.addColumn(
+      'user',
+      new TableColumn({
+        name: 'currentWeekWorkouts',
+        type: 'int',
+        default: 0,
+      }),
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropColumn('user', 'currentWeekWorkouts');
+    await queryRunner.dropColumn('user', 'lastStreakCheckDate');
+    await queryRunner.dropColumn('user', 'currentStreak');
+    await queryRunner.dropColumn('user', 'weeklyWorkoutGoal');
+  }
+}

backend/src/v1/user/dto/UpdateUser.dto.ts

@@ -1,4 +1,4 @@
-import { IsBoolean, IsOptional, IsString } from 'class-validator';
+import { IsBoolean, IsEmail, IsOptional, IsString, MinLength } from 'class-validator';
 
 export class UpdateUserDto {
   @IsOptional()
@@ -9,10 +9,23 @@ export class UpdateUserDto {
   @IsString()
   lastName?: string;
 
+  @IsOptional()
+  @IsEmail()
+  email?: string;
+
   @IsOptional()
   @IsString()
   avatar?: string;
 
+  @IsOptional()
+  @IsString()
+  currentPassword?: string;
+
+  @IsOptional()
+  @IsString()
+  @MinLength(8)
+  newPassword?: string;
+
   @IsOptional()
   @IsBoolean()
   showRpe?: boolean;

backend/src/v1/user/user.controller.ts

@@ -90,7 +90,7 @@ export class UserController {
   @ApiOkResponse({ type: UserWithoutPasswordDto })
   @UseInterceptors(FileInterceptor('file', { storage: undefined }))
   async uploadAvatar(
-    @UploadedFile() file: Express.Multer.File,
+    @UploadedFile() file: any,
     @Req() req: RequestWithUser,
   ): Promise<UserWithoutPasswordDto> {
     if (!req.user?.id) {
@@ -110,4 +110,40 @@ export class UserController {
 
     return this.userService.updateAvatar(+req.user.id, avatarUrl);
   }
+
+  @Get('streak')
+  @ApiOperation({ summary: 'Get user streak information' })
+  @ApiOkResponse({
+    description: 'User streak information',
+    schema: {
+      example: {
+        currentStreak: 5,
+        weeklyWorkoutGoal: 3,
+        currentWeekWorkouts: 2,
+        progressPercentage: 67,
+      },
+    },
+  })
+  getStreak(@Req() req: RequestWithUser) {
+    if (!req.user?.id) {
+      throw new UnauthorizedException('User not authenticated');
+    }
+    return this.userService.getStreakInfo(+req.user.id);
+  }
+
+  @Put('weekly-goal')
+  @ApiOperation({ summary: 'Update weekly workout goal' })
+  @ApiOkResponse({ type: UserWithoutPasswordDto })
+  updateWeeklyGoal(
+    @Req() req: RequestWithUser,
+    @Body() body: { weeklyWorkoutGoal: number },
+  ) {
+    if (!req.user?.id) {
+      throw new UnauthorizedException('User not authenticated');
+    }
+    return this.userService.updateWeeklyWorkoutGoal(
+      +req.user.id,
+      body.weeklyWorkoutGoal,
+    );
+  }
 }

backend/src/v1/user/user.entity.ts

@@ -32,6 +32,18 @@ export class User {
   @Column({ default: true })
   showRpe: boolean;
 
+  @Column({ default: 3 })
+  weeklyWorkoutGoal: number;
+
+  @Column({ default: 0 })
+  currentStreak: number;
+
+  @Column({ type: 'timestamp', nullable: true })
+  lastStreakCheckDate: Date;
+
+  @Column({ default: 0 })
+  currentWeekWorkouts: number;
+
   @CreateDateColumn()
   createdAt: Date;