Merge branch 'main' of https://github.com/trycompai/comp into claudio/fix-portal

Author: claudfuen

apps/api/.gitignore

@@ -54,3 +54,6 @@ pids
 
 # Diagnostic reports (https://nodejs.org/api/report.html)
 report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+
+prisma/schema.prisma

apps/api/Dockerfile

@@ -29,4 +29,4 @@ HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
   CMD wget --no-verbose --tries=1 --spider http://localhost:3333/v1/health || exit 1
 
 # Start the application
-CMD ["node", "main.js"]
+CMD ["node", "src/main.js"]

apps/api/buildspec.yml

@@ -26,35 +26,50 @@ phases:
       - '[ -n "$DATABASE_URL" ] || { echo "❌ DATABASE_URL is not set"; exit 1; }'
       - '[ -n "$BASE_URL" ] || { echo "❌ BASE_URL is not set"; exit 1; }'
 
-      # Install dependencies
-      - echo "Installing dependencies..."
-      - bun install --frozen-lockfile
-
-      # Generate Prisma client
-      - echo "Generating Prisma client..."
-      - cd packages/db && bun x prisma generate && cd ../../
+      # Install only API workspace dependencies
+      - echo "Installing API dependencies only..."
+      - bun install --filter=@comp/api --frozen-lockfile
 
-      # Build NestJS application
+      # Build NestJS application (prebuild automatically handles Prisma)
       - echo "Building NestJS application..."
-      - cd apps/$APP_NAME && bun run build && cd ../../
+      - echo "APP_NAME is set to $APP_NAME"
+      - echo "Current directory $(pwd)"
+      - echo "Available apps $(ls -la apps/)"
+      - cd apps/api
+      - echo "Changed to $(pwd)"
+      - echo "Running build (includes automatic prebuild db:generate)..."
+      - bun run build
+
+      # Verify build output exists
+      - echo "Checking build output..."
+      - ls -la dist/
+      - ls -la dist/src/
+      - '[ -f "dist/src/main.js" ] || { echo "❌ main.js not found in dist/src"; exit 1; }'
 
-      # Create self-contained bundle for Docker
+      # Create self-contained bundle for Docker (stay in apps/api)
       - echo "Creating self-contained bundle..."
-      - cd apps/$APP_NAME
       - mkdir -p ../docker-build
 
-      # Copy built application
+      # Copy built application (preserves NestJS structure)
+      - echo "Copying built application..."
       - cp -r dist/* ../docker-build/
 
-        # Copy entire node_modules for runtime (simpler and comprehensive)
+      # Copy prisma folder (needed for runtime imports)
+      - echo "Copying prisma folder..."
+      - cp -r prisma ../docker-build/
+
+      # Verify files were copied correctly
+      - echo "Verifying copied files..."
+      - ls -la ../docker-build/
+      - ls -la ../docker-build/src/
+      - '[ -f "../docker-build/src/main.js" ] || { echo "❌ main.js not found in docker-build/src"; exit 1; }'
+
+      # Copy entire node_modules for runtime (includes @trycompai/db from npm)
       - echo "Bundling all runtime dependencies..."
       - cp -r ../../node_modules ../docker-build/
 
-      # Copy @trycompai/db package
-      - mkdir -p ../docker-build/node_modules/@trycompai
-      - cp -r ../../packages/db ../docker-build/node_modules/@trycompai/
-
       # Copy Dockerfile
+      - echo "Copying Dockerfile..."
       - cp Dockerfile ../docker-build/
 
       # Build Docker image
@@ -69,7 +84,7 @@ phases:
       - docker push $ECR_REPOSITORY_URI:latest
       - echo "Updating ECS service..."
       - aws ecs update-service --cluster $ECS_CLUSTER_NAME --service $ECS_SERVICE_NAME --force-new-deployment
-      - 'printf "[{\"name\":\"%s-container\",\"imageUri\":\"%s\"}]" $APP_NAME $ECR_REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json'
+      - 'printf "[{\"name\":\"%s-container\",\"imageUri\":\"%s\"}]" api $ECR_REPOSITORY_URI:$IMAGE_TAG > imagedefinitions.json'
 
 cache:
   paths:

apps/api/eslint.config.mjs

@@ -28,7 +28,12 @@ export default tseslint.config(
     rules: {
       '@typescript-eslint/no-explicit-any': 'off',
       '@typescript-eslint/no-floating-promises': 'warn',
-      '@typescript-eslint/no-unsafe-argument': 'warn'
+      '@typescript-eslint/no-unsafe-argument': 'warn',
+      '@typescript-eslint/no-unsafe-assignment': 'off',
+      '@typescript-eslint/no-unsafe-call': 'off',
+      '@typescript-eslint/no-unsafe-member-access': 'off',
+      '@typescript-eslint/no-unsafe-return': 'off',
+      '@typescript-eslint/restrict-template-expressions': 'off',
     },
   },
-);
+);

apps/api/package.json

@@ -18,16 +18,24 @@
     "test:watch": "jest --watch",
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "typecheck": "tsc --noEmit",
+    "db:generate": "bun run db:getschema && prisma generate",
+    "db:getschema": "cp ../../node_modules/@trycompai/db/dist/schema.prisma prisma/schema.prisma",
+    "prebuild": "bun run db:generate"
   },
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.859.0",
+    "@aws-sdk/s3-request-presigner": "^3.859.0",
     "@nestjs/common": "^11.0.1",
+    "@nestjs/config": "^4.0.2",
     "@nestjs/core": "^11.0.1",
     "@nestjs/platform-express": "^11.1.5",
     "@nestjs/swagger": "^11.2.0",
-    "@trycompai/db": "file:../../packages/db",
+    "@trycompai/db": "^1.3.2",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
+    "jose": "^6.0.12",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
     "swagger-ui-express": "^5.0.1",

apps/api/prisma/client.ts

@@ -0,0 +1,7 @@
+import { PrismaClient } from '@prisma/client';
+
+const globalForPrisma = global as unknown as { prisma: PrismaClient };
+
+export const db = globalForPrisma.prisma || new PrismaClient();
+
+if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = db;

apps/api/prisma/index.ts

@@ -0,0 +1,2 @@
+export * from '@prisma/client';
+export { db } from './client';

apps/api/src/app.module.ts

@@ -1,13 +1,32 @@
 import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
+import { AttachmentsModule } from './attachments/attachments.module';
 import { AuthModule } from './auth/auth.module';
+import { CommentsModule } from './comments/comments.module';
+import { awsConfig } from './config/aws.config';
 import { HealthModule } from './health/health.module';
 import { OrganizationModule } from './organization/organization.module';
 import { TasksModule } from './tasks/tasks.module';
 
 @Module({
-  imports: [AuthModule, OrganizationModule, TasksModule, HealthModule],
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      load: [awsConfig],
+      validationOptions: {
+        allowUnknown: true,
+        abortEarly: true,
+      },
+    }),
+    AuthModule,
+    OrganizationModule,
+    AttachmentsModule,
+    TasksModule,
+    CommentsModule,
+    HealthModule,
+  ],
   controllers: [AppController],
   providers: [AppService],
 })

apps/api/src/attachments/attachments.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common';
+import { AttachmentsService } from './attachments.service';
+
+@Module({
+  providers: [AttachmentsService],
+  exports: [AttachmentsService],
+})
+export class AttachmentsModule {}