Merge branch 'main' into fix/mercy60-issues-653-654-663-666

Author: MaryammAli

.github/workflows/backend-academy.yml

@@ -0,0 +1,43 @@
+name: BackendAcademy CI
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - 'BackendAcademy/**'
+      - '.github/workflows/backend-academy.yml'
+  pull_request:
+    branches: [ main ]
+    paths:
+      - 'BackendAcademy/**'
+      - '.github/workflows/backend-academy.yml'
+
+jobs:
+  integration-and-ai-tests:
+    name: Learner journey & AI tests
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: BackendAcademy
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        # --legacy-peer-deps: joi-to-typescript (devDependency) pins joi@17
+        # while the app targets joi@18.
+        run: npm ci --no-audit --no-fund --legacy-peer-deps
+
+      # BA-075: the end-to-end learner submission journey (happy, retry,
+      # unauthorized, partial-failure paths) plus the AI provider/service
+      # suites run in CI with isolated in-memory fixtures.
+      - name: Run learner-journey integration & AI tests
+        env:
+          NODE_ENV: test
+        run: npx jest --config jest.config.ts --runInBand src/integration/learner-journey.spec.ts src/ai

BackendAcademy/.env.example

@@ -39,6 +39,10 @@ OPENAI_API_KEY=             # Required when AI_PROVIDER=openai
 AI_MODEL=                   # Model override (optional)
 AI_MAX_TOKENS=4096
 AI_TEMPERATURE=0.7
+# BA-078: Retry policy for transient AI provider errors (429/5xx)
+AI_RETRY_MAX_ATTEMPTS=3
+AI_RETRY_BASE_DELAY_MS=250
+AI_RETRY_MAX_DELAY_MS=5000
 
 # Static & uploaded assets
 ASSETS_UPLOAD_DIR=./data/uploads  # Where uploaded assets are persisted on disk

BackendAcademy/package-lock.json

@@ -27,6 +27,8 @@
     "joi": "^18.0.2",
     "multer": "^2.2.0",
     "prom-client": "^15.1.3",
+    "@willsoto/nestjs-prometheus": "^6.0.0",
+    "axios": "^1.7.9",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.8.1",
     "typeorm": "^0.3.30",

BackendAcademy/package.json

@@ -0,0 +1,63 @@
+import { ConfigService } from '@nestjs/config';
+import { validateAiConfig } from './ai.module';
+
+function configService(values: Record<string, unknown>): ConfigService {
+  return { get: <T = unknown>(key: string): T | undefined => values[key] as T } as ConfigService;
+}
+
+describe('validateAiConfig — BA-076 startup credential validation', () => {
+  it('accepts mock mode without any API keys', () => {
+    expect(() =>
+      validateAiConfig(configService({ AI_PROVIDER: 'mock' })),
+    ).not.toThrow();
+  });
+
+  it('accepts an unset AI_PROVIDER (defaults to mock)', () => {
+    expect(() => validateAiConfig(configService({}))).not.toThrow();
+  });
+
+  it('accepts openai when OPENAI_API_KEY is set', () => {
+    expect(() =>
+      validateAiConfig(
+        configService({ AI_PROVIDER: 'openai', OPENAI_API_KEY: 'sk-test' }),
+      ),
+    ).not.toThrow();
+  });
+
+  it('accepts claude when ANTHROPIC_API_KEY is set', () => {
+    expect(() =>
+      validateAiConfig(
+        configService({ AI_PROVIDER: 'claude', ANTHROPIC_API_KEY: 'sk-ant-test' }),
+      ),
+    ).not.toThrow();
+  });
+
+  it('rejects openai without OPENAI_API_KEY with an actionable message', () => {
+    expect(() => validateAiConfig(configService({ AI_PROVIDER: 'openai' }))).toThrow(
+      /AI_PROVIDER is "openai" but OPENAI_API_KEY is not set/,
+    );
+  });
+
+  it('rejects claude without ANTHROPIC_API_KEY with an actionable message', () => {
+    expect(() => validateAiConfig(configService({ AI_PROVIDER: 'claude' }))).toThrow(
+      /AI_PROVIDER is "claude" but ANTHROPIC_API_KEY is not set/,
+    );
+  });
+
+  it('rejects an empty (whitespace) key value', () => {
+    expect(() =>
+      validateAiConfig(configService({ AI_PROVIDER: 'openai', OPENAI_API_KEY: '   ' })),
+    ).toThrow(/OPENAI_API_KEY is not set/);
+  });
+
+  it('does not leak credential values in error messages', () => {
+    let message = '';
+    try {
+      validateAiConfig(configService({ AI_PROVIDER: 'claude' }));
+    } catch (err) {
+      message = (err as Error).message;
+    }
+    expect(message).not.toContain('sk-ant');
+    expect(message).toContain('ANTHROPIC_API_KEY');
+  });
+});

BackendAcademy/src/ai/ai.module.spec.ts

@@ -6,10 +6,31 @@ import { PromptTemplateService } from './prompt-template.service';
 import { ClaudeProvider } from './providers/claude.provider';
 import { OpenaiProvider } from './providers/openai.provider';
 
-function validateAiConfig(configService: ConfigService): void {
-  const provider = configService.get<string>('AI_PROVIDER');
-  if (provider && !['openai', 'claude'].includes(provider)) {
-    throw new Error(`Invalid AI_PROVIDER: ${provider}. Must be 'openai' or 'claude'.`);
+/**
+ * BA-076: Validate the AI configuration at startup, before any request
+ * arrives.
+ *
+ * Rules:
+ * - `AI_PROVIDER=openai` requires `OPENAI_API_KEY`.
+ * - `AI_PROVIDER=claude` requires `ANTHROPIC_API_KEY`.
+ * - `AI_PROVIDER=mock` (or unset) requires no credentials.
+ *
+ * Error messages are actionable and sanitized: they name the missing
+ * variable and the fix, but never echo credential values.
+ */
+export function validateAiConfig(configService: ConfigService): void {
+  const provider = configService.get<string>('AI_PROVIDER') ?? 'mock';
+
+  if (provider === 'openai' || provider === 'claude') {
+    const credentialsKey =
+      provider === 'openai' ? 'OPENAI_API_KEY' : 'ANTHROPIC_API_KEY';
+    const apiKey = configService.get<string>(credentialsKey);
+    if (!apiKey || apiKey.trim().length === 0) {
+      throw new Error(
+        `AI_PROVIDER is "${provider}" but ${credentialsKey} is not set. ` +
+          `Set ${credentialsKey} to your API key, or switch AI_PROVIDER to "mock" for local development.`,
+      );
+    }
   }
 
   const numericParams: Array<{ key: string; min: number; max: number; integer?: boolean }> = [
@@ -31,7 +52,7 @@ function validateAiConfig(configService: ConfigService): void {
       throw new Error(`AI config ${param.key} must be an integer, got "${raw}".`);
     }
     if (num < param.min || num > param.max) {
-      throw new Error(`AI config ${param.key} must be tween ${param.min} and ${param.max}, got "${raw}".`);
+      throw new Error(`AI config ${param.key} must be between ${param.min} and ${param.max}, got "${raw}".`);
     }
     process.env[param.key] = String(num);
   }
@@ -43,7 +64,7 @@ function validateAiConfig(configService: ConfigService): void {
     const lower = raw.toLowerCase();
     if (['true', '1', 'yes', 'y', 'on'].includes(lower)) {
       process.env[key] = 'true';
-    } else if (['false', '0', 'no' , 'n', 'off'].includes(lower)) {
+    } else if (['false', '0', 'no', 'n', 'off'].includes(lower)) {
       process.env[key] = 'false';
     } else {
       throw new Error(`AI config ${key} must be a boolean, got "${raw}".`);
@@ -65,7 +86,6 @@ const aiProviderFactory = {
 
 @Module({
   controllers: [AiController],
-  //ai controller
   providers: [AiService, PromptTemplateService, aiProviderFactory],
   exports: [AiService, PromptTemplateService],
 })