Deploy implementation

.dockerignore

@@ -61,3 +61,7 @@ docker-compose.yml
 # Uploads (not needed in image)
 tmp-uploads/
 uploads/
+
+# Make sure Prisma schema is NOT ignored
+!prisma/
+!prisma/schema.prisma

.github/workflows/deploy.yml

@@ -6,10 +6,10 @@ on:
       - main
       - release
       - deploy-implementation
-  workflow_dispatch: # Allow manual triggers
+  workflow_dispatch:
 
 env:
-  DEPLOY_PATH: /home/deploy/deployments/stellarion/back-end
+  DEPLOY_PATH: /home/deploy/deployments/stellarion
 
 jobs:
   test:
@@ -24,26 +24,22 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: "18"
-          # Disable cache since we don't have a lock file yet
-          # cache: "npm"
+          cache: "npm"
 
       - name: Install dependencies
-        run: |
-          if [ -f package-lock.json ]; then
-            npm ci
-          else
-            npm install
-            git config --local user.email "action@github.com"
-            git config --local user.name "GitHub Action"
-            git add package-lock.json
-            git commit -m "Add package-lock.json [skip ci]" || echo "No changes to commit"
-          fi
+        run: npm ci
 
       - name: Run linter
-        run: npm run lint || echo "Linting completed with warnings"
+        run: npm run lint
+        continue-on-error: true
+
+      - name: Build test
+        run: npm run build
+        continue-on-error: true
 
       - name: Run tests
-        run: npm test || echo "No tests configured yet"
+        run: npm test
+        continue-on-error: true
 
   deploy:
     name: Deploy to Digital Ocean
@@ -67,60 +63,111 @@ jobs:
 
             echo "🚀 Starting backend deployment..."
 
-            # Navigate to backend directory
+            # Check and cleanup disk space if needed
+            DISK_USAGE=$(df / | tail -1 | awk '{print $5}' | sed 's/%//')
+            echo "📊 Current disk usage: ${DISK_USAGE}%"
+            if [ $DISK_USAGE -gt 80 ]; then
+              echo "⚠️  Disk usage high, running cleanup..."
+              docker system prune -f --filter "until=168h"
+              docker volume prune -f
+              apt-get clean 2>/dev/null || true
+            fi
+
+            # Navigate to deployment directory
             cd ${{ env.DEPLOY_PATH }}
 
-            # Backup current state
+            # Create backup
             echo "📦 Creating backup..."
-            BACKUP_DIR="backups/backup-$(date +%Y%m%d-%H%M%S)"
+            BACKUP_DIR="backups/backend-$(date +%Y%m%d-%H%M%S)"
             mkdir -p $BACKUP_DIR
-            cp -r . $BACKUP_DIR/ || true
+            cp -r back-end $BACKUP_DIR/ 2>/dev/null || true
+
+            # Keep only last 3 backups
+            cd backups
+            ls -t | tail -n +4 | xargs -r rm -rf
+            cd ..
 
             # Pull latest changes
             echo "📥 Pulling latest code..."
+            cd back-end
             git fetch origin
             git reset --hard origin/${{ github.ref_name }}
-
-            # Navigate to parent directory for docker-compose
             cd ..
 
             # Stop backend container
-            echo "🛑 Stopping backend container..."
-            docker-compose stop backend
+            echo "🛑 Stopping backend..."
+            docker-compose stop backend 2>/dev/null || true
+            docker-compose rm -f backend 2>/dev/null || true
 
-            # Build new image
-            echo "🔨 Building new Docker image..."
-            docker-compose build backend
-
-            # Start backend container
-            echo "🚀 Starting backend container..."
+            # Build and start backend
+            echo "� Building and starting backend..."
+            docker-compose build --no-cache backend
             docker-compose up -d backend
 
-            # Wait for backend to be ready
+            # Wait for backend to be ready (increased for Prisma/Firebase init)
             echo "⏳ Waiting for backend to be ready..."
-            sleep 15
+            sleep 40
+
+            # Check if container is still running
+            echo "🔍 Checking container status..."
+            if ! docker ps | grep -q stellarion-backend; then
+              echo "❌ Container is not running!"
+              echo "📋 Container logs:"
+              docker logs stellarion-backend
+              echo ""
+              echo "🔍 Container status:"
+              docker ps -a | grep stellarion-backend
+              echo ""
+              echo "❌ Rolling back..."
+              docker-compose down backend
+              cp -r $BACKUP_DIR/back-end/* back-end/
+              docker-compose up -d backend
+              exit 1
+            fi
 
             # Health check
             echo "🔍 Running health check..."
             if docker exec stellarion-backend wget -qO- http://localhost:5000/health > /dev/null 2>&1; then
               echo "✅ Backend deployment successful!"
-              echo "✅ Health check passed"
             else
-              echo "❌ Health check failed, rolling back..."
+              echo "❌ Health check failed!"
+
+              # Save logs to file first to avoid buffering issues
+              docker logs stellarion-backend --tail 150 > /tmp/backend-error.log 2>&1
+
+              echo ""
+              echo "========================================" 
+              echo "� BACKEND CONTAINER LOGS (last 150 lines):"
+              echo "========================================"
+              cat /tmp/backend-error.log
+              echo ""
+              echo "========================================"
+              echo "🔍 Container status:"
+              echo "========================================"
+              docker ps -a | grep stellarion-backend
+              echo ""
+              echo "========================================"
+              echo "🔍 Testing direct connection:"
+              echo "========================================"
+              docker exec stellarion-backend wget -O- http://localhost:5000/health 2>&1 || true
+              echo ""
+              echo "❌ Rolling back..."
               docker-compose down backend
-              cd back-end
-              git reset --hard HEAD@{1}
-              cd ..
+              cp -r $BACKUP_DIR/back-end/* back-end/
               docker-compose up -d backend
-              echo "❌ Deployment failed and rolled back"
               exit 1
             fi
 
-            # Cleanup old images
-            echo "🧹 Cleaning up old Docker images..."
+            # Cleanup Docker resources
+            echo "🧹 Cleaning up Docker resources..."
             docker image prune -f
+            docker container prune -f --filter "until=168h"
+
+            # Show final disk usage
+            FINAL_USAGE=$(df / | tail -1 | awk '{print $5}')
+            echo "📊 Final disk usage: ${FINAL_USAGE}"
 
-            echo "✨ Backend deployment completed successfully!"
+            echo "✨ Deployment completed!"
 
       - name: Notify on Success
         if: success()

.github/workflows/docker-build.yml

@@ -1,4 +1,4 @@
-ame: Build and Push Docker Image
+name: Build and Push Docker Image
 
 on:
   push:

.gitignore

@@ -82,7 +82,7 @@ jspm_packages/
 # Yarn Integrity file
 .yarn-integrity
 
-package-lock.json
+# yarn.lock (allowing package-lock.json for better CI/CD compatibility)
 yarn.lock
 
 # Prisma generated artifacts (client & engine binaries)

Dockerfile

@@ -1,67 +1,26 @@
-# ============================================
-# Stage 1: Build Stage
-# ============================================
-FROM node:18-alpine AS builder
+# Simple Dockerfile - Run TypeScript directly without build step
+FROM node:18-alpine
 
-# Install build dependencies
-RUN apk add --no-cache python3 make g++ openssl
+# Install runtime dependencies
+RUN apk add --no-cache python3 make g++ wget openssl
 
 WORKDIR /app
 
-# Copy package files
+# Copy package files and install ALL dependencies (including tsx)
 COPY package*.json ./
-
-# Install ALL dependencies (including devDependencies for build)
-RUN npm i
-
-# Copy prisma schema and generate client
 COPY prisma ./prisma
-RUN npx prisma generate
-
-# Copy source code
-COPY . .
 
-# Build TypeScript to JavaScript
-RUN npm run build
+# Install all dependencies (we need devDeps for tsx and prisma)
+RUN npm ci
 
-# ============================================
-# Stage 2: Production Stage
-# ============================================
-FROM node:18-alpine AS production
-
-# Install runtime dependencies and wget for healthcheck
-RUN apk add --no-cache wget openssl
-
-# Create non-root user for security
-RUN addgroup -g 1001 -S nodejs && \
-    adduser -S nodejs -u 1001
-
-WORKDIR /app
-
-# Copy package files
-COPY package*.json ./
-
-# Install only production dependencies
-RUN npm i --only=production && \
-    npm cache clean --force
-
-# Copy Prisma schema and generate client for production
-COPY prisma ./prisma
+# Generate Prisma Client
 RUN npx prisma generate
 
-# Copy built application from builder stage
-COPY --from=builder /app/dist ./dist
-
-# Copy other necessary files
-COPY --from=builder /app/serviceAccountKey.json ./serviceAccountKey.json
-COPY --from=builder /app/firebaseAdmin.ts ./firebaseAdmin.ts
-
-# Create necessary directories with proper permissions
-RUN mkdir -p /app/logs /app/tmp-uploads /app/public && \
-    chown -R nodejs:nodejs /app
+# Copy all source code
+COPY . .
 
-# Switch to non-root user
-USER nodejs
+# Create directories with proper permissions
+RUN mkdir -p logs tmp-uploads public
 
 # Expose port
 EXPOSE 5000
@@ -70,5 +29,5 @@ EXPOSE 5000
 HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
   CMD wget --quiet --tries=1 --spider http://localhost:5000/health || exit 1
 
-# Start the application
-CMD ["node", "dist/index.js"]
+# Run TypeScript directly using tsx (no build needed!)
+CMD ["npx", "tsx", "index.ts"]

controllers/chatbot.controller.ts

@@ -4,6 +4,21 @@ import { prisma } from "../lib/prisma";
 import { ChatbotNotificationService } from "../services/chatbotNotification.service";
 import { ChatbotService } from "../services/chatbot.service";
 
+// Type definitions for Gemini API response
+interface GeminiCandidate {
+  content?: {
+    parts?: Array<{ text?: string }>;
+  };
+  finishReason?: string;
+}
+
+interface GeminiResponse {
+  candidates?: GeminiCandidate[];
+  error?: {
+    message?: string;
+  };
+}
+
 // Initialize Gemini API key
 const GEMINI_API_KEY = process.env.GEMINI_API_KEY;
 
@@ -55,7 +70,7 @@ async function callGeminiDirectly(
     throw new Error(`Gemini API error (${response.status}): ${errorText}`);
   }
 
-  const data = await response.json();
+  const data = (await response.json()) as GeminiResponse;
 
   // Log the full response for debugging
   console.log(
@@ -76,11 +91,16 @@ async function callGeminiDirectly(
 
     // Sometimes the content is in a different structure when MAX_TOKENS
     if (data.candidates[0].content?.parts?.[0]?.text) {
-      return data.candidates[0].content.parts[0].text;
+      const partialText = data.candidates[0].content.parts[0].text;
+      // Return partial response with note
+      return (
+        partialText +
+        "\n\n[Response was truncated due to length. Please ask for more specific information if needed.]"
+      );
     }
 
-    // If still no text, return a helpful message
-    throw new Error("Response too long. Please ask a more specific question.");
+    // If still no text, return a helpful fallback
+    return "I apologize, but my response was too long. Could you please ask a more specific question? I'd be happy to help with a focused topic.";
   }
 
   // Check if there's an error in the response