Merge branch 'dev' of https://github.com/AET-DevOps25/team-git-push-force into dev

Author: sfdamm

.github/workflows/ci.yml

@@ -285,6 +285,19 @@ jobs:
             type=ref,event=pr
             type=sha
 
+      - name: Set build arguments for client
+        id: build-args
+        run: |
+          if [[ "${{ matrix.service }}" == "client" ]]; then
+            if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then
+              echo "build_env=production" >> $GITHUB_OUTPUT
+            elif [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+              echo "build_env=staging" >> $GITHUB_OUTPUT
+            else
+              echo "build_env=development" >> $GITHUB_OUTPUT
+            fi
+          fi
+
       - name: Build and push Docker Image
         uses: docker/build-push-action@v5
         with:
@@ -294,6 +307,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            ${{ matrix.service == 'client' && format('BUILD_ENV={0}', steps.build-args.outputs.build_env) || '' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 

README.md

@@ -225,7 +225,41 @@ This will start all services:
 - Weaviate Vector Database at [http://localhost:8087](http://localhost:8087)
 - MinIO Object Storage at [http://localhost:9000](http://localhost:9000) (API) and [http://localhost:9001](http://localhost:9001) (Console)
 
-### Option 2: Manual Startup
+### 🚀 Development Environment (Default)
+
+The default docker-compose setup is optimized for development:
+
+```bash
+# Start development environment (default configuration)
+./start-dev.sh
+# OR manually:
+docker-compose up --build
+```
+
+This setup:
+- ✅ **Development Mode**: Uses development environment configuration by default
+- ✅ **Real Backend**: All backend services running for full-stack development  
+- ✅ **Easy Setup**: Single command to start the entire stack
+- ✅ **Environment Flexibility**: Can easily switch to staging or production builds
+
+**Services Available:**
+- Client (Angular frontend) at [http://localhost:3000](http://localhost:3000)
+- All backend services running and connected
+
+**Environment Options:**
+```bash
+# Development (default)
+docker-compose up --build
+
+# Staging environment
+CLIENT_BUILD_ENV=staging docker-compose up --build
+
+# Production environment  
+CLIENT_BUILD_ENV=production docker-compose up --build
+```
+
+
+### Manual Development Setup
 
 Before starting the services manually, you need to generate code from the OpenAPI specifications:
 

client/Dockerfile

@@ -2,13 +2,16 @@
 FROM node:22-alpine AS builder
 WORKDIR /app
 
+# Define build arguments
+ARG BUILD_ENV=production
+
 # speed up rebuilds: first copy lock files only
 COPY package*.json ./
 RUN npm ci --ignore-scripts
 
-# now copy sources and build for production
+# now copy sources and build for specified environment
 COPY . .
-RUN npm run build -- --configuration=production
+RUN npm run build -- --configuration=${BUILD_ENV}
 
 # ---------- 2. RUNTIME STAGE ----------
 FROM nginx:1.27-alpine

client/README.md

@@ -57,3 +57,73 @@ Angular CLI does not come with an end-to-end testing framework by default. You c
 ## Additional Resources
 
 For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.
+
+## Environment Configuration
+
+The application supports multiple environments:
+
+- **Development**: Uses `environment.ts` (default for local development)
+- **Staging**: Uses `environment.staging.ts` (for the staging environment)
+- **Production**: Uses `environment.prod.ts` (for the production environment)
+
+## Building with Docker
+
+The Dockerfile supports building the application for different environments using the `BUILD_ENV` build argument.
+
+### Building for Production (default)
+
+```bash
+docker build -t client .
+```
+
+This will use the production environment configuration by default.
+
+### Building for Staging
+
+```bash
+docker build -t client --build-arg BUILD_ENV=staging .
+```
+
+This will use the staging environment configuration.
+
+### Building for Development
+
+```bash
+docker build -t client --build-arg BUILD_ENV=development .
+```
+
+This will use the development environment configuration.
+
+## Environment Configuration Files
+
+The environment configuration files are located in `src/environments/`:
+
+- `environment.ts`: Development environment
+- `environment.staging.ts`: Staging environment
+- `environment.prod.ts`: Production environment
+
+Each file contains environment-specific settings like API URLs and feature flags.
+
+## CI/CD Integration
+
+The project's CI/CD pipeline automatically sets the appropriate `BUILD_ENV` value based on the Git branch:
+
+- **main branch**: Uses `BUILD_ENV=production` for production deployments
+- **dev branch**: Uses `BUILD_ENV=staging` for staging deployments
+- **other branches**: Uses `BUILD_ENV=development` as a fallback
+
+This is implemented in the GitHub Actions workflow (`.github/workflows/ci.yml`), which automatically builds and deploys the application with the correct environment configuration.
+
+### Manual CI/CD Example
+
+For manual CI/CD integration, you can use the `BUILD_ENV` build argument to specify the target environment:
+
+```yaml
+# Example for staging deployment
+docker build -t client --build-arg BUILD_ENV=staging .
+
+# Example for production deployment
+docker build -t client --build-arg BUILD_ENV=production .
+```
+
+This ensures that the correct environment configuration is used for each deployment target.

client/angular.json

@@ -58,6 +58,29 @@
               ],
               "outputHashing": "all"
             },
+            "staging": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.staging.ts"
+                }
+              ],
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kB",
+                  "maximumError": "1MB"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "4kB",
+                  "maximumError": "12kB"
+                }
+              ],
+              "outputHashing": "all",
+              "optimization": true,
+              "sourceMap": false
+            },
             "development": {
               "optimization": false,
               "extractLicenses": false,
@@ -72,6 +95,9 @@
             "production": {
               "buildTarget": "concepter:build:production"
             },
+            "staging": {
+              "buildTarget": "concepter:build:staging"
+            },
             "development": {
               "buildTarget": "concepter:build:development"
             }

client/src/app/core/models/concept.model.ts

@@ -31,7 +31,7 @@ export interface EventDetails {
 }
 
 export interface AgendaItem {
-  id: string;
+  id?: string;  // Made optional - backend will generate if not provided
   time: string;
   title: string;
   description?: string;
@@ -41,7 +41,7 @@ export interface AgendaItem {
 }
 
 export interface Speaker {
-  id: string;
+  id?: string;  // Made optional - backend will generate if not provided
   name: string;
   expertise: string;
   suggestedTopic?: string;

client/src/app/core/models/document.model.ts

@@ -4,15 +4,15 @@ export interface ProcessedDocument {
   type: 'INDUSTRY_REPORT' | 'BRAND_DECK' | 'PAST_EVENT_DEBRIEF' | 'GUIDELINES' | 'OTHER';
   status: 'PROCESSING' | 'COMPLETED' | 'FAILED';
   s3Location: string;
-  uploadedAt: Date;
-  processedAt?: Date;
+  uploadedAt: string; // ISO date-time string per OpenAPI spec
+  processedAt?: string; // ISO date-time string per OpenAPI spec
 }
 
 export interface DocumentUploadResult {
   documentId: string;
   filename: string;
   size: number;
   mimeType: string;
-  uploadedAt: Date;
+  uploadedAt: string; // ISO date-time string per OpenAPI spec
   status: 'QUEUED' | 'PROCESSING' | 'COMPLETED' | 'FAILED';
 } 

client/src/app/core/services/api.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams, HttpHeaders } from '@angular/common/http';
-import { Observable, catchError, throwError } from 'rxjs';
+import { Observable, catchError, of, throwError } from 'rxjs';
 import { environment } from '../../../environments/environment';
 import { MockApiService } from '../../mocks/services/mock-api.service';
 
@@ -41,6 +41,31 @@ export class ApiService {
       );
   }
 
+  // New method for downloading binary files (PDFs, images, etc.)
+  downloadBlob(endpoint: string, params?: any): Observable<Blob> {
+    if (environment.useMockApi) {
+      // Return a mock PDF blob for development
+      return of(new Blob(['Mock PDF content'], { type: 'application/pdf' })) as Observable<Blob>;
+    }
+
+    let httpParams = new HttpParams();
+    if (params) {
+      Object.keys(params).forEach(key => {
+        if (params[key] !== null && params[key] !== undefined) {
+          httpParams = httpParams.set(key, params[key].toString());
+        }
+      });
+    }
+
+    return this.http.get(`${this.baseUrl}${endpoint}`, { 
+      params: httpParams,
+      responseType: 'blob' // This is crucial for binary data
+    })
+    .pipe(
+      catchError(this.handleError)
+    );
+  }
+
   post<T>(endpoint: string, data: any): Observable<T> {
     if (environment.useMockApi) {
       return this.handleMockRequest<T>('POST', endpoint, data);