Merge branch 'main' into fix-1246-user-consent-indexes

Author: Peolite001

.github/workflows/ci.yml

@@ -65,8 +65,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 11
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -113,8 +111,6 @@ jobs:
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 11
 
       - name: Setup Node
         uses: actions/setup-node@v4

jest.config.js

@@ -73,6 +73,9 @@ module.exports = {
 
   // ─── Ignore patterns ───────────────────────────────────────────────────────
   testPathIgnorePatterns: ['/node_modules/', '/dist/', '/coverage/', '\\.integration\\.spec\\.ts$'],
+  transformIgnorePatterns: [
+    '[/\\\\]node_modules[/\\\\](?!(\\.pnpm|sanitize-html|htmlparser2|entities|dom-serializer|domelementtype|domhandler|domutils)[/\\\\])',
+  ],
 
   // ─── Output & lifecycle ────────────────────────────────────────────────────
   verbose: true,

package.json

@@ -5,6 +5,8 @@
   "author": "",
   "private": true,
   "license": "UNLICENSED",
+  "packageManager": "pnpm@9.1.0",
+  "prNote": "Added packageManager field per issue #1209",
   "scripts": {
     "license:scan": "node scripts/scan-licenses.js",
     "build": "nest build",

pnpm-lock.yaml

@@ -1,3 +1,6 @@
+packages:
+  - '.'
+
 allowBuilds:
   '@apollo/protobufjs': true
   '@nestjs/core': true

pnpm-workspace.yaml

@@ -6,6 +6,7 @@ import {
   UpdateDateColumn,
   ManyToOne,
   VersionColumn,
+  Index,
 } from 'typeorm';
 import { Experiment } from './experiment.entity';
 export enum MetricType {
@@ -20,6 +21,10 @@ export enum MetricType {
  * Represents the experiment Metric entity.
  */
 @Entity({ name: 'experiment_metrics' })
+@Index('IDX_experiment_metrics_experiment_id', ['experiment'])
+@Index('IDX_experiment_metrics_type', ['type'])
+@Index('IDX_experiment_metrics_created_at', ['createdAt'])
+@Index('IDX_experiment_metrics_experiment_is_primary', ['experiment', 'isPrimary'])
 export class ExperimentMetric {
   @PrimaryGeneratedColumn('uuid')
   id: string;

src/ab-testing/entities/experiment-metric.entity.ts

@@ -1,5 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
+import { MoreThanOrEqual } from 'typeorm';
 import { AchievementsNotificationsService } from './achievements-notifications.service';
 import { UserAchievement } from './entities/user-achievement.entity';
 import { Achievement } from './entities/achievement.entity';
@@ -83,6 +84,41 @@ describe('AchievementsNotificationsService', () => {
       expect(count).toBe(2);
     });
 
+    it('selects achievements unlocked since midnight today with notificationSent=false', async () => {
+      const achievement = makeUserAchievement();
+      mockRepo.find.mockResolvedValue([achievement]);
+      mockRepo.update.mockResolvedValue({ affected: 1 });
+
+      const today = new Date();
+      today.setHours(0, 0, 0, 0);
+
+      const count = await service.sendBatchNotifications();
+
+      expect(count).toBe(1);
+      expect(mockRepo.find).toHaveBeenCalledWith(
+        expect.objectContaining({
+          where: {
+            unlockedAt: MoreThanOrEqual(today),
+            notificationSent: false,
+          },
+        }),
+      );
+    });
+
+    it('processes a large backlog in bounded chunks', async () => {
+      const batchA = Array.from({ length: 100 }, () => makeUserAchievement());
+      const batchB = Array.from({ length: 3 }, () => makeUserAchievement());
+      // First call returns a full batch, second returns a short batch (loop ends).
+      mockRepo.find.mockResolvedValueOnce(batchA).mockResolvedValueOnce(batchB);
+      mockRepo.update.mockResolvedValue({ affected: 1 });
+
+      const count = await service.sendBatchNotifications();
+
+      expect(count).toBe(103);
+      expect(mockRepo.find).toHaveBeenCalledWith(expect.objectContaining({ take: 100 }));
+      expect(mockRepo.update).toHaveBeenCalledTimes(103);
+    });
+
     it('returns 0 when find throws', async () => {
       mockRepo.find.mockRejectedValue(new Error('connection lost'));
 

src/achievements/achievements-notifications.service.spec.ts

@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { MoreThanOrEqual, Repository } from 'typeorm';
 import { UserAchievement } from './entities/user-achievement.entity';
 
 /**
@@ -62,25 +62,45 @@ export class AchievementsNotificationsService {
 
   /**
    * Send batch notifications for achievements unlocked today
+   * Processes achievements in bounded chunks so a large backlog is not
+   * loaded or sent in a single tight loop.
    */
   async sendBatchNotifications(): Promise<number> {
+    const BATCH_SIZE = 100;
+
     try {
       const today = new Date();
       today.setHours(0, 0, 0, 0);
 
-      const achievements = await this.userAchievementRepository.find({
-        where: {
-          unlockedAt: new Date(),
-          notificationSent: false,
-        },
-        relations: ['user', 'achievement'],
-      });
-
       let sentCount = 0;
-
-      for (const userAchievement of achievements) {
-        await this.sendAchievementUnlockedNotification(userAchievement);
-        sentCount++;
+      let skip = 0;
+      let keepProcessing = true;
+
+      while (keepProcessing) {
+        const achievements = await this.userAchievementRepository.find({
+          where: {
+            unlockedAt: MoreThanOrEqual(today),
+            notificationSent: false,
+          },
+          relations: ['user', 'achievement'],
+          take: BATCH_SIZE,
+          skip,
+        });
+
+        if (achievements.length === 0) {
+          keepProcessing = false;
+          continue;
+        }
+
+        for (const userAchievement of achievements) {
+          await this.sendAchievementUnlockedNotification(userAchievement);
+          sentCount++;
+        }
+
+        skip += achievements.length;
+
+        // Stop when a chunk returns fewer than the batch size (no more pending).
+        keepProcessing = achievements.length === BATCH_SIZE;
       }
 
       this.logger.log(`Sent ${sentCount} achievement notifications`);

src/achievements/achievements-notifications.service.ts

@@ -3,8 +3,10 @@ import {
   PrimaryGeneratedColumn,
   Column,
   ManyToOne,
+  JoinColumn,
   OneToMany,
   VersionColumn,
+  Index,
 } from 'typeorm';
 import { AssessmentStatus } from '../enums/assessment-status.enum';
 import { Answer } from './answer.entity';
@@ -14,6 +16,10 @@ import { Assessment } from './assessment.entity';
  * Represents the assessment Attempt entity.
  */
 @Entity()
+@Index('IDX_assessment_attempt_studentId', ['studentId'])
+@Index('IDX_assessment_attempt_assessmentId', ['assessmentId'])
+@Index('IDX_assessment_attempt_status', ['status'])
+@Index('IDX_assessment_attempt_studentId_assessmentId', ['studentId', 'assessmentId'])
 export class AssessmentAttempt {
   @PrimaryGeneratedColumn('uuid')
   id: string;
@@ -25,8 +31,12 @@ export class AssessmentAttempt {
   studentId: string;
 
   @ManyToOne(() => Assessment)
+  @JoinColumn({ name: 'assessmentId' })
   assessment: Assessment;
 
+  @Column({ name: 'assessmentId', type: 'uuid', nullable: true })
+  assessmentId: string | null;
+
   @Column({ type: 'enum', enum: AssessmentStatus })
   status: AssessmentStatus;