fix: clean up conflict markers from all files

Author: Abdullah Utku Yertutan

.github/workflows/ci-cd.yml

@@ -125,14 +125,6 @@ jobs:
       - name: 🧪 Run Java Unit Tests
         run: |
           echo "🧪 Running Java unit tests..."
-<<<<<<< HEAD
-          cd server/user-service && ./mvnw test -q
-          cd ../workout-plan-service && ./mvnw test -q
-          cd ../tts-service && ./mvnw test -q
-=======
-          cd server/user-service && chmod +x ./mvnw && ./mvnw test -Dspring.profiles.active=test
-          cd ../workout-plan-service && chmod +x ./mvnw && ./mvnw test -Dspring.profiles.active=test
->>>>>>> 8ee4364d68a838d9dfdbb262658698d1e9f4ec0b
           echo "✅ Java unit tests completed"
 
       - name: 🧪 Run Python Unit Tests
@@ -364,190 +356,6 @@ jobs:
         with:
           version: 'latest'
 
-<<<<<<< HEAD
-  # Job 7: Deploy to Kubernetes (only for main branch)
-  deploy-k8s:
-    name: 🚀 Deploy to Kubernetes
-    runs-on: ubuntu-latest
-    needs: [setup, unit-tests, integration-tests, system-tests, build-package, build-and-push-ghcr]
-    if: always() && needs.setup.outputs.is_main == 'true' && needs.unit-tests.result == 'success' && (needs.integration-tests.result == 'success' || needs.integration-tests.result == 'skipped') && (needs.system-tests.result == 'success' || needs.system-tests.result == 'skipped')
-    steps:
-      - name: 📥 Checkout code
-        uses: actions/checkout@v4
-
-      - name: 🔑 Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v4
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: us-east-1
-
-      - name: 🔧 Configure kubectl
-        run: |
-          aws eks update-kubeconfig --name flexfit-cluster-production --region us-east-1
-
-      - name: 📦 Install Helm
-        run: |
-          curl https://get.helm.sh/helm-v3.12.0-linux-amd64.tar.gz | tar xz
-          sudo mv linux-amd64/helm /usr/local/bin/helm
-
-      - name: 🚀 Deploy to Kubernetes
-        env:
-          GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
-          CHAIR_API_KEY: ${{ secrets.CHAIR_API_KEY }}
-        run: |
-          # Create namespace if it doesn't exist
-          kubectl create namespace flexfit --dry-run=client -o yaml | kubectl apply -f -
-          
-          # Create Google credentials secret
-          kubectl create secret generic flexfit-google-credentials \
-            --from-literal=google-credentials.json="$GOOGLE_CREDENTIALS" \
-            --namespace flexfit --dry-run=client -o yaml | kubectl apply -f -
-          
-          # Deploy using Helm
-          helm upgrade --install flexfit ./helm/flexfit \
-            --namespace flexfit \
-            --set googleCredentials="$GOOGLE_CREDENTIALS" \
-            --set chairApiKey="$CHAIR_API_KEY" \
-            --set global.imageTag="${{ github.sha }}" \
-            --wait --timeout=10m
-
-      - name: 🏥 Health Check
-        run: |
-          echo "Waiting for services to be ready..."
-          kubectl wait --for=condition=ready pod -l app.kubernetes.io/name=flexfit --namespace flexfit --timeout=300s
-          
-          echo "Checking service endpoints..."
-          kubectl get services -n flexfit
-          kubectl get pods -n flexfit
-
-  # Job 8: Summary
-  summary:
-    name: 📊 Pipeline Summary
-    runs-on: ubuntu-latest
-    needs: [setup, unit-tests, integration-tests, system-tests, build-package, build-and-push-ghcr, deploy-k8s]
-=======
-      - name: 🔑 Configure Kubernetes context
-        run: |
-          echo "🔧 Setting up TUM Kubernetes cluster access..."
-          
-          # Create .kube directory
-          mkdir -p ~/.kube
-          
-          # Write kubeconfig from GitHub secret
-          echo "${{ secrets.TUM_KUBECONFIG }}" | base64 -d > ~/.kube/config
-          chmod 600 ~/.kube/config
-          
-          # Verify connection
-          kubectl config current-context
-          kubectl version --client
-          
-          echo "✅ Connected to TUM Kubernetes cluster"
-
-      - name: 🌍 Set deployment environment
-        id: env
-        run: |
-          if [[ "${{ needs.setup.outputs.is_development }}" == "true" ]]; then
-            echo "namespace=team-code-compass-development" >> $GITHUB_OUTPUT
-            echo "values_file=values-tum.yaml" >> $GITHUB_OUTPUT
-            echo "environment=development" >> $GITHUB_OUTPUT
-          elif [[ "${{ needs.setup.outputs.is_main }}" == "true" ]]; then
-            echo "namespace=team-code-compass-production" >> $GITHUB_OUTPUT
-            echo "values_file=values-tum-production.yaml" >> $GITHUB_OUTPUT
-            echo "environment=production" >> $GITHUB_OUTPUT
-          else
-            echo "namespace=team-code-compass-development" >> $GITHUB_OUTPUT
-            echo "values_file=values-tum.yaml" >> $GITHUB_OUTPUT
-            echo "environment=development" >> $GITHUB_OUTPUT
-          fi
-
-      - name: 🔄 Wait for image propagation
-        run: |
-          echo "⏳ Waiting 30 seconds for GHCR images to propagate..."
-          sleep 30
-
-      - name: 🚀 Deploy to Kubernetes using Helm
-        run: |
-          echo "🎯 Deploying to ${{ steps.env.outputs.environment }} environment"
-          echo "📦 Namespace: ${{ steps.env.outputs.namespace }}"
-          echo "📁 Values file: ${{ steps.env.outputs.values_file }}"
-          
-          # Set required environment variables for deployment
-          export TUM_ID="${{ secrets.TUM_ID }}"
-          export CHAIR_API_KEY="${{ secrets.CHAIR_API_KEY }}"
-          export POSTGRES_PASSWORD="${{ secrets.POSTGRES_PASSWORD }}"
-          export GRAFANA_ADMIN_PASSWORD="${{ secrets.GRAFANA_ADMIN_PASSWORD }}"
-          
-          # Email alerts (optional)
-          export ALERT_EMAIL_FROM="${{ secrets.ALERT_EMAIL_FROM || 'hakanduranyt@gmail.com' }}"
-          export ALERT_EMAIL_TO="${{ secrets.ALERT_EMAIL_TO || 'hakanduranyt@gmail.com' }}"
-          export ALERT_EMAIL_USERNAME="${{ secrets.ALERT_EMAIL_USERNAME || 'hakanduranyt@gmail.com' }}"
-          export ALERT_EMAIL_PASSWORD="${{ secrets.ALERT_EMAIL_PASSWORD || 'your_gmail_app_password_here' }}"
-          export SMTP_HOST="${{ secrets.SMTP_HOST || 'smtp.gmail.com:587' }}"
-          
-          # Set IMAGE_TAG based on branch
-          if [[ "${{ needs.setup.outputs.is_main }}" == "true" ]]; then
-            export IMAGE_TAG="main"
-            echo "🏷️ Using IMAGE_TAG=main for production deployment"
-          else
-            export IMAGE_TAG="latest"
-            echo "🏷️ Using IMAGE_TAG=latest for development deployment"
-          fi
-          
-          # Validate required secrets
-          if [[ -z "$TUM_ID" || -z "$CHAIR_API_KEY" || -z "$POSTGRES_PASSWORD" || -z "$GRAFANA_ADMIN_PASSWORD" ]]; then
-            echo "❌ Missing required secrets. Please configure:"
-            echo "  - TUM_ID"
-            echo "  - CHAIR_API_KEY" 
-            echo "  - POSTGRES_PASSWORD"
-            echo "  - GRAFANA_ADMIN_PASSWORD"
-            echo ""
-            echo "📋 Optional TUM Kubernetes secrets:"
-            echo "  - TUM_KUBECONFIG (base64 encoded kubeconfig)"
-            echo "  - TUM_NAMESPACE (e.g., ge85zat-devops25)"  
-            echo "  - TUM_INGRESS_HOST (e.g., ge85zat-devops25.student.k8s.aet.cit.tum.de)"
-            exit 1
-          fi
-          
-          # Deploy using envsubst and helm
-          cd helm/flexfit
-          envsubst < ${{ steps.env.outputs.values_file }} | \
-          helm upgrade --install flexfit . \
-            --namespace ${{ steps.env.outputs.namespace }} \
-            --create-namespace \
-            --wait \
-            --timeout=10m \
-            -f -
-
-      - name: ✅ Verify deployment
-        run: |
-          echo "🔍 Verifying deployment in ${{ steps.env.outputs.namespace }}"
-          kubectl get pods -n ${{ steps.env.outputs.namespace }}
-          kubectl get services -n ${{ steps.env.outputs.namespace }}
-          
-          echo "🌐 Checking service health..."
-          kubectl wait --for=condition=ready pod -l app=frontend -n ${{ steps.env.outputs.namespace }} --timeout=300s || true
-          kubectl wait --for=condition=ready pod -l app=api-gateway -n ${{ steps.env.outputs.namespace }} --timeout=300s || true
-
-      - name: 📊 Deployment summary
-        run: |
-          echo "## 🚀 Deployment Summary" >> $GITHUB_STEP_SUMMARY
-          echo "- **Environment**: ${{ steps.env.outputs.environment }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Namespace**: ${{ steps.env.outputs.namespace }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Branch**: ${{ github.ref_name }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **Commit**: ${{ github.sha }}" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "### 📦 Deployed Services:" >> $GITHUB_STEP_SUMMARY
-          kubectl get pods -n ${{ steps.env.outputs.namespace }} --no-headers | while read line; do
-            echo "- $line" >> $GITHUB_STEP_SUMMARY
-          done
-
-  # Job 6: Pipeline Summary
-  summary:
-    name: 📊 Pipeline Summary
-    runs-on: ubuntu-latest
-    needs: [setup, unit-tests, integration-tests, build-and-push-ghcr, deploy-to-kubernetes]
->>>>>>> 8ee4364d68a838d9dfdbb262658698d1e9f4ec0b
     if: always()
     steps:
       - name: 📊 Pipeline Results
@@ -562,16 +370,3 @@ jobs:
           echo "  🧪 Unit Tests: ${{ needs.unit-tests.result || 'skipped' }}"
           echo "  🔗 Integration Tests: ${{ needs.integration-tests.result || 'skipped' }}"
           echo "  🐳 GHCR Push: ${{ needs.build-and-push-ghcr.result || 'skipped' }}"
-<<<<<<< HEAD
-          echo "  🚀 Kubernetes Deploy: ${{ needs.deploy-k8s.result || 'skipped' }}"
-          echo ""
-          
-          if [ "${{ needs.unit-tests.result }}" == "success" ] && [ "${{ needs.integration-tests.result }}" != "failure" ] && [ "${{ needs.system-tests.result }}" != "failure" ]; then
-            echo "🎉 Pipeline completed successfully!"
-          else
-            echo "❌ Pipeline failed - check logs for details"
-          fi 
-=======
-          echo "  🚀 Kubernetes Deploy: ${{ needs.deploy-to-kubernetes.result || 'skipped' }}"
-          echo "" 
->>>>>>> 8ee4364d68a838d9dfdbb262658698d1e9f4ec0b