Redesign & bug fixe: streak, Calendar, Home

backend/package.json

@@ -44,7 +44,6 @@
     "install": "^0.13.0",
     "jszip": "^3.10.1",
     "multer": "^2.1.1",
-    "npm": "^11.14.1",
     "passport": "^0.7.0",
     "passport-github2": "^0.1.12",
     "passport-google-oauth20": "^2.0.0",
@@ -59,14 +58,14 @@
     "typeorm": "^0.3.25"
   },
   "devDependencies": {
-    "@nestjs/cli": "^11.0.21",
+    "@nestjs/cli": "^11.0.0",
     "@nestjs/schematics": "^11.1.0",
     "@nestjs/testing": "^11.1.21",
     "@types/bcrypt": "^5.0.2",
     "@types/cookie-parser": "^1.4.9",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.2",
-    "@types/node": "^20.3.1",
+    "@types/node": "^22.0.0",
     "@types/passport-jwt": "^4.0.1",
     "@types/passport-local": "^1.0.38",
     "@types/supertest": "^6.0.0",
@@ -103,7 +102,6 @@
     "testEnvironment": "node"
   },
   "overrides": {
-    "@nestjs/mapped-types": "2.0.6",
     "fast-uri": "^3.1.2",
     "path-to-regexp": "^8.4.0",
     "picomatch": "^4.0.4",

backend/src/v1/activityLog/activityLog.service.ts

@@ -175,6 +175,7 @@ export class ActivityLogService {
     }
 
     await this.activityLogRepo.remove(log);
+    await this.userService.decrementStreakOnDeletion(userId);
   }
 
   async update(

backend/src/v1/migrations/1776000000000-AddRoleToUser.ts

@@ -17,15 +17,18 @@ import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
 
 export class AddRoleToUser1776000000000 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumn(
-      'user',
-      new TableColumn({
-        name: 'role',
-        type: 'varchar',
-        length: '20',
-        default: "'user'",
-      }),
-    );
+    const table = await queryRunner.getTable('user');
+    if (!table?.findColumnByName('role')) {
+      await queryRunner.addColumn(
+        'user',
+        new TableColumn({
+          name: 'role',
+          type: 'varchar',
+          length: '20',
+          default: "'user'",
+        }),
+      );
+    }
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {

backend/src/v1/user/user.service.ts

@@ -327,6 +327,7 @@ export class UserService {
     const sessions = await this.sessionRepo.find({
       where: {
         user: { id: userId },
+        status: 'finished',
       },
       select: ['startedAt'],
     });
@@ -358,6 +359,18 @@ export class UserService {
     return count;
   }
 
+  /**
+   * Decrement streak when a finished session or activity log is deleted
+   */
+  async decrementStreakOnDeletion(userId: number): Promise<void> {
+    const user = await this.userRepo.findOne({ where: { id: userId } });
+    if (!user) return;
+    if (user.currentStreak > 0) {
+      user.currentStreak -= 1;
+    }
+    await this.userRepo.save(user);
+  }
+
   /**
    * Update streak and weekly workout count when an activity log is created
    * Should be called after logging an activity

backend/src/v1/workoutSession/workoutSession.service.ts

@@ -667,7 +667,11 @@ export class WorkoutSessionService {
 
     if (!session) throw new NotFoundException('Session not found');
 
+    const wasFinished = session.status === 'finished';
     await this.sessionRepo.remove(session);
+    if (wasFinished) {
+      await this.userService.decrementStreakOnDeletion(userId);
+    }
     return { message: 'Workout session deleted' };
   }