@studious-lms/server 1.2.52 → 1.3.0

package/tests/utils/prismaErrorHandler.test.ts

@@ -0,0 +1,101 @@
+import { describe, test, expect } from 'vitest';
+import {
+  handlePrismaError,
+  getFieldDisplayName,
+} from '../../src/utils/prismaErrorHandler.js';
+import {
+  PrismaClientKnownRequestError,
+  PrismaClientValidationError,
+  PrismaClientUnknownRequestError,
+} from '@prisma/client/runtime/library';
+
+describe('prismaErrorHandler', () => {
+  describe('handlePrismaError', () => {
+    test('handles PrismaClientKnownRequestError P2002 (unique constraint)', () => {
+      const error = new PrismaClientKnownRequestError('Unique constraint', {
+        code: 'P2002',
+        clientVersion: '6.0.0',
+        meta: { target: ['email'] },
+      });
+      const result = handlePrismaError(error);
+      expect(result.code).toBe('P2002');
+      expect(result.message).toContain('already exists');
+      expect(result.details).toContain('Unique constraint');
+    });
+
+    test('handles P2002 with array target', () => {
+      const error = new PrismaClientKnownRequestError('Unique', {
+        code: 'P2002',
+        clientVersion: '6.0.0',
+        meta: { target: ['username', 'email'] },
+      });
+      const result = handlePrismaError(error);
+      expect(result.message).toContain('username, email');
+    });
+
+    test('handles PrismaClientKnownRequestError P2025 (record not found)', () => {
+      const error = new PrismaClientKnownRequestError('Record not found', {
+        code: 'P2025',
+        clientVersion: '6.0.0',
+      });
+      const result = handlePrismaError(error);
+      expect(result.code).toBe('P2025');
+      expect(result.message).toContain('does not exist');
+    });
+
+    test('handles PrismaClientKnownRequestError P2003 (foreign key)', () => {
+      const error = new PrismaClientKnownRequestError('Foreign key', {
+        code: 'P2003',
+        clientVersion: '6.0.0',
+        meta: { field_name: 'classId' },
+      });
+      const result = handlePrismaError(error);
+      expect(result.code).toBe('P2003');
+      expect(result.message).toContain('referenced by other records');
+    });
+
+    test('handles PrismaClientValidationError', () => {
+      const error = new PrismaClientValidationError('Invalid data', {
+        clientVersion: '6.0.0',
+      });
+      const result = handlePrismaError(error);
+      expect(result.message).toBe('The data you provided is not valid');
+      expect(result.meta?.type).toBe('validation_error');
+    });
+
+    test('handles PrismaClientUnknownRequestError', () => {
+      const error = new PrismaClientUnknownRequestError('Unknown DB error', {
+        clientVersion: '6.0.0',
+      });
+      const result = handlePrismaError(error);
+      expect(result.message).toBe('An unexpected database error occurred');
+      expect(result.meta?.type).toBe('unknown_request_error');
+    });
+
+    test('handles generic Error', () => {
+      const error = new Error('Something went wrong');
+      const result = handlePrismaError(error);
+      expect(result.message).toBe('Something went wrong');
+      expect(result.details).toBeDefined();
+    });
+
+    test('handles non-Error unknown', () => {
+      const result = handlePrismaError('string error');
+      expect(result.message).toBe('An unknown database error occurred');
+      expect(result.details).toBe('string error');
+    });
+  });
+
+  describe('getFieldDisplayName', () => {
+    test('returns mapped display names for known fields', () => {
+      expect(getFieldDisplayName('username')).toBe('username');
+      expect(getFieldDisplayName('email')).toBe('email address');
+      expect(getFieldDisplayName('classId')).toBe('class');
+      expect(getFieldDisplayName('assignmentId')).toBe('assignment');
+    });
+
+    test('returns field name as-is for unknown fields', () => {
+      expect(getFieldDisplayName('unknownField')).toBe('unknownField');
+    });
+  });
+});

package/tests/utils/prismaWrapper.test.ts

@@ -0,0 +1,82 @@
+import { describe, test, expect, vi } from 'vitest';
+import {
+  withPrismaErrorHandling,
+  prismaWrapper,
+} from '../../src/utils/prismaWrapper.js';
+import { TRPCError } from '@trpc/server';
+import { PrismaClientKnownRequestError } from '@prisma/client/runtime/library';
+
+// Suppress console.error in tests
+vi.spyOn(console, 'error').mockImplementation(() => {});
+
+describe('prismaWrapper', () => {
+  describe('withPrismaErrorHandling', () => {
+    test('returns result when operation succeeds', async () => {
+      const result = await withPrismaErrorHandling(
+        async () => ({ id: '1', name: 'test' }),
+        'test op'
+      );
+      expect(result).toEqual({ id: '1', name: 'test' });
+    });
+
+    test('throws TRPCError with user-friendly message on Prisma P2002', async () => {
+      const error = new PrismaClientKnownRequestError('Unique', {
+        code: 'P2002',
+        clientVersion: '6.0.0',
+        meta: { target: ['email'] },
+      });
+      await expect(
+        withPrismaErrorHandling(async () => {
+          throw error;
+        }, 'create user')
+      ).rejects.toThrow(TRPCError);
+
+      try {
+        await withPrismaErrorHandling(async () => {
+          throw error;
+        }, 'create user');
+      } catch (e) {
+        expect(e).toBeInstanceOf(TRPCError);
+        expect((e as TRPCError).code).toBe('CONFLICT');
+        expect((e as TRPCError).message).toContain('already exists');
+      }
+    });
+
+    test('throws TRPCError with NOT_FOUND on P2025', async () => {
+      const error = new PrismaClientKnownRequestError('Not found', {
+        code: 'P2025',
+        clientVersion: '6.0.0',
+      });
+      try {
+        await withPrismaErrorHandling(async () => {
+          throw error;
+        });
+      } catch (e) {
+        expect(e).toBeInstanceOf(TRPCError);
+        expect((e as TRPCError).code).toBe('NOT_FOUND');
+      }
+    });
+  });
+
+  describe('prismaWrapper helpers', () => {
+    test('findUnique returns result', async () => {
+      const result = await prismaWrapper.findUnique(
+        async () => ({ id: '1' }),
+        'test'
+      );
+      expect(result).toEqual({ id: '1' });
+    });
+
+    test('create propagates Prisma errors as TRPCError', async () => {
+      const error = new PrismaClientKnownRequestError('Unique', {
+        code: 'P2002',
+        clientVersion: '6.0.0',
+      });
+      await expect(
+        prismaWrapper.create(async () => {
+          throw error;
+        })
+      ).rejects.toThrow(TRPCError);
+    });
+  });
+});

package/tests/worksheet.test.ts

@@ -0,0 +1,181 @@
+import { test, expect, describe, beforeAll } from 'vitest';
+import { user1Caller } from './setup';
+
+describe('Worksheet Router', () => {
+  let testClass: any;
+  let worksheetId: string;
+  let questionId: string;
+  let secondQuestionId: string;
+
+  beforeAll(async () => {
+    testClass = await user1Caller.class.create({
+      name: 'Worksheet Test Class',
+      subject: 'Physics',
+      section: '12th Grade',
+    });
+  });
+
+  describe('create', () => {
+    test('should create a worksheet', async () => {
+      const worksheet = await user1Caller.worksheet.create({
+        classId: testClass.id,
+        name: 'Chapter 1 Quiz',
+      });
+
+      expect(worksheet).toBeDefined();
+      expect(worksheet.name).toBe('Chapter 1 Quiz');
+      expect(worksheet.classId).toBe(testClass.id);
+      worksheetId = worksheet.id;
+    });
+  });
+
+  describe('listWorksheets', () => {
+    test('should list worksheets for a class', async () => {
+      const worksheets = await user1Caller.worksheet.listWorksheets({
+        classId: testClass.id,
+      });
+
+      expect(Array.isArray(worksheets)).toBe(true);
+      expect(worksheets.length).toBeGreaterThanOrEqual(1);
+      expect(worksheets.some((w) => w.id === worksheetId)).toBe(true);
+    });
+  });
+
+  describe('getWorksheet', () => {
+    test('should get a worksheet by ID', async () => {
+      const worksheet = await user1Caller.worksheet.getWorksheet({
+        worksheetId,
+      });
+
+      expect(worksheet).toBeDefined();
+      expect(worksheet.id).toBe(worksheetId);
+      expect(worksheet.name).toBe('Chapter 1 Quiz');
+    });
+
+    test('should fail for non-existent worksheet', async () => {
+      await expect(
+        user1Caller.worksheet.getWorksheet({ worksheetId: 'nonexistent' }),
+      ).rejects.toThrow();
+    });
+  });
+
+  describe('updateWorksheet', () => {
+    test('should update worksheet name', async () => {
+      const updated = await user1Caller.worksheet.updateWorksheet({
+        worksheetId,
+        name: 'Chapter 1 Test',
+      });
+
+      expect(updated.name).toBe('Chapter 1 Test');
+    });
+  });
+
+  describe('addQuestion', () => {
+    test('should add a short answer question', async () => {
+      const question = await user1Caller.worksheet.addQuestion({
+        worksheetId,
+        question: 'What is Newton\'s second law?',
+        answer: 'F = ma',
+        points: 5,
+        type: 'SHORT_ANSWER',
+      });
+
+      expect(question).toBeDefined();
+      expect(question.question).toBe('What is Newton\'s second law?');
+      expect(question.answer).toBe('F = ma');
+      expect(question.points).toBe(5);
+      questionId = question.id;
+    });
+
+    test('should add a multiple choice question', async () => {
+      const question = await user1Caller.worksheet.addQuestion({
+        worksheetId,
+        question: 'What is the SI unit of force?',
+        answer: 'Newton',
+        points: 3,
+        type: 'MULTIPLE_CHOICE',
+        options: [
+          { id: 'a', text: 'Joule', isCorrect: false },
+          { id: 'b', text: 'Newton', isCorrect: true },
+          { id: 'c', text: 'Watt', isCorrect: false },
+          { id: 'd', text: 'Pascal', isCorrect: false },
+        ],
+      });
+
+      expect(question).toBeDefined();
+      expect(question.type).toBe('MULTIPLE_CHOICE');
+      secondQuestionId = question.id;
+    });
+
+    test('should fail for non-existent worksheet', async () => {
+      await expect(
+        user1Caller.worksheet.addQuestion({
+          worksheetId: 'nonexistent',
+          question: 'Test',
+          answer: 'Test',
+          type: 'SHORT_ANSWER',
+        }),
+      ).rejects.toThrow();
+    });
+  });
+
+  describe('updateQuestion', () => {
+    test('should update a question', async () => {
+      const updated = await user1Caller.worksheet.updateQuestion({
+        worksheetId,
+        questionId,
+        question: 'State Newton\'s second law of motion.',
+        points: 10,
+      });
+
+      expect(updated.question).toBe('State Newton\'s second law of motion.');
+      expect(updated.points).toBe(10);
+    });
+  });
+
+  describe('reorderQuestions', () => {
+    test('should reorder questions', async () => {
+      const result = await user1Caller.worksheet.reorderQuestions({
+        worksheetId,
+        movedId: secondQuestionId,
+        position: 'before',
+        targetId: questionId,
+      });
+
+      expect(Array.isArray(result)).toBe(true);
+      expect(result.length).toBe(2);
+      const ids = result.map((r) => r.id);
+      expect(ids).toContain(questionId);
+      expect(ids).toContain(secondQuestionId);
+    });
+  });
+
+  describe('deleteQuestion', () => {
+    test('should delete a question', async () => {
+      const result = await user1Caller.worksheet.deleteQuestion({
+        worksheetId,
+        questionId: secondQuestionId,
+      });
+
+      expect(result.id).toBe(secondQuestionId);
+
+      const worksheet = await user1Caller.worksheet.getWorksheet({ worksheetId });
+      expect(worksheet.questions.length).toBe(1);
+    });
+  });
+
+  describe('deleteWorksheet', () => {
+    test('should delete a worksheet', async () => {
+      const toDelete = await user1Caller.worksheet.create({
+        classId: testClass.id,
+        name: 'Temporary Worksheet',
+      });
+
+      const result = await user1Caller.worksheet.deleteWorksheet({
+        worksheetId: toDelete.id,
+      });
+
+      expect(result.id).toBe(toDelete.id);
+    });
+  });
+});

package/vitest.config.ts

@@ -12,14 +12,17 @@ export default defineConfig({
     hookTimeout: 60000, // 60 seconds
     testTimeout: 30000, // 30 seconds per test
     include: ['tests/**/*.test.ts'],
-    setupFiles: ['./tests/setup.ts'], // run setup before tests
-    // Run tests sequentially to avoid database conflicts
-    // Can be changed to true once tests are fully isolated
+    globalSetup: ['./tests/globalSetup.ts'],
+    setupFiles: ['./tests/setup.ts'],
     sequence: {
       concurrent: false,
     },
     coverage: {
       exclude: [
+        "src/types/trpc.ts",
+        "src/instrument.ts",
+        "*.config.ts",
+        "tests/**",
         "generated/**",
         "prisma/**",
         "scripts/**",

package/vitest.unit.config.ts

@@ -0,0 +1,21 @@
+import { defineConfig } from 'vitest/config';
+import { config } from 'dotenv';
+import { resolve } from 'path';
+
+// Load test environment variables
+config({ path: resolve(process.cwd(), '.env.test'), override: true });
+
+/**
+ * Unit test config - no DB, no globalSetup.
+ * Use: npm run test:unit
+ */
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'node',
+    include: ['tests/utils/**/*.test.ts', 'tests/server/**/*.test.ts', 'tests/middleware/**/*.test.ts', 'tests/lib/**/*.test.ts'],
+    env: {
+      NODE_ENV: 'test',
+    },
+  },
+});

package/TODO.md

@@ -1,2 +0,0 @@
-router --> server --> model
-router: make lots of middleware. call middleware

package/coverage/base.css

@@ -1,224 +0,0 @@
-body, html {
-  margin:0; padding: 0;
-  height: 100%;
-}
-body {
-    font-family: Helvetica Neue, Helvetica, Arial;
-    font-size: 14px;
-    color:#333;
-}
-.small { font-size: 12px; }
-*, *:after, *:before {
-  -webkit-box-sizing:border-box;
-     -moz-box-sizing:border-box;
-          box-sizing:border-box;
-  }
-h1 { font-size: 20px; margin: 0;}
-h2 { font-size: 14px; }
-pre {
-    font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
-    margin: 0;
-    padding: 0;
-    -moz-tab-size: 2;
-    -o-tab-size:  2;
-    tab-size: 2;
-}
-a { color:#0074D9; text-decoration:none; }
-a:hover { text-decoration:underline; }
-.strong { font-weight: bold; }
-.space-top1 { padding: 10px 0 0 0; }
-.pad2y { padding: 20px 0; }
-.pad1y { padding: 10px 0; }
-.pad2x { padding: 0 20px; }
-.pad2 { padding: 20px; }
-.pad1 { padding: 10px; }
-.space-left2 { padding-left:55px; }
-.space-right2 { padding-right:20px; }
-.center { text-align:center; }
-.clearfix { display:block; }
-.clearfix:after {
-  content:'';
-  display:block;
-  height:0;
-  clear:both;
-  visibility:hidden;
-  }
-.fl { float: left; }
-@media only screen and (max-width:640px) {
-  .col3 { width:100%; max-width:100%; }
-  .hide-mobile { display:none!important; }
-}
-
-.quiet {
-  color: #7f7f7f;
-  color: rgba(0,0,0,0.5);
-}
-.quiet a { opacity: 0.7; }
-
-.fraction {
-  font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
-  font-size: 10px;
-  color: #555;
-  background: #E8E8E8;
-  padding: 4px 5px;
-  border-radius: 3px;
-  vertical-align: middle;
-}
-
-div.path a:link, div.path a:visited { color: #333; }
-table.coverage {
-  border-collapse: collapse;
-  margin: 10px 0 0 0;
-  padding: 0;
-}
-
-table.coverage td {
-  margin: 0;
-  padding: 0;
-  vertical-align: top;
-}
-table.coverage td.line-count {
-    text-align: right;
-    padding: 0 5px 0 20px;
-}
-table.coverage td.line-coverage {
-    text-align: right;
-    padding-right: 10px;
-    min-width:20px;
-}
-
-table.coverage td span.cline-any {
-    display: inline-block;
-    padding: 0 5px;
-    width: 100%;
-}
-.missing-if-branch {
-    display: inline-block;
-    margin-right: 5px;
-    border-radius: 3px;
-    position: relative;
-    padding: 0 4px;
-    background: #333;
-    color: yellow;
-}
-
-.skip-if-branch {
-    display: none;
-    margin-right: 10px;
-    position: relative;
-    padding: 0 4px;
-    background: #ccc;
-    color: white;
-}
-.missing-if-branch .typ, .skip-if-branch .typ {
-    color: inherit !important;
-}
-.coverage-summary {
-  border-collapse: collapse;
-  width: 100%;
-}
-.coverage-summary tr { border-bottom: 1px solid #bbb; }
-.keyline-all { border: 1px solid #ddd; }
-.coverage-summary td, .coverage-summary th { padding: 10px; }
-.coverage-summary tbody { border: 1px solid #bbb; }
-.coverage-summary td { border-right: 1px solid #bbb; }
-.coverage-summary td:last-child { border-right: none; }
-.coverage-summary th {
-  text-align: left;
-  font-weight: normal;
-  white-space: nowrap;
-}
-.coverage-summary th.file { border-right: none !important; }
-.coverage-summary th.pct { }
-.coverage-summary th.pic,
-.coverage-summary th.abs,
-.coverage-summary td.pct,
-.coverage-summary td.abs { text-align: right; }
-.coverage-summary td.file { white-space: nowrap;  }
-.coverage-summary td.pic { min-width: 120px !important;  }
-.coverage-summary tfoot td { }
-
-.coverage-summary .sorter {
-    height: 10px;
-    width: 7px;
-    display: inline-block;
-    margin-left: 0.5em;
-    background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
-}
-.coverage-summary .sorted .sorter {
-    background-position: 0 -20px;
-}
-.coverage-summary .sorted-desc .sorter {
-    background-position: 0 -10px;
-}
-.status-line {  height: 10px; }
-/* yellow */
-.cbranch-no { background: yellow !important; color: #111; }
-/* dark red */
-.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
-.low .chart { border:1px solid #C21F39 }
-.highlighted,
-.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{
-  background: #C21F39 !important;
-}
-/* medium red */
-.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
-/* light red */
-.low, .cline-no { background:#FCE1E5 }
-/* light green */
-.high, .cline-yes { background:rgb(230,245,208) }
-/* medium green */
-.cstat-yes { background:rgb(161,215,106) }
-/* dark green */
-.status-line.high, .high .cover-fill { background:rgb(77,146,33) }
-.high .chart { border:1px solid rgb(77,146,33) }
-/* dark yellow (gold) */
-.status-line.medium, .medium .cover-fill { background: #f9cd0b; }
-.medium .chart { border:1px solid #f9cd0b; }
-/* light yellow */
-.medium { background: #fff4c2; }
-
-.cstat-skip { background: #ddd; color: #111; }
-.fstat-skip { background: #ddd; color: #111 !important; }
-.cbranch-skip { background: #ddd !important; color: #111; }
-
-span.cline-neutral { background: #eaeaea; }
-
-.coverage-summary td.empty {
-    opacity: .5;
-    padding-top: 4px;
-    padding-bottom: 4px;
-    line-height: 1;
-    color: #888;
-}
-
-.cover-fill, .cover-empty {
-  display:inline-block;
-  height: 12px;
-}
-.chart {
-  line-height: 0;
-}
-.cover-empty {
-    background: white;
-}
-.cover-full {
-    border-right: none !important;
-}
-pre.prettyprint {
-    border: none !important;
-    padding: 0 !important;
-    margin: 0 !important;
-}
-.com { color: #999 !important; }
-.ignore-none { color: #999; font-weight: normal; }
-
-.wrapper {
-  min-height: 100%;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -48px;
-}
-.footer, .push {
-  height: 48px;
-}