E2565 : Integration of JoinTeamRequests

.github/workflows/TestPR.yml

@@ -26,11 +26,25 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Clear Ruby cache
+        run: |
+          rm -rf ~/.ruby-version
+          rm -rf ~/.rbenv
+          rm -rf ~/.rvm
+          rm -rf /usr/local/rvm
+          rm -rf /opt/ruby
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.7
-          bundler-cache: true
+          ruby-version: 3.4.5
+          bundler-cache: false
+
+      - name: Check Ruby Version
+        run: |
+          ruby -v
+          which ruby
+          gem env
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -45,7 +59,10 @@ jobs:
         run: |
           gem update --system
           gem install bundler:2.4.7
-          bundle install
+          bundle config set --local deployment 'false'
+          bundle config set --local without ''
+          bundle config set --local force_ruby_platform true
+          bundle install --verbose
       - name: Setup database
         run: |
           bundle exec rails db:create RAILS_ENV=test

.github/workflows/danger.yml

@@ -12,15 +12,36 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Clear Ruby cache
+        run: |
+          rm -rf ~/.ruby-version
+          rm -rf ~/.rbenv
+          rm -rf ~/.rvm
+          rm -rf /usr/local/rvm
+          rm -rf /opt/ruby
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2.7'
+          ruby-version: '3.4.5'
+          bundler-cache: false
+
+      - name: Check Ruby Version
+        run: |
+          ruby -v
+          which ruby
+          gem env
 
       - name: Install dependencies
-        run: bundle install
+        run: |
+          gem update --system
+          gem install bundler:2.4.7
+          bundle config set --local deployment 'false'
+          bundle config set --local without ''
+          bundle config set --local force_ruby_platform true
+          bundle install --verbose
 
       - name: Run Danger
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: bundle exec danger --verbose
+        run: bundle exec danger --verbose

.github/workflows/danger_target.yml

@@ -2,26 +2,40 @@ name: Danger
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
+
 jobs:
   danger:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           token: ${{ secrets.GITHUB_TOKEN }}
           fetch-depth: 0
 
+      - name: Remove .ruby-version if exists
+        run: |
+          if [ -f .ruby-version ]; then
+            echo "Removing .ruby-version file"
+            rm .ruby-version
+          fi
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2.7'
-
-      - name: Install dependencies
-        run: bundle install
+          ruby-version: '3.4.5'
+          bundler-cache: true
 
+      - name: Verify Ruby Version
+        run: |
+          echo "Ruby version:"
+          ruby -v
+          echo "Ruby path:"
+          which ruby
+          echo "Gem environment:"
+          gem env
 
       - name: Run Danger
         env:

.github/workflows/main.yml

@@ -27,11 +27,25 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Clear Ruby cache
+        run: |
+          rm -rf ~/.ruby-version
+          rm -rf ~/.rbenv
+          rm -rf ~/.rvm
+          rm -rf /usr/local/rvm
+          rm -rf /opt/ruby
+
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.7
-          bundler-cache: true
+          ruby-version: 3.4.5
+          bundler-cache: false
+
+      - name: Check Ruby Version
+        run: |
+          ruby -v
+          which ruby
+          gem env
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -47,33 +61,86 @@ jobs:
         run: |
           gem update --system
           gem install bundler:2.4.7
-          bundle install
+          bundle config set --local deployment 'false'
+          bundle config set --local without ''
+          bundle config set --local force_ruby_platform true
+          bundle install --verbose
 
       - name: Setup database
         run: |
           bundle exec rails db:create RAILS_ENV=test
           bundle exec rails db:schema:load RAILS_ENV=test
 
-      - name: Set up code climate test-reporter
+      - name: Set up code coverage
         run: |
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
+          echo "SimpleCov coverage reporting is configured in spec_helper.rb"
 
       - name: Run model tests
         run: bundle exec rspec spec/models
 
       - name: Run controller tests
         run: bundle exec rspec spec/requests/
 
-      - name: Format code coverage report
-        run: ./cc-test-reporter format-coverage -t simplecov -o "coverage/codeclimate.models.json" --debug
+      - name: Generate coverage report
+        run: |
+          echo "Coverage report generated in coverage/index.html"
+          ls -la coverage/ || echo "No coverage directory found"
+          if [ -f coverage/index.html ]; then
+            echo "✅ Coverage report generated successfully"
+            echo "📊 Coverage percentage:"
+            grep -o '[0-9]\+\.[0-9]\+%' coverage/index.html | head -1 || echo "Coverage percentage not found"
+          else
+            echo "❌ Coverage report not generated"
+          fi
 
       - name: Upload coverage artifacts
         uses: actions/upload-artifact@v4
         with:
           name: code-coverage-artifacts
           path: coverage/
+
+      - name: Comment coverage on PR
+        if: github.event_name == 'pull_request'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+
+            try {
+              // Read coverage data
+              const coveragePath = 'coverage/coverage.json';
+              if (fs.existsSync(coveragePath)) {
+                const coverage = JSON.parse(fs.readFileSync(coveragePath, 'utf8'));
+                const percentage = coverage.metrics.covered_percent.toFixed(2);
+
+                const comment = `## 📊 Code Coverage Report
+
+                **Coverage: ${percentage}%**
+
+                - **Lines covered:** ${coverage.metrics.covered_lines}/${coverage.metrics.total_lines}
+                - **Branches covered:** ${coverage.metrics.covered_branches}/${coverage.metrics.total_branches}
+
+                📈 Coverage report generated with SimpleCov and Ruby 3.4.5
+
+                <details>
+                <summary>View detailed coverage report</summary>
+
+                Coverage artifacts are available in the workflow run.
+                </details>`;
+
+                github.rest.issues.createComment({
+                  issue_number: context.issue.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body: comment
+                });
+              } else {
+                console.log('Coverage file not found');
+              }
+            } catch (error) {
+              console.log('Error creating coverage comment:', error.message);
+            }
 
 
   publish_code_coverage:
@@ -91,10 +158,9 @@ jobs:
       - name: Upload code-coverage report to code-climate
         run: |
           export GIT_BRANCH="${GITHUB_REF/refs\/heads\//}"
-          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          chmod +x ./cc-test-reporter
-          ./cc-test-reporter sum-coverage coverage/codeclimate.*.json 
-          ./cc-test-reporter after-build -t simplecov -r ${{ secrets.CC_TEST_REPORTER_ID }}
+          gem install codeclimate-test-reporter
+          cc-test-reporter sum-coverage coverage/codeclimate.*.json 
+          cc-test-reporter after-build -t simplecov -r ${{ secrets.CC_TEST_REPORTER_ID }}
 
   docker:
     needs: test

.ruby-version

@@ -1 +1 @@
-ruby-3.2.7
+ruby-3.4.5

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+    "sqltools.connections": [
+        {
+            "mysqlOptions": {
+                "authProtocol": "default",
+                "enableSsl": "Disabled"
+            },
+            "previewLimit": 50,
+            "server": "0.0.0.0",
+            "port": 3307,
+            "driver": "MySQL",
+            "database": "reimplementation_development",
+            "username": "root",
+            "name": "devexpertiza"
+        }
+    ]
+}

Dangerfile

@@ -1,4 +1,7 @@
-# Dangerfile
+# Helper to safely read files in UTF-8 and avoid "invalid byte sequence" errors
+def safe_read(path)
+  File.read(path, encoding: "UTF-8", invalid: :replace, undef: :replace)
+end
 
 # --- PR Size Checks ---
 warn("Pull request is too big (more than 500 LoC).") if git.lines_of_code > 500
@@ -14,7 +17,7 @@ warn("Pull request has duplicated commit messages.") if duplicated_commits.any?
 
 # --- TODO/FIXME Checks ---
 todo_fixme = (git.modified_files + git.added_files).any? do |file|
-  File.read(file).match?(/\b(TODO|FIXME)\b/i)
+  File.exist?(file) && safe_read(file).match?(/\b(TODO|FIXME)\b/i)
 end
 warn("Pull request contains TODO or FIXME comments.") if todo_fixme
 
@@ -25,7 +28,6 @@ warn("Pull request includes temp, tmp, or cache files.") if temp_files
 # --- Missing Test Checks ---
 warn("There are no test changes in this PR.") if (git.modified_files + git.added_files).none? { |f| f.include?('spec/') || f.include?('test/') }
 
-
 # --- .md File Changes ---
 md_changes = git.modified_files.any? { |file| file.end_with?('.md') }
 warn("Pull request modifies markdown files (*.md). Make sure you have a good reason.") if md_changes
@@ -49,11 +51,9 @@ config_files = %w[
 changed_config_files = git.modified_files.select { |file| config_files.include?(file) }
 warn("Pull request modifies config or setup files: #{changed_config_files.join(', ')}.") if changed_config_files.any?
 
-
 # --- Shallow Tests (RSpec) ---
-# (Rules 37-41 — Shallow tests — assuming you want them included)
 shallow_test_files = git.modified_files.select { |file| file.include?('spec/') }
 shallow_test_warning = shallow_test_files.any? do |file|
-  File.read(file).match?(/\bit\b|\bspecify\b/)
+  File.exist?(file) && safe_read(file).match?(/\bit\b|\bspecify\b/)
 end
 warn("RSpec tests seem shallow (single `it` blocks or no context). Consider improving test structure.") if shallow_test_warning

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:3.2.7
+FROM ruby:3.4.5
 
 LABEL maintainer="Ankur Mundra <[email protected]>"
 # Install dependencies
@@ -21,4 +21,4 @@ RUN bundle install
 EXPOSE 3002 
 
 # Set the entry point
-ENTRYPOINT ["/app/setup.sh"]
+ENTRYPOINT ["/app/setup.sh"]

Gemfile

@@ -1,14 +1,32 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.2.7'
+ruby '3.4.5'
 
-gem 'mysql2', '~> 0.5.5'
-gem 'puma', '~> 5.0'
+gem 'mysql2', '~> 0.5.7'
+gem 'sqlite3', '~> 1.4'  # Alternative for development
+gem 'puma', '~> 6.4'
 gem 'rails', '~> 8.0', '>= 8.0.1'
+gem 'mini_portile2', '~> 2.8'  # Helps with native gem compilation
+gem 'observer'  # Required for Ruby 3.4.5 compatibility with Rails 8.0
+gem 'mutex_m'  # Required for Ruby 3.4.5 compatibility
+gem 'faraday-retry'  # Required for Faraday v2.0+ compatibility
+gem 'bigdecimal'  # Required for Ruby 3.4.5 compatibility
+gem 'csv'  # Required for Ruby 3.4.5 compatibility
+gem 'date'  # Required for Ruby 3.4.5 compatibility
+gem 'delegate'  # Required for Ruby 3.4.5 compatibility
+gem 'forwardable'  # Required for Ruby 3.4.5 compatibility
+gem 'logger'  # Required for Ruby 3.4.5 compatibility
+gem 'monitor'  # Required for Ruby 3.4.5 compatibility
+gem 'ostruct'  # Required for Ruby 3.4.5 compatibility
+gem 'set'  # Required for Ruby 3.4.5 compatibility
+gem 'singleton'  # Required for Ruby 3.4.5 compatibility
+gem 'timeout'  # Required for Ruby 3.4.5 compatibility
+gem 'uri'  # Required for Ruby 3.4.5 compatibility
 gem 'rswag-api'
 gem 'rswag-ui'
 gem 'active_model_serializers', '~> 0.10.0'
+gem 'psych', '~> 5.2'  # Ensure compatible psych version for Ruby 3.4.5
 
 # Build JSON APIs with ease [https://github.com/rails/jbuilder]
 # gem "jbuilder"