Merge branch 'dev' into 51-implement-unit-tests-for-system-including-genai

Author: Skalski

.github/workflows/build_docker.yml

@@ -29,6 +29,9 @@ jobs:
           - service: flashcard-service
             context: flashcard-service
             dockerfile: flashcard-service/Dockerfile
+          - service: genai-service
+            context: genai-service
+            dockerfile: genai-service/Dockerfile
 
     steps:
       - uses: actions/checkout@v4

.gitignore

@@ -1,3 +1,76 @@
+### Frontend ###
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/frontend/*/node_modules
+/.pnp
+.pnp.*
+
+# production
+/frontend/*/build
+/frontend/*/dist
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+### Terraform ###
+# Local .terraform directories
+**/.terraform/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+crash.*.log
+
+# Exclude all .tfvars files, which are likely to contain sensitive data, such as
+# password, private keys, and other secrets. These should not be part of version 
+# control as they are data points which are potentially sensitive and subject 
+# to change depending on the environment.
+*.tfvars
+*.tfvars.json
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Ignore transient lock info files created by terraform apply
+.terraform.tfstate.lock.info
+
+# Include override files you do wish to add to version control using negated pattern
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
+
+# Ignore CLI configuration files
+.terraformrc
+terraform.rc
+
+### End Terraform ###
+
 ### Angular ###
 ## Angular ##
 # compiled output

client/Dockerfile

@@ -78,10 +78,12 @@ services:
       - .env.prod
     depends_on:
       - db
+      - genai-service
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/initexample
       - SPRING_DATASOURCE_USERNAME=${POSTGRES_USER}
       - SPRING_DATASOURCE_PASSWORD=${POSTGRES_PASSWORD}
+      - GENAI_SERVICE_URL=http://genai-service:5001
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik"
@@ -115,6 +117,24 @@ services:
     networks:
       - traefik
 
+  genai-service:
+    image: ghcr.io/aet-devops25/team-deployaas/genai-service:latest
+    container_name: studyapp_genai_service
+    env_file:
+      - .env.prod
+    environment:
+      - WEBUI_API_KEY=${WEBUI_API_KEY}
+      - PORT=5001
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5001/health"]
+      interval: 30s
+      timeout: 30s
+      retries: 3
+      start_period: 30s
+    restart: always
+    networks:
+      - traefik
+
   client:
     image: ghcr.io/aet-devops25/team-deployaas/client:latest
     container_name: studyapp_client
@@ -124,6 +144,7 @@ services:
       - auth-service
       - quiz-service
       - flashcard-service
+      - genai-service
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik"

client/nginx.conf

@@ -1,3 +1,7 @@
+-- Insert test users
+INSERT INTO users (user_id, name, email, password_hash) VALUES 
+    ('00000000-0000-0000-0000-000000000001', 'Test User', 'test@example.com', '$2a$10$dummyhashfordemopurposes');
+
 -- Insert initial course data
 INSERT INTO courses (course_id, title) VALUES 
     ('550e8400-e29b-41d4-a716-446655440000', 'DevOps Fundamentals'),
@@ -86,3 +90,59 @@ INSERT INTO questions (question_id, text, sample_solution, chapter_id, ordering)
      'How do distributed tracing and logging work together to provide system insights?',
      'Distributed tracing tracks requests across multiple services, providing end-to-end visibility of transaction flows and identifying performance bottlenecks. Logging captures detailed events and errors at each service level. Together, they enable: 1) Correlation of trace spans with relevant log entries, 2) Root cause analysis by following trace paths and examining logs, 3) Performance optimization by identifying slow operations in traces and their corresponding log details, 4) Error investigation by linking failed traces to error logs, and 5) System understanding through combined transaction flows and detailed event records.',
      '550e8400-e29b-41d4-a716-446655440003', 3);
+
+-- Insert test flashcard decks
+INSERT INTO flashcard_decks (deck_id, user_id, name) VALUES 
+    ('550e8400-e29b-41d4-a716-446655450001', '00000000-0000-0000-0000-000000000001', 'DevOps Fundamentals Deck'),
+    ('550e8400-e29b-41d4-a716-446655450002', '00000000-0000-0000-0000-000000000001', 'Testing Strategies Deck'),
+    ('550e8400-e29b-41d4-a716-446655450003', '00000000-0000-0000-0000-000000000001', 'CI/CD Pipeline Essentials');
+
+-- Insert test flashcards for DevOps Fundamentals Deck
+INSERT INTO flashcards (flashcard_id, deck_id, front, back) VALUES 
+    ('550e8400-e29b-41d4-a716-446655450011', '550e8400-e29b-41d4-a716-446655450001', 
+     'What does CI/CD stand for?', 
+     'Continuous Integration / Continuous Deployment (or Continuous Delivery)'),
+    
+    ('550e8400-e29b-41d4-a716-446655450012', '550e8400-e29b-41d4-a716-446655450001', 
+     'What is Infrastructure as Code (IaC)?', 
+     'Managing and provisioning computing infrastructure through machine-readable definition files, rather than physical hardware configuration or interactive configuration tools'),
+    
+    ('550e8400-e29b-41d4-a716-446655450013', '550e8400-e29b-41d4-a716-446655450001', 
+     'Name the three pillars of observability', 
+     'Metrics, Logs, and Traces'),
+    
+    ('550e8400-e29b-41d4-a716-446655450014', '550e8400-e29b-41d4-a716-446655450001', 
+     'What is the difference between monitoring and observability?', 
+     'Monitoring tells you WHAT is happening (predefined metrics), while observability helps you understand WHY it is happening (ability to debug unknown issues)');
+
+-- Insert test flashcards for Testing Strategies Deck
+INSERT INTO flashcards (flashcard_id, deck_id, front, back) VALUES 
+    ('550e8400-e29b-41d4-a716-446655450021', '550e8400-e29b-41d4-a716-446655450002', 
+     'What is the difference between verification and validation?', 
+     'Verification: Are we building the product right? (according to specifications)\nValidation: Are we building the right product? (according to user requirements)'),
+    
+    ('550e8400-e29b-41d4-a716-446655450022', '550e8400-e29b-41d4-a716-446655450002', 
+     'Name 3 fundamental principles of software testing', 
+     '1. Testing shows presence of defects, not their absence\n2. Exhaustive testing is impossible\n3. Early testing saves time and money'),
+    
+    ('550e8400-e29b-41d4-a716-446655450023', '550e8400-e29b-41d4-a716-446655450002', 
+     'What is mutation testing?', 
+     'A testing technique that evaluates test suite quality by introducing small changes (mutations) to the code and checking if tests can detect these changes');
+
+-- Insert test flashcards for CI/CD Pipeline Essentials Deck
+INSERT INTO flashcards (flashcard_id, deck_id, front, back) VALUES 
+    ('550e8400-e29b-41d4-a716-446655450031', '550e8400-e29b-41d4-a716-446655450003', 
+     'What are the key stages of a CI/CD pipeline?', 
+     '1. Source Control\n2. Build Stage\n3. Test Stage\n4. Code Analysis\n5. Deployment to Staging\n6. Production Deployment\n7. Monitoring'),
+    
+    ('550e8400-e29b-41d4-a716-446655450032', '550e8400-e29b-41d4-a716-446655450003', 
+     'What is the main benefit of automated testing in CI/CD?', 
+     'Early detection of integration issues and improved code quality through consistent, repeatable testing'),
+    
+    ('550e8400-e29b-41d4-a716-446655450033', '550e8400-e29b-41d4-a716-446655450003', 
+     'What is infrastructure drift?', 
+     'When actual infrastructure configuration deviates from the defined specification over time due to manual changes, patches, or updates'),
+    
+    ('550e8400-e29b-41d4-a716-446655450034', '550e8400-e29b-41d4-a716-446655450003', 
+     'How does IaC prevent infrastructure drift?', 
+     'By maintaining a single source of truth in code, regularly comparing actual vs desired state, and enabling automated remediation');