diff --git a/.github/workflows/TestPR.yml b/.github/workflows/TestPR.yml
index 93a5970a6..e09b92770 100644
--- a/.github/workflows/TestPR.yml
+++ b/.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
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 728ae334a..8f1fb8f59 100644
--- a/.github/workflows/danger.yml
+++ b/.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
\ No newline at end of file
+        run: bundle exec danger --verbose
diff --git a/.github/workflows/danger_target.yml b/.github/workflows/danger_target.yml
index 00da8ffb8..f12326bc7 100644
--- a/.github/workflows/danger_target.yml
+++ b/.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:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 15843d3f9..b5c6344ed 100644
--- a/.github/workflows/main.yml
+++ b/.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,18 +61,19 @@ 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
@@ -66,14 +81,66 @@ jobs:
       - 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
diff --git a/.ruby-version b/.ruby-version
index aa6fd8a3d..df9407bbb 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-3.2.7
\ No newline at end of file
+ruby-3.4.5
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7293d764b..ef45a4869 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,17 +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"
-        }
-    ]
+{
+    "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"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/Dangerfile b/Dangerfile
index 5179b84e9..6fd640064 100644
--- a/Dangerfile
+++ b/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
diff --git a/Dockerfile b/Dockerfile
index dcfad3884..687c70771 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,24 @@
-FROM ruby:3.2.7
-
-LABEL maintainer="Ankur Mundra <ankurmundra0212@gmail.com>"
-# Install dependencies
-RUN apt-get update && \
-    apt-get install -y curl && \
-    curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs && \
-    apt-get install -y netcat-openbsd
-
-# Set the working directory
-WORKDIR /app
-
-# Copy your application files from current location to WORKDIR
-COPY . .
-
-# Install Ruby dependencies
-RUN gem update --system && gem install bundler:2.4.7
-RUN bundle install
-
-EXPOSE 3002 
-
-# Set the entry point
+FROM ruby:3.4.5
+
+LABEL maintainer="Ankur Mundra <ankurmundra0212@gmail.com>"
+# Install dependencies
+RUN apt-get update && \
+    apt-get install -y curl && \
+    curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
+    apt-get install -y nodejs && \
+    apt-get install -y netcat-openbsd
+
+# Set the working directory
+WORKDIR /app
+
+# Copy your application files from current location to WORKDIR
+COPY . .
+
+# Install Ruby dependencies
+RUN gem update --system && gem install bundler:2.4.7
+RUN bundle install
+
+EXPOSE 3002 
+
+# Set the entry point
 ENTRYPOINT ["/app/setup.sh"]
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 4f4ae9434..aa91a954a 100644
--- a/Gemfile
+++ b/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"
diff --git a/Gemfile.lock b/Gemfile.lock
index a901506e0..1570d2590 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,29 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
+    actioncable (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.1)
-      actionpack (= 8.0.1)
-      activejob (= 8.0.1)
-      activerecord (= 8.0.1)
-      activestorage (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionmailbox (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
-    actionmailer (8.0.1)
-      actionpack (= 8.0.1)
-      actionview (= 8.0.1)
-      activejob (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionmailer (8.0.3)
+      actionpack (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.1)
-      actionview (= 8.0.1)
-      activesupport (= 8.0.1)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -31,15 +31,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.1)
-      actionpack (= 8.0.1)
-      activerecord (= 8.0.1)
-      activestorage (= 8.0.1)
-      activesupport (= 8.0.1)
+    actiontext (8.0.3)
+      actionpack (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.1)
-      activesupport (= 8.0.1)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -49,22 +49,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (8.0.1)
-      activesupport (= 8.0.1)
+    activejob (8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.3.6)
-    activemodel (8.0.1)
-      activesupport (= 8.0.1)
-    activerecord (8.0.1)
-      activemodel (= 8.0.1)
-      activesupport (= 8.0.1)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
       timeout (>= 0.4.0)
-    activestorage (8.0.1)
-      actionpack (= 8.0.1)
-      activejob (= 8.0.1)
-      activerecord (= 8.0.1)
-      activesupport (= 8.0.1)
+    activestorage (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activesupport (= 8.0.3)
       marcel (~> 1.0)
-    activesupport (8.0.1)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -77,16 +77,16 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
       uri (>= 0.13.1)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bcrypt (3.1.19)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    bootsnap (1.18.4)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bcrypt (3.1.20)
+    benchmark (0.4.1)
+    bigdecimal (3.2.3)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
-    builder (3.2.4)
+    builder (3.3.0)
     case_transform (0.2)
       activesupport
     claide (1.1.0)
@@ -96,7 +96,7 @@ GEM
       open4 (~> 1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.4)
     cork (0.3.0)
       colored2 (~> 3.1)
     coveralls (0.7.1)
@@ -106,78 +106,89 @@ GEM
       term-ansicolor
       thor
     crass (1.0.6)
-    danger (9.5.1)
+    csv (3.3.5)
+    danger (9.5.3)
       base64 (~> 0.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
-      colored2 (~> 3.1)
+      colored2 (>= 3.1, < 5)
       cork (~> 0.1)
       faraday (>= 0.9.0, < 3.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.13)
-      kramdown (~> 2.3)
+      git (>= 1.13, < 3.0)
+      kramdown (>= 2.5.1, < 3.0)
       kramdown-parser-gfm (~> 1.0)
       octokit (>= 4.0)
       pstore (~> 0.1)
-      terminal-table (>= 1, < 4)
-    database_cleaner-active_record (2.2.0)
+      terminal-table (>= 1, < 5)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
-    debug (1.10.0)
+    debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
+    delegate (0.4.0)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
     domain_name (0.6.20240107)
-    drb (2.2.1)
-    erubi (1.12.0)
-    factory_bot (6.2.1)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
-      railties (>= 5.0.0)
-    faker (3.2.0)
+    drb (2.2.3)
+    erb (5.0.2)
+    erubi (1.13.1)
+    factory_bot (6.5.5)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.1)
+      factory_bot (~> 6.5)
+      railties (>= 6.1.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
+    faraday-retry (2.3.2)
+      faraday (~> 2.0)
     find_with_order (1.3.1)
       activerecord (>= 3)
-    git (1.19.1)
+    forwardable (1.3.3)
+    git (2.3.3)
+      activesupport (>= 5.0)
       addressable (~> 2.8)
+      process_executer (~> 1.1)
       rchardet (~> 1.8)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
     http-accept (1.7.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
-    i18n (1.14.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    io-console (0.8.0)
-    irb (1.15.1)
+    io-console (0.8.1)
+    irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.6.3)
-    json-schema (3.0.0)
-      addressable (>= 2.8)
+    json (2.15.0)
+    json-schema (5.2.2)
+      addressable (~> 2.8)
+      bigdecimal (~> 3.1)
     jsonapi-renderer (0.2.2)
-    jwt (2.7.1)
-    kramdown (2.4.0)
-      rexml
+    jwt (2.10.2)
+      base64
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
     lingua (0.6.2)
-    logger (1.6.6)
-    loofah (2.21.3)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -185,20 +196,25 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.4)
-    mime-types (3.6.0)
+    marcel (1.1.0)
+    mime-types (3.7.0)
       logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0204)
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
-    minitest (5.19.0)
+    mini_portile2 (2.8.9)
+    minitest (5.25.5)
+    mize (0.6.1)
+    monitor (0.2.0)
     msgpack (1.8.0)
-    multi_json (1.15.0)
-    mysql2 (0.5.5)
+    multi_json (1.17.0)
+    mutex_m (0.3.0)
+    mysql2 (0.5.7)
+      bigdecimal
     nap (1.1.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.6)
+    net-imap (0.5.11)
       date
       net-protocol
     net-pop (0.1.2)
@@ -209,103 +225,110 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
-    nokogiri (1.15.2-aarch64-linux)
+    nokogiri (1.18.10-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.15.2-arm64-darwin)
+    nokogiri (1.18.10-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.2-x64-mingw-ucrt)
+    nokogiri (1.18.10-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-linux)
+    nokogiri (1.18.10-x86_64-linux-gnu)
       racc (~> 1.4)
+    observer (0.1.2)
     octokit (10.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pp (0.6.2)
       prettyprint
     prettyprint (0.2.0)
+    prism (1.5.1)
+    process_executer (1.3.0)
     pstore (0.2.0)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (5.0.3)
-    puma (5.6.6)
+    public_suffix (6.0.2)
+    puma (6.6.1)
       nio4r (~> 2.0)
-    racc (1.7.1)
-    rack (2.2.8)
-    rack-cors (2.0.1)
-      rack (>= 2.0.0)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.1.0)
+    racc (1.8.1)
+    rack (3.2.1)
+    rack-cors (3.0.0)
+      logger
+      rack (>= 3.0.14)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (8.0.1)
-      actioncable (= 8.0.1)
-      actionmailbox (= 8.0.1)
-      actionmailer (= 8.0.1)
-      actionpack (= 8.0.1)
-      actiontext (= 8.0.1)
-      actionview (= 8.0.1)
-      activejob (= 8.0.1)
-      activemodel (= 8.0.1)
-      activerecord (= 8.0.1)
-      activestorage (= 8.0.1)
-      activesupport (= 8.0.1)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (8.0.3)
+      actioncable (= 8.0.3)
+      actionmailbox (= 8.0.3)
+      actionmailer (= 8.0.3)
+      actionpack (= 8.0.3)
+      actiontext (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activemodel (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       bundler (>= 1.15.0)
-      railties (= 8.0.1)
-    rails-dom-testing (2.2.0)
+      railties (= 8.0.3)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
-    railties (8.0.1)
-      actionpack (= 8.0.1)
-      activesupport (= 8.0.1)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rchardet (1.9.0)
-    rdoc (6.12.0)
+    rake (13.3.0)
+    rchardet (1.10.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    regexp_parser (2.8.1)
-    reline (0.6.0)
+    regexp_parser (2.11.3)
+    reline (0.6.2)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rexml (3.4.4)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-rails (6.0.3)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
-    rspec-support (3.12.1)
+      rspec-support (~> 3.13.0)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.6)
     rswag-api (2.16.0)
       activesupport (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
@@ -317,80 +340,103 @@ GEM
     rswag-ui (2.16.0)
       actionpack (>= 5.2, < 8.1)
       railties (>= 5.2, < 8.1)
-    rubocop (1.55.1)
+    rubocop (1.81.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     ruby-progressbar (1.13.0)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
-    shoulda-matchers (6.4.0)
+    set (1.1.2)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    spring (4.1.1)
-    stringio (3.1.5)
+    singleton (0.3.0)
+    spring (4.4.0)
+    sqlite3 (1.7.3)
+      mini_portile2 (~> 2.8.0)
+    stringio (3.1.7)
     sync (0.5.0)
-    term-ansicolor (1.11.2)
-      tins (~> 1.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.2)
+    term-ansicolor (1.11.3)
+      tins (~> 1)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    thor (1.4.0)
     timeout (0.4.3)
-    tins (1.38.0)
+    tins (1.44.1)
       bigdecimal
+      mize (~> 0.6)
       sync
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2023.3)
+    tzinfo-data (1.2025.2)
       tzinfo (>= 1.0.0)
-    unicode-display_width (2.4.2)
-    uri (1.0.2)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.3)
     useragent (0.16.11)
-    webrick (1.9.1)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.11)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   aarch64-linux
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
+  arm64-darwin-25
   x64-mingw-ucrt
   x86_64-linux
 
 DEPENDENCIES
   active_model_serializers (~> 0.10.0)
   bcrypt (~> 3.1.7)
+  bigdecimal
   bootsnap (>= 1.18.4)
   coveralls
+  csv
   danger
   database_cleaner-active_record
+  date
   debug
+  delegate
   factory_bot_rails
   faker
+  faraday-retry
   find_with_order
+  forwardable
   jwt (~> 2.7, >= 2.7.1)
   lingua
-  mysql2 (~> 0.5.5)
-  puma (~> 5.0)
+  logger
+  mini_portile2 (~> 2.8)
+  monitor
+  mutex_m
+  mysql2 (~> 0.5.7)
+  observer
+  ostruct
+  psych (~> 5.2)
+  puma (~> 6.4)
   rack-cors
   rails (~> 8.0, >= 8.0.1)
   rspec-rails
@@ -398,14 +444,19 @@ DEPENDENCIES
   rswag-specs
   rswag-ui
   rubocop
+  set
   shoulda-matchers
   simplecov
   simplecov_json_formatter
+  singleton
   spring
+  sqlite3 (~> 1.4)
+  timeout
   tzinfo-data
+  uri
 
 RUBY VERSION
-   ruby 3.2.7p253
+   ruby 3.4.5p51
 
 BUNDLED WITH
    2.4.14
diff --git a/README.md b/README.md
index 035aee277..2c94a747a 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ application up and running.
 
 Things you may want to cover:
 
-* Ruby version - 3.2.1
+* Ruby version - 3.4.5
 
 ## Development Environment
 
diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
index d67269728..9aec23053 100644
--- a/app/channels/application_cable/channel.rb
+++ b/app/channels/application_cable/channel.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end
diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
index 0ff5442f4..8d6c2a1bf 100644
--- a/app/channels/application_cable/connection.rb
+++ b/app/channels/application_cable/connection.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end
diff --git a/app/controllers/api/v1/account_requests_controller.rb b/app/controllers/account_requests_controller.rb
similarity index 98%
rename from app/controllers/api/v1/account_requests_controller.rb
rename to app/controllers/account_requests_controller.rb
index 30cb17fa7..c4b79e065 100644
--- a/app/controllers/api/v1/account_requests_controller.rb
+++ b/app/controllers/account_requests_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::AccountRequestsController < ApplicationController
+class AccountRequestsController < ApplicationController
 
   # GET /account_requests/pending
   def pending_requests
diff --git a/app/controllers/api/v1/join_team_requests_controller.rb b/app/controllers/api/v1/join_team_requests_controller.rb
deleted file mode 100644
index 7a90fe20d..000000000
--- a/app/controllers/api/v1/join_team_requests_controller.rb
+++ /dev/null
@@ -1,106 +0,0 @@
-class Api::V1::JoinTeamRequestsController < ApplicationController
-  # Constants used to indicate status for the request
-  PENDING = 'PENDING'
-  DECLINED = 'DECLINED'
-  ACCEPTED = 'ACCEPTED'
-
-  # This filter runs before the create action, checking if the team is full
-  before_action :check_team_status, only: [:create]
-
-  # This filter runs before the specified actions, finding the join team request
-  before_action :find_request, only: %i[show update destroy decline]
-
-  #checks if the current user is a student
-  def action_allowed?
-    @current_user.student?
-  end
-
-  # GET api/v1/join_team_requests
-  # gets a list of all the join team requests
-  def index
-    unless @current_user.administrator?
-      return render json: { errors: 'Unauthorized' }, status: :unauthorized
-    end
-    join_team_requests = JoinTeamRequest.all
-    render json: join_team_requests, status: :ok
-  end
-
-  # GET api/v1join_team_requests/1
-  # show the join team request that is passed into the route
-  def show
-    render json: @join_team_request, status: :ok
-  end
-
-  # POST api/v1/join_team_requests
-  # Creates a new join team request
-  def create
-    join_team_request = JoinTeamRequest.new
-    join_team_request.comments = params[:comments]
-    join_team_request.status = PENDING
-    join_team_request.team_id = params[:team_id]
-    participant = Participant.where(user_id: @current_user.id, assignment_id: params[:assignment_id]).first
-    team = Team.find(params[:team_id])
-
-    if team.participants.include?(participant)
-      render json: { error: 'You already belong to the team' }, status: :unprocessable_entity
-    elsif participant
-      join_team_request.participant_id = participant.id
-      if join_team_request.save
-        render json: join_team_request, status: :created
-      else
-        render json: { errors: join_team_request.errors.full_messages }, status: :unprocessable_entity
-      end
-    else
-      render json: { errors: 'Participant not found' }, status: :unprocessable_entity
-    end
-  end
-
-  # PATCH/PUT api/v1/join_team_requests/1
-  # Updates a join team request
-  def update
-    if @join_team_request.update(join_team_request_params)
-      render json: { message: 'JoinTeamRequest was successfully updated' }, status: :ok
-    else
-      render json: { errors: @join_team_request.errors.full_messages }, status: :unprocessable_entity
-    end
-  end
-
-  # DELETE api/v1/join_team_requests/1
-  # delete a join team request
-  def destroy
-    if @join_team_request.destroy
-      render json: { message: 'JoinTeamRequest was successfully deleted' }, status: :ok
-    else
-      render json: { errors: 'Failed to delete JoinTeamRequest' }, status: :unprocessable_entity
-    end
-  end
-
-  # decline a join team request
-  def decline
-    @join_team_request.status = DECLINED
-    if @join_team_request.save
-      render json: { message: 'JoinTeamRequest declined successfully' }, status: :ok
-    else
-      render json: { errors: @join_team_request.errors.full_messages }, status: :unprocessable_entity
-    end
-  end
-
-  private
-  # checks if the team is full already
-  def check_team_status
-    team = Team.find(params[:team_id])
-    if team.full?
-      render json: { message: 'This team is full.' }, status: :unprocessable_entity
-    end
-  end
-
-  # Finds the join team request by ID
-  def find_request
-    @join_team_request = JoinTeamRequest.find(params[:id])
-  end
-
-  # Permits specified parameters for join team requests
-  def join_team_request_params
-    params.require(:join_team_request).permit(:comments, :reply_status)
-  end
-end
diff --git a/app/controllers/api/v1/teams_controller.rb b/app/controllers/api/v1/teams_controller.rb
deleted file mode 100644
index dbca26358..000000000
--- a/app/controllers/api/v1/teams_controller.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-module Api
-  module V1
-    class TeamsController < ApplicationController
-      # Set the @team instance variable before executing actions except index and create
-      before_action :set_team, except: [:index, :create]
-
-      # Validate team type only during team creation
-      before_action :validate_team_type, only: [:create]
-
-      # GET /api/v1/teams
-      # Fetches all teams and renders them using TeamSerializer
-      def index
-        @teams = Team.all
-        render json: @teams, each_serializer: TeamSerializer
-      end
-
-      # GET /api/v1/teams/:id
-      # Shows a specific team based on ID
-      def show
-        render json: @team, serializer: TeamSerializer
-      rescue ActiveRecord::RecordNotFound
-        render json: { error: 'Team not found' }, status: :not_found
-      end
-
-      # POST /api/v1/teams
-      # Creates a new team associated with the current user
-      def create
-        @team = Team.new(team_params)
-        @team.user = current_user
-        if @team.save
-          render json: @team, serializer: TeamSerializer, status: :created
-        else
-          render json: { errors: @team.errors.full_messages }, status: :unprocessable_entity
-        end
-      end
-
-      # GET /api/v1/teams/:id/members
-      # Lists all members of a specific team
-      def members
-        participants = @team.participants.includes(:user)
-        render json: participants.map(&:user), each_serializer: UserSerializer
-      end
-
-      # POST /api/v1/teams/:id/members
-      # Adds a new member to the team unless it's already full
-      def add_member
-        return render json: { errors: ['Team is full'] }, status: :unprocessable_entity if @team.full?
-
-        user = User.find(team_participant_params[:user_id])
-        participant = Participant.find_by(user: user, parent_id: @team.parent_id)
-
-        unless participant
-          return render json: { error: 'Participant not found for this team context' }, status: :not_found
-        end
-
-        teams_participants = @team.teams_participants.build(participant: participant, user: participant.user)
-
-        if teams_participants.save
-          render json: participant.user, serializer: UserSerializer, status: :created
-        else
-          render json: { errors: teams_participants.errors.full_messages }, status: :unprocessable_entity
-        end
-      rescue ActiveRecord::RecordNotFound
-        render json: { error: 'User not found' }, status: :not_found
-      end
-
-      # DELETE /api/v1/teams/:id/members/:user_id
-      # Removes a member from the team based on user ID
-      def remove_member
-        user = User.find(params[:user_id])
-        participant = Participant.find_by(user: user, parent_id: @team.parent_id)
-        tp = @team.teams_participants.find_by(participant: participant)
-
-        if tp
-          tp.destroy
-          head :no_content
-        else
-          render json: { error: 'Member not found' }, status: :not_found
-        end
-      rescue ActiveRecord::RecordNotFound
-        render json: { error: 'User not found' }, status: :not_found
-      end
-
-      private
-
-      # Finds the team by ID and assigns to @team, else renders not found
-      def set_team
-        @team = Team.find(params[:id])
-      rescue ActiveRecord::RecordNotFound
-        render json: { error: 'Team not found' }, status: :not_found
-      end
-
-      # Whitelists the parameters allowed for team creation/updation
-      def team_params
-        params.require(:team).permit(:name, :max_team_size, :type, :assignment_id)
-      end
-
-      # Whitelists parameters required to add a team member
-      def team_participant_params
-        params.require(:team_participant).permit(:user_id)
-      end
-
-      # Validates the team type before team creation to ensure it's among allowed types
-      def validate_team_type
-        return unless params[:team] && params[:team][:type]
-        valid_types = ['CourseTeam', 'AssignmentTeam', 'MentoredTeam']
-        unless valid_types.include?(params[:team][:type])
-          render json: { error: 'Invalid team type' }, status: :unprocessable_entity
-        end
-      end
-
-      
-    end
-  end
-end 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 12ffcf261..8129da6b6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::API
   include Authorization
   include JwtToken
diff --git a/app/controllers/api/v1/assignments_controller.rb b/app/controllers/assignments_controller.rb
similarity index 97%
rename from app/controllers/api/v1/assignments_controller.rb
rename to app/controllers/assignments_controller.rb
index 2f2515232..84d99f7c0 100644
--- a/app/controllers/api/v1/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -1,19 +1,19 @@
-class Api::V1::AssignmentsController < ApplicationController
+class AssignmentsController < ApplicationController
   rescue_from ActiveRecord::RecordNotFound, with: :not_found
 
-  # GET /api/v1/assignments
+  # GET /assignments
   def index
     assignments = Assignment.all
     render json: assignments
   end
 
-  # GET /api/v1/assignments/:id
+  # GET /assignments/:id
   def show
     assignment = Assignment.find(params[:id])
     render json: assignment
   end
 
-  # POST /api/v1/assignments
+  # POST /assignments
   def create
     assignment = Assignment.new(assignment_params)
     if assignment.save
@@ -23,7 +23,7 @@ def create
     end
   end
 
-  # PATCH/PUT /api/v1/assignments/:id
+  # PATCH/PUT /assignments/:id
   def update
     assignment = Assignment.find(params[:id])
     if assignment.update(assignment_params)
@@ -37,7 +37,7 @@ def not_found
     render json: { error: "Assignment not found" }, status: :not_found
   end
 
-  # DELETE /api/v1/assignments/:id
+  # DELETE /assignments/:id
   def destroy
     assignment = Assignment.find_by(id: params[:id])
     if assignment
diff --git a/app/controllers/authentication_controller.rb b/app/controllers/authentication_controller.rb
index 32c96a909..696c4ab21 100644
--- a/app/controllers/authentication_controller.rb
+++ b/app/controllers/authentication_controller.rb
@@ -1,4 +1,4 @@
-# app/controllers/api/v1/authentication_controller.rb
+# app/controllers/authentication_controller.rb
 require 'json_web_token'
 
 class AuthenticationController < ApplicationController
diff --git a/app/controllers/api/v1/bookmarks_controller.rb b/app/controllers/bookmarks_controller.rb
similarity index 95%
rename from app/controllers/api/v1/bookmarks_controller.rb
rename to app/controllers/bookmarks_controller.rb
index 3e82a3b83..59fa3efda 100644
--- a/app/controllers/api/v1/bookmarks_controller.rb
+++ b/app/controllers/bookmarks_controller.rb
@@ -1,101 +1,101 @@
-class Api::V1::BookmarksController < ApplicationController
-  rescue_from ActiveRecord::RecordNotFound, with: :not_found
-  
-  def action_allowed?
-    current_user_has_student_privileges?
-  end
-  # Index method returns the list of JSON objects of the bookmark
-  # GET on /bookmarks
-  def index
-    @bookmarks = Bookmark.order(:id)
-    render json: @bookmarks, status: :ok and return
-  end
-
-  # Show method returns the JSON object of bookmark with id = {:id}
-  # GET on /bookmarks/:id
-  def show
-    begin
-      @bookmark = Bookmark.find(params[:id])
-      render json: @bookmark, status: :ok and return
-    rescue ActiveRecord::RecordNotFound
-      render json: $ERROR_INFO.to_s, status: :not_found and return
-    end
-  end
-
-  # Create method creates a bookmark and returns the JSON object of the created bookmark
-  # POST on /bookmarks
-  def create
-    begin
-      # params[:user_id] = @current_user.id
-      @bookmark = Bookmark.new(bookmark_params)
-      @bookmark.user_id = @current_user.id
-      @bookmark.save!
-      render json: @bookmark, status: :created and return
-    rescue ActiveRecord::RecordInvalid
-      render json: $ERROR_INFO.to_s, status: :unprocessable_entity
-    end
-  end
-
-  # Update method updates the bookmark object with id - {:id} and returns the updated bookmark JSON object
-  # PUT on /bookmarks/:id
-  def update
-    @bookmark = Bookmark.find(params[:id])
-    if @bookmark.update(update_bookmark_params)
-      render json: @bookmark, status: :ok
-    else
-      render json: @bookmark.errors.full_messages, status: :unprocessable_entity
-    end
-  end
-
-  # Handle the case when an invalid bookmark id is being passed
-  def not_found
-    render json: { error: "Couldn't find Bookmark" }, status: :not_found
-  end
-
-  # Destroy method deletes the bookmark object with id- {:id}
-  # DELETE on /bookmarks/:id
-  def destroy
-    begin
-      @bookmark = Bookmark.find(params[:id])
-      @bookmark.delete
-    rescue ActiveRecord::RecordNotFound
-        render json: $ERROR_INFO.to_s, status: :not_found and return
-    end
-  end
-
-  # get_bookmark_rating_score method gets the bookmark rating of the bookmark object with id- {:id}
-  # GET on /bookmarks/:id/bookmarkratings
-  def get_bookmark_rating_score
-    begin
-      @bookmark = Bookmark.find(params[:id])
-      @bookmark_rating = BookmarkRating.where(bookmark_id: @bookmark.id, user_id: @current_user.id).first
-      render json: @bookmark_rating, status: :ok and return
-    rescue ActiveRecord::RecordNotFound
-      render json: $ERROR_INFO.to_s, status: :not_found and return
-    end
-  end
-
-  # save_bookmark_rating_score method creates or updates the bookmark rating of the bookmark object with id- {:id}
-  # POST on /bookmarks/:id/bookmarkratings
-  def save_bookmark_rating_score
-    @bookmark = Bookmark.find(params[:id])
-    @bookmark_rating = BookmarkRating.where(bookmark_id: @bookmark.id, user_id: @current_user.id).first
-    if @bookmark_rating.blank?
-      @bookmark_rating = BookmarkRating.create(bookmark_id: @bookmark.id, user_id: @current_user.id, rating: params[:rating])
-    else
-      @bookmark_rating.update({'rating': params[:rating].to_i})
-    end
-    render json: {"bookmark": @bookmark, "rating": @bookmark_rating}, status: :ok
-  end
-
-  private
-
-  def bookmark_params
-    params.require(:bookmark).permit(:url, :title, :description, :topic_id, :rating, :id)
-  end
-
-  def update_bookmark_params
-    params.require(:bookmark).permit(:url, :title, :description)
-  end
-
-end
+class BookmarksController < ApplicationController
+  rescue_from ActiveRecord::RecordNotFound, with: :not_found
+  
+  def action_allowed?
+    current_user_has_student_privileges?
+  end
+  # Index method returns the list of JSON objects of the bookmark
+  # GET on /bookmarks
+  def index
+    @bookmarks = Bookmark.order(:id)
+    render json: @bookmarks, status: :ok and return
+  end
+
+  # Show method returns the JSON object of bookmark with id = {:id}
+  # GET on /bookmarks/:id
+  def show
+    begin
+      @bookmark = Bookmark.find(params[:id])
+      render json: @bookmark, status: :ok and return
+    rescue ActiveRecord::RecordNotFound
+      render json: $ERROR_INFO.to_s, status: :not_found and return
+    end
+  end
+
+  # Create method creates a bookmark and returns the JSON object of the created bookmark
+  # POST on /bookmarks
+  def create
+    begin
+      # params[:user_id] = @current_user.id
+      @bookmark = Bookmark.new(bookmark_params)
+      @bookmark.user_id = @current_user.id
+      @bookmark.save!
+      render json: @bookmark, status: :created and return
+    rescue ActiveRecord::RecordInvalid
+      render json: $ERROR_INFO.to_s, status: :unprocessable_entity
+    end
+  end
+
+  # Update method updates the bookmark object with id - {:id} and returns the updated bookmark JSON object
+  # PUT on /bookmarks/:id
+  def update
+    @bookmark = Bookmark.find(params[:id])
+    if @bookmark.update(update_bookmark_params)
+      render json: @bookmark, status: :ok
+    else
+      render json: @bookmark.errors.full_messages, status: :unprocessable_entity
+    end
+  end
+
+  # Handle the case when an invalid bookmark id is being passed
+  def not_found
+    render json: { error: "Couldn't find Bookmark" }, status: :not_found
+  end
+
+  # Destroy method deletes the bookmark object with id- {:id}
+  # DELETE on /bookmarks/:id
+  def destroy
+    begin
+      @bookmark = Bookmark.find(params[:id])
+      @bookmark.delete
+    rescue ActiveRecord::RecordNotFound
+        render json: $ERROR_INFO.to_s, status: :not_found and return
+    end
+  end
+
+  # get_bookmark_rating_score method gets the bookmark rating of the bookmark object with id- {:id}
+  # GET on /bookmarks/:id/bookmarkratings
+  def get_bookmark_rating_score
+    begin
+      @bookmark = Bookmark.find(params[:id])
+      @bookmark_rating = BookmarkRating.where(bookmark_id: @bookmark.id, user_id: @current_user.id).first
+      render json: @bookmark_rating, status: :ok and return
+    rescue ActiveRecord::RecordNotFound
+      render json: $ERROR_INFO.to_s, status: :not_found and return
+    end
+  end
+
+  # save_bookmark_rating_score method creates or updates the bookmark rating of the bookmark object with id- {:id}
+  # POST on /bookmarks/:id/bookmarkratings
+  def save_bookmark_rating_score
+    @bookmark = Bookmark.find(params[:id])
+    @bookmark_rating = BookmarkRating.where(bookmark_id: @bookmark.id, user_id: @current_user.id).first
+    if @bookmark_rating.blank?
+      @bookmark_rating = BookmarkRating.create(bookmark_id: @bookmark.id, user_id: @current_user.id, rating: params[:rating])
+    else
+      @bookmark_rating.update({'rating': params[:rating].to_i})
+    end
+    render json: {"bookmark": @bookmark, "rating": @bookmark_rating}, status: :ok
+  end
+
+  private
+
+  def bookmark_params
+    params.require(:bookmark).permit(:url, :title, :description, :topic_id, :rating, :id)
+  end
+
+  def update_bookmark_params
+    params.require(:bookmark).permit(:url, :title, :description)
+  end
+
+end
diff --git a/app/controllers/concerns/authorization.rb b/app/controllers/concerns/authorization.rb
index 95669e990..5c2e87cad 100644
--- a/app/controllers/concerns/authorization.rb
+++ b/app/controllers/concerns/authorization.rb
@@ -1,252 +1,254 @@
-module Authorization
-  extend ActiveSupport::Concern
-  include JwtToken
-
-  # Authorize all actions
-  def authorize
-    Rails.logger.info "Authorization Header: #{request.headers['Authorization']}"
-    Rails.logger.info "Current User: #{current_user&.inspect}"
-    unless all_actions_allowed?
-      render json: { 
-        error: "You are not authorized to #{params[:action]} this #{params[:controller]}"
-      }, status: :forbidden
-    end
-  end
-
-  # Check if all actions are allowed
-  def all_actions_allowed?
-    return true if current_user_has_super_admin_privileges?
-    action_allowed?
-  end
-
-  # Base action_allowed? - allows everything by default
-  # Controllers should override this method to implement their authorization logic
-  def action_allowed?
-    true
-  end
-
-  # this method checks if the user has exactly the specified role
-  # @param role_name [String, Role] The exact role to check for
-  # @return [Boolean] true if user has exactly this role, false otherwise
-  # @example
-  #   current_user_has_role?('Student') # true only if user is exactly a student
-  #   current_user_has_role?(Role::INSTRUCTOR) # true only if user is exactly an instructor
-  def current_user_has_role?(required_role)
-    required_role = required_role.name if required_role.is_a?(Role)
-    current_user&.role&.name == required_role
-  end
-
-    # Determine if the currently logged-in user has the privileges of a Super-Admin
-  def current_user_has_super_admin_privileges?
-    current_user_has_privileges_of?('Super Administrator')
-  end
-
-  # Determine if the currently logged-in user has the privileges of an Admin (or higher)
-  def current_user_has_admin_privileges?
-    current_user_has_privileges_of?('Administrator')
-  end
-
-  # Determine if the currently logged-in user has the privileges of an Instructor (or higher)
-  def current_user_has_instructor_privileges?
-    current_user_has_privileges_of?('Instructor')
-  end
-
-  # Determine if the currently logged-in user has the privileges of a TA (or higher)
-  def current_user_has_ta_privileges?
-    current_user_has_privileges_of?('Teaching Assistant')
-  end
-
-  # Determine if the currently logged-in user has the privileges of a Student (or higher)
-  def current_user_has_student_privileges?
-    current_user_has_privileges_of?('Student')
-  end
-
-  # Determine if the currently logged-in user is participating in an Assignment based on the assignment_id argument
-  def current_user_is_assignment_participant?(assignment_id)
-    if user_logged_in?
-      return AssignmentParticipant.exists?(parent_id: assignment_id, user_id: current_user.id)
-    end
-    false
-  end
-
-  def current_user_teaching_staff_of_assignment?(assignment_id)
-    assignment = Assignment.find(assignment_id)
-    user_logged_in? &&
-    (
-        current_user_instructs_assignment?(assignment) ||
-        current_user_has_ta_mapping_for_assignment?(assignment)
-    )
-  end
-
-  # Determine if the currently logged-in user IS of the given role name
-  # If there is no currently logged-in user simply return false
-  # parameter role_name should be one of: 'Student', 'Teaching Assistant', 'Instructor', 'Administrator', 'Super-Administrator'
-  def current_user_is_a?(role_name)
-    current_user_and_role_exist? && current_user.role.name == role_name
-  end
-
-  # Determine if the current user has the passed in id value
-  # parameter id can be integer or string
-  def current_user_has_id?(id)
-    user_logged_in? && current_user.id.eql?(id.to_i)
-  end
-
-  # Determine if the currently logged-in user created the bookmark with the given ID
-  # If there is no currently logged-in user (or that user has no ID) simply return false
-  # Bookmark ID can be passed as string or number
-  # If the bookmark is not found, simply return false
-  def current_user_created_bookmark_id?(bookmark_id)
-    user_logged_in? && !bookmark_id.nil? && Bookmark.find(bookmark_id.to_i).user_id == current_user.id
-  rescue ActiveRecord::RecordNotFound
-    return false
-  end
-
-  # Determine if the given user can submit work
-  def given_user_can_submit?(user_id)
-    given_user_can?(user_id, 'submit')
-  end
-
-  # Determine if the given user can review work
-  def given_user_can_review?(user_id)
-    given_user_can?(user_id, 'review')
-  end
-
-  # Determine if the given user can take quizzes
-  def given_user_can_take_quiz?(user_id)
-    given_user_can?(user_id, 'take_quiz')
-  end
-
-  # Determine if the given user can read work
-  def given_user_can_read?(user_id)
-    # Note that the ability to read is in the model as can_take_quiz
-    # Per Dr. Gehringer, "I believe that 'can_take_quiz' means that the participant is a reader,
-    # but please check the code to verify".
-    # This was verified in the Participant model
-    given_user_can_take_quiz?(user_id)
-  end
-
-  def response_edit_allowed?(map, user_id)
-    assignment = map.reviewer.assignment
-    # if it is a review response map, all the members of reviewee team should be able to view the response (can be done from heat map)
-    if map.is_a? ReviewResponseMap
-      reviewee_team = AssignmentTeam.find(map.reviewee_id)
-      return user_logged_in? &&
-          (
-            current_user_has_id?(user_id) ||
-            reviewee_team.user?(current_user) ||
-            current_user_has_admin_privileges? ||
-            (current_user_is_a?('Instructor') && current_user_instructs_assignment?(assignment)) ||
-            (current_user_is_a?('Teaching Assistant') && current_user_has_ta_mapping_for_assignment?(assignment))
-          )
-    end
-    current_user_has_id?(user_id) ||
-        (current_user_is_a?('Instructor') && current_user_instructs_assignment?(assignment)) ||
-        (assignment.course && current_user_is_a?('Teaching Assistant') && current_user_has_ta_mapping_for_assignment?(assignment))
-  end
-
-  # Determine if there is a current user
-  # The application controller method current_user
-  # will return a user even if current_user has been explicitly cleared out
-  # because it is "sticky" in that it uses "@current_user ||= current_user"
-  # So, this method can be used to answer a controller's question
-  # "is anyone CURRENTLY logged in"
-  def user_logged_in?
-    !current_user.nil?
-  end
-
-  # Determine if the currently logged-in user is an ancestor of the passed in user
-  def current_user_ancestor_of?(user)
-    return current_user.recursively_parent_of(user) if user_logged_in? && user
-    false
-  end
-
-  # Recursively find an assignment for a given Response id. Because a ResponseMap
-  # Determine if the current user is an instructor for the given assignment
-  def current_user_instructs_assignment?(assignment)
-    user_logged_in? && !assignment.nil? && (
-      assignment.instructor_id == current_user.id ||
-      (assignment.course_id && Course.find(assignment.course_id).instructor_id == current_user.id)
-    )
-  end
-
-  # Determine if the current user and the given assignment are associated by a TA mapping
-  def current_user_has_ta_mapping_for_assignment?(assignment)
-    user_logged_in? && !assignment.nil? && TaMapping.exists?(ta_id: current_user.id, course_id: assignment.course.id)
-  end
-
-  # Recursively find an assignment given the passed in Response id. Because a ResponseMap
-  # can either point to an Assignment or another Response, recursively search until the
-  # ResponseMap object's reviewed_object_id points to an Assignment.
-  def find_assignment_from_response_id(response_id)
-    response = Response.find(response_id.to_i)
-    response_map = response.response_map
-    if response_map.assignment
-      return response_map.assignment
-    else
-      find_assignment_from_response_id(response_map.reviewed_object_id)
-    end
-  end
-
-  # Finds the assignment_instructor for a given assignment. If the assignment is associated with
-  # a course, the instructor for the course is returned. If not, the instructor associated
-  # with the assignment is return.
-  def find_assignment_instructor(assignment)
-    if assignment.course
-      Course.find_by(id: assignment.course.id).instructor
-    else
-      assignment.instructor
-    end
-  end
-
-  def current_user_has_all_heatgrid_data_privileges?(assignment)
-    return false unless user_logged_in?
-
-    # 1. Super Admin
-    return true if current_user_is_a?('Super Administrator')
-
-    # 2. Admin who created the instructor of the assignment
-    if current_user_is_a?('Administrator')
-      instructor = find_assignment_instructor(assignment)
-      return true if instructor && instructor.parent_id == current_user.id
-    end
-
-    # 3. Instructor of the assignment
-    return true if current_user_is_a?('Instructor') && current_user_instructs_assignment?(assignment)
-
-    # 4. TA mapped to the course of the assignment
-    return true if current_user_is_a?('Teaching Assistant') && current_user_has_ta_mapping_for_assignment?(assignment)
-
-    false
-  end
-
-  # PRIVATE METHODS
-  private
-
-  # Determine if the currently logged-in user has the privileges of the given role name (or higher privileges)
-  # Let the Role model define this logic for the sake of DRY
-  # If there is no currently logged-in user simply return false
-  def current_user_has_privileges_of?(role_name)
-    current_user_and_role_exist? && current_user.role.all_privileges_of?(Role.find_by(name: role_name))
-  end
-
-  # Determine if the given user is a participant of some kind
-  # who is allowed to perform the given action ("submit", "review", "take_quiz")
-  def given_user_can?(user_id, action)
-    participant = Participant.find_by(id: user_id)
-    return false if participant.nil?
-    case action
-    when 'submit'
-      participant.can_submit
-    when 'review'
-      participant.can_review
-    when 'take_quiz'
-      participant.can_take_quiz
-    else
-      raise "Did not recognize user action '" + action + "'"
-    end
-  end
-
-  def current_user_and_role_exist?
-    user_logged_in? && !current_user.role.nil?
-  end
+# frozen_string_literal: true
+
+module Authorization
+  extend ActiveSupport::Concern
+  include JwtToken
+
+  # Authorize all actions
+  def authorize
+    Rails.logger.info "Authorization Header: #{request.headers['Authorization']}"
+    Rails.logger.info "Current User: #{current_user&.inspect}"
+    unless all_actions_allowed?
+      render json: { 
+        error: "You are not authorized to #{params[:action]} this #{params[:controller]}"
+      }, status: :forbidden
+    end
+  end
+
+  # Check if all actions are allowed
+  def all_actions_allowed?
+    return true if current_user_has_super_admin_privileges?
+    action_allowed?
+  end
+
+  # Base action_allowed? - allows everything by default
+  # Controllers should override this method to implement their authorization logic
+  def action_allowed?
+    true
+  end
+
+  # this method checks if the user has exactly the specified role
+  # @param role_name [String, Role] The exact role to check for
+  # @return [Boolean] true if user has exactly this role, false otherwise
+  # @example
+  #   current_user_has_role?('Student') # true only if user is exactly a student
+  #   current_user_has_role?(Role::INSTRUCTOR) # true only if user is exactly an instructor
+  def current_user_has_role?(required_role)
+    required_role = required_role.name if required_role.is_a?(Role)
+    current_user&.role&.name == required_role
+  end
+
+    # Determine if the currently logged-in user has the privileges of a Super-Admin
+  def current_user_has_super_admin_privileges?
+    current_user_has_privileges_of?('Super Administrator')
+  end
+
+  # Determine if the currently logged-in user has the privileges of an Admin (or higher)
+  def current_user_has_admin_privileges?
+    current_user_has_privileges_of?('Administrator')
+  end
+
+  # Determine if the currently logged-in user has the privileges of an Instructor (or higher)
+  def current_user_has_instructor_privileges?
+    current_user_has_privileges_of?('Instructor')
+  end
+
+  # Determine if the currently logged-in user has the privileges of a TA (or higher)
+  def current_user_has_ta_privileges?
+    current_user_has_privileges_of?('Teaching Assistant')
+  end
+
+  # Determine if the currently logged-in user has the privileges of a Student (or higher)
+  def current_user_has_student_privileges?
+    current_user_has_privileges_of?('Student')
+  end
+
+  # Determine if the currently logged-in user is participating in an Assignment based on the assignment_id argument
+  def current_user_is_assignment_participant?(assignment_id)
+    if user_logged_in?
+      return AssignmentParticipant.exists?(parent_id: assignment_id, user_id: current_user.id)
+    end
+    false
+  end
+
+  def current_user_teaching_staff_of_assignment?(assignment_id)
+    assignment = Assignment.find(assignment_id)
+    user_logged_in? &&
+    (
+        current_user_instructs_assignment?(assignment) ||
+        current_user_has_ta_mapping_for_assignment?(assignment)
+    )
+  end
+
+  # Determine if the currently logged-in user IS of the given role name
+  # If there is no currently logged-in user simply return false
+  # parameter role_name should be one of: 'Student', 'Teaching Assistant', 'Instructor', 'Administrator', 'Super-Administrator'
+  def current_user_is_a?(role_name)
+    current_user_and_role_exist? && current_user.role.name == role_name
+  end
+
+  # Determine if the current user has the passed in id value
+  # parameter id can be integer or string
+  def current_user_has_id?(id)
+    user_logged_in? && current_user.id.eql?(id.to_i)
+  end
+
+  # Determine if the currently logged-in user created the bookmark with the given ID
+  # If there is no currently logged-in user (or that user has no ID) simply return false
+  # Bookmark ID can be passed as string or number
+  # If the bookmark is not found, simply return false
+  def current_user_created_bookmark_id?(bookmark_id)
+    user_logged_in? && !bookmark_id.nil? && Bookmark.find(bookmark_id.to_i).user_id == current_user.id
+  rescue ActiveRecord::RecordNotFound
+    return false
+  end
+
+  # Determine if the given user can submit work
+  def given_user_can_submit?(user_id)
+    given_user_can?(user_id, 'submit')
+  end
+
+  # Determine if the given user can review work
+  def given_user_can_review?(user_id)
+    given_user_can?(user_id, 'review')
+  end
+
+  # Determine if the given user can take quizzes
+  def given_user_can_take_quiz?(user_id)
+    given_user_can?(user_id, 'take_quiz')
+  end
+
+  # Determine if the given user can read work
+  def given_user_can_read?(user_id)
+    # Note that the ability to read is in the model as can_take_quiz
+    # Per Dr. Gehringer, "I believe that 'can_take_quiz' means that the participant is a reader,
+    # but please check the code to verify".
+    # This was verified in the Participant model
+    given_user_can_take_quiz?(user_id)
+  end
+
+  def response_edit_allowed?(map, user_id)
+    assignment = map.reviewer.assignment
+    # if it is a review response map, all the members of reviewee team should be able to view the response (can be done from heat map)
+    if map.is_a? ReviewResponseMap
+      reviewee_team = AssignmentTeam.find(map.reviewee_id)
+      return user_logged_in? &&
+          (
+            current_user_has_id?(user_id) ||
+            reviewee_team.user?(current_user) ||
+            current_user_has_admin_privileges? ||
+            (current_user_is_a?('Instructor') && current_user_instructs_assignment?(assignment)) ||
+            (current_user_is_a?('Teaching Assistant') && current_user_has_ta_mapping_for_assignment?(assignment))
+          )
+    end
+    current_user_has_id?(user_id) ||
+        (current_user_is_a?('Instructor') && current_user_instructs_assignment?(assignment)) ||
+        (assignment.course && current_user_is_a?('Teaching Assistant') && current_user_has_ta_mapping_for_assignment?(assignment))
+  end
+
+  # Determine if there is a current user
+  # The application controller method current_user
+  # will return a user even if current_user has been explicitly cleared out
+  # because it is "sticky" in that it uses "@current_user ||= current_user"
+  # So, this method can be used to answer a controller's question
+  # "is anyone CURRENTLY logged in"
+  def user_logged_in?
+    !current_user.nil?
+  end
+
+  # Determine if the currently logged-in user is an ancestor of the passed in user
+  def current_user_ancestor_of?(user)
+    return current_user.recursively_parent_of(user) if user_logged_in? && user
+    false
+  end
+
+  # Recursively find an assignment for a given Response id. Because a ResponseMap
+  # Determine if the current user is an instructor for the given assignment
+  def current_user_instructs_assignment?(assignment)
+    user_logged_in? && !assignment.nil? && (
+      assignment.instructor_id == current_user.id ||
+      (assignment.course_id && Course.find(assignment.course_id).instructor_id == current_user.id)
+    )
+  end
+
+  # Determine if the current user and the given assignment are associated by a TA mapping
+  def current_user_has_ta_mapping_for_assignment?(assignment)
+    user_logged_in? && !assignment.nil? && TaMapping.exists?(ta_id: current_user.id, course_id: assignment.course.id)
+  end
+
+  # Recursively find an assignment given the passed in Response id. Because a ResponseMap
+  # can either point to an Assignment or another Response, recursively search until the
+  # ResponseMap object's reviewed_object_id points to an Assignment.
+  def find_assignment_from_response_id(response_id)
+    response = Response.find(response_id.to_i)
+    response_map = response.response_map
+    if response_map.assignment
+      return response_map.assignment
+    else
+      find_assignment_from_response_id(response_map.reviewed_object_id)
+    end
+  end
+
+  # Finds the assignment_instructor for a given assignment. If the assignment is associated with
+  # a course, the instructor for the course is returned. If not, the instructor associated
+  # with the assignment is return.
+  def find_assignment_instructor(assignment)
+    if assignment.course
+      Course.find_by(id: assignment.course.id).instructor
+    else
+      assignment.instructor
+    end
+  end
+
+  def current_user_has_all_heatgrid_data_privileges?(assignment)
+    return false unless user_logged_in?
+
+    # 1. Super Admin
+    return true if current_user_is_a?('Super Administrator')
+
+    # 2. Admin who created the instructor of the assignment
+    if current_user_is_a?('Administrator')
+      instructor = find_assignment_instructor(assignment)
+      return true if instructor && instructor.parent_id == current_user.id
+    end
+
+    # 3. Instructor of the assignment
+    return true if current_user_is_a?('Instructor') && current_user_instructs_assignment?(assignment)
+
+    # 4. TA mapped to the course of the assignment
+    return true if current_user_is_a?('Teaching Assistant') && current_user_has_ta_mapping_for_assignment?(assignment)
+
+    false
+  end
+
+  # PRIVATE METHODS
+  private
+
+  # Determine if the currently logged-in user has the privileges of the given role name (or higher privileges)
+  # Let the Role model define this logic for the sake of DRY
+  # If there is no currently logged-in user simply return false
+  def current_user_has_privileges_of?(role_name)
+    current_user_and_role_exist? && current_user.role.all_privileges_of?(Role.find_by(name: role_name))
+  end
+
+  # Determine if the given user is a participant of some kind
+  # who is allowed to perform the given action ("submit", "review", "take_quiz")
+  def given_user_can?(user_id, action)
+    participant = Participant.find_by(id: user_id)
+    return false if participant.nil?
+    case action
+    when 'submit'
+      participant.can_submit
+    when 'review'
+      participant.can_review
+    when 'take_quiz'
+      participant.can_take_quiz
+    else
+      raise "Did not recognize user action '" + action + "'"
+    end
+  end
+
+  def current_user_and_role_exist?
+    user_logged_in? && !current_user.role.nil?
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/concerns/jwt_token.rb b/app/controllers/concerns/jwt_token.rb
index 6e2ca918d..868ce4ac3 100644
--- a/app/controllers/concerns/jwt_token.rb
+++ b/app/controllers/concerns/jwt_token.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json_web_token'
 module JwtToken
   extend ActiveSupport::Concern
diff --git a/app/controllers/api/v1/courses_controller.rb b/app/controllers/courses_controller.rb
similarity index 94%
rename from app/controllers/api/v1/courses_controller.rb
rename to app/controllers/courses_controller.rb
index 037b4315d..b8da8f874 100644
--- a/app/controllers/api/v1/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1,119 +1,119 @@
-class Api::V1::CoursesController < ApplicationController
-  before_action :set_course, only: %i[ show update destroy add_ta view_tas remove_ta copy ]
-  rescue_from ActiveRecord::RecordNotFound, with: :course_not_found
-  rescue_from ActionController::ParameterMissing, with: :parameter_missing
-
-  def action_allowed?
-    current_user_has_instructor_privileges?
-  end
-
-  # GET /courses
-  # List all the courses
-  def index
-    courses = Course.all
-    render json: courses, status: :ok
-  end
-
-  # GET /courses/1
-  # Get a course
-  def show
-    render json: @course, status: :ok
-  end
-
-  # POST /courses
-  # Create a course
-  def create
-    course = Course.new(course_params)
-    if course.save
-      render json: course, status: :created
-    else
-      render json: course.errors, status: :unprocessable_entity
-    end
-  end
-
-  # PATCH/PUT /courses/1
-  # Update a course
-  def update
-    if @course.update(course_params)
-      render json: @course, status: :ok
-    else
-      render json: @course.errors, status: :unprocessable_entity
-    end
-  end
-
-  # DELETE /courses/1
-  # Delete a course
-  def destroy
-    @course.destroy
-    render json: { message: "Course with id #{params[:id]}, deleted" }, status: :no_content
-  end
-
-  # Adds a Teaching Assistant to the course
-  def add_ta
-    user_id = params[:ta_id] # Use user_id from the request
-    print(user_id)
-    user = User.find_by(id: user_id)
-    
-    course_id = params[:id]
-    @course = Course.find_by(id: course_id)
-  
-    if user.nil?
-      render json: { status: "error", message: "The user with id #{user_id} does not exist" }, status: :not_found
-      return
-    end
-  
-    result = @course.add_ta(user)
-    if result[:success]
-      render json: result[:data], status: :created
-    else
-      render json: { status: "error", message: result[:message] }, status: :bad_request
-    end
-  end
-
-  # Displays all Teaching Assistants for the course
-  def view_tas
-    teaching_assistants = @course.tas
-    render json: teaching_assistants, status: :ok
-  end
-
-  # Removes Teaching Assistant from the course
-  def remove_ta
-    result = @course.remove_ta(params[:ta_id])
-    if result[:success]
-      render json: { message: "The TA #{result[:ta_name]} has been removed." }, status: :ok
-    else
-      render json: { status: "error", message: result[:message] }, status: :not_found
-    end
-  end
-
-  # Creates a copy of the course
-  def copy
-    # existing_course = Course.find(params[:id])
-    success = @course.copy_course
-    if success
-      render json: { message: "The course #{@course.name} has been successfully copied" }, status: :ok
-    else
-      render json: { message: "The course was not able to be copied" }, status: :unprocessable_entity
-    end
-  end
-
-  private
-
-  # Use callbacks to share common setup or constraints between actions.
-  def set_course
-    @course = Course.find(params[:id])
-  end
-
-  # Only allow a list of trusted parameters through.
-  def course_params
-    params.require(:course).permit(:name, :directory_path, :info, :private, :instructor_id, :institution_id)
-  end
-
-  def course_not_found
-    render json: { error: "Course with id #{params[:id]} not found" }, status: :not_found
-  end
-
-  def parameter_missing
-    render json: { error: "Parameter missing" }, status: :unprocessable_entity
-  end
-end
+class CoursesController < ApplicationController
+  before_action :set_course, only: %i[ show update destroy add_ta view_tas remove_ta copy ]
+  rescue_from ActiveRecord::RecordNotFound, with: :course_not_found
+  rescue_from ActionController::ParameterMissing, with: :parameter_missing
+
+  def action_allowed?
+    current_user_has_instructor_privileges?
+  end
+
+  # GET /courses
+  # List all the courses
+  def index
+    courses = Course.all
+    render json: courses, status: :ok
+  end
+
+  # GET /courses/1
+  # Get a course
+  def show
+    render json: @course, status: :ok
+  end
+
+  # POST /courses
+  # Create a course
+  def create
+    course = Course.new(course_params)
+    if course.save
+      render json: course, status: :created
+    else
+      render json: course.errors, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /courses/1
+  # Update a course
+  def update
+    if @course.update(course_params)
+      render json: @course, status: :ok
+    else
+      render json: @course.errors, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /courses/1
+  # Delete a course
+  def destroy
+    @course.destroy
+    render json: { message: "Course with id #{params[:id]}, deleted" }, status: :no_content
+  end
+
+  # Adds a Teaching Assistant to the course
+  def add_ta
+    user_id = params[:ta_id] # Use user_id from the request
+    print(user_id)
+    user = User.find_by(id: user_id)
+    
+    course_id = params[:id]
+    @course = Course.find_by(id: course_id)
+  
+    if user.nil?
+      render json: { status: "error", message: "The user with id #{user_id} does not exist" }, status: :not_found
+      return
+    end
+  
+    result = @course.add_ta(user)
+    if result[:success]
+      render json: result[:data], status: :created
+    else
+      render json: { status: "error", message: result[:message] }, status: :bad_request
+    end
+  end
+
+  # Displays all Teaching Assistants for the course
+  def view_tas
+    teaching_assistants = @course.tas
+    render json: teaching_assistants, status: :ok
+  end
+
+  # Removes Teaching Assistant from the course
+  def remove_ta
+    result = @course.remove_ta(params[:ta_id])
+    if result[:success]
+      render json: { message: "The TA #{result[:ta_name]} has been removed." }, status: :ok
+    else
+      render json: { status: "error", message: result[:message] }, status: :not_found
+    end
+  end
+
+  # Creates a copy of the course
+  def copy
+    # existing_course = Course.find(params[:id])
+    success = @course.copy_course
+    if success
+      render json: { message: "The course #{@course.name} has been successfully copied" }, status: :ok
+    else
+      render json: { message: "The course was not able to be copied" }, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  # Use callbacks to share common setup or constraints between actions.
+  def set_course
+    @course = Course.find(params[:id])
+  end
+
+  # Only allow a list of trusted parameters through.
+  def course_params
+    params.require(:course).permit(:name, :directory_path, :info, :private, :instructor_id, :institution_id)
+  end
+
+  def course_not_found
+    render json: { error: "Course with id #{params[:id]} not found" }, status: :not_found
+  end
+
+  def parameter_missing
+    render json: { error: "Parameter missing" }, status: :unprocessable_entity
+  end
+end
diff --git a/app/controllers/api/v1/grades_controller.rb b/app/controllers/grades_controller.rb
similarity index 97%
rename from app/controllers/api/v1/grades_controller.rb
rename to app/controllers/grades_controller.rb
index d9f009623..2c92dd3dd 100644
--- a/app/controllers/api/v1/grades_controller.rb
+++ b/app/controllers/grades_controller.rb
@@ -1,277 +1,277 @@
-class Api::V1::GradesController < ApplicationController
-    include GradesHelper
-    before_action :action_allowed
-    before_action :set_team_and_assignment_via_participant, only: [:edit, :update, :instructor_review]
-    before_action :set_participant_and_team_via_assignment, only: [:view_our_scores, :view_my_scores]
-
-    def action_allowed
-        unless check_permission(action_name)
-            render json: { error: "You do not have permission to perform this action." }, status: :forbidden
-        end
-    end
-
-    # index (GET /api/v1/grades/:id/view_all_scores)
-    # returns all review scores and computed heatmap data for the given assignment (instructor/TA view).
-    def view_all_scores    
-        @assignment = Assignment.find(params[:assignment_id])
-        participant_scores = {}
-        team_scores = {}
-        
-        if params[:participant_id]
-            @participant = AssignmentParticipant.find(params[:participant_id])
-            participant_scores = get_my_scores_data
-        end 
-
-        if params[:team_id]
-            @team = AssignmentTeam.find(params[:team_id])
-            team_scores = get_our_scores_data
-        end
-
-        
-        render json: {
-            team_scores: team_scores,
-            participant_scores: participant_scores
-        }
-    end
-
-
-    # view_our_scores (GET /api/v1/grades/:assignment_id/view_our_scores)
-    # similar to view but scoped to the requesting student’s own team.
-    # It returns the same heatmap data with reviewer identities removed, plus the list of review items.
-    # renders JSON with scores, assignment, averages.
-    # This meets the student’s need to see heatgrids for their team only (with anonymous reviewers) and the associated items.
-    def view_our_scores
-        render json: get_our_scores_data
-    end
-
-    def view_my_scores
-        render json: get_my_scores_data
-    end
-
-
-    # edit (GET /api/v1/grades/:participant_id/edit)
-    # provides data for the grade-assignment interface.
-    # Given an AssignmentParticipant ID, it looks up the participant and its assignment, gathers the full list of items 
-    # (via a helper like list_questions(assignment)), and computes existing peer-review scores for those items.
-    # It then returns JSON including the participant, assignment, items, and current scores.
-    # This lets the front end display an interface where an instructor can assign a grade and feedback (score breakdown) to that submission.
-    def edit
-        items = list_items(@assignment)
-        scores = {}
-        scores[:my_team] = get_our_scores_data
-        scores[:my_own] = get_my_scores_data
-        render json: {
-        participant: @participant,
-        assignment: @assignment,
-        items: items,
-        scores: scores
-        }
-    end
-
-
-    # update (PATCH /api/v1/grades/:participant_id/update)
-    # saves an instructor’s grade and feedback for a team submission.
-    # The method finds the AssignmentParticipant, gets its team, and sets team.grade_for_submission = params[:grade_for_submission] and 
-    # team.comment_for_submission = params[:comment_for_submission]. It then saves the team and returns a success response 
-    # (for example, instructing the UI to reload the team view). This implements “assign score & give feedback” for instructor.
-    def update
-        # team = @participant.team
-        @team.grade_for_submission = params[:grade_for_submission]
-        @team.comment_for_submission = params[:comment_for_submission]
-        if @team.save
-        render json: { message: 'Team grade and comment updated successfully.' }, status: :ok
-        else
-        render json: { error: 'Failed to update team grade or comment.' }, status: :unprocessable_entity
-        end
-    end
-
-
-    # instructor_review (GET /api/v1/grades/:id/instructor_review)
-    # helps the instructor begin grading or re-grading a submission.
-    # It finds or creates the appropriate review mapping for the given participant and returns JSON indicating whether to go to 
-    # Response#new (no review exists yet) or Response#edit (review already exists).
-    # This supports the instructor’s ability to open or edit a review for a student’s submission.
-    def instructor_review
-        reviewer = AssignmentParticipant.find_or_create_by!(user_id: current_user.id, parent_id: @assignment.id, handle: current_user.name)         
-
-        mapping = ReviewResponseMap.find_or_create_by!(
-        reviewed_object_id: @assignment.id,
-        reviewer_id: reviewer.id,
-        reviewee_id: @team.id
-        )
-
-        existing_response = Response.find_by(map_id: mapping.id)
-        action = existing_response.present? ? 'edit' : 'new'
-
-        render json: {
-        map_id: mapping.id,
-        response_id: existing_response&.id,
-        redirect_to: "/response/#{action}/#{mapping.id}"
-        }
-    end
-
-    private
-
-    def set_team_and_assignment_via_participant
-        @participant = AssignmentParticipant.find(params[:participant_id])
-        unless @participant
-        render json: { error: 'Participant not found' }, status: :not_found
-        return
-        end
-        @team = @participant.team
-        unless @team
-        render json: { error: 'Team not found' }, status: :not_found
-        return
-        end
-        @assignment = @participant.assignment
-    end
-
-    # only called when a student wants to review its grades
-    def set_participant_and_team_via_assignment
-        @participant = AssignmentParticipant.find_by(parent_id: params[:assignment_id], user_id: current_user.id)
-        unless @participant
-        render json: { error: 'Participant not found' }, status: :not_found
-        return
-        end
-        @team = @participant.team
-        unless @team
-        render json: { error: 'Team not found' }, status: :not_found
-        return
-        end
-        @assignment = @participant.assignment
-    end
-
-    def check_permission(action)
-        role = current_user.role.name
-        allowed_roles = {
-        'view_our_scores' => ['Student', 'Instructor', 'Teaching Assistant','Super Administrator'],
-        'view_my_scores' => ['Student', 'Instructor', 'Teaching Assistant','Super Administrator'],
-        'view_all_scores' => ['Instructor', 'Teaching Assistant','Super Administrator'],
-        'edit' => ['Instructor','Super Administrator'],
-        'update' => ['Instructor', 'Super Administrator'],
-        'instructor_review' => ['Instructor', 'Teaching Assistant', 'Super Administrator'],
-        'get_response_scores' => ['Student','Super Administrator']
-        }
-        allowed_roles[action]&.include?(role)
-    end
-    
-    def get_our_scores_data
-        reviews_of_our_work_maps = ReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewee_id: @team.id).to_a
-        reviews_of_our_work = get_heatgrid_data_for(reviews_of_our_work_maps)
-        avg_score_of_our_work = @team.aggregate_review_grade
-
-        {
-            reviews_of_our_work: reviews_of_our_work,
-            avg_score_of_our_work: avg_score_of_our_work
-        }
-    end
-
-    def get_my_scores_data
-        # the set of review maps that my team members used to review me
-        reviews_of_me_maps = TeammateReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewee_id: @participant.id).to_a 
-
-        # the set of review maps that I used to review my team members
-        reviews_by_me_maps = TeammateReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewer_id: @participant.id).to_a
-        
-        reviews_of_me = get_heatgrid_data_for(reviews_of_me_maps)
-
-        reviews_by_me = get_heatgrid_data_for(reviews_by_me_maps)
-
-        # Fetch all review response maps where the current participant is the reviewer and the reviewed object is the current assignment.
-        my_reviews_of_other_teams_maps = ReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewer_id: @participant.id)
-
-        # the maps that the authors I (the participant) reviewed used to give feedback on my reviews
-        feedback_from_my_reviewees_maps = []
-           
-        my_reviews_of_other_teams_maps.each do |map|
-            feedback_from_my_reviewees_maps << FeedbackResponseMap.find_by(reviewed_object_id: map.id, reviewee_id: @participant.id)           
-        end
-
-        feedback_scores_from_my_reviewees = get_heatgrid_data_for(feedback_from_my_reviewees_maps)
-
-        avg_score_from_my_teammates = @participant.aggregate_teammate_review_grade(reviews_of_me_maps) 
-        avg_score_to_my_teammates = @participant.aggregate_teammate_review_grade(reviews_by_me_maps) 
-        avg_score_from_my_authors = @participant.aggregate_teammate_review_grade(feedback_from_my_reviewees_maps) 
-
-        {
-            reviews_of_me: reviews_of_me,
-            reviews_by_me: reviews_by_me,
-            author_feedback_scores: feedback_scores_from_my_reviewees,
-            avg_score_from_my_teammates: avg_score_from_my_teammates,
-            avg_score_to_my_teammates: avg_score_to_my_teammates,
-            avg_score_from_my_authors: avg_score_from_my_authors
-        }
-    end
-
-    def get_heatgrid_data_for(maps)
-        # Initialize a hash to store scores grouped by review rounds
-        reviewee_scores = {}
-        return if maps.empty?
-
-        # check if the assignment uses different rubrics for each round
-        if @assignment.varying_rubrics_by_round?
-            # Retrieve all round numbers that have distinct questionnaires
-            rounds = @assignment.review_rounds(maps.first.questionnaire_type)
-
-            rounds.each do |round|
-                # Create a symbol like :Review-Round-1 or :TeammateReview-Round-2
-                round_symbol = ("#{maps.first.questionnaire_type}-Round-#{round}").to_sym
-
-                # Initialize the array to hold scores for the current round
-                reviewee_scores[round_symbol] = []
-
-                # Go through each response map (i.e., reviewer mapping)
-                maps.each_with_index do |map, index|
-                    # Find the most recent submitted response for the current round
-                    submitted_round_response = map.responses.select do |r|
-                        r.round == round && r.is_submitted && r.map_id == map.id
-                    end.last
-
-                    # Skip if no valid response was submitted
-                    next if submitted_round_response.nil?
-
-                    # Go through each score in the submitted response
-                    submitted_round_response.scores.each_with_index do |score, newIndex|
-                        # Initialize sub-array if it doesn't exist
-                        reviewee_scores[round_symbol][newIndex] ||= []
-
-                        # Add the score's answer, optionally anonymizing reviewer name                        
-                        reviewee_scores[round_symbol][newIndex] << get_answer(score, index)
-                    end
-                end
-
-                reviewee_scores[round_symbol].each_with_index do |scores_array, idx|
-                    # Sort each question's answers array by reviewer_name and reviwee_name 
-                    reviewee_scores[round_symbol][idx] = scores_array.sort_by { |ans| [ans[:reviewer_name].downcase , ans[:reviewee_name].downcase] }
-                end
-            end
-
-        end
-
-        # Return the organized hash of scores grouped by round
-        return reviewee_scores
-    end
-
-    def get_answer(score, index)
-        # Determine the name or label to show for the reviewer
-        reviewer_name = if current_user_has_all_heatgrid_data_privileges?(@assignment)
-                           score&.response&.reviewer&.fullname # Show the actual reviewer's name
-                        else
-                            "Participant #{index+1}" # Show generic label (e.g., Participant 1)
-                        end
-        
-        # useful in case of reviews done by reviews_by_me (reviews given by a user to its teammates)
-        # in that case we will need reviewee's name instead of reviewer name because the reviewer will be the user itself.
-        reviewee_name = score&.response&.reviewee&.fullname                        
-
-        #Return particular score/answer information
-        return {
-            id: score.id,
-            item_id:score.item_id,
-            answer:score.answer,
-            comments:score.comments,
-            reviewer_name: reviewer_name,
-            reviewee_name: reviewee_name
-        }
-    end 
+class GradesController < ApplicationController
+    include GradesHelper
+    before_action :action_allowed
+    before_action :set_team_and_assignment_via_participant, only: [:edit, :update, :instructor_review]
+    before_action :set_participant_and_team_via_assignment, only: [:view_our_scores, :view_my_scores]
+
+    def action_allowed
+        unless check_permission(action_name)
+            render json: { error: "You do not have permission to perform this action." }, status: :forbidden
+        end
+    end
+
+    # index (GET /api/v1/grades/:id/view_all_scores)
+    # returns all review scores and computed heatmap data for the given assignment (instructor/TA view).
+    def view_all_scores    
+        @assignment = Assignment.find(params[:assignment_id])
+        participant_scores = {}
+        team_scores = {}
+        
+        if params[:participant_id]
+            @participant = AssignmentParticipant.find(params[:participant_id])
+            participant_scores = get_my_scores_data
+        end 
+
+        if params[:team_id]
+            @team = AssignmentTeam.find(params[:team_id])
+            team_scores = get_our_scores_data
+        end
+
+        
+        render json: {
+            team_scores: team_scores,
+            participant_scores: participant_scores
+        }
+    end
+
+
+    # view_our_scores (GET /api/v1/grades/:assignment_id/view_our_scores)
+    # similar to view but scoped to the requesting student’s own team.
+    # It returns the same heatmap data with reviewer identities removed, plus the list of review items.
+    # renders JSON with scores, assignment, averages.
+    # This meets the student’s need to see heatgrids for their team only (with anonymous reviewers) and the associated items.
+    def view_our_scores
+        render json: get_our_scores_data
+    end
+
+    def view_my_scores
+        render json: get_my_scores_data
+    end
+
+
+    # edit (GET /api/v1/grades/:participant_id/edit)
+    # provides data for the grade-assignment interface.
+    # Given an AssignmentParticipant ID, it looks up the participant and its assignment, gathers the full list of items 
+    # (via a helper like list_questions(assignment)), and computes existing peer-review scores for those items.
+    # It then returns JSON including the participant, assignment, items, and current scores.
+    # This lets the front end display an interface where an instructor can assign a grade and feedback (score breakdown) to that submission.
+    def edit
+        items = list_items(@assignment)
+        scores = {}
+        scores[:my_team] = get_our_scores_data
+        scores[:my_own] = get_my_scores_data
+        render json: {
+        participant: @participant,
+        assignment: @assignment,
+        items: items,
+        scores: scores
+        }
+    end
+
+
+    # update (PATCH /api/v1/grades/:participant_id/update)
+    # saves an instructor’s grade and feedback for a team submission.
+    # The method finds the AssignmentParticipant, gets its team, and sets team.grade_for_submission = params[:grade_for_submission] and 
+    # team.comment_for_submission = params[:comment_for_submission]. It then saves the team and returns a success response 
+    # (for example, instructing the UI to reload the team view). This implements “assign score & give feedback” for instructor.
+    def update
+        # team = @participant.team
+        @team.grade_for_submission = params[:grade_for_submission]
+        @team.comment_for_submission = params[:comment_for_submission]
+        if @team.save
+        render json: { message: 'Team grade and comment updated successfully.' }, status: :ok
+        else
+        render json: { error: 'Failed to update team grade or comment.' }, status: :unprocessable_entity
+        end
+    end
+
+
+    # instructor_review (GET /api/v1/grades/:id/instructor_review)
+    # helps the instructor begin grading or re-grading a submission.
+    # It finds or creates the appropriate review mapping for the given participant and returns JSON indicating whether to go to 
+    # Response#new (no review exists yet) or Response#edit (review already exists).
+    # This supports the instructor’s ability to open or edit a review for a student’s submission.
+    def instructor_review
+        reviewer = AssignmentParticipant.find_or_create_by!(user_id: current_user.id, parent_id: @assignment.id, handle: current_user.name)         
+
+        mapping = ReviewResponseMap.find_or_create_by!(
+        reviewed_object_id: @assignment.id,
+        reviewer_id: reviewer.id,
+        reviewee_id: @team.id
+        )
+
+        existing_response = Response.find_by(map_id: mapping.id)
+        action = existing_response.present? ? 'edit' : 'new'
+
+        render json: {
+        map_id: mapping.id,
+        response_id: existing_response&.id,
+        redirect_to: "/response/#{action}/#{mapping.id}"
+        }
+    end
+
+    private
+
+    def set_team_and_assignment_via_participant
+        @participant = AssignmentParticipant.find(params[:participant_id])
+        unless @participant
+        render json: { error: 'Participant not found' }, status: :not_found
+        return
+        end
+        @team = @participant.team
+        unless @team
+        render json: { error: 'Team not found' }, status: :not_found
+        return
+        end
+        @assignment = @participant.assignment
+    end
+
+    # only called when a student wants to review its grades
+    def set_participant_and_team_via_assignment
+        @participant = AssignmentParticipant.find_by(parent_id: params[:assignment_id], user_id: current_user.id)
+        unless @participant
+        render json: { error: 'Participant not found' }, status: :not_found
+        return
+        end
+        @team = @participant.team
+        unless @team
+        render json: { error: 'Team not found' }, status: :not_found
+        return
+        end
+        @assignment = @participant.assignment
+    end
+
+    def check_permission(action)
+        role = current_user.role.name
+        allowed_roles = {
+        'view_our_scores' => ['Student', 'Instructor', 'Teaching Assistant','Super Administrator'],
+        'view_my_scores' => ['Student', 'Instructor', 'Teaching Assistant','Super Administrator'],
+        'view_all_scores' => ['Instructor', 'Teaching Assistant','Super Administrator'],
+        'edit' => ['Instructor','Super Administrator'],
+        'update' => ['Instructor', 'Super Administrator'],
+        'instructor_review' => ['Instructor', 'Teaching Assistant', 'Super Administrator'],
+        'get_response_scores' => ['Student','Super Administrator']
+        }
+        allowed_roles[action]&.include?(role)
+    end
+    
+    def get_our_scores_data
+        reviews_of_our_work_maps = ReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewee_id: @team.id).to_a
+        reviews_of_our_work = get_heatgrid_data_for(reviews_of_our_work_maps)
+        avg_score_of_our_work = @team.aggregate_review_grade
+
+        {
+            reviews_of_our_work: reviews_of_our_work,
+            avg_score_of_our_work: avg_score_of_our_work
+        }
+    end
+
+    def get_my_scores_data
+        # the set of review maps that my team members used to review me
+        reviews_of_me_maps = TeammateReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewee_id: @participant.id).to_a 
+
+        # the set of review maps that I used to review my team members
+        reviews_by_me_maps = TeammateReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewer_id: @participant.id).to_a
+        
+        reviews_of_me = get_heatgrid_data_for(reviews_of_me_maps)
+
+        reviews_by_me = get_heatgrid_data_for(reviews_by_me_maps)
+
+        # Fetch all review response maps where the current participant is the reviewer and the reviewed object is the current assignment.
+        my_reviews_of_other_teams_maps = ReviewResponseMap.where(reviewed_object_id: @assignment.id, reviewer_id: @participant.id)
+
+        # the maps that the authors I (the participant) reviewed used to give feedback on my reviews
+        feedback_from_my_reviewees_maps = []
+           
+        my_reviews_of_other_teams_maps.each do |map|
+            feedback_from_my_reviewees_maps << FeedbackResponseMap.find_by(reviewed_object_id: map.id, reviewee_id: @participant.id)           
+        end
+
+        feedback_scores_from_my_reviewees = get_heatgrid_data_for(feedback_from_my_reviewees_maps)
+
+        avg_score_from_my_teammates = @participant.aggregate_teammate_review_grade(reviews_of_me_maps) 
+        avg_score_to_my_teammates = @participant.aggregate_teammate_review_grade(reviews_by_me_maps) 
+        avg_score_from_my_authors = @participant.aggregate_teammate_review_grade(feedback_from_my_reviewees_maps) 
+
+        {
+            reviews_of_me: reviews_of_me,
+            reviews_by_me: reviews_by_me,
+            author_feedback_scores: feedback_scores_from_my_reviewees,
+            avg_score_from_my_teammates: avg_score_from_my_teammates,
+            avg_score_to_my_teammates: avg_score_to_my_teammates,
+            avg_score_from_my_authors: avg_score_from_my_authors
+        }
+    end
+
+    def get_heatgrid_data_for(maps)
+        # Initialize a hash to store scores grouped by review rounds
+        reviewee_scores = {}
+        return if maps.empty?
+
+        # check if the assignment uses different rubrics for each round
+        if @assignment.varying_rubrics_by_round?
+            # Retrieve all round numbers that have distinct questionnaires
+            rounds = @assignment.review_rounds(maps.first.questionnaire_type)
+
+            rounds.each do |round|
+                # Create a symbol like :Review-Round-1 or :TeammateReview-Round-2
+                round_symbol = ("#{maps.first.questionnaire_type}-Round-#{round}").to_sym
+
+                # Initialize the array to hold scores for the current round
+                reviewee_scores[round_symbol] = []
+
+                # Go through each response map (i.e., reviewer mapping)
+                maps.each_with_index do |map, index|
+                    # Find the most recent submitted response for the current round
+                    submitted_round_response = map.responses.select do |r|
+                        r.round == round && r.is_submitted && r.map_id == map.id
+                    end.last
+
+                    # Skip if no valid response was submitted
+                    next if submitted_round_response.nil?
+
+                    # Go through each score in the submitted response
+                    submitted_round_response.scores.each_with_index do |score, newIndex|
+                        # Initialize sub-array if it doesn't exist
+                        reviewee_scores[round_symbol][newIndex] ||= []
+
+                        # Add the score's answer, optionally anonymizing reviewer name                        
+                        reviewee_scores[round_symbol][newIndex] << get_answer(score, index)
+                    end
+                end
+
+                reviewee_scores[round_symbol].each_with_index do |scores_array, idx|
+                    # Sort each question's answers array by reviewer_name and reviwee_name 
+                    reviewee_scores[round_symbol][idx] = scores_array.sort_by { |ans| [ans[:reviewer_name].downcase , ans[:reviewee_name].downcase] }
+                end
+            end
+
+        end
+
+        # Return the organized hash of scores grouped by round
+        return reviewee_scores
+    end
+
+    def get_answer(score, index)
+        # Determine the name or label to show for the reviewer
+        reviewer_name = if current_user_has_all_heatgrid_data_privileges?(@assignment)
+                           score&.response&.reviewer&.fullname # Show the actual reviewer's name
+                        else
+                            "Participant #{index+1}" # Show generic label (e.g., Participant 1)
+                        end
+        
+        # useful in case of reviews done by reviews_by_me (reviews given by a user to its teammates)
+        # in that case we will need reviewee's name instead of reviewer name because the reviewer will be the user itself.
+        reviewee_name = score&.response&.reviewee&.fullname                        
+
+        #Return particular score/answer information
+        return {
+            id: score.id,
+            item_id:score.item_id,
+            answer:score.answer,
+            comments:score.comments,
+            reviewer_name: reviewer_name,
+            reviewee_name: reviewee_name
+        }
+    end 
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/institutions_controller.rb b/app/controllers/institutions_controller.rb
similarity index 92%
rename from app/controllers/api/v1/institutions_controller.rb
rename to app/controllers/institutions_controller.rb
index c674e788d..57a90d973 100644
--- a/app/controllers/api/v1/institutions_controller.rb
+++ b/app/controllers/institutions_controller.rb
@@ -1,57 +1,57 @@
-class Api::V1::InstitutionsController < ApplicationController
-  rescue_from ActiveRecord::RecordNotFound, with: :institution_not_found
-  def action_allowed?
-    current_user_has_role?('Instructor')
-  end
-  # GET /institutions
-  def index
-    @institutions = Institution.all
-    render json: @institutions, status: :ok
-  end
-
-  # GET /institutions/:id
-  def show
-    @institution = Institution.find(params[:id])
-    render json: @institution, status: :ok
-  rescue ActiveRecord::RecordNotFound => e
-    render json: { error: e.message }, status: :not_found
-  end
-
-  # POST /institutions
-  def create
-    @institution = Institution.new(institution_params)
-    if @institution.save
-      render json: @institution, status: :created
-    else
-      render json: @institution.errors, status: :unprocessable_entity
-    end
-  end
-
-  # PATCH/PUT /institutions/:id
-  def update
-    @institution = Institution.find(params[:id])
-    if @institution.update(institution_params)
-      render json: @institution, status: :ok
-    else
-      render json: @institution.errors, status: :unprocessable_entity
-    end
-  end
-
-  # DELETE /institutions/:id
-  def destroy
-    @institution = Institution.find(params[:id])
-    @institution.destroy
-    render json: { message: 'Institution deleted' }, status: :ok
-  end
-
-  private
-
-  # Only allow a list of trusted parameters through.
-  def institution_params
-    params.require(:institution).permit(:id, :name)
-  end
-
-  def institution_not_found
-    render json: { error: 'Institution not found' }, status: :not_found
-  end
+class InstitutionsController < ApplicationController
+  rescue_from ActiveRecord::RecordNotFound, with: :institution_not_found
+  def action_allowed?
+    current_user_has_role?('Instructor')
+  end
+  # GET /institutions
+  def index
+    @institutions = Institution.all
+    render json: @institutions, status: :ok
+  end
+
+  # GET /institutions/:id
+  def show
+    @institution = Institution.find(params[:id])
+    render json: @institution, status: :ok
+  rescue ActiveRecord::RecordNotFound => e
+    render json: { error: e.message }, status: :not_found
+  end
+
+  # POST /institutions
+  def create
+    @institution = Institution.new(institution_params)
+    if @institution.save
+      render json: @institution, status: :created
+    else
+      render json: @institution.errors, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /institutions/:id
+  def update
+    @institution = Institution.find(params[:id])
+    if @institution.update(institution_params)
+      render json: @institution, status: :ok
+    else
+      render json: @institution.errors, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /institutions/:id
+  def destroy
+    @institution = Institution.find(params[:id])
+    @institution.destroy
+    render json: { message: 'Institution deleted' }, status: :ok
+  end
+
+  private
+
+  # Only allow a list of trusted parameters through.
+  def institution_params
+    params.require(:institution).permit(:id, :name)
+  end
+
+  def institution_not_found
+    render json: { error: 'Institution not found' }, status: :not_found
+  end
 end
\ No newline at end of file
diff --git a/app/controllers/api/v1/invitations_controller.rb b/app/controllers/invitations_controller.rb
similarity index 93%
rename from app/controllers/api/v1/invitations_controller.rb
rename to app/controllers/invitations_controller.rb
index 56edb5f7e..dba7316e9 100644
--- a/app/controllers/api/v1/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::InvitationsController < ApplicationController
+class InvitationsController < ApplicationController
   rescue_from ActiveRecord::RecordNotFound, with: :invite_not_found
   before_action :set_invitation, only: %i[show update destroy]
   before_action :invitee_participant, only: %i[create]
@@ -16,13 +16,13 @@ def action_allowed?
     end
   end
 
-  # GET /api/v1/invitations
+  # GET /invitations
   def index
     @invitations = Invitation.all
     render json: @invitations, status: :ok
   end
 
-  # POST /api/v1/invitations/
+  # POST /invitations/
   def create
     params[:invitation][:reply_status] ||= InvitationValidator::WAITING_STATUS
     @invitation = Invitation.invitation_factory(invite_params)
@@ -34,12 +34,12 @@ def create
     end
   end
 
-  # GET /api/v1/invitations/:id
+  # GET /invitations/:id
   def show
     render json: @invitation, status: :ok
   end
 
-  # PATCH /api/v1/invitations/:id
+  # PATCH /invitations/:id
   def update
     case params[:reply_status]
     when InvitationValidator::ACCEPT_STATUS
@@ -65,7 +65,7 @@ def update
     end
   end
 
-  # DELETE /api/v1/invitations/:id
+  # DELETE /invitations/:id
   def destroy
     @invitation.destroy!
     render json: { success:true, message: "Invitation deleted successfully." }, status: :ok
diff --git a/app/controllers/join_team_requests_controller.rb b/app/controllers/join_team_requests_controller.rb
new file mode 100644
index 000000000..1c344fc4e
--- /dev/null
+++ b/app/controllers/join_team_requests_controller.rb
@@ -0,0 +1,263 @@
+class JoinTeamRequestsController < ApplicationController
+  # Constants used to indicate status for the request
+  PENDING = 'PENDING'
+  DECLINED = 'DECLINED'
+  ACCEPTED = 'ACCEPTED'
+
+  # This filter runs before the create action, checking if the team is full
+  before_action :check_team_status, only: [:create]
+
+  # This filter runs before the specified actions, finding the join team request
+  before_action :find_request, only: %i[show update destroy decline accept]
+
+  # This filter ensures the request is still pending before processing
+  before_action :ensure_request_pending, only: %i[accept decline]
+
+  # Centralized authorization method
+  def action_allowed?
+    case params[:action]
+    when 'create'
+      # Any student can create a join team request
+      current_user_has_student_privileges?
+    
+    when 'show'
+      # The participant who made the request OR any team member can view it
+      return false unless current_user_has_student_privileges?
+      load_request_for_authorization
+      return false unless @join_team_request
+      current_user_is_request_creator? || current_user_is_team_member?
+    
+    when 'update', 'destroy'
+      # Only the participant who created the request can update or delete it
+      return false unless current_user_has_student_privileges?
+      load_request_for_authorization
+      return false unless @join_team_request
+      current_user_is_request_creator?
+    
+    when 'decline', 'accept'
+      # Only team members of the target team can accept/decline a request
+      return false unless current_user_has_student_privileges?
+      load_request_for_authorization
+      return false unless @join_team_request
+      current_user_is_team_member?
+    
+    when 'for_team', 'by_user', 'pending'
+      # Students can view filtered lists
+      current_user_has_student_privileges?
+    
+    else
+      # Default: deny access
+      false
+    end
+  end
+
+  # GET api/v1/join_team_requests/1
+  # show the join team request that is passed into the route
+  def show
+    render json: @join_team_request, serializer: JoinTeamRequestSerializer, status: :ok
+  end
+
+  # GET api/v1/join_team_requests/for_team/:team_id
+  # Get all join team requests for a specific team
+  def for_team
+    team = Team.find(params[:team_id])
+    join_team_requests = team.join_team_requests.includes(:participant, :team)
+    render json: join_team_requests, each_serializer: JoinTeamRequestSerializer, status: :ok
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: 'Team not found' }, status: :not_found
+  end
+
+  # GET api/v1/join_team_requests/by_user/:user_id
+  # Get all join team requests created by a specific user
+  def by_user
+    participant_ids = Participant.where(user_id: params[:user_id]).pluck(:id)
+    join_team_requests = JoinTeamRequest.where(participant_id: participant_ids).includes(:participant, :team)
+    render json: join_team_requests, each_serializer: JoinTeamRequestSerializer, status: :ok
+  end
+
+  # GET api/v1/join_team_requests/pending
+  # Get all pending join team requests
+  def pending
+    join_team_requests = JoinTeamRequest.where(reply_status: PENDING).includes(:participant, :team)
+    render json: join_team_requests, each_serializer: JoinTeamRequestSerializer, status: :ok
+  end
+
+  # POST api/v1/join_team_requests
+  # Creates a new join team request
+  def create
+    # Find participant object for the user who is requesting to join the team
+    participant = AssignmentParticipant.find_by(user_id: @current_user.id, parent_id: params[:assignment_id])
+    
+    unless participant
+      return render json: { error: 'You are not a participant in this assignment' }, status: :unprocessable_entity
+    end
+
+    team = Team.find_by(id: params[:team_id])
+    unless team
+      return render json: { error: 'Team not found' }, status: :not_found
+    end
+
+    # Check if user already belongs to the team
+    if team.participants.include?(participant)
+      return render json: { error: 'You already belong to this team' }, status: :unprocessable_entity
+    end
+
+    # Check for duplicate pending requests
+    existing_request = JoinTeamRequest.find_by(
+      participant_id: participant.id,
+      team_id: team.id,
+      reply_status: PENDING
+    )
+    
+    if existing_request
+      return render json: { error: 'You already have a pending request to join this team' }, status: :unprocessable_entity
+    end
+
+    # Create the request
+    join_team_request = JoinTeamRequest.new(
+      participant_id: participant.id,
+      team_id: team.id,
+      comments: params[:comments],
+      reply_status: PENDING
+    )
+
+    if join_team_request.save
+      render json: join_team_request, serializer: JoinTeamRequestSerializer, status: :created
+    else
+      render json: { errors: join_team_request.errors.full_messages }, status: :unprocessable_entity
+    end
+  rescue ActiveRecord::RecordNotFound => e
+    render json: { error: e.message }, status: :not_found
+  end
+
+  # PATCH/PUT api/v1/join_team_requests/1
+  # Updates a join team request (comments only, not status)
+  def update
+    # Only allow updating comments
+    if @join_team_request.update(comments: params[:comments])
+      render json: @join_team_request, serializer: JoinTeamRequestSerializer, status: :ok
+    else
+      render json: { errors: @join_team_request.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE api/v1/join_team_requests/1
+  # delete a join team request
+  def destroy
+    if @join_team_request.destroy
+      render json: { message: 'Join team request was successfully deleted' }, status: :ok
+    else
+      render json: { error: 'Failed to delete join team request' }, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH api/v1/join_team_requests/1/accept
+  # Accept a join team request and add the participant to the team
+  def accept
+    team = @join_team_request.team
+    if team.full?
+      return render json: { error: 'Team is full' }, status: :unprocessable_entity
+    end
+
+    participant = @join_team_request.participant
+
+    # Use a transaction to ensure both removal and addition happen atomically
+    ActiveRecord::Base.transaction do
+      # Find and remove participant from their old team (if any)
+      old_team_participant = TeamsParticipant.find_by(participant_id: participant.id)
+      if old_team_participant
+        old_team = old_team_participant.team
+        old_team_participant.destroy!
+        
+        # If the old team is now empty, optionally clean up (but keep the team for now)
+        Rails.logger.info "Removed participant #{participant.id} from old team #{old_team&.id}"
+      end
+
+      # Add participant to the new team
+      TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id: team.id,
+        user_id: participant.user_id
+      )
+
+      # Update the request status
+      @join_team_request.update!(reply_status: ACCEPTED)
+
+      render json: { 
+        message: 'Join team request accepted successfully', 
+        join_team_request: JoinTeamRequestSerializer.new(@join_team_request).as_json
+      }, status: :ok
+    end
+  rescue ActiveRecord::RecordInvalid => e
+    render json: { error: e.message }, status: :unprocessable_entity
+  rescue StandardError => e
+    render json: { error: e.message }, status: :unprocessable_entity
+  end
+
+  # PATCH api/v1/join_team_requests/1/decline
+  # Decline a join team request
+  def decline
+    if @join_team_request.update(reply_status: DECLINED)
+      render json: { 
+        message: 'Join team request declined successfully',
+        join_team_request: JoinTeamRequestSerializer.new(@join_team_request).as_json
+      }, status: :ok
+    else
+      render json: { errors: @join_team_request.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  private
+  
+  # checks if the team is full already
+  def check_team_status
+    team = Team.find(params[:team_id])
+    if team.full?
+      render json: { message: 'This team is full.' }, status: :unprocessable_entity
+    end
+  end
+
+  # Ensures the request is still pending before processing accept/decline
+  def ensure_request_pending
+    unless @join_team_request.reply_status == PENDING
+      render json: { error: 'This request has already been processed' }, status: :unprocessable_entity
+    end
+  end
+
+  # Finds the join team request by ID
+  def find_request
+    @join_team_request = JoinTeamRequest.find(params[:id])
+  end
+
+  # Loads the request for authorization check (avoids duplicate queries)
+  def load_request_for_authorization
+    @join_team_request ||= JoinTeamRequest.find_by(id: params[:id])
+  end
+
+  # Permits specified parameters for join team requests
+  def join_team_request_params
+    params.require(:join_team_request).permit(:comments, :reply_status)
+  end
+
+  # Helper method to check if current user is the creator of the request
+  def current_user_is_request_creator?
+    return false unless @join_team_request && @current_user
+    
+    @join_team_request.participant&.user_id == @current_user.id
+  end
+
+  # Helper method to check if current user is a member of the target team
+  def current_user_is_team_member?
+    return false unless @join_team_request && @current_user
+    
+    team = @join_team_request.team
+    return false unless team.is_a?(AssignmentTeam)
+    
+    participant = AssignmentParticipant.find_by(
+      user_id: @current_user.id,
+      parent_id: team.parent_id
+    )
+    
+    participant && team.participants.include?(participant)
+  end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/participants_controller.rb b/app/controllers/participants_controller.rb
similarity index 96%
rename from app/controllers/api/v1/participants_controller.rb
rename to app/controllers/participants_controller.rb
index 649bd3663..878209621 100644
--- a/app/controllers/api/v1/participants_controller.rb
+++ b/app/controllers/participants_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::ParticipantsController < ApplicationController
+class ParticipantsController < ApplicationController
   include ParticipantsHelper
 
   # Return a list of participants for a given user
@@ -29,7 +29,7 @@ def list_assignment_participants
     if participants.nil?
       render json: participants.errors, status: :unprocessable_entity
     else
-      render json: participants, status: :ok
+      render json: participants.as_json(include: { user: { include: %i[role parent] } }), status: :ok
     end
   end
 
@@ -103,7 +103,7 @@ def update_authorization
   # DELETE /participants/:id
   def destroy
     participant = Participant.find_by(id: params[:id])
-  
+
     if participant.nil?
       render json: { error: 'Not Found' }, status: :not_found
     elsif participant.destroy
@@ -139,8 +139,7 @@ def filter_user_participants(user)
   # Filters participants based on the provided assignment
   # Returns participants ordered by their IDs
   def filter_assignment_participants(assignment)
-    participants = Participant.all
-    participants = participants.where(parent_id: assignment.id, type: 'AssignmentParticipant') if assignment
+    participants = Participant.where(parent_id: assignment.id, type: 'AssignmentParticipant') if assignment
     participants.order(:id)
   end
 
diff --git a/app/controllers/api/v1/questionnaires_controller.rb b/app/controllers/questionnaires_controller.rb
similarity index 98%
rename from app/controllers/api/v1/questionnaires_controller.rb
rename to app/controllers/questionnaires_controller.rb
index 9bc2cd876..278f70c07 100644
--- a/app/controllers/api/v1/questionnaires_controller.rb
+++ b/app/controllers/questionnaires_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::QuestionnairesController < ApplicationController
+class QuestionnairesController < ApplicationController
   
   # Index method returns the list of JSON objects of the questionnaire
   # GET on /questionnaires
diff --git a/app/controllers/api/v1/questions_controller.rb b/app/controllers/questions_controller.rb
similarity index 91%
rename from app/controllers/api/v1/questions_controller.rb
rename to app/controllers/questions_controller.rb
index 2fa6cf6b5..f49157861 100644
--- a/app/controllers/api/v1/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -1,132 +1,132 @@
-class Api::V1::QuestionsController < ApplicationController
-  before_action :set_question, only: [:show, :update]
-
-  # GET /questions
-  def action_allowed?
-    current_user_has_role?('Instructor')
-  end
-  # Index method returns the list of questions JSON object
-  # GET on /questions
-  def index
-    @questions = Item.order(:id)
-    render json: @questions, status: :ok
-  end
-
-  # GET /questions/:id
-  def show
-    begin
-      @item = Item.find(params[:id])
-
-      # Choose the correct strategy based on item type
-      strategy = get_strategy_for_item(@item)
-
-      # Render the item using the strategy
-      @rendered_item = strategy.render(@item)
-
-      render json: { item: @item, rendered_item: @rendered_item }, status: :ok
-    rescue ActiveRecord::RecordNotFound
-      render json: { error: "Question not found" }, status: :not_found
-    end
-  end
-
-  # GET /api/v1/questions/show_all/questionnaire/:id
-  def show_all
-    questionnaire = Questionnaire.find(params[:id])
-    items = questionnaire.items.order(:id)
-    render json: items, status: :ok
-  rescue ActiveRecord::RecordNotFound
-    render json: { error: "Couldn't find Questionnaire" }, status: :not_found
-  end
-
-  # POST /questions
-  def create
-    questionnaire_id = params[:questionnaire_id]
-    questionnaire = Questionnaire.find(questionnaire_id)
-
-    # Create the new Item (item)
-    item = questionnaire.items.build(
-      txt: params[:txt],
-      question_type: params[:question_type],
-      seq: params[:seq],
-      break_before: true
-    )
-
-    # Add attributes based on the item type
-    case item.question_type
-    when 'Scale'
-      item.weight = params[:weight]
-      item.max_label = 'Strongly agree'
-      item.min_label = 'Strongly disagree'
-      item.max_value = params[:max_value] || 5
-    when 'Dropdown'
-      item.alternatives = '0|1|2|3|4|5'
-    when 'TextArea'
-      item.size = '60, 5'
-    when 'TextField'
-      item.size = '30'
-    end
-
-    if item.save
-      render json: item, status: :created
-    else
-      render json: { error: item.errors.full_messages.to_sentence }, status: :unprocessable_entity
-    end
-  end
-
-  # PUT /questions/:id
-  def update
-    if @item.update(question_params)
-      render json: @item, status: :ok
-    else
-      render json: { error: @item.errors.full_messages.to_sentence }, status: :unprocessable_entity
-    end
-  end
-
-  def destroy
-    @item = Item.find(params[:id])
-    @item.destroy
-    head :no_content
-  rescue ActiveRecord::RecordNotFound
-    render json: { error: "Couldn't find Item" }, status: :not_found
-  end
-
-  # DELETE /api/v1/questions/delete_all/questionnaire/:id
-  def delete_all
-    questionnaire = Questionnaire.find(params[:id])
-    if questionnaire.items.delete_all
-      render json: { message: "All questions deleted" }, status: :ok
-    else
-      render json: { error: "Deletion failed" }, status: :unprocessable_entity
-    end
-  rescue ActiveRecord::RecordNotFound
-    render json: { error: "Couldn't find Questionnaire" }, status: :not_found
-  end
-
-  def types
-    types = Item.pluck(:question_type).uniq
-    render json: types, status: :ok
-  end
-
-
-  private
-
-  def set_question
-    @item = Item.find(params[:id])
-  end
-
-  def question_params
-    params.require(:question).permit(:txt, :question_type, :seq, :weight, :max_value, :size, :alternatives)
-  end
-
-  def get_strategy_for_item(item)
-    case item.question_type
-    when 'Dropdown'
-      Strategies::DropdownStrategy.new
-    when 'Scale'
-      Strategies::ScaleStrategy.new
-    # You can add more strategies as needed
-    else
-      raise "Strategy for this item type not defined"
-    end
-  end
-end
+class QuestionsController < ApplicationController
+  before_action :set_question, only: [:show, :update]
+
+  # GET /questions
+  def action_allowed?
+    current_user_has_role?('Instructor')
+  end
+  # Index method returns the list of questions JSON object
+  # GET on /questions
+  def index
+    @questions = Item.order(:id)
+    render json: @questions, status: :ok
+  end
+
+  # GET /questions/:id
+  def show
+    begin
+      @item = Item.find(params[:id])
+
+      # Choose the correct strategy based on item type
+      strategy = get_strategy_for_item(@item)
+
+      # Render the item using the strategy
+      @rendered_item = strategy.render(@item)
+
+      render json: { item: @item, rendered_item: @rendered_item }, status: :ok
+    rescue ActiveRecord::RecordNotFound
+      render json: { error: "Question not found" }, status: :not_found
+    end
+  end
+
+  # GET /questions/show_all/questionnaire/:id
+  def show_all
+    questionnaire = Questionnaire.find(params[:id])
+    items = questionnaire.items.order(:id)
+    render json: items, status: :ok
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: "Couldn't find Questionnaire" }, status: :not_found
+  end
+
+  # POST /questions
+  def create
+    questionnaire_id = params[:questionnaire_id]
+    questionnaire = Questionnaire.find(questionnaire_id)
+
+    # Create the new Item (item)
+    item = questionnaire.items.build(
+      txt: params[:txt],
+      question_type: params[:question_type],
+      seq: params[:seq],
+      break_before: true
+    )
+
+    # Add attributes based on the item type
+    case item.question_type
+    when 'Scale'
+      item.weight = params[:weight]
+      item.max_label = 'Strongly agree'
+      item.min_label = 'Strongly disagree'
+      item.max_value = params[:max_value] || 5
+    when 'Dropdown'
+      item.alternatives = '0|1|2|3|4|5'
+    when 'TextArea'
+      item.size = '60, 5'
+    when 'TextField'
+      item.size = '30'
+    end
+
+    if item.save
+      render json: item, status: :created
+    else
+      render json: { error: item.errors.full_messages.to_sentence }, status: :unprocessable_entity
+    end
+  end
+
+  # PUT /questions/:id
+  def update
+    if @item.update(question_params)
+      render json: @item, status: :ok
+    else
+      render json: { error: @item.errors.full_messages.to_sentence }, status: :unprocessable_entity
+    end
+  end
+
+  def destroy
+    @item = Item.find(params[:id])
+    @item.destroy
+    head :no_content
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: "Couldn't find Item" }, status: :not_found
+  end
+
+  # DELETE /questions/delete_all/questionnaire/:id
+  def delete_all
+    questionnaire = Questionnaire.find(params[:id])
+    if questionnaire.items.delete_all
+      render json: { message: "All questions deleted" }, status: :ok
+    else
+      render json: { error: "Deletion failed" }, status: :unprocessable_entity
+    end
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: "Couldn't find Questionnaire" }, status: :not_found
+  end
+
+  def types
+    types = Item.pluck(:question_type).uniq
+    render json: types, status: :ok
+  end
+
+
+  private
+
+  def set_question
+    @item = Item.find(params[:id])
+  end
+
+  def question_params
+    params.require(:question).permit(:txt, :question_type, :seq, :weight, :max_value, :size, :alternatives)
+  end
+
+  def get_strategy_for_item(item)
+    case item.question_type
+    when 'Dropdown'
+      Strategies::DropdownStrategy.new
+    when 'Scale'
+      Strategies::ScaleStrategy.new
+    # You can add more strategies as needed
+    else
+      raise "Strategy for this item type not defined"
+    end
+  end
+end
diff --git a/app/controllers/api/v1/roles_controller.rb b/app/controllers/roles_controller.rb
similarity index 92%
rename from app/controllers/api/v1/roles_controller.rb
rename to app/controllers/roles_controller.rb
index bde685c0f..843fec9c1 100644
--- a/app/controllers/api/v1/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -1,69 +1,69 @@
-class Api::V1::RolesController < ApplicationController
-  # rescue_from ActiveRecord::RecordNotFound, with: :role_not_found
-  rescue_from ActionController::ParameterMissing, with: :parameter_missing
-
-  def action_allowed?
-    current_user_has_admin_privileges?
-  end
-  
-  # GET /roles
-  def index
-    roles = Role.order(:id)
-    render json: roles, status: :ok
-  end
-
-  # GET /roles/:id
-  def show
-    role = Role.find(params[:id])
-    render json: role, status: :ok
-  end
-
-  # POST /roles
-  def create
-    role = Role.new(role_params)
-    if role.save
-      render json: role, status: :created
-    else
-      render json: role.errors, status: :unprocessable_entity
-    end
-  end
-
-  # PATCH/PUT /roles/:id
-  def update
-    role = Role.find(params[:id])
-    if role.update(role_params)
-      render json: role, status: :ok
-    else
-      render json: role.errors, status: :unprocessable_entity
-    end
-  end
-
-  # DELETE /roles/:ids
-  def destroy
-    role = Role.find(params[:id])
-    role_name = role.name
-    role.destroy
-    render json: { message: "Role #{role_name} with id #{params[:id]} deleted successfully!" }, status: :no_content
-  end
-
-  def subordinate_roles
-    role = current_user.role
-    roles = role.subordinate_roles
-    render json: roles, status: :ok
-  end
-
-  private
-
-  # Only allow a list of trusted parameters through.
-  def role_params
-    params.require(:role).permit(:id, :name, :parent_id)
-  end
-
-  # def role_not_found
-  #   render json: { error: "Role with id #{params[:id]} not found" }, status: :not_found
-  # end
-
-  def parameter_missing
-    render json: { error: 'Parameter missing' }, status: :unprocessable_entity
-  end
-end
+class RolesController < ApplicationController
+  # rescue_from ActiveRecord::RecordNotFound, with: :role_not_found
+  rescue_from ActionController::ParameterMissing, with: :parameter_missing
+
+  def action_allowed?
+    current_user_has_admin_privileges?
+  end
+  
+  # GET /roles
+  def index
+    roles = Role.order(:id)
+    render json: roles, status: :ok
+  end
+
+  # GET /roles/:id
+  def show
+    role = Role.find(params[:id])
+    render json: role, status: :ok
+  end
+
+  # POST /roles
+  def create
+    role = Role.new(role_params)
+    if role.save
+      render json: role, status: :created
+    else
+      render json: role.errors, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT /roles/:id
+  def update
+    role = Role.find(params[:id])
+    if role.update(role_params)
+      render json: role, status: :ok
+    else
+      render json: role.errors, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE /roles/:ids
+  def destroy
+    role = Role.find(params[:id])
+    role_name = role.name
+    role.destroy
+    render json: { message: "Role #{role_name} with id #{params[:id]} deleted successfully!" }, status: :no_content
+  end
+
+  def subordinate_roles
+    role = current_user.role
+    roles = role.subordinate_roles
+    render json: roles, status: :ok
+  end
+
+  private
+
+  # Only allow a list of trusted parameters through.
+  def role_params
+    params.require(:role).permit(:id, :name, :parent_id)
+  end
+
+  # def role_not_found
+  #   render json: { error: "Role with id #{params[:id]} not found" }, status: :not_found
+  # end
+
+  def parameter_missing
+    render json: { error: 'Parameter missing' }, status: :unprocessable_entity
+  end
+end
diff --git a/app/controllers/api/v1/sign_up_topics_controller.rb b/app/controllers/sign_up_topics_controller.rb
similarity index 96%
rename from app/controllers/api/v1/sign_up_topics_controller.rb
rename to app/controllers/sign_up_topics_controller.rb
index a736f3eaa..11ddf5c7b 100644
--- a/app/controllers/api/v1/sign_up_topics_controller.rb
+++ b/app/controllers/sign_up_topics_controller.rb
@@ -1,7 +1,7 @@
-class Api::V1::SignUpTopicsController < ApplicationController
+class SignUpTopicsController < ApplicationController
   before_action :set_sign_up_topic, only: %i[ show update ]
 
-  # GET /api/v1/sign_up_topics?assignment_id=&topic_ids[]=
+  # GET /sign_up_topics?assignment_id=&topic_ids[]=
   # Retrieve SignUpTopics by two query parameters - assignment_id (compulsory) and an array of topic_ids (optional)
   def index
     if params[:assignment_id].nil?
diff --git a/app/controllers/api/v1/signed_up_teams_controller.rb b/app/controllers/signed_up_teams_controller.rb
similarity index 73%
rename from app/controllers/api/v1/signed_up_teams_controller.rb
rename to app/controllers/signed_up_teams_controller.rb
index dee945a87..961e65fbc 100644
--- a/app/controllers/api/v1/signed_up_teams_controller.rb
+++ b/app/controllers/signed_up_teams_controller.rb
@@ -1,11 +1,26 @@
-class Api::V1::SignedUpTeamsController < ApplicationController
+class SignedUpTeamsController < ApplicationController
 
-  # Returns signed up topics using sign_up_topic assignment id
-  # Retrieves sign_up_topic using topic_id as a parameter
+  # Returns signed up teams
+  # Can query by topic_id or assignment_id
   def index
-    # puts params[:topic_id]
-    @sign_up_topic = SignUpTopic.find(params[:topic_id])
-    @signed_up_team = SignedUpTeam.find_team_participants(@sign_up_topic.assignment_id)
+    if params[:assignment_id].present?
+      # Get all signed up teams for an assignment (across all topics)
+      topic_ids = SignUpTopic.where(assignment_id: params[:assignment_id]).pluck(:id)
+      @signed_up_teams = SignedUpTeam.where(sign_up_topic_id: topic_ids)
+                                      .includes(team: :users, sign_up_topic: :assignment)
+      render json: @signed_up_teams, include: { team: { methods: [:team_size, :max_size] }, sign_up_topic: {} }
+    elsif params[:topic_id].present?
+      # Get signed up teams for a specific topic with their participants
+      @signed_up_teams = SignedUpTeam.where(sign_up_topic_id: params[:topic_id])
+                                      .includes(team: :users, sign_up_topic: :assignment)
+      render json: @signed_up_teams, include: { team: { include: :users, methods: [:team_size, :max_size] }, sign_up_topic: {} }
+    else
+      render json: { error: 'Either assignment_id or topic_id parameter is required' }, status: :bad_request
+    end
+  end
+
+  def show
+    @signed_up_team = SignedUpTeam.find_by(id:params[:id])
     render json: @signed_up_team
   end
 
@@ -99,4 +114,4 @@ def signed_up_teams_params
     params.require(:signed_up_team).permit(:topic_id, :team_id, :is_waitlisted, :preference_priority_number, :comments_for_advertisement, :advertise_for_partner)
   end
 
-end
+end
\ No newline at end of file
diff --git a/app/controllers/api/v1/student_tasks_controller.rb b/app/controllers/student_tasks_controller.rb
similarity index 91%
rename from app/controllers/api/v1/student_tasks_controller.rb
rename to app/controllers/student_tasks_controller.rb
index 0b1291ba5..ffb6097a5 100644
--- a/app/controllers/api/v1/student_tasks_controller.rb
+++ b/app/controllers/student_tasks_controller.rb
@@ -1,28 +1,28 @@
-class Api::V1::StudentTasksController < ApplicationController
-
-  # List retrieves all student tasks associated with the current logged-in user.
-  def action_allowed?
-    current_user_has_student_privileges?
-  end
-  def list
-    # Retrieves all tasks that belong to the current user.
-    @student_tasks = StudentTask.from_user(current_user)
-    # Render the list of student tasks as JSON.
-    render json: @student_tasks, status: :ok
-  end
-
-  def show
-    render json: @student_task, status: :ok
-  end
-
-  # The view function retrieves a student task based on a participant's ID.
-  # It is meant to provide an endpoint where tasks can be queried based on participant ID.
-  def view
-    # Retrieves the student task where the participant's ID matches the provided parameter.
-    # This function will be used for clicking on a specific student task to "view" its details.
-    @student_task = StudentTask.from_participant_id(params[:id])
-    # Render the found student task as JSON.
-    render json: @student_task, status: :ok
-  end
-
-end
+class StudentTasksController < ApplicationController
+
+  # List retrieves all student tasks associated with the current logged-in user.
+  def action_allowed?
+    current_user_has_student_privileges?
+  end
+  def list
+    # Retrieves all tasks that belong to the current user.
+    @student_tasks = StudentTask.from_user(current_user)
+    # Render the list of student tasks as JSON.
+    render json: @student_tasks, status: :ok
+  end
+
+  def show
+    render json: @student_task, status: :ok
+  end
+
+  # The view function retrieves a student task based on a participant's ID.
+  # It is meant to provide an endpoint where tasks can be queried based on participant ID.
+  def view
+    # Retrieves the student task where the participant's ID matches the provided parameter.
+    # This function will be used for clicking on a specific student task to "view" its details.
+    @student_task = StudentTask.from_participant_id(params[:id])
+    # Render the found student task as JSON.
+    render json: @student_task, status: :ok
+  end
+
+end
diff --git a/app/controllers/api/v1/student_teams_controller.rb b/app/controllers/student_teams_controller.rb
similarity index 96%
rename from app/controllers/api/v1/student_teams_controller.rb
rename to app/controllers/student_teams_controller.rb
index 3ff7e106c..5aeb31bd9 100644
--- a/app/controllers/api/v1/student_teams_controller.rb
+++ b/app/controllers/student_teams_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::StudentTeamsController < ApplicationController
+class StudentTeamsController < ApplicationController
 
     #  team is gaining or losing a member
     def team
diff --git a/app/controllers/teams_controller.rb b/app/controllers/teams_controller.rb
new file mode 100644
index 000000000..a24cd23f2
--- /dev/null
+++ b/app/controllers/teams_controller.rb
@@ -0,0 +1,113 @@
+class TeamsController < ApplicationController
+  # Set the @team instance variable before executing actions except index and create
+  before_action :set_team, except: [:index, :create]
+
+  # Validate team type only during team creation
+  before_action :validate_team_type, only: [:create]
+
+  # GET /teams
+  # Fetches all teams and renders them using TeamSerializer
+  def index
+    @teams = Team.all
+    render json: @teams, each_serializer: TeamSerializer
+  end
+
+  # GET /teams/:id
+  # Shows a specific team based on ID
+  def show
+    render json: @team, serializer: TeamSerializer
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: 'Team not found' }, status: :not_found
+  end
+
+  # POST /teams
+  # Creates a new team associated with the current user
+  def create
+    @team = Team.new(team_params)
+    if @team.save
+      render json: @team, serializer: TeamSerializer, status: :created
+    else
+      render json: { errors: @team.errors.full_messages }, status: :unprocessable_entity
+    end
+  end
+
+  # GET /teams/:id/members
+  # Lists all members of a specific team
+  def members
+    participants = @team.participants.includes(:user)
+    render json: participants.map(&:user), each_serializer: UserSerializer
+  end
+
+  # POST /teams/:id/members
+  # Adds a new member to the team unless it's already full
+  def add_member
+    return render json: { errors: ['Team is full'] }, status: :unprocessable_entity if @team.full?
+
+    user = User.find(team_participant_params[:user_id])
+    participant = Participant.find_by(user: user, parent_id: @team.parent_id)
+
+    unless participant
+      return render json: { error: 'Participant not found for this team context' }, status: :not_found
+    end
+
+    teams_participants = @team.teams_participants.build(participant: participant, user: participant.user)
+
+    if teams_participants.save
+      render json: participant.user, serializer: UserSerializer, status: :created
+    else
+      render json: { errors: teams_participants.errors.full_messages }, status: :unprocessable_entity
+    end
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: 'User not found' }, status: :not_found
+  end
+
+  # DELETE /teams/:id/members/:user_id
+  # Removes a member from the team based on user ID
+  def remove_member
+    user = User.find(params[:user_id])
+    participant = Participant.find_by(user: user, parent_id: @team.parent_id)
+    tp = @team.teams_participants.find_by(participant: participant)
+
+    if tp
+      tp.destroy
+      head :no_content
+    else
+      render json: { error: 'Member not found' }, status: :not_found
+    end
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: 'User not found' }, status: :not_found
+  end
+
+  # Placeholder method to get current user (can be replaced by actual auth logic)
+  def current_user
+    @current_user
+  end
+
+  private
+
+  # Finds the team by ID and assigns to @team, else renders not found
+  def set_team
+    @team = Team.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: 'Team not found' }, status: :not_found
+  end
+
+  # Whitelists the parameters allowed for team creation/updation
+  def team_params
+    params.require(:team).permit(:name, :type, :assignment_id)
+  end
+
+  # Whitelists parameters required to add a team member
+  def team_participant_params
+    params.require(:team_participant).permit(:user_id)
+  end
+
+  # Validates the team type before team creation to ensure it's among allowed types
+  def validate_team_type
+    return unless params[:team] && params[:team][:type]
+    valid_types = ['CourseTeam', 'AssignmentTeam', 'MentoredTeam']
+    unless valid_types.include?(params[:team][:type])
+      render json: { error: 'Invalid team type' }, status: :unprocessable_entity
+    end
+  end
+end 
diff --git a/app/controllers/api/v1/teams_participants_controller.rb b/app/controllers/teams_participants_controller.rb
similarity index 96%
rename from app/controllers/api/v1/teams_participants_controller.rb
rename to app/controllers/teams_participants_controller.rb
index e4a778030..c34e3f34d 100644
--- a/app/controllers/api/v1/teams_participants_controller.rb
+++ b/app/controllers/teams_participants_controller.rb
@@ -1,120 +1,120 @@
-class Api::V1::TeamsParticipantsController < ApplicationController
-  # Allow duty updation for a team if current user is student, else require TA or above privileges.
-  def action_allowed?
-    case params[:action]
-    when 'update_duty'
-      current_user_has_student_privileges?
-    else
-      current_user_has_ta_privileges?
-    end
-  end
-
-  # Updates the duty (role) assigned to a participant in a team.
-  def update_duty
-    team_participant = TeamsParticipant.find_by(id: params[:teams_participant_id])
-
-    # FIRST, check existence
-    unless team_participant
-      render json: { error: "Couldn't find TeamsParticipant" }, status: :not_found and return
-    end
-
-    # THEN, verify participant belongs to current user
-    unless team_participant.participant.user_id == current_user.id
-      render json: { error: 'You are not authorized to update duty for this participant' }, status: :forbidden and return
-    end
-
-    duty_id = params.dig(:teams_participant, :duty_id) || params.dig("teams_participant", "duty_id")
-    team_participant.update(duty_id: duty_id)
-    render json: { message: "Duty updated successfully" }, status: :ok
-  end
-
-  # Displays a list of all participants in a specific team.
-  def list_participants
-    # Retrieve the team from the database using the provided ID parameter.
-    current_team = Team.find_by(id: params[:id])
-
-    # If no team is found, return a 404 error with an appropriate error message.
-    if current_team.nil?
-      render json: { error: "Couldn't find Team" }, status: :not_found and return
-    end
-
-    # Fetch all team participant records associated with the current team.
-    team_participants = TeamsParticipant.where(team_id: current_team.id)
-
-    # Determine whether this team belongs to an assignment or a course
-    # Determine context based on type column
-    if current_team.type == "AssignmentTeam"
-      context_key = :assignment
-      context_value = current_team.assignment
-    elsif current_team.type == "CourseTeam"
-      context_key = :course
-      context_value = current_team.course
-    else
-      render json: { error: "Invalid team type" }, status: :unprocessable_entity and return
-    end
-
-    # Build and return a single JSON response with common structure
-    render json: {
-      team_participants: team_participants,
-      team: current_team,
-      context_key => context_value
-    }, status: :ok
-  end
-
-  # Adds Participant to a team
-  def add_participant
-    # First Check if Participant exists
-    # Look up the User record based on the provided name parameter.
-    user = User.find_by(name: params[:name].strip) || (render(json: { error: "User not found" }, status: :not_found) and return)
-    # Find the Participant associated with the user, or return not found error
-    participant = Participant.find_by(user_id: user.id) || (render(json: { error: "Couldn't find Participant" }, status: :not_found) and return)
-
-    # Check if Team exists
-    current_team = Team.find(params[:id])
-    unless current_team
-      render json: { error: "Couldn't find Team" }, status: :not_found and return
-    end
-
-    # Validate if participant can join a team
-    validation_result = current_team.can_participant_join_team?(participant)
-
-    unless validation_result[:success]
-      Rails.logger.info "Validation error: #{validation_result[:error]}"
-      render json: { error: validation_result[:error] }, status: :unprocessable_entity and return
-    end
-
-    # This line adds a participant to the current team
-    result = current_team.add_member(participant)
-
-    if result[:success]
-      render json: { message: "Participant added successfully." }, status: :ok
-    else
-      render json: { error: result[:error] }, status: :unprocessable_entity
-    end
-
-  end
-
-  # Removes one or more participants from a team.
-  def delete_participants
-    # Check if Team exists first
-    current_team = Team.find_by(id: params[:id])
-    unless current_team
-      render json: { error: "Couldn't find Team" }, status: :not_found and return
-    end
-
-    # Extract participant IDs from payload
-    participant_record_ids = params.dig(:payload, :item) || params.dig("payload", "item") || []
-
-    if participant_record_ids.blank?
-      render json: { error: "No participants selected" }, status: :ok and return
-    end
-
-    # Ensure we only delete participants belonging to the specified team
-    TeamsParticipant.where(team_id: current_team.id, id: participant_record_ids).delete_all
-
-    message = participant_record_ids.length == 1 ? "Participant removed successfully" : "Participants deleted successfully"
-    render json: { message: message }, status: :ok
-
-  end
-
-end
+class TeamsParticipantsController < ApplicationController
+  # Allow duty updation for a team if current user is student, else require TA or above privileges.
+  def action_allowed?
+    case params[:action]
+    when 'update_duty'
+      current_user_has_student_privileges?
+    else
+      current_user_has_ta_privileges?
+    end
+  end
+
+  # Updates the duty (role) assigned to a participant in a team.
+  def update_duty
+    team_participant = TeamsParticipant.find_by(id: params[:teams_participant_id])
+
+    # FIRST, check existence
+    unless team_participant
+      render json: { error: "Couldn't find TeamsParticipant" }, status: :not_found and return
+    end
+
+    # THEN, verify participant belongs to current user
+    unless team_participant.participant.user_id == current_user.id
+      render json: { error: 'You are not authorized to update duty for this participant' }, status: :forbidden and return
+    end
+
+    duty_id = params.dig(:teams_participant, :duty_id) || params.dig("teams_participant", "duty_id")
+    team_participant.update(duty_id: duty_id)
+    render json: { message: "Duty updated successfully" }, status: :ok
+  end
+
+  # Displays a list of all participants in a specific team.
+  def list_participants
+    # Retrieve the team from the database using the provided ID parameter.
+    current_team = Team.find_by(id: params[:id])
+
+    # If no team is found, return a 404 error with an appropriate error message.
+    if current_team.nil?
+      render json: { error: "Couldn't find Team" }, status: :not_found and return
+    end
+
+    # Fetch all team participant records associated with the current team.
+    team_participants = TeamsParticipant.where(team_id: current_team.id)
+
+    # Determine whether this team belongs to an assignment or a course
+    # Determine context based on type column
+    if current_team.type == "AssignmentTeam"
+      context_key = :assignment
+      context_value = current_team.assignment
+    elsif current_team.type == "CourseTeam"
+      context_key = :course
+      context_value = current_team.course
+    else
+      render json: { error: "Invalid team type" }, status: :unprocessable_entity and return
+    end
+
+    # Build and return a single JSON response with common structure
+    render json: {
+      team_participants: team_participants,
+      team: current_team,
+      context_key => context_value
+    }, status: :ok
+  end
+
+  # Adds Participant to a team
+  def add_participant
+    # First Check if Participant exists
+    # Look up the User record based on the provided name parameter.
+    user = User.find_by(name: params[:name].strip) || (render(json: { error: "User not found" }, status: :not_found) and return)
+    # Find the Participant associated with the user, or return not found error
+    participant = Participant.find_by(user_id: user.id) || (render(json: { error: "Couldn't find Participant" }, status: :not_found) and return)
+
+    # Check if Team exists
+    current_team = Team.find(params[:id])
+    unless current_team
+      render json: { error: "Couldn't find Team" }, status: :not_found and return
+    end
+
+    # Validate if participant can join a team
+    validation_result = current_team.can_participant_join_team?(participant)
+
+    unless validation_result[:success]
+      Rails.logger.info "Validation error: #{validation_result[:error]}"
+      render json: { error: validation_result[:error] }, status: :unprocessable_entity and return
+    end
+
+    # This line adds a participant to the current team
+    result = current_team.add_member(participant)
+
+    if result[:success]
+      render json: { message: "Participant added successfully." }, status: :ok
+    else
+      render json: { error: result[:error] }, status: :unprocessable_entity
+    end
+
+  end
+
+  # Removes one or more participants from a team.
+  def delete_participants
+    # Check if Team exists first
+    current_team = Team.find_by(id: params[:id])
+    unless current_team
+      render json: { error: "Couldn't find Team" }, status: :not_found and return
+    end
+
+    # Extract participant IDs from payload
+    participant_record_ids = params.dig(:payload, :item) || params.dig("payload", "item") || []
+
+    if participant_record_ids.blank?
+      render json: { error: "No participants selected" }, status: :ok and return
+    end
+
+    # Ensure we only delete participants belonging to the specified team
+    TeamsParticipant.where(team_id: current_team.id, id: participant_record_ids).delete_all
+
+    message = participant_record_ids.length == 1 ? "Participant removed successfully" : "Participants deleted successfully"
+    render json: { message: message }, status: :ok
+
+  end
+
+end
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/users_controller.rb
similarity index 94%
rename from app/controllers/api/v1/users_controller.rb
rename to app/controllers/users_controller.rb
index 086376556..83d7352fd 100644
--- a/app/controllers/api/v1/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::UsersController < ApplicationController
+class UsersController < ApplicationController
   rescue_from ActiveRecord::RecordNotFound, with: :user_not_found
   rescue_from ActionController::ParameterMissing, with: :parameter_missing
 
@@ -42,7 +42,7 @@ def destroy
     render json: { message: "User #{user.name} with id #{params[:id]} deleted successfully!" }, status: :no_content
   end
 
-  # GET /api/v1/users/institution/:id
+  # GET /users/institution/:id
   # Get all users for an institution
   def institution_users
     institution = Institution.find(params[:id])
@@ -52,7 +52,7 @@ def institution_users
     render json: { error: e.message }, status: :not_found
   end
 
-  # GET /api/v1/users/:id/managed
+  # GET /users/:id/managed
   # Get all users that are managed by a user
   def managed_users
     parent = User.find(params[:id])
@@ -66,7 +66,7 @@ def managed_users
   end
 
   # Get role based users
-  # GET /api/v1/users/role/:name
+  # GET /users/role/:name
   def role_users
     name = params[:name].split('_').map(&:capitalize).join(' ')
     role = Role.find_by(name:)
diff --git a/app/helpers/grades_helper.rb b/app/helpers/grades_helper.rb
index b6cf8f207..a8b924dc3 100644
--- a/app/helpers/grades_helper.rb
+++ b/app/helpers/grades_helper.rb
@@ -1,318 +1,318 @@
-module GradesHelper
-  include PenaltyHelper
-
-  # Calculates and applies penalties for participants of a given assignment.
-  def penalties(assignment_id)
-    assignment = Assignment.find(assignment_id)
-    calculate_for_participants = should_calculate_penalties?(assignment)
-  
-    all_penalties = {} 
-
-    Participant.where(assignment_id: assignment_id).each do |participant|
-      penalties = calculate_penalty(participant.id)
-      total_penalty = calculate_total_penalty(penalties)
-  
-      if total_penalty > 0
-        total_penalty = apply_max_penalty(total_penalty)
-        attributes(participant) if calculate_for_participants
-      end
-  
-      all_penalties = assign_all_penalties(participant, penalties)
-    end
-  
-    mark_penalty_as_calculated(assignment) unless assignment.is_penalty_calculated
-    return all_penalties
-  end
-
-  # Calculates and applies penalties for the current assignment.
-  def update_penalties(assignment)
-    penalties(assignment.id)
-  end
-
-  # Retrieves the name of the current user's role, if available.
-  def current_role_name
-    current_role.try :name
-  end
-
-  # Retrieves items from the given questionnaires for the specified assignment, considering the round if applicable.
-  def retrieve_items(questionnaires, assignment_id)
-    items = {}
-    questionnaires.each do |questionnaire|
-      round = AssignmentQuestionnaire.where(assignment_id: assignment_id, questionnaire_id: questionnaire.id).first.used_in_round
-      #can accomodate other types of questionnaires too such as TeammateReviewQuestionnaire, AuthorFeedbackQuestionnaire
-      questionnaire_symbol = if round.nil?
-                               questionnaire.display_type
-                             else
-                               (questionnaire.display_type.to_s + '-Round-' + round.to_s).to_sym
-                             end
-      # questionnaire_symbol = questionnaire.id
-      items[questionnaire_symbol] = questionnaire.items
-    end
-    items  
-  end
-
-  # Retrieves the participant and their associated assignment data.
-  def fetch_participant_and_assignment(id)
-    @participant = AssignmentParticipant.find(id)
-    @assignment = @participant.assignment
-  end
-
-  # Retrieves the questionnaires and their associated items for the assignment.
-  def fetch_questionnaires_and_items(assignment)
-    questionnaires = assignment.questionnaires
-    items = retrieve_items(questionnaires, assignment.id)
-    return items
-  end
-
-  # Fetches the scores for the participant based on the retrieved items.
-  def fetch_participant_scores(participant, items)
-    pscore = Response.participant_scores(participant, items)
-    return pscore
-  end
-
-
-  # Summarizes the feedback received by the reviewee, including overall summary and average scores by round and criterion.
-  def fetch_feedback_summary
-    summary_ws_url = WEBSERVICE_CONFIG['summary_webservice_url']
-    sum = SummaryHelper::Summary.new.summarize_reviews_by_reviewee(@items, @assignment, @team_id, summary_ws_url, session)
-    @summary = sum.summary
-    @avg_scores_by_round = sum.avg_scores_by_round
-    @avg_scores_by_criterion = sum.avg_scores_by_criterion
-  end
-
-  # Processes questionnaires for a team, considering topic-specific and round-specific rubrics, and populates view models accordingly.
-  def process_questionare_for_team(assignment, team_id, questionnaires, team, participant)
-    vmlist = []
-
-    counter_for_same_rubric = 0
-    # if @assignment.vary_by_topic?
-    #   topic_id = SignedUpTeam.topic_id_by_team_id(@team_id)
-    #   topic_specific_questionnaire = AssignmentQuestionnaire.where(assignment_id: @assignment.id, topic_id: topic_id).first.questionnaire
-    #   @vmlist << populate_view_model(topic_specific_questionnaire)
-    # end
-
-    questionnaires.each do |questionnaire|
-      round = nil
-
-      # Guard clause to skip questionnaires that have already been populated for topic specific reviewing
-      # if @assignment.vary_by_topic? && questionnaire.type == 'ReviewQuestionnaire'
-      #   next # Assignments with topic specific rubrics cannot have multiple rounds of review
-      # end
-
-      if assignment.varying_rubrics_by_round? && questionnaire.questionnaire_type == 'ReviewQuestionnaire'
-        questionnaires = AssignmentQuestionnaire.where(assignment_id: assignment.id, questionnaire_id: questionnaire.id)
-        if questionnaires.count > 1
-          round = questionnaires[counter_for_same_rubric].used_in_round
-          counter_for_same_rubric += 1
-        else
-          round = questionnaires[0].used_in_round
-          counter_for_same_rubric = 0
-        end
-      end
-      vmlist << populate_view_model(questionnaire, assignment, round, team, participant)
-    end
-    return vmlist
-  end
-
-  # Redirects the user if they are not allowed to access the assignment, based on team or reviewer authorization.
-  def redirect_when_disallowed(participant)
-    if is_team_assignment?(participant)
-      redirect_if_not_on_correct_team(participant)
-    else
-      redirect_if_not_authorized_reviewer(participant)
-    end
-    false
-  end 
-
-  # Populates the view model with questionnaire data, team members, reviews, and calculated metrics.
-  def populate_view_model(questionnaire, assignment, round, team, participant)
-    vm = VmQuestionResponse.new(questionnaire, assignment, round)
-    vmitems = questionnaire.items
-    vm.add_items(vmitems)
-    vm.add_team_members(team)
-    qn = AssignmentQuestionnaire.where(assignment_id: assignment.id, used_in_round: 2).size >= 1
-    vm.add_reviews(participant, team, assignment.varying_rubrics_by_round?)
-    vm.calculate_metrics
-    vm
-  end
-
-  # Finds an assignment participant by ID, and handles the case where the participant is not found.
-  def find_participant(participant_id)
-    AssignmentParticipant.find(participant_id)
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = "Assignment participant #{participant_id} not found"
-    nil
-  end
-  
-  # Finds an assignment participant by ID, and handles the case where the participant is not found.
-  def find_assignment(assignment_id)
-    Assignment.find(assignment_id)
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = "Assignment participant #{assignment_id} not found"
-    nil
-  end
-
-  # Checks if the student has the necessary permissions and authorizations to proceed.
-  def student_with_permissions?
-    current_user_has_role?('Student') &&
-      self_review_finished?(current_user.id) &&
-      are_needed_authorizations_present?(current_user.id, 'reader', 'reviewer')
-  end
-
-  # Checks if the user is either a student viewing their own team or has Teaching Assistant privileges.
-  def student_or_ta?
-    student_viewing_own_team? || current_user_has_ta_privileges?
-  end
-
-  # This method checks if the current user, who must have the 'Student' role, is viewing their own team.
-  def student_viewing_own_team?
-    return false unless current_user_has_role?('Student')
-  
-    participant = AssignmentParticipant.find_by(id: params[:id])
-    participant && current_user_is_assignment_participant?(participant.assignment.id)
-  end
-
-  # Check if the self-review for the participant is finished based on assignment settings and submission status.
-  def self_review_finished?(id)
-    participant = Participant.find(id)
-    assignment = participant.try(:assignment)
-    self_review_enabled = assignment.try(:is_selfreview_enabled)
-    not_submitted = ResponseMap.self_review_pending?(participant.try(:id))
-    puts self_review_enabled
-    if self_review_enabled
-      !not_submitted
-    else
-      true
-    end
-  end
-
-
-  # Methods associated with View methods:
-  # Determines if the rubric changes by round and returns the corresponding items based on the criteria.
-  def filter_questionnaires(assignment)
-    questionnaires = assignment.questionnaires
-    if assignment.varying_rubrics_by_round?
-      retrieve_items(questionnaires, assignment.id)
-    else
-      items = {}
-      questionnaires.each do |questionnaire|
-        items[questionnaire.id.to_s.to_sym] = questionnaire.items
-      end
-      items
-    end
-  end
-
-  
-  # This method retrieves all items from relevant questionnaires associated with this assignment. 
-  def list_items(assignment)
-    assignment.questionnaires.each_with_object({}) do |questionnaire, items|
-      items[questionnaire.id.to_s] = questionnaire.items
-    end
-  end
-
-  # Method associated with Update methods:
-  # Displays an error message if the participant is not found.
-  def handle_not_found
-    render json: { error: 'Participant not found.' }, status: :not_found
-  end
-
-  # Checks if the participant's grade has changed compared to the new grade.
-  def grade_changed?(participant, new_grade)
-    return false if new_grade.nil?
-
-    format('%.2f', params[:total_score]) != new_grade
-  end
-
-  # Generates a message based on whether the participant's grade is present or computed.
-  def grade_message(participant)
-    participant.grade.nil? ? "The computed score will be used for #{participant.user.name}." :
-                             "A score of #{participant.grade}% has been saved for #{participant.user.name}."
-  end
-
-
-  # Methods associated with instructor_review: 
-  # Finds or creates a reviewer for the given user and assignment, and sets a handle if it's a new record
-  def find_or_create_reviewer(user_id, assignment_id)
-    reviewer = AssignmentParticipant.find_or_create_by(user_id: user_id, parent_id: assignment_id)
-    reviewer.set_handle if reviewer.new_record?
-    reviewer
-  end
-
-  # Finds or creates a review mapping between the reviewee and reviewer for the given assignment.
-  def find_or_create_review_mapping(reviewee_id, reviewer_id, assignment_id)
-    ReviewResponseMap.find_or_create_by(reviewee_id: reviewee_id, reviewer_id: reviewer_id, reviewed_object_id: assignment_id)
-  end
-  
-  # Redirects to the appropriate review page based on whether the review mapping is new or existing.
-  def redirect_to_review(review_mapping)
-    if review_mapping.new_record?
-      redirect_to controller: 'response', action: 'new', id: review_mapping.map_id, return: 'instructor'
-    else
-      review = Response.find_by(map_id: review_mapping.map_id)
-      redirect_to controller: 'response', action: 'edit', id: review.id, return: 'instructor'
-    end
-  end
-
-  private
-  
-  # Determines if penalties should be calculated based on the assignment's penalty status.
-  def should_calculate_penalties?(assignment)
-    !assignment.is_penalty_calculated
-  end
-  
-  # Calculates the total penalty from submission, review, and meta-review penalties.
-  def calculate_total_penalty(penalties)
-    total = penalties[:submission] + penalties[:review] + penalties[:meta_review]
-    total > 0 ? total : 0
-  end
-  
-  # Applies the maximum penalty limit based on the assignment's late policy.
-  def apply_max_penalty(total_penalty)
-    late_policy = LatePolicy.find(@assignment.late_policy_id)
-    total_penalty > late_policy.max_penalty ? late_policy.max_penalty : total_penalty
-  end
-  
-  # Marks the assignment's penalty status as calculated.
-  def mark_penalty_as_calculated(assignment)
-    assignment.update(is_penalty_calculated: true)
-  end
-
-  def assign_all_penalties(participant, penalties)
-    all_penalties[participant.id] = {
-      submission: penalties[:submission],
-      review: penalties[:review],
-      meta_review: penalties[:meta_review],
-      total_penalty: @total_penalty
-    }
-    return all_penalties
-  end
-
-  # Checks if the assignment is a team assignment based on the maximum team size.
-  def is_team_assignment?(participant)
-    participant.assignment.max_team_size > 1
-  end
-  
-  # Redirects the user if they are not on the correct team that provided the feedback.
-  def redirect_if_not_on_correct_team(participant)
-    team = participant.team
-    puts team.attributes
-    if team.nil? || !team.user?(session[:user])
-      flash[:error] = 'You are not on the team that wrote this feedback'
-      redirect_to '/'
-    end
-  end
-  
-  # Redirects the user if they are not an authorized reviewer for the feedback.
-  def redirect_if_not_authorized_reviewer(participant)
-    reviewer = AssignmentParticipant.where(user_id: session[:user].id, parent_id: participant.assignment.id).first
-    return if current_user_id?(reviewer.try(:user_id))
-  
-    flash[:error] = 'You are not authorized to view this feedback'
-    redirect_to '/'
-  end
-
-  # def get_penalty_from_helper(participant_id)
-  #   get_penalty(participant_id)
-  # end
-
+module GradesHelper
+  include PenaltyHelper
+
+  # Calculates and applies penalties for participants of a given assignment.
+  def penalties(assignment_id)
+    assignment = Assignment.find(assignment_id)
+    calculate_for_participants = should_calculate_penalties?(assignment)
+  
+    all_penalties = {} 
+
+    Participant.where(assignment_id: assignment_id).each do |participant|
+      penalties = calculate_penalty(participant.id)
+      total_penalty = calculate_total_penalty(penalties)
+  
+      if total_penalty > 0
+        total_penalty = apply_max_penalty(total_penalty)
+        attributes(participant) if calculate_for_participants
+      end
+  
+      all_penalties = assign_all_penalties(participant, penalties)
+    end
+  
+    mark_penalty_as_calculated(assignment) unless assignment.is_penalty_calculated
+    return all_penalties
+  end
+
+  # Calculates and applies penalties for the current assignment.
+  def update_penalties(assignment)
+    penalties(assignment.id)
+  end
+
+  # Retrieves the name of the current user's role, if available.
+  def current_role_name
+    current_role.try :name
+  end
+
+  # Retrieves items from the given questionnaires for the specified assignment, considering the round if applicable.
+  def retrieve_items(questionnaires, assignment_id)
+    items = {}
+    questionnaires.each do |questionnaire|
+      round = AssignmentQuestionnaire.where(assignment_id: assignment_id, questionnaire_id: questionnaire.id).first.used_in_round
+      #can accomodate other types of questionnaires too such as TeammateReviewQuestionnaire, AuthorFeedbackQuestionnaire
+      questionnaire_symbol = if round.nil?
+                               questionnaire.display_type
+                             else
+                               (questionnaire.display_type.to_s + '-Round-' + round.to_s).to_sym
+                             end
+      # questionnaire_symbol = questionnaire.id
+      items[questionnaire_symbol] = questionnaire.items
+    end
+    items  
+  end
+
+  # Retrieves the participant and their associated assignment data.
+  def fetch_participant_and_assignment(id)
+    @participant = AssignmentParticipant.find(id)
+    @assignment = @participant.assignment
+  end
+
+  # Retrieves the questionnaires and their associated items for the assignment.
+  def fetch_questionnaires_and_items(assignment)
+    questionnaires = assignment.questionnaires
+    items = retrieve_items(questionnaires, assignment.id)
+    return items
+  end
+
+  # Fetches the scores for the participant based on the retrieved items.
+  def fetch_participant_scores(participant, items)
+    pscore = Response.participant_scores(participant, items)
+    return pscore
+  end
+
+
+  # Summarizes the feedback received by the reviewee, including overall summary and average scores by round and criterion.
+  def fetch_feedback_summary
+    summary_ws_url = WEBSERVICE_CONFIG['summary_webservice_url']
+    sum = SummaryHelper::Summary.new.summarize_reviews_by_reviewee(@items, @assignment, @team_id, summary_ws_url, session)
+    @summary = sum.summary
+    @avg_scores_by_round = sum.avg_scores_by_round
+    @avg_scores_by_criterion = sum.avg_scores_by_criterion
+  end
+
+  # Processes questionnaires for a team, considering topic-specific and round-specific rubrics, and populates view models accordingly.
+  def process_questionare_for_team(assignment, team_id, questionnaires, team, participant)
+    vmlist = []
+
+    counter_for_same_rubric = 0
+    # if @assignment.vary_by_topic?
+    #   topic_id = SignedUpTeam.topic_id_by_team_id(@team_id)
+    #   topic_specific_questionnaire = AssignmentQuestionnaire.where(assignment_id: @assignment.id, topic_id: topic_id).first.questionnaire
+    #   @vmlist << populate_view_model(topic_specific_questionnaire)
+    # end
+
+    questionnaires.each do |questionnaire|
+      round = nil
+
+      # Guard clause to skip questionnaires that have already been populated for topic specific reviewing
+      # if @assignment.vary_by_topic? && questionnaire.type == 'ReviewQuestionnaire'
+      #   next # Assignments with topic specific rubrics cannot have multiple rounds of review
+      # end
+
+      if assignment.varying_rubrics_by_round? && questionnaire.questionnaire_type == 'ReviewQuestionnaire'
+        questionnaires = AssignmentQuestionnaire.where(assignment_id: assignment.id, questionnaire_id: questionnaire.id)
+        if questionnaires.count > 1
+          round = questionnaires[counter_for_same_rubric].used_in_round
+          counter_for_same_rubric += 1
+        else
+          round = questionnaires[0].used_in_round
+          counter_for_same_rubric = 0
+        end
+      end
+      vmlist << populate_view_model(questionnaire, assignment, round, team, participant)
+    end
+    return vmlist
+  end
+
+  # Redirects the user if they are not allowed to access the assignment, based on team or reviewer authorization.
+  def redirect_when_disallowed(participant)
+    if is_team_assignment?(participant)
+      redirect_if_not_on_correct_team(participant)
+    else
+      redirect_if_not_authorized_reviewer(participant)
+    end
+    false
+  end 
+
+  # Populates the view model with questionnaire data, team members, reviews, and calculated metrics.
+  def populate_view_model(questionnaire, assignment, round, team, participant)
+    vm = VmQuestionResponse.new(questionnaire, assignment, round)
+    vmitems = questionnaire.items
+    vm.add_items(vmitems)
+    vm.add_team_members(team)
+    qn = AssignmentQuestionnaire.where(assignment_id: assignment.id, used_in_round: 2).size >= 1
+    vm.add_reviews(participant, team, assignment.varying_rubrics_by_round?)
+    vm.calculate_metrics
+    vm
+  end
+
+  # Finds an assignment participant by ID, and handles the case where the participant is not found.
+  def find_participant(participant_id)
+    AssignmentParticipant.find(participant_id)
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = "Assignment participant #{participant_id} not found"
+    nil
+  end
+  
+  # Finds an assignment participant by ID, and handles the case where the participant is not found.
+  def find_assignment(assignment_id)
+    Assignment.find(assignment_id)
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = "Assignment participant #{assignment_id} not found"
+    nil
+  end
+
+  # Checks if the student has the necessary permissions and authorizations to proceed.
+  def student_with_permissions?
+    current_user_has_role?('Student') &&
+      self_review_finished?(current_user.id) &&
+      are_needed_authorizations_present?(current_user.id, 'reader', 'reviewer')
+  end
+
+  # Checks if the user is either a student viewing their own team or has Teaching Assistant privileges.
+  def student_or_ta?
+    student_viewing_own_team? || current_user_has_ta_privileges?
+  end
+
+  # This method checks if the current user, who must have the 'Student' role, is viewing their own team.
+  def student_viewing_own_team?
+    return false unless current_user_has_role?('Student')
+  
+    participant = AssignmentParticipant.find_by(id: params[:id])
+    participant && current_user_is_assignment_participant?(participant.assignment.id)
+  end
+
+  # Check if the self-review for the participant is finished based on assignment settings and submission status.
+  def self_review_finished?(id)
+    participant = Participant.find(id)
+    assignment = participant.try(:assignment)
+    self_review_enabled = assignment.try(:is_selfreview_enabled)
+    not_submitted = ResponseMap.self_review_pending?(participant.try(:id))
+    puts self_review_enabled
+    if self_review_enabled
+      !not_submitted
+    else
+      true
+    end
+  end
+
+
+  # Methods associated with View methods:
+  # Determines if the rubric changes by round and returns the corresponding items based on the criteria.
+  def filter_questionnaires(assignment)
+    questionnaires = assignment.questionnaires
+    if assignment.varying_rubrics_by_round?
+      retrieve_items(questionnaires, assignment.id)
+    else
+      items = {}
+      questionnaires.each do |questionnaire|
+        items[questionnaire.id.to_s.to_sym] = questionnaire.items
+      end
+      items
+    end
+  end
+
+  
+  # This method retrieves all items from relevant questionnaires associated with this assignment. 
+  def list_items(assignment)
+    assignment.questionnaires.each_with_object({}) do |questionnaire, items|
+      items[questionnaire.id.to_s] = questionnaire.items
+    end
+  end
+
+  # Method associated with Update methods:
+  # Displays an error message if the participant is not found.
+  def handle_not_found
+    render json: { error: 'Participant not found.' }, status: :not_found
+  end
+
+  # Checks if the participant's grade has changed compared to the new grade.
+  def grade_changed?(participant, new_grade)
+    return false if new_grade.nil?
+
+    format('%.2f', params[:total_score]) != new_grade
+  end
+
+  # Generates a message based on whether the participant's grade is present or computed.
+  def grade_message(participant)
+    participant.grade.nil? ? "The computed score will be used for #{participant.user.name}." :
+                             "A score of #{participant.grade}% has been saved for #{participant.user.name}."
+  end
+
+
+  # Methods associated with instructor_review: 
+  # Finds or creates a reviewer for the given user and assignment, and sets a handle if it's a new record
+  def find_or_create_reviewer(user_id, assignment_id)
+    reviewer = AssignmentParticipant.find_or_create_by(user_id: user_id, parent_id: assignment_id)
+    reviewer.set_handle if reviewer.new_record?
+    reviewer
+  end
+
+  # Finds or creates a review mapping between the reviewee and reviewer for the given assignment.
+  def find_or_create_review_mapping(reviewee_id, reviewer_id, assignment_id)
+    ReviewResponseMap.find_or_create_by(reviewee_id: reviewee_id, reviewer_id: reviewer_id, reviewed_object_id: assignment_id)
+  end
+  
+  # Redirects to the appropriate review page based on whether the review mapping is new or existing.
+  def redirect_to_review(review_mapping)
+    if review_mapping.new_record?
+      redirect_to controller: 'response', action: 'new', id: review_mapping.map_id, return: 'instructor'
+    else
+      review = Response.find_by(map_id: review_mapping.map_id)
+      redirect_to controller: 'response', action: 'edit', id: review.id, return: 'instructor'
+    end
+  end
+
+  private
+  
+  # Determines if penalties should be calculated based on the assignment's penalty status.
+  def should_calculate_penalties?(assignment)
+    !assignment.is_penalty_calculated
+  end
+  
+  # Calculates the total penalty from submission, review, and meta-review penalties.
+  def calculate_total_penalty(penalties)
+    total = penalties[:submission] + penalties[:review] + penalties[:meta_review]
+    total > 0 ? total : 0
+  end
+  
+  # Applies the maximum penalty limit based on the assignment's late policy.
+  def apply_max_penalty(total_penalty)
+    late_policy = LatePolicy.find(@assignment.late_policy_id)
+    total_penalty > late_policy.max_penalty ? late_policy.max_penalty : total_penalty
+  end
+  
+  # Marks the assignment's penalty status as calculated.
+  def mark_penalty_as_calculated(assignment)
+    assignment.update(is_penalty_calculated: true)
+  end
+
+  def assign_all_penalties(participant, penalties)
+    all_penalties[participant.id] = {
+      submission: penalties[:submission],
+      review: penalties[:review],
+      meta_review: penalties[:meta_review],
+      total_penalty: @total_penalty
+    }
+    return all_penalties
+  end
+
+  # Checks if the assignment is a team assignment based on the maximum team size.
+  def is_team_assignment?(participant)
+    participant.assignment.max_team_size > 1
+  end
+  
+  # Redirects the user if they are not on the correct team that provided the feedback.
+  def redirect_if_not_on_correct_team(participant)
+    team = participant.team
+    puts team.attributes
+    if team.nil? || !team.user?(session[:user])
+      flash[:error] = 'You are not on the team that wrote this feedback'
+      redirect_to '/'
+    end
+  end
+  
+  # Redirects the user if they are not an authorized reviewer for the feedback.
+  def redirect_if_not_authorized_reviewer(participant)
+    reviewer = AssignmentParticipant.where(user_id: session[:user].id, parent_id: participant.assignment.id).first
+    return if current_user_id?(reviewer.try(:user_id))
+  
+    flash[:error] = 'You are not authorized to view this feedback'
+    redirect_to '/'
+  end
+
+  # def get_penalty_from_helper(participant_id)
+  #   get_penalty(participant_id)
+  # end
+
 end
\ No newline at end of file
diff --git a/app/helpers/metric_helper.rb b/app/helpers/metric_helper.rb
index 07019365a..f01235380 100644
--- a/app/helpers/metric_helper.rb
+++ b/app/helpers/metric_helper.rb
@@ -37,7 +37,7 @@ def get_all_review_comments(reviewer_id)
       (1..num_review_rounds + 1).each do |round|
         comments_in_round[round] = ''
         counter_in_round[round] = 0
-        last_response_in_current_round = response_map.response.select { |r| r.round == round }.last
+        last_response_in_current_round = response_map.responses.select { |r| r.round == round }.last
         next if last_response_in_current_round.nil?
 
         last_response_in_current_round.scores.each do |answer|
diff --git a/app/helpers/participants_helper.rb b/app/helpers/participants_helper.rb
index 6a3e7011a..ce665d64c 100644
--- a/app/helpers/participants_helper.rb
+++ b/app/helpers/participants_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ParticipantsHelper
   # ===========================================================
   # A participant can be one of the following authorizations:
diff --git a/app/helpers/penalty_helper.rb b/app/helpers/penalty_helper.rb
index 9f25564de..d02750af1 100644
--- a/app/helpers/penalty_helper.rb
+++ b/app/helpers/penalty_helper.rb
@@ -1,135 +1,270 @@
-module PenaltyHelper
-  def get_penalty(participant_id)
-    set_participant_and_assignment(participant_id)
-    set_late_policy if @assignment.late_policy_id
-  
-    penalties = { submission: 0, review: 0, meta_review: 0 }
-    penalties[:submission] = calculate_submission_penalty
-    penalties[:review] = calculate_review_penalty
-    penalties[:meta_review] = calculate_meta_review_penalty
-    penalties
-  end
-    
-  def set_participant_and_assignment(participant_id)
-    @participant = AssignmentParticipant.find(participant_id)
-    @assignment = @participant.assignment
-  end
-  
-  def set_late_policy
-    late_policy = LatePolicy.find(@assignment.late_policy_id)
-    @penalty_per_unit = late_policy.penalty_per_unit
-    @max_penalty_for_no_submission = late_policy.max_penalty
-    @penalty_unit = late_policy.penalty_unit
-  end
-
-  def calculate_submission_penalty
-    return 0 if @penalty_per_unit.nil?
-  
-    submission_due_date = get_submission_due_date
-    submission_records = SubmissionRecord.where(team_id: @participant.team.id, assignment_id: @participant.assignment.id)
-    late_submission_times = get_late_submission_times(submission_records, submission_due_date)
-  
-    if late_submission_times.any?
-      calculate_late_submission_penalty(late_submission_times.last.updated_at, submission_due_date)
-    else
-      handle_no_submission(submission_records)
-    end
-  end
-  
-  def get_submission_due_date
-    AssignmentDueDate.where(deadline_type_id: @submission_deadline_type_id, parent_id: @assignment.id).first.due_at
-  end
-  
-  def get_late_submission_times(submission_records, submission_due_date)
-    submission_records.select { |submission_record| submission_record.updated_at > submission_due_date }
-  end
-  
-  def calculate_late_submission_penalty(last_submission_time, submission_due_date)
-    return 0 if last_submission_time <= submission_due_date
-  
-    time_difference = last_submission_time - submission_due_date
-    penalty_units = calculate_penalty_units(time_difference, @penalty_unit)
-    penalty_for_submission = penalty_units * @penalty_per_unit
-    apply_max_penalty_limit(penalty_for_submission)
-  end
-  
-  def handle_no_submission(submission_records)
-    submission_records.any? ? 0 : @max_penalty_for_no_submission
-  end
-  
-  def apply_max_penalty_limit(penalty_for_submission)
-    if penalty_for_submission > @max_penalty_for_no_submission
-      @max_penalty_for_no_submission
-    else
-      penalty_for_submission
-    end
-  end
-
-  def calculate_review_penalty
-    calculate_penalty(@assignment.num_reviews, @review_deadline_type_id, ReviewResponseMap, :get_reviewer)
-  end
-  
-  def calculate_meta_review_penalty
-    calculate_penalty(@assignment.num_review_of_reviews, @meta_review_deadline_type_id, MetareviewResponseMap, :id)
-  end
-  
-  private
-  
-  def calculate_penalty(num_reviews_required, deadline_type_id, mapping_class, reviewer_method)
-    return 0 if num_reviews_required <= 0 || @penalty_per_unit.nil?
-  
-    review_mappings = mapping_class.where(reviewer_id: @participant.send(reviewer_method).id)
-    review_due_date = AssignmentDueDate.where(deadline_type_id: deadline_type_id, parent_id: @assignment.id).first
-    return 0 if review_due_date.nil?
-  
-    compute_penalty_on_reviews(review_mappings, review_due_date.due_at, num_reviews_required)
-  end
-
-  def compute_penalty_on_reviews(review_mappings, review_due_date, num_of_reviews_required, penalty_unit, penalty_per_unit, max_penalty)
-    review_timestamps = collect_review_timestamps(review_mappings)
-    review_timestamps.sort!
-    
-    penalty = 0
-  
-    num_of_reviews_required.times do |i|
-      if review_timestamps[i]
-        penalty += calculate_review_penalty(review_timestamps[i], review_due_date, penalty_unit, penalty_per_unit, max_penalty)
-      else
-        penalty = apply_max_penalty_if_missing(max_penalty)
-      end
-    end
-  
-    penalty
-  end
-  
-  private
-  
-  def collect_review_timestamps(review_mappings)
-    review_mappings.filter_map do |map|
-      Response.find_by(map_id: map.id)&.created_at unless map.response.empty?
-    end
-  end
-  
-  def calculate_review_penalty(submission_date, due_date, penalty_unit, penalty_per_unit, max_penalty)
-    return 0 if submission_date <= due_date
-  
-    time_difference = submission_date - due_date
-    penalty_units = calculate_penalty_units(time_difference, penalty_unit)
-    [penalty_units * penalty_per_unit, max_penalty].min
-  end
-  
-  def apply_max_penalty_if_missing(max_penalty)
-    max_penalty
-  end
-
-  def calculate_penalty_units(time_difference, penalty_unit)
-    case penalty_unit
-    when 'Minute'
-      time_difference / 60
-    when 'Hour'
-      time_difference / 3600
-    when 'Day'
-      time_difference / 86_400
-    end
-  end
+module PenaltyHelper
+  def get_penalty(participant_id)
+    set_participant_and_assignment(participant_id)
+    set_late_policy if @assignment.late_policy_id
+  
+    penalties = { submission: 0, review: 0, meta_review: 0 }
+    penalties[:submission] = calculate_submission_penalty
+    penalties[:review] = calculate_review_penalty
+    penalties[:meta_review] = calculate_meta_review_penalty
+    penalties
+  end
+    
+  def set_participant_and_assignment(participant_id)
+    @participant = AssignmentParticipant.find(participant_id)
+    @assignment = @participant.assignment
+  end
+  
+  def set_late_policy
+    late_policy = LatePolicy.find(@assignment.late_policy_id)
+    @penalty_per_unit = late_policy.penalty_per_unit
+    @max_penalty_for_no_submission = late_policy.max_penalty
+    @penalty_unit = late_policy.penalty_unit
+  end
+
+  def calculate_submission_penalty
+    return 0 if @penalty_per_unit.nil?
+  
+    submission_due_date = get_submission_due_date
+    submission_records = SubmissionRecord.where(team_id: @participant.team.id, assignment_id: @participant.assignment.id)
+    late_submission_times = get_late_submission_times(submission_records, submission_due_date)
+  
+    if late_submission_times.any?
+      calculate_late_submission_penalty(late_submission_times.last.updated_at, submission_due_date)
+    else
+      handle_no_submission(submission_records)
+    end
+  end
+  
+  def get_submission_due_date
+    AssignmentDueDate.where(deadline_type_id: @submission_deadline_type_id, parent_id: @assignment.id).first.due_at
+  end
+  
+  def get_late_submission_times(submission_records, submission_due_date)
+    submission_records.select { |submission_record| submission_record.updated_at > submission_due_date }
+  end
+  
+  def calculate_late_submission_penalty(last_submission_time, submission_due_date)
+    return 0 if last_submission_time <= submission_due_date
+  
+    time_difference = last_submission_time - submission_due_date
+    penalty_units = calculate_penalty_units(time_difference, @penalty_unit)
+    penalty_for_submission = penalty_units * @penalty_per_unit
+    apply_max_penalty_limit(penalty_for_submission)
+  end
+  
+  def handle_no_submission(submission_records)
+    submission_records.any? ? 0 : @max_penalty_for_no_submission
+  end
+  
+  def apply_max_penalty_limit(penalty_for_submission)
+    if penalty_for_submission > @max_penalty_for_no_submission
+      @max_penalty_for_no_submission
+    else
+      penalty_for_submission
+    end
+  end
+
+  def calculate_review_penalty
+    calculate_penalty(@assignment.num_reviews, @review_deadline_type_id, ReviewResponseMap, :get_reviewer)
+  end
+  
+  def calculate_meta_review_penalty
+    calculate_penalty(@assignment.num_review_of_reviews, @meta_review_deadline_type_id, MetareviewResponseMap, :id)
+  end
+  
+  private
+  
+  def calculate_penalty(num_reviews_required, deadline_type_id, mapping_class, reviewer_method)
+    return 0 if num_reviews_required <= 0 || @penalty_per_unit.nil?
+  
+    review_mappings = mapping_class.where(reviewer_id: @participant.send(reviewer_method).id)
+    review_due_date = AssignmentDueDate.where(deadline_type_id: deadline_type_id, parent_id: @assignment.id).first
+    return 0 if review_due_date.nil?
+  
+    compute_penalty_on_reviews(review_mappings, review_due_date.due_at, num_reviews_required)
+  end
+
+  def compute_penalty_on_reviews(review_mappings, review_due_date, num_of_reviews_required, penalty_unit, penalty_per_unit, max_penalty)
+    review_timestamps = collect_review_timestamps(review_mappings)
+    review_timestamps.sort!
+    
+    penalty = 0
+  
+    num_of_reviews_required.times do |i|
+      if review_timestamps[i]
+        penalty += calculate_review_penalty(review_timestamps[i], review_due_date, penalty_unit, penalty_per_unit, max_penalty)
+      else
+        penalty = apply_max_penalty_if_missing(max_penalty)
+      end
+    end
+  
+    penalty
+  end
+  
+  private
+  
+  def collect_review_timestamps(review_mappings)
+    review_mappings.filter_map do |map|
+      Response.find_by(map_id: map.id)&.created_at unless map.response.empty?
+    end
+  end
+  
+  def calculate_review_penalty(submission_date, due_date, penalty_unit, penalty_per_unit, max_penalty)
+    return 0 if submission_date <= due_date
+  
+    time_difference = submission_date - due_date
+    penalty_units = calculate_penalty_units(time_difference, penalty_unit)
+    [penalty_units * penalty_per_unit, max_penalty].min
+  end
+  
+  def apply_max_penalty_if_missing(max_penalty)
+    max_penalty
+  end
+
+  def calculate_penalty_units(time_difference, penalty_unit)
+    case penalty_unit
+    when 'Minute'
+      time_difference / 60
+    when 'Hour'
+      time_difference / 3600
+    when 'Day'
+      time_difference / 86_400
+    end
+  end
+end
+module PenaltyHelper
+  def get_penalty(participant_id)
+    set_participant_and_assignment(participant_id)
+    set_late_policy if @assignment.late_policy_id
+  
+    penalties = { submission: 0, review: 0, meta_review: 0 }
+    penalties[:submission] = calculate_submission_penalty
+    penalties[:review] = calculate_review_penalty
+    penalties[:meta_review] = calculate_meta_review_penalty
+    penalties
+  end
+    
+  def set_participant_and_assignment(participant_id)
+    @participant = AssignmentParticipant.find(participant_id)
+    @assignment = @participant.assignment
+  end
+  
+  def set_late_policy
+    late_policy = LatePolicy.find(@assignment.late_policy_id)
+    @penalty_per_unit = late_policy.penalty_per_unit
+    @max_penalty_for_no_submission = late_policy.max_penalty
+    @penalty_unit = late_policy.penalty_unit
+  end
+
+  def calculate_submission_penalty
+    return 0 if @penalty_per_unit.nil?
+  
+    submission_due_date = get_submission_due_date
+    submission_records = SubmissionRecord.where(team_id: @participant.team.id, assignment_id: @participant.assignment.id)
+    late_submission_times = get_late_submission_times(submission_records, submission_due_date)
+  
+    if late_submission_times.any?
+      calculate_late_submission_penalty(late_submission_times.last.updated_at, submission_due_date)
+    else
+      handle_no_submission(submission_records)
+    end
+  end
+  
+  def get_submission_due_date
+    AssignmentDueDate.where(deadline_type_id: @submission_deadline_type_id, parent_id: @assignment.id).first.due_at
+  end
+  
+  def get_late_submission_times(submission_records, submission_due_date)
+    submission_records.select { |submission_record| submission_record.updated_at > submission_due_date }
+  end
+  
+  def calculate_late_submission_penalty(last_submission_time, submission_due_date)
+    return 0 if last_submission_time <= submission_due_date
+  
+    time_difference = last_submission_time - submission_due_date
+    penalty_units = calculate_penalty_units(time_difference, @penalty_unit)
+    penalty_for_submission = penalty_units * @penalty_per_unit
+    apply_max_penalty_limit(penalty_for_submission)
+  end
+  
+  def handle_no_submission(submission_records)
+    submission_records.any? ? 0 : @max_penalty_for_no_submission
+  end
+  
+  def apply_max_penalty_limit(penalty_for_submission)
+    if penalty_for_submission > @max_penalty_for_no_submission
+      @max_penalty_for_no_submission
+    else
+      penalty_for_submission
+    end
+  end
+
+  def calculate_review_penalty
+    calculate_penalty(@assignment.num_reviews, @review_deadline_type_id, ReviewResponseMap, :get_reviewer)
+  end
+  
+  def calculate_meta_review_penalty
+    calculate_penalty(@assignment.num_review_of_reviews, @meta_review_deadline_type_id, MetareviewResponseMap, :id)
+  end
+  
+  private
+  
+  def calculate_penalty(num_reviews_required, deadline_type_id, mapping_class, reviewer_method)
+    return 0 if num_reviews_required <= 0 || @penalty_per_unit.nil?
+  
+    review_mappings = mapping_class.where(reviewer_id: @participant.send(reviewer_method).id)
+    review_due_date = AssignmentDueDate.where(deadline_type_id: deadline_type_id, parent_id: @assignment.id).first
+    return 0 if review_due_date.nil?
+  
+    compute_penalty_on_reviews(review_mappings, review_due_date.due_at, num_reviews_required)
+  end
+
+  def compute_penalty_on_reviews(review_mappings, review_due_date, num_of_reviews_required, penalty_unit, penalty_per_unit, max_penalty)
+    review_timestamps = collect_review_timestamps(review_mappings)
+    review_timestamps.sort!
+    
+    penalty = 0
+  
+    num_of_reviews_required.times do |i|
+      if review_timestamps[i]
+        penalty += calculate_review_penalty(review_timestamps[i], review_due_date, penalty_unit, penalty_per_unit, max_penalty)
+      else
+        penalty = apply_max_penalty_if_missing(max_penalty)
+      end
+    end
+  
+    penalty
+  end
+  
+  private
+  
+  def collect_review_timestamps(review_mappings)
+    review_mappings.filter_map do |map|
+      Response.find_by(map_id: map.id)&.created_at unless map.response.empty?
+    end
+  end
+  
+  def calculate_review_penalty(submission_date, due_date, penalty_unit, penalty_per_unit, max_penalty)
+    return 0 if submission_date <= due_date
+  
+    time_difference = submission_date - due_date
+    penalty_units = calculate_penalty_units(time_difference, penalty_unit)
+    [penalty_units * penalty_per_unit, max_penalty].min
+  end
+  
+  def apply_max_penalty_if_missing(max_penalty)
+    max_penalty
+  end
+
+  def calculate_penalty_units(time_difference, penalty_unit)
+    case penalty_unit
+    when 'Minute'
+      time_difference / 60
+    when 'Hour'
+      time_difference / 3600
+    when 'Day'
+      time_difference / 86_400
+    end
+  end
 end
\ No newline at end of file
diff --git a/app/helpers/question_helper.rb b/app/helpers/question_helper.rb
index 1d9f88b96..26cb42fcd 100644
--- a/app/helpers/question_helper.rb
+++ b/app/helpers/question_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module QuestionHelper
     def edit_common(label = nil,min_question_score = nil, max_question_score = nil, txt ,weight, type)
       {
diff --git a/app/helpers/scorable_helper.rb b/app/helpers/scorable_helper.rb
index deac24055..cebbbf0ee 100644
--- a/app/helpers/scorable_helper.rb
+++ b/app/helpers/scorable_helper.rb
@@ -8,10 +8,10 @@ def calculate_total_score
     # answer for scorable questions, and they will not be counted towards the total score)
 
     sum = 0
-    question_ids = scores.map(&:question_id)
+    item_ids = scores.map(&:item_id)
 
-    # We use find with order here to ensure that the list of questions we get is in the same order as that of question_ids
-    questions = Item.find_with_order(question_ids)
+    # We use find with order here to ensure that the list of questions we get is in the same order as that of item_ids
+    questions = Item.find_with_order(item_ids)
 
     scores.each_with_index do |score, idx|
       item = questions[idx]
@@ -35,10 +35,10 @@ def maximum_score
     # Only count the scorable questions, only when the answer is not nil (we accept nil as
     # answer for scorable questions, and they will not be counted towards the total score)
     total_weight = 0
-    question_ids = scores.map(&:question_id)
+    item_ids = scores.map(&:item_id)
 
-    # We use find with order here to ensure that the list of questions we get is in the same order as that of question_ids
-    questions = Item.find_with_order(question_ids)
+    # We use find with order here to ensure that the list of questions we get is in the same order as that of item_ids
+    questions = Item.find_with_order(item_ids)
 
     scores.each_with_index do |score, idx|
       total_weight += questions[idx].weight unless score.answer.nil? || !questions[idx].scorable?
@@ -60,7 +60,7 @@ def questionnaire_by_answer(answer)
       assignment = map.response_assignment
       questionnaire = Questionnaire.find(assignment.review_questionnaire_id)
     else
-      questionnaire = Item.find(answer.question_id).questionnaire
+      questionnaire = Item.find(answer.item_id).questionnaire
     end
     questionnaire
   end
diff --git a/app/helpers/team_operations_helper.rb b/app/helpers/team_operations_helper.rb
index 684bab8dc..63ade7dab 100644
--- a/app/helpers/team_operations_helper.rb
+++ b/app/helpers/team_operations_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TeamOperationsHelper
   # Validates whether the given user can be part of the specified team based on parent context
   def self.validate_team_membership(team, user)
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index d394c3d10..bef395997 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 286b2239d..d84cb6e71 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: 'from@example.com'
   layout 'mailer'
diff --git a/app/mailers/invitation_mailer.rb b/app/mailers/invitation_mailer.rb
index 005888e5f..091f77416 100644
--- a/app/mailers/invitation_mailer.rb
+++ b/app/mailers/invitation_mailer.rb
@@ -1,9 +1,32 @@
 class InvitationMailer < ApplicationMailer
   default from: 'from@example.com'
+  
   def send_invitation_email
     @invitation = params[:invitation]
     @to_participant = Participant.find(@invitation.to_id)
     @from_team = AssignmentTeam.find(@invitation.from_id)
     mail(to: @to_participant.user.email, subject: 'You have a new invitation from Expertiza')
   end
+
+  # Send acceptance email to the invitee
+  def send_acceptance_email
+    @invitation = params[:invitation]
+    @invitee = Participant.find(@invitation.to_id)
+    @inviter_team = AssignmentTeam.find(@invitation.from_id)
+    @assignment = Assignment.find(@invitation.assignment_id)
+    mail(to: @invitee.user.email, subject: 'Your invitation has been accepted')
+  end
+
+  # Send acceptance notification to the entire inviting team
+  def send_team_acceptance_notification
+    @invitation = params[:invitation]
+    @invitee = Participant.find(@invitation.to_id)
+    @inviter_team = AssignmentTeam.find(@invitation.from_id)
+    @assignment = Assignment.find(@invitation.assignment_id)
+    
+    # Get all team members' emails
+    team_member_emails = @inviter_team.participants.map { |p| p.user.email }
+    
+    mail(to: team_member_emails, subject: "#{@invitee.user.full_name} has accepted the team invitation")
+  end
 end
\ No newline at end of file
diff --git a/app/mailers/join_team_request_mailer.rb b/app/mailers/join_team_request_mailer.rb
new file mode 100644
index 000000000..6ceb29506
--- /dev/null
+++ b/app/mailers/join_team_request_mailer.rb
@@ -0,0 +1,12 @@
+class JoinTeamRequestMailer < ApplicationMailer
+  default from: 'from@example.com'
+
+  # Send acceptance email to the person whose join request was accepted
+  def send_acceptance_email
+    @join_team_request = params[:join_team_request]
+    @participant = @join_team_request.participant
+    @team = @join_team_request.team
+    @assignment = @team.assignment
+    mail(to: @participant.user.email, subject: 'Your join team request has been accepted')
+  end
+end
diff --git a/app/models/Item.rb b/app/models/Item.rb
index e745b2d17..a7969776f 100644
--- a/app/models/Item.rb
+++ b/app/models/Item.rb
@@ -1,74 +1,98 @@
-class Item < ApplicationRecord
-  before_create :set_seq
-  belongs_to :questionnaire # each item belongs to a specific questionnaire
-  has_many :answers, dependent: :destroy, foreign_key: 'item_id'
-  attr_accessor :choice_strategy
-  
-  validates :seq, presence: true, numericality: true # sequence must be numeric
-  validates :txt, length: { minimum: 0, allow_nil: false, message: "can't be nil" } # text content must be provided
-  validates :question_type, presence: true # user must define the item type
-  validates :break_before, presence: true
-
-  def scorable?
-    false
-  end
-
-  def scored?
-    question_type.in?(%w[ScaleItem CriterionItem])
-  end
-    
-  def set_seq
-    self.seq = questionnaire.items.size + 1
-  end
-
-  def as_json(options = {})
-      super(options.merge({
-                            only: %i[txt weight seq question_type size alternatives break_before min_label max_label created_at updated_at],
-                            include: {
-                              questionnaire: { only: %i[name id] }
-                            }
-                          })).tap do |hash|
-      end
-  end
-
-  def strategy
-    case question_type
-    when 'dropdown'
-      self.choice_strategy = Strategies::DropdownStrategy.new
-    when 'multiple_choice'
-      self.choice_strategy = Strategies::MultipleChoiceStrategy.new
-    when 'scale'
-      self.choice_strategy = Strategies::ScaleStrategy.new
-    else
-      raise "Unknown item type: #{question_type}"
-    end
-  end
-
-  # Use strategy to render the item
-  def render
-    strategy.render(self)
-  end
-
-  # Use strategy to validate the item
-  def validate_item
-    strategy.validate(self)
-  end
-
-  def max_score
-    weight
-  end
-
-  def self.for(record)
-    klass = case record.question_type
-            when 'Criterion'
-              Criterion
-            when 'Scale'
-              Scale
-            else
-              Item
-            end
-
-    # Cast the existing record to the desired subclass
-    klass.new(record.attributes)
-  end
+# frozen_string_literal: true
+
+class Item < ApplicationRecord
+  before_create :set_seq
+  belongs_to :questionnaire # each item belongs to a specific questionnaire
+  has_many :answers, dependent: :destroy, foreign_key: 'item_id'
+  attr_accessor :choice_strategy
+  
+  validates :seq, presence: true, numericality: true # sequence must be numeric
+  validates :txt, length: { minimum: 0, allow_nil: false, message: "can't be nil" } # text content must be provided
+  validates :question_type, presence: true # user must define the item type
+  validates :break_before, presence: true
+
+  def scorable?
+    false
+  end
+
+  def scored?
+    question_type.in?(%w[ScaleItem CriterionItem])
+  end
+
+  def scored?
+    question_type.in?(%w[ScaleItem CriterionItem])
+  end
+    
+  def set_seq
+    self.seq = questionnaire.items.size + 1
+  end
+
+  def as_json(options = {})
+      super(options.merge({
+                            only: %i[txt weight seq question_type size alternatives break_before min_label max_label created_at updated_at],
+                            include: {
+                              questionnaire: { only: %i[name id] }
+                            }
+                          })).tap do |hash|
+      end
+  end
+
+  def strategy
+    case question_type
+    when 'dropdown'
+      self.choice_strategy = Strategies::DropdownStrategy.new
+    when 'multiple_choice'
+      self.choice_strategy = Strategies::MultipleChoiceStrategy.new
+    when 'scale'
+      self.choice_strategy = Strategies::ScaleStrategy.new
+    else
+      raise "Unknown item type: #{question_type}"
+    end
+  end
+
+  # Use strategy to render the item
+  def render
+    strategy.render(self)
+  end
+
+  # Use strategy to validate the item
+  def validate_item
+    strategy.validate(self)
+  end
+
+  def max_score
+    weight
+  end
+
+  def self.for(record)
+    klass = case record.question_type
+            when 'Criterion'
+              Criterion
+            when 'Scale'
+              Scale
+            else
+              Item
+            end
+
+    # Cast the existing record to the desired subclass
+    klass.new(record.attributes)
+  end
+
+  def max_score
+    weight
+  end
+
+  def self.for(record)
+    klass = case record.question_type
+            when 'Criterion'
+              Criterion
+            when 'Scale'
+              Scale
+            else
+              Item
+            end
+
+    # Cast the existing record to the desired subclass
+    klass.new(record.attributes)
+  end
 end
\ No newline at end of file
diff --git a/app/models/Strategies/choice_strategy.rb b/app/models/Strategies/choice_strategy.rb
index 2eba17c28..ae00cd280 100644
--- a/app/models/Strategies/choice_strategy.rb
+++ b/app/models/Strategies/choice_strategy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Strategies
   class ChoiceStrategy
     def render(item)
diff --git a/app/models/Strategies/dropdown_strategy.rb b/app/models/Strategies/dropdown_strategy.rb
index 9b622031d..318728083 100644
--- a/app/models/Strategies/dropdown_strategy.rb
+++ b/app/models/Strategies/dropdown_strategy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Strategies
   class DropdownStrategy < ChoiceStrategy
     def render(item)
diff --git a/app/models/Strategies/multiple_choice_strategy.rb b/app/models/Strategies/multiple_choice_strategy.rb
index 9f9bec1a7..d0fe03415 100644
--- a/app/models/Strategies/multiple_choice_strategy.rb
+++ b/app/models/Strategies/multiple_choice_strategy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Strategies
   class MultipleChoiceStrategy < ChoiceStrategy
     def render(item)
diff --git a/app/models/Strategies/scale_strategy.rb b/app/models/Strategies/scale_strategy.rb
index 200cfbdf8..4187a3a35 100644
--- a/app/models/Strategies/scale_strategy.rb
+++ b/app/models/Strategies/scale_strategy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Strategies
   class ScaleStrategy < ChoiceStrategy
     def render(item)
diff --git a/app/models/account_request.rb b/app/models/account_request.rb
index 72e4d50e4..b14d41972 100644
--- a/app/models/account_request.rb
+++ b/app/models/account_request.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AccountRequest < ApplicationRecord
   belongs_to :role
   belongs_to :institution
diff --git a/app/models/administrator.rb b/app/models/administrator.rb
index 698ba4090..9e1d922a6 100644
--- a/app/models/administrator.rb
+++ b/app/models/administrator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Administrator < User
   def managed_users
     # Get all users that belong to an institution of the loggedIn user except the user itself
diff --git a/app/models/analytic/assignment_team_analytic.rb b/app/models/analytic/assignment_team_analytic.rb
index 9c19819c8..3d7b59609 100644
--- a/app/models/analytic/assignment_team_analytic.rb
+++ b/app/models/analytic/assignment_team_analytic.rb
@@ -1,108 +1,108 @@
-# require 'analytic/response_analytic'
-module AssignmentTeamAnalytic
-    #======= general ==========#
-    def num_participants
-      participants.count
-    end
-  
-    def num_reviews
-      responses.count
-    end
-  
-    #========== score ========#
-    def average_review_score
-      if num_reviews == 0
-        0
-      else
-        review_scores.inject(:+).to_f / num_reviews
-      end
-    end
-  
-    def max_review_score
-      review_scores.max
-    end
-  
-    def min_review_score
-      review_scores.min
-    end
-  
-    #======= word count =======#
-    def total_review_word_count
-      review_word_counts.inject(:+)
-    end
-  
-    def average_review_word_count
-      if num_reviews == 0
-        0
-      else
-        total_review_word_count.to_f / num_reviews
-      end
-    end
-  
-    def max_review_word_count
-      review_word_counts.max
-    end
-  
-    def min_review_word_count
-      review_word_counts.min
-    end
-  
-    #===== character count ====#
-    def total_review_character_count
-      review_character_counts.inject(:+)
-    end
-  
-    def average_review_character_count
-      if num_reviews == 0
-        0
-      else
-        total_review_character_count.to_f / num_reviews
-      end
-    end
-  
-    def max_review_character_count
-      review_character_counts.max
-    end
-  
-    def min_review_character_count
-      review_character_counts.min
-    end
-  
-    def review_character_counts
-      list = []
-      responses.each do |response|
-        list << response.total_character_count
-      end
-      if list.empty?
-        [0]
-      else
-        list
-      end
-    end
-  
-    # return an array containing the score of all the reviews
-    def review_scores
-      list = []
-      responses.each do |response|
-        list << response.average_score
-      end
-      if list.empty?
-        [0]
-      else
-        list
-      end
-    end
-  
-    def review_word_counts
-      list = []
-      responses.each do |response|
-        list << response.total_word_count
-      end
-      if list.empty?
-        [0]
-      else
-        list
-      end
-    end
-  end
+# require 'analytic/response_analytic'
+module  Analytic::AssignmentTeamAnalytic
+    #======= general ==========#
+    def num_participants
+      participants.count
+    end
+  
+    def num_reviews
+      responses.count
+    end
+  
+    #========== score ========#
+    def average_review_score
+      if num_reviews == 0
+        0
+      else
+        review_scores.inject(:+).to_f / num_reviews
+      end
+    end
+  
+    def max_review_score
+      review_scores.max
+    end
+  
+    def min_review_score
+      review_scores.min
+    end
+  
+    #======= word count =======#
+    def total_review_word_count
+      review_word_counts.inject(:+)
+    end
+  
+    def average_review_word_count
+      if num_reviews == 0
+        0
+      else
+        total_review_word_count.to_f / num_reviews
+      end
+    end
+  
+    def max_review_word_count
+      review_word_counts.max
+    end
+  
+    def min_review_word_count
+      review_word_counts.min
+    end
+  
+    #===== character count ====#
+    def total_review_character_count
+      review_character_counts.inject(:+)
+    end
+  
+    def average_review_character_count
+      if num_reviews == 0
+        0
+      else
+        total_review_character_count.to_f / num_reviews
+      end
+    end
+  
+    def max_review_character_count
+      review_character_counts.max
+    end
+  
+    def min_review_character_count
+      review_character_counts.min
+    end
+  
+    def review_character_counts
+      list = []
+      responses.each do |response|
+        list << response.total_character_count
+      end
+      if list.empty?
+        [0]
+      else
+        list
+      end
+    end
+  
+    # return an array containing the score of all the reviews
+    def review_scores
+      list = []
+      responses.each do |response|
+        list << response.average_score
+      end
+      if list.empty?
+        [0]
+      else
+        list
+      end
+    end
+  
+    def review_word_counts
+      list = []
+      responses.each do |response|
+        list << response.total_word_count
+      end
+      if list.empty?
+        [0]
+      else
+        list
+      end
+    end
+end
   
\ No newline at end of file
diff --git a/app/models/answer.rb b/app/models/answer.rb
index 2b55378fd..3c3320afe 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Answer < ApplicationRecord
     belongs_to :response
     belongs_to :item
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index f6961453b..e64d155b1 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   primary_abstract_class
 end
\ No newline at end of file
diff --git a/app/models/assignment.rb b/app/models/assignment.rb
index 88080da4c..220efca64 100644
--- a/app/models/assignment.rb
+++ b/app/models/assignment.rb
@@ -1,208 +1,222 @@
-class Assignment < ApplicationRecord
-  include MetricHelper
-  has_many :participants, class_name: 'AssignmentParticipant', foreign_key: 'parent_id', dependent: :destroy
-  has_many :users, through: :participants, inverse_of: :assignment
-  has_many :teams, class_name: 'AssignmentTeam', foreign_key: 'parent_id', dependent: :destroy, inverse_of: :assignment
-  has_many :invitations, class_name: 'Invitation', foreign_key: 'assignment_id', dependent: :destroy # , inverse_of: :assignment
-  has_many :assignment_questionnaires, dependent: :destroy
-  has_many :questionnaires, through: :assignment_questionnaires
-  has_many :response_maps, foreign_key: 'reviewed_object_id', dependent: :destroy, inverse_of: :assignment
-  has_many :review_mappings, class_name: 'ReviewResponseMap', foreign_key: 'reviewed_object_id', dependent: :destroy, inverse_of: :assignment
-  has_many :sign_up_topics , class_name: 'SignUpTopic', foreign_key: 'assignment_id', dependent: :destroy
-  has_many :due_dates,as: :parent, class_name: 'DueDate',  dependent: :destroy
-  belongs_to :course, optional: true
-  belongs_to :instructor, class_name: 'User', inverse_of: :assignments
-
-  #This method return the value of the has_badge field for the given assignment object.
-  attr_accessor :title, :description, :has_badge, :enable_pair_programming, :is_calibrated, :staggered_deadline
-
-  def review_questionnaire_id
-    Questionnaire.find_by_assignment_id id
-  end
-
-  def teams?
-    @has_teams ||= teams.any?
-  end
-  def num_review_rounds
-    rounds_of_reviews
-  end
-
-  # Add a participant to the assignment based on the provided user_id.
-  # This method first finds the User with the given user_id. If the user does not exist, it raises an error.
-  # It then checks if the user is already a participant in the assignment. If so, it raises an error.
-  # If the user is not a participant, a new AssignmentParticipant is created and associated with the assignment.
-  # The participant's handle is set, and the newly created participant is returned.
-  # Raises an error if the user does not exist or if the user is already a participant.
-  # Returns the newly created AssignmentParticipant.
-  def add_participant(user_id)
-    # Find the User with the provided user_id
-    user = User.find_by(id: user_id)
-    # Check if the user exists
-    if user.nil?
-      raise "The user account does not exist"
-    end
-    # Check if the user is already a participant in the assignment
-    participant = AssignmentParticipant.find_by(parent_id:id, user_id:user.id)
-    if participant
-      # Raises error if the user is already a participant
-      raise "The user #{user.name} is already a participant."
-    end
-    # Create a new AssignmentParticipant associated with the assignment and user
-    new_part = AssignmentParticipant.create(parent_id: self.id,
-                                            user_id: user.id)
-    # Set the participant's handle
-    new_part.set_handle
-    # Return the newly created AssignmentParticipant
-    new_part
-  end
-
-
-  # Remove a participant from the assignment based on the provided user_id.
-  # This method finds the AssignmentParticipant with the given assignment_id and user_id,
-  # and then deletes the corresponding record from the database.
-  # No return value; the participant is removed from the assignment.
-  def remove_participant(user_id)
-    # Find the AssignmentParticipant associated with this assignment and user
-    assignment_participant = AssignmentParticipant.where(parent_id: self.id, user_id: user_id).first
-    # Delete the AssignmentParticipant record
-    if assignment_participant
-      assignment_participant.destroy
-    end
-  end
-
-  # Remove the assignment from the associated course.
-  # This method sets the course_id of the assignment to nil, effectively removing its course association.
-  # Returns the modified assignment object with course_id set to nil.
-  def remove_assignment_from_course
-    # Set the course_id of the assignment to nil
-    self.course_id = nil
-    # Return the modified assignment
-    self
-  end
-
-
-
- # Assign a course to the assignment based on the provided course_id.
-  # If the assignment already belongs to the specified course, an error is raised.
-  # Returns the modified assignment object with the updated course assignment.
-  def assign_course(course_id)
-    # Find the assignment by its ID
-    assignment = Assignment.where(id: id).first
-    # Check if the assignment already belongs to the provided course_id
-    if assignment.course_id == course_id
-      # Raises error if the assignment already belongs to the provided course_id
-      raise "The assignment already belongs to this course id."
-    end
-    # Update the assignment's course assignment
-    assignment.course_id = course_id
-    # Return the modified assignment
-    assignment
-  end
-
-
-  # Create a copy of the assignment, including its name, instructor, and course assignment.
-  # The new assignment is named "Copy of [original assignment name]".
-  # Returns the newly created assignment object, which is a copy of the original assignment.
-  def copy
-    copied_assignment = Assignment.new(
-        name: "Copy of #{self.name}",
-        course_id: self.course_id
-      )
-
-    # Assign the correct instructor to the copied assignment
-    copied_assignment.instructor = self.instructor
-
-    # Save the copied assignment to the database
-    copied_assignment.save
-
-    copied_assignment
-
-  end
-  def is_calibrated?
-    is_calibrated
-  end
-  
-  def pair_programming_enabled?
-    enable_pair_programming
-  end
-  
-  def has_badge?
-    has_badge
-  end
-
-  def staggered_and_no_topic?(topic_id)
-    staggered_deadline? && topic_id.nil?
-  end
-
-
-  #This method return the value of the has_topics field for the given assignment object.
-  # has_topics is of boolean type and is set true if there is any topic associated with the assignment.
-  def topics?
-    @has_topics ||= sign_up_topics.any?
-  end
-
-  #This method return if the given assignment is a team assignment.
-  # Checks if the value of max_team_size for the given assignment object is greater than 1
-  def team_assignment?
-    !max_team_size.nil? && max_team_size > 1
-  end
-
-  #Auxiliary method for checking the validity of the field reviews_allowed for the given assignment object
-  # Checks if review_allowed is not null and not negative.
-  def valid_reviews_allowed?(reviews_allowed)
-    reviews_allowed && reviews_allowed != -1
-  end
-
-  #method for checking if reviews_required are smaller than reviews_allowed for the given assignment object.
-  def num_reviews_greater?(reviews_required, reviews_allowed)
-    valid_reviews_allowed?(reviews_allowed) and reviews_required > reviews_allowed
-  end
-
-  #This method checks if for the given review type, required reviews and allowed reviews have valid order of values
-  # Receives a parameter review_type and return an object with boolean value of 'success' and corresponding message
-  # If the parameter is of a invalid type, the corresponding error message is received.
-  def valid_num_review(review_type)
-    if review_type=='review'
-      #checks for reviews
-      if num_reviews_greater?(num_reviews_required,num_reviews_allowed)
-        {success: false, message: 'Number of reviews required cannot be greater than number of reviews allowed'}
-      else
-        {success: true}
-      end
-
-      #checks for meta-reviews
-    elsif review_type == 'metareview'
-        if num_reviews_greater?(num_metareviews_required,num_metareviews_allowed)
-          {success: false, message: 'Number of metareviews required cannot be greater than number of metareviews allowed'}
-        else
-          {success: true}
-        end
-
-        #for invalid review_type
-    else
-      {success: false, message: 'Please enter a valid review type.'}
-    end
-  end
-
-
-  #This method check if for the given assignment,different type of rubrics are used in different round.
-  # Checks if for the given assignment any questionnaire is present with used_in_round field not nil.
-  # Returns a boolean value whether such questionnaire is present.
-  def varying_rubrics_by_round?
-    rubric_with_round = AssignmentQuestionnaire.where(assignment_id: id).where.not(used_in_round: nil).first
-    # Check if any rubric has a specified round
-    rubric_with_round.present?
-  end
-
-  def review_rounds(questionnaireType)
-    review_rounds = []
-    if varying_rubrics_by_round?
-      all_questionnaires = AssignmentQuestionnaire.where(assignment_id: id).where.not(used_in_round: nil).all
-      all_questionnaires.each do |q|
-        review_rounds << q.used_in_round if q.questionnaire.questionnaire_type == "#{questionnaireType}Questionnaire"
-      end
-    end
-    review_rounds
-  end
-
-end
+# frozen_string_literal: true
+
+class Assignment < ApplicationRecord
+  include MetricHelper
+  has_many :participants, class_name: 'AssignmentParticipant', foreign_key: 'parent_id', dependent: :destroy
+  has_many :users, through: :participants, inverse_of: :assignment
+  has_many :teams, class_name: 'AssignmentTeam', foreign_key: 'parent_id', dependent: :destroy, inverse_of: :assignment
+  has_many :invitations, class_name: 'Invitation', foreign_key: 'assignment_id', dependent: :destroy # , inverse_of: :assignment
+  has_many :assignment_questionnaires, dependent: :destroy
+  has_many :questionnaires, through: :assignment_questionnaires
+  has_many :response_maps, foreign_key: 'reviewed_object_id', dependent: :destroy, inverse_of: :assignment
+  has_many :review_mappings, class_name: 'ReviewResponseMap', foreign_key: 'reviewed_object_id', dependent: :destroy, inverse_of: :assignment
+  has_many :sign_up_topics , class_name: 'SignUpTopic', foreign_key: 'assignment_id', dependent: :destroy
+  has_many :due_dates,as: :parent, class_name: 'DueDate',  dependent: :destroy
+  belongs_to :course, optional: true
+  belongs_to :instructor, class_name: 'User', inverse_of: :assignments
+
+  #This method return the value of the has_badge field for the given assignment object.
+  attr_accessor :title, :description, :has_badge, :enable_pair_programming, :is_calibrated, :staggered_deadline
+
+  def review_questionnaire_id
+    Questionnaire.find_by_assignment_id id
+  end
+
+  def teams?
+    @has_teams ||= teams.any?
+  end
+  def num_review_rounds
+    rounds_of_reviews
+  end
+
+  # Add a participant to the assignment based on the provided user_id.
+  # This method first finds the User with the given user_id. If the user does not exist, it raises an error.
+  # It then checks if the user is already a participant in the assignment. If so, it raises an error.
+  # If the user is not a participant, a new AssignmentParticipant is created and associated with the assignment.
+  # The participant's handle is set, and the newly created participant is returned.
+  # Raises an error if the user does not exist or if the user is already a participant.
+  # Returns the newly created AssignmentParticipant.
+  def add_participant(user_id)
+    # Find the User with the provided user_id
+    user = User.find_by(id: user_id)
+    # Check if the user exists
+    if user.nil?
+      raise "The user account does not exist"
+    end
+    # Check if the user is already a participant in the assignment
+    participant = AssignmentParticipant.find_by(parent_id:id, user_id:user.id)
+    if participant
+      # Raises error if the user is already a participant
+      raise "The user #{user.name} is already a participant."
+    end
+    # Create a new AssignmentParticipant associated with the assignment and user
+    new_part = AssignmentParticipant.create(parent_id: self.id,
+                                            user_id: user.id)
+    # Set the participant's handle
+    new_part.set_handle
+    # Return the newly created AssignmentParticipant
+    new_part
+  end
+
+
+  # Remove a participant from the assignment based on the provided user_id.
+  # This method finds the AssignmentParticipant with the given assignment_id and user_id,
+  # and then deletes the corresponding record from the database.
+  # No return value; the participant is removed from the assignment.
+  def remove_participant(user_id)
+    # Find the AssignmentParticipant associated with this assignment and user
+    assignment_participant = AssignmentParticipant.where(parent_id: self.id, user_id: user_id).first
+    # Delete the AssignmentParticipant record
+    if assignment_participant
+      assignment_participant.destroy
+    end
+  end
+
+  # Remove the assignment from the associated course.
+  # This method sets the course_id of the assignment to nil, effectively removing its course association.
+  # Returns the modified assignment object with course_id set to nil.
+  def remove_assignment_from_course
+    # Set the course_id of the assignment to nil
+    self.course_id = nil
+    # Return the modified assignment
+    self
+  end
+
+
+
+ # Assign a course to the assignment based on the provided course_id.
+  # If the assignment already belongs to the specified course, an error is raised.
+  # Returns the modified assignment object with the updated course assignment.
+  def assign_course(course_id)
+    # Find the assignment by its ID
+    assignment = Assignment.where(id: id).first
+    # Check if the assignment already belongs to the provided course_id
+    if assignment.course_id == course_id
+      # Raises error if the assignment already belongs to the provided course_id
+      raise "The assignment already belongs to this course id."
+    end
+    # Update the assignment's course assignment
+    assignment.course_id = course_id
+    # Return the modified assignment
+    assignment
+  end
+
+
+  # Create a copy of the assignment, including its name, instructor, and course assignment.
+  # The new assignment is named "Copy of [original assignment name]".
+  # Returns the newly created assignment object, which is a copy of the original assignment.
+  def copy
+    copied_assignment = Assignment.new(
+        name: "Copy of #{self.name}",
+        course_id: self.course_id
+      )
+
+    # Assign the correct instructor to the copied assignment
+    copied_assignment.instructor = self.instructor
+
+    # Save the copied assignment to the database
+    copied_assignment.save
+
+    copied_assignment
+
+  end
+  def is_calibrated?
+    is_calibrated
+  end
+  
+  def pair_programming_enabled?
+    enable_pair_programming
+  end
+  
+  def has_badge?
+    has_badge
+  end
+
+  def staggered_and_no_topic?(topic_id)
+    staggered_deadline? && topic_id.nil?
+  end
+
+
+  #This method return the value of the has_topics field for the given assignment object.
+  # has_topics is of boolean type and is set true if there is any topic associated with the assignment.
+  def topics?
+    @has_topics ||= sign_up_topics.any?
+  end
+
+  #This method return if the given assignment is a team assignment.
+  # Checks if the value of max_team_size for the given assignment object is greater than 1
+  def team_assignment?
+    !max_team_size.nil? && max_team_size > 1
+  end
+
+  #Auxiliary method for checking the validity of the field reviews_allowed for the given assignment object
+  # Checks if review_allowed is not null and not negative.
+  def valid_reviews_allowed?(reviews_allowed)
+    reviews_allowed && reviews_allowed != -1
+  end
+
+  #method for checking if reviews_required are smaller than reviews_allowed for the given assignment object.
+  def num_reviews_greater?(reviews_required, reviews_allowed)
+    valid_reviews_allowed?(reviews_allowed) and reviews_required > reviews_allowed
+  end
+
+  #This method checks if for the given review type, required reviews and allowed reviews have valid order of values
+  # Receives a parameter review_type and return an object with boolean value of 'success' and corresponding message
+  # If the parameter is of a invalid type, the corresponding error message is received.
+  def valid_num_review(review_type)
+    if review_type=='review'
+      #checks for reviews
+      if num_reviews_greater?(num_reviews_required,num_reviews_allowed)
+        {success: false, message: 'Number of reviews required cannot be greater than number of reviews allowed'}
+      else
+        {success: true}
+      end
+
+      #checks for meta-reviews
+    elsif review_type == 'metareview'
+        if num_reviews_greater?(num_metareviews_required,num_metareviews_allowed)
+          {success: false, message: 'Number of metareviews required cannot be greater than number of metareviews allowed'}
+        else
+          {success: true}
+        end
+
+        #for invalid review_type
+    else
+      {success: false, message: 'Please enter a valid review type.'}
+    end
+  end
+
+
+  #This method check if for the given assignment,different type of rubrics are used in different round.
+  # Checks if for the given assignment any questionnaire is present with used_in_round field not nil.
+  # Returns a boolean value whether such questionnaire is present.
+  def varying_rubrics_by_round?
+    rubric_with_round = AssignmentQuestionnaire.where(assignment_id: id).where.not(used_in_round: nil).first
+    # Check if any rubric has a specified round
+    rubric_with_round.present?
+  end
+
+  def review_rounds(questionnaireType)
+    review_rounds = []
+    if varying_rubrics_by_round?
+      all_questionnaires = AssignmentQuestionnaire.where(assignment_id: id).where.not(used_in_round: nil).all
+      all_questionnaires.each do |q|
+        review_rounds << q.used_in_round if q.questionnaire.questionnaire_type == "#{questionnaireType}Questionnaire"
+      end
+    end
+    review_rounds
+  end
+
+
+  def review_rounds(questionnaireType)
+    review_rounds = []
+    if varying_rubrics_by_round?
+      all_questionnaires = AssignmentQuestionnaire.where(assignment_id: id).where.not(used_in_round: nil).all
+      all_questionnaires.each do |q|
+        review_rounds << q.used_in_round if q.questionnaire.questionnaire_type == "#{questionnaireType}Questionnaire"
+      end
+    end
+    review_rounds
+  end
+
+end
diff --git a/app/models/assignment_due_date.rb b/app/models/assignment_due_date.rb
index 6246452be..202c33836 100644
--- a/app/models/assignment_due_date.rb
+++ b/app/models/assignment_due_date.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AssignmentDueDate < DueDate
   # Needed for backwards compatibility due to DueDate.type inheritance column
 end
diff --git a/app/models/assignment_participant.rb b/app/models/assignment_participant.rb
index acfa3d0f2..412e2bf87 100644
--- a/app/models/assignment_participant.rb
+++ b/app/models/assignment_participant.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class AssignmentParticipant < Participant
+  include ReviewAggregator
   has_many :sent_invitations, class_name: 'Invitation', foreign_key: 'participant_id'
   belongs_to :user
   validates :handle, presence: true
@@ -20,13 +21,7 @@ def set_handle
     self.save
   end
 
-  def aggregate_teammate_review_grade(maps)
-    return 0 if maps.empty?
-    obtained_score = 0    
-    total_reviewers = maps.size
-    maps.each do |map|
-       obtained_score += map.review_grade
-    end
-     ((obtained_score/total_reviewers)*100).round(2)
+  def aggregate_teammate_review_grade(teammate_review_mappings)
+    compute_average_review_score(teammate_review_mappings)
   end
 end
\ No newline at end of file
diff --git a/app/models/assignment_questionnaire.rb b/app/models/assignment_questionnaire.rb
index c4cc4337b..87a55883d 100644
--- a/app/models/assignment_questionnaire.rb
+++ b/app/models/assignment_questionnaire.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AssignmentQuestionnaire < ApplicationRecord
   belongs_to :assignment
   belongs_to :questionnaire
diff --git a/app/models/assignment_survey_response_map.rb b/app/models/assignment_survey_response_map.rb
index d43a980ee..d5c31ef5c 100644
--- a/app/models/assignment_survey_response_map.rb
+++ b/app/models/assignment_survey_response_map.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class AssignmentSurveyResponseMap < SurveyResponseMap
+    include ResponseMapSubclassTitles
     belongs_to :assignment, foreign_key: 'reviewed_object_id'
     def survey_parent
         assignment
diff --git a/app/models/assignment_team.rb b/app/models/assignment_team.rb
index 2da003e41..b3b837bb4 100644
--- a/app/models/assignment_team.rb
+++ b/app/models/assignment_team.rb
@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 class AssignmentTeam < Team
+  include Analytic::AssignmentTeamAnalytic
+  include ReviewAggregator
   # Each AssignmentTeam must belong to a specific assignment
   belongs_to :assignment, class_name: 'Assignment', foreign_key: 'parent_id'
+  has_many :review_mappings, class_name: 'ReviewResponseMap', foreign_key: 'reviewee_id'
+  has_many :review_response_maps, foreign_key: 'reviewee_id'
+  has_many :responses, through: :review_response_maps, foreign_key: 'map_id'
 
 
   # Copies the current assignment team to a course team
@@ -19,6 +26,66 @@ def copy_to_course_team(course)
     end
     course_team   # Returns the newly created course team object
   end  
+  # Adds a participant to this team.
+  # - Update the participant's team_id (so their direct reference is consistent)
+  # - Ensure there is a TeamsParticipant join record connecting the participant and this team
+  def add_participant(participant)
+    # need to have a check if the team is full then it can not add participant to the team
+    raise TeamFullError, "Team is full." if full?
+
+    # Update the participant's team_id column - will remove the team reference inside participants table later. keeping it for now
+    # participant.update!(team_id: id)
+
+    # Create or reuse the join record to maintain the association
+    TeamsParticipant.find_or_create_by!(participant_id: participant.id, team_id: id, user_id: participant.user_id)
+  end
+
+  # Removes a participant from this team.
+  # - Delete the TeamsParticipant join record
+  # - if the participant sent any invitations while being on the team, they all need to be retracted
+  # - If the team has no remaining members, destroy the team itself
+  def remove_participant(participant)
+    # retract all the invitations the participant sent (if any) while being on the this team
+    participant.retract_sent_invitations
+
+    # Remove the join record if it exists
+    tp = TeamsParticipant.find_by(team_id: id, participant_id: participant.id)
+    tp&.destroy
+    
+    # Update the participant's team_id column - will remove the team reference inside participants table later. keeping it for now
+    # participant.update!(team_id: nil)
+
+    # If no participants remain after removal, delete the team
+    destroy if participants.empty?
+  end
+
+  # Get the review response map
+  def review_map_type
+    'ReviewResponseMap'
+  end
+
+  def fullname
+    name
+  end
+
+  # Use current object (AssignmentTeam) as reviewee and create the ReviewResponseMap record
+  def assign_reviewer(reviewer)
+    assignment = Assignment.find(parent_id)
+    raise 'The assignment cannot be found.' if assignment.nil?
+
+    ReviewResponseMap.create(reviewee_id: id, reviewer_id: reviewer.get_reviewer.id, reviewed_object_id: assignment.id, team_reviewing_enabled: assignment.team_reviewing_enabled)
+  end
+
+  # Whether the team has submitted work or not
+  def has_submissions?
+    submitted_files.any? || submitted_hyperlinks.present?
+  end
+
+  # Computes the average review grade for an assignment team.
+  # This method aggregates scores from all ReviewResponseMaps (i.e., all reviewers of the team).
+  def aggregate_review_grade
+    compute_average_review_score(review_mappings)
+  end
   
   # Adds a participant to this team.
   # - Update the participant's team_id (so their direct reference is consistent)
@@ -64,7 +131,6 @@ def validate_membership(user)
 
   private
 
-  
   # Validates that the team is an AssignmentTeam or a subclass (e.g., MentoredTeam)
   def validate_assignment_team_type
     unless self.kind_of?(AssignmentTeam)
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 2f02eabb5..59b7ba68a 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Bookmark < ApplicationRecord
   belongs_to :user
   # belongs_to :topic, class_name: "SignUpTopic"
diff --git a/app/models/bookmark_rating.rb b/app/models/bookmark_rating.rb
index d8e003f3e..6eb8aafa3 100644
--- a/app/models/bookmark_rating.rb
+++ b/app/models/bookmark_rating.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BookmarkRating < ApplicationRecord
   belongs_to :bookmark
   belongs_to :user
diff --git a/app/models/bookmark_rating_response_map.rb b/app/models/bookmark_rating_response_map.rb
index cc07ea7f7..9c0ff91ca 100644
--- a/app/models/bookmark_rating_response_map.rb
+++ b/app/models/bookmark_rating_response_map.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BookmarkRatingResponseMap < ReviewResponseMap
   belongs_to :reviewee, class_name: 'Bookmark', foreign_key: 'reviewee_id'
   belongs_to :assignment, class_name: 'Assignment', foreign_key: 'reviewed_object_id'
diff --git a/app/models/checkbox.rb b/app/models/checkbox.rb
index 35e79239c..07e8a671a 100644
--- a/app/models/checkbox.rb
+++ b/app/models/checkbox.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Checkbox < UnscoredItem
     def edit(count)
       {
diff --git a/app/models/concerns/response_map_subclass_titles.rb b/app/models/concerns/response_map_subclass_titles.rb
index 38ef017f3..8c1fee2f3 100644
--- a/app/models/concerns/response_map_subclass_titles.rb
+++ b/app/models/concerns/response_map_subclass_titles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ResponseMapSubclassTitles
     ASSIGNMENT_SURVEY_RESPONSE_MAP_TITLE = 'Assignment Survey'
     BOOKMARK_RATING_RESPONSE_MAP_TITLE = 'Bookmark Review'
diff --git a/app/models/concerns/review_aggregator.rb b/app/models/concerns/review_aggregator.rb
new file mode 100644
index 000000000..95e25e65e
--- /dev/null
+++ b/app/models/concerns/review_aggregator.rb
@@ -0,0 +1,22 @@
+module ReviewAggregator
+  extend ActiveSupport::Concern
+
+  # Generic method to compute average review grade from a collection of response maps
+  def compute_average_review_score(maps)
+    return nil if maps.blank?
+
+    total_score = 0.0
+    total_reviewers = 0
+
+    maps.each do |map|
+      score = map.aggregate_reviewers_score
+      next if score.nil?
+
+      total_score += score
+      total_reviewers += 1
+    end
+
+    return nil if total_reviewers.zero?
+    ((total_score / total_reviewers) * 100).round(2)
+  end
+end
\ No newline at end of file
diff --git a/app/models/course.rb b/app/models/course.rb
index 460690708..f33f1875f 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Course < ApplicationRecord
   belongs_to :instructor, class_name: 'User', foreign_key: 'instructor_id'
   belongs_to :institution, foreign_key: 'institution_id'
diff --git a/app/models/course_participant.rb b/app/models/course_participant.rb
index e5b7b263f..59d83a842 100644
--- a/app/models/course_participant.rb
+++ b/app/models/course_participant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CourseParticipant < Participant
   belongs_to :user
   validates :handle, presence: true
diff --git a/app/models/course_survey_response_map.rb b/app/models/course_survey_response_map.rb
index b54c1319a..ac966df46 100644
--- a/app/models/course_survey_response_map.rb
+++ b/app/models/course_survey_response_map.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class CourseSurveyResponseMap < SurveyResponseMap
+    include ResponseMapSubclassTitles
     belongs_to :course, foreign_key: 'reviewed_object_id'
     
     def questionnaire
diff --git a/app/models/course_team.rb b/app/models/course_team.rb
index da7f6dcff..1230f0175 100644
--- a/app/models/course_team.rb
+++ b/app/models/course_team.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CourseTeam < Team
   #Each course team must belong to a course
   belongs_to :course, class_name: 'Course', foreign_key: 'parent_id'
@@ -41,4 +43,4 @@ def type_must_be_course_team
       errors.add(:type, 'must be CourseTeam')
     end
   end
-end 
+end
diff --git a/app/models/criterion.rb b/app/models/criterion.rb
index 2342bf451..4dfcaae2d 100644
--- a/app/models/criterion.rb
+++ b/app/models/criterion.rb
@@ -1,85 +1,87 @@
-class Criterion < ScoredItem
-    validates :size, presence: true
-
-    def max_score
-      questionnaire.max_question_score * weight
-    end
-  
-    def edit
-      {
-        remove_link: "/questions/#{id}",
-        sequence_input: seq.to_s,
-        question_text: txt,
-        question_type: question_type,
-        weight: weight.to_s,
-        size: size.to_s,
-        max_label: max_label,
-        min_label: min_label
-      }
-    end
-  
-    def view_item_text
-      question_data = {
-        text: txt,
-        question_type: question_type,
-        weight: weight,
-        score_range: "#{questionnaire.min_question_score} to #{questionnaire.max_question_score}"
-      }
-  
-      question_data[:score_range] = "(#{min_label}) " + question_data[:score_range] + " (#{max_label})" if max_label && min_label
-      question_data
-    end
-  
-    def complete(count,answer = nil, questionnaire_min, questionnaire_max, dropdown_or_scale)
-      question_advices = QuestionAdvice.to_json_by_question_id(id)
-      advice_total_length = question_advices.sum { |advice| advice.advice.length unless advice.advice.blank? }
-  
-      response_options = if dropdown_or_scale == 'dropdown'
-                           dropdown_criterion_question(count, answer, questionnaire_min, questionnaire_max)
-                         elsif dropdown_or_scale == 'scale'
-                           scale_criterion_question(count, answer, questionnaire_min, questionnaire_max)
-                         end
-  
-      advice_section = question_advices.empty? || advice_total_length.zero? ? nil : advices_criterion_question(count, question_advices)
-  
-      {
-        label: txt,
-        advice: advice_section,
-        response_options: response_options
-      }.compact # Use .compact to remove nil values
-    end
-  
-    # Assuming now these methods should be public based on the test cases
-    def dropdown_criterion_question(count,answer, questionnaire_min, questionnaire_max)
-      options = (questionnaire_min..questionnaire_max).map do |score|
-        option = { value: score, label: score.to_s }
-        option[:selected] = 'selected' if answer && score == answer.answer
-        option
-      end
-      { type: 'dropdown', options: options, current_answer: answer.try(:answer), comments: answer.try(:comments) }
-    end
-  
-    def scale_criterion_question(count,answer, questionnaire_min, questionnaire_max)
-      {
-        type: 'scale',
-        min: questionnaire_min,
-        max: questionnaire_max,
-        current_answer: answer.try(:answer),
-        comments: answer.try(:comments),
-        min_label: min_label,
-        max_label: max_label,
-        size: size
-      }
-    end
-  
-    private
-  
-    def advices_criterion_question(question_advices)
-      question_advices.map do |advice|
-        {
-          score: advice.score,
-          advice: advice.advice
-        }
-      end
-    end
+# frozen_string_literal: true
+
+class Criterion < ScoredItem
+    validates :size, presence: true
+
+    def max_score
+      questionnaire.max_question_score * weight
+    end
+  
+    def edit
+      {
+        remove_link: "/questions/#{id}",
+        sequence_input: seq.to_s,
+        question_text: txt,
+        question_type: question_type,
+        weight: weight.to_s,
+        size: size.to_s,
+        max_label: max_label,
+        min_label: min_label
+      }
+    end
+  
+    def view_item_text
+      question_data = {
+        text: txt,
+        question_type: question_type,
+        weight: weight,
+        score_range: "#{questionnaire.min_question_score} to #{questionnaire.max_question_score}"
+      }
+  
+      question_data[:score_range] = "(#{min_label}) " + question_data[:score_range] + " (#{max_label})" if max_label && min_label
+      question_data
+    end
+  
+    def complete(count,answer = nil, questionnaire_min, questionnaire_max, dropdown_or_scale)
+      question_advices = QuestionAdvice.to_json_by_question_id(id)
+      advice_total_length = question_advices.sum { |advice| advice.advice.length unless advice.advice.blank? }
+  
+      response_options = if dropdown_or_scale == 'dropdown'
+                           dropdown_criterion_question(count, answer, questionnaire_min, questionnaire_max)
+                         elsif dropdown_or_scale == 'scale'
+                           scale_criterion_question(count, answer, questionnaire_min, questionnaire_max)
+                         end
+  
+      advice_section = question_advices.empty? || advice_total_length.zero? ? nil : advices_criterion_question(count, question_advices)
+  
+      {
+        label: txt,
+        advice: advice_section,
+        response_options: response_options
+      }.compact # Use .compact to remove nil values
+    end
+  
+    # Assuming now these methods should be public based on the test cases
+    def dropdown_criterion_question(count,answer, questionnaire_min, questionnaire_max)
+      options = (questionnaire_min..questionnaire_max).map do |score|
+        option = { value: score, label: score.to_s }
+        option[:selected] = 'selected' if answer && score == answer.answer
+        option
+      end
+      { type: 'dropdown', options: options, current_answer: answer.try(:answer), comments: answer.try(:comments) }
+    end
+  
+    def scale_criterion_question(count,answer, questionnaire_min, questionnaire_max)
+      {
+        type: 'scale',
+        min: questionnaire_min,
+        max: questionnaire_max,
+        current_answer: answer.try(:answer),
+        comments: answer.try(:comments),
+        min_label: min_label,
+        max_label: max_label,
+        size: size
+      }
+    end
+  
+    private
+  
+    def advices_criterion_question(question_advices)
+      question_advices.map do |advice|
+        {
+          score: advice.score,
+          advice: advice.advice
+        }
+      end
+    end
   end
\ No newline at end of file
diff --git a/app/models/dropdown.rb b/app/models/dropdown.rb
index c780a6b8c..4769e7d84 100644
--- a/app/models/dropdown.rb
+++ b/app/models/dropdown.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Dropdown < UnscoredItem
     include QuestionHelper
   
diff --git a/app/models/due_date.rb b/app/models/due_date.rb
index fbebe3bfb..ed310bef5 100644
--- a/app/models/due_date.rb
+++ b/app/models/due_date.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DueDate < ApplicationRecord
   include Comparable
   # Named constants for teammate review statuses
diff --git a/app/models/feedback_response_map.rb b/app/models/feedback_response_map.rb
index b234708cc..80e353602 100644
--- a/app/models/feedback_response_map.rb
+++ b/app/models/feedback_response_map.rb
@@ -1,9 +1,26 @@
-class FeedbackResponseMap < ResponseMap
-  belongs_to :reviewee, class_name: 'Participant', foreign_key: 'reviewee_id'
-  belongs_to :review, class_name: 'Response', foreign_key: 'reviewed_object_id'
-  belongs_to :reviewer, class_name: 'AssignmentParticipant', dependent: :destroy
-
-  def questionnaire_type
-    'AuthorFeedback'
-  end
+# frozen_string_literal: true
+class FeedbackResponseMap < ResponseMap 
+  belongs_to :reviewee, class_name: 'Participant', foreign_key: 'reviewee_id'
+  belongs_to :review, class_name: 'Response', foreign_key: 'reviewed_object_id'
+  belongs_to :reviewer, class_name: 'AssignmentParticipant', dependent: :destroy
+
+    def questionnaire_type
+      'AuthorFeedback'
+    end
+
+  def assignment 
+    review.map.assignment
+  end 
+
+  def questionnaire 
+    Questionnaire.find_by(id: reviewed_object_id)
+  end 
+
+  def get_title 
+    FEEDBACK_RESPONSE_MAP_TITLE
+  end
+
+  def questionnaire_type
+    'AuthorFeedback'
+  end
 end
\ No newline at end of file
diff --git a/app/models/file_upload.rb b/app/models/file_upload.rb
index 10b6ea742..f7fdb0d06 100644
--- a/app/models/file_upload.rb
+++ b/app/models/file_upload.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # app/models/file_upload.rb
 class FileUpload < Item
     def edit(_count)
diff --git a/app/models/global_survey_response_map.rb b/app/models/global_survey_response_map.rb
index c5a77e301..4633f6c9b 100644
--- a/app/models/global_survey_response_map.rb
+++ b/app/models/global_survey_response_map.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class GlobalSurveyResponseMap < SurveyResponseMap
+    include ResponseMapSubclassTitles
     belongs_to :questionnaire, foreign_key: 'reviewed_object_id'
     def questionnaire
         Questionnaire.find_by(id: reviewed_object_id)
diff --git a/app/models/institution.rb b/app/models/institution.rb
index 7f6c51404..7a7d60103 100644
--- a/app/models/institution.rb
+++ b/app/models/institution.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Institution < ApplicationRecord
   validates :name, presence: true, uniqueness: true, allow_blank: false, length: { maximum: 50 }
   has_many :users, dependent: :restrict_with_error
diff --git a/app/models/instructor.rb b/app/models/instructor.rb
index b71e4cf5e..91ed5307c 100644
--- a/app/models/instructor.rb
+++ b/app/models/instructor.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Instructor < User
 
   # Get all users whose parent is the instructor
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index 906358d13..329050fe4 100644
--- a/app/models/invitation.rb
+++ b/app/models/invitation.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Invitation < ApplicationRecord
   after_initialize :set_defaults
 
@@ -56,6 +58,15 @@ def accept_invitation
 
       # 4. Mark this invitation as accepted
       update!(reply_status: InvitationValidator::ACCEPT_STATUS)
+      
+      # 5. Send acceptance emails
+      InvitationMailer.with(invitation: self)
+                      .send_acceptance_email
+                      .deliver_now
+      
+      InvitationMailer.with(invitation: self)
+                      .send_team_acceptance_notification
+                      .deliver_now
     end
 
     { success: true, message: "Invitation accepted successfully." }
diff --git a/app/models/join_team_request.rb b/app/models/join_team_request.rb
index 39bf798a8..a8f763f3c 100644
--- a/app/models/join_team_request.rb
+++ b/app/models/join_team_request.rb
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class JoinTeamRequest < ApplicationRecord
-  # TODO Uncomment the following line when Team and Team Controller is thoroughly implemented
-  # belongs_to :team
-  has_one :participant, dependent: :nullify
+  belongs_to :team
+  belongs_to :participant
+  
   ACCEPTED_STATUSES = %w[ACCEPTED DECLINED PENDING]
-  validates :status, inclusion: { in: ACCEPTED_STATUSES }
+  validates :reply_status, inclusion: { in: ACCEPTED_STATUSES }
 end
diff --git a/app/models/mentored_team.rb b/app/models/mentored_team.rb
index af3fc2911..77cf25627 100644
--- a/app/models/mentored_team.rb
+++ b/app/models/mentored_team.rb
@@ -1,15 +1,10 @@
-class MentoredTeam < AssignmentTeam
-  belongs_to :mentor, class_name: 'User'
+# frozen_string_literal: true
 
-  #Validates the presence of a mentor in the team
-  validates :mentor, presence: true
+class MentoredTeam < AssignmentTeam
 
   # Custom validation to ensure the team type is 'MentoredTeam'
   validate :type_must_be_mentored_team
 
-  # Validates the role of the mentor
-  validate :mentor_must_have_mentor_role
-
   # adds members to the team who are not mentors
   def add_member(user)
     return false if user == mentor
@@ -36,10 +31,4 @@ def remove_mentor
   def type_must_be_mentored_team
     errors.add(:type, 'must be MentoredTeam') unless type == 'MentoredTeam'
   end
-
-  # Check if the user has been given the role 'mentor'
-  def mentor_must_have_mentor_role
-    return unless mentor
-    errors.add(:mentor, 'must have mentor role') unless mentor.role&.name&.downcase&.include?('mentor')
-  end
 end 
diff --git a/app/models/multiple_choice_checkbox.rb b/app/models/multiple_choice_checkbox.rb
index 5e1d81f1b..a3ec77e99 100644
--- a/app/models/multiple_choice_checkbox.rb
+++ b/app/models/multiple_choice_checkbox.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class MultipleChoiceCheckbox < QuizItem
diff --git a/app/models/multiple_choice_radio.rb b/app/models/multiple_choice_radio.rb
index 807a1d583..910659074 100644
--- a/app/models/multiple_choice_radio.rb
+++ b/app/models/multiple_choice_radio.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class MultipleChoiceRadio < QuizItem
diff --git a/app/models/node.rb b/app/models/node.rb
index e6df14864..18fcb5331 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Node < ApplicationRecord
   belongs_to :parent, class_name: 'Node', foreign_key: 'parent_id', optional: true, inverse_of: false
   has_many :children, class_name: 'Node', foreign_key: 'parent_id', dependent: :nullify, inverse_of: false
diff --git a/app/models/participant.rb b/app/models/participant.rb
index 336128735..c48b8f3bd 100644
--- a/app/models/participant.rb
+++ b/app/models/participant.rb
@@ -1,19 +1,21 @@
-class Participant < ApplicationRecord
-  # Associations
-  belongs_to :user
-  has_many   :join_team_requests, dependent: :destroy
-  belongs_to :team, optional: true
-  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'parent_id', optional: true, inverse_of: :participants
-  belongs_to :course, class_name: 'Course', foreign_key: 'parent_id', optional: true, inverse_of: :participants
-
-  # Validations
-  validates :user_id, presence: true
-  validates :parent_id, presence: true
-  validates :type, presence: true, inclusion: { in: %w[AssignmentParticipant CourseParticipant], message: "must be either 'AssignmentParticipant' or 'CourseParticipant'" }
-
-  # Methods
-  def fullname
-    user.full_name
-  end
-
-end
+# frozen_string_literal: true
+
+class Participant < ApplicationRecord
+  # Associations
+  belongs_to :user
+  has_many   :join_team_requests, dependent: :destroy
+  belongs_to :team, optional: true
+  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'parent_id', optional: true, inverse_of: :participants
+  belongs_to :course, class_name: 'Course', foreign_key: 'parent_id', optional: true, inverse_of: :participants
+
+  # Validations
+  validates :user_id, presence: true
+  validates :parent_id, presence: true
+  validates :type, presence: true, inclusion: { in: %w[AssignmentParticipant CourseParticipant], message: "must be either 'AssignmentParticipant' or 'CourseParticipant'" }
+
+  # Methods
+  def fullname
+    user.full_name
+  end
+
+end
diff --git a/app/models/question_advice.rb b/app/models/question_advice.rb
index ce04ade69..76b54c56d 100644
--- a/app/models/question_advice.rb
+++ b/app/models/question_advice.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class QuestionAdvice < ApplicationRecord
     belongs_to :item
     def self.export_fields(_options)
diff --git a/app/models/questionnaire.rb b/app/models/questionnaire.rb
index 436da7ad6..1225af7d0 100644
--- a/app/models/questionnaire.rb
+++ b/app/models/questionnaire.rb
@@ -1,41 +1,68 @@
-  class Questionnaire < ApplicationRecord
-    belongs_to :instructor
-    has_many :items, class_name: "Item", foreign_key: "questionnaire_id", dependent: :destroy # the collection of items associated with this Questionnaire
-    before_destroy :check_for_question_associations
-    has_many :questions
-
-    validate :validate_questionnaire
-    validates :name, presence: true
-    validates :max_question_score, :min_question_score, numericality: true 
-    
-
-    # after_initialize :post_initialization
-      # @print_name = 'Review Rubric'
-    
-      # class << self
-      #   attr_reader :print_name
-      # end
-    
-      # def post_initialization
-      #   self.display_type = 'Review'
-      # end
-    
-      def symbol
-        'review'.to_sym
-      end
+# frozen_string_literal: true
+
+class Questionnaire < ApplicationRecord
+  belongs_to :instructor
+  has_many :items, class_name: "Item", foreign_key: "questionnaire_id", dependent: :destroy # the collection of questions associated with this Questionnaire
+  before_destroy :check_for_question_associations
+
+  validate :validate_questionnaire
+  validates :name, presence: true
+  validates :max_question_score, :min_question_score, numericality: true 
+  
+
+  # after_initialize :post_initialization
+    # @print_name = 'Review Rubric'
+  
+    # class << self
+    #   attr_reader :print_name
+    # end
+  
+    # def post_initialization
+    #   self.display_type = 'Review'
+    # end
+  
+    def symbol
+      'review'.to_sym
+    end
+  
+    def get_assessments_for(participant)
+      participant.reviews
+    end
     
-      def get_assessments_for(participant)
-        participant.reviews
+  # validate the entries for this questionnaire
+  def validate_questionnaire
+    errors.add(:max_question_score, 'The maximum item score must be a positive integer.') if max_question_score < 1
+    errors.add(:min_question_score, 'The minimum item score must be a positive integer.') if min_question_score < 0
+    errors.add(:min_question_score, 'The minimum item score must be less than the maximum.') if min_question_score >= max_question_score
+    results = Questionnaire.where('id <> ? and name = ? and instructor_id = ?', id, name, instructor_id)
+    errors.add(:name, 'Questionnaire names must be unique.') if results.present?
+  end
+
+  # clones the contents of a questionnaire, including the questions and associated advice
+  def self.copy_questionnaire_details(params)
+    orig_questionnaire = Questionnaire.find(params[:id])
+    questions = Item.where(questionnaire_id: params[:id])
+    questionnaire = orig_questionnaire.dup
+    questionnaire.instructor_id = params[:instructor_id]
+    questionnaire.name = 'Copy of ' + orig_questionnaire.name
+    questionnaire.created_at = Time.zone.now
+    questionnaire.save!
+    questions.each do |question|
+      new_question = question.dup
+      new_question.questionnaire_id = questionnaire.id
+      new_question.size = '50,3' if (new_question.is_a?(Criterion) || new_question.is_a?(TextResponse)) && new_question.size.nil?
+      new_question.save!
+      advices = QuestionAdvice.where(question_id: question.id)
+      next if advices.empty?
+
+      advices.each do |advice|
+        new_advice = advice.dup
+        new_advice.question_id = new_question.id
+        new_advice.save!
       end
-      
-    # validate the entries for this questionnaire
-    def validate_questionnaire
-      errors.add(:max_question_score, 'The maximum item score must be a positive integer.') if max_question_score < 1
-      errors.add(:min_question_score, 'The minimum item score must be a positive integer.') if min_question_score < 0
-      errors.add(:min_question_score, 'The minimum item score must be less than the maximum.') if min_question_score >= max_question_score
-      results = Questionnaire.where('id <> ? and name = ? and instructor_id = ?', id, name, instructor_id)
-      errors.add(:name, 'Questionnaire names must be unique.') if results.present?
     end
+    questionnaire
+  end
 
     # Check_for_question_associations checks if questionnaire has associated questions or not
     def check_for_question_associations
@@ -44,112 +71,15 @@ def check_for_question_associations
       end
     end
 
-    def as_json(options = {})
-        super(options.merge({
-                              only: %i[id name private min_question_score max_question_score created_at updated_at questionnaire_type instructor_id],
-                              include: {
-                                instructor: { only: %i[name email fullname password role]
-                              }
-                              }
-                            })).tap do |hash|
-          hash['instructor'] ||= { id: nil, name: nil }
-        end
-    end
-
-    DEFAULT_MIN_QUESTION_SCORE = 0  # The lowest score that a reviewer can assign to any questionnaire question
-    DEFAULT_MAX_QUESTION_SCORE = 5  # The highest score that a reviewer can assign to any questionnaire question
-    DEFAULT_QUESTIONNAIRE_URL = 'http://www.courses.ncsu.edu/csc517'.freeze
-    QUESTIONNAIRE_TYPES = ['ReviewQuestionnaire',
-                          'MetareviewQuestionnaire',
-                          'Author FeedbackQuestionnaire',
-                          'AuthorFeedbackQuestionnaire',
-                          'Teammate ReviewQuestionnaire',
-                          'TeammateReviewQuestionnaire',
-                          'SurveyQuestionnaire',
-                          'AssignmentSurveyQuestionnaire',
-                          'Assignment SurveyQuestionnaire',
-                          'Global SurveyQuestionnaire',
-                          'GlobalSurveyQuestionnaire',
-                          'Course SurveyQuestionnaire',
-                          'CourseSurveyQuestionnaire',
-                          'Bookmark RatingQuestionnaire',
-                          'BookmarkRatingQuestionnaire',
-                          'QuizQuestionnaire'].freeze
-    # has_paper_trail
-
-    def get_weighted_score(assignment, scores)
-      # create symbol for "varying rubrics" feature -Yang
-      round = AssignmentQuestionnaire.find_by(assignment_id: assignment.id, questionnaire_id: id).used_in_round
-      questionnaire_symbol = if round.nil?
-                              symbol
-                            else
-                              (symbol.to_s + round.to_s).to_sym
-                            end
-      compute_weighted_score(questionnaire_symbol, assignment, scores)
-    end
-
-    def compute_weighted_score(symbol, assignment, scores)
-      # aq = assignment_questionnaires.find_by(assignment_id: assignment.id)
-      aq = AssignmentQuestionnaire.find_by(assignment_id: assignment.id)
-
-      if scores[symbol][:scores][:avg].nil?
-        0
-      else
-        scores[symbol][:scores][:avg] * aq.questionnaire_weight / 100.0
+  def as_json(options = {})
+      super(options.merge({
+                            only: %i[id name private min_question_score max_question_score created_at updated_at questionnaire_type instructor_id],
+                            include: {
+                              instructor: { only: %i[name email fullname password role]
+                            }
+                            }
+                          })).tap do |hash|
+        hash['instructor'] ||= { id: nil, name: nil }
       end
-    end
-
-    # Does this questionnaire contain true/false questions?
-    def true_false_questions?
-      questions.each { |question| return true if question.type == 'Checkbox' }
-      false
-    end
-
-    def delete
-      assignments.each do |assignment|
-        raise "The assignment #{assignment.name} uses this questionnaire.
-              Do you want to <A href='../assignment/delete/#{assignment.id}'>delete</A> the assignment?"
-      end
-
-      questions.each(&:delete)
-
-      node = QuestionnaireNode.find_by(node_object_id: id)
-      node.destroy if node
-
-      destroy
-    end
-
-    def max_possible_score
-      results = Questionnaire.joins('INNER JOIN questions ON questions.questionnaire_id = questionnaires.id')
-                            .select('SUM(questions.weight) * questionnaires.max_question_score as max_score')
-                            .where('questionnaires.id = ?', id)
-      results[0].max_score
-    end
-
-    # clones the contents of a questionnaire, including the questions and associated advice
-    def self.copy_questionnaire_details(params, instructor_id)
-      orig_questionnaire = Questionnaire.find(params[:id])
-      questions = Question.where(questionnaire_id: params[:id])
-      questionnaire = orig_questionnaire.dup
-      questionnaire.instructor_id = instructor_id
-      questionnaire.name = 'Copy of ' + orig_questionnaire.name
-      questionnaire.created_at = Time.zone.now
-      questionnaire.save!
-      questions.each do |question|
-        new_question = question.dup
-        new_question.questionnaire_id = questionnaire.id
-        new_question.size = '50,3' if (new_question.is_a?(Criterion) || new_question.is_a?(TextResponse)) && new_question.size.nil?
-        new_question.save!
-        advices = QuestionAdvice.where(question_id: question.id)
-        next if advices.empty?
-
-        advices.each do |advice|
-          new_advice = advice.dup
-          new_advice.question_id = new_question.id
-          new_advice.save!
-        end
-      end
-      questionnaire
-    end
-
-  end
\ No newline at end of file
+  end
+end
\ No newline at end of file
diff --git a/app/models/quiz_item.rb b/app/models/quiz_item.rb
index ed0a8b799..8367ca20e 100644
--- a/app/models/quiz_item.rb
+++ b/app/models/quiz_item.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class QuizItem < Item
diff --git a/app/models/quiz_question_choice.rb b/app/models/quiz_question_choice.rb
index 6101d26ca..abfbdd47d 100644
--- a/app/models/quiz_question_choice.rb
+++ b/app/models/quiz_question_choice.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class QuizQuestionChoice < ApplicationRecord
     belongs_to :item, dependent: :destroy
   end
\ No newline at end of file
diff --git a/app/models/quiz_questionnaire.rb b/app/models/quiz_questionnaire.rb
index 6dd82b603..5f8a606c3 100644
--- a/app/models/quiz_questionnaire.rb
+++ b/app/models/quiz_questionnaire.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class QuizQuestionnaire < Questionnaire
     attr_accessor :questionnaire
     after_initialize :post_initialization
diff --git a/app/models/quiz_response_map.rb b/app/models/quiz_response_map.rb
index 398681297..e53873022 100644
--- a/app/models/quiz_response_map.rb
+++ b/app/models/quiz_response_map.rb
@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 class QuizResponseMap < ResponseMap
+  include ResponseMapSubclassTitles
   belongs_to :quiz_questionnaire, foreign_key: 'reviewed_object_id', inverse_of: false
   belongs_to :assignment, inverse_of: false
   has_many :quiz_responses, foreign_key: :map_id, dependent: :destroy, inverse_of: false
diff --git a/app/models/response.rb b/app/models/response.rb
index 23d34c1d3..a1ef244ee 100644
--- a/app/models/response.rb
+++ b/app/models/response.rb
@@ -1,78 +1,79 @@
-# frozen_string_literal: true
-
-class Response < ApplicationRecord
-  include ScorableHelper
-  include MetricHelper
-
-  belongs_to :response_map, class_name: 'ResponseMap', foreign_key: 'map_id', inverse_of: false
-  has_many :scores, class_name: 'Answer', foreign_key: 'response_id', dependent: :destroy, inverse_of: false
-
-  alias map response_map
-  delegate :response_assignment, :reviewee, :reviewer, to: :map
-
-  # return the questionnaire that belongs to the response
-  def questionnaire
-    response_assignment.assignment_questionnaires.find_by(used_in_round: self.round).questionnaire
-  end
-
-  def reportable_difference?
-    map_class = map.class
-    # gets all responses made by a reviewee
-    existing_responses = map_class.assessments_for(map.reviewee)
-
-    count = 0
-    total = 0
-    # gets the sum total percentage scores of all responses that are not this response
-    existing_responses.each do |response|
-      unless id == response.id # the current_response is also in existing_responses array
-        count += 1
-        total +=  response.aggregate_questionnaire_score.to_f / response.maximum_score
-      end
-    end
-
-    # if this response is the only response by the reviewee, there's no grade conflict
-    return false if count.zero?
-
-    # calculates the average score of all other responses
-    average_score = total / count
-
-    # This score has already skipped the unfilled scorable item(s)
-    score = aggregate_questionnaire_score.to_f / maximum_score
-    questionnaire = questionnaire_by_answer(scores.first)
-    assignment = map.assignment
-    assignment_questionnaire = AssignmentQuestionnaire.find_by(assignment_id: assignment.id, questionnaire_id: questionnaire.id)
-
-    # notification_limit can be specified on 'Rubrics' tab on assignment edit page.
-    allowed_difference_percentage = assignment_questionnaire.notification_limit.to_f
-
-    # the range of average_score_on_same_artifact_from_others and score is [0,1]
-    # the range of allowed_difference_percentage is [0, 100]
-    (average_score - score).abs * 100 > allowed_difference_percentage
-  end
-
-  def aggregate_questionnaire_score
-    # only count the scorable items, only when the answer is not nil
-    # we accept nil as answer for scorable items, and they will not be counted towards the total score
-    sum = 0
-    scores.each do |s|
-      item = Item.find(s.item_id)
-      # For quiz responses, the weights will be 1 or 0, depending on if correct
-      sum += s.answer * item.weight unless s.answer.nil?  #|| !item.scorable?
-    end
-    # puts "sum: #{sum}"
-    sum
-  end
-
-  # Returns the maximum possible score for this response
-  def maximum_score
-    # only count the scorable questions, only when the answer is not nil (we accept nil as
-    # answer for scorable questions, and they will not be counted towards the total score)
-    total_weight = 0
-    scores.each do |s|
-      item = Item.find(s.item_id)
-      total_weight += item.weight unless s.answer.nil? #|| !item.is_a(ScoredItem)?
-    end
-    # puts "total: #{total_weight * questionnaire.max_question_score} "
-    total_weight * questionnaire.max_question_score
-  end
+# frozen_string_literal: true
+
+class Response < ApplicationRecord
+  include ScorableHelper
+  include MetricHelper
+
+  belongs_to :response_map, class_name: 'ResponseMap', foreign_key: 'map_id', inverse_of: false
+  has_many :scores, class_name: 'Answer', foreign_key: 'response_id', dependent: :destroy, inverse_of: false
+
+  alias map response_map
+  delegate :response_assignment, :reviewee, :reviewer, to: :map
+
+  # return the questionnaire that belongs to the response
+  def questionnaire
+    response_assignment.assignment_questionnaires.find_by(used_in_round: self.round).questionnaire
+  end
+
+  def reportable_difference?
+    map_class = map.class
+    # gets all responses made by a reviewee
+    existing_responses = map_class.assessments_for(map.reviewee)
+
+    count = 0
+    total = 0
+    # gets the sum total percentage scores of all responses that are not this response
+    existing_responses.each do |response|
+      unless id == response.id # the current_response is also in existing_responses array
+        count += 1
+        total +=  response.aggregate_questionnaire_score.to_f / response.maximum_score
+      end
+    end
+
+    # if this response is the only response by the reviewee, there's no grade conflict
+    return false if count.zero?
+
+    # calculates the average score of all other responses
+    average_score = total / count
+
+    # This score has already skipped the unfilled scorable item(s)
+    score = aggregate_questionnaire_score.to_f / maximum_score
+    questionnaire = questionnaire_by_answer(scores.first)
+    assignment = map.assignment
+    assignment_questionnaire = AssignmentQuestionnaire.find_by(assignment_id: assignment.id, questionnaire_id: questionnaire.id)
+
+    # notification_limit can be specified on 'Rubrics' tab on assignment edit page.
+    allowed_difference_percentage = assignment_questionnaire.notification_limit.to_f
+
+    # the range of average_score_on_same_artifact_from_others and score is [0,1]
+    # the range of allowed_difference_percentage is [0, 100]
+    (average_score - score).abs * 100 > allowed_difference_percentage
+  end
+
+  def aggregate_questionnaire_score
+    # only count the scorable items, only when the answer is not nil
+    # we accept nil as answer for scorable items, and they will not be counted towards the total score
+    sum = 0
+    scores.each do |s|
+      item = Item.find(s.item_id)
+      # For quiz responses, the weights will be 1 or 0, depending on if correct
+      sum += s.answer * item.weight unless s.answer.nil?  #|| !item.scorable?
+    end
+    # puts "sum: #{sum}"
+    # puts "sum: #{sum}"
+    sum
+  end
+
+  # Returns the maximum possible score for this response
+  def maximum_score
+    # only count the scorable questions, only when the answer is not nil (we accept nil as
+    # answer for scorable questions, and they will not be counted towards the total score)
+    total_weight = 0
+    scores.each do |s|
+      item = Item.find(s.item_id)
+      total_weight += item.weight unless s.answer.nil? #|| !item.is_a(ScoredItem)?
+    end
+    # puts "total: #{total_weight * questionnaire.max_question_score} "
+    total_weight * questionnaire.max_question_score
+  end
 end
\ No newline at end of file
diff --git a/app/models/response_map.rb b/app/models/response_map.rb
index 7b525bb77..d891da390 100644
--- a/app/models/response_map.rb
+++ b/app/models/response_map.rb
@@ -1,80 +1,112 @@
-class ResponseMap < ApplicationRecord
-  include ResponseMapSubclassTitles
-
-  has_many :responses, foreign_key: 'map_id', dependent: :destroy, inverse_of: false
-  belongs_to :reviewer, class_name: 'Participant', foreign_key: 'reviewer_id', inverse_of: false
-  belongs_to :reviewee, class_name: 'Participant', foreign_key: 'reviewee_id', inverse_of: false
-  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'reviewed_object_id', inverse_of: false
-
-  alias map_id id
-
-  def questionnaire
-    Questionnaire.find_by(id: reviewed_object_id)
-  end
-
-  # returns the assignment related to the response map
-  def response_assignment
-    return Participant.find(self.reviewer_id).assignment
-  end
-
-  def self.assessments_for(team)
-    responses = []
-    # stime = Time.now
-    if team
-      array_sort = []
-      sort_to = []
-      maps = where(reviewee_id: team.id)
-      maps.each do |map|
-        next if map.response.empty?
-
-        all_resp = Response.where(map_id: map.map_id).last
-        if map.type.eql?('ReviewResponseMap')
-          # If its ReviewResponseMap then only consider those response which are submitted.
-          array_sort << all_resp if all_resp.is_submitted
-        else
-          array_sort << all_resp
-        end
-        # sort all versions in descending order and get the latest one.
-        sort_to = array_sort.sort # { |m1, m2| (m1.updated_at and m2.updated_at) ? m2.updated_at <=> m1.updated_at : (m1.version_num ? -1 : 1) }
-        responses << sort_to[0] unless sort_to[0].nil?
-        array_sort.clear
-        sort_to.clear
-      end
-      responses = responses.sort { |a, b| a.map.reviewer.fullname <=> b.map.reviewer.fullname }
-    end
-    responses
-  end
-
-  # Check to see if this response map is a survey. Default is false, and some subclasses will overwrite to true.
-  def survey?
-    false
-  end
-
-  # Computes the average score (as a fraction between 0 and 1) across the latest submitted responses
-  # from each round for this ReviewResponseMap.
-  def review_grade 
-    # Return 0 if there are no responses for this map
-    return 0 if responses.empty?
-
-    # Group all responses by round, then select the latest one per round based on the most recent created one (i.e., most recent revision in that round)
-    latest_responses_by_round = responses
-      .group_by(&:round)
-      .transform_values { |resps| resps.max_by(&:created_at) } 
-
-    response_score = 0.0  # Sum of actual scores obtained
-    total_score = 0.0     # Sum of maximum possible scores
-
-    # Iterate through the latest responses from each round
-    latest_responses_by_round.each_value do |response|
-      # Only consider responses that were submitted
-      next unless response.is_submitted
-
-      # Accumulate the obtained and maximum scores
-      response_score += response.aggregate_questionnaire_score
-      total_score += response.maximum_score
-    end
-
-    # Return the normalized score (as a float), or 0 if no valid total score
-    total_score > 0 ? (response_score.to_f / total_score) : 0
-  end
+# frozen_string_literal: true
+
+class ResponseMap < ApplicationRecord
+  include ResponseMapSubclassTitles
+
+  has_many :responses, foreign_key: 'map_id', dependent: :destroy, inverse_of: false
+  belongs_to :reviewer, class_name: 'Participant', foreign_key: 'reviewer_id', inverse_of: false
+  belongs_to :reviewee, class_name: 'Participant', foreign_key: 'reviewee_id', inverse_of: false
+  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'reviewed_object_id', inverse_of: false
+
+  alias map_id id
+
+  def questionnaire
+    Questionnaire.find_by(id: reviewed_object_id)
+  end
+
+  # returns the assignment related to the response map
+  def response_assignment
+    # reviewer will always be the Assignment Participant so finding Assignment based on reviewer_id.
+    return reviewer.assignment
+  end
+
+  def self.assessments_for(team)
+    responses = []
+    # stime = Time.now
+    if team
+      array_sort = []
+      sort_to = []
+      maps = where(reviewee_id: team.id)
+      maps.each do |map|
+        next if map.response.empty?
+
+        all_resp = Response.where(map_id: map.map_id).last
+        if map.type.eql?('ReviewResponseMap')
+          # If its ReviewResponseMap then only consider those response which are submitted.
+          array_sort << all_resp if all_resp.is_submitted
+        else
+          array_sort << all_resp
+        end
+        # sort all versions in descending order and get the latest one.
+        sort_to = array_sort.sort # { |m1, m2| (m1.updated_at and m2.updated_at) ? m2.updated_at <=> m1.updated_at : (m1.version_num ? -1 : 1) }
+        responses << sort_to[0] unless sort_to[0].nil?
+        array_sort.clear
+        sort_to.clear
+      end
+      responses = responses.sort { |a, b| a.map.reviewer.fullname <=> b.map.reviewer.fullname }
+    end
+    responses
+  end
+
+  # Computes the average score (as a fraction between 0 and 1) across the latest submitted responses
+  # from each round for this ReviewResponseMap.
+  def aggregate_reviewers_score
+    # Return nil if there are no responses for this map
+    return nil if responses.empty?
+
+    # Group all responses by round, then select the latest one per round based on the most recent created one (i.e., most recent revision in that round)
+    latest_responses_by_round = responses
+      .group_by(&:round)
+      .transform_values { |resps| resps.max_by(&:updated_at) } 
+
+    response_score = 0.0  # Sum of actual scores obtained
+    total_score = 0.0     # Sum of maximum possible scores
+    submitted_found = false  #flag to track if any submitted response exists
+
+    # For each latest response in each round, if the response was submitted, sum up its earned score and its maximum possible score.
+    latest_responses_by_round.each_value do |response|
+      # Only consider responses that were submitted
+      next unless response.is_submitted
+      
+      submitted_found = true  # true if a submitted response is found
+      
+      # Accumulate the obtained and maximum scores
+      response_score += response.aggregate_questionnaire_score
+      total_score += response.maximum_score
+    end
+
+    # If no submitted responses at all, return nil
+    return nil unless submitted_found
+
+    # Return the normalized score (as a float), or 0 if no valid total score
+    total_score > 0 ? (response_score.to_f / total_score) : 0
+  end
+
+  # Computes the average score (as a fraction between 0 and 1) across the latest submitted responses
+  # from each round for this ReviewResponseMap.
+  def review_grade 
+    # Return 0 if there are no responses for this map
+    return 0 if responses.empty?
+
+    # Group all responses by round, then select the latest one per round based on the most recent created one (i.e., most recent revision in that round)
+    latest_responses_by_round = responses
+      .group_by(&:round)
+      .transform_values { |resps| resps.max_by(&:created_at) } 
+
+    response_score = 0.0  # Sum of actual scores obtained
+    total_score = 0.0     # Sum of maximum possible scores
+
+    # Iterate through the latest responses from each round
+    latest_responses_by_round.each_value do |response|
+      # Only consider responses that were submitted
+      next unless response.is_submitted
+
+      # Accumulate the obtained and maximum scores
+      response_score += response.aggregate_questionnaire_score
+      total_score += response.maximum_score
+    end
+
+    # Return the normalized score (as a float), or 0 if no valid total score
+    total_score > 0 ? (response_score.to_f / total_score) : 0
+  end
 end
\ No newline at end of file
diff --git a/app/models/review_response_map.rb b/app/models/review_response_map.rb
index dc0736ec5..835798a48 100644
--- a/app/models/review_response_map.rb
+++ b/app/models/review_response_map.rb
@@ -1,44 +1,45 @@
-# frozen_string_literal: true
-class ReviewResponseMap < ResponseMap
-  belongs_to :reviewee, class_name: 'Team', foreign_key: 'reviewee_id', inverse_of: false
-  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'parent_id'
-  has_many :review_mappings, class_name: 'ReviewResponseMap', foreign_key: 'reviewee_id'
-  has_many :review_response_maps, foreign_key: 'reviewee_id'
-  has_many :responses, through: :review_response_maps, foreign_key: 'map_id' 
-
-  # returns the assignment related to the response map
-  def response_assignment
-    return assignment
-  end
-
-  def questionnaire_type
-    'Review'
-  end
-
-  def get_title
-    REVIEW_RESPONSE_MAP_TITLE
-  end
-
-  # Get the review response map
-  def review_map_type
-    'ReviewResponseMap'
-  end
-
-  # Computes the average review grade for an assignment team.
-  # This method aggregates scores from all ReviewResponseMaps (i.e., all reviewers of the team).
-  def aggregate_review_grade 
-    obtained_score = 0
-
-    # Total number of reviewers for this team
-    total_reviewers = review_mappings.size
-
-    # Loop through each ReviewResponseMap (i.e., each reviewer)
-    review_mappings.each do |map|
-      # Add the review grade (normalized score between 0 and 1) to the total
-      obtained_score += map.review_grade
-    end
-
-    # Compute the average score across reviewers and convert it to a percentage
-    ((obtained_score / total_reviewers) * 100).round(2)
-  end
-end
+# frozen_string_literal: true
+class ReviewResponseMap < ResponseMap
+  include ResponseMapSubclassTitles
+  belongs_to :reviewee, class_name: 'Team', foreign_key: 'reviewee_id', inverse_of: false
+  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'parent_id'
+  has_many :review_mappings, class_name: 'ReviewResponseMap', foreign_key: 'reviewee_id'
+  has_many :review_response_maps, foreign_key: 'reviewee_id'
+  has_many :responses, through: :review_response_maps, foreign_key: 'map_id' 
+
+  # returns the assignment related to the response map
+  def response_assignment
+    return assignment
+  end
+
+  def questionnaire_type
+    'Review'
+  end
+
+  def get_title
+    REVIEW_RESPONSE_MAP_TITLE
+  end
+
+  # Get the review response map
+  def review_map_type
+    'ReviewResponseMap'
+  end
+
+  # Computes the average review grade for an assignment team.
+  # This method aggregates scores from all ReviewResponseMaps (i.e., all reviewers of the team).
+  def aggregate_review_grade 
+    obtained_score = 0
+
+    # Total number of reviewers for this team
+    total_reviewers = review_mappings.size
+
+    # Loop through each ReviewResponseMap (i.e., each reviewer)
+    review_mappings.each do |map|
+      # Add the review grade (normalized score between 0 and 1) to the total
+      obtained_score += map.review_grade
+    end
+
+    # Compute the average score across reviewers and convert it to a percentage
+    ((obtained_score / total_reviewers) * 100).round(2)
+  end
+end
diff --git a/app/models/role.rb b/app/models/role.rb
index eb1c03959..3cce77975 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Role < ApplicationRecord
   validates :name, presence: true, uniqueness: true, allow_blank: false
   belongs_to :parent, class_name: 'Role', optional: true
diff --git a/app/models/scale.rb b/app/models/scale.rb
index f92de1866..2517f7cf7 100644
--- a/app/models/scale.rb
+++ b/app/models/scale.rb
@@ -1,38 +1,40 @@
-class Scale < ScoredItem
-    include QuestionHelper
-  
-    attr_accessor :txt, :type, :weight, :min_label, :max_label, :answer, :min_question_score, :max_question_score
-  
-    def edit
-      edit_common('Item:', min_question_score, max_question_score , txt, weight, type).to_json
-    end
-  
-    def view_item_text
-      view_item_text_common(txt, type, weight, score_range).to_json
-    end
-  
-    def complete
-      options = (@min_question_score..@max_question_score).map do |option|
-        { value: option, selected: (option == answer) }
-      end
-      { scale_options: options }.to_json
-    end
-  
-    def view_completed_item(options = {})
-      if options[:count] && options[:answer] && options[:questionnaire_max]
-        { count: options[:count], answer: options[:answer], questionnaire_max: options[:questionnaire_max] }.to_json
-      else
-        { message: 'Item not answered.' }.to_json
-      end
-    end
-
-    def max_score
-      questionnaire.max_question_score * weight
-    end
-  
-    private
-  
-    def score_range
-      @min_question_score..@max_question_score
-    end
+# frozen_string_literal: true
+
+class Scale < ScoredItem
+    include QuestionHelper
+  
+    attr_accessor :txt, :type, :weight, :min_label, :max_label, :answer, :min_question_score, :max_question_score
+  
+    def edit
+      edit_common('Item:', min_question_score, max_question_score , txt, weight, type).to_json
+    end
+  
+    def view_item_text
+      view_item_text_common(txt, type, weight, score_range).to_json
+    end
+  
+    def complete
+      options = (@min_question_score..@max_question_score).map do |option|
+        { value: option, selected: (option == answer) }
+      end
+      { scale_options: options }.to_json
+    end
+  
+    def view_completed_item(options = {})
+      if options[:count] && options[:answer] && options[:questionnaire_max]
+        { count: options[:count], answer: options[:answer], questionnaire_max: options[:questionnaire_max] }.to_json
+      else
+        { message: 'Item not answered.' }.to_json
+      end
+    end
+
+    def max_score
+      questionnaire.max_question_score * weight
+    end
+  
+    private
+  
+    def score_range
+      @min_question_score..@max_question_score
+    end
   end
\ No newline at end of file
diff --git a/app/models/score_view.rb b/app/models/score_view.rb
index bcb4dde5d..1544b35e2 100644
--- a/app/models/score_view.rb
+++ b/app/models/score_view.rb
@@ -1,13 +1,26 @@
-class ScoreView < ApplicationRecord
-    # setting this to false so that factories can be created
-    # to test the grading of weighted quiz questionnaires
-    def readonly?
-      false
-    end
-  
-    def self.questionnaire_data(questionnaire_id, response_id)
-      questionnaire_data = ScoreView.find_by_sql ["SELECT q1_max_question_score ,SUM(question_weight) as sum_of_weights,SUM(question_weight * s_score) as weighted_score FROM score_views WHERE type in('Criterion', 'Scale') AND q1_id = ? AND s_response_id = ?  GROUP BY q1_max_question_score", questionnaire_id, response_id]
-      questionnaire_data[0]
-    end
-  end
+class ScoreView < ApplicationRecord
+    # setting this to false so that factories can be created
+    # to test the grading of weighted quiz questionnaires
+    def readonly?
+      false
+    end
+  
+    def self.questionnaire_data(questionnaire_id, response_id)
+      questionnaire_data = ScoreView.find_by_sql ["SELECT q1_max_question_score ,SUM(question_weight) as sum_of_weights,SUM(question_weight * s_score) as weighted_score FROM score_views WHERE type in('Criterion', 'Scale') AND q1_id = ? AND s_response_id = ?  GROUP BY q1_max_question_score", questionnaire_id, response_id]
+      questionnaire_data[0]
+    end
+  end
+  
+class ScoreView < ApplicationRecord
+    # setting this to false so that factories can be created
+    # to test the grading of weighted quiz questionnaires
+    def readonly?
+      false
+    end
+  
+    def self.questionnaire_data(questionnaire_id, response_id)
+      questionnaire_data = ScoreView.find_by_sql ["SELECT q1_max_question_score ,SUM(question_weight) as sum_of_weights,SUM(question_weight * s_score) as weighted_score FROM score_views WHERE type in('Criterion', 'Scale') AND q1_id = ? AND s_response_id = ?  GROUP BY q1_max_question_score", questionnaire_id, response_id]
+      questionnaire_data[0]
+    end
+  end
   
\ No newline at end of file
diff --git a/app/models/scored_item.rb b/app/models/scored_item.rb
index 42d2125b6..1bc752513 100644
--- a/app/models/scored_item.rb
+++ b/app/models/scored_item.rb
@@ -1,15 +1,24 @@
-# frozen_string_literal: true
-
-class ScoredItem < ChoiceItem
-  validates :weight, presence: true # user must specify a weight for a question
-  validates :weight, numericality: true # the weight must be numeric
-  
-  def scorable?
-      true
-  end
-
-  def self.compute_item_score(response_id)
-    answer = Answer.find_by(item_id: id, response_id: response_id)
-    weight * answer.answer
-  end
-end
+# frozen_string_literal: true
+
+class ScoredItem < ChoiceItem
+  validates :weight, presence: true # user must specify a weight for a question
+  validates :weight, numericality: true # the weight must be numeric
+  
+  validates :weight, presence: true # user must specify a weight for a question
+  validates :weight, numericality: true # the weight must be numeric
+  
+  def scorable?
+      true
+  end
+
+  def self.compute_item_score(response_id)
+    answer = Answer.find_by(item_id: id, response_id: response_id)
+    weight * answer.answer
+  end
+  end
+
+  def self.compute_item_score(response_id)
+    answer = Answer.find_by(item_id: id, response_id: response_id)
+    weight * answer.answer
+  end
+end
diff --git a/app/models/sign_up_topic.rb b/app/models/sign_up_topic.rb
index 83546b5f1..1d89b687b 100644
--- a/app/models/sign_up_topic.rb
+++ b/app/models/sign_up_topic.rb
@@ -1,7 +1,9 @@
-class SignUpTopic < ApplicationRecord
-  has_many :signed_up_teams, foreign_key: 'topic_id', dependent: :destroy
-  has_many :teams, through: :signed_up_teams # list all teams choose this topic, no matter in waitlist or not
-  has_many :assignment_questionnaires, class_name: 'AssignmentQuestionnaire', foreign_key: 'topic_id', dependent: :destroy
-  has_many :due_dates, as: :parent,class_name: 'DueDate', dependent: :destroy
-  belongs_to :assignment
-end
+# frozen_string_literal: true
+
+class SignUpTopic < ApplicationRecord
+  has_many :signed_up_teams, foreign_key: 'topic_id', dependent: :destroy
+  has_many :teams, through: :signed_up_teams # list all teams choose this topic, no matter in waitlist or not
+  has_many :assignment_questionnaires, class_name: 'AssignmentQuestionnaire', foreign_key: 'topic_id', dependent: :destroy
+  has_many :due_dates, as: :parent,class_name: 'DueDate', dependent: :destroy
+  belongs_to :assignment
+end
diff --git a/app/models/student_task.rb b/app/models/student_task.rb
index a69316f22..c5bb9332b 100644
--- a/app/models/student_task.rb
+++ b/app/models/student_task.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class StudentTask
     attr_accessor :assignment, :current_stage, :participant, :stage_deadline, :topic, :permission_granted
 
diff --git a/app/models/super_administrator.rb b/app/models/super_administrator.rb
index fd9c1ba2c..0d0e96560 100644
--- a/app/models/super_administrator.rb
+++ b/app/models/super_administrator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SuperAdministrator < User
   def managed_users
     User.all.to_a
diff --git a/app/models/survey_response_map.rb b/app/models/survey_response_map.rb
index 68505d33f..d7a23ecf2 100644
--- a/app/models/survey_response_map.rb
+++ b/app/models/survey_response_map.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Intermediary model in the ResponseMap hierarchy. Has subclasses of:
 #   AssignmentSurveyResponseMap
 #   CourseSurveyResponseMap
diff --git a/app/models/ta.rb b/app/models/ta.rb
index cda7181a2..534a9dcf4 100644
--- a/app/models/ta.rb
+++ b/app/models/ta.rb
@@ -1,17 +1,25 @@
-class Ta < User
-  
-  # Get all users whose parent is the TA
-  # @return [Array<User>] all users that belongs to courses that is mapped to the TA
-  def managed_users
-    User.where(parent_id: id).to_a
-  end
-
-  def my_instructor
-    # code here
-  end
-
-  def courses_assisted_with
-    courses = TaMapping.where(ta_id: id)
-    courses.map { |c| Course.find(c.course_id) }
-  end
+# frozen_string_literal: true
+
+class Ta < User
+  
+  
+  # Get all users whose parent is the TA
+  # @return [Array<User>] all users that belongs to courses that is mapped to the TA
+  def managed_users
+    User.where(parent_id: id).to_a
+  end
+
+  def my_instructor
+    # code here
+  end
+
+  def courses_assisted_with
+    courses = TaMapping.where(ta_id: id)
+    courses.map { |c| Course.find(c.course_id) }
+  end
+
+  def courses_assisted_with
+    courses = TaMapping.where(ta_id: id)
+    courses.map { |c| Course.find(c.course_id) }
+  end
 end
\ No newline at end of file
diff --git a/app/models/ta_mapping.rb b/app/models/ta_mapping.rb
index fc9ea2d1d..d267f7404 100644
--- a/app/models/ta_mapping.rb
+++ b/app/models/ta_mapping.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TaMapping < ApplicationRecord
   belongs_to :course
   belongs_to :ta, class_name: 'User', foreign_key: 'user_id'
diff --git a/app/models/team.rb b/app/models/team.rb
index bcabdc6c6..120a16d2d 100644
--- a/app/models/team.rb
+++ b/app/models/team.rb
@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 class Team < ApplicationRecord
 
   # Core associations
   has_many :signed_up_teams, dependent: :destroy
-  has_many :teams_users, dependent: :destroy  
+  has_many :teams_users, dependent: :destroy
   has_many :teams_participants, dependent: :destroy
   has_many :users, through: :teams_participants
   has_many :participants, through: :teams_participants
+  has_many :join_team_requests, dependent: :destroy
 
   # The team is either an AssignmentTeam or a CourseTeam
   belongs_to :assignment, class_name: 'Assignment', foreign_key: 'parent_id', optional: true
   belongs_to :course, class_name: 'Course', foreign_key: 'parent_id', optional: true
   belongs_to :user, optional: true # Team creator
-  
+
   attr_accessor :max_participants
   validates :parent_id, presence: true
   validates :type, presence: true, inclusion: { in: %w[AssignmentTeam CourseTeam MentoredTeam], message: "must be 'Assignment' or 'Course' or 'Mentor'" }
@@ -20,6 +23,22 @@ def has_member?(user)
     participants.exists?(user_id: user.id)
   end
   
+  # Returns the current number of team members
+  def team_size
+    users.count
+  end
+  
+  # Returns the maximum allowed team size
+  def max_size
+    if is_a?(AssignmentTeam) && assignment&.max_team_size
+      assignment.max_team_size
+    elsif is_a?(CourseTeam) && course&.max_team_size
+      course.max_team_size
+    else
+      nil
+    end
+  end
+  
   def full?
     current_size = participants.count
 
diff --git a/app/models/teammate_review_response_map.rb b/app/models/teammate_review_response_map.rb
index 16dbbf801..849f562d5 100644
--- a/app/models/teammate_review_response_map.rb
+++ b/app/models/teammate_review_response_map.rb
@@ -1,29 +1,30 @@
-class TeammateReviewResponseMap < ResponseMap
-  belongs_to :reviewee, class_name: 'Participant', foreign_key: 'reviewee_id', inverse_of: false
-  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'reviewed_object_id'
-
-  def questionnaire_type
-      'TeammateReview'
-  end
-
-  def questionnaire
-    assignment.questionnaires.find_by(type: 'TeammateReviewQuestionnaire')
-  end
-
-  def questionnaire_by_duty(duty_id)
-    duty_questionnaire = assignment.questionnaires.find(assignment_id: assignment.assignment_id, duty_id: duty_id).first
-    if duty_questionnaire.nil?
-      questionnaire
-    else
-      duty_questionnaire
-    end
-  end
-
-  def get_reviewer
-    AssignmentParticipant.find(reviewer_id)
-  end
-
-  def self.teammate_response_report(id)
-    TeammateReviewResponseMap.select('DISTINCT reviewer_id').where('reviewed_object_id = ?', id)
-  end
+# frozen_string_literal: true
+class TeammateReviewResponseMap < ResponseMap
+  belongs_to :reviewee, class_name: 'Participant', foreign_key: 'reviewee_id', inverse_of: false
+  belongs_to :assignment, class_name: 'Assignment', foreign_key: 'reviewed_object_id'
+
+  def questionnaire_type
+      'TeammateReview'
+  end
+
+  def questionnaire
+    assignment.questionnaires.find_by(type: 'TeammateReviewQuestionnaire')
+  end
+
+  def questionnaire_by_duty(duty_id)
+    duty_questionnaire = assignment.questionnaires.find(assignment_id: assignment.assignment_id, duty_id: duty_id).first
+    if duty_questionnaire.nil?
+      questionnaire
+    else
+      duty_questionnaire
+    end
+  end
+
+  def get_reviewer
+    AssignmentParticipant.find(reviewer_id)
+  end
+
+  def self.teammate_response_report(id)
+    TeammateReviewResponseMap.select('DISTINCT reviewer_id').where('reviewed_object_id = ?', id)
+  end
 end
\ No newline at end of file
diff --git a/app/models/teams_participant.rb b/app/models/teams_participant.rb
index 700d1c7a1..701d4eb50 100644
--- a/app/models/teams_participant.rb
+++ b/app/models/teams_participant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TeamsParticipant < ApplicationRecord
   belongs_to :participant
   belongs_to :team
diff --git a/app/models/teams_user.rb b/app/models/teams_user.rb
index 9e1768b94..8afd23cce 100644
--- a/app/models/teams_user.rb
+++ b/app/models/teams_user.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TeamsUser < ApplicationRecord
   belongs_to :user
   belongs_to :team
diff --git a/app/models/text_area.rb b/app/models/text_area.rb
index a734e993b..ca80454b3 100644
--- a/app/models/text_area.rb
+++ b/app/models/text_area.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TextArea < Item
     def complete(count,answer = nil)
       {
diff --git a/app/models/text_field.rb b/app/models/text_field.rb
index ab7888a1d..a0f470804 100644
--- a/app/models/text_field.rb
+++ b/app/models/text_field.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TextField < Item
     validates :size, presence: true
   
diff --git a/app/models/text_response.rb b/app/models/text_response.rb
index 1f61490b0..d469b6294 100644
--- a/app/models/text_response.rb
+++ b/app/models/text_response.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TextResponse < Item
     validates :size, presence: true
   
diff --git a/app/models/topic_due_date.rb b/app/models/topic_due_date.rb
index aa68bfebf..739e0ad0d 100644
--- a/app/models/topic_due_date.rb
+++ b/app/models/topic_due_date.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TopicDueDate < DueDate
   # overwrite super method with additional logic to check for topic first
   def self.next_due_date(assignment_id, topic_id)
diff --git a/app/models/unscored_item.rb b/app/models/unscored_item.rb
index 6af1360bb..9581e0af0 100644
--- a/app/models/unscored_item.rb
+++ b/app/models/unscored_item.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UnscoredItem < ChoiceItem
     def edit; end
   
diff --git a/app/models/user.rb b/app/models/user.rb
index 4c10c4bc4..0e77e25dc 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,154 +1,156 @@
-class User < ApplicationRecord
-  has_secure_password
-  after_initialize :set_defaults
-
-  # name must be lowercase and unique
-  validates :name, presence: true, uniqueness: true, allow_blank: false
-                   # format: { with: /\A[a-z]+\z/, message: 'must be in lowercase' }
-  validates :email, presence: true, format: { with: URI::MailTo::EMAIL_REGEXP }
-  validates :password, length: { minimum: 6 }, presence: true, allow_nil: true
-  validates :full_name, presence: true, length: { maximum: 50 }
-
-  belongs_to :role
-  belongs_to :institution, optional: true
-  belongs_to :parent, class_name: 'User', optional: true
-  has_many :users, foreign_key: 'parent_id', dependent: :nullify
-  has_many :invitations
-  has_many :assignments
-  has_many :teams_users, dependent: :destroy
-  has_many :teams, through: :teams_users
-  has_many :participants
-
-  scope :students, -> { where role_id: Role::STUDENT }
-  scope :tas, -> { where role_id: Role::TEACHING_ASSISTANT }
-  scope :instructors, -> { where role_id: Role::INSTRUCTOR }
-  scope :administrators, -> { where role_id: Role::ADMINISTRATOR }
-  scope :superadministrators, -> { where role_id: Role::SUPER_ADMINISTRATOR }
-
-  delegate :student?, to: :role
-  delegate :ta?, to: :role
-  delegate :instructor?, to: :role
-  delegate :administrator?, to: :role
-  delegate :super_administrator?, to: :role
-
-  def self.instantiate(record)
-    case record.role
-    when Role::TEACHING_ASSISTANT
-      record.becomes(Ta)
-    when Role::INSTRUCTOR
-      record.becomes(Instructor)
-    when Role::ADMINISTRATOR
-      record.becomes(Administrator)
-    when Role::SUPER_ADMINISTRATOR
-      record.becomes(SuperAdministrator)
-    else
-      super
-    end
-  end
-
-  # Welcome email to be sent to the user after they sign up
-  def welcome_email; end
-
-  # Return a user object if the user is found in the database, the input can be either email or name
-  def self.login_user(login)
-    user = User.find_by(email: login)
-    if user.nil?
-      short_name = login.split('@').first
-      user_list = User.where(name: short_name)
-      user = user_list.first if user_list.one?
-    end
-    user
-  end
-
-  # Reset the password for the user
-  def reset_password
-    random_password = SecureRandom.alphanumeric(10)
-    user.password_digest = BCrypt::Password.create(random_password)
-    user.save
-  end
-
-  # Get instructor_id of the user, if the user is TA,
-  # return the id of the instructor else return the id of the user for superior roles
-  def instructor_id
-    case role
-    when Role::INSTRUCTOR, Role::ADMINISTRATOR, Role::SUPER_ADMINISTRATOR
-      id
-    when Role::TEACHING_ASSISTANT
-      my_instructor
-    else
-      raise NotImplementedError, "Unknown role: #{role.name}"
-    end
-  end
-
-  def can_impersonate?(user)
-    return true if role.super_admin?
-    return true if teaching_assistant_for?(user)
-    return true if recursively_parent_of(user)
-
-    false
-  end
-
-  def recursively_parent_of(user)
-    p = user.parent
-    return false if p.nil?
-    return true if p == self
-    return false if p.role.super_admin?
-
-    recursively_parent_of(p)
-  end
-
-  def teaching_assistant_for?(student)
-    return false unless teaching_assistant?
-    return false unless student.role.name == 'Student'
-
-    # We have to use the Ta object instead of User object
-    # because single table inheritance is not currently functioning
-    ta = Ta.find(id)
-    return true if ta.courses_assisted_with.any? do |c|
-      c.assignments.map(&:participants).flatten.map(&:user_id).include? student.id
-    end
-  end
-
-  def teaching_assistant?
-    true if role.ta?
-  end
-
-  def self.from_params(params)
-    user = params[:user_id] ? User.find(params[:user_id]) : User.find_by(name: params[:user][:name])
-    raise "User #{params[:user_id] || params[:user][:name]} not found" if user.nil?
-
-    user
-  end
-
-  # This will override the default as_json method in the ApplicationRecord class and specify
-  # that only the id, name, and email attributes should be included when a User object is serialized.
-  def as_json(options = {})
-    super(options.merge({
-                          only: %i[id name email full_name email_on_review email_on_submission
-                                   email_on_review_of_review],
-                          include:
-                          {
-                            role: { only: %i[id name] },
-                            parent: { only: %i[id name] },
-                            institution: { only: %i[id name] }
-                          }
-                        })).tap do |hash|
-      hash['parent'] ||= { id: nil, name: nil }
-      hash['institution'] ||= { id: nil, name: nil }
-    end
-  end
-
-  def set_defaults
-    self.is_new_user = true
-    self.copy_of_emails ||= false
-    self.email_on_review ||= false
-    self.email_on_submission ||= false
-    self.email_on_review_of_review ||= false
-    self.etc_icons_on_homepage ||= true
-  end
-
-  def generate_jwt
-    JWT.encode({ id: id, exp: 60.days.from_now.to_i }, Rails.application.credentials.secret_key_base)
-  end
-
-end
+# frozen_string_literal: true
+
+class User < ApplicationRecord
+  has_secure_password
+  after_initialize :set_defaults
+
+  # name must be lowercase and unique
+  validates :name, presence: true, uniqueness: true, allow_blank: false
+                   # format: { with: /\A[a-z]+\z/, message: 'must be in lowercase' }
+  validates :email, presence: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+  validates :password, length: { minimum: 6 }, presence: true, allow_nil: true
+  validates :full_name, presence: true, length: { maximum: 50 }
+
+  belongs_to :role
+  belongs_to :institution, optional: true
+  belongs_to :parent, class_name: 'User', optional: true
+  has_many :users, foreign_key: 'parent_id', dependent: :nullify
+  has_many :invitations
+  has_many :assignments
+  has_many :teams_users, dependent: :destroy
+  has_many :teams, through: :teams_users
+  has_many :participants
+
+  scope :students, -> { where role_id: Role::STUDENT }
+  scope :tas, -> { where role_id: Role::TEACHING_ASSISTANT }
+  scope :instructors, -> { where role_id: Role::INSTRUCTOR }
+  scope :administrators, -> { where role_id: Role::ADMINISTRATOR }
+  scope :superadministrators, -> { where role_id: Role::SUPER_ADMINISTRATOR }
+
+  delegate :student?, to: :role
+  delegate :ta?, to: :role
+  delegate :instructor?, to: :role
+  delegate :administrator?, to: :role
+  delegate :super_administrator?, to: :role
+
+  def self.instantiate(record)
+    case record.role
+    when Role::TEACHING_ASSISTANT
+      record.becomes(Ta)
+    when Role::INSTRUCTOR
+      record.becomes(Instructor)
+    when Role::ADMINISTRATOR
+      record.becomes(Administrator)
+    when Role::SUPER_ADMINISTRATOR
+      record.becomes(SuperAdministrator)
+    else
+      super
+    end
+  end
+
+  # Welcome email to be sent to the user after they sign up
+  def welcome_email; end
+
+  # Return a user object if the user is found in the database, the input can be either email or name
+  def self.login_user(login)
+    user = User.find_by(email: login)
+    if user.nil?
+      short_name = login.split('@').first
+      user_list = User.where(name: short_name)
+      user = user_list.first if user_list.one?
+    end
+    user
+  end
+
+  # Reset the password for the user
+  def reset_password
+    random_password = SecureRandom.alphanumeric(10)
+    user.password_digest = BCrypt::Password.create(random_password)
+    user.save
+  end
+
+  # Get instructor_id of the user, if the user is TA,
+  # return the id of the instructor else return the id of the user for superior roles
+  def instructor_id
+    case role
+    when Role::INSTRUCTOR, Role::ADMINISTRATOR, Role::SUPER_ADMINISTRATOR
+      id
+    when Role::TEACHING_ASSISTANT
+      my_instructor
+    else
+      raise NotImplementedError, "Unknown role: #{role.name}"
+    end
+  end
+
+  def can_impersonate?(user)
+    return true if role.super_admin?
+    return true if teaching_assistant_for?(user)
+    return true if recursively_parent_of(user)
+
+    false
+  end
+
+  def recursively_parent_of(user)
+    p = user.parent
+    return false if p.nil?
+    return true if p == self
+    return false if p.role.super_admin?
+
+    recursively_parent_of(p)
+  end
+
+  def teaching_assistant_for?(student)
+    return false unless teaching_assistant?
+    return false unless student.role.name == 'Student'
+
+    # We have to use the Ta object instead of User object
+    # because single table inheritance is not currently functioning
+    ta = Ta.find(id)
+    return true if ta.courses_assisted_with.any? do |c|
+      c.assignments.map(&:participants).flatten.map(&:user_id).include? student.id
+    end
+  end
+
+  def teaching_assistant?
+    true if role.ta?
+  end
+
+  def self.from_params(params)
+    user = params[:user_id] ? User.find(params[:user_id]) : User.find_by(name: params[:user][:name])
+    raise "User #{params[:user_id] || params[:user][:name]} not found" if user.nil?
+
+    user
+  end
+
+  # This will override the default as_json method in the ApplicationRecord class and specify
+  # that only the id, name, and email attributes should be included when a User object is serialized.
+  def as_json(options = {})
+    super(options.merge({
+                          only: %i[id name email full_name email_on_review email_on_submission
+                                   email_on_review_of_review],
+                          include:
+                          {
+                            role: { only: %i[id name] },
+                            parent: { only: %i[id name] },
+                            institution: { only: %i[id name] }
+                          }
+                        })).tap do |hash|
+      hash['parent'] ||= { id: nil, name: nil }
+      hash['institution'] ||= { id: nil, name: nil }
+    end
+  end
+
+  def set_defaults
+    self.is_new_user = true
+    self.copy_of_emails ||= false
+    self.email_on_review ||= false
+    self.email_on_submission ||= false
+    self.email_on_review_of_review ||= false
+    self.etc_icons_on_homepage ||= true
+  end
+
+  def generate_jwt
+    JWT.encode({ id: id, exp: 60.days.from_now.to_i }, Rails.application.credentials.secret_key_base)
+  end
+
+end
diff --git a/app/serializers/join_team_request_serializer.rb b/app/serializers/join_team_request_serializer.rb
new file mode 100644
index 000000000..f2586f55d
--- /dev/null
+++ b/app/serializers/join_team_request_serializer.rb
@@ -0,0 +1,26 @@
+class JoinTeamRequestSerializer < ActiveModel::Serializer
+  attributes :id, :comments, :reply_status, :created_at, :updated_at
+  
+  # Include participant information
+  attribute :participant do
+    {
+      id: object.participant.id,
+      user_id: object.participant.user_id,
+      user_name: object.participant.user.name,
+      user_email: object.participant.user.email,
+      handle: object.participant.handle
+    }
+  end
+  
+  # Include team information
+  attribute :team do
+    {
+      id: object.team.id,
+      name: object.team.name,
+      type: object.team.type,
+      team_size: object.team.participants.count,
+      max_size: object.team.is_a?(AssignmentTeam) ? object.team.assignment&.max_team_size : nil,
+      is_full: object.team.full?
+    }
+  end
+end
diff --git a/app/serializers/team_serializer.rb b/app/serializers/team_serializer.rb
index a416eb4bd..66e1c6f08 100644
--- a/app/serializers/team_serializer.rb
+++ b/app/serializers/team_serializer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TeamSerializer < ActiveModel::Serializer
   attributes :id, :name, :type, :team_size, :signed_up_team, :sign_up_topic
   has_many :members, serializer: ParticipantSerializer
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 16eea1e28..a1a7e28ee 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UserSerializer < ActiveModel::Serializer
   attributes :id, :username, :email, :fullName
 
diff --git a/app/validators/invitation_validator.rb b/app/validators/invitation_validator.rb
index 3cb6896ef..be0fdc24f 100644
--- a/app/validators/invitation_validator.rb
+++ b/app/validators/invitation_validator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # app/validators/invitation_validator.rb
 class InvitationValidator < ActiveModel::Validator
   ACCEPT_STATUS = 'A'.freeze
diff --git a/app/views/invitation_mailer/send_acceptance_email.html.erb b/app/views/invitation_mailer/send_acceptance_email.html.erb
new file mode 100644
index 000000000..b5948df71
--- /dev/null
+++ b/app/views/invitation_mailer/send_acceptance_email.html.erb
@@ -0,0 +1,52 @@
+<html>
+<head>
+  <title>Invitation Accepted</title>
+  <style>
+    body { font-family: Arial, sans-serif; color: #333; }
+    .container { max-width: 600px; margin: 0 auto; padding: 20px; border: 1px solid #ddd; border-radius: 5px; }
+    .header { background-color: #007bff; color: white; padding: 20px; border-radius: 5px 5px 0 0; text-align: center; }
+    .content { padding: 20px; background-color: #f9f9f9; }
+    .footer { background-color: #f0f0f0; padding: 10px; text-align: center; font-size: 12px; color: #666; border-radius: 0 0 5px 5px; }
+    .detail-row { margin: 10px 0; }
+    .label { font-weight: bold; color: #007bff; }
+    .button { display: inline-block; padding: 10px 20px; background-color: #007bff; color: white; text-decoration: none; border-radius: 5px; margin-top: 15px; }
+  </style>
+</head>
+
+<body>
+  <div class="container">
+    <div class="header">
+      <h1>Invitation Accepted!</h1>
+    </div>
+    
+    <div class="content">
+      <p>Dear <%= @invitee.user.full_name %>,</p>
+      
+      <p>Your invitation to join team <strong><%= @inviter_team.name %></strong> for assignment <strong><%= @assignment.name %></strong> has been accepted!</p>
+      
+      <p>You have been successfully added to the team. You can now collaborate with your teammates on this assignment.</p>
+      
+      <div class="detail-row">
+        <span class="label">Team Name:</span> <%= @inviter_team.name %>
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Assignment:</span> <%= @assignment.name %>
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Date Accepted:</span> <%= I18n.l(@invitation.updated_at, format: :long) %>
+      </div>
+      
+      <p>You can now start working with your team members on the assignment. Good luck!</p>
+      
+      <p>Best regards,<br>
+      <strong>Expertiza Team</strong></p>
+    </div>
+    
+    <div class="footer">
+      <p>This is an automated email. Please do not reply to this message.</p>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/app/views/invitation_mailer/send_invitation_acceptance_email.html.erb b/app/views/invitation_mailer/send_invitation_acceptance_email.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/invitation_mailer/send_invitation_acceptance_to_team.html.erb b/app/views/invitation_mailer/send_invitation_acceptance_to_team.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/invitation_mailer/send_team_acceptance_notification.html.erb b/app/views/invitation_mailer/send_team_acceptance_notification.html.erb
new file mode 100644
index 000000000..02680ccaa
--- /dev/null
+++ b/app/views/invitation_mailer/send_team_acceptance_notification.html.erb
@@ -0,0 +1,53 @@
+<html>
+<head>
+  <title>Team Member Joined</title>
+  <style>
+    body { font-family: Arial, sans-serif; color: #333; }
+    .container { max-width: 600px; margin: 0 auto; padding: 20px; border: 1px solid #ddd; border-radius: 5px; }
+    .header { background-color: #28a745; color: white; padding: 20px; border-radius: 5px 5px 0 0; text-align: center; }
+    .content { padding: 20px; background-color: #f9f9f9; }
+    .footer { background-color: #f0f0f0; padding: 10px; text-align: center; font-size: 12px; color: #666; border-radius: 0 0 5px 5px; }
+    .detail-row { margin: 10px 0; }
+    .label { font-weight: bold; color: #28a745; }
+  </style>
+</head>
+
+<body>
+  <div class="container">
+    <div class="header">
+      <h1>Team Member Joined!</h1>
+    </div>
+    
+    <div class="content">
+      <p>Hello Team Members,</p>
+      
+      <p><strong><%= @invitee.user.full_name %></strong> has accepted the team invitation and has been successfully added to your team!</p>
+      
+      <div class="detail-row">
+        <span class="label">New Team Member:</span> <%= @invitee.user.full_name %> (<%= @invitee.user.email %>)
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Team Name:</span> <%= @inviter_team.name %>
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Assignment:</span> <%= @assignment.name %>
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Date Joined:</span> <%= I18n.l(@invitation.updated_at, format: :long) %>
+      </div>
+      
+      <p>You can now start collaborating with your new team member. Looking forward to great work from your team!</p>
+      
+      <p>Best regards,<br>
+      <strong>Expertiza Team</strong></p>
+    </div>
+    
+    <div class="footer">
+      <p>This is an automated email. Please do not reply to this message.</p>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/app/views/join_team_request_mailer/send_acceptance_email.html.erb b/app/views/join_team_request_mailer/send_acceptance_email.html.erb
new file mode 100644
index 000000000..25770188e
--- /dev/null
+++ b/app/views/join_team_request_mailer/send_acceptance_email.html.erb
@@ -0,0 +1,51 @@
+<html>
+<head>
+  <title>Join Request Accepted</title>
+  <style>
+    body { font-family: Arial, sans-serif; color: #333; }
+    .container { max-width: 600px; margin: 0 auto; padding: 20px; border: 1px solid #ddd; border-radius: 5px; }
+    .header { background-color: #007bff; color: white; padding: 20px; border-radius: 5px 5px 0 0; text-align: center; }
+    .content { padding: 20px; background-color: #f9f9f9; }
+    .footer { background-color: #f0f0f0; padding: 10px; text-align: center; font-size: 12px; color: #666; border-radius: 0 0 5px 5px; }
+    .detail-row { margin: 10px 0; }
+    .label { font-weight: bold; color: #007bff; }
+  </style>
+</head>
+
+<body>
+  <div class="container">
+    <div class="header">
+      <h1>Join Request Accepted!</h1>
+    </div>
+    
+    <div class="content">
+      <p>Dear <%= @participant.user.full_name %>,</p>
+      
+      <p>Good news! Your request to join team <strong><%= @team.name %></strong> for assignment <strong><%= @assignment.name %></strong> has been accepted!</p>
+      
+      <p>You have been successfully added to the team. You can now collaborate with your teammates on this assignment.</p>
+      
+      <div class="detail-row">
+        <span class="label">Team Name:</span> <%= @team.name %>
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Assignment:</span> <%= @assignment.name %>
+      </div>
+      
+      <div class="detail-row">
+        <span class="label">Date Accepted:</span> <%= I18n.l(@join_team_request.updated_at, format: :long) %>
+      </div>
+      
+      <p>You can now start working with your team members on the assignment. Good luck!</p>
+      
+      <p>Best regards,<br>
+      <strong>Expertiza Team</strong></p>
+    </div>
+    
+    <div class="footer">
+      <p>This is an automated email. Please do not reply to this message.</p>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/config/application.rb b/config/application.rb
index c66af389b..798f8702b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'boot'
 require 'rails/all'
 if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('8.0.0')
diff --git a/config/boot.rb b/config/boot.rb
index e355b2018..d229af499 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 require 'logger'
 require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/config/database.yml.old b/config/database.yml.old
index a7473bbc0..0c642e69b 100644
--- a/config/database.yml.old
+++ b/config/database.yml.old
@@ -9,17 +9,31 @@
 # And be sure to use new-style password hashing:
 #   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
 #
+# MySQL. Versions 5.5.8 and up are supported.
+#
+# Install the MySQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem "mysql2"
+#
+# And be sure to use new-style password hashing:
+#   https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
+#
 default: &default
   adapter: mysql2
   encoding: utf8mb4
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   username: dev
   password: expertiza
+  host: <%= ENV.fetch("DB_HOST", "db") %>
+  port: <%= ENV.fetch("DB_PORT", "3306") %>
 
 
 development:
   <<: *default
   database: reimplementation_development
+  database: reimplementation_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb4..d5abe5580 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
 require_relative 'application'
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 37737bd0a..9dfc904f4 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
@@ -63,4 +65,5 @@
   # config.action_cable.disable_request_forgery_protection = true
   config.hosts << 'localhost'
   config.hosts << "www.example.com"
+  config.hosts << "152.7.176.23"
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 71cf9f9dc..e8177f290 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 20f166baf..ec73764a0 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/integer/time'
 
 # The test environment is used exclusively to run your application's
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index d7cf5aaf7..6fe85a1f7 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Avoid CORS issues when API is called from the frontend app.
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 166997c5a..3df77c5be 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure parameters to be filtered from the log file. Use this to limit dissemination of
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 3860f659e..9e049dcc9 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/rswag_api.rb b/config/initializers/rswag_api.rb
index c4462b277..c7b2269a7 100644
--- a/config/initializers/rswag_api.rb
+++ b/config/initializers/rswag_api.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rswag::Api.configure do |c|
 
   # Specify a root folder where Swagger JSON files are located
diff --git a/config/initializers/rswag_ui.rb b/config/initializers/rswag_ui.rb
index f62d5c783..763074c4e 100644
--- a/config/initializers/rswag_ui.rb
+++ b/config/initializers/rswag_ui.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rswag::Ui.configure do |c|
 
   # List the Swagger endpoints that you want to be documented through the
diff --git a/config/puma.rb b/config/puma.rb
index 059371274..0f2bcb3ed 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
diff --git a/config/routes.rb b/config/routes.rb
index aab697c02..4975fcbb0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
 
   mount Rswag::Api::Engine => 'api-docs'
@@ -7,8 +9,6 @@
   # Defines the root path route ("/")
   # root "articles#index"
   post '/login', to: 'authentication#login'
-  namespace :api do
-    namespace :v1 do
       resources :institutions
       resources :roles do
         collection do
@@ -85,8 +85,14 @@
       end
 
       resources :join_team_requests do
+        member do
+          patch 'accept', to: 'join_team_requests#accept'
+          patch 'decline', to: 'join_team_requests#decline'
+        end
         collection do
-          post 'decline/:id', to:'join_team_requests#decline'
+          get 'for_team/:team_id', to: 'join_team_requests#for_team'
+          get 'by_user/:user_id', to: 'join_team_requests#by_user'
+          get 'pending', to: 'join_team_requests#pending'
         end
       end
 
@@ -173,6 +179,5 @@
           get '/:participant_id/instructor_review', to: 'grades#instructor_review'
         end
       end
-    end
   end
 end
\ No newline at end of file
diff --git a/database_dump.sql b/database_dump.sql
new file mode 100644
index 000000000..bf29f1b50
--- /dev/null
+++ b/database_dump.sql
@@ -0,0 +1,1091 @@
+-- MySQL dump 10.13  Distrib 8.0.44, for Linux (x86_64)
+--
+-- Host: localhost    Database: reimplementation_development
+-- ------------------------------------------------------
+-- Server version	8.0.44
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!50503 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `account_requests`
+--
+
+DROP TABLE IF EXISTS `account_requests`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `account_requests` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `username` varchar(255) DEFAULT NULL,
+  `full_name` varchar(255) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `status` varchar(255) DEFAULT NULL,
+  `introduction` text,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `role_id` bigint NOT NULL,
+  `institution_id` bigint NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_account_requests_on_institution_id` (`institution_id`),
+  KEY `index_account_requests_on_role_id` (`role_id`),
+  CONSTRAINT `fk_rails_39cb3df9b0` FOREIGN KEY (`institution_id`) REFERENCES `institutions` (`id`),
+  CONSTRAINT `fk_rails_ea08ff5293` FOREIGN KEY (`role_id`) REFERENCES `roles` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `account_requests`
+--
+
+LOCK TABLES `account_requests` WRITE;
+/*!40000 ALTER TABLE `account_requests` DISABLE KEYS */;
+/*!40000 ALTER TABLE `account_requests` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `answers`
+--
+
+DROP TABLE IF EXISTS `answers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `answers` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `item_id` int NOT NULL DEFAULT '0',
+  `response_id` int DEFAULT NULL,
+  `answer` int DEFAULT NULL,
+  `comments` text,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_score_items` (`item_id`),
+  KEY `fk_score_response` (`response_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `answers`
+--
+
+LOCK TABLES `answers` WRITE;
+/*!40000 ALTER TABLE `answers` DISABLE KEYS */;
+/*!40000 ALTER TABLE `answers` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `ar_internal_metadata`
+--
+
+DROP TABLE IF EXISTS `ar_internal_metadata`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `ar_internal_metadata` (
+  `key` varchar(255) NOT NULL,
+  `value` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`key`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ar_internal_metadata`
+--
+
+LOCK TABLES `ar_internal_metadata` WRITE;
+/*!40000 ALTER TABLE `ar_internal_metadata` DISABLE KEYS */;
+INSERT INTO `ar_internal_metadata` VALUES ('environment','development','2025-11-15 22:48:42.225557','2025-11-15 22:48:42.225561'),('schema_sha1','d6d04ca9ec9015eb33402a2bd419dfa8c6a07af4','2025-11-15 22:48:42.235203','2025-11-15 22:48:42.235205');
+/*!40000 ALTER TABLE `ar_internal_metadata` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `assignment_questionnaires`
+--
+
+DROP TABLE IF EXISTS `assignment_questionnaires`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `assignment_questionnaires` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `assignment_id` int DEFAULT NULL,
+  `questionnaire_id` int DEFAULT NULL,
+  `notification_limit` int NOT NULL DEFAULT '15',
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `used_in_round` int DEFAULT NULL,
+  `questionnaire_weight` int DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_aq_assignments_id` (`assignment_id`),
+  KEY `fk_aq_questionnaire_id` (`questionnaire_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `assignment_questionnaires`
+--
+
+LOCK TABLES `assignment_questionnaires` WRITE;
+/*!40000 ALTER TABLE `assignment_questionnaires` DISABLE KEYS */;
+INSERT INTO `assignment_questionnaires` VALUES (1,1,1,15,'2025-11-15 22:49:22.118717','2025-11-15 22:49:22.118717',1,NULL),(2,1,2,15,'2025-11-15 22:49:22.133606','2025-11-15 22:49:22.133606',2,NULL),(3,2,3,15,'2025-11-15 22:49:22.152366','2025-11-15 22:49:22.152366',1,NULL),(4,2,4,15,'2025-11-15 22:49:22.169158','2025-11-15 22:49:22.169158',2,NULL);
+/*!40000 ALTER TABLE `assignment_questionnaires` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `assignments`
+--
+
+DROP TABLE IF EXISTS `assignments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `assignments` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `directory_path` varchar(255) DEFAULT NULL,
+  `submitter_count` int DEFAULT NULL,
+  `private` tinyint(1) DEFAULT NULL,
+  `num_reviews` int DEFAULT NULL,
+  `num_review_of_reviews` int DEFAULT NULL,
+  `num_review_of_reviewers` int DEFAULT NULL,
+  `reviews_visible_to_all` tinyint(1) DEFAULT NULL,
+  `num_reviewers` int DEFAULT NULL,
+  `spec_location` text,
+  `max_team_size` int DEFAULT NULL,
+  `staggered_deadline` tinyint(1) DEFAULT NULL,
+  `allow_suggestions` tinyint(1) DEFAULT NULL,
+  `days_between_submissions` int DEFAULT NULL,
+  `review_assignment_strategy` varchar(255) DEFAULT NULL,
+  `max_reviews_per_submission` int DEFAULT NULL,
+  `review_topic_threshold` int DEFAULT NULL,
+  `copy_flag` tinyint(1) DEFAULT NULL,
+  `rounds_of_reviews` int DEFAULT NULL,
+  `microtask` tinyint(1) DEFAULT NULL,
+  `require_quiz` tinyint(1) DEFAULT NULL,
+  `num_quiz_questions` int DEFAULT NULL,
+  `is_coding_assignment` tinyint(1) DEFAULT NULL,
+  `is_intelligent` tinyint(1) DEFAULT NULL,
+  `calculate_penalty` tinyint(1) DEFAULT NULL,
+  `late_policy_id` int DEFAULT NULL,
+  `is_penalty_calculated` tinyint(1) DEFAULT NULL,
+  `max_bids` int DEFAULT NULL,
+  `show_teammate_reviews` tinyint(1) DEFAULT NULL,
+  `availability_flag` tinyint(1) DEFAULT NULL,
+  `use_bookmark` tinyint(1) DEFAULT NULL,
+  `can_review_same_topic` tinyint(1) DEFAULT NULL,
+  `can_choose_topic_to_review` tinyint(1) DEFAULT NULL,
+  `is_calibrated` tinyint(1) DEFAULT NULL,
+  `is_selfreview_enabled` tinyint(1) DEFAULT NULL,
+  `reputation_algorithm` varchar(255) DEFAULT NULL,
+  `is_anonymous` tinyint(1) DEFAULT NULL,
+  `num_reviews_required` int DEFAULT NULL,
+  `num_metareviews_required` int DEFAULT NULL,
+  `num_metareviews_allowed` int DEFAULT NULL,
+  `num_reviews_allowed` int DEFAULT NULL,
+  `simicheck` int DEFAULT NULL,
+  `simicheck_threshold` int DEFAULT NULL,
+  `is_answer_tagging_allowed` tinyint(1) DEFAULT NULL,
+  `has_badge` tinyint(1) DEFAULT NULL,
+  `allow_selecting_additional_reviews_after_1st_round` tinyint(1) DEFAULT NULL,
+  `sample_assignment_id` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `instructor_id` bigint NOT NULL,
+  `course_id` bigint DEFAULT NULL,
+  `enable_pair_programming` tinyint(1) DEFAULT '0',
+  `has_teams` tinyint(1) DEFAULT '0',
+  `has_topics` tinyint(1) DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `index_assignments_on_course_id` (`course_id`),
+  KEY `index_assignments_on_instructor_id` (`instructor_id`),
+  CONSTRAINT `fk_rails_2194c084a6` FOREIGN KEY (`course_id`) REFERENCES `courses` (`id`),
+  CONSTRAINT `fk_rails_e22e619567` FOREIGN KEY (`instructor_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `assignments`
+--
+
+LOCK TABLES `assignments` WRITE;
+/*!40000 ALTER TABLE `assignments` DISABLE KEYS */;
+INSERT INTO `assignments` VALUES (1,'audit',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.751586','2025-11-15 22:49:22.200267',8,2,0,1,1),(2,'encourage',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.769950','2025-11-15 22:49:09.769950',9,2,0,1,0),(3,'compel',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.782365','2025-11-15 22:49:09.782365',8,2,0,1,0),(4,'spray',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.801042','2025-11-15 22:49:09.801042',9,2,0,1,0),(5,'inspect',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.825501','2025-11-15 22:49:09.825501',8,2,0,1,0),(6,'impair',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.840605','2025-11-15 22:49:09.840605',9,2,0,1,0),(7,'wish',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.862102','2025-11-15 22:49:09.862102',8,2,0,1,0),(8,'bite',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2025-11-15 22:49:09.877849','2025-11-15 22:49:09.877849',9,2,0,1,0);
+/*!40000 ALTER TABLE `assignments` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `bookmark_ratings`
+--
+
+DROP TABLE IF EXISTS `bookmark_ratings`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `bookmark_ratings` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `bookmark_id` int DEFAULT NULL,
+  `user_id` int DEFAULT NULL,
+  `rating` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `bookmark_ratings`
+--
+
+LOCK TABLES `bookmark_ratings` WRITE;
+/*!40000 ALTER TABLE `bookmark_ratings` DISABLE KEYS */;
+/*!40000 ALTER TABLE `bookmark_ratings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `bookmarks`
+--
+
+DROP TABLE IF EXISTS `bookmarks`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `bookmarks` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `url` text,
+  `title` text,
+  `description` text,
+  `user_id` int DEFAULT NULL,
+  `topic_id` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `bookmarks`
+--
+
+LOCK TABLES `bookmarks` WRITE;
+/*!40000 ALTER TABLE `bookmarks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `bookmarks` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `cakes`
+--
+
+DROP TABLE IF EXISTS `cakes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `cakes` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `cakes`
+--
+
+LOCK TABLES `cakes` WRITE;
+/*!40000 ALTER TABLE `cakes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `cakes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `courses`
+--
+
+DROP TABLE IF EXISTS `courses`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `courses` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `directory_path` varchar(255) DEFAULT NULL,
+  `info` text,
+  `private` tinyint(1) DEFAULT '0',
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `instructor_id` bigint NOT NULL,
+  `institution_id` bigint NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_courses_on_institution_id` (`institution_id`),
+  KEY `fk_course_users` (`instructor_id`),
+  KEY `index_courses_on_instructor_id` (`instructor_id`),
+  CONSTRAINT `fk_rails_2ab3132eb0` FOREIGN KEY (`instructor_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `fk_rails_d012129e83` FOREIGN KEY (`institution_id`) REFERENCES `institutions` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `courses`
+--
+
+LOCK TABLES `courses` WRITE;
+/*!40000 ALTER TABLE `courses` DISABLE KEYS */;
+INSERT INTO `courses` VALUES (1,'Military','ample_relationship/cruelty-angel','A fake class',0,'2025-11-15 22:49:09.610380','2025-11-15 22:49:09.610380',8,1),(2,'Oil & Energy','midnight-shock/ambiguous-corn','A fake class',0,'2025-11-15 22:49:09.628681','2025-11-15 22:49:09.628681',9,1);
+/*!40000 ALTER TABLE `courses` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `due_dates`
+--
+
+DROP TABLE IF EXISTS `due_dates`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `due_dates` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `due_at` datetime(6) NOT NULL,
+  `deadline_type_id` int NOT NULL,
+  `parent_type` varchar(255) NOT NULL,
+  `parent_id` bigint NOT NULL,
+  `submission_allowed_id` int NOT NULL,
+  `review_allowed_id` int NOT NULL,
+  `round` int DEFAULT NULL,
+  `flag` tinyint(1) DEFAULT '0',
+  `threshold` int DEFAULT '1',
+  `delayed_job_id` varchar(255) DEFAULT NULL,
+  `deadline_name` varchar(255) DEFAULT NULL,
+  `description_url` varchar(255) DEFAULT NULL,
+  `quiz_allowed_id` int DEFAULT '1',
+  `teammate_review_allowed_id` int DEFAULT '3',
+  `type` varchar(255) DEFAULT 'AssignmentDueDate',
+  `resubmission_allowed_id` int DEFAULT NULL,
+  `rereview_allowed_id` int DEFAULT NULL,
+  `review_of_review_allowed_id` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_due_dates_on_parent` (`parent_type`,`parent_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `due_dates`
+--
+
+LOCK TABLES `due_dates` WRITE;
+/*!40000 ALTER TABLE `due_dates` DISABLE KEYS */;
+/*!40000 ALTER TABLE `due_dates` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `institutions`
+--
+
+DROP TABLE IF EXISTS `institutions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `institutions` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `institutions`
+--
+
+LOCK TABLES `institutions` WRITE;
+/*!40000 ALTER TABLE `institutions` DISABLE KEYS */;
+INSERT INTO `institutions` VALUES (1,'North Carolina State University','2025-11-15 22:49:03.488893','2025-11-15 22:49:03.488893');
+/*!40000 ALTER TABLE `institutions` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `invitations`
+--
+
+DROP TABLE IF EXISTS `invitations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `invitations` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `assignment_id` int DEFAULT NULL,
+  `reply_status` varchar(1) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `from_id` bigint NOT NULL,
+  `to_id` bigint NOT NULL,
+  `participant_id` bigint NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_invitation_assignments` (`assignment_id`),
+  KEY `index_invitations_on_from_id` (`from_id`),
+  KEY `index_invitations_on_participant_id` (`participant_id`),
+  KEY `index_invitations_on_to_id` (`to_id`),
+  CONSTRAINT `fk_rails_5c28345ebb` FOREIGN KEY (`from_id`) REFERENCES `participants` (`id`),
+  CONSTRAINT `fk_rails_9ac855df28` FOREIGN KEY (`to_id`) REFERENCES `participants` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `invitations`
+--
+
+LOCK TABLES `invitations` WRITE;
+/*!40000 ALTER TABLE `invitations` DISABLE KEYS */;
+/*!40000 ALTER TABLE `invitations` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `items`
+--
+
+DROP TABLE IF EXISTS `items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `items` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `txt` text,
+  `weight` int DEFAULT NULL,
+  `seq` decimal(10,0) DEFAULT NULL,
+  `question_type` varchar(255) DEFAULT NULL,
+  `size` varchar(255) DEFAULT NULL,
+  `alternatives` varchar(255) DEFAULT NULL,
+  `break_before` tinyint(1) DEFAULT NULL,
+  `max_label` varchar(255) DEFAULT NULL,
+  `min_label` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `questionnaire_id` bigint NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_question_questionnaires` (`questionnaire_id`),
+  KEY `index_items_on_questionnaire_id` (`questionnaire_id`),
+  CONSTRAINT `fk_rails_c59f3245d3` FOREIGN KEY (`questionnaire_id`) REFERENCES `questionnaires` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `items`
+--
+
+LOCK TABLES `items` WRITE;
+/*!40000 ALTER TABLE `items` DISABLE KEYS */;
+INSERT INTO `items` VALUES (1,'Animi sequi voluptatem est ipsum asperiores quia architecto.',2,1,'Scale','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Assumenda','A','2025-11-15 22:49:21.438745','2025-11-15 22:49:21.438746',1),(2,'Earum a labore modi repellat eveniet consequuntur quasi.',2,2,'Criterion','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Recusandae','Eius','2025-11-15 22:49:21.475030','2025-11-15 22:49:21.475031',1),(3,'Ut natus perferendis quo id error et autem.',2,3,'Scale','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Est','Quidem','2025-11-15 22:49:21.488093','2025-11-15 22:49:21.488094',1),(4,'Eveniet eligendi consequuntur veritatis nam facilis explicabo commodi.',2,4,'TextArea','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Et','Quo','2025-11-15 22:49:21.502363','2025-11-15 22:49:21.502364',1),(5,'Eos impedit voluptate qui ullam ea ipsum atque.',1,5,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Nam','Nesciunt','2025-11-15 22:49:21.519869','2025-11-15 22:49:21.519870',1),(6,'Laudantium voluptas voluptatem non ut officiis quis deleniti.',2,6,'Criterion','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Et','Iure','2025-11-15 22:49:21.535449','2025-11-15 22:49:21.535449',1),(7,'Ut error et labore repellendus qui ex sapiente.',1,7,'TextArea','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Nulla','Dolorem','2025-11-15 22:49:21.547132','2025-11-15 22:49:21.547133',1),(8,'Tenetur adipisci illo voluptatem aut distinctio et velit.',2,8,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Vitae','Hic','2025-11-15 22:49:21.564389','2025-11-15 22:49:21.564390',1),(9,'Et ut sit vel accusantium suscipit ipsum fugit.',1,9,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Aliquam','Eveniet','2025-11-15 22:49:21.578295','2025-11-15 22:49:21.578295',1),(10,'Sit ipsum autem facere dolorum fugiat vel est.',2,10,'TextArea','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Et','Enim','2025-11-15 22:49:21.591428','2025-11-15 22:49:21.591429',1),(11,'Dolore quisquam pariatur quis perferendis ullam praesentium quas.',1,1,'Dropdown','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Dolores','Repellendus','2025-11-15 22:49:21.603968','2025-11-15 22:49:21.603969',2),(12,'Unde ad fugit tenetur autem ex aut provident.',2,2,'Dropdown','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'At','Ipsum','2025-11-15 22:49:21.619502','2025-11-15 22:49:21.619503',2),(13,'Molestiae molestiae amet sunt aliquam quia laboriosam deleniti.',1,3,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Voluptas','Mollitia','2025-11-15 22:49:21.635878','2025-11-15 22:49:21.635879',2),(14,'Mollitia sed quae fuga doloremque cum sunt eveniet.',2,4,'Criterion','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Rerum','Cumque','2025-11-15 22:49:21.648978','2025-11-15 22:49:21.648978',2),(15,'Et iusto veniam quis eius rerum voluptas perferendis.',2,5,'Dropdown','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Rem','Quaerat','2025-11-15 22:49:21.663995','2025-11-15 22:49:21.663995',2),(16,'Voluptatem exercitationem dolores quia id aut quas voluptatibus.',2,6,'Scale','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Perspiciatis','Eos','2025-11-15 22:49:21.682033','2025-11-15 22:49:21.682033',2),(17,'Alias quos neque officia tempore dolorum expedita a.',2,7,'Criterion','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Facilis','Consequatur','2025-11-15 22:49:21.695772','2025-11-15 22:49:21.695772',2),(18,'Iure in quo fugit eos laudantium non est.',2,8,'Criterion','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Cum','Sint','2025-11-15 22:49:21.711042','2025-11-15 22:49:21.711042',2),(19,'Reprehenderit quis ut omnis corrupti est inventore sint.',1,9,'TextArea','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Sit','Accusantium','2025-11-15 22:49:21.727462','2025-11-15 22:49:21.727462',2),(20,'Et veniam nostrum quia quaerat provident officia ex.',2,10,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Dolores','Laborum','2025-11-15 22:49:21.742467','2025-11-15 22:49:21.742467',2),(21,'Dolorem modi rerum esse eos voluptas placeat omnis.',1,1,'Scale','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Dolores','Nam','2025-11-15 22:49:21.759247','2025-11-15 22:49:21.759248',3),(22,'Eveniet quia sit aut doloribus sapiente sequi illo.',1,2,'TextArea','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Amet','Minima','2025-11-15 22:49:21.777205','2025-11-15 22:49:21.777206',3),(23,'Veritatis doloribus cumque atque inventore molestiae facere qui.',1,3,'Criterion','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Qui','Possimus','2025-11-15 22:49:21.793967','2025-11-15 22:49:21.793968',3),(24,'Ipsam dolor ea id ducimus doloremque aliquid necessitatibus.',2,4,'Criterion','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Autem','Laudantium','2025-11-15 22:49:21.812252','2025-11-15 22:49:21.812253',3),(25,'Odio atque consequatur dolorem officiis quia autem nemo.',2,5,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Occaecati','Neque','2025-11-15 22:49:21.826663','2025-11-15 22:49:21.826664',3),(26,'Pariatur et numquam est omnis dolores qui qui.',1,6,'TextArea','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Qui','Rerum','2025-11-15 22:49:21.842886','2025-11-15 22:49:21.842887',3),(27,'Qui sint nobis aut ab voluptas perspiciatis accusantium.',2,7,'Criterion','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Temporibus','Sint','2025-11-15 22:49:21.857543','2025-11-15 22:49:21.857544',3),(28,'Enim explicabo tenetur veniam temporibus sequi reprehenderit et.',2,8,'Dropdown','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Repellat','Sed','2025-11-15 22:49:21.871617','2025-11-15 22:49:21.871617',3),(29,'Dolores et cum debitis quibusdam est modi facere.',1,9,'Dropdown','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Cupiditate','Aut','2025-11-15 22:49:21.887063','2025-11-15 22:49:21.887063',3),(30,'Velit odit nemo hic quia numquam omnis nobis.',2,10,'Scale','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Quia','Consequatur','2025-11-15 22:49:21.903116','2025-11-15 22:49:21.903117',3),(31,'Nisi quo voluptatum velit eveniet aut rerum dolores.',2,1,'TextArea','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Beatae','Voluptates','2025-11-15 22:49:21.918620','2025-11-15 22:49:21.918621',4),(32,'Sed ut quos nulla magnam quas commodi ut.',2,2,'Criterion','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Aspernatur','Quas','2025-11-15 22:49:21.937170','2025-11-15 22:49:21.937171',4),(33,'Laboriosam earum veritatis voluptatibus quis quos quia nisi.',1,3,'TextArea','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Et','Quaerat','2025-11-15 22:49:21.954679','2025-11-15 22:49:21.954680',4),(34,'Ipsam exercitationem dolore dolores consequatur in nulla sit.',2,4,'Scale','60x4','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Recusandae','Amet','2025-11-15 22:49:21.972031','2025-11-15 22:49:21.972031',4),(35,'Rerum velit possimus nobis ipsam officiis ut eveniet.',2,5,'Scale','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Sit','Ut','2025-11-15 22:49:21.986587','2025-11-15 22:49:21.986588',4),(36,'Dolor commodi sit quidem a exercitationem cumque quia.',2,6,'Criterion','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Iure','Ratione','2025-11-15 22:49:22.001151','2025-11-15 22:49:22.001151',4),(37,'Ut a aliquam quod et quia aperiam praesentium.',2,7,'Dropdown','50x3','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Perspiciatis','Id','2025-11-15 22:49:22.017038','2025-11-15 22:49:22.017039',4),(38,'Recusandae error quas vitae aut harum velit corporis.',2,8,'Dropdown','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Eos','Quasi','2025-11-15 22:49:22.034568','2025-11-15 22:49:22.034568',4),(39,'Maxime sed quis sit corporis et molestias quas.',2,9,'Scale','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Saepe','Quis','2025-11-15 22:49:22.048509','2025-11-15 22:49:22.048510',4),(40,'Aut corporis debitis quia perspiciatis dolores optio accusantium.',2,10,'Dropdown','40x2','[\"Yes|No\", \"Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree\"]',1,'Et','Odio','2025-11-15 22:49:22.064913','2025-11-15 22:49:22.064913',4);
+/*!40000 ALTER TABLE `items` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `join_team_requests`
+--
+
+DROP TABLE IF EXISTS `join_team_requests`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `join_team_requests` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `participant_id` int DEFAULT NULL,
+  `team_id` int DEFAULT NULL,
+  `comments` text,
+  `reply_status` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `join_team_requests`
+--
+
+LOCK TABLES `join_team_requests` WRITE;
+/*!40000 ALTER TABLE `join_team_requests` DISABLE KEYS */;
+INSERT INTO `join_team_requests` VALUES (1,'2025-11-15 22:49:22.704123','2025-11-15 22:51:39.643432',51,17,'I have experience with Python and machine learning. Would love to contribute to the AI project!','ACCEPTED'),(2,'2025-11-15 22:49:22.726732','2025-11-15 22:54:20.540402',52,18,'I am proficient in React and Node.js. Can help with both frontend and backend!','ACCEPTED'),(3,'2025-11-15 22:49:22.745286','2025-11-15 22:54:00.155401',51,18,'Also interested in web development. Have full-stack experience.','DECLINED'),(4,'2025-11-15 22:49:22.765134','2025-11-15 22:49:22.765134',52,19,'Interested in mobile development!','DECLINED'),(5,'2025-11-15 22:56:24.018459','2025-11-15 22:59:53.082017',50,18,'Responding to advertisement for Web Development','ACCEPTED'),(6,'2025-11-15 22:58:09.167184','2025-11-15 22:59:59.909223',48,18,'Responding to advertisement for Web Development','ACCEPTED'),(7,'2025-11-15 22:59:05.290277','2025-11-15 22:59:05.290277',47,18,'Responding to advertisement for Web Development','PENDING'),(8,'2025-11-15 23:21:12.514923','2025-11-15 23:23:30.147394',49,17,'Responding to advertisement for AI and Machine Learning','ACCEPTED');
+/*!40000 ALTER TABLE `join_team_requests` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `nodes`
+--
+
+DROP TABLE IF EXISTS `nodes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `nodes` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `parent_id` int DEFAULT NULL,
+  `node_object_id` int DEFAULT NULL,
+  `type` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `nodes`
+--
+
+LOCK TABLES `nodes` WRITE;
+/*!40000 ALTER TABLE `nodes` DISABLE KEYS */;
+/*!40000 ALTER TABLE `nodes` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `participants`
+--
+
+DROP TABLE IF EXISTS `participants`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `participants` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `user_id` bigint DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `can_submit` tinyint(1) DEFAULT '1',
+  `can_review` tinyint(1) DEFAULT '1',
+  `handle` varchar(255) DEFAULT NULL,
+  `permission_granted` tinyint(1) DEFAULT '0',
+  `join_team_request_id` bigint DEFAULT NULL,
+  `team_id` bigint DEFAULT NULL,
+  `topic` varchar(255) DEFAULT NULL,
+  `current_stage` varchar(255) DEFAULT NULL,
+  `stage_deadline` datetime(6) DEFAULT NULL,
+  `can_take_quiz` tinyint(1) DEFAULT NULL,
+  `can_mentor` tinyint(1) DEFAULT NULL,
+  `authorization` varchar(255) DEFAULT NULL,
+  `parent_id` int NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `grade` float DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_participants_on_join_team_request_id` (`join_team_request_id`),
+  KEY `index_participants_on_team_id` (`team_id`),
+  KEY `fk_participant_users` (`user_id`),
+  KEY `index_participants_on_user_id` (`user_id`),
+  CONSTRAINT `fk_rails_8cf3035ef1` FOREIGN KEY (`join_team_request_id`) REFERENCES `join_team_requests` (`id`),
+  CONSTRAINT `fk_rails_990c37f108` FOREIGN KEY (`team_id`) REFERENCES `teams` (`id`),
+  CONSTRAINT `fk_rails_b9a3c50f15` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `participants`
+--
+
+LOCK TABLES `participants` WRITE;
+/*!40000 ALTER TABLE `participants` DISABLE KEYS */;
+INSERT INTO `participants` VALUES (1,10,'2025-11-15 22:49:20.067974','2025-11-15 22:49:20.067974',1,1,'simon-rohan',0,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(2,11,'2025-11-15 22:49:20.131044','2025-11-15 22:49:20.131044',1,1,'martine',0,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(3,12,'2025-11-15 22:49:20.164957','2025-11-15 22:49:20.164957',1,1,'joanne-reichert',0,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(4,13,'2025-11-15 22:49:20.201889','2025-11-15 22:49:20.201889',1,1,'antonetta',0,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(5,14,'2025-11-15 22:49:20.249710','2025-11-15 22:49:20.249710',1,1,'glenda',0,NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(6,15,'2025-11-15 22:49:20.290664','2025-11-15 22:49:20.290664',1,1,'kenda',0,NULL,6,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(7,16,'2025-11-15 22:49:20.323462','2025-11-15 22:49:20.323462',1,1,'ji',0,NULL,7,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(8,17,'2025-11-15 22:49:20.356540','2025-11-15 22:49:20.356540',1,1,'nelson',0,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(9,18,'2025-11-15 22:49:20.389857','2025-11-15 22:49:20.389857',1,1,'xavier',0,NULL,9,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(10,19,'2025-11-15 22:49:20.421129','2025-11-15 22:49:20.421129',1,1,'rose',0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(11,20,'2025-11-15 22:49:20.456256','2025-11-15 22:49:20.456256',1,1,'lissa-keeling',0,NULL,11,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(12,21,'2025-11-15 22:49:20.496587','2025-11-15 22:49:20.496587',1,1,'jonathan-gulgowski',0,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(13,22,'2025-11-15 22:49:20.533512','2025-11-15 22:49:20.533512',1,1,'livia',0,NULL,13,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(14,23,'2025-11-15 22:49:20.564724','2025-11-15 22:49:20.564724',1,1,'janiece',0,NULL,14,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(15,24,'2025-11-15 22:49:20.598150','2025-11-15 22:49:20.598150',1,1,'jason',0,NULL,15,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(16,25,'2025-11-15 22:49:20.634535','2025-11-15 22:49:20.634535',1,1,'michel-mohr',0,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(17,26,'2025-11-15 22:49:20.670171','2025-11-15 22:49:20.670171',1,1,'wesley',0,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(18,27,'2025-11-15 22:49:20.698796','2025-11-15 22:49:20.698796',1,1,'eileen',0,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(19,28,'2025-11-15 22:49:20.731918','2025-11-15 22:49:20.731918',1,1,'lynwood-medhurst',0,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(20,29,'2025-11-15 22:49:20.764580','2025-11-15 22:49:20.764580',1,1,'ira',0,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(21,30,'2025-11-15 22:49:20.799624','2025-11-15 22:49:20.799624',1,1,'gavin',0,NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(22,31,'2025-11-15 22:49:20.835038','2025-11-15 22:49:20.835038',1,1,'anthony',0,NULL,6,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(23,32,'2025-11-15 22:49:20.872685','2025-11-15 22:49:20.872685',1,1,'anthony-schuppe',0,NULL,7,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(24,33,'2025-11-15 22:49:20.931834','2025-11-15 22:49:20.931834',1,1,'julieann',0,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(25,34,'2025-11-15 22:49:20.948191','2025-11-15 22:49:20.948191',1,1,'milton-sanford',0,NULL,9,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(26,35,'2025-11-15 22:49:20.963813','2025-11-15 22:49:20.963813',1,1,'colin-stracke',0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(27,36,'2025-11-15 22:49:20.980149','2025-11-15 22:49:20.980149',1,1,'rigoberto-oberbrunner',0,NULL,11,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(28,37,'2025-11-15 22:49:20.994813','2025-11-15 22:49:20.994813',1,1,'vern-blick',0,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(29,38,'2025-11-15 22:49:21.010647','2025-11-15 22:49:21.010647',1,1,'janyce',0,NULL,13,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(30,39,'2025-11-15 22:49:21.023602','2025-11-15 22:49:21.023602',1,1,'kerrie-hane',0,NULL,14,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(31,40,'2025-11-15 22:49:21.043091','2025-11-15 22:49:21.043091',1,1,'jerald',0,NULL,15,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(32,41,'2025-11-15 22:49:21.068544','2025-11-15 22:49:21.068544',1,1,'kylie-beier',0,NULL,16,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(33,42,'2025-11-15 22:49:21.095117','2025-11-15 22:49:21.095117',1,1,'willian-hirthe',0,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(34,43,'2025-11-15 22:49:21.110682','2025-11-15 22:49:21.110682',1,1,'vincent',0,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(35,44,'2025-11-15 22:49:21.125655','2025-11-15 22:49:21.125655',1,1,'kayla',0,NULL,3,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(36,45,'2025-11-15 22:49:21.143264','2025-11-15 22:49:21.143264',1,1,'hung',0,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(37,46,'2025-11-15 22:49:21.160411','2025-11-15 22:49:21.160411',1,1,'ermelinda-mills',0,NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(38,47,'2025-11-15 22:49:21.172396','2025-11-15 22:49:21.172396',1,1,'whitney',0,NULL,6,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(39,48,'2025-11-15 22:49:21.185994','2025-11-15 22:49:21.185994',1,1,'sergio',0,NULL,7,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(40,49,'2025-11-15 22:49:21.202478','2025-11-15 22:49:21.202478',1,1,'stanford',0,NULL,8,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(41,50,'2025-11-15 22:49:21.217308','2025-11-15 22:49:21.217308',1,1,'margene',0,NULL,9,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(42,51,'2025-11-15 22:49:21.233449','2025-11-15 22:49:21.233449',1,1,'wanda-oreilly',0,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(43,52,'2025-11-15 22:49:21.254452','2025-11-15 22:49:21.254452',1,1,'james',0,NULL,11,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(44,53,'2025-11-15 22:49:21.269216','2025-11-15 22:49:21.269216',1,1,'gregory',0,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(45,54,'2025-11-15 22:49:21.283245','2025-11-15 22:49:21.283245',1,1,'johnie-zemlak',0,NULL,13,NULL,NULL,NULL,NULL,NULL,NULL,1,'CourseParticipant',NULL),(46,55,'2025-11-15 22:49:21.298326','2025-11-15 22:49:21.298326',1,1,'erline',0,NULL,14,NULL,NULL,NULL,NULL,NULL,NULL,2,'CourseParticipant',NULL),(47,2,'2025-11-15 22:49:22.304114','2025-11-15 22:49:22.456587',1,1,'alice',0,NULL,17,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(48,3,'2025-11-15 22:49:22.319883','2025-11-15 22:49:22.465496',1,1,'bob',0,NULL,17,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(49,4,'2025-11-15 22:49:22.334399','2025-11-15 22:49:22.558760',1,1,'charlie',0,NULL,18,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(50,5,'2025-11-15 22:49:22.349995','2025-11-15 22:49:22.631453',1,1,'diana',0,NULL,19,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(51,6,'2025-11-15 22:49:22.367524','2025-11-15 22:49:22.367524',1,1,'ethan',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL),(52,7,'2025-11-15 22:49:22.384185','2025-11-15 22:49:22.384185',1,1,'fiona',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'AssignmentParticipant',NULL);
+/*!40000 ALTER TABLE `participants` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `question_advices`
+--
+
+DROP TABLE IF EXISTS `question_advices`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `question_advices` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `question_id` bigint NOT NULL,
+  `score` int DEFAULT NULL,
+  `advice` text,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_question_advices_on_question_id` (`question_id`),
+  CONSTRAINT `fk_rails_e2f223545a` FOREIGN KEY (`question_id`) REFERENCES `items` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `question_advices`
+--
+
+LOCK TABLES `question_advices` WRITE;
+/*!40000 ALTER TABLE `question_advices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `question_advices` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `question_types`
+--
+
+DROP TABLE IF EXISTS `question_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `question_types` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `question_types`
+--
+
+LOCK TABLES `question_types` WRITE;
+/*!40000 ALTER TABLE `question_types` DISABLE KEYS */;
+/*!40000 ALTER TABLE `question_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `questionnaire_types`
+--
+
+DROP TABLE IF EXISTS `questionnaire_types`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `questionnaire_types` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `questionnaire_types`
+--
+
+LOCK TABLES `questionnaire_types` WRITE;
+/*!40000 ALTER TABLE `questionnaire_types` DISABLE KEYS */;
+/*!40000 ALTER TABLE `questionnaire_types` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `questionnaires`
+--
+
+DROP TABLE IF EXISTS `questionnaires`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `questionnaires` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `instructor_id` int DEFAULT NULL,
+  `private` tinyint(1) DEFAULT NULL,
+  `min_question_score` int DEFAULT NULL,
+  `max_question_score` int DEFAULT NULL,
+  `questionnaire_type` varchar(255) DEFAULT NULL,
+  `display_type` varchar(255) DEFAULT NULL,
+  `instruction_loc` text,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `questionnaires`
+--
+
+LOCK TABLES `questionnaires` WRITE;
+/*!40000 ALTER TABLE `questionnaires` DISABLE KEYS */;
+INSERT INTO `questionnaires` VALUES (1,'Ab Et Nesciunt Corrupti Dolore',4,0,0,5,'ReviewQuestionnaire','Review',NULL,'2025-11-15 22:49:21.326436','2025-11-15 22:49:21.326436'),(2,'Adipisci Qui Voluptatem Quidem Ipsum',3,0,0,5,'ReviewQuestionnaire','Review',NULL,'2025-11-15 22:49:21.375613','2025-11-15 22:49:21.375614'),(3,'Vel Minus Vero Eum Dolores',1,0,0,5,'ReviewQuestionnaire','Review',NULL,'2025-11-15 22:49:21.387979','2025-11-15 22:49:21.387979'),(4,'Eaque Aut A Blanditiis Similique',3,0,0,5,'ReviewQuestionnaire','Review',NULL,'2025-11-15 22:49:21.404540','2025-11-15 22:49:21.404541');
+/*!40000 ALTER TABLE `questionnaires` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `quiz_question_choices`
+--
+
+DROP TABLE IF EXISTS `quiz_question_choices`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `quiz_question_choices` (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `question_id` int DEFAULT NULL,
+  `txt` text,
+  `iscorrect` tinyint(1) DEFAULT '0',
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `quiz_question_choices`
+--
+
+LOCK TABLES `quiz_question_choices` WRITE;
+/*!40000 ALTER TABLE `quiz_question_choices` DISABLE KEYS */;
+/*!40000 ALTER TABLE `quiz_question_choices` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `response_maps`
+--
+
+DROP TABLE IF EXISTS `response_maps`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `response_maps` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `reviewed_object_id` int NOT NULL DEFAULT '0',
+  `reviewer_id` int NOT NULL DEFAULT '0',
+  `reviewee_id` int NOT NULL DEFAULT '0',
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `type` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_response_map_reviewer` (`reviewer_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `response_maps`
+--
+
+LOCK TABLES `response_maps` WRITE;
+/*!40000 ALTER TABLE `response_maps` DISABLE KEYS */;
+/*!40000 ALTER TABLE `response_maps` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `responses`
+--
+
+DROP TABLE IF EXISTS `responses`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `responses` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `map_id` int NOT NULL DEFAULT '0',
+  `additional_comment` text,
+  `is_submitted` tinyint(1) DEFAULT '0',
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `round` int DEFAULT NULL,
+  `version_num` int DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_response_response_map` (`map_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `responses`
+--
+
+LOCK TABLES `responses` WRITE;
+/*!40000 ALTER TABLE `responses` DISABLE KEYS */;
+/*!40000 ALTER TABLE `responses` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `roles`
+--
+
+DROP TABLE IF EXISTS `roles`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `roles` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `parent_id` bigint DEFAULT NULL,
+  `default_page_id` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_rails_4404228d2f` (`parent_id`),
+  CONSTRAINT `fk_rails_4404228d2f` FOREIGN KEY (`parent_id`) REFERENCES `roles` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `roles`
+--
+
+LOCK TABLES `roles` WRITE;
+/*!40000 ALTER TABLE `roles` DISABLE KEYS */;
+INSERT INTO `roles` VALUES (1,'Super Administrator',NULL,NULL,'2025-11-15 22:49:03.561397','2025-11-15 22:49:03.561397'),(2,'Administrator',NULL,NULL,'2025-11-15 22:49:03.580891','2025-11-15 22:49:03.580891'),(3,'Instructor',NULL,NULL,'2025-11-15 22:49:03.603641','2025-11-15 22:49:03.603641'),(4,'Teaching Assistant',NULL,NULL,'2025-11-15 22:49:03.621059','2025-11-15 22:49:03.621059'),(5,'Student',NULL,NULL,'2025-11-15 22:49:03.643916','2025-11-15 22:49:03.643916');
+/*!40000 ALTER TABLE `roles` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `schema_migrations`
+--
+
+DROP TABLE IF EXISTS `schema_migrations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `schema_migrations` (
+  `version` varchar(255) NOT NULL,
+  PRIMARY KEY (`version`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `schema_migrations`
+--
+
+LOCK TABLES `schema_migrations` WRITE;
+/*!40000 ALTER TABLE `schema_migrations` DISABLE KEYS */;
+INSERT INTO `schema_migrations` VALUES ('20230305064753'),('20230305185139'),('20230306022503'),('20230306035806'),('20230401213353'),('20230401213404'),('20230412013301'),('20230412013310'),('20230412020156'),('20230415003243'),('20230415011209'),('20230424172126'),('20230424172612'),('20230424173506'),('20230424174001'),('20230424174153'),('20230427171632'),('20231019170608'),('20231019195109'),('20231026002451'),('20231026002543'),('20231027211715'),('20231028012101'),('20231030174450'),('20231102173153'),('20231104070639'),('20231104071922'),('20231105193016'),('20231105193219'),('20231129021640'),('20231129023417'),('20231129024913'),('20231129050431'),('20231129051018'),('20231130030500'),('20231130030611'),('20231130030646'),('20231130033226'),('20231130033325'),('20231130033332'),('20231201012040'),('20231201024204'),('20240318205124'),('20240324000112'),('20240415155554'),('20240415163413'),('20240415192048'),('20240420000000'),('20240420070000'),('20241015223136'),('20241201224112'),('20241201224137'),('20241202165201'),('20250214224716'),('20250216020117'),('20250324193058'),('20250401020016'),('20250414002952'),('20250414005152'),('20250418004442'),('20250418013852'),('20250418014519'),('20250427014225'),('20250621151644'),('20250621152946'),('20250621180527'),('20250621180851'),('20250629185100'),('20250629185439'),('20250629190818'),('20250727170825'),('20250805174104'),('20251021165336'),('20251022160053'),('20251029071649');
+/*!40000 ALTER TABLE `schema_migrations` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `sign_up_topics`
+--
+
+DROP TABLE IF EXISTS `sign_up_topics`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `sign_up_topics` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `topic_name` text NOT NULL,
+  `assignment_id` bigint NOT NULL,
+  `max_choosers` int NOT NULL DEFAULT '0',
+  `category` text,
+  `topic_identifier` varchar(10) DEFAULT NULL,
+  `micropayment` int DEFAULT '0',
+  `private_to` int DEFAULT NULL,
+  `description` text,
+  `link` varchar(255) DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `fk_sign_up_categories_sign_up_topics` (`assignment_id`),
+  KEY `index_sign_up_topics_on_assignment_id` (`assignment_id`),
+  CONSTRAINT `fk_rails_c15a869a32` FOREIGN KEY (`assignment_id`) REFERENCES `assignments` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `sign_up_topics`
+--
+
+LOCK TABLES `sign_up_topics` WRITE;
+/*!40000 ALTER TABLE `sign_up_topics` DISABLE KEYS */;
+INSERT INTO `sign_up_topics` VALUES (1,'AI and Machine Learning',1,2,NULL,NULL,0,NULL,'Research on artificial intelligence applications',NULL,'2025-11-15 22:49:22.252164','2025-11-15 22:49:22.252164'),(2,'Web Development',1,2,NULL,NULL,0,NULL,'Modern web development frameworks and tools',NULL,'2025-11-15 22:49:22.266382','2025-11-15 22:49:22.266382'),(3,'Mobile Applications',1,2,NULL,NULL,0,NULL,'iOS and Android app development',NULL,'2025-11-15 22:49:22.286811','2025-11-15 22:49:22.286811');
+/*!40000 ALTER TABLE `sign_up_topics` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `signed_up_teams`
+--
+
+DROP TABLE IF EXISTS `signed_up_teams`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `signed_up_teams` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `sign_up_topic_id` bigint NOT NULL,
+  `team_id` bigint NOT NULL,
+  `is_waitlisted` tinyint(1) DEFAULT NULL,
+  `preference_priority_number` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `comments_for_advertisement` text,
+  `advertise_for_partner` tinyint(1) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_signed_up_teams_on_sign_up_topic_id` (`sign_up_topic_id`),
+  KEY `index_signed_up_teams_on_team_id` (`team_id`),
+  CONSTRAINT `fk_rails_b3a6d3624c` FOREIGN KEY (`team_id`) REFERENCES `teams` (`id`),
+  CONSTRAINT `fk_rails_f886024d81` FOREIGN KEY (`sign_up_topic_id`) REFERENCES `sign_up_topics` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `signed_up_teams`
+--
+
+LOCK TABLES `signed_up_teams` WRITE;
+/*!40000 ALTER TABLE `signed_up_teams` DISABLE KEYS */;
+INSERT INTO `signed_up_teams` VALUES (1,1,17,0,NULL,'2025-11-15 22:49:22.516383','2025-11-15 22:49:22.516383','Python &AND& TensorFlow &AND& Data Science',1),(2,2,18,0,NULL,'2025-11-15 22:49:22.579260','2025-11-15 22:49:22.579260','React &AND& Node.js &AND& TypeScript',1),(3,3,19,0,NULL,'2025-11-15 22:49:22.649225','2025-11-15 22:49:22.649225',NULL,0);
+/*!40000 ALTER TABLE `signed_up_teams` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `ta_mappings`
+--
+
+DROP TABLE IF EXISTS `ta_mappings`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `ta_mappings` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `course_id` bigint NOT NULL,
+  `user_id` bigint NOT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_ta_mappings_on_course_id` (`course_id`),
+  KEY `fk_ta_mapping_users` (`user_id`),
+  KEY `index_ta_mappings_on_user_id` (`user_id`),
+  CONSTRAINT `fk_rails_3db3e2b248` FOREIGN KEY (`course_id`) REFERENCES `courses` (`id`),
+  CONSTRAINT `fk_rails_f98655c908` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `ta_mappings`
+--
+
+LOCK TABLES `ta_mappings` WRITE;
+/*!40000 ALTER TABLE `ta_mappings` DISABLE KEYS */;
+/*!40000 ALTER TABLE `ta_mappings` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `teams`
+--
+
+DROP TABLE IF EXISTS `teams`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `teams` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `type` varchar(255) NOT NULL,
+  `parent_id` int NOT NULL,
+  `grade_for_submission` int DEFAULT NULL,
+  `comment_for_submission` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `teams`
+--
+
+LOCK TABLES `teams` WRITE;
+/*!40000 ALTER TABLE `teams` DISABLE KEYS */;
+INSERT INTO `teams` VALUES (1,'2025-11-15 22:49:09.978170','2025-11-15 22:49:09.978170','denice','AssignmentTeam',1,NULL,NULL),(2,'2025-11-15 22:49:09.993937','2025-11-15 22:49:09.993937','adan stoltenberg','AssignmentTeam',1,NULL,NULL),(3,'2025-11-15 22:49:10.009747','2025-11-15 22:49:10.009747','sang','AssignmentTeam',1,NULL,NULL),(4,'2025-11-15 22:49:10.026409','2025-11-15 22:49:10.026409','herb','AssignmentTeam',1,NULL,NULL),(5,'2025-11-15 22:49:10.044312','2025-11-15 22:49:10.044312','giuseppe wiegand','AssignmentTeam',1,NULL,NULL),(6,'2025-11-15 22:49:10.077570','2025-11-15 22:49:10.077570','delia rogahn','AssignmentTeam',1,NULL,NULL),(7,'2025-11-15 22:49:10.176154','2025-11-15 22:49:10.176154','jordon spencer','AssignmentTeam',1,NULL,NULL),(8,'2025-11-15 22:49:10.190295','2025-11-15 22:49:10.190295','cruz','AssignmentTeam',1,NULL,NULL),(9,'2025-11-15 22:49:10.224191','2025-11-15 22:49:10.224191','lakeshia borer','CourseTeam',2,NULL,NULL),(10,'2025-11-15 22:49:10.240950','2025-11-15 22:49:10.240950','roni grimes','CourseTeam',2,NULL,NULL),(11,'2025-11-15 22:49:10.254785','2025-11-15 22:49:10.254785','gary predovic','CourseTeam',2,NULL,NULL),(12,'2025-11-15 22:49:10.279512','2025-11-15 22:49:10.279512','moses jakubowski','CourseTeam',2,NULL,NULL),(13,'2025-11-15 22:49:10.309244','2025-11-15 22:49:10.309244','gita','CourseTeam',2,NULL,NULL),(14,'2025-11-15 22:49:10.333895','2025-11-15 22:49:10.333895','machelle','CourseTeam',2,NULL,NULL),(15,'2025-11-15 22:49:10.349560','2025-11-15 22:49:10.349560','daine corkery','CourseTeam',2,NULL,NULL),(16,'2025-11-15 22:49:10.370800','2025-11-15 22:49:10.370800','verline','CourseTeam',2,NULL,NULL),(17,'2025-11-15 22:49:22.399739','2025-11-15 22:49:22.399739','AI Innovators','AssignmentTeam',1,NULL,NULL),(18,'2025-11-15 22:49:22.531058','2025-11-15 22:49:22.531058','Web Warriors','AssignmentTeam',1,NULL,NULL),(19,'2025-11-15 22:49:22.594653','2025-11-15 22:49:22.594653','Mobile Masters','AssignmentTeam',1,NULL,NULL);
+/*!40000 ALTER TABLE `teams` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `teams_participants`
+--
+
+DROP TABLE IF EXISTS `teams_participants`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `teams_participants` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `team_id` bigint NOT NULL,
+  `duty_id` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `participant_id` bigint NOT NULL,
+  `user_id` int NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_teams_participants_on_participant_id` (`participant_id`),
+  KEY `index_teams_participants_on_team_id` (`team_id`),
+  KEY `index_teams_participants_on_user_id` (`user_id`),
+  CONSTRAINT `fk_rails_f4d20198de` FOREIGN KEY (`participant_id`) REFERENCES `participants` (`id`),
+  CONSTRAINT `fk_rails_fc217eb52e` FOREIGN KEY (`team_id`) REFERENCES `teams` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `teams_participants`
+--
+
+LOCK TABLES `teams_participants` WRITE;
+/*!40000 ALTER TABLE `teams_participants` DISABLE KEYS */;
+INSERT INTO `teams_participants` VALUES (1,1,NULL,'2025-11-15 22:49:20.120273','2025-11-15 22:49:20.120273',1,10),(2,2,NULL,'2025-11-15 22:49:20.151957','2025-11-15 22:49:20.151957',2,11),(3,3,NULL,'2025-11-15 22:49:20.187710','2025-11-15 22:49:20.187710',3,12),(4,4,NULL,'2025-11-15 22:49:20.230627','2025-11-15 22:49:20.230627',4,13),(5,5,NULL,'2025-11-15 22:49:20.273339','2025-11-15 22:49:20.273339',5,14),(6,6,NULL,'2025-11-15 22:49:20.312217','2025-11-15 22:49:20.312217',6,15),(7,7,NULL,'2025-11-15 22:49:20.343751','2025-11-15 22:49:20.343751',7,16),(8,8,NULL,'2025-11-15 22:49:20.376074','2025-11-15 22:49:20.376074',8,17),(9,9,NULL,'2025-11-15 22:49:20.409146','2025-11-15 22:49:20.409146',9,18),(10,10,NULL,'2025-11-15 22:49:20.440938','2025-11-15 22:49:20.440938',10,19),(11,11,NULL,'2025-11-15 22:49:20.482101','2025-11-15 22:49:20.482101',11,20),(12,12,NULL,'2025-11-15 22:49:20.519310','2025-11-15 22:49:20.519310',12,21),(13,13,NULL,'2025-11-15 22:49:20.552850','2025-11-15 22:49:20.552850',13,22),(14,14,NULL,'2025-11-15 22:49:20.586153','2025-11-15 22:49:20.586153',14,23),(15,15,NULL,'2025-11-15 22:49:20.621640','2025-11-15 22:49:20.621640',15,24),(16,16,NULL,'2025-11-15 22:49:20.657731','2025-11-15 22:49:20.657731',16,25),(17,1,NULL,'2025-11-15 22:49:20.687672','2025-11-15 22:49:20.687672',17,26),(18,2,NULL,'2025-11-15 22:49:20.719120','2025-11-15 22:49:20.719120',18,27),(19,3,NULL,'2025-11-15 22:49:20.752424','2025-11-15 22:49:20.752424',19,28),(20,4,NULL,'2025-11-15 22:49:20.785478','2025-11-15 22:49:20.785478',20,29),(21,5,NULL,'2025-11-15 22:49:20.821631','2025-11-15 22:49:20.821631',21,30),(22,6,NULL,'2025-11-15 22:49:20.857609','2025-11-15 22:49:20.857609',22,31),(23,7,NULL,'2025-11-15 22:49:20.891295','2025-11-15 22:49:20.891295',23,32),(24,17,NULL,'2025-11-15 22:49:22.426925','2025-11-15 22:49:22.426925',47,2),(25,17,NULL,'2025-11-15 22:49:22.447826','2025-11-15 22:49:22.447826',48,3),(26,18,NULL,'2025-11-15 22:49:22.550799','2025-11-15 22:49:22.550799',49,4),(27,19,NULL,'2025-11-15 22:49:22.619734','2025-11-15 22:49:22.619734',50,5),(28,17,NULL,'2025-11-15 22:51:39.631775','2025-11-15 22:51:39.631775',51,6),(29,18,NULL,'2025-11-15 22:54:20.533274','2025-11-15 22:54:20.533274',52,7),(30,18,NULL,'2025-11-15 22:59:53.075085','2025-11-15 22:59:53.075085',50,5),(31,18,NULL,'2025-11-15 22:59:59.901036','2025-11-15 22:59:59.901036',48,3),(32,17,NULL,'2025-11-15 23:23:30.137080','2025-11-15 23:23:30.137080',49,4);
+/*!40000 ALTER TABLE `teams_participants` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `teams_users`
+--
+
+DROP TABLE IF EXISTS `teams_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `teams_users` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `team_id` bigint NOT NULL,
+  `user_id` bigint NOT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_teams_users_on_team_id` (`team_id`),
+  KEY `index_teams_users_on_user_id` (`user_id`),
+  CONSTRAINT `fk_rails_74983f37ec` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `fk_rails_7caef73a94` FOREIGN KEY (`team_id`) REFERENCES `teams` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `teams_users`
+--
+
+LOCK TABLES `teams_users` WRITE;
+/*!40000 ALTER TABLE `teams_users` DISABLE KEYS */;
+/*!40000 ALTER TABLE `teams_users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `users`
+--
+
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `users` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `password_digest` varchar(255) DEFAULT NULL,
+  `full_name` varchar(255) DEFAULT NULL,
+  `email` varchar(255) DEFAULT NULL,
+  `mru_directory_path` varchar(255) DEFAULT NULL,
+  `email_on_review` tinyint(1) DEFAULT '0',
+  `email_on_submission` tinyint(1) DEFAULT '0',
+  `email_on_review_of_review` tinyint(1) DEFAULT '0',
+  `is_new_user` tinyint(1) DEFAULT '1',
+  `master_permission_granted` tinyint(1) DEFAULT '0',
+  `handle` varchar(255) DEFAULT NULL,
+  `persistence_token` varchar(255) DEFAULT NULL,
+  `timeZonePref` varchar(255) DEFAULT NULL,
+  `copy_of_emails` tinyint(1) DEFAULT '0',
+  `etc_icons_on_homepage` tinyint(1) DEFAULT '0',
+  `locale` int DEFAULT NULL,
+  `created_at` datetime(6) NOT NULL,
+  `updated_at` datetime(6) NOT NULL,
+  `institution_id` bigint DEFAULT NULL,
+  `role_id` bigint NOT NULL,
+  `parent_id` bigint DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `index_users_on_institution_id` (`institution_id`),
+  KEY `index_users_on_parent_id` (`parent_id`),
+  KEY `index_users_on_role_id` (`role_id`),
+  CONSTRAINT `fk_rails_642f17018b` FOREIGN KEY (`role_id`) REFERENCES `roles` (`id`),
+  CONSTRAINT `fk_rails_684a13307d` FOREIGN KEY (`parent_id`) REFERENCES `users` (`id`),
+  CONSTRAINT `fk_rails_7fcf39ca13` FOREIGN KEY (`institution_id`) REFERENCES `institutions` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `users`
+--
+
+LOCK TABLES `users` WRITE;
+/*!40000 ALTER TABLE `users` DISABLE KEYS */;
+INSERT INTO `users` VALUES (1,'admin','$2a$12$Vx8Y.xeROXxiS/L0y/V1lOAPNDRU61X698xqy23ZTOFFEQxdydnwS','admin admin','admin2@example.com',NULL,0,0,0,1,0,NULL,NULL,NULL,0,1,NULL,'2025-11-15 22:49:04.137704','2025-11-15 22:49:04.137704',1,1,NULL),(2,'alice','$2a$12$MY4nYh9fMeKYLJgZq/VmTuD3k2txq0wFhQnpDO4hcLy0TsPHMdGWC','Alice Johnson','alice@example.com',NULL,0,0,0,1,0,'alice',NULL,NULL,0,1,NULL,'2025-11-15 22:49:05.271823','2025-11-15 22:49:05.271823',1,5,NULL),(3,'bob','$2a$12$QBigs3zR7OX0O9tvjC0XROMA938IBxN9xYf082No4ANivlTPK88Na','Bob Smith','bob@example.com',NULL,0,0,0,1,0,'bob',NULL,NULL,0,1,NULL,'2025-11-15 22:49:06.475531','2025-11-15 22:49:06.475531',1,5,NULL),(4,'charlie','$2a$12$Q343KEH76jtMUXbpHjgd8.UsjsQffk.T6KGeXEnKtcRWjLt19Yh0C','Charlie Davis','charlie@example.com',NULL,0,0,0,1,0,'charlie',NULL,NULL,0,1,NULL,'2025-11-15 22:49:06.700163','2025-11-15 22:49:06.700163',1,5,NULL),(5,'diana','$2a$12$VNyl5.UMIv/IbgvyMHF4W.8hRzog60gZLP9ex5Nrg.dJzkiRt1fn6','Diana Martinez','diana@example.com',NULL,0,0,0,1,0,'diana',NULL,NULL,0,1,NULL,'2025-11-15 22:49:06.918754','2025-11-15 22:49:06.918754',1,5,NULL),(6,'ethan','$2a$12$9K7/6ME2hRezvI1hg16.r..NPOQZKx46NM9Mt6cskYDfTPORKbERa','Ethan Brown','ethan@example.com',NULL,0,0,0,1,0,'ethan',NULL,NULL,0,1,NULL,'2025-11-15 22:49:07.130909','2025-11-15 22:49:07.130909',1,5,NULL),(7,'fiona','$2a$12$VbG2NF21lktaVQE3TdprbeF6y7hxBZMKeyGkZZSKxeQDvWIy/5I/u','Fiona Wilson','fiona@example.com',NULL,0,0,0,1,0,'fiona',NULL,NULL,0,1,NULL,'2025-11-15 22:49:07.352882','2025-11-15 22:49:07.352882',1,5,NULL),(8,'heike','$2a$12$YjZNcOlcQHP/fZZNy29P4OQiC1IX8q34ISe95q/uDgQWtsvR77Y2G','Blaine Graham','troy@moore.example',NULL,0,0,0,1,0,NULL,NULL,NULL,0,1,NULL,'2025-11-15 22:49:09.361012','2025-11-15 22:49:09.361012',1,3,NULL),(9,'jimmy_hartmann','$2a$12$ctzF5S5Oa7ln7.zqaQOE3uppVAukgqbZzr27z6/JnVpW37H8dYYRy','Rep. Laurena Ledner','mariel@howe.example',NULL,0,0,0,1,0,NULL,NULL,NULL,0,1,NULL,'2025-11-15 22:49:09.558354','2025-11-15 22:49:09.558354',1,3,NULL),(10,'breann_ohara','$2a$12$lQE59ews5RzQ8G/eGulW7uiYUXxf8V3Vd7c0AETVyLFSSr9D79.12','Agustin Feil','phung@hettinger-schultz.example',NULL,0,0,0,1,0,'simon-rohan',NULL,NULL,0,1,NULL,'2025-11-15 22:49:10.589466','2025-11-15 22:49:10.589466',1,5,NULL),(11,'nan','$2a$12$EzVoweoIZDrhIcqt3j9vp.lYK8NceLtYEvbqlP/zdPwlt1roGhgIe','Ricky Okuneva','joseph@lemke.example',NULL,0,0,0,1,0,'martine',NULL,NULL,0,1,NULL,'2025-11-15 22:49:10.790924','2025-11-15 22:49:10.790924',1,5,NULL),(12,'raymond_dibbert','$2a$12$MPj82l1s1ODjSq7bxoyODOVDteqOYNwBCymcnbSf5Uu4jyedIXAf2','Bret Moore','lakeesha_donnelly@armstrong-bogisich.example',NULL,0,0,0,1,0,'joanne-reichert',NULL,NULL,0,1,NULL,'2025-11-15 22:49:10.983761','2025-11-15 22:49:10.983761',1,5,NULL),(13,'marshall_block','$2a$12$jYJxb9V4I0qNY6hyNlfJ4e.G4cNYs1.4QzP.avwsSK3Tfq10lgSv6','Arthur Mertz','zack@lehner-nikolaus.test',NULL,0,0,0,1,0,'antonetta',NULL,NULL,0,1,NULL,'2025-11-15 22:49:11.196071','2025-11-15 22:49:11.196071',1,5,NULL),(14,'kirby_kihn','$2a$12$.KDaZzjPFA6t4htIBshql.iUqw4cBbRuvuJHcqk/XGKcw9W.fMbKu','Raymond Nolan','tobias.treutel@schuster-gutkowski.test',NULL,0,0,0,1,0,'glenda',NULL,NULL,0,1,NULL,'2025-11-15 22:49:11.402705','2025-11-15 22:49:11.402705',1,5,NULL),(15,'pablo_medhurst','$2a$12$Kw/yW8tdqM3tWd8mplQAZu.2ZO4dRBx2XrKX87qFcxEfuP3rmQ3qu','Logan Yundt','chang@funk-bergstrom.test',NULL,0,0,0,1,0,'kenda',NULL,NULL,0,1,NULL,'2025-11-15 22:49:11.605050','2025-11-15 22:49:11.605050',1,5,NULL),(16,'heather','$2a$12$Jsu8iL1Io1IxZgdvb9HqfeMpqzdqF56WewRPIBSSFs23oOSFlauh6','Sam Leannon','robin@white.example',NULL,0,0,0,1,0,'ji',NULL,NULL,0,1,NULL,'2025-11-15 22:49:11.805567','2025-11-15 22:49:11.805567',1,5,NULL),(17,'edie_hane','$2a$12$fsCbIXuTfWGoHygg2mR7Xu4mdk3TNHXLvcc/5MptYxXRpoAl2Us0q','Jeffry Kris','lawerence@bednar.example',NULL,0,0,0,1,0,'nelson',NULL,NULL,0,1,NULL,'2025-11-15 22:49:12.007642','2025-11-15 22:49:12.007642',1,5,NULL),(18,'rosenda_morar','$2a$12$hXK32BUXSHNmz1Co1A0jSe7V9harj5ZXMmC.ZCTbzCBKwI9J4wQma','Jackson Kautzer','reyes.stiedemann@lang.test',NULL,0,0,0,1,0,'xavier',NULL,NULL,0,1,NULL,'2025-11-15 22:49:12.214776','2025-11-15 22:49:12.214776',1,5,NULL),(19,'edison','$2a$12$2gBlIWdChpu5CRClWwrXKemFlGhKRh.9TEHyuF394cb7vVrMAaQ7C','Rep. Sheldon Miller','abe@okeefe-jacobs.test',NULL,0,0,0,1,0,'rose',NULL,NULL,0,1,NULL,'2025-11-15 22:49:12.443180','2025-11-15 22:49:12.443180',1,5,NULL),(20,'rebeca_metz','$2a$12$NIUY5o2NpuDCsbvLKLSaQ.WmGd4uoNGVvbvSkK3ljxnqDRaqluPsq','Mariel Hettinger','damien@kunde-corwin.test',NULL,0,0,0,1,0,'lissa-keeling',NULL,NULL,0,1,NULL,'2025-11-15 22:49:12.677076','2025-11-15 22:49:12.677076',1,5,NULL),(21,'francesco','$2a$12$Bt52GRFtVAitdE4UQnuug.Ui8zhujseb87V8V5eWlShGTq.FoOYPe','Thomasena Prohaska','danae.bosco@lakin.test',NULL,0,0,0,1,0,'jonathan-gulgowski',NULL,NULL,0,1,NULL,'2025-11-15 22:49:12.880843','2025-11-15 22:49:12.880843',1,5,NULL),(22,'jacob','$2a$12$ApRpl.N48d17smJW6cexJeIZEQ0SDAnfw6mtxyvt90mmsQcNCc6Ai','Benjamin Romaguera','marty@okon.test',NULL,0,0,0,1,0,'livia',NULL,NULL,0,1,NULL,'2025-11-15 22:49:13.091180','2025-11-15 22:49:13.091180',1,5,NULL),(23,'ivory_pouros','$2a$12$Fv1F3x70gpNij.JCU1M/q.T3ja5wQRe1hLclz4I3bwAOJ9VOd5uRW','Germaine Altenwerth','marlena.predovic@koelpin.test',NULL,0,0,0,1,0,'janiece',NULL,NULL,0,1,NULL,'2025-11-15 22:49:13.327186','2025-11-15 22:49:13.327186',1,5,NULL),(24,'seymour','$2a$12$L7gn/H7kcY7vVnjgL4gjxOJ3E7tgx/bFzImFIpP.MHYzDZwjY3eA.','Hugh Shields','hassan.labadie@cartwright-witting.example',NULL,0,0,0,1,0,'jason',NULL,NULL,0,1,NULL,'2025-11-15 22:49:13.538869','2025-11-15 22:49:13.538869',1,5,NULL),(25,'catherina','$2a$12$BxEJQFfBN2623ngTs4LplOBib12i1RqZ7xXeMzpNFQtGkPSfN.H3y','Jeremy Wisoky','andreas_schoen@harris.example',NULL,0,0,0,1,0,'michel-mohr',NULL,NULL,0,1,NULL,'2025-11-15 22:49:13.734944','2025-11-15 22:49:13.734944',1,5,NULL),(26,'damian','$2a$12$.K7krwTb7fjySi2vcXu6He8xG4ziRmLkl542qm9PxAX6IqvFJN9um','Norman Rodriguez','russel@lockman.test',NULL,0,0,0,1,0,'wesley',NULL,NULL,0,1,NULL,'2025-11-15 22:49:13.947616','2025-11-15 22:49:13.947616',1,5,NULL),(27,'lakita','$2a$12$OBaHESnqSiuqvbwNpB70ueRuS5k39QVHFgVlPZQVFX0Ao1v2NUfHK','Almeda Wuckert Sr.','miranda@cole-sauer.example',NULL,0,0,0,1,0,'eileen',NULL,NULL,0,1,NULL,'2025-11-15 22:49:14.148864','2025-11-15 22:49:14.148864',1,5,NULL),(28,'betsey_breitenberg','$2a$12$k.tYvUNLiZ/WhKT/8kirgeW9ZuVHagWmEG9HUZJ7v0AvBrMgNuy8q','Marc Wuckert','johnie@bahringer-quigley.example',NULL,0,0,0,1,0,'lynwood-medhurst',NULL,NULL,0,1,NULL,'2025-11-15 22:49:14.347485','2025-11-15 22:49:14.347485',1,5,NULL),(29,'aldo','$2a$12$UbpJC6KFTiusZbkp.m3rzecCdVeXlRQemiGETvEX..F.3GaA2xQkq','Connie Moen','timothy_little@kovacek.test',NULL,0,0,0,1,0,'ira',NULL,NULL,0,1,NULL,'2025-11-15 22:49:14.554583','2025-11-15 22:49:14.554583',1,5,NULL),(30,'fidela','$2a$12$GSxQRlm0/PZTTAeIq0ZHguDkzQgWO/9RYTLKU6wYFheO74HqWJi4e','Msgr. Tommie Daugherty','dion@abshire.test',NULL,0,0,0,1,0,'gavin',NULL,NULL,0,1,NULL,'2025-11-15 22:49:14.753713','2025-11-15 22:49:14.753713',1,5,NULL),(31,'stacy','$2a$12$C4G.3cw6bgJEoTBAhdCWvOMmO3W7cw7r05P.ZbbODMQe5ewo13aA2','Darby Zemlak','brett.feil@thompson-hintz.example',NULL,0,0,0,1,0,'anthony',NULL,NULL,0,1,NULL,'2025-11-15 22:49:14.969435','2025-11-15 22:49:14.969435',1,5,NULL),(32,'renna_mccullough','$2a$12$62D151j/MivNsCWO9A9Rf.C2o/Vtoz1cUoaNXlwNJ3EcVddKGnFx2','Cherri Casper','jamey.leffler@gleichner.example',NULL,0,0,0,1,0,'anthony-schuppe',NULL,NULL,0,1,NULL,'2025-11-15 22:49:15.166643','2025-11-15 22:49:15.166643',1,5,NULL),(33,'adaline_runte','$2a$12$otC42sAsD1BlQnLMqLuO7ep0kr2MELuZha2K.dlwrYnUWdLKx7So2','Clinton Wiegand','kiana_gleichner@stoltenberg.example',NULL,0,0,0,1,0,'julieann',NULL,NULL,0,1,NULL,'2025-11-15 22:49:15.375901','2025-11-15 22:49:15.375901',1,5,NULL),(34,'david','$2a$12$6wlBCKrtP6R9zOgVxyB71etafith2YOO0mUTNkmEw4hDSdJZgkG62','Wyatt Mueller II','shirl@mayer.test',NULL,0,0,0,1,0,'milton-sanford',NULL,NULL,0,1,NULL,'2025-11-15 22:49:15.583437','2025-11-15 22:49:15.583437',1,5,NULL),(35,'donald','$2a$12$JZv328TZMDJmn4zgzrEzdOFSC965H5xWBcpqirFIdvDK8F4l/RNCy','Nita Macejkovic','nathanial.hessel@anderson.test',NULL,0,0,0,1,0,'colin-stracke',NULL,NULL,0,1,NULL,'2025-11-15 22:49:15.795134','2025-11-15 22:49:15.795134',1,5,NULL),(36,'thad_schaden','$2a$12$j6G1ulQ8hbCziSvLkrGJ5.9B7pW7zVztromG5GPWkj3I4HOwlxvdy','Dr. Eldon Buckridge','nestor@turner-tremblay.example',NULL,0,0,0,1,0,'rigoberto-oberbrunner',NULL,NULL,0,1,NULL,'2025-11-15 22:49:15.995918','2025-11-15 22:49:15.995918',1,5,NULL),(37,'casey','$2a$12$wQDmK3GbvmzPLBdQXR3AqOHhPSrMpHwEMw3Nwl4rORMNdfbjn/XhS','Marketta Kirlin','bettie_smitham@stokes-baumbach.example',NULL,0,0,0,1,0,'vern-blick',NULL,NULL,0,1,NULL,'2025-11-15 22:49:16.198008','2025-11-15 22:49:16.198008',1,5,NULL),(38,'quinn','$2a$12$jsATc51esaAoyUCojko60O9QKWiv7ShhR2cxO6zU1b/FGpnNMZOlm','Muriel Koss','charley_bailey@rath.test',NULL,0,0,0,1,0,'janyce',NULL,NULL,0,1,NULL,'2025-11-15 22:49:16.406961','2025-11-15 22:49:16.406961',1,5,NULL),(39,'mackenzie','$2a$12$At9c0GCZyzF5eJ2ICHnWP.Y5wVNoIx4C7HroSDxeGX7m5cvaspLom','Tamatha Gorczany','shea_hyatt@ward.test',NULL,0,0,0,1,0,'kerrie-hane',NULL,NULL,0,1,NULL,'2025-11-15 22:49:16.616785','2025-11-15 22:49:16.616785',1,5,NULL),(40,'shirley','$2a$12$t/l9CAjNlTcxIA96/sQIjeneMNTEaXjvivkx9Puyg87nAI74sv8dq','Selma Dooley','clarine@medhurst-ritchie.example',NULL,0,0,0,1,0,'jerald',NULL,NULL,0,1,NULL,'2025-11-15 22:49:16.821363','2025-11-15 22:49:16.821363',1,5,NULL),(41,'terisa','$2a$12$5zaSPlcP3554kNNzwZQoKezBq0ydUKUfthjZMfTLOmPxVSbG9q6qS','Season Abshire','burton.farrell@quitzon.test',NULL,0,0,0,1,0,'kylie-beier',NULL,NULL,0,1,NULL,'2025-11-15 22:49:17.025014','2025-11-15 22:49:17.025014',1,5,NULL),(42,'suzan','$2a$12$5BOJwKQL0zjo9QGZXXQwse.qzgz4l0vNhaWC8bmRw7GYvdXrZO5pO','Rhett Collier','palmer.gibson@stiedemann.example',NULL,0,0,0,1,0,'willian-hirthe',NULL,NULL,0,1,NULL,'2025-11-15 22:49:17.230537','2025-11-15 22:49:17.230537',1,5,NULL),(43,'tony_schuppe','$2a$12$kIJNqs7mT8IO.jlhMjB6HOOOxlRh89luvUjSHRExHSANerEBd5TvS','Evalyn Runte','claudette.homenick@renner.example',NULL,0,0,0,1,0,'vincent',NULL,NULL,0,1,NULL,'2025-11-15 22:49:17.432953','2025-11-15 22:49:17.432953',1,5,NULL),(44,'terrell','$2a$12$YzXdI5kEFDJ1mOOJonN9ze9UjRvOXOnd6CEfNNp2upsPf2KXR8Bhu','Brock O\'Keefe III','marilee@hilpert.test',NULL,0,0,0,1,0,'kayla',NULL,NULL,0,1,NULL,'2025-11-15 22:49:17.641109','2025-11-15 22:49:17.641109',1,5,NULL),(45,'dwana_macgyver','$2a$12$9FyYFTTEsukbX0iW/HFEEe9P5eVJHJmc6sew6m.O6VvGcK6CdYov.','Hyon Thiel','morris.herman@block-stehr.test',NULL,0,0,0,1,0,'hung',NULL,NULL,0,1,NULL,'2025-11-15 22:49:17.835641','2025-11-15 22:49:17.835641',1,5,NULL),(46,'mckinley','$2a$12$240kAcLb/X5/uSFgf6Lol.LsB/dmc8eGoaOOwQoEIZ1htxovP0PAe','Ms. Aurelio Deckow','cassaundra@gislason.test',NULL,0,0,0,1,0,'ermelinda-mills',NULL,NULL,0,1,NULL,'2025-11-15 22:49:18.030227','2025-11-15 22:49:18.030227',1,5,NULL),(47,'keeley','$2a$12$UPRIALtJ.wUIKqVyOOxWw.OO9.OjmvyoVAHeeDG8mNrW/h9chy16.','Liane Kohler Esq.','marybeth_stanton@sawayn.test',NULL,0,0,0,1,0,'whitney',NULL,NULL,0,1,NULL,'2025-11-15 22:49:18.243797','2025-11-15 22:49:18.243797',1,5,NULL),(48,'milford_brekke','$2a$12$Nf1BBymrusDIAEJD4WAtaue0obrcYRM.3n6SOb4Jisr0YEIbVdeLu','Vern Stehr','twyla.prohaska@leuschke-stehr.test',NULL,0,0,0,1,0,'sergio',NULL,NULL,0,1,NULL,'2025-11-15 22:49:18.464760','2025-11-15 22:49:18.464760',1,5,NULL),(49,'lupe_west','$2a$12$S.eRInToSH7Bee9YZkIkueR108wIk6u9WnbNzBbCtOMaqN7Tknmhq','Alfred White','marcelino@cruickshank.test',NULL,0,0,0,1,0,'stanford',NULL,NULL,0,1,NULL,'2025-11-15 22:49:18.674721','2025-11-15 22:49:18.674721',1,5,NULL),(50,'audria','$2a$12$CaymNcMEvNRlIrh5i3fXkOoUa/A2k8IJEpfya2G4BavKYBQERXRHq','Rosario Raynor','lashunda@adams-runolfsson.test',NULL,0,0,0,1,0,'margene',NULL,NULL,0,1,NULL,'2025-11-15 22:49:18.878725','2025-11-15 22:49:18.878725',1,5,NULL),(51,'mallie','$2a$12$Yhd7UMfiQByNd8befS3lL.WvIzbKJUJf31i3SKDpGF.vSp2mhvXGC','Dean Carroll','tamatha.macejkovic@williamson-schuster.test',NULL,0,0,0,1,0,'wanda-oreilly',NULL,NULL,0,1,NULL,'2025-11-15 22:49:19.089954','2025-11-15 22:49:19.089954',1,5,NULL),(52,'sharda','$2a$12$QREH39TpuZ.vX11HlskHXOA02wyWKLuLGNzV1MiwRFXjHfbaAHd2G','Hang Cormier DC','elvera@brown-wilderman.test',NULL,0,0,0,1,0,'james',NULL,NULL,0,1,NULL,'2025-11-15 22:49:19.293444','2025-11-15 22:49:19.293444',1,5,NULL),(53,'francisco_mills','$2a$12$NmvdYgWqHxVc/KiU1b260eRDT4HJc9MJ4vx5AQRA/BsCqbPMOi9Nq','Kai Jerde DC','karl.ziemann@mitchell.example',NULL,0,0,0,1,0,'gregory',NULL,NULL,0,1,NULL,'2025-11-15 22:49:19.491197','2025-11-15 22:49:19.491197',1,5,NULL),(54,'jeromy_schaden','$2a$12$J/Vr1ei/AQZdXRVL68ED.uqZqM7yHeIQIVtDkzg9S3Yxpob1fycJu','Wilson Lehner','sam@collier.test',NULL,0,0,0,1,0,'johnie-zemlak',NULL,NULL,0,1,NULL,'2025-11-15 22:49:19.694554','2025-11-15 22:49:19.694554',1,5,NULL),(55,'kizzy','$2a$12$acIqqMmYyUPnMJd0OU6Ck.ItrwH5Q9I2ZkCMhASxZ8.neA.kD.L/S','Malcolm Doyle','douglass.kshlerin@reilly-breitenberg.test',NULL,0,0,0,1,0,'erline',NULL,NULL,0,1,NULL,'2025-11-15 22:49:19.895422','2025-11-15 22:49:19.895422',1,5,NULL);
+/*!40000 ALTER TABLE `users` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2025-11-15 23:30:17
diff --git a/db/add_signup_test_data.rb b/db/add_signup_test_data.rb
new file mode 100644
index 000000000..7f1d50c5e
--- /dev/null
+++ b/db/add_signup_test_data.rb
@@ -0,0 +1,258 @@
+# Script to add test data for signup sheet with advertisements
+
+puts "Starting to add test data for signup sheet..."
+
+# Find or create an assignment
+assignment = Assignment.first
+unless assignment
+  puts "Creating test assignment..."
+  assignment = Assignment.create!(
+    name: "Test Assignment - Final Project",
+    directory_path: "/test",
+    submitter_count: 0,
+    course_id: 1,
+    instructor_id: 2,
+    private: false,
+    num_reviews: 3,
+    num_review_of_reviews: 1,
+    num_review_of_reviewers: 1,
+    reviews_visible_to_all: true,
+    num_reviewers: 3,
+    spec_link: "https://example.com/spec",
+    max_team_size: 4,
+    staggered_deadline: false,
+    allow_suggestions: false,
+    days_between_submissions: 7,
+    review_assignment_strategy: "Auto-Selected",
+    max_reviews_per_submission: 3,
+    review_topic_threshold: 0,
+    copy_flag: false,
+    rounds_of_reviews: 1,
+    microtask: false,
+    require_quiz: false,
+    num_quiz_questions: 0,
+    is_calibrated: false,
+    availability_flag: true,
+    use_bookmark: true,
+    can_review_same_topic: true,
+    can_choose_topic_to_review: true,
+    is_intelligent: false,
+    calculate_penalty: false,
+    late_policy_id: nil,
+    is_penalty_calculated: false,
+    max_choosing_teams: 1,
+    is_anonymous: true,
+    num_reviews_required: 3,
+    num_metareviews_required: 1,
+    num_reviews_allowed: 3,
+    num_metareviews_allowed: 3,
+    simicheck: -1,
+    simicheck_threshold: 100
+  )
+  puts "Created assignment: #{assignment.name} (ID: #{assignment.id})"
+end
+
+puts "Using assignment: #{assignment.name} (ID: #{assignment.id})"
+
+# Create sign up topics if they don't exist
+topics_data = [
+  { name: "Ruby on Rails Best Practices", max_choosers: 3, description: "Study and present best practices in Rails development" },
+  { name: "React Frontend Development", max_choosers: 2, description: "Build a modern React application" },
+  { name: "API Design and Documentation", max_choosers: 3, description: "Design and document RESTful APIs" },
+  { name: "Database Optimization", max_choosers: 2, description: "Performance tuning for MySQL databases" }
+]
+
+topics = []
+topics_data.each_with_index do |topic_data, index|
+  topic = SignUpTopic.find_or_create_by!(
+    topic_name: topic_data[:name],
+    assignment_id: assignment.id
+  ) do |t|
+    t.topic_identifier = (index + 1).to_s
+    t.max_choosers = topic_data[:max_choosers]
+    t.category = "Project Topics"
+    t.description = topic_data[:description]
+  end
+  topics << topic
+  puts "Created/found topic: #{topic.topic_name} (ID: #{topic.id})"
+end
+
+# Find the student users
+user1 = User.find_by(name: "quinn_johns")
+user2 = User.find_by(name: "gaston_blick") || User.find_by(role_id: 3).second
+user3 = User.where(role_id: 3).where.not(id: [user1&.id, user2&.id]).first
+
+unless user1
+  puts "ERROR: User quinn_johns not found!"
+  exit 1
+end
+
+puts "Found users: #{user1.name}, #{user2&.name || 'N/A'}, #{user3&.name || 'N/A'}"
+
+# Create assignment participants if they don't exist
+participant1 = AssignmentParticipant.find_or_create_by!(
+  user_id: user1.id,
+  parent_id: assignment.id
+) do |p|
+  p.can_submit = true
+  p.can_review = true
+  p.can_take_quiz = true
+  p.handle = user1.handle || user1.name
+end
+puts "Created/found participant for #{user1.name} (ID: #{participant1.id})"
+
+participant2 = nil
+if user2
+  participant2 = AssignmentParticipant.find_or_create_by!(
+    user_id: user2.id,
+    parent_id: assignment.id
+  ) do |p|
+    p.can_submit = true
+    p.can_review = true
+    p.can_take_quiz = true
+    p.handle = user2.handle || user2.name
+  end
+  puts "Created/found participant for #{user2.name} (ID: #{participant2.id})"
+end
+
+participant3 = nil
+if user3
+  participant3 = AssignmentParticipant.find_or_create_by!(
+    user_id: user3.id,
+    parent_id: assignment.id
+  ) do |p|
+    p.can_submit = true
+    p.can_review = true
+    p.can_take_quiz = true
+    p.handle = user3.handle || user3.name
+  end
+  puts "Created/found participant for #{user3.name} (ID: #{participant3.id})"
+end
+
+# Create teams
+team1 = AssignmentTeam.find_or_create_by!(
+  name: "Team Alpha",
+  parent_id: assignment.id
+) do |t|
+  t.type = "AssignmentTeam"
+end
+puts "Created/found team: #{team1.name} (ID: #{team1.id})"
+
+team2 = nil
+if user2
+  team2 = AssignmentTeam.find_or_create_by!(
+    name: "Team Beta",
+    parent_id: assignment.id
+  ) do |t|
+    t.type = "AssignmentTeam"
+  end
+  puts "Created/found team: #{team2.name} (ID: #{team2.id})"
+end
+
+team3 = nil
+if user3
+  team3 = AssignmentTeam.find_or_create_by!(
+    name: "Team Gamma",
+    parent_id: assignment.id
+  ) do |t|
+    t.type = "AssignmentTeam"
+  end
+  puts "Created/found team: #{team3.name} (ID: #{team3.id})"
+end
+
+# Add users to teams
+TeamsUser.find_or_create_by!(team_id: team1.id, user_id: user1.id)
+puts "Added #{user1.name} to #{team1.name}"
+
+if user2 && team2
+  TeamsUser.find_or_create_by!(team_id: team2.id, user_id: user2.id)
+  puts "Added #{user2.name} to #{team2.name}"
+end
+
+if user3 && team3
+  TeamsUser.find_or_create_by!(team_id: team3.id, user_id: user3.id)
+  puts "Added #{user3.name} to #{team3.name}"
+end
+
+# Sign up teams for topics with advertisements
+# Team 1 signs up for Topic 1 and advertises for partners
+signed_up_team1 = SignedUpTeam.find_or_create_by!(
+  team_id: team1.id,
+  sign_up_topic_id: topics[0].id
+) do |sut|
+  sut.is_waitlisted = false
+  sut.preference_priority_number = 1
+  sut.advertise_for_partner = true
+  sut.comments_for_advertisement = "Looking for experienced Ruby developers! We have strong frontend skills and need backend expertise. Great team dynamic!"
+end
+puts "Team #{team1.name} signed up for topic '#{topics[0].topic_name}' WITH advertisement"
+
+# Team 2 signs up for Topic 2 and advertises
+if team2
+  signed_up_team2 = SignedUpTeam.find_or_create_by!(
+    team_id: team2.id,
+    sign_up_topic_id: topics[1].id
+  ) do |sut|
+    sut.is_waitlisted = false
+    sut.preference_priority_number = 1
+    sut.advertise_for_partner = true
+    sut.comments_for_advertisement = "Seeking creative frontend developer for React project. We have backend covered and need someone passionate about UX/UI design!"
+  end
+  puts "Team #{team2.name} signed up for topic '#{topics[1].topic_name}' WITH advertisement"
+end
+
+# Team 3 signs up for Topic 3 WITHOUT advertising
+if team3
+  signed_up_team3 = SignedUpTeam.find_or_create_by!(
+    team_id: team3.id,
+    sign_up_topic_id: topics[2].id
+  ) do |sut|
+    sut.is_waitlisted = false
+    sut.preference_priority_number = 1
+    sut.advertise_for_partner = false
+  end
+  puts "Team #{team3.name} signed up for topic '#{topics[2].topic_name}' WITHOUT advertisement"
+end
+
+# Add one more team on waitlist for Topic 1 WITH advertisement
+if user2 && team2
+  # Create another team for demonstration
+  team4 = AssignmentTeam.find_or_create_by!(
+    name: "Team Delta",
+    parent_id: assignment.id
+  ) do |t|
+    t.type = "AssignmentTeam"
+  end
+  
+  # Sign up on waitlist with advertisement
+  SignedUpTeam.find_or_create_by!(
+    team_id: team4.id,
+    sign_up_topic_id: topics[0].id
+  ) do |sut|
+    sut.is_waitlisted = true
+    sut.preference_priority_number = 2
+    sut.advertise_for_partner = true
+    sut.comments_for_advertisement = "Waitlisted but ready to go! Full-stack team looking to collaborate. We're organized and committed!"
+  end
+  puts "Team #{team4.name} signed up for topic '#{topics[0].topic_name}' on WAITLIST WITH advertisement"
+end
+
+puts "\n" + "="*80
+puts "TEST DATA SUMMARY"
+puts "="*80
+puts "Assignment ID: #{assignment.id}"
+puts "Assignment Name: #{assignment.name}"
+puts "\nTopics created:"
+topics.each do |topic|
+  signed_teams = SignedUpTeam.where(sign_up_topic_id: topic.id)
+  advertising_teams = signed_teams.where(advertise_for_partner: true)
+  puts "  - #{topic.topic_name} (ID: #{topic.id})"
+  puts "    Max choosers: #{topic.max_choosers}"
+  puts "    Signed up teams: #{signed_teams.count}"
+  puts "    Advertising teams: #{advertising_teams.count}"
+end
+
+puts "\nTo test the signup sheet, navigate to:"
+puts "  http://localhost:3000/assignments/#{assignment.id}/signup_sheet"
+puts "\nLogin as: #{user1.name}"
+puts "="*80
diff --git a/db/migrate/20230305064753_create_roles.rb b/db/migrate/20230305064753_create_roles.rb
index 13fc710d7..55415bf44 100644
--- a/db/migrate/20230305064753_create_roles.rb
+++ b/db/migrate/20230305064753_create_roles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateRoles < ActiveRecord::Migration[7.0]
   def change
     create_table :roles do |t|
diff --git a/db/migrate/20230305185139_create_institutions.rb b/db/migrate/20230305185139_create_institutions.rb
index 8454dd121..bc2cf53a8 100644
--- a/db/migrate/20230305185139_create_institutions.rb
+++ b/db/migrate/20230305185139_create_institutions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateInstitutions < ActiveRecord::Migration[7.0]
   def change
     create_table :institutions do |t|
diff --git a/db/migrate/20230306022503_create_users.rb b/db/migrate/20230306022503_create_users.rb
index 6051ecc46..8252aabe5 100644
--- a/db/migrate/20230306022503_create_users.rb
+++ b/db/migrate/20230306022503_create_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateUsers < ActiveRecord::Migration[7.0]
   def change
     create_table :users, on_delete: :cascade do |t|
diff --git a/db/migrate/20230306035806_create_assignments.rb b/db/migrate/20230306035806_create_assignments.rb
index 211278d8c..a04c51a71 100644
--- a/db/migrate/20230306035806_create_assignments.rb
+++ b/db/migrate/20230306035806_create_assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAssignments < ActiveRecord::Migration[7.0]
   def change
     create_table :assignments, on_delete: :cascade do |t|
diff --git a/db/migrate/20230401213353_create_questionnaires.rb b/db/migrate/20230401213353_create_questionnaires.rb
index c9e42da82..b34cacbc6 100644
--- a/db/migrate/20230401213353_create_questionnaires.rb
+++ b/db/migrate/20230401213353_create_questionnaires.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateQuestionnaires < ActiveRecord::Migration[7.0]
   def change
     create_table :questionnaires do |t|
diff --git a/db/migrate/20230401213404_create_questions.rb b/db/migrate/20230401213404_create_questions.rb
index 2687ac23a..3c83f0bf4 100644
--- a/db/migrate/20230401213404_create_questions.rb
+++ b/db/migrate/20230401213404_create_questions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateQuestions < ActiveRecord::Migration[7.0]
   def change
     create_table :questions do |t|
diff --git a/db/migrate/20230412013301_create_account_requests.rb b/db/migrate/20230412013301_create_account_requests.rb
index 26a92465e..864360dd9 100644
--- a/db/migrate/20230412013301_create_account_requests.rb
+++ b/db/migrate/20230412013301_create_account_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAccountRequests < ActiveRecord::Migration[7.0]
   def change
     create_table :account_requests do |t|
diff --git a/db/migrate/20230412013310_add_refs_to_account_requests.rb b/db/migrate/20230412013310_add_refs_to_account_requests.rb
index 6e2acd2f3..3c1f9c114 100644
--- a/db/migrate/20230412013310_add_refs_to_account_requests.rb
+++ b/db/migrate/20230412013310_add_refs_to_account_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddRefsToAccountRequests < ActiveRecord::Migration[7.0]
   def change
     add_reference :account_requests, :role, null: false, foreign_key: true
diff --git a/db/migrate/20230412020156_create_invitations.rb b/db/migrate/20230412020156_create_invitations.rb
index 7f3f3c05c..42e53c8a8 100644
--- a/db/migrate/20230412020156_create_invitations.rb
+++ b/db/migrate/20230412020156_create_invitations.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateInvitations < ActiveRecord::Migration[7.0]
   def change
     create_table :invitations do |t|
diff --git a/db/migrate/20230415003243_create_courses.rb b/db/migrate/20230415003243_create_courses.rb
index 0b0bd9bd4..94d5e77ea 100644
--- a/db/migrate/20230415003243_create_courses.rb
+++ b/db/migrate/20230415003243_create_courses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateCourses < ActiveRecord::Migration[7.0]
   def change
     create_table :courses do |t|
diff --git a/db/migrate/20230415011209_create_ta_mappings.rb b/db/migrate/20230415011209_create_ta_mappings.rb
index 454c2e512..08d283db4 100644
--- a/db/migrate/20230415011209_create_ta_mappings.rb
+++ b/db/migrate/20230415011209_create_ta_mappings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTaMappings < ActiveRecord::Migration[7.0]
   def change
     create_table :ta_mappings do |t|
diff --git a/db/migrate/20230424172126_create_responses.rb b/db/migrate/20230424172126_create_responses.rb
index 7462dd973..267770b0a 100644
--- a/db/migrate/20230424172126_create_responses.rb
+++ b/db/migrate/20230424172126_create_responses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateResponses < ActiveRecord::Migration[7.0]
   def change
     create_table :responses, on_delete: :cascade do |t|
diff --git a/db/migrate/20230424172612_create_response_maps.rb b/db/migrate/20230424172612_create_response_maps.rb
index 14ab19801..5704d043f 100644
--- a/db/migrate/20230424172612_create_response_maps.rb
+++ b/db/migrate/20230424172612_create_response_maps.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateResponseMaps < ActiveRecord::Migration[7.0]
   def change
     create_table :response_maps do |t|
diff --git a/db/migrate/20230424173506_create_participants.rb b/db/migrate/20230424173506_create_participants.rb
index 21340f0be..fc0f996e0 100644
--- a/db/migrate/20230424173506_create_participants.rb
+++ b/db/migrate/20230424173506_create_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateParticipants < ActiveRecord::Migration[7.0]
   def change
     create_table :participants do |t|
diff --git a/db/migrate/20230424174001_create_answers.rb b/db/migrate/20230424174001_create_answers.rb
index a274d74b6..ab865f0fe 100644
--- a/db/migrate/20230424174001_create_answers.rb
+++ b/db/migrate/20230424174001_create_answers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAnswers < ActiveRecord::Migration[7.0]
   def change
     create_table :answers do |t|
diff --git a/db/migrate/20230424174153_create_assignment_questionnaires.rb b/db/migrate/20230424174153_create_assignment_questionnaires.rb
index 2fcfb9cfc..16faef6f6 100644
--- a/db/migrate/20230424174153_create_assignment_questionnaires.rb
+++ b/db/migrate/20230424174153_create_assignment_questionnaires.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAssignmentQuestionnaires < ActiveRecord::Migration[7.0]
   def change
     create_table :assignment_questionnaires do |t|
diff --git a/db/migrate/20230427171632_add_references_to_users.rb b/db/migrate/20230427171632_add_references_to_users.rb
index 6625c6e54..75ab911fa 100644
--- a/db/migrate/20230427171632_add_references_to_users.rb
+++ b/db/migrate/20230427171632_add_references_to_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddReferencesToUsers < ActiveRecord::Migration[7.0]
   def change
     add_reference :users, :institution, foreign_key: true
diff --git a/db/migrate/20231019170608_create_join_team_requests.rb b/db/migrate/20231019170608_create_join_team_requests.rb
index 3117d26cb..6547400df 100644
--- a/db/migrate/20231019170608_create_join_team_requests.rb
+++ b/db/migrate/20231019170608_create_join_team_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateJoinTeamRequests < ActiveRecord::Migration[7.0]
   def change
     create_table :join_team_requests do |t|
diff --git a/db/migrate/20231019195109_add_fields_to_join_team_requests.rb b/db/migrate/20231019195109_add_fields_to_join_team_requests.rb
index 9ac4876a2..2ee16e8c0 100644
--- a/db/migrate/20231019195109_add_fields_to_join_team_requests.rb
+++ b/db/migrate/20231019195109_add_fields_to_join_team_requests.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddFieldsToJoinTeamRequests < ActiveRecord::Migration[7.0]
   def change
     add_column :join_team_requests, :participant_id, :integer
diff --git a/db/migrate/20231026002451_add_can_submit_to_participant.rb b/db/migrate/20231026002451_add_can_submit_to_participant.rb
index 235bfb7ab..0d1dca1cc 100644
--- a/db/migrate/20231026002451_add_can_submit_to_participant.rb
+++ b/db/migrate/20231026002451_add_can_submit_to_participant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCanSubmitToParticipant < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :can_submit, :boolean, :default => true
diff --git a/db/migrate/20231026002543_add_can_review_to_participant.rb b/db/migrate/20231026002543_add_can_review_to_participant.rb
index 95218ee96..7f05e20b8 100644
--- a/db/migrate/20231026002543_add_can_review_to_participant.rb
+++ b/db/migrate/20231026002543_add_can_review_to_participant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCanReviewToParticipant < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :can_review, :boolean, :default => true
diff --git a/db/migrate/20231027211715_add_handle_to_participant.rb b/db/migrate/20231027211715_add_handle_to_participant.rb
index ff3399757..9207f16bd 100644
--- a/db/migrate/20231027211715_add_handle_to_participant.rb
+++ b/db/migrate/20231027211715_add_handle_to_participant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHandleToParticipant < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :handle, :string
diff --git a/db/migrate/20231028012101_add_permission_granted_to_participants.rb b/db/migrate/20231028012101_add_permission_granted_to_participants.rb
index ee64f4407..56ff401e0 100644
--- a/db/migrate/20231028012101_add_permission_granted_to_participants.rb
+++ b/db/migrate/20231028012101_add_permission_granted_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPermissionGrantedToParticipants < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :permission_granted, :boolean, default: false
diff --git a/db/migrate/20231030174450_add_join_team_request_to_participants.rb b/db/migrate/20231030174450_add_join_team_request_to_participants.rb
index 9571a661b..ecc0cb0ac 100644
--- a/db/migrate/20231030174450_add_join_team_request_to_participants.rb
+++ b/db/migrate/20231030174450_add_join_team_request_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddJoinTeamRequestToParticipants < ActiveRecord::Migration[6.0]
   def change
     add_reference :participants, :join_team_request, foreign_key: true
diff --git a/db/migrate/20231102173152_create_teams.rb b/db/migrate/20231102173152_create_teams.rb
new file mode 100644
index 000000000..bc2db75de
--- /dev/null
+++ b/db/migrate/20231102173152_create_teams.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class CreateTeams < ActiveRecord::Migration[8.0]
+  def change
+    create_table :teams do |t|
+      t.string :name, null: false
+      t.integer :parent_id, index: true
+      t.string :type, null: false
+
+      t.text    :comments_for_advertisement
+      t.boolean :advertise_for_partner, null: false, default: false
+      t.text    :submitted_hyperlinks
+      t.integer :directory_num
+
+      t.timestamps
+    end
+
+    add_index :teams, :type
+  end
+end 
diff --git a/db/migrate/20231102173153_create_participants_teams_relationship.rb b/db/migrate/20231102173153_create_participants_teams_relationship.rb
index 6d7a2dfd0..65a8005d9 100644
--- a/db/migrate/20231102173153_create_participants_teams_relationship.rb
+++ b/db/migrate/20231102173153_create_participants_teams_relationship.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateParticipantsTeamsRelationship < ActiveRecord::Migration[7.0]
   def change
       add_reference :participants, :team, foreign_key: true
diff --git a/db/migrate/20231104070639_remove_instructor_id_from_assignments.rb b/db/migrate/20231104070639_remove_instructor_id_from_assignments.rb
index 44796a12a..dddc94b59 100644
--- a/db/migrate/20231104070639_remove_instructor_id_from_assignments.rb
+++ b/db/migrate/20231104070639_remove_instructor_id_from_assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveInstructorIdFromAssignments < ActiveRecord::Migration[7.0]
   def change
     remove_column :assignments, :instructor_id, :integer
diff --git a/db/migrate/20231104071922_add_instructor_to_assignments.rb b/db/migrate/20231104071922_add_instructor_to_assignments.rb
index 1099aeccc..226c6e81d 100644
--- a/db/migrate/20231104071922_add_instructor_to_assignments.rb
+++ b/db/migrate/20231104071922_add_instructor_to_assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddInstructorToAssignments < ActiveRecord::Migration[7.0]
   def change
     add_reference :assignments, :instructor, null: false, foreign_key: { to_table: :users }
diff --git a/db/migrate/20231105193016_remove_course_id_from_assignments.rb b/db/migrate/20231105193016_remove_course_id_from_assignments.rb
index 1d378408e..4bdf57701 100644
--- a/db/migrate/20231105193016_remove_course_id_from_assignments.rb
+++ b/db/migrate/20231105193016_remove_course_id_from_assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RemoveCourseIdFromAssignments < ActiveRecord::Migration[7.0]
   def change
     remove_column :assignments, :course_id, :integer
diff --git a/db/migrate/20231105193219_add_course_to_assignments.rb b/db/migrate/20231105193219_add_course_to_assignments.rb
index f9d321846..a3a1ebc1f 100644
--- a/db/migrate/20231105193219_add_course_to_assignments.rb
+++ b/db/migrate/20231105193219_add_course_to_assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCourseToAssignments < ActiveRecord::Migration[7.0]
   def change
     add_reference :assignments, :course, null: true, foreign_key: true
diff --git a/db/migrate/20231129021640_add_enable_pair_programming_to_assignment.rb b/db/migrate/20231129021640_add_enable_pair_programming_to_assignment.rb
index 97a36dcc2..60b21f678 100644
--- a/db/migrate/20231129021640_add_enable_pair_programming_to_assignment.rb
+++ b/db/migrate/20231129021640_add_enable_pair_programming_to_assignment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddEnablePairProgrammingToAssignment < ActiveRecord::Migration[7.0]
   def change
     add_column :assignments, :enable_pair_programming, :boolean, default: false
diff --git a/db/migrate/20231129023417_add_assignment_to_teams.rb b/db/migrate/20231129023417_add_assignment_to_teams.rb
index de3da8e1c..855eea007 100644
--- a/db/migrate/20231129023417_add_assignment_to_teams.rb
+++ b/db/migrate/20231129023417_add_assignment_to_teams.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAssignmentToTeams < ActiveRecord::Migration[7.0]
   def change
     add_reference :teams, :assignment, null: false, foreign_key: true
diff --git a/db/migrate/20231129024913_add_has_teams_to_assignments.rb b/db/migrate/20231129024913_add_has_teams_to_assignments.rb
index ecd54ba73..8bbc882d9 100644
--- a/db/migrate/20231129024913_add_has_teams_to_assignments.rb
+++ b/db/migrate/20231129024913_add_has_teams_to_assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHasTeamsToAssignments < ActiveRecord::Migration[7.0]
   def change
     add_column :assignments, :has_teams, :boolean, default: false
diff --git a/db/migrate/20231129050431_create_sign_up_topics.rb b/db/migrate/20231129050431_create_sign_up_topics.rb
index 69ca12122..e7bbb15d7 100644
--- a/db/migrate/20231129050431_create_sign_up_topics.rb
+++ b/db/migrate/20231129050431_create_sign_up_topics.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSignUpTopics < ActiveRecord::Migration[7.0]
   def change
     create_table :sign_up_topics do |t|
diff --git a/db/migrate/20231129051018_add_has_topics_to_assignment.rb b/db/migrate/20231129051018_add_has_topics_to_assignment.rb
index 9f7187a38..40622b7b2 100644
--- a/db/migrate/20231129051018_add_has_topics_to_assignment.rb
+++ b/db/migrate/20231129051018_add_has_topics_to_assignment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddHasTopicsToAssignment < ActiveRecord::Migration[7.0]
   def change
     add_column :assignments, :has_topics, :boolean, default: false
diff --git a/db/migrate/20231130030500_create_signed_up_teams.rb b/db/migrate/20231130030500_create_signed_up_teams.rb
index 944cb5215..fd5bf507e 100644
--- a/db/migrate/20231130030500_create_signed_up_teams.rb
+++ b/db/migrate/20231130030500_create_signed_up_teams.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSignedUpTeams < ActiveRecord::Migration[7.0]
   def change
     create_table :signed_up_teams do |t|
diff --git a/db/migrate/20231130030611_add_foreign_key_to_signed_up_teams_for_sign_up_topic.rb b/db/migrate/20231130030611_add_foreign_key_to_signed_up_teams_for_sign_up_topic.rb
index 184db82b2..e2fc5c79b 100644
--- a/db/migrate/20231130030611_add_foreign_key_to_signed_up_teams_for_sign_up_topic.rb
+++ b/db/migrate/20231130030611_add_foreign_key_to_signed_up_teams_for_sign_up_topic.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddForeignKeyToSignedUpTeamsForSignUpTopic < ActiveRecord::Migration[7.0]
   def change
   end
diff --git a/db/migrate/20231130030646_add_foreign_key_to_signed_up_teams_for_team.rb b/db/migrate/20231130030646_add_foreign_key_to_signed_up_teams_for_team.rb
index f6b75606d..765dc7235 100644
--- a/db/migrate/20231130030646_add_foreign_key_to_signed_up_teams_for_team.rb
+++ b/db/migrate/20231130030646_add_foreign_key_to_signed_up_teams_for_team.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddForeignKeyToSignedUpTeamsForTeam < ActiveRecord::Migration[7.0]
   def change
   end
diff --git a/db/migrate/20231130033226_create_teams_users.rb b/db/migrate/20231130033226_create_teams_users.rb
index 71e213929..4a9528789 100644
--- a/db/migrate/20231130033226_create_teams_users.rb
+++ b/db/migrate/20231130033226_create_teams_users.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTeamsUsers < ActiveRecord::Migration[7.0]
   def change
     create_table :teams_users do |t|
@@ -6,5 +8,6 @@ def change
 
       t.timestamps
     end
+    add_index :teams_users, [:team_id, :user_id], unique: true
   end
 end
diff --git a/db/migrate/20231130033325_add_foreign_key_to_teams_users_for_user.rb b/db/migrate/20231130033325_add_foreign_key_to_teams_users_for_user.rb
index 1bdb4ac0f..6081b7567 100644
--- a/db/migrate/20231130033325_add_foreign_key_to_teams_users_for_user.rb
+++ b/db/migrate/20231130033325_add_foreign_key_to_teams_users_for_user.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddForeignKeyToTeamsUsersForUser < ActiveRecord::Migration[7.0]
   def change
   end
diff --git a/db/migrate/20231130033332_add_foreign_key_to_teams_users_for_team.rb b/db/migrate/20231130033332_add_foreign_key_to_teams_users_for_team.rb
index 87fc159f8..eeac349f0 100644
--- a/db/migrate/20231130033332_add_foreign_key_to_teams_users_for_team.rb
+++ b/db/migrate/20231130033332_add_foreign_key_to_teams_users_for_team.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddForeignKeyToTeamsUsersForTeam < ActiveRecord::Migration[7.0]
   def change
   end
diff --git a/db/migrate/20231201012040_add_used_in_round_to_assignment_questionnaire.rb b/db/migrate/20231201012040_add_used_in_round_to_assignment_questionnaire.rb
index 7d5ff3c94..37d53053b 100644
--- a/db/migrate/20231201012040_add_used_in_round_to_assignment_questionnaire.rb
+++ b/db/migrate/20231201012040_add_used_in_round_to_assignment_questionnaire.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUsedInRoundToAssignmentQuestionnaire < ActiveRecord::Migration[7.0]
   def change
     add_column :assignment_questionnaires, :used_in_round, :integer, null: true
diff --git a/db/migrate/20231201024204_create_nodes.rb b/db/migrate/20231201024204_create_nodes.rb
index 37cda85c2..3531ebbac 100644
--- a/db/migrate/20231201024204_create_nodes.rb
+++ b/db/migrate/20231201024204_create_nodes.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateNodes < ActiveRecord::Migration[7.0]
   def change
     create_table :nodes do |t|
diff --git a/db/migrate/20240318205124_create_bookmarks.rb b/db/migrate/20240318205124_create_bookmarks.rb
index b66641483..d7d46677a 100644
--- a/db/migrate/20240318205124_create_bookmarks.rb
+++ b/db/migrate/20240318205124_create_bookmarks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateBookmarks < ActiveRecord::Migration[7.0]
   def change
     create_table :bookmarks do |t|
diff --git a/db/migrate/20240324000112_create_bookmark_ratings.rb b/db/migrate/20240324000112_create_bookmark_ratings.rb
index 037375693..cbb56e407 100644
--- a/db/migrate/20240324000112_create_bookmark_ratings.rb
+++ b/db/migrate/20240324000112_create_bookmark_ratings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateBookmarkRatings < ActiveRecord::Migration[7.0]
   def up
     create_table "bookmark_ratings" do |t|
diff --git a/db/migrate/20240415155554_create_student_tasks.rb b/db/migrate/20240415155554_create_student_tasks.rb
index 3dabe33bd..aad822e09 100644
--- a/db/migrate/20240415155554_create_student_tasks.rb
+++ b/db/migrate/20240415155554_create_student_tasks.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateStudentTasks < ActiveRecord::Migration[7.0]
   def change
     create_table :student_tasks do |t|
diff --git a/db/migrate/20240415163413_add_columns_to_participants.rb b/db/migrate/20240415163413_add_columns_to_participants.rb
index 96e884161..1efab559c 100644
--- a/db/migrate/20240415163413_add_columns_to_participants.rb
+++ b/db/migrate/20240415163413_add_columns_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddColumnsToParticipants < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :topic, :string
diff --git a/db/migrate/20240415192048_drop_student_task_tabkle.rb b/db/migrate/20240415192048_drop_student_task_tabkle.rb
index d7cccd2dd..13ad0c3f1 100644
--- a/db/migrate/20240415192048_drop_student_task_tabkle.rb
+++ b/db/migrate/20240415192048_drop_student_task_tabkle.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class DropStudentTaskTabkle < ActiveRecord::Migration[7.0]
   def change
     drop_table :student_tasks
diff --git a/db/migrate/20240420000000_create_teams.rb b/db/migrate/20240420000000_create_teams.rb
deleted file mode 100644
index a1bf79a09..000000000
--- a/db/migrate/20240420000000_create_teams.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class CreateTeams < ActiveRecord::Migration[8.0]
-  def change
-    create_table :teams do |t|
-      t.string :name, null: false
-      t.string :type, null: false
-
-      t.timestamps
-    end
-
-    add_index :teams, :type
-  end
-end 
diff --git a/db/migrate/20240420070000_make_assignment_id_optional.rb b/db/migrate/20240420070000_make_assignment_id_optional.rb
index 79b6dbbce..414aeb07b 100644
--- a/db/migrate/20240420070000_make_assignment_id_optional.rb
+++ b/db/migrate/20240420070000_make_assignment_id_optional.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MakeAssignmentIdOptional < ActiveRecord::Migration[8.0]
   def change
     change_column_null :teams, :assignment_id, true
diff --git a/db/migrate/20241015223136_create_due_dates.rb b/db/migrate/20241015223136_create_due_dates.rb
index 30fe69e0d..8238f2f15 100644
--- a/db/migrate/20241015223136_create_due_dates.rb
+++ b/db/migrate/20241015223136_create_due_dates.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDueDates < ActiveRecord::Migration[7.0]
   def change
     create_table :due_dates do |t|
diff --git a/db/migrate/20241201224112_add_can_take_quiz_to_participants.rb b/db/migrate/20241201224112_add_can_take_quiz_to_participants.rb
index 97dd2ea7a..d9358e310 100644
--- a/db/migrate/20241201224112_add_can_take_quiz_to_participants.rb
+++ b/db/migrate/20241201224112_add_can_take_quiz_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCanTakeQuizToParticipants < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :can_take_quiz, :boolean
diff --git a/db/migrate/20241201224137_add_can_mentor_to_participants.rb b/db/migrate/20241201224137_add_can_mentor_to_participants.rb
index 890458682..66f4efa2e 100644
--- a/db/migrate/20241201224137_add_can_mentor_to_participants.rb
+++ b/db/migrate/20241201224137_add_can_mentor_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCanMentorToParticipants < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :can_mentor, :boolean
diff --git a/db/migrate/20241202165201_add_authorization_to_participants.rb b/db/migrate/20241202165201_add_authorization_to_participants.rb
index 3ca665d5f..c0a7a83cb 100644
--- a/db/migrate/20241202165201_add_authorization_to_participants.rb
+++ b/db/migrate/20241202165201_add_authorization_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAuthorizationToParticipants < ActiveRecord::Migration[7.0]
   def change
     add_column :participants, :authorization, :string
diff --git a/db/migrate/20250214224716_create_question_tables.rb b/db/migrate/20250214224716_create_question_tables.rb
index 7a4221e2b..a2ed1b112 100644
--- a/db/migrate/20250214224716_create_question_tables.rb
+++ b/db/migrate/20250214224716_create_question_tables.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateQuestionTables < ActiveRecord::Migration[7.0]
   def change
     create_table :question_advices, options: "CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci" do |t|
diff --git a/db/migrate/20250216020117_rename_questions_to_items.rb b/db/migrate/20250216020117_rename_questions_to_items.rb
index 666615988..b96f9fccb 100644
--- a/db/migrate/20250216020117_rename_questions_to_items.rb
+++ b/db/migrate/20250216020117_rename_questions_to_items.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameQuestionsToItems < ActiveRecord::Migration[7.0]
   def change
     rename_table :questions, :items
diff --git a/db/migrate/20250324193058_create_team_participants.rb b/db/migrate/20250324193058_create_team_participants.rb
index 0a9746b4f..2039ed9d2 100644
--- a/db/migrate/20250324193058_create_team_participants.rb
+++ b/db/migrate/20250324193058_create_team_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTeamParticipants < ActiveRecord::Migration[8.0]
   def change
     create_table :team_participants do |t|
diff --git a/db/migrate/20250401020016_change_user_id_to_participant_id_in_team_participant.rb b/db/migrate/20250401020016_change_user_id_to_participant_id_in_team_participant.rb
index dfb211f7f..b75dff6b9 100644
--- a/db/migrate/20250401020016_change_user_id_to_participant_id_in_team_participant.rb
+++ b/db/migrate/20250401020016_change_user_id_to_participant_id_in_team_participant.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeUserIdToParticipantIdInTeamParticipant < ActiveRecord::Migration[6.0]
   def change
     remove_column :team_participants, :user_id, :integer
diff --git a/db/migrate/20250414002952_rename_team_participants_to_teams_participants.rb b/db/migrate/20250414002952_rename_team_participants_to_teams_participants.rb
index 929a7d4f7..edd419866 100644
--- a/db/migrate/20250414002952_rename_team_participants_to_teams_participants.rb
+++ b/db/migrate/20250414002952_rename_team_participants_to_teams_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameTeamParticipantsToTeamsParticipants < ActiveRecord::Migration[8.0]
   def change
     rename_table :team_participants, :teams_participants
diff --git a/db/migrate/20250414005152_add_course_id_to_participants.rb b/db/migrate/20250414005152_add_course_id_to_participants.rb
index 92fea589c..208bbcd74 100644
--- a/db/migrate/20250414005152_add_course_id_to_participants.rb
+++ b/db/migrate/20250414005152_add_course_id_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddCourseIdToParticipants < ActiveRecord::Migration[8.0]
   def change
     add_reference :participants, :course, foreign_key: true
diff --git a/db/migrate/20250418004442_change_to_polymorphic_association_in_teams.rb b/db/migrate/20250418004442_change_to_polymorphic_association_in_teams.rb
index 770a3817a..cd2fb7094 100644
--- a/db/migrate/20250418004442_change_to_polymorphic_association_in_teams.rb
+++ b/db/migrate/20250418004442_change_to_polymorphic_association_in_teams.rb
@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 class ChangeToPolymorphicAssociationInTeams < ActiveRecord::Migration[8.0]
   def change
-    # Remove old assignment and course references
+    # Remove old assignment reference (course reference doesn't exist)
     remove_reference :teams, :assignment, foreign_key: true
-    remove_reference :teams, :course, foreign_key: true
 
-    # Add polymorphic association fields
+    # Add polymorphic association fields (type column already exists)
     add_column :teams, :parent_id, :integer, null: false
-    add_column :teams, :type, :string, null: false
   end
 end
diff --git a/db/migrate/20250418013852_change_participants_to_polymorphic_parent.rb b/db/migrate/20250418013852_change_participants_to_polymorphic_parent.rb
index 186fea699..88874ece5 100644
--- a/db/migrate/20250418013852_change_participants_to_polymorphic_parent.rb
+++ b/db/migrate/20250418013852_change_participants_to_polymorphic_parent.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeParticipantsToPolymorphicParent < ActiveRecord::Migration[8.0]
   def change
     # Remove old columns
diff --git a/db/migrate/20250418014519_add_type_to_participants.rb b/db/migrate/20250418014519_add_type_to_participants.rb
index eb9b7e3e3..599802077 100644
--- a/db/migrate/20250418014519_add_type_to_participants.rb
+++ b/db/migrate/20250418014519_add_type_to_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddTypeToParticipants < ActiveRecord::Migration[8.0]
   def change
     add_column :participants, :type, :string, null: false
diff --git a/db/migrate/20250427014225_add_user_id_to_teams_participants.rb b/db/migrate/20250427014225_add_user_id_to_teams_participants.rb
index c1a125991..222d5ab86 100644
--- a/db/migrate/20250427014225_add_user_id_to_teams_participants.rb
+++ b/db/migrate/20250427014225_add_user_id_to_teams_participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUserIdToTeamsParticipants < ActiveRecord::Migration[8.0]
   def change
     add_column :teams_participants, :user_id, :integer
diff --git a/db/migrate/20251028_add_team_to_review_mappings.rb b/db/migrate/20251028_add_team_to_review_mappings.rb
new file mode 100644
index 000000000..8a80254cd
--- /dev/null
+++ b/db/migrate/20251028_add_team_to_review_mappings.rb
@@ -0,0 +1,12 @@
+class AddTeamToReviewMappings < ActiveRecord::Migration[7.1]
+    def change
+        # If this app doesn't have review_mappings yet, just skip.
+        return unless table_exists?(:review_mappings)
+
+        # Only add the column if it's missing.
+        unless column_exists?(:review_mappings, :team_id)
+            add_reference :review_mappings, :team, foreign_key: true, null: true
+            add_index     :review_mappings, :team_id
+        end
+    end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 50ff84a38..d3a15fcfa 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -359,10 +359,10 @@
   end
 
   create_table "teams", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
     t.string "name", null: false
     t.string "type", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "parent_id", null: false
     t.integer "grade_for_submission"
     t.string "comment_for_submission"
diff --git a/db/seeds.rb b/db/seeds.rb
index 2b66038f2..dc3038272 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
     #Create an institution
     inst_id = Institution.create!(
@@ -6,116 +8,90 @@
     
     roles = {
       admin: Role.find_or_create_by!(name: 'Super Administrator'),
+      administrator: Role.find_or_create_by!(name: 'Administrator'),
       instructor: Role.find_or_create_by!(name: 'Instructor'),
+      ta: Role.find_or_create_by!(name: 'Teaching Assistant'),
       student: Role.find_or_create_by!(name: 'Student')
     }
     
 
-    # Create an admin user
-    User.create!(
-      name: 'admin',
-      email: 'admin2@example.com',
-      password: 'password123',
-      full_name: 'admin admin',
+  # Create an admin user
+  User.create!(
+    name: 'admin',
+    email: 'admin2@example.com',
+    password: 'password123',
+    full_name: 'admin admin',
+    institution_id: 1,
+    role_id: 1
+  )
+
+  # Generate Random Users
+  num_students = 48
+  num_assignments = 8
+  num_teams = 16
+  num_courses = 2
+  num_instructors = 2
+
+  puts "creating instructors"
+  instructor_user_ids = []
+  num_instructors.times do
+    instructor_user_ids << User.create(
+      name: Faker::Internet.unique.username,
+      email: Faker::Internet.unique.email,
+      password: "password",
+      full_name: Faker::Name.name,
       institution_id: 1,
-      role_id:  roles[:admin].id,
-    )
-    
-
-    #Generate Random Users
-    num_students = 46
-    num_assignments = 8
-    num_teams = 16
-    num_courses = 2
-    num_instructors = 2
-    
-    puts "creating instructors"
-    instructor_user_ids = []
-    num_instructors.times do
-      instructor_user_ids << User.create(
-        name: Faker::Internet.unique.username,
-        email: Faker::Internet.unique.email,
-        password: "password",
-        full_name: Faker::Name.name,
-        institution_id: 1,
-        role_id:  roles[:instructor].id,
-      ).id
-    end
-
-    puts "creating courses"
-    course_ids = []
-    num_courses.times do |i|
-      course_ids << Course.create(
-        instructor_id: instructor_user_ids[i],
-        institution_id: inst_id,
-        directory_path: Faker::File.dir(segment_count: 2),
-        name: Faker::Company.industry,
-        info: "A fake class",
-        private: false
-      ).id
-    end
-
-    puts "creating assignments"
-    assignment_ids = []
-    num_assignments.times do |i|
-      assignment_ids << Assignment.create(
-        name: Faker::Verb.base,
-        instructor_id: instructor_user_ids[i%num_instructors],
-        course_id: 2,
-        has_teams: true,
-        private: false
-      ).id
-    end
-
-
-    puts "creating assignment teams"
-    team_ids = []
-    (num_teams/2).times do |i|
-      # assignment_id = assignment_ids[i % num_assignments]
-      team = AssignmentTeam.create(
-        parent_id: 1,
-        type: 'AssignmentTeam',
-        name: Faker::Internet.unique.username(separators: [' ']),
-      )
+      role_id: 3
+    ).id
+  end
 
-      if team.persisted?
-        team_ids << team.id
-        puts "Created AssignmentTeam with ID: #{team.id} for assignment_id: 1"
-      else
-        puts "Failed to create AssignmentTeam: #{team.errors.full_messages.join(', ')}"
-      end
-    end
+  puts "creating courses"
+  course_ids = []
+  num_courses.times do |i|
+    course_ids << Course.create(
+      instructor_id: instructor_user_ids[i],
+      institution_id: inst_id,
+      directory_path: Faker::File.dir(segment_count: 2),
+      name: Faker::Company.industry,
+      info: "A fake class",
+      private: false
+    ).id
+  end
 
-    puts "creating course teams"
-    (num_teams/2).times do |i|
-      # course_id = course_ids[i % num_courses]
-      team = CourseTeam.create(
-        parent_id: 2,
-        type: 'CourseTeam',
-        name: Faker::Internet.unique.username(separators: [' ']),
-      )
+  puts "creating assignments"
+  assignment_ids = []
+  num_assignments.times do |i|
+    assignment_ids << Assignment.create(
+      name: Faker::Verb.base,
+      instructor_id: instructor_user_ids[i % num_instructors],
+      course_id: course_ids[i % num_courses],
+      has_teams: true,
+      private: false
+    ).id
+  end
 
-      if team.persisted?
-        team_ids << team.id
-        puts "Created CourseTeam with ID: #{team.id} for course_id: 1"
-      else
-        puts "Failed to create CourseTeam: #{team.errors.full_messages.join(', ')}"
-      end
-    end
+  puts "creating teams"
+  team_ids = []
+  num_teams.times do |i|
+    team_ids << AssignmentTeam.create(
+      name: "Team #{i + 1}",
+      parent_id: assignment_ids[i % num_assignments]
+    ).id
+  end
 
-    puts "creating students"
-    student_user_ids = []
-    num_students.times do
-      student_user_ids << User.create(
-        name: Faker::Internet.unique.username(separators: ['_']),
-        email: Faker::Internet.unique.email,
-        password: "password",
-        full_name: Faker::Name.name,
-        institution_id: 1,
-        role_id:  roles[:student].id,
-        handle: Faker::Internet.unique.username(separators: ['-'])
-      ).id
-    end
+  puts "creating students"
+  student_user_ids = []
+  num_students.times do
+    student_user_ids << User.create(
+      name: Faker::Internet.unique.username,
+      email: Faker::Internet.unique.email,
+      password: "password",
+      full_name: Faker::Name.name,
+      institution_id: 1,
+      role_id: 5,
+      parent_id: [nil, *instructor_user_ids].sample
+    ).id
+  end
 
     # puts "assigning students to teams"
     # teams_users_ids = []
@@ -160,286 +136,22 @@
       end
     end
 
-    ((num_students / 2)..num_students-1).each do |i|
-      user_id = student_user_ids[i]
-      handle = User.find(user_id).handle
-      participant = Participant.create(
-        user_id: user_id,
-        parent_id: course_ids[i%num_courses],
+    puts "assigning participant to students, teams, courses, and assignments"
+    participant_ids = []
+    num_students.times do |i|
+      participant_ids << AssignmentParticipant.create(
+        user_id: student_user_ids[i],
+        parent_id: assignment_ids[i%num_assignments],
         team_id: team_ids[i%num_teams],
-        type: 'CourseParticipant',
-        handle: handle
-      )
-
-      if participant.persisted?
-        participant_ids << participant.id
-        puts "Created course participant #{participant.id}"
-      else
-        puts "Failed to create course participant: #{participant.errors.full_messages.join(', ')}"
-      end
-    end
-
-    puts "creating questionnaires"
-    questionnaire_count = 4
-    items_per_questionnaire = 10
-    questionnaire_ids = []
-    questionnaire_count.times do
-        questionnaire_ids << Questionnaire.create!(
-        name: "#{Faker::Lorem.words(number: 5).join(' ').titleize}",
-        instructor_id: rand(1..5), # assuming some instructor IDs exist in range 1–5
-        private: false,
-        min_question_score: 0,
-        max_question_score: 5,
-        questionnaire_type: "ReviewQuestionnaire",
-        display_type: "Review",
-        created_at: Time.now,
-        updated_at: Time.now
-        ).id
-
-    end
-
-    questionnaires = Questionnaire.all
-
-    puts  "creating items for each questionnaire"
-    questionnaires.each do |questionnaire|
-        items_per_questionnaire.times do |i|
-        Item.create!(
-            txt: Faker::Lorem.sentence(word_count: 8),
-            weight: rand(1..2),
-            seq: i + 1,
-            question_type: ['Criterion', 'Scale', 'TextArea', 'Dropdown'].sample,
-            size: ['50x3', '60x4', '40x2'].sample,
-            alternatives: ['Yes|No', 'Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree'],
-            break_before: true,
-            max_label: Faker::Lorem.word.capitalize,
-            min_label: Faker::Lorem.word.capitalize,
-            questionnaire_id: questionnaire.id,
-            created_at: Time.now,
-            updated_at: Time.now
-        )
-        end
-    end
-
-
-    assignment_ids = [1, 2]
-    used_in_rounds = [1, 2]
-    questionnaire_id = 1
-
-    assignment_ids.each do |assignment_id|
-      used_in_rounds.each do |round|
-        AssignmentQuestionnaire.create!(
-          assignment_id: assignment_id,
-          questionnaire_id: questionnaire_id,
-          used_in_round: round
-        )
-        questionnaire_id += 1
-      end
+      ).id
     end
 
-  # Fetch all reviewee teams (assuming AssignmentTeam model)
-  # reviewee_teams = AssignmentTeam.limit(5)
-  # reviewer_ids = Participant.pluck(:id).sample(10)
-
-  # 5.times do |i|
-  #   ReviewResponseMap.create!(
-  #     reviewed_object_id: 1,
-  #     reviewer_id: reviewer_ids[i],
-  #     reviewee_id: 1,
-  #     created_at: Time.now,
-  #     updated_at: Time.now,
-  #   )                                                                        
-  # end
-
-  # 5.times do |i|
-  #   ReviewResponseMap.create!(
-  #     reviewed_object_id: 1,
-  #     reviewer_id: reviewer_ids[i],
-  #     reviewee_id: 1,
-  #     created_at: Time.now,
-  #     updated_at: Time.now,
-  #   )                                                                        
-  # end
-
-  # puts "Seeded review_response_maps and teammate_review_response_maps for 1 team, total: 10 records."
-
-  # item_ids = Item.pluck(:id).sort  # 40 items total
-  # response_records = []
-  # items = Item.all
-
-  # response_maps_count = ResponseMap.all.size*2
-  # response_maps_count.times do |i|
-  #   # item_id = item_ids[i / 5]            # Each item_id appears in 5 responses
-  #   round = case i
-  #           when 0...50 then 1
-  #           when 50...100 then 2
-  #           when 100...150 then 1
-  #           else 2
-  #           end
-
-  #   map_id = if i < 100
-  #             (i % 5) + 1              # map_id from 1 to 5
-  #           else
-  #             ((i - 100) % 5) + 6      # map_id from 6 to 10
-  #           end
-
-  #   response = Response.create!(
-  #     map_id: map_id,
-  #     round: round,
-  #     is_submitted: true,
-  #     version_num: 1,
-  #     created_at: Time.now,
-  #     updated_at: Time.now
-  #   )
 
-  #    items.each do |item|
-  #     Answer.create(
-  #       response: response,
-  #       item: item,
-  #       score: rand(0..5),
-  #       comments: "Seeded answer"
-  #     )
 
-  #   # response_records << { item_id: item_id, response_id: response.id }
-  # end
 
-  # puts "✅ Seeded #{response_records.size} responses."
 
-  # # Create answers
-  # response_records.each do |rec|
-  #   item = Item.find(rec[:item_id])
-  #   answer = item.question_type=="Criterion" ? rand(0..5) : rand(0..1)
-  #   Answer.create!(
-  #     item_id: rec[:item_id],
-  #     response_id: rec[:response_id],
-  #     answer: answer,
-  #     comments: Faker::Lorem.sentence
-  #   )
-  # end
 
-  # puts "✅ Seeded #{response_records.size} answers."
 
-  # Setup sample questions
-  # questionnaire = Questionnaire.create!(name: "Sample Review Rubric", max_question_score: 5, min_question_score: 0, questionnaire_type: "ReviewQuestionnaire" ,display_type: "Review", instructor_id: 2, private: false)
-  # items = []
-  # 5.times do |i|
-  #   items << Item.create!(
-  #     txt: Faker::Lorem.sentence(word_count: 8),
-  #     weight: rand(1..2),
-  #     seq: i + 1,
-  #     question_type: ['Criterion', 'Scale', 'TextArea', 'Dropdown'].sample,
-  #     size: ['50x3', '60x4', '40x2'].sample,
-  #     alternatives: ['Yes|No', 'Strongly Agree|Agree|Neutral|Disagree|Strongly Disagree'],
-  #     break_before: true,
-  #     max_label: Faker::Lorem.word.capitalize,
-  #     min_label: Faker::Lorem.word.capitalize,
-  #     questionnaire_id: questionnaire.id,
-  #     created_at: Time.now,
-  #     updated_at: Time.now
-  # )
-  # end
-
-  # # Create 3 participants and 1 reviewee team
-  # team = AssignmentTeam.find(1)
-  # 3.times do |i|
-  #   reviewer = AssignmentParticipant.find(i+1)
-
-  #   # Create ResponseMap (reviewer -> team)
-  #   map = ReviewResponseMap.create(
-  #     reviewer_id: reviewer.id,
-  #     reviewee_id: team.id,
-  #     reviewed_object_id: 1,
-  #     created_at: Time.now,
-  #     updated_at: Time.now
-  #   )
-
-  #   # Create 2 Responses per map (one per round)
-  #   [1, 2].each do |round|
-  #     response = Response.create(
-  #       map_id: map.id,
-  #       round: round,
-  #       is_submitted: true,
-  #       created_at: Time.now,
-  #       updated_at: Time.now,
-  #     )
-
-  #     # Create Answers for each question
-  #     items.each do |item|
-  #       Answer.create(
-  #         response_id: response.id,
-  #         item_id: item.id,
-  #         answer: rand(1..5),
-  #         comments: "Seeded answer"
-  #       )
-  #     end
-  #   end
-  # end
-
-  questionnaires = {}
-
-  (1..2).each do |round|
-    questionnaire = Questionnaire.create!(
-      name: "Review Rubric - Round #{round}",
-      max_question_score: 5,
-      min_question_score: 0,
-      questionnaire_type: "ReviewQuestionnaire",
-      display_type: "Review",
-      instructor_id: 2,
-      private: false
-    )
-
-    # Save questionnaire and its items
-    questionnaires[round] = {
-      q: questionnaire,
-      items: []
-    }
-
-    5.times do |i|
-      item = Item.create!(
-        txt: Faker::Lorem.sentence(word_count: 8),
-        weight: rand(1..2),
-        seq: i + 1,
-        question_type: ['Criterion', 'Scale', 'TextArea', 'Dropdown'].sample,
-        size: ['50x3', '60x4', '40x2'].sample,
-        alternatives: 'Yes|No',
-        break_before: true,
-        max_label: Faker::Lorem.word.capitalize,
-        min_label: Faker::Lorem.word.capitalize,
-        questionnaire_id: questionnaire.id
-      )
-      questionnaires[round][:items] << item
-    end
-  end
-
-  # Create team and reviewers
-  team = AssignmentTeam.find(1)
-
-  3.times do |i|
-    reviewer = AssignmentParticipant.find(i + 1)
-
-    map = ReviewResponseMap.create!(
-      reviewer_id: reviewer.id,
-      reviewee_id: team.id,
-      reviewed_object_id: 1 # optional if used for navigation only
-    )
-
-    [1, 2].each do |round|
-      response = Response.create!(
-        map_id: map.id,
-        round: round,
-        is_submitted: true
-      )
-
-      # Get the correct items for this round
-      questionnaires[round][:items].each do |item|
-        Answer.create!(
-          response_id: response.id,
-          item_id: item.id,
-          answer: rand(1..5),
-          comments: "Seeded answer"
-        )
-      end
-    end
-  end
 
 rescue ActiveRecord::RecordInvalid => e
   puts "Seeding failed or the db is already seeded: #{e.message}"
diff --git a/docker-compose.yml b/docker-compose.yml
index 85edfda55..f22dc27ef 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.1'
-
 services:
   app:
     build: .
diff --git a/dump.sql b/dump.sql
new file mode 100644
index 000000000..60ffec93f
--- /dev/null
+++ b/dump.sql
@@ -0,0 +1,19 @@
+-- Common Users Seed Data for Development Environment
+-- This ensures all team members have the same test users
+-- Usage: docker exec -i reimplementation-back-end-db-1 mysql -u root -pexpertiza reimplementation_development < users_seed_data.sql
+
+-- Insert common user data (only if they don't already exist)
+INSERT IGNORE INTO users (id, full_name, email, password_digest, role_id, created_at, updated_at) VALUES
+(1, 'Admin User', 'admin@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 1, NOW(), NOW()),
+(2, 'Alice Johnson', 'alice@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 4, NOW(), NOW()),
+(3, 'Bob Smith', 'bob@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 4, NOW(), NOW()),
+(4, 'Charlie Davis', 'charlie@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 4, NOW(), NOW()),
+(5, 'Diana Martinez', 'diana@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 4, NOW(), NOW()),
+(6, 'Ethan Brown', 'ethan@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 4, NOW(), NOW()),
+(7, 'Fiona Wilson', 'fiona@example.com', '$2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW', 4, NOW(), NOW());
+
+-- Note: All users have the password "password123"
+-- Password hash: $2a$12$PfN/CKp7R6aQp9bXt6SKIOElvh2DuXkopyN4xjRI3J.F8uAKsI1jW
+
+SELECT 'Users seed data loaded successfully!' AS message;
+SELECT id, full_name, email FROM users WHERE id IN (1, 2, 3, 4, 5, 6, 7);
\ No newline at end of file
diff --git a/generate_usernames.rb b/generate_usernames.rb
new file mode 100644
index 000000000..66738aa54
--- /dev/null
+++ b/generate_usernames.rb
@@ -0,0 +1,7 @@
+require 'faker'
+
+puts "Three example student usernames (generated by Faker):"
+3.times do
+  username = Faker::Internet.unique.username(separators: ['_'])
+  puts "- #{username}"
+end
diff --git a/generate_users_with_emails.rb b/generate_users_with_emails.rb
new file mode 100644
index 000000000..4c1ae7101
--- /dev/null
+++ b/generate_users_with_emails.rb
@@ -0,0 +1,11 @@
+require 'faker'
+
+puts "Three example students with username and email:"
+3.times do
+  username = Faker::Internet.unique.username(separators: ['_'])
+  email = Faker::Internet.unique.email
+  puts "Username: #{username}"
+  puts "Email: #{email}"
+  puts "Password: password"
+  puts "---"
+end
diff --git a/get_token.sh b/get_token.sh
new file mode 100755
index 000000000..b2bcb5c5a
--- /dev/null
+++ b/get_token.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+
+# Script to get a JWT token for testing
+
+echo "Getting JWT token for quinn_johns..."
+echo ""
+
+# Make login request
+response=$(curl -s -X POST http://152.7.176.23:3002/login \
+  -H "Content-Type: application/json" \
+  -d '{
+    "user_name": "quinn_johns",
+    "password": "password123"
+  }')
+
+# Extract token
+token=$(echo $response | grep -o '"token":"[^"]*' | cut -d'"' -f4)
+
+if [ -z "$token" ]; then
+  echo "❌ Failed to get token. Response:"
+  echo $response
+  echo ""
+  echo "Trying with default password 'password'..."
+  
+  response=$(curl -s -X POST http://152.7.176.23:3002/login \
+    -H "Content-Type: application/json" \
+    -d '{
+      "user_name": "quinn_johns",
+      "password": "password"
+    }')
+  
+  token=$(echo $response | grep -o '"token":"[^"]*' | cut -d'"' -f4)
+  
+  if [ -z "$token" ]; then
+    echo "❌ Still failed. Response:"
+    echo $response
+    exit 1
+  fi
+fi
+
+echo "✅ Successfully obtained JWT token!"
+echo ""
+echo "Token: $token"
+echo ""
+echo "To use this token in your browser:"
+echo "1. Open Developer Tools (F12)"
+echo "2. Go to Console tab"
+echo "3. Run: localStorage.setItem('jwt', '$token')"
+echo "4. Refresh the page"
+echo ""
+echo "Or test the API directly:"
+echo "curl -H 'Authorization: Bearer $token' http://152.7.176.23:3002/api/v1/sign_up_topics?assignment_id=1"
diff --git a/get_usernames.rb b/get_usernames.rb
new file mode 100644
index 000000000..bf0db8643
--- /dev/null
+++ b/get_usernames.rb
@@ -0,0 +1,75 @@
+require 'mysql2'
+require 'dotenv/load'
+
+# Parse DATABASE_URL from environment
+db_url = ENV['DATABASE_URL']
+
+if db_url
+  # Extract database name - assuming format: mysql2://user:pass@host:port/dbname
+  db_name = db_url.split('/').last.split('?').first
+  db_name = db_name.sub('expertiza', 'expertiza_development')
+
+  # Extract credentials
+  uri = URI.parse(db_url.sub('mysql2://', 'http://'))
+
+  begin
+    client = Mysql2::Client.new(
+      host: uri.host || 'localhost',
+      port: uri.port || 3306,
+      username: uri.user || 'root',
+      password: uri.password || '',
+      database: db_name
+    )
+
+    # Get Student role ID
+    role_result = client.query("SELECT id FROM roles WHERE name = 'Student' LIMIT 1")
+    student_role_id = role_result.first['id'] if role_result.first
+
+    if student_role_id
+      # Get 3 student usernames
+      results = client.query("SELECT name FROM users WHERE role_id = #{student_role_id} LIMIT 3")
+
+      puts "Three student usernames:"
+      results.each do |row|
+        puts "- #{row['name']}"
+      end
+    else
+      puts "No Student role found in database"
+    end
+
+    client.close
+  rescue => e
+    puts "Error: #{e.message}"
+    puts "\nTrying with default credentials..."
+
+    # Try default connection
+    begin
+      client = Mysql2::Client.new(
+        host: 'localhost',
+        username: 'root',
+        password: '',
+        database: 'expertiza_development'
+      )
+
+      role_result = client.query("SELECT id FROM roles WHERE name = 'Student' LIMIT 1")
+      student_role_id = role_result.first['id'] if role_result.first
+
+      if student_role_id
+        results = client.query("SELECT name FROM users WHERE role_id = #{student_role_id} LIMIT 3")
+
+        puts "Three student usernames:"
+        results.each do |row|
+          puts "- #{row['name']}"
+        end
+      else
+        puts "No Student role found"
+      end
+
+      client.close
+    rescue => e2
+      puts "Failed: #{e2.message}"
+    end
+  end
+else
+  puts "DATABASE_URL not set"
+end
diff --git a/lib/json_web_token.rb b/lib/json_web_token.rb
index 356ec4719..9ca60f520 100644
--- a/lib/json_web_token.rb
+++ b/lib/json_web_token.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # app/lib/json_web_token.rb
 require 'openssl'
 
diff --git a/results.txt b/results.txt
index 14f6f6e0f..0d19a8c4b 100644
--- a/results.txt
+++ b/results.txt
@@ -4,12 +4,12 @@ F........
 
 Failures:
 
-  1) api/v1/teams_participants /api/v1/teams_participants/update_duties put duty updated successfully returns a 200 response
+  1) teams_participants /teams_participants/update_duties put duty updated successfully returns a 200 response
      Failure/Error: example.run
 
      Rswag::Specs::UnexpectedResponse:
        Expected response code '500' to match '200'
-       Response body: {"status":500,"error":"Internal Server Error","exception":"#\u003cNoMethodError: undefined method `duty_id=' for #\u003cTeamsUser id: 1, team_id: 1, user_id: 2, created_at: \"2025-03-24 06:13:17.232100000 +0000\", updated_at: \"2025-03-24 06:13:17.232100000 +0000\"\u003e\u003e","traces":{"Application Trace":[{"exception_object_id":51620,"id":4,"trace":"app/controllers/api/v1/teams_participants_controller.rb:31:in `update_duties'"}],"Framework Trace":[{"exception_object_id":51620,"id":0,"trace":"activemodel (8.0.1) lib/active_model/attribute_methods.rb:512:in `method_missing'"},{"exception_object_id":51620,"id":1,"trace":"activerecord (8.0.1) lib/active_record/attribute_methods.rb:495:in `method_missing'"},{"exception_object_id":51620,"id":2,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `public_send'"},{"exception_object_id":51620,"id":3,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `update_attribute'"},{"exception_object_id":51620,"id":5,"trace":"actionpack (8.0.1) lib/action_controller/metal/basic_implicit_render.rb:8:in `send_action'"},{"exception_object_id":51620,"id":6,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:226:in `process_action'"},{"exception_object_id":51620,"id":7,"trace":"actionpack (8.0.1) lib/action_controller/metal/rendering.rb:193:in `process_action'"},{"exception_object_id":51620,"id":8,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:261:in `block in process_action'"},{"exception_object_id":51620,"id":9,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:109:in `run_callbacks'"},{"exception_object_id":51620,"id":10,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:260:in `process_action'"},{"exception_object_id":51620,"id":11,"trace":"actionpack (8.0.1) lib/action_controller/metal/rescue.rb:27:in `process_action'"},{"exception_object_id":51620,"id":12,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:76:in `block in process_action'"},{"exception_object_id":51620,"id":13,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `block in instrument'"},{"exception_object_id":51620,"id":14,"trace":"activesupport (8.0.1) lib/active_support/notifications/instrumenter.rb:58:in `instrument'"},{"exception_object_id":51620,"id":15,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `instrument'"},{"exception_object_id":51620,"id":16,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:75:in `process_action'"},{"exception_object_id":51620,"id":17,"trace":"actionpack (8.0.1) lib/action_controller/metal/params_wrapper.rb:259:in `process_action'"},{"exception_object_id":51620,"id":18,"trace":"activerecord (8.0.1) lib/active_record/railties/controller_runtime.rb:39:in `process_action'"},{"exception_object_id":51620,"id":19,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:163:in `process'"},{"exception_object_id":51620,"id":20,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:252:in `dispatch'"},{"exception_object_id":51620,"id":21,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:335:in `dispatch'"},{"exception_object_id":51620,"id":22,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:67:in `dispatch'"},{"exception_object_id":51620,"id":23,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:50:in `serve'"},{"exception_object_id":51620,"id":24,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:53:in `block in serve'"},{"exception_object_id":51620,"id":25,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:133:in `block in find_routes'"},{"exception_object_id":51620,"id":26,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `each'"},{"exception_object_id":51620,"id":27,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `find_routes'"},{"exception_object_id":51620,"id":28,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:34:in `serve'"},{"exception_object_id":51620,"id":29,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:908:in `call'"},{"exception_object_id":51620,"id":30,"trace":"rack (2.2.8) lib/rack/etag.rb:27:in `call'"},{"exception_object_id":51620,"id":31,"trace":"rack (2.2.8) lib/rack/conditional_get.rb:40:in `call'"},{"exception_object_id":51620,"id":32,"trace":"rack (2.2.8) lib/rack/head.rb:12:in `call'"},{"exception_object_id":51620,"id":33,"trace":"activerecord (8.0.1) lib/active_record/migration.rb:671:in `call'"},{"exception_object_id":51620,"id":34,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:31:in `block in call'"},{"exception_object_id":51620,"id":35,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:100:in `run_callbacks'"},{"exception_object_id":51620,"id":36,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:30:in `call'"},{"exception_object_id":51620,"id":37,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":38,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/actionable_exceptions.rb:18:in `call'"},{"exception_object_id":51620,"id":39,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/debug_exceptions.rb:31:in `call'"},{"exception_object_id":51620,"id":40,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/show_exceptions.rb:32:in `call'"},{"exception_object_id":51620,"id":41,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:41:in `call_app'"},{"exception_object_id":51620,"id":42,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:29:in `call'"},{"exception_object_id":51620,"id":43,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/remote_ip.rb:96:in `call'"},{"exception_object_id":51620,"id":44,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/request_id.rb:34:in `call'"},{"exception_object_id":51620,"id":45,"trace":"rack (2.2.8) lib/rack/runtime.rb:22:in `call'"},{"exception_object_id":51620,"id":46,"trace":"activesupport (8.0.1) lib/active_support/cache/strategy/local_cache_middleware.rb:29:in `call'"},{"exception_object_id":51620,"id":47,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:61:in `block in call'"},{"exception_object_id":51620,"id":48,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:26:in `collect_events'"},{"exception_object_id":51620,"id":49,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:60:in `call'"},{"exception_object_id":51620,"id":50,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":51,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/static.rb:27:in `call'"},{"exception_object_id":51620,"id":52,"trace":"rack (2.2.8) lib/rack/sendfile.rb:110:in `call'"},{"exception_object_id":51620,"id":53,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/host_authorization.rb:143:in `call'"},{"exception_object_id":51620,"id":54,"trace":"rack-cors (2.0.1) lib/rack/cors.rb:102:in `call'"},{"exception_object_id":51620,"id":55,"trace":"railties (8.0.1) lib/rails/engine.rb:535:in `call'"},{"exception_object_id":51620,"id":56,"trace":"rack-test (2.1.0) lib/rack/test.rb:360:in `process_request'"},{"exception_object_id":51620,"id":57,"trace":"rack-test (2.1.0) lib/rack/test.rb:153:in `request'"},{"exception_object_id":51620,"id":58,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:297:in `process'"},{"exception_object_id":51620,"id":59,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:37:in `put'"},{"exception_object_id":51620,"id":60,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:388:in `put'"},{"exception_object_id":51620,"id":61,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_helpers.rb:20:in `submit_request'"},{"exception_object_id":51620,"id":62,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_group_helpers.rb:140:in `block in run_test!'"},{"exception_object_id":51620,"id":63,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":64,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":65,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:365:in `run'"},{"exception_object_id":51620,"id":66,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:529:in `block in run_owned_hooks_for'"},{"exception_object_id":51620,"id":67,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `each'"},{"exception_object_id":51620,"id":68,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `run_owned_hooks_for'"},{"exception_object_id":51620,"id":69,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:615:in `block in run_example_hooks_for'"},{"exception_object_id":51620,"id":70,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `reverse_each'"},{"exception_object_id":51620,"id":71,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `run_example_hooks_for'"},{"exception_object_id":51620,"id":72,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:484:in `run'"},{"exception_object_id":51620,"id":73,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:505:in `run_before_example'"},{"exception_object_id":51620,"id":74,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:261:in `block in run'"},{"exception_object_id":51620,"id":75,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":76,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `block in with_around_example_hooks'"},{"exception_object_id":51620,"id":77,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `block in run'"},{"exception_object_id":51620,"id":78,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:626:in `block in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":79,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":80,"trace":"rspec-rails (6.0.3) lib/rspec/rails/adapters.rb:75:in `block (2 levels) in \u003cmodule:MinitestLifecycleAdapter\u003e'"},{"exception_object_id":51620,"id":81,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":82,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":83,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":84,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":85,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":86,"trace":"spec/rails_helper.rb:44:in `block (3 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":87,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/strategy.rb:30:in `cleaning'"},{"exception_object_id":51620,"id":88,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":89,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:34:in `block (2 levels) in cleaning'"},{"exception_object_id":51620,"id":90,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:35:in `cleaning'"},{"exception_object_id":51620,"id":91,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":92,"trace":"spec/rails_helper.rb:43:in `block (2 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":93,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":94,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":95,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":96,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":97,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":98,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:629:in `run_around_example_hooks_for'"},{"exception_object_id":51620,"id":99,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `run'"},{"exception_object_id":51620,"id":100,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `with_around_example_hooks'"},{"exception_object_id":51620,"id":101,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":102,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:259:in `run'"},{"exception_object_id":51620,"id":103,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:646:in `block in run_examples'"},{"exception_object_id":51620,"id":104,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `map'"},{"exception_object_id":51620,"id":105,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `run_examples'"},{"exception_object_id":51620,"id":106,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:607:in `run'"},{"exception_object_id":51620,"id":107,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":108,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":109,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":110,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":111,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":112,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":113,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":114,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":115,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":116,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (3 levels) in run_specs'"},{"exception_object_id":51620,"id":117,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `map'"},{"exception_object_id":51620,"id":118,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (2 levels) in run_specs'"},{"exception_object_id":51620,"id":119,"trace":"rspec-core (3.12.2) lib/rspec/core/configuration.rb:2070:in `with_suite_hooks'"},{"exception_object_id":51620,"id":120,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:116:in `block in run_specs'"},{"exception_object_id":51620,"id":121,"trace":"rspec-core (3.12.2) lib/rspec/core/reporter.rb:74:in `report'"},{"exception_object_id":51620,"id":122,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:115:in `run_specs'"},{"exception_object_id":51620,"id":123,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:89:in `run'"},{"exception_object_id":51620,"id":124,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:71:in `run'"},{"exception_object_id":51620,"id":125,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:45:in `invoke'"},{"exception_object_id":51620,"id":126,"trace":"rspec-core (3.12.2) exe/rspec:4:in `\u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":127,"trace":"/usr/local/bundle/bin/rspec:25:in `load'"},{"exception_object_id":51620,"id":128,"trace":"/usr/local/bundle/bin/rspec:25:in `\u003cmain\u003e'"}],"Full Trace":[{"exception_object_id":51620,"id":0,"trace":"activemodel (8.0.1) lib/active_model/attribute_methods.rb:512:in `method_missing'"},{"exception_object_id":51620,"id":1,"trace":"activerecord (8.0.1) lib/active_record/attribute_methods.rb:495:in `method_missing'"},{"exception_object_id":51620,"id":2,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `public_send'"},{"exception_object_id":51620,"id":3,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `update_attribute'"},{"exception_object_id":51620,"id":4,"trace":"app/controllers/api/v1/teams_participants_controller.rb:31:in `update_duties'"},{"exception_object_id":51620,"id":5,"trace":"actionpack (8.0.1) lib/action_controller/metal/basic_implicit_render.rb:8:in `send_action'"},{"exception_object_id":51620,"id":6,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:226:in `process_action'"},{"exception_object_id":51620,"id":7,"trace":"actionpack (8.0.1) lib/action_controller/metal/rendering.rb:193:in `process_action'"},{"exception_object_id":51620,"id":8,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:261:in `block in process_action'"},{"exception_object_id":51620,"id":9,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:109:in `run_callbacks'"},{"exception_object_id":51620,"id":10,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:260:in `process_action'"},{"exception_object_id":51620,"id":11,"trace":"actionpack (8.0.1) lib/action_controller/metal/rescue.rb:27:in `process_action'"},{"exception_object_id":51620,"id":12,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:76:in `block in process_action'"},{"exception_object_id":51620,"id":13,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `block in instrument'"},{"exception_object_id":51620,"id":14,"trace":"activesupport (8.0.1) lib/active_support/notifications/instrumenter.rb:58:in `instrument'"},{"exception_object_id":51620,"id":15,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `instrument'"},{"exception_object_id":51620,"id":16,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:75:in `process_action'"},{"exception_object_id":51620,"id":17,"trace":"actionpack (8.0.1) lib/action_controller/metal/params_wrapper.rb:259:in `process_action'"},{"exception_object_id":51620,"id":18,"trace":"activerecord (8.0.1) lib/active_record/railties/controller_runtime.rb:39:in `process_action'"},{"exception_object_id":51620,"id":19,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:163:in `process'"},{"exception_object_id":51620,"id":20,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:252:in `dispatch'"},{"exception_object_id":51620,"id":21,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:335:in `dispatch'"},{"exception_object_id":51620,"id":22,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:67:in `dispatch'"},{"exception_object_id":51620,"id":23,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:50:in `serve'"},{"exception_object_id":51620,"id":24,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:53:in `block in serve'"},{"exception_object_id":51620,"id":25,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:133:in `block in find_routes'"},{"exception_object_id":51620,"id":26,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `each'"},{"exception_object_id":51620,"id":27,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `find_routes'"},{"exception_object_id":51620,"id":28,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:34:in `serve'"},{"exception_object_id":51620,"id":29,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:908:in `call'"},{"exception_object_id":51620,"id":30,"trace":"rack (2.2.8) lib/rack/etag.rb:27:in `call'"},{"exception_object_id":51620,"id":31,"trace":"rack (2.2.8) lib/rack/conditional_get.rb:40:in `call'"},{"exception_object_id":51620,"id":32,"trace":"rack (2.2.8) lib/rack/head.rb:12:in `call'"},{"exception_object_id":51620,"id":33,"trace":"activerecord (8.0.1) lib/active_record/migration.rb:671:in `call'"},{"exception_object_id":51620,"id":34,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:31:in `block in call'"},{"exception_object_id":51620,"id":35,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:100:in `run_callbacks'"},{"exception_object_id":51620,"id":36,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:30:in `call'"},{"exception_object_id":51620,"id":37,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":38,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/actionable_exceptions.rb:18:in `call'"},{"exception_object_id":51620,"id":39,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/debug_exceptions.rb:31:in `call'"},{"exception_object_id":51620,"id":40,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/show_exceptions.rb:32:in `call'"},{"exception_object_id":51620,"id":41,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:41:in `call_app'"},{"exception_object_id":51620,"id":42,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:29:in `call'"},{"exception_object_id":51620,"id":43,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/remote_ip.rb:96:in `call'"},{"exception_object_id":51620,"id":44,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/request_id.rb:34:in `call'"},{"exception_object_id":51620,"id":45,"trace":"rack (2.2.8) lib/rack/runtime.rb:22:in `call'"},{"exception_object_id":51620,"id":46,"trace":"activesupport (8.0.1) lib/active_support/cache/strategy/local_cache_middleware.rb:29:in `call'"},{"exception_object_id":51620,"id":47,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:61:in `block in call'"},{"exception_object_id":51620,"id":48,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:26:in `collect_events'"},{"exception_object_id":51620,"id":49,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:60:in `call'"},{"exception_object_id":51620,"id":50,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":51,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/static.rb:27:in `call'"},{"exception_object_id":51620,"id":52,"trace":"rack (2.2.8) lib/rack/sendfile.rb:110:in `call'"},{"exception_object_id":51620,"id":53,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/host_authorization.rb:143:in `call'"},{"exception_object_id":51620,"id":54,"trace":"rack-cors (2.0.1) lib/rack/cors.rb:102:in `call'"},{"exception_object_id":51620,"id":55,"trace":"railties (8.0.1) lib/rails/engine.rb:535:in `call'"},{"exception_object_id":51620,"id":56,"trace":"rack-test (2.1.0) lib/rack/test.rb:360:in `process_request'"},{"exception_object_id":51620,"id":57,"trace":"rack-test (2.1.0) lib/rack/test.rb:153:in `request'"},{"exception_object_id":51620,"id":58,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:297:in `process'"},{"exception_object_id":51620,"id":59,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:37:in `put'"},{"exception_object_id":51620,"id":60,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:388:in `put'"},{"exception_object_id":51620,"id":61,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_helpers.rb:20:in `submit_request'"},{"exception_object_id":51620,"id":62,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_group_helpers.rb:140:in `block in run_test!'"},{"exception_object_id":51620,"id":63,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":64,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":65,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:365:in `run'"},{"exception_object_id":51620,"id":66,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:529:in `block in run_owned_hooks_for'"},{"exception_object_id":51620,"id":67,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `each'"},{"exception_object_id":51620,"id":68,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `run_owned_hooks_for'"},{"exception_object_id":51620,"id":69,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:615:in `block in run_example_hooks_for'"},{"exception_object_id":51620,"id":70,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `reverse_each'"},{"exception_object_id":51620,"id":71,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `run_example_hooks_for'"},{"exception_object_id":51620,"id":72,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:484:in `run'"},{"exception_object_id":51620,"id":73,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:505:in `run_before_example'"},{"exception_object_id":51620,"id":74,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:261:in `block in run'"},{"exception_object_id":51620,"id":75,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":76,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `block in with_around_example_hooks'"},{"exception_object_id":51620,"id":77,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `block in run'"},{"exception_object_id":51620,"id":78,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:626:in `block in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":79,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":80,"trace":"rspec-rails (6.0.3) lib/rspec/rails/adapters.rb:75:in `block (2 levels) in \u003cmodule:MinitestLifecycleAdapter\u003e'"},{"exception_object_id":51620,"id":81,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":82,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":83,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":84,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":85,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":86,"trace":"spec/rails_helper.rb:44:in `block (3 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":87,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/strategy.rb:30:in `cleaning'"},{"exception_object_id":51620,"id":88,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":89,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:34:in `block (2 levels) in cleaning'"},{"exception_object_id":51620,"id":90,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:35:in `cleaning'"},{"exception_object_id":51620,"id":91,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":92,"trace":"spec/rails_helper.rb:43:in `block (2 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":93,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":94,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":95,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":96,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":97,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":98,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:629:in `run_around_example_hooks_for'"},{"exception_object_id":51620,"id":99,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `run'"},{"exception_object_id":51620,"id":100,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `with_around_example_hooks'"},{"exception_object_id":51620,"id":101,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":102,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:259:in `run'"},{"exception_object_id":51620,"id":103,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:646:in `block in run_examples'"},{"exception_object_id":51620,"id":104,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `map'"},{"exception_object_id":51620,"id":105,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `run_examples'"},{"exception_object_id":51620,"id":106,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:607:in `run'"},{"exception_object_id":51620,"id":107,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":108,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":109,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":110,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":111,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":112,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":113,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":114,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":115,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":116,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (3 levels) in run_specs'"},{"exception_object_id":51620,"id":117,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `map'"},{"exception_object_id":51620,"id":118,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (2 levels) in run_specs'"},{"exception_object_id":51620,"id":119,"trace":"rspec-core (3.12.2) lib/rspec/core/configuration.rb:2070:in `with_suite_hooks'"},{"exception_object_id":51620,"id":120,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:116:in `block in run_specs'"},{"exception_object_id":51620,"id":121,"trace":"rspec-core (3.12.2) lib/rspec/core/reporter.rb:74:in `report'"},{"exception_object_id":51620,"id":122,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:115:in `run_specs'"},{"exception_object_id":51620,"id":123,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:89:in `run'"},{"exception_object_id":51620,"id":124,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:71:in `run'"},{"exception_object_id":51620,"id":125,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:45:in `invoke'"},{"exception_object_id":51620,"id":126,"trace":"rspec-core (3.12.2) exe/rspec:4:in `\u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":127,"trace":"/usr/local/bundle/bin/rspec:25:in `load'"},{"exception_object_id":51620,"id":128,"trace":"/usr/local/bundle/bin/rspec:25:in `\u003cmain\u003e'"}]}}
+       Response body: {"status":500,"error":"Internal Server Error","exception":"#\u003cNoMethodError: undefined method `duty_id=' for #\u003cTeamsUser id: 1, team_id: 1, user_id: 2, created_at: \"2025-03-24 06:13:17.232100000 +0000\", updated_at: \"2025-03-24 06:13:17.232100000 +0000\"\u003e\u003e","traces":{"Application Trace":[{"exception_object_id":51620,"id":4,"trace":"app/controllers/teams_participants_controller.rb:31:in `update_duties'"}],"Framework Trace":[{"exception_object_id":51620,"id":0,"trace":"activemodel (8.0.1) lib/active_model/attribute_methods.rb:512:in `method_missing'"},{"exception_object_id":51620,"id":1,"trace":"activerecord (8.0.1) lib/active_record/attribute_methods.rb:495:in `method_missing'"},{"exception_object_id":51620,"id":2,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `public_send'"},{"exception_object_id":51620,"id":3,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `update_attribute'"},{"exception_object_id":51620,"id":5,"trace":"actionpack (8.0.1) lib/action_controller/metal/basic_implicit_render.rb:8:in `send_action'"},{"exception_object_id":51620,"id":6,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:226:in `process_action'"},{"exception_object_id":51620,"id":7,"trace":"actionpack (8.0.1) lib/action_controller/metal/rendering.rb:193:in `process_action'"},{"exception_object_id":51620,"id":8,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:261:in `block in process_action'"},{"exception_object_id":51620,"id":9,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:109:in `run_callbacks'"},{"exception_object_id":51620,"id":10,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:260:in `process_action'"},{"exception_object_id":51620,"id":11,"trace":"actionpack (8.0.1) lib/action_controller/metal/rescue.rb:27:in `process_action'"},{"exception_object_id":51620,"id":12,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:76:in `block in process_action'"},{"exception_object_id":51620,"id":13,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `block in instrument'"},{"exception_object_id":51620,"id":14,"trace":"activesupport (8.0.1) lib/active_support/notifications/instrumenter.rb:58:in `instrument'"},{"exception_object_id":51620,"id":15,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `instrument'"},{"exception_object_id":51620,"id":16,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:75:in `process_action'"},{"exception_object_id":51620,"id":17,"trace":"actionpack (8.0.1) lib/action_controller/metal/params_wrapper.rb:259:in `process_action'"},{"exception_object_id":51620,"id":18,"trace":"activerecord (8.0.1) lib/active_record/railties/controller_runtime.rb:39:in `process_action'"},{"exception_object_id":51620,"id":19,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:163:in `process'"},{"exception_object_id":51620,"id":20,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:252:in `dispatch'"},{"exception_object_id":51620,"id":21,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:335:in `dispatch'"},{"exception_object_id":51620,"id":22,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:67:in `dispatch'"},{"exception_object_id":51620,"id":23,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:50:in `serve'"},{"exception_object_id":51620,"id":24,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:53:in `block in serve'"},{"exception_object_id":51620,"id":25,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:133:in `block in find_routes'"},{"exception_object_id":51620,"id":26,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `each'"},{"exception_object_id":51620,"id":27,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `find_routes'"},{"exception_object_id":51620,"id":28,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:34:in `serve'"},{"exception_object_id":51620,"id":29,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:908:in `call'"},{"exception_object_id":51620,"id":30,"trace":"rack (2.2.8) lib/rack/etag.rb:27:in `call'"},{"exception_object_id":51620,"id":31,"trace":"rack (2.2.8) lib/rack/conditional_get.rb:40:in `call'"},{"exception_object_id":51620,"id":32,"trace":"rack (2.2.8) lib/rack/head.rb:12:in `call'"},{"exception_object_id":51620,"id":33,"trace":"activerecord (8.0.1) lib/active_record/migration.rb:671:in `call'"},{"exception_object_id":51620,"id":34,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:31:in `block in call'"},{"exception_object_id":51620,"id":35,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:100:in `run_callbacks'"},{"exception_object_id":51620,"id":36,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:30:in `call'"},{"exception_object_id":51620,"id":37,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":38,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/actionable_exceptions.rb:18:in `call'"},{"exception_object_id":51620,"id":39,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/debug_exceptions.rb:31:in `call'"},{"exception_object_id":51620,"id":40,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/show_exceptions.rb:32:in `call'"},{"exception_object_id":51620,"id":41,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:41:in `call_app'"},{"exception_object_id":51620,"id":42,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:29:in `call'"},{"exception_object_id":51620,"id":43,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/remote_ip.rb:96:in `call'"},{"exception_object_id":51620,"id":44,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/request_id.rb:34:in `call'"},{"exception_object_id":51620,"id":45,"trace":"rack (2.2.8) lib/rack/runtime.rb:22:in `call'"},{"exception_object_id":51620,"id":46,"trace":"activesupport (8.0.1) lib/active_support/cache/strategy/local_cache_middleware.rb:29:in `call'"},{"exception_object_id":51620,"id":47,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:61:in `block in call'"},{"exception_object_id":51620,"id":48,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:26:in `collect_events'"},{"exception_object_id":51620,"id":49,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:60:in `call'"},{"exception_object_id":51620,"id":50,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":51,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/static.rb:27:in `call'"},{"exception_object_id":51620,"id":52,"trace":"rack (2.2.8) lib/rack/sendfile.rb:110:in `call'"},{"exception_object_id":51620,"id":53,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/host_authorization.rb:143:in `call'"},{"exception_object_id":51620,"id":54,"trace":"rack-cors (2.0.1) lib/rack/cors.rb:102:in `call'"},{"exception_object_id":51620,"id":55,"trace":"railties (8.0.1) lib/rails/engine.rb:535:in `call'"},{"exception_object_id":51620,"id":56,"trace":"rack-test (2.1.0) lib/rack/test.rb:360:in `process_request'"},{"exception_object_id":51620,"id":57,"trace":"rack-test (2.1.0) lib/rack/test.rb:153:in `request'"},{"exception_object_id":51620,"id":58,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:297:in `process'"},{"exception_object_id":51620,"id":59,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:37:in `put'"},{"exception_object_id":51620,"id":60,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:388:in `put'"},{"exception_object_id":51620,"id":61,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_helpers.rb:20:in `submit_request'"},{"exception_object_id":51620,"id":62,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_group_helpers.rb:140:in `block in run_test!'"},{"exception_object_id":51620,"id":63,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":64,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":65,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:365:in `run'"},{"exception_object_id":51620,"id":66,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:529:in `block in run_owned_hooks_for'"},{"exception_object_id":51620,"id":67,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `each'"},{"exception_object_id":51620,"id":68,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `run_owned_hooks_for'"},{"exception_object_id":51620,"id":69,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:615:in `block in run_example_hooks_for'"},{"exception_object_id":51620,"id":70,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `reverse_each'"},{"exception_object_id":51620,"id":71,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `run_example_hooks_for'"},{"exception_object_id":51620,"id":72,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:484:in `run'"},{"exception_object_id":51620,"id":73,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:505:in `run_before_example'"},{"exception_object_id":51620,"id":74,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:261:in `block in run'"},{"exception_object_id":51620,"id":75,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":76,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `block in with_around_example_hooks'"},{"exception_object_id":51620,"id":77,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `block in run'"},{"exception_object_id":51620,"id":78,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:626:in `block in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":79,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":80,"trace":"rspec-rails (6.0.3) lib/rspec/rails/adapters.rb:75:in `block (2 levels) in \u003cmodule:MinitestLifecycleAdapter\u003e'"},{"exception_object_id":51620,"id":81,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":82,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":83,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":84,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":85,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":86,"trace":"spec/rails_helper.rb:44:in `block (3 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":87,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/strategy.rb:30:in `cleaning'"},{"exception_object_id":51620,"id":88,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":89,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:34:in `block (2 levels) in cleaning'"},{"exception_object_id":51620,"id":90,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:35:in `cleaning'"},{"exception_object_id":51620,"id":91,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":92,"trace":"spec/rails_helper.rb:43:in `block (2 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":93,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":94,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":95,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":96,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":97,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":98,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:629:in `run_around_example_hooks_for'"},{"exception_object_id":51620,"id":99,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `run'"},{"exception_object_id":51620,"id":100,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `with_around_example_hooks'"},{"exception_object_id":51620,"id":101,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":102,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:259:in `run'"},{"exception_object_id":51620,"id":103,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:646:in `block in run_examples'"},{"exception_object_id":51620,"id":104,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `map'"},{"exception_object_id":51620,"id":105,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `run_examples'"},{"exception_object_id":51620,"id":106,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:607:in `run'"},{"exception_object_id":51620,"id":107,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":108,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":109,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":110,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":111,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":112,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":113,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":114,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":115,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":116,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (3 levels) in run_specs'"},{"exception_object_id":51620,"id":117,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `map'"},{"exception_object_id":51620,"id":118,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (2 levels) in run_specs'"},{"exception_object_id":51620,"id":119,"trace":"rspec-core (3.12.2) lib/rspec/core/configuration.rb:2070:in `with_suite_hooks'"},{"exception_object_id":51620,"id":120,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:116:in `block in run_specs'"},{"exception_object_id":51620,"id":121,"trace":"rspec-core (3.12.2) lib/rspec/core/reporter.rb:74:in `report'"},{"exception_object_id":51620,"id":122,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:115:in `run_specs'"},{"exception_object_id":51620,"id":123,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:89:in `run'"},{"exception_object_id":51620,"id":124,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:71:in `run'"},{"exception_object_id":51620,"id":125,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:45:in `invoke'"},{"exception_object_id":51620,"id":126,"trace":"rspec-core (3.12.2) exe/rspec:4:in `\u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":127,"trace":"/usr/local/bundle/bin/rspec:25:in `load'"},{"exception_object_id":51620,"id":128,"trace":"/usr/local/bundle/bin/rspec:25:in `\u003cmain\u003e'"}],"Full Trace":[{"exception_object_id":51620,"id":0,"trace":"activemodel (8.0.1) lib/active_model/attribute_methods.rb:512:in `method_missing'"},{"exception_object_id":51620,"id":1,"trace":"activerecord (8.0.1) lib/active_record/attribute_methods.rb:495:in `method_missing'"},{"exception_object_id":51620,"id":2,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `public_send'"},{"exception_object_id":51620,"id":3,"trace":"activerecord (8.0.1) lib/active_record/persistence.rb:533:in `update_attribute'"},{"exception_object_id":51620,"id":4,"trace":"app/controllers/teams_participants_controller.rb:31:in `update_duties'"},{"exception_object_id":51620,"id":5,"trace":"actionpack (8.0.1) lib/action_controller/metal/basic_implicit_render.rb:8:in `send_action'"},{"exception_object_id":51620,"id":6,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:226:in `process_action'"},{"exception_object_id":51620,"id":7,"trace":"actionpack (8.0.1) lib/action_controller/metal/rendering.rb:193:in `process_action'"},{"exception_object_id":51620,"id":8,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:261:in `block in process_action'"},{"exception_object_id":51620,"id":9,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:109:in `run_callbacks'"},{"exception_object_id":51620,"id":10,"trace":"actionpack (8.0.1) lib/abstract_controller/callbacks.rb:260:in `process_action'"},{"exception_object_id":51620,"id":11,"trace":"actionpack (8.0.1) lib/action_controller/metal/rescue.rb:27:in `process_action'"},{"exception_object_id":51620,"id":12,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:76:in `block in process_action'"},{"exception_object_id":51620,"id":13,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `block in instrument'"},{"exception_object_id":51620,"id":14,"trace":"activesupport (8.0.1) lib/active_support/notifications/instrumenter.rb:58:in `instrument'"},{"exception_object_id":51620,"id":15,"trace":"activesupport (8.0.1) lib/active_support/notifications.rb:210:in `instrument'"},{"exception_object_id":51620,"id":16,"trace":"actionpack (8.0.1) lib/action_controller/metal/instrumentation.rb:75:in `process_action'"},{"exception_object_id":51620,"id":17,"trace":"actionpack (8.0.1) lib/action_controller/metal/params_wrapper.rb:259:in `process_action'"},{"exception_object_id":51620,"id":18,"trace":"activerecord (8.0.1) lib/active_record/railties/controller_runtime.rb:39:in `process_action'"},{"exception_object_id":51620,"id":19,"trace":"actionpack (8.0.1) lib/abstract_controller/base.rb:163:in `process'"},{"exception_object_id":51620,"id":20,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:252:in `dispatch'"},{"exception_object_id":51620,"id":21,"trace":"actionpack (8.0.1) lib/action_controller/metal.rb:335:in `dispatch'"},{"exception_object_id":51620,"id":22,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:67:in `dispatch'"},{"exception_object_id":51620,"id":23,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:50:in `serve'"},{"exception_object_id":51620,"id":24,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:53:in `block in serve'"},{"exception_object_id":51620,"id":25,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:133:in `block in find_routes'"},{"exception_object_id":51620,"id":26,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `each'"},{"exception_object_id":51620,"id":27,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:126:in `find_routes'"},{"exception_object_id":51620,"id":28,"trace":"actionpack (8.0.1) lib/action_dispatch/journey/router.rb:34:in `serve'"},{"exception_object_id":51620,"id":29,"trace":"actionpack (8.0.1) lib/action_dispatch/routing/route_set.rb:908:in `call'"},{"exception_object_id":51620,"id":30,"trace":"rack (2.2.8) lib/rack/etag.rb:27:in `call'"},{"exception_object_id":51620,"id":31,"trace":"rack (2.2.8) lib/rack/conditional_get.rb:40:in `call'"},{"exception_object_id":51620,"id":32,"trace":"rack (2.2.8) lib/rack/head.rb:12:in `call'"},{"exception_object_id":51620,"id":33,"trace":"activerecord (8.0.1) lib/active_record/migration.rb:671:in `call'"},{"exception_object_id":51620,"id":34,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:31:in `block in call'"},{"exception_object_id":51620,"id":35,"trace":"activesupport (8.0.1) lib/active_support/callbacks.rb:100:in `run_callbacks'"},{"exception_object_id":51620,"id":36,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/callbacks.rb:30:in `call'"},{"exception_object_id":51620,"id":37,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":38,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/actionable_exceptions.rb:18:in `call'"},{"exception_object_id":51620,"id":39,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/debug_exceptions.rb:31:in `call'"},{"exception_object_id":51620,"id":40,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/show_exceptions.rb:32:in `call'"},{"exception_object_id":51620,"id":41,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:41:in `call_app'"},{"exception_object_id":51620,"id":42,"trace":"railties (8.0.1) lib/rails/rack/logger.rb:29:in `call'"},{"exception_object_id":51620,"id":43,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/remote_ip.rb:96:in `call'"},{"exception_object_id":51620,"id":44,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/request_id.rb:34:in `call'"},{"exception_object_id":51620,"id":45,"trace":"rack (2.2.8) lib/rack/runtime.rb:22:in `call'"},{"exception_object_id":51620,"id":46,"trace":"activesupport (8.0.1) lib/active_support/cache/strategy/local_cache_middleware.rb:29:in `call'"},{"exception_object_id":51620,"id":47,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:61:in `block in call'"},{"exception_object_id":51620,"id":48,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:26:in `collect_events'"},{"exception_object_id":51620,"id":49,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/server_timing.rb:60:in `call'"},{"exception_object_id":51620,"id":50,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/executor.rb:16:in `call'"},{"exception_object_id":51620,"id":51,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/static.rb:27:in `call'"},{"exception_object_id":51620,"id":52,"trace":"rack (2.2.8) lib/rack/sendfile.rb:110:in `call'"},{"exception_object_id":51620,"id":53,"trace":"actionpack (8.0.1) lib/action_dispatch/middleware/host_authorization.rb:143:in `call'"},{"exception_object_id":51620,"id":54,"trace":"rack-cors (2.0.1) lib/rack/cors.rb:102:in `call'"},{"exception_object_id":51620,"id":55,"trace":"railties (8.0.1) lib/rails/engine.rb:535:in `call'"},{"exception_object_id":51620,"id":56,"trace":"rack-test (2.1.0) lib/rack/test.rb:360:in `process_request'"},{"exception_object_id":51620,"id":57,"trace":"rack-test (2.1.0) lib/rack/test.rb:153:in `request'"},{"exception_object_id":51620,"id":58,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:297:in `process'"},{"exception_object_id":51620,"id":59,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:37:in `put'"},{"exception_object_id":51620,"id":60,"trace":"actionpack (8.0.1) lib/action_dispatch/testing/integration.rb:388:in `put'"},{"exception_object_id":51620,"id":61,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_helpers.rb:20:in `submit_request'"},{"exception_object_id":51620,"id":62,"trace":"rswag-specs (2.16.0) lib/rswag/specs/example_group_helpers.rb:140:in `block in run_test!'"},{"exception_object_id":51620,"id":63,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":64,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":65,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:365:in `run'"},{"exception_object_id":51620,"id":66,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:529:in `block in run_owned_hooks_for'"},{"exception_object_id":51620,"id":67,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `each'"},{"exception_object_id":51620,"id":68,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:528:in `run_owned_hooks_for'"},{"exception_object_id":51620,"id":69,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:615:in `block in run_example_hooks_for'"},{"exception_object_id":51620,"id":70,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `reverse_each'"},{"exception_object_id":51620,"id":71,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:614:in `run_example_hooks_for'"},{"exception_object_id":51620,"id":72,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:484:in `run'"},{"exception_object_id":51620,"id":73,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:505:in `run_before_example'"},{"exception_object_id":51620,"id":74,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:261:in `block in run'"},{"exception_object_id":51620,"id":75,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":76,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `block in with_around_example_hooks'"},{"exception_object_id":51620,"id":77,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `block in run'"},{"exception_object_id":51620,"id":78,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:626:in `block in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":79,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":80,"trace":"rspec-rails (6.0.3) lib/rspec/rails/adapters.rb:75:in `block (2 levels) in \u003cmodule:MinitestLifecycleAdapter\u003e'"},{"exception_object_id":51620,"id":81,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":82,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":83,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":84,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":85,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":86,"trace":"spec/rails_helper.rb:44:in `block (3 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":87,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/strategy.rb:30:in `cleaning'"},{"exception_object_id":51620,"id":88,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":89,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:34:in `block (2 levels) in cleaning'"},{"exception_object_id":51620,"id":90,"trace":"database_cleaner-core (2.0.1) lib/database_cleaner/cleaners.rb:35:in `cleaning'"},{"exception_object_id":51620,"id":91,"trace":"/usr/local/lib/ruby/3.2.0/forwardable.rb:240:in `cleaning'"},{"exception_object_id":51620,"id":92,"trace":"spec/rails_helper.rb:43:in `block (2 levels) in \u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":93,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":94,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:457:in `instance_exec'"},{"exception_object_id":51620,"id":95,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:390:in `execute_with'"},{"exception_object_id":51620,"id":96,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:628:in `block (2 levels) in run_around_example_hooks_for'"},{"exception_object_id":51620,"id":97,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:352:in `call'"},{"exception_object_id":51620,"id":98,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:629:in `run_around_example_hooks_for'"},{"exception_object_id":51620,"id":99,"trace":"rspec-core (3.12.2) lib/rspec/core/hooks.rb:486:in `run'"},{"exception_object_id":51620,"id":100,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:468:in `with_around_example_hooks'"},{"exception_object_id":51620,"id":101,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks'"},{"exception_object_id":51620,"id":102,"trace":"rspec-core (3.12.2) lib/rspec/core/example.rb:259:in `run'"},{"exception_object_id":51620,"id":103,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:646:in `block in run_examples'"},{"exception_object_id":51620,"id":104,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `map'"},{"exception_object_id":51620,"id":105,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:642:in `run_examples'"},{"exception_object_id":51620,"id":106,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:607:in `run'"},{"exception_object_id":51620,"id":107,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":108,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":109,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":110,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":111,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":112,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":113,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `block in run'"},{"exception_object_id":51620,"id":114,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `map'"},{"exception_object_id":51620,"id":115,"trace":"rspec-core (3.12.2) lib/rspec/core/example_group.rb:608:in `run'"},{"exception_object_id":51620,"id":116,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (3 levels) in run_specs'"},{"exception_object_id":51620,"id":117,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `map'"},{"exception_object_id":51620,"id":118,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:121:in `block (2 levels) in run_specs'"},{"exception_object_id":51620,"id":119,"trace":"rspec-core (3.12.2) lib/rspec/core/configuration.rb:2070:in `with_suite_hooks'"},{"exception_object_id":51620,"id":120,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:116:in `block in run_specs'"},{"exception_object_id":51620,"id":121,"trace":"rspec-core (3.12.2) lib/rspec/core/reporter.rb:74:in `report'"},{"exception_object_id":51620,"id":122,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:115:in `run_specs'"},{"exception_object_id":51620,"id":123,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:89:in `run'"},{"exception_object_id":51620,"id":124,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:71:in `run'"},{"exception_object_id":51620,"id":125,"trace":"rspec-core (3.12.2) lib/rspec/core/runner.rb:45:in `invoke'"},{"exception_object_id":51620,"id":126,"trace":"rspec-core (3.12.2) exe/rspec:4:in `\u003ctop (required)\u003e'"},{"exception_object_id":51620,"id":127,"trace":"/usr/local/bundle/bin/rspec:25:in `load'"},{"exception_object_id":51620,"id":128,"trace":"/usr/local/bundle/bin/rspec:25:in `\u003cmain\u003e'"}]}}
      # /usr/local/bundle/gems/rswag-specs-2.16.0/lib/rswag/specs/response_validator.rb:28:in `validate_code!'
      # /usr/local/bundle/gems/rswag-specs-2.16.0/lib/rswag/specs/response_validator.rb:18:in `validate!'
      # /usr/local/bundle/gems/rswag-specs-2.16.0/lib/rswag/specs/example_helpers.rb:30:in `assert_response_matches_metadata'
@@ -25,6 +25,6 @@ Finished in 8.68 seconds (files took 7.46 seconds to load)
 
 Failed examples:
 
-rspec ./spec/requests/api/v1/teams_participants_controller_spec.rb:84 # api/v1/teams_participants /api/v1/teams_participants/update_duties put duty updated successfully returns a 200 response
+rspec ./spec/requests/teams_participants_controller_spec.rb:84 # teams_participants /teams_participants/update_duties put duty updated successfully returns a 200 response
 
 JSON Coverage report generated for RSpec to /app/coverage.         257 / 2825 LOC (9.1%) covered.
diff --git a/spec/controllers/concerns/authorization_spec.rb b/spec/controllers/concerns/authorization_spec.rb
index 465df6fc3..09bdc9da3 100644
--- a/spec/controllers/concerns/authorization_spec.rb
+++ b/spec/controllers/concerns/authorization_spec.rb
@@ -1,206 +1,208 @@
-require 'rails_helper'
-
-RSpec.describe Authorization, type: :controller do
-  controller(ApplicationController) do
-    include Authorization
-  end
-
-  # Global test doubles and setup
-  let(:user) { instance_double('User') }
-  let(:role) { instance_double('Role') }
-
-  before do
-    allow(controller).to receive(:current_user).and_return(user)
-    allow(user).to receive(:role).and_return(role)
-  end
-
-  ##########################################
-  # Tests for current_user_has_privileges_of? method
-  ##########################################
-  describe '#current_user_has_privileges_of?' do
-    describe 'role validation' do
-      context 'when required_role is a string' do
-        let(:admin_role) { instance_double('Role') }
-
-        before do
-          allow(Role).to receive(:find_by).with(name:'Administrator').and_return(admin_role)
-        end
-
-        it 'finds the role and checks privileges' do
-          expect(role).to receive(:all_privileges_of?).with(admin_role).and_return(true)
-          expect(controller.current_user_has_admin_privileges?).to be true
-        end
-      end      
-    end
-
-    describe 'edge cases' do
-      context 'when user is not logged in' do
-        before do
-          allow(controller).to receive(:current_user).and_return(nil)
-        end
-
-        it 'returns false' do
-          expect(controller.current_user_has_admin_privileges?).to be false
-        end
-      end
-
-      context 'when user has no role' do
-        before do
-          allow(user).to receive(:role).and_return(nil)
-        end
-
-        it 'returns false' do
-          expect(controller.current_user_has_admin_privileges?).to be false
-        end
-      end
-    end
-  end
-
-  ##########################################
-  # Tests for current_user_has_role? method
-  ##########################################
-  describe '#current_user_has_role?' do
-    describe 'role matching' do
-      context 'when role_name is a string' do
-        before do
-          allow(role).to receive(:name).and_return('Student')
-        end
-
-        it 'returns true when roles match' do
-          expect(controller.current_user_has_role?('Student')).to be true
-        end
-
-        it 'returns false when roles do not match' do
-          expect(controller.current_user_has_role?('Instructor')).to be false
-        end
-      end
-
-      context 'when role_name is a Role object' do
-        let(:role_object) { instance_double('Role', name: 'Student') }
-
-        before do
-          allow(role).to receive(:name).and_return('Student')
-          allow(role_object).to receive(:name).and_return('Student')
-          allow(role_object).to receive(:is_a?).with(Role).and_return(true)
-        end
-
-        it 'compares using the role name' do
-          expect(controller.current_user_has_role?(role_object)).to be true
-        end
-      end
-    end
-
-    describe 'edge cases' do
-      context 'when user is not logged in' do
-        before do
-          allow(controller).to receive(:current_user).and_return(nil)
-        end
-
-        it 'returns false' do
-          expect(controller.current_user_has_role?('Student')).to be false
-        end
-      end
-
-      context 'when user has no role' do
-        before do
-          allow(user).to receive(:role).and_return(nil)
-        end
-
-        it 'returns false' do
-          expect(controller.current_user_has_role?('Student')).to be false
-        end
-      end
-    end
-  end
-  
-  ##########################################
-  # Tests for all_actions_allowed? method
-  ##########################################
-  describe '#all_actions_allowed?' do
-    context 'when the user has the Super Administrator role' do
-      before do
-        allow(controller).to receive(:current_user_has_privileges_of?).with('Super Administrator').and_return(true)
-      end
-
-      it 'returns true' do
-        expect(controller.all_actions_allowed?).to be true
-      end
-    end
-
-    context 'when the user does not have the Super Administrator role' do
-      before do
-        allow(controller).to receive(:current_user_has_privileges_of?).with('Super Administrator').and_return(false)
-        allow(controller).to receive(:action_allowed?).and_return(false)
-      end
-
-      it 'checks action_allowed? and returns false' do
-        expect(controller.all_actions_allowed?).to be false
-      end
-    end
-
-    context 'when action_allowed? returns true' do
-      before do
-        allow(controller).to receive(:current_user_has_privileges_of?).with('Super Administrator').and_return(false)
-        allow(controller).to receive(:action_allowed?).and_return(true)
-      end
-
-      it 'returns true' do
-        expect(controller.all_actions_allowed?).to be true
-      end
-    end
-  end
-
-  ##########################################
-  # Tests for action_allowed? method
-  ##########################################
-  describe '#action_allowed?' do
-    it 'returns true by default' do
-      expect(controller.action_allowed?).to be true
-    end
-
-    it 'can be overridden in subclasses for custom logic' do
-      class CustomController < ApplicationController
-        include Authorization
-
-        def action_allowed?
-          false
-        end
-      end
-
-      custom_controller = CustomController.new
-      expect(custom_controller.action_allowed?).to be false
-    end
-  end
-
-  ##########################################
-  # Tests for authorize method
-  ##########################################
-  describe '#authorize' do
-    context 'when all actions are allowed' do
-      before do
-        allow(controller).to receive(:all_actions_allowed?).and_return(true)
-      end
-
-      it 'does not render an error response' do
-        expect(controller).not_to receive(:render)
-        controller.authorize
-      end
-    end
-
-    context 'when actions are not allowed' do
-      before do
-        allow(controller).to receive(:all_actions_allowed?).and_return(false)
-        allow(controller.params).to receive(:[]).with(:action).and_return('edit')
-        allow(controller.params).to receive(:[]).with(:controller).and_return('users')
-      end
-
-      it 'renders an error response with forbidden status' do
-        expect(controller).to receive(:render).with(
-          json: { error: "You are not authorized to edit this users" },
-          status: :forbidden
-        )
-        controller.authorize
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Authorization, type: :controller do
+  controller(ApplicationController) do
+    include Authorization
+  end
+
+  # Global test doubles and setup
+  let(:user) { instance_double('User') }
+  let(:role) { instance_double('Role') }
+
+  before do
+    allow(controller).to receive(:current_user).and_return(user)
+    allow(user).to receive(:role).and_return(role)
+  end
+
+  ##########################################
+  # Tests for current_user_has_privileges_of? method
+  ##########################################
+  describe '#current_user_has_privileges_of?' do
+    describe 'role validation' do
+      context 'when required_role is a string' do
+        let(:admin_role) { instance_double('Role') }
+
+        before do
+          allow(Role).to receive(:find_by).with(name:'Administrator').and_return(admin_role)
+        end
+
+        it 'finds the role and checks privileges' do
+          expect(role).to receive(:all_privileges_of?).with(admin_role).and_return(true)
+          expect(controller.current_user_has_admin_privileges?).to be true
+        end
+      end      
+    end
+
+    describe 'edge cases' do
+      context 'when user is not logged in' do
+        before do
+          allow(controller).to receive(:current_user).and_return(nil)
+        end
+
+        it 'returns false' do
+          expect(controller.current_user_has_admin_privileges?).to be false
+        end
+      end
+
+      context 'when user has no role' do
+        before do
+          allow(user).to receive(:role).and_return(nil)
+        end
+
+        it 'returns false' do
+          expect(controller.current_user_has_admin_privileges?).to be false
+        end
+      end
+    end
+  end
+
+  ##########################################
+  # Tests for current_user_has_role? method
+  ##########################################
+  describe '#current_user_has_role?' do
+    describe 'role matching' do
+      context 'when role_name is a string' do
+        before do
+          allow(role).to receive(:name).and_return('Student')
+        end
+
+        it 'returns true when roles match' do
+          expect(controller.current_user_has_role?('Student')).to be true
+        end
+
+        it 'returns false when roles do not match' do
+          expect(controller.current_user_has_role?('Instructor')).to be false
+        end
+      end
+
+      context 'when role_name is a Role object' do
+        let(:role_object) { instance_double('Role', name: 'Student') }
+
+        before do
+          allow(role).to receive(:name).and_return('Student')
+          allow(role_object).to receive(:name).and_return('Student')
+          allow(role_object).to receive(:is_a?).with(Role).and_return(true)
+        end
+
+        it 'compares using the role name' do
+          expect(controller.current_user_has_role?(role_object)).to be true
+        end
+      end
+    end
+
+    describe 'edge cases' do
+      context 'when user is not logged in' do
+        before do
+          allow(controller).to receive(:current_user).and_return(nil)
+        end
+
+        it 'returns false' do
+          expect(controller.current_user_has_role?('Student')).to be false
+        end
+      end
+
+      context 'when user has no role' do
+        before do
+          allow(user).to receive(:role).and_return(nil)
+        end
+
+        it 'returns false' do
+          expect(controller.current_user_has_role?('Student')).to be false
+        end
+      end
+    end
+  end
+  
+  ##########################################
+  # Tests for all_actions_allowed? method
+  ##########################################
+  describe '#all_actions_allowed?' do
+    context 'when the user has the Super Administrator role' do
+      before do
+        allow(controller).to receive(:current_user_has_privileges_of?).with('Super Administrator').and_return(true)
+      end
+
+      it 'returns true' do
+        expect(controller.all_actions_allowed?).to be true
+      end
+    end
+
+    context 'when the user does not have the Super Administrator role' do
+      before do
+        allow(controller).to receive(:current_user_has_privileges_of?).with('Super Administrator').and_return(false)
+        allow(controller).to receive(:action_allowed?).and_return(false)
+      end
+
+      it 'checks action_allowed? and returns false' do
+        expect(controller.all_actions_allowed?).to be false
+      end
+    end
+
+    context 'when action_allowed? returns true' do
+      before do
+        allow(controller).to receive(:current_user_has_privileges_of?).with('Super Administrator').and_return(false)
+        allow(controller).to receive(:action_allowed?).and_return(true)
+      end
+
+      it 'returns true' do
+        expect(controller.all_actions_allowed?).to be true
+      end
+    end
+  end
+
+  ##########################################
+  # Tests for action_allowed? method
+  ##########################################
+  describe '#action_allowed?' do
+    it 'returns true by default' do
+      expect(controller.action_allowed?).to be true
+    end
+
+    it 'can be overridden in subclasses for custom logic' do
+      class CustomController < ApplicationController
+        include Authorization
+
+        def action_allowed?
+          false
+        end
+      end
+
+      custom_controller = CustomController.new
+      expect(custom_controller.action_allowed?).to be false
+    end
+  end
+
+  ##########################################
+  # Tests for authorize method
+  ##########################################
+  describe '#authorize' do
+    context 'when all actions are allowed' do
+      before do
+        allow(controller).to receive(:all_actions_allowed?).and_return(true)
+      end
+
+      it 'does not render an error response' do
+        expect(controller).not_to receive(:render)
+        controller.authorize
+      end
+    end
+
+    context 'when actions are not allowed' do
+      before do
+        allow(controller).to receive(:all_actions_allowed?).and_return(false)
+        allow(controller.params).to receive(:[]).with(:action).and_return('edit')
+        allow(controller.params).to receive(:[]).with(:controller).and_return('users')
+      end
+
+      it 'renders an error response with forbidden status' do
+        expect(controller).to receive(:render).with(
+          json: { error: "You are not authorized to edit this users" },
+          status: :forbidden
+        )
+        controller.authorize
+      end
+    end
+  end
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 0217c8e0d..1556b02b2 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :student_task do
     assignment { nil }
@@ -30,6 +32,10 @@
       role { create(:role, :instructor) }
     end
 
+    trait :ta do
+      role { create(:role, :ta) }
+    end
+
     trait :student do
       role { create(:role, :student) }
     end
diff --git a/spec/factories/assignments.rb b/spec/factories/assignments.rb
index 11788ce8c..33ec9f14e 100644
--- a/spec/factories/assignments.rb
+++ b/spec/factories/assignments.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # spec/factories/assignments.rb
 FactoryBot.define do
   factory :assignment do
diff --git a/spec/factories/courses.rb b/spec/factories/courses.rb
index b06c4e878..f51991f02 100644
--- a/spec/factories/courses.rb
+++ b/spec/factories/courses.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :course do
     name { Faker::Educator.course_name }
diff --git a/spec/factories/factories.rb b/spec/factories/factories.rb
index eb06d7682..54ca75e74 100644
--- a/spec/factories/factories.rb
+++ b/spec/factories/factories.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   
 
diff --git a/spec/factories/participants.rb b/spec/factories/participants.rb
index d3da37aa0..6cccb71e8 100644
--- a/spec/factories/participants.rb
+++ b/spec/factories/participants.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :participant do
     association :user
diff --git a/spec/factories/questionnaires.rb b/spec/factories/questionnaires.rb
index 2b1181035..71b54a50a 100644
--- a/spec/factories/questionnaires.rb
+++ b/spec/factories/questionnaires.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # spec/factories/questionnaires.rb
 FactoryBot.define do
   factory :questionnaire do
diff --git a/spec/factories/roles.rb b/spec/factories/roles.rb
index 226d8bcf7..75fa513ee 100644
--- a/spec/factories/roles.rb
+++ b/spec/factories/roles.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # spec/factories/roles.rb
 FactoryBot.define do
   factory :role do
diff --git a/spec/factories/teams.rb b/spec/factories/teams.rb
index 29f1e1670..8533a6b0e 100644
--- a/spec/factories/teams.rb
+++ b/spec/factories/teams.rb
@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :team do
     name { Faker::Team.name }
     type { 'CourseTeam' }
-    max_team_size { 5 }
-    association :user, factory: :user
 
     trait :with_assignment do
       association :assignment, factory: :assignment
@@ -13,16 +13,12 @@
   factory :course_team, class: 'CourseTeam' do
     name { Faker::Team.name }
     type { 'CourseTeam' }
-    max_team_size { 5 }
-    association :user, factory: :user
     association :course, factory: :course
   end
 
   factory :assignment_team, class: 'AssignmentTeam' do
     name { Faker::Team.name }
     type { 'AssignmentTeam' }
-    max_team_size { 5 }
-    association :user, factory: :user
     
     transient do
       course { create(:course) }
@@ -34,14 +30,12 @@
       else
         team.course = team.assignment.course
       end
-      team.user ||= create(:user)
     end
 
     trait :with_assignment do
       after(:build) do |team, evaluator|
         team.assignment = create(:assignment, course: evaluator.course)
         team.course = team.assignment.course
-        team.user ||= create(:user)
       end
     end
   end
@@ -49,8 +43,6 @@
   factory :mentored_team, class: 'MentoredTeam' do
     name { Faker::Team.name }
     type { 'MentoredTeam' }
-    max_team_size { 5 }
-    association :user, factory: :user
 
     transient do
       course { create(:course) }
@@ -58,11 +50,11 @@
 
     assignment { create(:assignment, course: course) }
 
-    after(:build) do |team, evaluator|
-      mentor_role = create(:role, :mentor)
-      mentor = create(:user, role: mentor_role)
-      team.mentor = mentor
-    end
+    # after(:build) do |team, evaluator|
+    #   mentor_role = create(:role, :mentor)
+    #   mentor = create(:user, role: mentor_role)
+    #   team.mentor = mentor
+    # end
   end
 
   factory :teams_participant, class: 'TeamsParticipant' do
diff --git a/spec/mailers/invitation_sent_spec.rb b/spec/mailers/invitation_sent_spec.rb
index 5d0363f95..256dfb887 100644
--- a/spec/mailers/invitation_sent_spec.rb
+++ b/spec/mailers/invitation_sent_spec.rb
@@ -1,5 +1,120 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
-RSpec.describe InvitationSentMailer, type: :mailer do
-  pending "add some examples to (or delete) #{__FILE__}"
+RSpec.describe InvitationMailer, type: :mailer do
+  include ActiveJob::TestHelper
+
+  let(:role) { Role.create(name: 'Instructor', parent_id: nil, id: 3, default_page_id: nil) }
+  let(:student_role) { Role.create(name: 'Student', parent_id: nil, id: 5, default_page_id: nil) }
+  let(:instructor) { Instructor.create(name: 'testinstructor', email: 'instructor@test.com', full_name: 'Test Instructor', password: '123456', role: role) }
+  let(:user1) { create :user, name: 'invitee_user', role: student_role, email: 'invitee@test.com' }
+  let(:user2) { create :user, name: 'inviter_user', role: student_role, email: 'inviter@test.com' }
+  let(:assignment) { create(:assignment, instructor: instructor) }
+
+  before(:each) do
+    ActiveJob::Base.queue_adapter = :test
+  end
+
+  after(:each) do
+    clear_enqueued_jobs
+  end
+
+  describe '#send_invitation_email' do
+    it 'sends invitation email to invitee' do
+      invitation = Invitation.create(to_id: user1.id, from_id: user2.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_invitation_email
+      
+      expect(email.to).to eq([user1.email])
+      expect(email.subject).to include('invitation')
+    end
+  end
+
+  describe '#send_acceptance_email' do
+    it 'sends acceptance email to invitee' do
+      invitation = Invitation.create(to_id: user1.id, from_id: user2.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_acceptance_email
+      
+      expect(email.to).to eq([user1.email])
+      expect(email.subject).to include('accepted')
+    end
+
+    it 'includes invitee name in email body' do
+      invitation = Invitation.create(to_id: user1.id, from_id: user2.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_acceptance_email
+      
+      expect(email.body.encoded).to include(user1.full_name)
+    end
+
+    it 'includes team name in email body' do
+      team = AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam')
+      invitation = Invitation.create(to_id: user1.id, from_id: team.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_acceptance_email
+      
+      expect(email.body.encoded).to include(team.name)
+    end
+
+    it 'includes assignment name in email body' do
+      team = AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam')
+      invitation = Invitation.create(to_id: user1.id, from_id: team.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_acceptance_email
+      
+      expect(email.body.encoded).to include(assignment.name)
+    end
+  end
+
+  describe '#send_team_acceptance_notification' do
+    it 'sends notification email to all team members' do
+      team = AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam')
+      inviter_participant = AssignmentParticipant.create(user_id: user2.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'inviter_handle')
+      TeamsParticipant.create(team_id: team.id, participant_id: inviter_participant.id, user_id: user2.id)
+      
+      invitation = Invitation.create(to_id: user1.id, from_id: team.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_team_acceptance_notification
+      
+      expect(email.to).to include(user2.email)
+    end
+
+    it 'includes invitee name in team notification body' do
+      team = AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam')
+      inviter_participant = AssignmentParticipant.create(user_id: user2.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'inviter_handle')
+      TeamsParticipant.create(team_id: team.id, participant_id: inviter_participant.id, user_id: user2.id)
+      
+      invitation = Invitation.create(to_id: user1.id, from_id: team.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_team_acceptance_notification
+      
+      expect(email.body.encoded).to include(user1.full_name)
+    end
+
+    it 'includes team name in team notification body' do
+      team = AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam')
+      inviter_participant = AssignmentParticipant.create(user_id: user2.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'inviter_handle')
+      TeamsParticipant.create(team_id: team.id, participant_id: inviter_participant.id, user_id: user2.id)
+      
+      invitation = Invitation.create(to_id: user1.id, from_id: team.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_team_acceptance_notification
+      
+      expect(email.body.encoded).to include(team.name)
+    end
+
+    it 'includes assignment name in team notification body' do
+      team = AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam')
+      inviter_participant = AssignmentParticipant.create(user_id: user2.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'inviter_handle')
+      TeamsParticipant.create(team_id: team.id, participant_id: inviter_participant.id, user_id: user2.id)
+      
+      invitation = Invitation.create(to_id: user1.id, from_id: team.id, assignment_id: assignment.id)
+      
+      email = InvitationMailer.with(invitation: invitation).send_team_acceptance_notification
+      
+      expect(email.body.encoded).to include(assignment.name)
+    end
+  end
 end
diff --git a/spec/mailers/join_team_request_mailer_spec.rb b/spec/mailers/join_team_request_mailer_spec.rb
new file mode 100644
index 000000000..bba838d04
--- /dev/null
+++ b/spec/mailers/join_team_request_mailer_spec.rb
@@ -0,0 +1,69 @@
+require "rails_helper"
+
+RSpec.describe JoinTeamRequestMailer, type: :mailer do
+  include ActiveJob::TestHelper
+
+  let(:role) { Role.create(name: 'Instructor', parent_id: nil, id: 3, default_page_id: nil) }
+  let(:student_role) { Role.create(name: 'Student', parent_id: nil, id: 5, default_page_id: nil) }
+  let(:instructor) { Instructor.create(name: 'testinstructor', email: 'instructor@test.com', full_name: 'Test Instructor', password: '123456', role: role) }
+  let(:requester) { create :user, name: 'requester_user', role: student_role, email: 'requester@test.com' }
+  let(:team_member) { create :user, name: 'team_member_user', role: student_role, email: 'team_member@test.com' }
+  let(:assignment) { create(:assignment, instructor: instructor) }
+  let(:team) { AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam') }
+  let(:requester_participant) { AssignmentParticipant.create(user_id: requester.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'requester_handle') }
+  let(:team_member_participant) { AssignmentParticipant.create(user_id: team_member.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'team_member_handle') }
+  let(:join_team_request) { JoinTeamRequest.create(participant_id: requester_participant.id, team_id: team.id, comments: 'Please let me join', reply_status: 'PENDING') }
+
+  before(:each) do
+    ActiveJob::Base.queue_adapter = :test
+    TeamsParticipant.create(team_id: team.id, participant_id: team_member_participant.id, user_id: team_member.id)
+  end
+
+  after(:each) do
+    clear_enqueued_jobs
+  end
+
+  describe '#send_acceptance_email' do
+    it 'sends acceptance email to requester' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.to).to eq([requester.email])
+    end
+
+    it 'has correct subject line' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.subject).to include('accepted')
+    end
+
+    it 'includes requester name in email body' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.body.encoded).to include(requester.full_name)
+    end
+
+    it 'includes team name in email body' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.body.encoded).to include(team.name)
+    end
+
+    it 'includes assignment name in email body' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.body.encoded).to include(assignment.name)
+    end
+
+    it 'includes congratulatory message in email body' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.body.encoded).to include('Good news')
+    end
+
+    it 'includes collaboration message in email body' do
+      email = JoinTeamRequestMailer.with(join_team_request: join_team_request).send_acceptance_email
+      
+      expect(email.body.encoded).to include('collaborate')
+    end
+  end
+end
diff --git a/spec/mailers/previews/invitation_sent_preview.rb b/spec/mailers/previews/invitation_sent_preview.rb
index 1bb8b6a90..201ba9b77 100644
--- a/spec/mailers/previews/invitation_sent_preview.rb
+++ b/spec/mailers/previews/invitation_sent_preview.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Preview all emails at http://localhost:3000/rails/mailers/invitation_sent
 class InvitationSentPreview < ActionMailer::Preview
 
diff --git a/spec/models/account_request_spec.rb b/spec/models/account_request_spec.rb
index 009759e09..81b14a9e3 100644
--- a/spec/models/account_request_spec.rb
+++ b/spec/models/account_request_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe AccountRequest, type: :model do
diff --git a/spec/models/assignment_spec.rb b/spec/models/assignment_spec.rb
index d36f0d95a..58fd6a45f 100644
--- a/spec/models/assignment_spec.rb
+++ b/spec/models/assignment_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 
 require 'rails_helper'
 
@@ -6,8 +8,8 @@
   let(:team) {Team.new}
   let(:assignment) { Assignment.new(id: 1, name: 'Test Assignment') }
   let(:review_response_map) { ReviewResponseMap.new(assignment: assignment, reviewee: team) }
-  let(:answer) { Answer.new(answer: 1, comments: 'Answer text', question_id: 1) }
-  let(:answer2) { Answer.new(answer: 1, comments: 'Answer text', question_id: 1) }
+  let(:answer) { Answer.new(answer: 1, comments: 'Answer text', item_id: 1) }
+  let(:answer2) { Answer.new(answer: 1, comments: 'Answer text', item_id: 1) }
 
   describe '.get_all_review_comments' do
     it 'returns concatenated review comments and # of reviews in each round' do
@@ -17,7 +19,7 @@
                                                                            .with(no_args).and_yield(review_response_map)
       response1 = double('Response', round: 1, additional_comment: '')
       response2 = double('Response', round: 2, additional_comment: 'LGTM')
-      allow(review_response_map).to receive(:response).and_return([response1, response2])
+      allow(review_response_map).to receive(:responses).and_return([response1, response2])
       allow(response1).to receive(:scores).and_return([answer])
       allow(response2).to receive(:scores).and_return([answer2])
       expect(assignment.get_all_review_comments(1)).to eq([[nil, 'Answer text', 'Answer textLGTM', ''], [nil, 1, 1, 0]])
diff --git a/spec/models/assignment_survey_response_map_spec.rb b/spec/models/assignment_survey_response_map_spec.rb
index d42d37d7a..5708e1b91 100644
--- a/spec/models/assignment_survey_response_map_spec.rb
+++ b/spec/models/assignment_survey_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe AssignmentSurveyResponseMap, type: :model do
     describe '#questionnaire' do
       it 'returns the questionnaire associated with the reviewed_object_id' do
diff --git a/spec/models/assignment_team_spec.rb b/spec/models/assignment_team_spec.rb
index 57d6704f0..50e03616f 100644
--- a/spec/models/assignment_team_spec.rb
+++ b/spec/models/assignment_team_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe AssignmentTeam, type: :model do
@@ -63,7 +65,6 @@ def create_student(suffix)
     AssignmentTeam.create!(
       parent_id:      assignment.id,
       name:           'team 1',
-      user_id:        team_owner.id
     )
   end
 
@@ -109,7 +110,6 @@ def create_student(suffix)
 
   describe 'associations' do
     it { should belong_to(:assignment) }
-    it { should belong_to(:user).optional }
     it { should have_many(:teams_participants).dependent(:destroy) }
     it { should have_many(:users).through(:teams_participants) }
   end
diff --git a/spec/models/bookmark_rating_response_map_spec.rb b/spec/models/bookmark_rating_response_map_spec.rb
index a7b18c796..e988ebd24 100644
--- a/spec/models/bookmark_rating_response_map_spec.rb
+++ b/spec/models/bookmark_rating_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe BookmarkRatingResponseMap, type: :model do
   describe '#questionnaire' do
     it 'returns associated questionnaire' do
diff --git a/spec/models/checkbox_spec.rb b/spec/models/checkbox_spec.rb
index 10410cfd5..0755ddd3e 100644
--- a/spec/models/checkbox_spec.rb
+++ b/spec/models/checkbox_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Checkbox do
diff --git a/spec/models/course_spec.rb b/spec/models/course_spec.rb
index aa13a0065..f4a69d45e 100644
--- a/spec/models/course_spec.rb
+++ b/spec/models/course_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Course, type: :model do
diff --git a/spec/models/course_survey_response_map_spec.rb b/spec/models/course_survey_response_map_spec.rb
index 837d5788d..535c2c115 100644
--- a/spec/models/course_survey_response_map_spec.rb
+++ b/spec/models/course_survey_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe CourseSurveyResponseMap, type: :model do
     describe '#questionnaire' do
       it 'returns the questionnaire associated with the reviewed_object_id' do
diff --git a/spec/models/course_team_spec.rb b/spec/models/course_team_spec.rb
index 6c9634423..2eda015ac 100644
--- a/spec/models/course_team_spec.rb
+++ b/spec/models/course_team_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe CourseTeam, type: :model do
@@ -63,7 +65,6 @@ def create_student(suffix)
     CourseTeam.create!(
       parent_id:      course.id,
       name:           'team 2',
-      user_id:        team_owner.id
     )
   end
 
@@ -101,7 +102,6 @@ def create_student(suffix)
 
   describe 'associations' do
     it { should belong_to(:course) }
-    it { should belong_to(:user).optional }
     it { should have_many(:teams_participants).dependent(:destroy) }
     it { should have_many(:users).through(:teams_participants) }
   end
diff --git a/spec/models/criterion_spec.rb b/spec/models/criterion_spec.rb
index 2dbf0a2c6..6d1809e14 100644
--- a/spec/models/criterion_spec.rb
+++ b/spec/models/criterion_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Criterion, type: :model do
diff --git a/spec/models/dropdown_spec.rb b/spec/models/dropdown_spec.rb
index 51a5655ad..26b2377cd 100644
--- a/spec/models/dropdown_spec.rb
+++ b/spec/models/dropdown_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Dropdown, type: :model do
diff --git a/spec/models/due_date_spec.rb b/spec/models/due_date_spec.rb
index 2df3035cf..510a583a5 100644
--- a/spec/models/due_date_spec.rb
+++ b/spec/models/due_date_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # spec/models/due_date_spec.rb
 require 'rails_helper'
 
diff --git a/spec/models/feedback_response_map_spec.rb b/spec/models/feedback_response_map_spec.rb
index cf254ae13..a1c36a7fe 100644
--- a/spec/models/feedback_response_map_spec.rb
+++ b/spec/models/feedback_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe FeedbackResponseMap, type: :model do 
     describe '#assignment' do
       it 'returns the assignment associated with this FeedbackResponseMap' do
diff --git a/spec/models/file_upload_spec.rb b/spec/models/file_upload_spec.rb
index c083f63aa..495da2bc7 100644
--- a/spec/models/file_upload_spec.rb
+++ b/spec/models/file_upload_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 
diff --git a/spec/models/global_survey_response_map_spec.rb b/spec/models/global_survey_response_map_spec.rb
index decf4cc31..772b8b8b1 100644
--- a/spec/models/global_survey_response_map_spec.rb
+++ b/spec/models/global_survey_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe GlobalSurveyResponseMap, type: :model do
     describe '#questionnaire' do
       it 'returns the questionnaire associated with the reviewed_object_id' do
diff --git a/spec/models/institution_spec.rb b/spec/models/institution_spec.rb
index dc408cf6c..f100a4184 100644
--- a/spec/models/institution_spec.rb
+++ b/spec/models/institution_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Institution, type: :model do
diff --git a/spec/models/item_spec.rb b/spec/models/item_spec.rb
index 22e82c0ec..767b25d5b 100644
--- a/spec/models/item_spec.rb
+++ b/spec/models/item_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Item, type: :model do
diff --git a/spec/models/join_team_request_spec.rb b/spec/models/join_team_request_spec.rb
index 43808ccee..21b8ac417 100644
--- a/spec/models/join_team_request_spec.rb
+++ b/spec/models/join_team_request_spec.rb
@@ -1,5 +1,384 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe JoinTeamRequest, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  include ActiveJob::TestHelper
+
+  let(:role) { Role.create(name: 'Instructor', parent_id: nil, id: 3, default_page_id: nil) }
+  let(:student_role) { Role.create(name: 'Student', parent_id: nil, id: 5, default_page_id: nil) }
+  let(:instructor) { Instructor.create(name: 'testinstructor', email: 'instructor@test.com', full_name: 'Test Instructor', password: '123456', role: role) }
+  let(:requester) { create :user, name: 'requester_user', role: student_role, email: 'requester@test.com' }
+  let(:team_member) { create :user, name: 'team_member_user', role: student_role, email: 'team_member@test.com' }
+  let(:another_user) { create :user, name: 'another_user', role: student_role, email: 'another@test.com' }
+  let(:assignment) { create(:assignment, instructor: instructor, max_team_size: 3) }
+  let(:team) { AssignmentTeam.create(name: 'Test Team', parent_id: assignment.id, type: 'AssignmentTeam') }
+  let(:another_team) { AssignmentTeam.create(name: 'Another Team', parent_id: assignment.id, type: 'AssignmentTeam') }
+  let(:requester_participant) { AssignmentParticipant.create(user_id: requester.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'requester_handle') }
+  let(:team_member_participant) { AssignmentParticipant.create(user_id: team_member.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'team_member_handle') }
+  let(:another_participant) { AssignmentParticipant.create(user_id: another_user.id, parent_id: assignment.id, type: 'AssignmentParticipant', handle: 'another_handle') }
+
+  before(:each) do
+    ActiveJob::Base.queue_adapter = :test
+    TeamsParticipant.create(team_id: team.id, participant_id: team_member_participant.id, user_id: team_member.id)
+  end
+
+  after(:each) do
+    clear_enqueued_jobs
+  end
+
+  # --------------------------------------------------------------------------
+  # Association Tests
+  # --------------------------------------------------------------------------
+  describe 'associations' do
+    it 'belongs to participant' do
+      join_request = JoinTeamRequest.new(participant_id: requester_participant.id, team_id: team.id)
+      expect(join_request).to belong_to(:participant)
+    end
+
+    it 'belongs to team' do
+      join_request = JoinTeamRequest.new(participant_id: requester_participant.id, team_id: team.id)
+      expect(join_request).to belong_to(:team)
+    end
+
+    it 'can access participant user through association' do
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+      expect(join_request.participant.user).to eq(requester)
+    end
+
+    it 'can access team assignment through association' do
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+      expect(join_request.team.assignment).to eq(assignment)
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Validation Tests
+  # --------------------------------------------------------------------------
+  describe 'validations' do
+    it 'is valid with valid attributes' do
+      join_request = JoinTeamRequest.new(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        comments: 'Please let me join',
+        reply_status: 'PENDING'
+      )
+      expect(join_request).to be_valid
+    end
+
+    it 'requires participant_id' do
+      join_request = JoinTeamRequest.new(team_id: team.id, comments: 'Join please', reply_status: 'PENDING')
+      expect(join_request).not_to be_valid
+      expect(join_request.errors[:participant]).to include("must exist")
+    end
+
+    it 'requires team_id' do
+      join_request = JoinTeamRequest.new(participant_id: requester_participant.id, comments: 'Join please', reply_status: 'PENDING')
+      expect(join_request).not_to be_valid
+      expect(join_request.errors[:team]).to include("must exist")
+    end
+
+    it 'validates reply_status inclusion' do
+      join_request = JoinTeamRequest.new(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'INVALID_STATUS'
+      )
+      expect(join_request).not_to be_valid
+      expect(join_request.errors[:reply_status]).to include("is not included in the list")
+    end
+
+    it 'accepts PENDING as valid reply_status' do
+      join_request = JoinTeamRequest.new(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+      expect(join_request).to be_valid
+    end
+
+    it 'accepts ACCEPTED as valid reply_status' do
+      join_request = JoinTeamRequest.new(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'ACCEPTED'
+      )
+      expect(join_request).to be_valid
+    end
+
+    it 'accepts DECLINED as valid reply_status' do
+      join_request = JoinTeamRequest.new(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'DECLINED'
+      )
+      expect(join_request).to be_valid
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Creation and Attributes Tests
+  # --------------------------------------------------------------------------
+  describe 'creation and attributes' do
+    it 'creates a join request with correct attributes' do
+      join_request = JoinTeamRequest.create(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        comments: 'I want to join your team',
+        reply_status: 'PENDING'
+      )
+
+      expect(join_request.participant_id).to eq(requester_participant.id)
+      expect(join_request.team_id).to eq(team.id)
+      expect(join_request.comments).to eq('I want to join your team')
+      expect(join_request.reply_status).to eq('PENDING')
+    end
+
+    it 'allows creating without explicit reply_status' do
+      join_request = JoinTeamRequest.create(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      expect(join_request).to be_persisted
+      expect(join_request.reply_status).to eq('PENDING')
+    end
+
+    it 'allows empty comments' do
+      join_request = JoinTeamRequest.create(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+      expect(join_request).to be_valid
+      expect(join_request.comments).to be_nil
+    end
+
+    it 'allows updating comments' do
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        comments: 'Original comment',
+        reply_status: 'PENDING'
+      )
+
+      join_request.update!(comments: 'Updated comment')
+      expect(join_request.reload.comments).to eq('Updated comment')
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Relationship Tests
+  # --------------------------------------------------------------------------
+  describe 'relationships' do
+    it 'returns correct participant' do
+      join_request = JoinTeamRequest.create(
+        participant_id: requester_participant.id,
+        team_id: team.id
+      )
+
+      expect(join_request.participant).to eq(requester_participant)
+    end
+
+    it 'returns correct team' do
+      join_request = JoinTeamRequest.create(
+        participant_id: requester_participant.id,
+        team_id: team.id
+      )
+
+      expect(join_request.team).to eq(team)
+    end
+
+    it 'is destroyed when the team is destroyed' do
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      expect { team.destroy }.to change(JoinTeamRequest, :count).by(-1)
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Status Transition Tests
+  # --------------------------------------------------------------------------
+  describe 'status transitions' do
+    let(:join_request) do
+      JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+    end
+
+    it 'can transition from PENDING to ACCEPTED' do
+      join_request.update!(reply_status: 'ACCEPTED')
+      expect(join_request.reload.reply_status).to eq('ACCEPTED')
+    end
+
+    it 'can transition from PENDING to DECLINED' do
+      join_request.update!(reply_status: 'DECLINED')
+      expect(join_request.reload.reply_status).to eq('DECLINED')
+    end
+
+    it 'persists status changes' do
+      join_request.update!(reply_status: 'ACCEPTED')
+      reloaded = JoinTeamRequest.find(join_request.id)
+      expect(reloaded.reply_status).to eq('ACCEPTED')
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Query Tests
+  # --------------------------------------------------------------------------
+  describe 'queries' do
+    before do
+      @pending_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+      @accepted_request = JoinTeamRequest.create!(
+        participant_id: another_participant.id,
+        team_id: team.id,
+        reply_status: 'ACCEPTED'
+      )
+    end
+
+    it 'can filter by PENDING status' do
+      pending_requests = JoinTeamRequest.where(reply_status: 'PENDING')
+      expect(pending_requests).to include(@pending_request)
+      expect(pending_requests).not_to include(@accepted_request)
+    end
+
+    it 'can filter by ACCEPTED status' do
+      accepted_requests = JoinTeamRequest.where(reply_status: 'ACCEPTED')
+      expect(accepted_requests).to include(@accepted_request)
+      expect(accepted_requests).not_to include(@pending_request)
+    end
+
+    it 'can find requests by team_id' do
+      team_requests = JoinTeamRequest.where(team_id: team.id)
+      expect(team_requests.count).to eq(2)
+    end
+
+    it 'can find requests by participant_id' do
+      participant_requests = JoinTeamRequest.where(participant_id: requester_participant.id)
+      expect(participant_requests).to include(@pending_request)
+      expect(participant_requests.count).to eq(1)
+    end
+
+    it 'can check for existing pending request' do
+      existing = JoinTeamRequest.find_by(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+      expect(existing).to eq(@pending_request)
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Multiple Requests Tests
+  # --------------------------------------------------------------------------
+  describe 'multiple requests' do
+    it 'allows same participant to request different teams' do
+      request1 = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      request2 = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: another_team.id,
+        reply_status: 'PENDING'
+      )
+
+      expect(request1).to be_persisted
+      expect(request2).to be_persisted
+    end
+
+    it 'allows different participants to request same team' do
+      request1 = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      request2 = JoinTeamRequest.create!(
+        participant_id: another_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      expect(request1).to be_persisted
+      expect(request2).to be_persisted
+      expect(team.join_team_requests.count).to eq(2)
+    end
+
+    it 'retrieves all requests for a team through association' do
+      JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      JoinTeamRequest.create!(
+        participant_id: another_participant.id,
+        team_id: team.id,
+        reply_status: 'PENDING'
+      )
+
+      expect(team.join_team_requests.count).to eq(2)
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Edge Cases Tests
+  # --------------------------------------------------------------------------
+  describe 'edge cases' do
+    it 'handles long comments' do
+      long_comment = 'A' * 1000
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        comments: long_comment,
+        reply_status: 'PENDING'
+      )
+      expect(join_request.comments).to eq(long_comment)
+    end
+
+    it 'handles special characters in comments' do
+      special_comment = "Hello! I'd like to join. <script>alert('test')</script>"
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        comments: special_comment,
+        reply_status: 'PENDING'
+      )
+      expect(join_request.comments).to eq(special_comment)
+    end
+
+    it 'handles unicode in comments' do
+      unicode_comment = "I'd like to join! 🚀 こんにちは"
+      join_request = JoinTeamRequest.create!(
+        participant_id: requester_participant.id,
+        team_id: team.id,
+        comments: unicode_comment,
+        reply_status: 'PENDING'
+      )
+      expect(join_request.comments).to eq(unicode_comment)
+    end
+  end
 end
diff --git a/spec/models/mentored_team_spec.rb b/spec/models/mentored_team_spec.rb
index 27e0de3ff..5d95b50c3 100644
--- a/spec/models/mentored_team_spec.rb
+++ b/spec/models/mentored_team_spec.rb
@@ -1,152 +1,152 @@
-require 'rails_helper'
+# # frozen_string_literal: true
 
-RSpec.describe MentoredTeam, type: :model do
+# require 'rails_helper'
+
+# RSpec.describe MentoredTeam, type: :model do
   
-  include RolesHelper
-  # --------------------------------------------------------------------------
-  # Global Setup
-  # --------------------------------------------------------------------------
-  # Create the full roles hierarchy once, to be shared by all examples.
-  let!(:roles) { create_roles_hierarchy }
-
-  # ------------------------------------------------------------------------
-  # Helper: DRY-up creation of student users with a predictable pattern.
-  # ------------------------------------------------------------------------
-  def create_student(suffix)
-    User.create!(
-      name:            suffix,
-      email:           "#{suffix}@example.com",
-      full_name:       suffix.split('_').map(&:capitalize).join(' '),
-      password_digest: "password",
-      role_id:          roles[:student].id,
-      institution_id:  institution.id
-    )
-  end
-
-  # ------------------------------------------------------------------------
-  # Shared Data Setup: Build core domain objects used across tests.
-  # ------------------------------------------------------------------------
-  let(:institution) do
-    # All users belong to the same institution to satisfy foreign key constraints.
-    Institution.create!(name: "NC State")
-  end
-
-  let(:instructor) do
-    # The instructor will own assignments and courses in subsequent tests.
-    User.create!(
-      name:            "instructor",
-      full_name:       "Instructor User",
-      email:           "instructor@example.com",
-      password_digest: "password",
-      role_id:          roles[:instructor].id,
-      institution_id:  institution.id
-    )
-  end
-
-  let(:team_owner) do
-    User.create!(
-      name:            "team_owner",
-      full_name:       "Team Owner",
-      email:           "team_owner@example.com",
-      password_digest: "password",
-      role_id:          roles[:student].id,
-      institution_id:  institution.id
-    )
-  end
-
-  let!(:assignment)  { Assignment.create!(name: "Assignment 1", instructor_id: instructor.id, max_team_size: 3) }
-  let!(:course)  { Course.create!(name: "Course 1", instructor_id: instructor.id, institution_id: institution.id, directory_path: "/course1") }
-
-  let(:mentor_role) { create(:role, :mentor) }
-
-  let(:mentor) do
-    User.create!(
-      name: "mentor_user",
-      full_name: "Mentor User",
-      email: "mentor@example.com",
-      password_digest: "password",
-      role_id: mentor_role.id,
-      institution_id: institution.id
-    )
-  end
-
-  let(:mentored_team) do
-    MentoredTeam.create!(
-      parent_id: mentor.id,
-      assignment: assignment,
-      name: 'team 3',
-      user_id: team_owner.id,
-      mentor: mentor
-    )
-  end
-
-  let(:user) do
-    User.create!(
-      name: "student_user",
-      full_name: "Student User",
-      email: "student@example.com",
-      password_digest: "password",
-      role_id: roles[:student].id,
-      institution_id: institution.id
-    )
-  end
-
-  let!(:team) { create(:mentored_team, user: user, assignment: assignment) }
-
-
-  describe 'validations' do
-    it { should validate_presence_of(:mentor) }
-    it { should validate_presence_of(:type) }
+#   include RolesHelper
+#   # --------------------------------------------------------------------------
+#   # Global Setup
+#   # --------------------------------------------------------------------------
+#   # Create the full roles hierarchy once, to be shared by all examples.
+#   let!(:roles) { create_roles_hierarchy }
+
+#   # ------------------------------------------------------------------------
+#   # Helper: DRY-up creation of student users with a predictable pattern.
+#   # ------------------------------------------------------------------------
+#   def create_student(suffix)
+#     User.create!(
+#       name:            suffix,
+#       email:           "#{suffix}@example.com",
+#       full_name:       suffix.split('_').map(&:capitalize).join(' '),
+#       password_digest: "password",
+#       role_id:          roles[:student].id,
+#       institution_id:  institution.id
+#     )
+#   end
+
+#   # ------------------------------------------------------------------------
+#   # Shared Data Setup: Build core domain objects used across tests.
+#   # ------------------------------------------------------------------------
+#   let(:institution) do
+#     # All users belong to the same institution to satisfy foreign key constraints.
+#     Institution.create!(name: "NC State")
+#   end
+
+#   let(:instructor) do
+#     # The instructor will own assignments and courses in subsequent tests.
+#     User.create!(
+#       name:            "instructor",
+#       full_name:       "Instructor User",
+#       email:           "instructor@example.com",
+#       password_digest: "password",
+#       role_id:          roles[:instructor].id,
+#       institution_id:  institution.id
+#     )
+#   end
+
+#   let(:team_owner) do
+#     User.create!(
+#       name:            "team_owner",
+#       full_name:       "Team Owner",
+#       email:           "team_owner@example.com",
+#       password_digest: "password",
+#       role_id:          roles[:student].id,
+#       institution_id:  institution.id
+#     )
+#   end
+
+#   let!(:assignment)  { Assignment.create!(name: "Assignment 1", instructor_id: instructor.id, max_team_size: 3) }
+#   let!(:course)  { Course.create!(name: "Course 1", instructor_id: instructor.id, institution_id: institution.id, directory_path: "/course1") }
+
+#   let(:mentor_role) { create(:role, :mentor) }
+
+#   let(:mentor) do
+#     User.create!(
+#       name: "mentor_user",
+#       full_name: "Mentor User",
+#       email: "mentor@example.com",
+#       password_digest: "password",
+#       role_id: mentor_role.id,
+#       institution_id: institution.id
+#     )
+#   end
+
+#   let(:mentored_team) do
+#     MentoredTeam.create!(
+#       parent_id: mentor.id,
+#       assignment: assignment,
+#       name: 'team 3',
+#     )
+#   end
+
+#   let(:user) do
+#     User.create!(
+#       name: "student_user",
+#       full_name: "Student User",
+#       email: "student@example.com",
+#       password_digest: "password",
+#       role_id: roles[:student].id,
+#       institution_id: institution.id
+#     )
+#   end
+
+#   let!(:team) { create(:mentored_team, assignment: assignment) }
+
+
+#   describe 'validations' do
+#     it { should validate_presence_of(:mentor) }
+#     it { should validate_presence_of(:type) }
     
-    it 'requires type to be MentoredTeam' do
-      team.type = 'AssignmentTeam'
-      expect(team).not_to be_valid
-      expect(team.errors[:type]).to include('must be MentoredTeam')
-    end
-
-    it 'requires mentor to have mentor role' do
-      non_mentor = create(:user)
-      team.mentor = non_mentor
-      expect(team).not_to be_valid
-      expect(team.errors[:mentor]).to include('must have mentor role')
-    end
-  end
-
-  describe 'associations' do
-    it { should belong_to(:mentor).class_name('User') }
-    it { should belong_to(:assignment) }
-    it { should belong_to(:user).optional }
-    it { should have_many(:teams_participants).dependent(:destroy) }
-    it { should have_many(:users).through(:teams_participants) }
-  end
-
-  describe 'team management' do
-    let(:enrolled_user) { create(:user) }
-
-    before do
-      @participant = create(:assignment_participant, user: enrolled_user, assignment: assignment)
-    end
-
-    it 'can add enrolled user' do
-      expect(team.add_member(enrolled_user)).to be_truthy
-      expect(team.has_member?(enrolled_user)).to be_truthy
-    end
-
-    it 'cannot add mentor as member' do
-      expect(team.add_member(team.mentor)).to be_falsey
-      expect(team.has_member?(team.mentor)).to be_falsey
-    end
-
-    it 'can assign new mentor' do
-      new_mentor = create(:user, role: mentor_role)
-      expect(team.assign_mentor(new_mentor)).to be_truthy
-      expect(team.mentor).to eq(new_mentor)
-    end
-
-    it 'cannot assign non-mentor as mentor' do
-      non_mentor = create(:user)
-      expect(team.assign_mentor(non_mentor)).to be_falsey
-      expect(team.mentor).not_to eq(non_mentor)
-    end
-  end
-end 
+#     it 'requires type to be MentoredTeam' do
+#       team.type = 'AssignmentTeam'
+#       expect(team).not_to be_valid
+#       expect(team.errors[:type]).to include('must be MentoredTeam')
+#     end
+
+#     it 'requires mentor to have mentor role' do
+#       non_mentor = create(:user)
+#       team.mentor = non_mentor
+#       expect(team).not_to be_valid
+#       expect(team.errors[:mentor]).to include('must have mentor role')
+#     end
+#   end
+
+#   describe 'associations' do
+#     it { should belong_to(:mentor).class_name('User') }
+#     it { should belong_to(:assignment) }
+#     it { should belong_to(:user).optional }
+#     it { should have_many(:teams_participants).dependent(:destroy) }
+#     it { should have_many(:users).through(:teams_participants) }
+#   end
+
+#   describe 'team management' do
+#     let(:enrolled_user) { create(:user) }
+
+#     before do
+#       @participant = create(:assignment_participant, user: enrolled_user, assignment: assignment)
+#     end
+
+#     it 'can add enrolled user' do
+#       expect(team.add_member(enrolled_user)).to be_truthy
+#       expect(team.has_member?(enrolled_user)).to be_truthy
+#     end
+
+#     it 'cannot add mentor as member' do
+#       expect(team.add_member(team.mentor)).to be_falsey
+#       expect(team.has_member?(team.mentor)).to be_falsey
+#     end
+
+#     it 'can assign new mentor' do
+#       new_mentor = create(:user, role: mentor_role)
+#       expect(team.assign_mentor(new_mentor)).to be_truthy
+#       expect(team.mentor).to eq(new_mentor)
+#     end
+
+#     it 'cannot assign non-mentor as mentor' do
+#       non_mentor = create(:user)
+#       expect(team.assign_mentor(non_mentor)).to be_falsey
+#       expect(team.mentor).not_to eq(non_mentor)
+#     end
+#   end
+# end 
diff --git a/spec/models/multiple_choice_checkbox_spec.rb b/spec/models/multiple_choice_checkbox_spec.rb
index eb580489f..abae72bd2 100644
--- a/spec/models/multiple_choice_checkbox_spec.rb
+++ b/spec/models/multiple_choice_checkbox_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe MultipleChoiceCheckbox, type: :model do
diff --git a/spec/models/multiple_choice_radio_spec.rb b/spec/models/multiple_choice_radio_spec.rb
index 8ccf41fe6..cf2fca282 100644
--- a/spec/models/multiple_choice_radio_spec.rb
+++ b/spec/models/multiple_choice_radio_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe MultipleChoiceRadio, type: :model do
diff --git a/spec/models/questionnaire_spec.rb b/spec/models/questionnaire_spec.rb
index 60b5d1e67..1af1c1ef8 100644
--- a/spec/models/questionnaire_spec.rb
+++ b/spec/models/questionnaire_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 describe Questionnaire, type: :model do
 
@@ -120,7 +122,7 @@
       questionnaire.save!
       question1.save!
       question2.save!
-      copied_questionnaire = Questionnaire.copy_questionnaire_details( { id: questionnaire.id})
+      copied_questionnaire = Questionnaire.copy_questionnaire_details( { id: questionnaire.id, instructor_id: instructor.id})
       expect(copied_questionnaire.instructor_id).to eq(questionnaire.instructor_id)
       expect(copied_questionnaire.name).to eq("Copy of #{questionnaire.name}")
       expect(copied_questionnaire.created_at).to be_within(1.second).of(Time.zone.now)
@@ -132,7 +134,7 @@
       questionnaire.save!
       question1.save!
       question2.save!
-      copied_questionnaire = described_class.copy_questionnaire_details({ id: questionnaire.id })
+      copied_questionnaire = described_class.copy_questionnaire_details({ id: questionnaire.id, instructor_id: instructor.id })
       expect(copied_questionnaire.items.count).to eq(2)
       expect(copied_questionnaire.items.first.txt).to eq(question1.txt)
       expect(copied_questionnaire.items.second.txt).to eq(question2.txt)
diff --git a/spec/models/quiz_response_map_spec.rb b/spec/models/quiz_response_map_spec.rb
index c28437a3b..baf3864bf 100644
--- a/spec/models/quiz_response_map_spec.rb
+++ b/spec/models/quiz_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe QuizResponseMap, type: :model do
     describe 'associations' do
       it 'belongs to quiz_questionnaire' do
diff --git a/spec/models/response_map_spec.rb b/spec/models/response_map_spec.rb
index 293b135e9..0a84ef6de 100644
--- a/spec/models/response_map_spec.rb
+++ b/spec/models/response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe ResponseMap, type: :model do
diff --git a/spec/models/response_spec.rb b/spec/models/response_spec.rb
index 5f5b3ee07..976128828 100644
--- a/spec/models/response_spec.rb
+++ b/spec/models/response_spec.rb
@@ -1,17 +1,22 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe Response do
 
-  let(:user) { User.new(id: 1, role_id: 1, name: 'no name', full_name: 'no one') }
-  let(:team) {Team.new}
-  let(:participant) { Participant.new(id: 1, user: user) }
-  let(:assignment) { Assignment.new(id: 1, name: 'Test Assignment') }
-  let(:answer) { Answer.new(answer: 1, comments: 'Answer text', question_id: 1) }
-  let(:item) { ScoredItem.new(id: 1, weight: 2) }
-  let(:questionnaire) { Questionnaire.new(id: 1, items: [item], max_question_score: 5) }
-  let(:review_response_map) { ReviewResponseMap.new(assignment: assignment, reviewee: team) }
-  let(:response_map) { ResponseMap.new(assignment: assignment, reviewee: participant, reviewer: participant) }
-  let(:response) { Response.new(map_id: 1, response_map: review_response_map, scores: [answer]) }
+  let(:user) { create(:user, :student) }
+  let(:user2) { create(:user, :student) }
+  let(:assignment) { create(:assignment, name: 'Test Assignment') }
+  let(:team) {create(:team, :with_assignment, name: 'Test Team')}
+  let(:participant) { AssignmentParticipant.create!(assignment: assignment, user: user, handle: user.name) }
+  let(:participant2) { AssignmentParticipant.create!(assignment: assignment, user: user2, handle: user2.name) }
+  let(:item) { ScoredItem.new(weight: 2) }
+  let(:answer) { Answer.new(answer: 1, comments: 'Answer text', item:item) }
+  let(:questionnaire) { Questionnaire.new(items: [item], min_question_score: 0, max_question_score: 5) }
+  let(:assignment_questionnaire) { AssignmentQuestionnaire.create!(assignment: assignment, questionnaire: questionnaire, used_in_round: 1, notification_limit: 5.0)}
+  let(:review_response_map) { ReviewResponseMap.new(assignment: assignment, reviewee: team, reviewer: participant2) }
+  let(:response_map) { ResponseMap.new(assignment: assignment, reviewee: participant, reviewer: participant2) }
+  let(:response) { Response.new(map_id: review_response_map.id, response_map: review_response_map, round:1, scores: [answer]) }
 
   # Compare the current response score with other scores on the same artifact, and test if the difference is significant enough to notify
   # instructor.
@@ -32,7 +37,7 @@
           allow(response).to receive(:aggregate_questionnaire_score).and_return(93)
           allow(response).to receive(:maximum_score).and_return(100)
           allow(response).to receive(:questionnaire_by_answer).with(answer).and_return(questionnaire)
-          allow(AssignmentQuestionnaire).to receive(:find_by).with(assignment_id: 1, questionnaire_id: 1)
+          allow(AssignmentQuestionnaire).to receive(:find_by).with(assignment_id: assignment.id, questionnaire_id: questionnaire.id)
                                                              .and_return(double('AssignmentQuestionnaire', notification_limit: 5.0))
           expect(response.reportable_difference?).to be true
         end
@@ -41,14 +46,9 @@
   end
 
   # Calculate the total score of a review
-  describe '#calculate_total_score' do
+  describe '#aggregate_questionnaire_score' do
     it 'computes the total score of a review' do
-      question2 = double('ScoredItem', weight: 2)
-      arr_question2 = [question2]
-      allow(Item).to receive(:find_with_order).with([1]).and_return(arr_question2)
-      allow(question2).to receive(:scorable?).and_return(true)
-      allow(question2).to receive(:answer).and_return(answer)
-      expect(response.calculate_total_score).to eq(2)
+      expect(response.aggregate_questionnaire_score).to eq(2)
     end
   end
 
@@ -73,42 +73,45 @@
   # Returns the maximum possible score for this response - only count the scorable questions, only when the answer is not nil (we accept nil as
   # answer for scorable questions, and they will not be counted towards the total score)
   describe '#maximum_score' do
-    it 'returns the maximum possible score for current response' do
-      question2 = double('ScoredItem', weight: 2)
-      arr_question2 = [question2]
-      allow(Item).to receive(:find_with_order).with([1]).and_return(arr_question2)
-      allow(question2).to receive(:scorable?).and_return(true)
-      allow(response).to receive(:questionnaire_by_answer).with(answer).and_return(questionnaire)
-      allow(questionnaire).to receive(:max_question_score).and_return(5)
-      expect(response.maximum_score).to eq(10)
+    before do
+      allow(response.response_assignment)
+        .to receive_message_chain(:assignment_questionnaires, :find_by)
+        .with(used_in_round: 1)
+        .and_return(assignment_questionnaire)
+    end
+    context 'when answers are present and scorable' do
+      it 'returns weight * max_question_score' do
+        # item.weight = 2, max_question_score = 5 → 10        
+        expect(response.maximum_score).to eq(10)
+      end
     end
 
-    it 'returns the maximum possible score for current response without score' do
-      response.scores = []
-      allow(response).to receive(:questionnaire_by_answer).with(nil).and_return(questionnaire)
-      allow(questionnaire).to receive(:max_question_score).and_return(5)
-      expect(response.maximum_score).to eq(0)
+    context 'when answer is nil' do
+      before { answer.answer = nil }
+
+      it 'does not count that answer' do        
+        expect(response.maximum_score).to eq(0)
+      end
     end
 
-    # Expects to return the participant's assignment for a ResponseMap object
-    it 'returns the appropriate assignment for ResponseMap' do
-      allow(Participant).to receive(:find).and_return(participant)
-      allow(participant).to receive(:assignment).and_return(assignment)
+    context 'when there are no scores' do
+      before { response.scores = [] }
 
-      expect(response_map.response_assignment).to eq(assignment)
+      it 'returns 0' do
+        # allow(AssignmentQuestionnaire).to receive(:find_by).with(assignment_id: assignment.id, questionnaire_id: questionnaire.id)
+        #                                                      .and_return(double('AssignmentQuestionnaire', notification_limit: 5.0))
+        expect(response.maximum_score).to eq(0)
+      end
     end
+  end
 
-    # Expects to return ResponseMap's assignment
-    it 'returns the appropriate assignment for ReviewResponseMap' do
-      question2 = double('ScoredItem', weight: 2)
-      arr_question2 = [question2]
-      allow(Item).to receive(:find_with_order).with([1]).and_return(arr_question2)
-      allow(question2).to receive(:scorable?).and_return(true)
-      allow(questionnaire).to receive(:max_question_score).and_return(5)
-      allow(review_response_map).to receive(:assignment).and_return(assignment)
+  describe '#response_assignment' do
+    it 'returns assignment for ResponseMap' do
+      expect(response_map.response_assignment).to eq(assignment)
+    end
 
+    it 'returns assignment for ReviewResponseMap' do
       expect(review_response_map.response_assignment).to eq(assignment)
-
     end
   end
 end
diff --git a/spec/models/scale_spec.rb b/spec/models/scale_spec.rb
index b3a44b95d..0b382452c 100644
--- a/spec/models/scale_spec.rb
+++ b/spec/models/scale_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Scale, type: :model do
diff --git a/spec/models/student_task_spec.rb b/spec/models/student_task_spec.rb
index e4321ae89..94b9e7ffc 100644
--- a/spec/models/student_task_spec.rb
+++ b/spec/models/student_task_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 
diff --git a/spec/models/survey_response_map_spec.rb b/spec/models/survey_response_map_spec.rb
index cd451d72e..926e0386b 100644
--- a/spec/models/survey_response_map_spec.rb
+++ b/spec/models/survey_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe SurveyResponseMap, type: :model do
     describe '#survey?' do
         it 'returns true' do
diff --git a/spec/models/ta_mapping_spec.rb b/spec/models/ta_mapping_spec.rb
index 4aaa2889b..e2d4e062c 100644
--- a/spec/models/ta_mapping_spec.rb
+++ b/spec/models/ta_mapping_spec.rb
@@ -1,5 +1,22 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
+require 'json_web_token'
 
 RSpec.describe TaMapping, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+
+  let(:ta) {create(:user, :ta)}
+  let(:course) {create(:course)}
+
+  let(:ta_token) { JsonWebToken.encode({id: ta.id}) }
+
+  describe 'Teaching Assistant access' do
+    before do
+      TaMapping.create!(course_id: course.id, user_id: ta.id)
+    end
+
+    it 'creates the TA mapping' do
+      expect(TaMapping.exists?(course_id: course.id, user_id: ta.id)).to be true
+    end
+  end
 end
diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb
index 8fdc04316..fe55ac3c1 100644
--- a/spec/models/team_spec.rb
+++ b/spec/models/team_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 # This spec exercises the Team model, covering:
@@ -75,7 +77,6 @@ def create_student(suffix)
     AssignmentTeam.create!(
       parent_id:      assignment.id,
       name:           'team 1',
-      user_id:        team_owner.id
     )
   end
 
@@ -83,7 +84,6 @@ def create_student(suffix)
     CourseTeam.create!(
       parent_id:      course.id,
       name:           'team 2',
-      user_id:        team_owner.id
     )
   end
 
diff --git a/spec/models/teammate_review_response_map_spec.rb b/spec/models/teammate_review_response_map_spec.rb
index 2d47f9586..3826fc9ac 100644
--- a/spec/models/teammate_review_response_map_spec.rb
+++ b/spec/models/teammate_review_response_map_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe TeammateReviewResponseMap, type: :model do
   describe '#questionnaire' do
     it 'returns associated questionnaire' do
diff --git a/spec/models/teams_participant_spec.rb b/spec/models/teams_participant_spec.rb
new file mode 100644
index 000000000..c9a711e4d
--- /dev/null
+++ b/spec/models/teams_participant_spec.rb
@@ -0,0 +1,298 @@
+require 'rails_helper'
+
+RSpec.describe TeamsParticipant, type: :model do
+  include RolesHelper
+
+  # --------------------------------------------------------------------------
+  # Global Setup
+  # --------------------------------------------------------------------------
+  before(:all) do
+    @roles = create_roles_hierarchy
+  end
+
+  # ------------------------------------------------------------------------
+  # Helper: DRY-up creation of student users
+  # ------------------------------------------------------------------------
+  def create_student(suffix)
+    User.create!(
+      name:            suffix,
+      email:           "#{suffix}@example.com",
+      full_name:       suffix.split('_').map(&:capitalize).join(' '),
+      password_digest: "password",
+      role_id:         @roles[:student].id,
+      institution_id:  institution.id
+    )
+  end
+
+  # ------------------------------------------------------------------------
+  # Shared Data Setup
+  # ------------------------------------------------------------------------
+  let(:institution) do
+    Institution.create!(name: "NC State")
+  end
+
+  let(:instructor) do
+    User.create!(
+      name:            "instructor",
+      full_name:       "Instructor User",
+      email:           "instructor@example.com",
+      password_digest: "password",
+      role_id:         @roles[:instructor].id,
+      institution_id:  institution.id
+    )
+  end
+
+  let(:student_user) { create_student("student1") }
+  let(:another_student) { create_student("student2") }
+
+  let(:assignment) { Assignment.create!(name: "Test Assignment", instructor_id: instructor.id, max_team_size: 3) }
+  
+  let(:team) do
+    AssignmentTeam.create!(
+      parent_id: assignment.id,
+      name:      'Test Team'
+    )
+  end
+
+  let(:another_team) do
+    AssignmentTeam.create!(
+      parent_id: assignment.id,
+      name:      'Another Team'
+    )
+  end
+
+  let(:participant) do
+    AssignmentParticipant.create!(
+      user_id:   student_user.id,
+      parent_id: assignment.id,
+      handle:    'student1_handle'
+    )
+  end
+
+  let(:another_participant) do
+    AssignmentParticipant.create!(
+      user_id:   another_student.id,
+      parent_id: assignment.id,
+      handle:    'student2_handle'
+    )
+  end
+
+  # --------------------------------------------------------------------------
+  # Association Tests
+  # --------------------------------------------------------------------------
+  describe 'associations' do
+    it { should belong_to(:participant) }
+    it { should belong_to(:team) }
+    it { should belong_to(:user) }
+  end
+
+  # --------------------------------------------------------------------------
+  # Validation Tests
+  # --------------------------------------------------------------------------
+  describe 'validations' do
+    it 'is valid with valid attributes' do
+      teams_participant = TeamsParticipant.new(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+      expect(teams_participant).to be_valid
+    end
+
+    it 'requires user_id' do
+      teams_participant = TeamsParticipant.new(
+        participant_id: participant.id,
+        team_id:        team.id
+      )
+      expect(teams_participant).not_to be_valid
+      expect(teams_participant.errors[:user_id]).to include("can't be blank")
+    end
+
+    it 'enforces uniqueness of participant_id scoped to team_id' do
+      TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      duplicate = TeamsParticipant.new(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      expect(duplicate).not_to be_valid
+      expect(duplicate.errors[:participant_id]).to include("has already been taken")
+    end
+
+    it 'allows same participant in different teams' do
+      # Note: This tests the model validation only - business logic may prevent this
+      TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      different_team_membership = TeamsParticipant.new(
+        participant_id: participant.id,
+        team_id:        another_team.id,
+        user_id:        student_user.id
+      )
+
+      # The model allows this, but business logic in controllers should prevent it
+      expect(different_team_membership).to be_valid
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Creation and Destruction Tests
+  # --------------------------------------------------------------------------
+  describe 'creation' do
+    it 'creates a teams_participant record successfully' do
+      expect {
+        TeamsParticipant.create!(
+          participant_id: participant.id,
+          team_id:        team.id,
+          user_id:        student_user.id
+        )
+      }.to change(TeamsParticipant, :count).by(1)
+    end
+
+    it 'associates participant with the correct team' do
+      teams_participant = TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      expect(teams_participant.team).to eq(team)
+      expect(teams_participant.participant).to eq(participant)
+      expect(teams_participant.user).to eq(student_user)
+    end
+  end
+
+  describe 'destruction' do
+    it 'removes the teams_participant record' do
+      teams_participant = TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      expect {
+        teams_participant.destroy
+      }.to change(TeamsParticipant, :count).by(-1)
+    end
+
+    it 'does not destroy the associated team or participant' do
+      teams_participant = TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      team_id = team.id
+      participant_id = participant.id
+
+      teams_participant.destroy
+
+      expect(Team.find_by(id: team_id)).not_to be_nil
+      expect(Participant.find_by(id: participant_id)).not_to be_nil
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Team Membership Transfer Tests (for join team requests)
+  # --------------------------------------------------------------------------
+  describe 'team membership transfer' do
+    it 'allows removing participant from old team and adding to new team' do
+      # Create initial membership
+      old_membership = TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      # Transfer to new team (simulating accept join team request)
+      old_membership.destroy
+
+      new_membership = TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        another_team.id,
+        user_id:        student_user.id
+      )
+
+      expect(new_membership).to be_persisted
+      expect(TeamsParticipant.find_by(participant_id: participant.id, team_id: team.id)).to be_nil
+      expect(TeamsParticipant.find_by(participant_id: participant.id, team_id: another_team.id)).not_to be_nil
+    end
+
+    it 'updates team participant count correctly after transfer' do
+      # Add participant to first team
+      TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+
+      # Add another participant to second team
+      TeamsParticipant.create!(
+        participant_id: another_participant.id,
+        team_id:        another_team.id,
+        user_id:        another_student.id
+      )
+
+      expect(team.participants.count).to eq(1)
+      expect(another_team.participants.count).to eq(1)
+
+      # Transfer first participant to second team
+      TeamsParticipant.find_by(participant_id: participant.id, team_id: team.id).destroy
+      TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        another_team.id,
+        user_id:        student_user.id
+      )
+
+      team.reload
+      another_team.reload
+
+      expect(team.participants.count).to eq(0)
+      expect(another_team.participants.count).to eq(2)
+    end
+  end
+
+  # --------------------------------------------------------------------------
+  # Query Tests
+  # --------------------------------------------------------------------------
+  describe 'querying' do
+    before do
+      TeamsParticipant.create!(
+        participant_id: participant.id,
+        team_id:        team.id,
+        user_id:        student_user.id
+      )
+      TeamsParticipant.create!(
+        participant_id: another_participant.id,
+        team_id:        another_team.id,
+        user_id:        another_student.id
+      )
+    end
+
+    it 'finds teams_participant by participant_id' do
+      result = TeamsParticipant.find_by(participant_id: participant.id)
+      expect(result).not_to be_nil
+      expect(result.team_id).to eq(team.id)
+    end
+
+    it 'finds teams_participant by team_id' do
+      result = TeamsParticipant.where(team_id: team.id)
+      expect(result.count).to eq(1)
+      expect(result.first.participant_id).to eq(participant.id)
+    end
+
+    it 'finds all participants for a team through association' do
+      expect(team.participants).to include(participant)
+      expect(another_team.participants).to include(another_participant)
+    end
+  end
+end
diff --git a/spec/models/text_area_spec.rb b/spec/models/text_area_spec.rb
index 90ac0ba9e..45f886f53 100644
--- a/spec/models/text_area_spec.rb
+++ b/spec/models/text_area_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe TextArea do
diff --git a/spec/models/text_field_spec.rb b/spec/models/text_field_spec.rb
index c39472031..f93a8a54d 100644
--- a/spec/models/text_field_spec.rb
+++ b/spec/models/text_field_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe TextField, type: :model do
diff --git a/spec/models/text_response_spec.rb b/spec/models/text_response_spec.rb
index 41a79fcec..cf23f8b32 100644
--- a/spec/models/text_response_spec.rb
+++ b/spec/models/text_response_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe TextResponse, type: :model do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 1356f4ff9..4e51c9933 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
 require_relative '../config/environment'
 # Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
+abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'rspec/rails'
 
 require 'factory_bot_rails'
 require 'database_cleaner/active_record'
 
 # Override DATABASE_URL for tests to prevent remote DB errors
-#if Rails.env.test?
-#  ENV['DATABASE_URL'] = 'mysql2://root:expertiza@127.0.0.1/reimplementation_test'
-#end
+if Rails.env.test?
+ ENV['DATABASE_URL'] = 'mysql2://root:expertiza@127.0.0.1/reimplementation_test'
+end
 
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
@@ -75,12 +77,13 @@
 end
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = Rails.root.join('spec/fixtures')
+  # config.fixture_path = Rails.root.join('spec/fixtures')
+
+  # Since we're using Factory Bot instead of fixtures, we don't need fixture_path
+  # config.fixture_path is deprecated in newer RSpec versions anyway
 
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
+  # We're using DatabaseCleaner instead of transactional fixtures
+  # config.use_transactional_fixtures = false
 
   # You can uncomment this line to turn off ActiveRecord support entirely.
   # config.use_active_record = false
diff --git a/spec/requests/api/v1/acceptance_email_integration_spec.rb b/spec/requests/api/v1/acceptance_email_integration_spec.rb
new file mode 100644
index 000000000..e533ad135
--- /dev/null
+++ b/spec/requests/api/v1/acceptance_email_integration_spec.rb
@@ -0,0 +1,394 @@
+require 'rails_helper'
+require 'json_web_token'
+
+RSpec.describe 'Join Team Request and Invitation Acceptance Email Integration', type: :request do
+  include ActiveJob::TestHelper
+
+  before(:all) do
+    @roles = create_roles_hierarchy
+  end
+
+  let(:instructor) {
+    User.create!(
+      name: "instructor_user",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:instructor].id,
+      full_name: "Instructor User",
+      email: "instructor@example.com"
+    )
+  }
+
+  let(:student1) {
+    User.create!(
+      name: "student1",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student One",
+      email: "student1@example.com"
+    )
+  }
+
+  let(:student2) {
+    User.create!(
+      name: "student2",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student Two",
+      email: "student2@example.com"
+    )
+  }
+
+  let(:student3) {
+    User.create!(
+      name: "student3",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student Three",
+      email: "student3@example.com"
+    )
+  }
+
+  let(:assignment) {
+    Assignment.create!(
+      name: 'Integration Test Assignment',
+      instructor_id: instructor.id,
+      has_teams: true,
+      max_team_size: 4
+    )
+  }
+
+  let(:team1) {
+    AssignmentTeam.create!(
+      name: 'Integration Test Team',
+      parent_id: assignment.id,
+      type: 'AssignmentTeam'
+    )
+  }
+
+  let(:participant1) {
+    AssignmentParticipant.create!(
+      user_id: student1.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student1_handle'
+    )
+  }
+
+  let(:participant2) {
+    AssignmentParticipant.create!(
+      user_id: student2.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student2_handle'
+    )
+  }
+
+  let(:participant3) {
+    AssignmentParticipant.create!(
+      user_id: student3.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student3_handle'
+    )
+  }
+
+  before(:each) do
+    ActiveJob::Base.queue_adapter = :test
+    # Add student1 to team1
+    TeamsParticipant.create!(
+      team_id: team1.id,
+      participant_id: participant1.id,
+      user_id: student1.id
+    )
+  end
+
+  after(:each) do
+    clear_enqueued_jobs
+  end
+
+  describe 'Complete Join Team Request Acceptance Workflow' do
+    let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+    let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+
+    it 'completes full workflow: request creation -> acceptance -> email notification' do
+      participant2 # Ensure participant exists
+
+      # Step 1: Create join team request
+      post '/api/v1/join_team_requests',
+           params: {
+             team_id: team1.id,
+             assignment_id: assignment.id,
+             comments: 'I want to join your team'
+           },
+           headers: { 'Authorization' => "Bearer #{JsonWebToken.encode({id: student2.id})}" }
+
+      expect(response).to have_http_status(:created)
+      created_request = JSON.parse(response.body)
+      request_id = created_request['join_team_request']['id']
+
+      # Step 2: Accept the request
+      expect {
+        patch "/api/v1/join_team_requests/#{request_id}/accept", headers: team_member_headers
+      }.to have_enqueued_job(ActionMailer::MailDeliveryJob)
+
+      expect(response).to have_http_status(:ok)
+
+      # Step 3: Verify participant was added
+      expect(team1.participants.reload).to include(participant2)
+
+      # Step 4: Verify request status changed
+      updated_request = JoinTeamRequest.find(request_id)
+      expect(updated_request.reply_status).to eq('ACCEPTED')
+    end
+
+    it 'sends email with correct content when join request is accepted' do
+      participant2 # Ensure participant exists
+      join_request = JoinTeamRequest.create!(
+        participant_id: participant2.id,
+        team_id: team1.id,
+        comments: 'Please let me join'
+      )
+
+      patch "/api/v1/join_team_requests/#{join_request.id}/accept", headers: team_member_headers
+
+      # Email job should be enqueued
+      expect(ActionMailer::MailDeliveryJob).to have_been_enqueued.on_queue('default')
+    end
+  end
+
+  describe 'Complete Invitation Acceptance Workflow' do
+    it 'completes full workflow: invitation creation -> acceptance -> email notifications' do
+      participant2 # Ensure participant exists
+      participant3 # Ensure participant exists
+
+      # Step 1: Create invitation
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      expect(invitation).to be_valid
+
+      # Step 2: Accept invitation
+      result = nil
+      expect {
+        result = invitation.accept_invitation
+      }.to have_enqueued_job(ActionMailer::MailDeliveryJob).at_least(:twice)
+
+      expect(result[:success]).to be true
+
+      # Step 3: Verify participant was added to team
+      expect(team1.participants.reload).to include(participant2)
+
+      # Step 4: Verify invitation status changed
+      invitation.reload
+      expect(invitation.reply_status).to eq(InvitationValidator::ACCEPT_STATUS)
+    end
+
+    it 'sends acceptance email to invitee when invitation is accepted' do
+      participant2 # Ensure participant exists
+
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      expect {
+        invitation.accept_invitation
+      }.to have_enqueued_job(ActionMailer::MailDeliveryJob)
+         .with('InvitationMailer', 'send_acceptance_email', anything)
+    end
+
+    it 'sends team notification email when invitation is accepted' do
+      participant2 # Ensure participant exists
+      participant3 # Ensure participant exists
+
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      expect {
+        invitation.accept_invitation
+      }.to have_enqueued_job(ActionMailer::MailDeliveryJob)
+         .with('InvitationMailer', 'send_team_acceptance_notification', anything)
+    end
+
+    it 'sends two emails (to invitee and team) on acceptance' do
+      participant2 # Ensure participant exists
+
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      expect {
+        invitation.accept_invitation
+      }.to have_enqueued_job(ActionMailer::MailDeliveryJob).exactly(2).times
+    end
+  end
+
+  describe 'Email Content Validation' do
+    it 'join request acceptance email includes all required information' do
+      participant2 # Ensure participant exists
+      join_request = JoinTeamRequest.create!(
+        participant_id: participant2.id,
+        team_id: team1.id,
+        comments: 'Please let me join'
+      )
+
+      email = JoinTeamRequestMailer.with(join_team_request: join_request).send_acceptance_email
+
+      # Verify recipient
+      expect(email.to).to include(student2.email)
+
+      # Verify content
+      body = email.body.encoded
+      expect(body).to include(student2.full_name)
+      expect(body).to include(team1.name)
+      expect(body).to include(assignment.name)
+      expect(body).to include('Good news')
+      expect(body).to include('accepted')
+    end
+
+    it 'invitation acceptance email includes all required information' do
+      participant2 # Ensure participant exists
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      email = InvitationMailer.with(invitation: invitation).send_acceptance_email
+
+      # Verify recipient
+      expect(email.to).to include(student2.email)
+
+      # Verify content
+      body = email.body.encoded
+      expect(body).to include(student2.full_name)
+      expect(body).to include(team1.name)
+      expect(body).to include(assignment.name)
+      expect(body).to include('accepted')
+    end
+
+    it 'team notification email includes all required information' do
+      participant2 # Ensure participant exists
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      email = InvitationMailer.with(invitation: invitation).send_team_acceptance_notification
+
+      # Verify recipient(s)
+      expect(email.to).to include(student1.email)
+
+      # Verify content
+      body = email.body.encoded
+      expect(body).to include(student2.full_name)
+      expect(body).to include(team1.name)
+      expect(body).to include(assignment.name)
+      expect(body).to include('joined')
+    end
+  end
+
+  describe 'Error Handling' do
+    it 'does not send email if team is full' do
+      participant2 # Ensure participant exists
+      assignment.update!(max_team_size: 1)
+      join_request = JoinTeamRequest.create!(
+        participant_id: participant2.id,
+        team_id: team1.id,
+        comments: 'Please let me join'
+      )
+
+      team_member_token = JsonWebToken.encode({id: student1.id})
+      team_member_headers = { 'Authorization' => "Bearer #{team_member_token}" }
+
+      expect {
+        patch "/api/v1/join_team_requests/#{join_request.id}/accept", headers: team_member_headers
+      }.not_to have_enqueued_job(ActionMailer::MailDeliveryJob)
+    end
+
+    it 'handles invitation acceptance when team already has multiple members' do
+      participant2 # Ensure participant exists
+      participant3 # Ensure participant exists
+
+      # Add another member to the team
+      TeamsParticipant.create!(
+        team_id: team1.id,
+        participant_id: participant3.id,
+        user_id: student3.id
+      )
+
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      expect {
+        result = invitation.accept_invitation
+        expect(result[:success]).to be true
+      }.to have_enqueued_job(ActionMailer::MailDeliveryJob).at_least(:twice)
+    end
+  end
+
+  describe 'OODD Principles Compliance' do
+    it 'encapsulates email logic within mailer classes' do
+      # Email logic should not be in controller or model
+      # Instead, mailer classes should handle email composition
+
+      participant2 # Ensure participant exists
+      join_request = JoinTeamRequest.create!(
+        participant_id: participant2.id,
+        team_id: team1.id,
+        comments: 'Please let me join'
+      )
+
+      # Mailer should be responsible for email composition
+      expect(JoinTeamRequestMailer).to respond_to(:send_acceptance_email)
+    end
+
+    it 'separates concerns: controller handles requests, mailer handles emails' do
+      participant2 # Ensure participant exists
+      join_request = JoinTeamRequest.create!(
+        participant_id: participant2.id,
+        team_id: team1.id,
+        comments: 'Please let me join'
+      )
+
+      team_member_token = JsonWebToken.encode({id: student1.id})
+      team_member_headers = { 'Authorization' => "Bearer #{team_member_token}" }
+
+      # Controller should call mailer, not send email directly
+      expect(JoinTeamRequestMailer).to receive(:with).and_call_original
+
+      patch "/api/v1/join_team_requests/#{join_request.id}/accept", headers: team_member_headers
+    end
+
+    it 'maintains single responsibility: model accepts, mailer notifies' do
+      participant2 # Ensure participant exists
+      invitation = Invitation.create!(
+        to_id: participant2.id,
+        from_id: team1.id,
+        assignment_id: assignment.id
+      )
+
+      # Model's accept_invitation should focus on acceptance logic and delegation
+      result = invitation.accept_invitation
+
+      # Check that it returns success
+      expect(result[:success]).to be true
+
+      # Emails should be queued (responsibility of mailer)
+      expect(ActionMailer::MailDeliveryJob).to have_been_enqueued.at_least(:twice)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/account_requests_spec.rb b/spec/requests/api/v1/account_requests_spec.rb
index 9db8efe3f..ee355a685 100644
--- a/spec/requests/api/v1/account_requests_spec.rb
+++ b/spec/requests/api/v1/account_requests_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
@@ -21,7 +23,7 @@
   let(:Authorization) { "Bearer #{token}" }
   let(:institution) { Institution.create(name: "NC State") }
 
-  path '/api/v1/account_requests/pending' do
+  path '/account_requests/pending' do
     # List all Pending Account Requests
     get('List all Pending Account Requests') do
       tags 'Account Requests'
@@ -40,7 +42,7 @@
     end
   end
 
-  path '/api/v1/account_requests/processed' do
+  path '/account_requests/processed' do
     # List all Processed Account Requests
     get('List all Processed Account Requests') do
       tags 'Account Requests'
@@ -59,7 +61,7 @@
     end
   end
 
-  path '/api/v1/account_requests' do
+  path '/account_requests' do
     post('Create Account Request') do
       tags 'Account Requests'
       consumes 'application/json'
@@ -167,7 +169,7 @@
       end
     end
 
-    path '/api/v1/account_requests/{id}' do
+    path '/account_requests/{id}' do
       parameter name: 'id', in: :path, type: :integer, description: 'id of the Account Request'
       
       let(:account_request) do
diff --git a/spec/requests/api/v1/advertisements_spec.rb b/spec/requests/api/v1/advertisements_spec.rb
new file mode 100644
index 000000000..1c3cff681
--- /dev/null
+++ b/spec/requests/api/v1/advertisements_spec.rb
@@ -0,0 +1,361 @@
+require 'swagger_helper'
+require 'rails_helper'
+require 'json_web_token'
+
+RSpec.describe 'Advertisements API', type: :request do
+  before(:all) do
+    @roles = create_roles_hierarchy
+  end
+
+  let(:instructor) {
+    User.create!(
+      name: "instructor_user",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:instructor].id,
+      full_name: "Instructor User",
+      email: "instructor@example.com"
+    )
+  }
+
+  let(:student1) {
+    User.create!(
+      name: "student1",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student One",
+      email: "student1@example.com"
+    )
+  }
+
+  let(:student2) {
+    User.create!(
+      name: "student2",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student Two",
+      email: "student2@example.com"
+    )
+  }
+
+  let(:student3) {
+    User.create!(
+      name: "student3",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student Three",
+      email: "student3@example.com"
+    )
+  }
+
+  let(:assignment) {
+    Assignment.create!(
+      name: 'Test Assignment',
+      instructor_id: instructor.id,
+      has_teams: true,
+      has_topics: true,
+      max_team_size: 3
+    )
+  }
+
+  let(:sign_up_topic) {
+    SignUpTopic.create!(
+      topic_name: 'Test Topic',
+      assignment_id: assignment.id,
+      max_choosers: 2
+    )
+  }
+
+  let(:team) {
+    AssignmentTeam.create!(
+      name: 'Team Alpha',
+      parent_id: assignment.id,
+      type: 'AssignmentTeam'
+    )
+  }
+
+  let(:participant1) {
+    AssignmentParticipant.create!(
+      user_id: student1.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student1_handle'
+    )
+  }
+
+  let(:participant2) {
+    AssignmentParticipant.create!(
+      user_id: student2.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student2_handle'
+    )
+  }
+
+  let(:participant3) {
+    AssignmentParticipant.create!(
+      user_id: student3.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student3_handle'
+    )
+  }
+
+  let(:signed_up_team) {
+    SignedUpTeam.create!(
+      sign_up_topic_id: sign_up_topic.id,
+      team_id: team.id,
+      is_waitlisted: false
+    )
+  }
+
+  before(:each) do
+    # Add student1 to team
+    TeamsParticipant.create!(
+      team_id: team.id,
+      participant_id: participant1.id,
+      user_id: student1.id
+    )
+  end
+
+  describe 'Advertisement Display' do
+    let(:student2_token) { JsonWebToken.encode({ id: student2.id }) }
+    let(:student2_headers) { { 'Authorization' => "Bearer #{student2_token}" } }
+
+    context 'when viewing assignments with advertisements' do
+      it 'returns advertisement data when team has created advertisement' do
+        # Create advertisement
+        signed_up_team # Create signed up team
+        signed_up_team.update(advertise_for_partner: true, comments_for_advertisement: 'Looking for strong members!')
+
+        # Simulate endpoint: GET /api/v1/assignments/:id/sign_up_topics
+        get "/api/v1/sign_up_topics?assignment_id=#{assignment.id}", headers: student2_headers
+        
+        expect(response).to have_http_status(:ok)
+        body = JSON.parse(response.body)
+        
+        # Verify we can see the topic and its signed up teams (which contain advertisement data)
+        expect(body).to be_a(Array)
+      end
+
+      it 'includes trumpet icon indicator when team is advertising' do
+        signed_up_team.update(advertise_for_partner: true, comments_for_advertisement: 'We need members!')
+        participant2 # ensure exists
+
+        get "/api/v1/sign_up_topics?assignment_id=#{assignment.id}", headers: student2_headers
+        
+        expect(response).to have_http_status(:ok)
+        # The frontend will check signed_up_teams[].advertise_for_partner to render trumpet icon
+      end
+
+      it 'returns advertisement comments' do
+        ad_text = 'Experienced team looking for dedicated members to complete project'
+        signed_up_team.update(advertise_for_partner: true, comments_for_advertisement: ad_text)
+        participant2 # ensure exists
+
+        get "/api/v1/sign_up_topics?assignment_id=#{assignment.id}", headers: student2_headers
+        
+        expect(response).to have_http_status(:ok)
+        # Frontend will display comments_for_advertisement text
+      end
+    end
+  end
+
+  describe 'Advertisement Creation' do
+    context 'when team wants to create an advertisement' do
+      let(:student1_token) { JsonWebToken.encode({ id: student1.id }) }
+      let(:student1_headers) { { 'Authorization' => "Bearer #{student1_token}" } }
+
+      it 'allows team member to enable advertisement' do
+        signed_up_team # Create signed up team
+        participant1 # ensure team member exists
+
+        # Update signed up team to create advertisement
+        patch "/api/v1/signed_up_teams/#{signed_up_team.id}",
+              params: {
+                signed_up_team: {
+                  advertise_for_partner: true,
+                  comments_for_advertisement: 'Looking for passionate developers!'
+                }
+              },
+              headers: student1_headers
+        
+        # Verify the team member can enable advertisement
+        expect(response).to have_http_status(:ok)
+        signed_up_team.reload
+        expect(signed_up_team.advertise_for_partner).to be true
+        expect(signed_up_team.comments_for_advertisement).to eq('Looking for passionate developers!')
+      end
+
+      it 'stores advertisement text correctly' do
+        ad_text = 'We have one spot left. Please join our amazing team!'
+        signed_up_team.update(
+          advertise_for_partner: true,
+          comments_for_advertisement: ad_text
+        )
+        
+        expect(signed_up_team.advertise_for_partner).to be true
+        expect(signed_up_team.comments_for_advertisement).to eq(ad_text)
+      end
+
+      it 'allows team to disable advertisement' do
+        signed_up_team.update(
+          advertise_for_partner: true,
+          comments_for_advertisement: 'Looking for members'
+        )
+        
+        signed_up_team.update(advertise_for_partner: false)
+        
+        expect(signed_up_team.advertise_for_partner).to be false
+      end
+    end
+  end
+
+  describe 'Join Request from Advertisement' do
+    let(:student2_token) { JsonWebToken.encode({ id: student2.id }) }
+    let(:student2_headers) { { 'Authorization' => "Bearer #{student2_token}" } }
+
+    context 'when student sees advertisement and wants to join' do
+      before do
+        signed_up_team.update(
+          advertise_for_partner: true,
+          comments_for_advertisement: 'We need one more member!'
+        )
+      end
+
+      it 'allows student to submit join request for advertising team' do
+        participant2 # ensure exists
+        
+        post '/api/v1/join_team_requests',
+             params: {
+               team_id: team.id,
+               assignment_id: assignment.id,
+               comments: 'I would like to join your team based on your advertisement'
+             },
+             headers: student2_headers
+        
+        expect(response).to have_http_status(:created)
+        body = JSON.parse(response.body)
+        expect(body['reply_status']).to eq('PENDING')
+      end
+
+      it 'tracks which team the request is for' do
+        participant2 # ensure exists
+        
+        post '/api/v1/join_team_requests',
+             params: {
+               team_id: team.id,
+               assignment_id: assignment.id,
+               comments: 'Interested in joining'
+             },
+             headers: student2_headers
+        
+        join_request = JoinTeamRequest.last
+        expect(join_request.team_id).to eq(team.id)
+      end
+    end
+  end
+
+  describe 'Team Full Scenario with Advertisements' do
+    let(:student1_token) { JsonWebToken.encode({ id: student1.id }) }
+    let(:student1_headers) { { 'Authorization' => "Bearer #{student1_token}" } }
+    
+    let(:student2_token) { JsonWebToken.encode({ id: student2.id }) }
+    let(:student2_headers) { { 'Authorization' => "Bearer #{student2_token}" } }
+    
+    let(:student3_token) { JsonWebToken.encode({ id: student3.id }) }
+    let(:student3_headers) { { 'Authorization' => "Bearer #{student3_token}" } }
+
+    context 'when team reaches maximum capacity' do
+      before do
+        signed_up_team.update(advertise_for_partner: true, comments_for_advertisement: 'Last spot available!')
+        participant2 # ensure exists
+        participant3 # ensure exists
+        
+        # Add student2 to team (now 2 members)
+        TeamsParticipant.create!(
+          team_id: team.id,
+          participant_id: participant2.id,
+          user_id: student2.id
+        )
+      end
+
+      it 'prevents new join requests when team is full' do
+        assignment.update(max_team_size: 2)
+        
+        post '/api/v1/join_team_requests',
+             params: {
+               team_id: team.id,
+               assignment_id: assignment.id,
+               comments: 'I want to join'
+             },
+             headers: student3_headers
+        
+        expect(response).to have_http_status(:unprocessable_entity)
+        body = JSON.parse(response.body)
+        expect(body['message']).to include('full')
+      end
+
+      it 'prevents team owner from accepting request when team is full' do
+        join_request = JoinTeamRequest.create!(
+          participant_id: participant3.id,
+          team_id: team.id,
+          comments: 'Please let me join',
+          reply_status: 'PENDING'
+        )
+        
+        assignment.update(max_team_size: 2)
+        
+        patch "/api/v1/join_team_requests/#{join_request.id}/accept",
+              headers: student1_headers
+        
+        expect(response).to have_http_status(:unprocessable_entity)
+        body = JSON.parse(response.body)
+        expect(body['error']).to include('full')
+      end
+    end
+  end
+
+  describe 'Integration: Advertisement Lifecycle' do
+    let(:student1_token) { JsonWebToken.encode({ id: student1.id }) }
+    let(:student1_headers) { { 'Authorization' => "Bearer #{student1_token}" } }
+    
+    let(:student2_token) { JsonWebToken.encode({ id: student2.id }) }
+    let(:student2_headers) { { 'Authorization' => "Bearer #{student2_token}" } }
+
+    it 'completes full workflow: create team -> advertise -> receive request -> accept' do
+      signed_up_team # Create signed up team with student1
+      participant2 # ensure student2 exists
+      
+      # Step 1: Team creates advertisement
+      signed_up_team.update(
+        advertise_for_partner: true,
+        comments_for_advertisement: 'Expert team seeking final member'
+      )
+      expect(signed_up_team.advertise_for_partner).to be true
+      
+      # Step 2: Another student sees advertisement and submits join request
+      post '/api/v1/join_team_requests',
+           params: {
+             team_id: team.id,
+             assignment_id: assignment.id,
+             comments: 'Saw your advertisement, interested in joining'
+           },
+           headers: student2_headers
+      
+      expect(response).to have_http_status(:created)
+      join_request = JoinTeamRequest.last
+      expect(join_request.team_id).to eq(team.id)
+      
+      # Step 3: Team member sees the request and accepts it
+      patch "/api/v1/join_team_requests/#{join_request.id}/accept",
+            headers: student1_headers
+      
+      expect(response).to have_http_status(:ok)
+      
+      # Step 4: Verify student2 is now on the team
+      team.reload
+      expect(team.participants.count).to eq(2)
+      expect(team.participants.pluck(:user_id)).to include(student2.id)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/assignment_controller_spec.rb b/spec/requests/api/v1/assignment_controller_spec.rb
index b3967fe70..6b64f4270 100644
--- a/spec/requests/api/v1/assignment_controller_spec.rb
+++ b/spec/requests/api/v1/assignment_controller_spec.rb
@@ -1,4 +1,4 @@
-# spec/requests/api/v1/assignment_controller_spec.rb
+# spec/requests/assignment_controller_spec.rb
 
 require 'swagger_helper'
 require 'rails_helper'
@@ -43,7 +43,7 @@
     )
   end
 
-  # Create two assignments so the "GET /api/v1/assignments" test expects 2
+  # Create two assignments so the "GET /assignments" test expects 2
   let!(:assignment1) { Assignment.create!(name: 'Test Assignment 1', instructor_id: prof.id) }
   let!(:assignment2) { Assignment.create!(name: 'Test Assignment 2', instructor_id: prof.id) }
 
@@ -63,9 +63,9 @@
   let(:Authorization) { "Bearer #{token}" }
 
   # -------------------------------------------------------------------------
-  # GET /api/v1/assignments  (Get assignments)
+  # GET /assignments  (Get assignments)
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments' do
+  path '/assignments' do
     get 'Get assignments' do
       tags "Get All Assignments"
       produces 'application/json'
@@ -83,9 +83,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # POST /api/v1/assignments/{assignment_id}/add_participant/{user_id}
+  # POST /assignments/{assignment_id}/add_participant/{user_id}
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/add_participant/{user_id}' do
+  path '/assignments/{assignment_id}/add_participant/{user_id}' do
     parameter name: 'assignment_id', in: :path, type: :string
     parameter name: 'user_id', in: :path, type: :string
 
@@ -119,9 +119,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # DELETE /api/v1/assignments/{assignment_id}/remove_participant/{user_id}
+  # DELETE /assignments/{assignment_id}/remove_participant/{user_id}
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/remove_participant/{user_id}' do
+  path '/assignments/{assignment_id}/remove_participant/{user_id}' do
     parameter name: 'assignment_id', in: :path, type: :string
     parameter name: 'user_id', in: :path, type: :string
 
@@ -157,9 +157,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # PATCH /api/v1/assignments/{assignment_id}/assign_course/{course_id}
+  # PATCH /assignments/{assignment_id}/assign_course/{course_id}
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/assign_course/{course_id}' do
+  path '/assignments/{assignment_id}/assign_course/{course_id}' do
     parameter name: 'assignment_id', in: :path, type: :string
     parameter name: 'course_id', in: :path, type: :string
 
@@ -193,9 +193,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # PATCH /api/v1/assignments/{assignment_id}/remove_assignment_from_course
+  # PATCH /assignments/{assignment_id}/remove_assignment_from_course
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/remove_assignment_from_course' do
+  path '/assignments/{assignment_id}/remove_assignment_from_course' do
     patch 'Removes assignment from course' do
       tags 'Assignments'
       produces 'application/json'
@@ -228,9 +228,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # POST /api/v1/assignments/{assignment_id}/copy_assignment
+  # POST /assignments/{assignment_id}/copy_assignment
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/copy_assignment' do
+  path '/assignments/{assignment_id}/copy_assignment' do
     parameter name: 'assignment_id', in: :path, type: :string
 
     post 'Copy an existing assignment' do
@@ -261,9 +261,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # DELETE /api/v1/assignments/{id}
+  # DELETE /assignments/{id}
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{id}' do
+  path '/assignments/{id}' do
     parameter name: 'id', in: :path, type: :integer, description: 'Assignment ID'
 
     delete('Delete an assignment') do
@@ -294,9 +294,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # GET /api/v1/assignments/{assignment_id}/has_topics
+  # GET /assignments/{assignment_id}/has_topics
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/has_topics' do
+  path '/assignments/{assignment_id}/has_topics' do
     parameter name: 'assignment_id', in: :path, type: :integer, description: 'Assignment ID'
 
     get('Check if an assignment has topics') do
@@ -326,9 +326,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # GET /api/v1/assignments/{assignment_id}/team_assignment
+  # GET /assignments/{assignment_id}/team_assignment
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/team_assignment' do
+  path '/assignments/{assignment_id}/team_assignment' do
     parameter name: 'assignment_id', in: :path, type: :integer, description: 'Assignment ID'
 
     get('Check if an assignment is a team assignment') do
@@ -358,9 +358,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # GET /api/v1/assignments/{assignment_id}/valid_num_review/{review_type}
+  # GET /assignments/{assignment_id}/valid_num_review/{review_type}
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/valid_num_review/{review_type}' do
+  path '/assignments/{assignment_id}/valid_num_review/{review_type}' do
     parameter name: 'assignment_id', in: :path, type: :integer, description: 'Assignment ID'
     parameter name: 'review_type', in: :path, type: :string, description: 'Review Type'
 
@@ -393,9 +393,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # GET /api/v1/assignments/{assignment_id}/has_teams
+  # GET /assignments/{assignment_id}/has_teams
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{assignment_id}/has_teams' do
+  path '/assignments/{assignment_id}/has_teams' do
     parameter name: 'assignment_id', in: :path, type: :integer, description: 'Assignment ID'
 
     get('Check if an assignment has teams') do
@@ -425,9 +425,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # GET /api/v1/assignments/{id}/show_assignment_details
+  # GET /assignments/{id}/show_assignment_details
   # -------------------------------------------------------------------------
-  path '/api/v1/assignments/{id}/show_assignment_details' do
+  path '/assignments/{id}/show_assignment_details' do
     parameter name: 'id', in: :path, type: :integer, description: 'Assignment ID'
 
     get('Retrieve assignment details') do
diff --git a/spec/requests/api/v1/bookmarks_controller_spec.rb b/spec/requests/api/v1/bookmarks_controller_spec.rb
index a1bc7ceef..861891aee 100644
--- a/spec/requests/api/v1/bookmarks_controller_spec.rb
+++ b/spec/requests/api/v1/bookmarks_controller_spec.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
 # Rspec test for Bookmarks Controller
-RSpec.describe 'api/v1/bookmarks', type: :request do
+RSpec.describe 'bookmarks', type: :request do
   before(:all) do
     @roles = create_roles_hierarchy
   end
@@ -21,7 +23,7 @@
   let(:token) { JsonWebToken.encode({ id: student.id }) }
   let(:Authorization) { "Bearer #{token}" }
 
-  path '/api/v1/bookmarks' do
+  path '/bookmarks' do
     # Creation of dummy objects for the test with the help of let statements
     let(:bookmark1) do
       student
@@ -48,7 +50,7 @@
     let(:token) { JsonWebToken.encode({ id: student.id }) }
     let(:Authorization) { "Bearer #{token}" }
 
-    # get request on /api/v1/bookmarks return list of bookmarks with response 200
+    # get request on /bookmarks return list of bookmarks with response 200
     get('list bookmarks') do
       tags 'Bookmarks'
       produces 'application/json'
@@ -92,7 +94,7 @@
         required: %w[url title description topic_id]
       }
 
-      # post request on /api/v1/bookmarks creates bookmark with response 201 when correct params are passed
+      # post request on /bookmarks creates bookmark with response 201 when correct params are passed
       response(201, 'created') do
         let(:bookmark) do
           student
@@ -103,7 +105,7 @@
         end
       end
 
-      # post request on /api/v1/bookmarks returns 422 response - unprocessable entity when wrong params is passed to create bookmark
+      # post request on /bookmarks returns 422 response - unprocessable entity when wrong params is passed to create bookmark
       response(422, 'unprocessable entity') do
         let(:bookmark) do
           student
@@ -114,7 +116,7 @@
     end
   end
 
-  path '/api/v1/bookmarks/{id}' do
+  path '/bookmarks/{id}' do
     parameter name: 'id', in: :path, type: :integer
 
     # Creation of dummy objects for the test with the help of let statements
@@ -138,7 +140,7 @@
       bookmark.id
     end
 
-    # Get request on /api/v1/bookmarks/{id} returns the response 200 successful - bookmark with id = {id} when correct id is passed which is in the database
+    # Get request on /bookmarks/{id} returns the response 200 successful - bookmark with id = {id} when correct id is passed which is in the database
     get('show bookmark') do
       tags 'Bookmarks'
       produces 'application/json'
@@ -148,7 +150,7 @@
         end
       end
 
-      # Get request on /api/v1/bookmarks/{id} returns the response 404 not found - bookmark with id = {id} when correct id is passed which is not present in the database
+      # Get request on /bookmarks/{id} returns the response 404 not found - bookmark with id = {id} when correct id is passed which is not present in the database
       response(404, 'not_found') do
         let(:id) { 'invalid' }
         run_test! do
@@ -169,7 +171,7 @@
         }
       }
 
-      # put request on /api/v1/bookmarks/{id} returns 200 response successful when bookmark id is present in the database and correct valid params are passed
+      # put request on /bookmarks/{id} returns 200 response successful when bookmark id is present in the database and correct valid params are passed
       response(200, 'successful') do
         let(:body_params) do
           {
@@ -181,7 +183,7 @@
         end
       end
 
-      # put request on /api/v1/bookmarks/{id} returns 404 not found when id is not present in the database which bookmark needs to be updated
+      # put request on /bookmarks/{id} returns 404 not found when id is not present in the database which bookmark needs to be updated
       response(404, 'not found') do
         let(:id) { 0 }
         let(:body_params) do
@@ -198,14 +200,14 @@
     delete('delete bookmark') do
       tags 'Bookmarks'
       produces 'application/json'
-      # delete request on /api/v1/bookmarks/{id} returns 204 successful response when bookmark with id present in the database is successfully deleted
+      # delete request on /bookmarks/{id} returns 204 successful response when bookmark with id present in the database is successfully deleted
       response(204, 'successful') do
         run_test! do
           expect(Bookmark.exists?(id)).to eq(false)
         end
       end
 
-      # delete request on /api/v1/bookmarks/{id} returns 404 not found response when bookmark id is not present in the database
+      # delete request on /bookmarks/{id} returns 404 not found response when bookmark id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -215,7 +217,7 @@
     end
   end
 
-  path '/api/v1/bookmarks/{id}/bookmarkratings' do
+  path '/bookmarks/{id}/bookmarkratings' do
     parameter name: 'id', in: :path, type: :integer
     
     let(:bookmark) do
diff --git a/spec/requests/api/v1/courses_spec.rb b/spec/requests/api/v1/courses_spec.rb
index d7f3908e5..241231b43 100644
--- a/spec/requests/api/v1/courses_spec.rb
+++ b/spec/requests/api/v1/courses_spec.rb
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
-RSpec.describe 'api/v1/courses', type: :request do
+RSpec.describe 'courses', type: :request do
   before(:all) do
     @roles = create_roles_hierarchy
   end
@@ -21,7 +23,7 @@
   let(:Authorization) { "Bearer #{token}" }
 
   # GET /courses/{id}/add_ta/{ta_id}
-  path '/api/v1/courses/{id}/add_ta/{ta_id}' do
+  path '/courses/{id}/add_ta/{ta_id}' do
     parameter name: :id, in: :path, type: :integer, required: true
     parameter name: :ta_id, in: :path, type: :integer, required: true
     let(:institution) { Institution.create(name: "NC State") }
@@ -72,7 +74,7 @@
   end
 
   # GET /courses/{id}/tas
-  path '/api/v1/courses/{id}/tas' do
+  path '/courses/{id}/tas' do
     parameter name: 'id', in: :path, type: :string, description: 'id'
     let(:institution) { Institution.create(name: "NC State") }
     let(:course) {
@@ -96,7 +98,7 @@
   end
 
   # GET /courses/{id}/remove_ta/{ta_id}
-  path '/api/v1/courses/{id}/remove_ta/{ta_id}' do
+  path '/courses/{id}/remove_ta/{ta_id}' do
     parameter name: 'id', in: :path, type: :string, description: 'id'
     parameter name: 'ta_id', in: :path, type: :string, description: 'ta_id'
     let(:institution) { Institution.create(name: "NC State") }
@@ -138,7 +140,7 @@
   end
 
   # GET /courses/{id}/copy
-  path '/api/v1/courses/{id}/copy' do
+  path '/courses/{id}/copy' do
     parameter name: 'id', in: :path, type: :string, description: 'id'
     let(:institution) { Institution.create(name: "NC State") }
     let(:course) {
@@ -162,7 +164,7 @@
   end
 
   # GET /courses/
-  path '/api/v1/courses' do
+  path '/courses' do
     get('list courses') do
       tags 'Courses'
       response(200, 'successful') do
@@ -211,7 +213,7 @@
   end
 
   # GET /courses/{id}
-  path '/api/v1/courses/{id}' do
+  path '/courses/{id}' do
     parameter name: 'id', in: :path, type: :string, description: 'id'
     let(:institution) { Institution.create(name: "NC State") }
     let(:course) {
diff --git a/spec/requests/api/v1/grades_controller_spec.rb b/spec/requests/api/v1/grades_controller_spec.rb
new file mode 100644
index 000000000..b728b9f5f
--- /dev/null
+++ b/spec/requests/api/v1/grades_controller_spec.rb
@@ -0,0 +1,430 @@
+require 'swagger_helper'
+require 'json_web_token'
+
+RSpec.describe 'Grades API', type: :request do
+  before(:all) do
+    @roles = create_roles_hierarchy
+  end
+
+  let(:instructor) do
+    User.create!(
+      name: "instructor",
+      password_digest: "password",
+      role_id: @roles[:instructor].id,
+      full_name: "Instructor Name",
+      email: "instructor@example.com"
+    )
+  end
+
+  let(:ta) do
+    User.create!(
+      name: "ta",
+      password_digest: "password",
+      role_id: @roles[:ta].id,
+      full_name: "Teaching Assistant",
+      email: "ta@example.com"
+    )
+  end
+
+  let(:student) do
+    User.create!(
+      name: "student",
+      password_digest: "password",
+      role_id: @roles[:student].id,
+      full_name: "Student Name",
+      email: "student@example.com"
+    )
+  end
+
+  let(:student2) do
+    User.create!(
+      name: "student2",
+      password_digest: "password",
+      role_id: @roles[:student].id,
+      full_name: "Student Two",
+      email: "student2@example.com"
+    )
+  end
+
+  let(:course) {create(:course)}
+
+  let!(:assignment) { Assignment.create!(name: 'Test Assignment', instructor_id: instructor.id, course_id: course.id) }
+  let!(:team) { AssignmentTeam.create!(name: 'Team 1', parent_id: assignment.id) }
+  let!(:participant) { AssignmentParticipant.create!(user_id: student.id, parent_id: assignment.id, team_id: team.id, handle: student.name) }
+  let!(:participant2) { AssignmentParticipant.create!(user_id: student2.id, parent_id: assignment.id, team_id: team.id, handle: student2.name) }
+  
+
+  let(:instructor_token) { JsonWebToken.encode({id: instructor.id}) }
+  let(:ta_token) { JsonWebToken.encode({id: ta.id}) }
+  let(:student_token) { JsonWebToken.encode({id: student.id}) }
+
+  let(:Authorization) { "Bearer #{instructor_token}" }
+
+  path '/grades/{assignment_id}/view_all_scores' do
+    get 'Retrieve all review scores for an assignment' do
+      tags 'Grades'
+      produces 'application/json'
+      security [bearer_auth: []]
+
+      parameter name: :assignment_id, in: :path, type: :integer, description: 'ID of the assignment'
+      parameter name: :participant_id, in: :query, type: :integer, required: false, description: 'ID of the participant'
+      parameter name: :team_id, in: :query, type: :integer, required: false, description: 'ID of the team'
+      parameter name: 'Authorization', in: :header, type: :string, required: true, description: 'Bearer token'
+
+      response '200', 'Returns all scores for assignment' do
+        let(:assignment_id) { assignment.id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data).to have_key('team_scores')
+          expect(data).to have_key('participant_scores')
+        end
+      end
+
+      response '200', 'Returns participant scores when participant_id provided' do
+        let(:assignment_id) { assignment.id }
+        let(:participant_id) { participant.id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['participant_scores']).to be_present
+        end
+      end
+
+      response '200', 'Returns team scores when team_id provided' do
+        let(:assignment_id) { assignment.id }
+        let(:team_id) { team.id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['team_scores']).to be_present
+        end
+      end
+
+      response '403', 'Forbidden - Student cannot access' do
+        let(:assignment_id) { assignment.id }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('You are not authorized to view_all_scores this grades')
+        end
+      end
+
+      response '401', 'Unauthorized' do
+        let(:assignment_id) { assignment.id }
+        let(:Authorization) { 'Bearer invalid_token' }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Authorized')
+        end
+      end
+    end
+  end
+
+  path '/grades/{assignment_id}/view_our_scores' do
+    get 'Retrieve team scores for the requesting student' do
+      tags 'Grades'
+      produces 'application/json'
+      security [bearer_auth: []]
+
+      parameter name: :assignment_id, in: :path, type: :integer, description: 'ID of the assignment'
+      parameter name: 'Authorization', in: :header, type: :string, required: true, description: 'Bearer token'
+
+      response '200', 'Returns team scores' do
+        let(:assignment_id) { assignment.id }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data).to have_key('reviews_of_our_work')
+          expect(data).to have_key('avg_score_of_our_work')
+        end
+      end
+
+      response '403', 'Assignment Participant not found' do
+        let(:assignment_id) { 999 }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('You are not authorized to view_our_scores this grades')
+        end
+      end
+
+      response '401', 'Unauthorized' do
+        let(:assignment_id) { assignment.id }
+        let(:Authorization) { 'Bearer invalid_token' }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Authorized')
+        end
+      end
+    end
+  end
+
+  path '/grades/{assignment_id}/view_my_scores' do
+    get 'Retrieve individual participant scores' do
+      tags 'Grades'
+      produces 'application/json'
+      security [bearer_auth: []]
+
+      parameter name: :assignment_id, in: :path, type: :integer, description: 'ID of the assignment'
+      parameter name: 'Authorization', in: :header, type: :string, required: true, description: 'Bearer token'
+
+      response '200', 'Returns participant scores' do
+        let(:assignment_id) { assignment.id }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data).to have_key('reviews_of_me')
+          expect(data).to have_key('reviews_by_me')
+          expect(data).to have_key('author_feedback_scores')
+          expect(data).to have_key('avg_score_from_my_teammates')
+          expect(data).to have_key('avg_score_to_my_teammates')
+          expect(data).to have_key('avg_score_from_my_authors')
+        end
+      end
+
+      response '403', 'Participant not found' do
+        let(:assignment_id) { 999 }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('You are not authorized to view_my_scores this grades')
+        end
+      end
+
+      response '401', 'Unauthorized' do
+        let(:assignment_id) { assignment.id }
+        let(:Authorization) { 'Bearer invalid_token' }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Authorized')
+        end
+      end
+    end
+  end
+
+  path '/grades/{participant_id}/edit' do
+    get 'Get grade assignment interface data' do
+      tags 'Grades'
+      produces 'application/json'
+      security [bearer_auth: []]
+
+      parameter name: :participant_id, in: :path, type: :integer, description: 'ID of the participant'
+      parameter name: 'Authorization', in: :header, type: :string, required: true, description: 'Bearer token'
+
+      response '200', 'Returns participant, assignment, items, and scores' do
+        let(:participant_id) { participant.id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data).to have_key('participant')
+          expect(data).to have_key('assignment')
+          expect(data).to have_key('items')
+          expect(data).to have_key('scores')
+          expect(data['scores']).to have_key('my_team')
+          expect(data['scores']).to have_key('my_own')
+        end
+      end
+
+      response '404', 'Participant not found' do
+        let(:participant_id) { 999 }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Found')
+        end
+      end
+
+      response '403', 'Forbidden - Student cannot access' do
+        let(:participant_id) { participant.id }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('You are not authorized to edit this grades')
+        end
+      end
+
+      response '401', 'Unauthorized' do
+        let(:participant_id) { participant.id }
+        let(:Authorization) { 'Bearer invalid_token' }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Authorized')
+        end
+      end
+    end
+  end
+
+  path '/grades/{participant_id}/assign_grade' do
+    patch 'Assign grades and comment to team' do
+      tags 'Grades'
+      consumes 'application/json'
+      produces 'application/json'
+      security [bearer_auth: []]
+
+      parameter name: :participant_id, in: :path, type: :integer, description: 'ID of the participant'
+      parameter name: 'Authorization', in: :header, type: :string, required: true, description: 'Bearer token'
+      parameter name: :grade_data, in: :body, schema: {
+        type: :object,
+        properties: {
+          grade_for_submission: { type: :number, description: 'Grade for the submission' },
+          comment_for_submission: { type: :string, description: 'Comment for the submission' }
+        }
+      }
+
+      response '200', 'Team grade and comment assigned successfully' do
+        let(:participant_id) { participant.id }
+        let(:grade_data) { { grade_for_submission: 95, comment_for_submission: 'Excellent work!' } }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['message']).to eq("Grade and comment assigned to team #{team.name} successfully.")
+          
+          team.reload
+          expect(team.grade_for_submission).to eq(95)
+          expect(team.comment_for_submission).to eq('Excellent work!')
+        end
+      end
+
+      response '422', 'Failed to assign team grade or comment' do
+        let(:participant_id) { participant.id }
+        let(:grade_data) { { grade_for_submission: nil } }
+
+        before do
+          allow_any_instance_of(AssignmentTeam).to receive(:save).and_return(false)
+        end
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq("Failed to assign grade or comment to team #{team.name}." )
+        end
+      end
+
+      response '404', 'Participant not found' do
+        let(:participant_id) { 999 }
+        let(:grade_data) { { grade_for_submission: 95 } }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Found')
+        end
+      end
+
+      response '403', 'Forbidden - Student cannot access' do
+        let(:participant_id) { participant.id }
+        let(:grade_data) { { grade_for_submission: 95 } }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('You are not authorized to assign_grade this grades')
+        end
+      end
+
+      response '401', 'Unauthorized' do
+        let(:participant_id) { participant.id }
+        let(:grade_data) { { grade_for_submission: 95 } }
+        let(:Authorization) { 'Bearer invalid_token' }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Authorized')
+        end
+      end
+    end
+  end
+
+  path '/grades/{participant_id}/instructor_review' do
+    get 'Begin or continue grading a submission' do
+      tags 'Grades'
+      produces 'application/json'
+      security [bearer_auth: []]
+
+      parameter name: :participant_id, in: :path, type: :integer, description: 'ID of the participant'
+      parameter name: 'Authorization', in: :header, type: :string, required: true, description: 'Bearer token'
+
+      response '200', 'Returns mapping and redirect information for new review' do
+        let(:participant_id) { participant.id }
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data).to have_key('map_id')
+          expect(data).to have_key('response_id')
+          expect(data).to have_key('redirect_to')
+          expect(data['redirect_to']).to include('/response/new/') if data['response_id'].nil?
+        end
+      end
+
+      response '200', 'Returns mapping and redirect information for existing review' do
+        let(:participant_id) { participant.id }
+        
+        before do
+          reviewer = AssignmentParticipant.create!(user_id: instructor.id, parent_id: assignment.id, handle: instructor.name)
+          mapping = ReviewResponseMap.create!(
+            reviewed_object_id: assignment.id,
+            reviewer_id: reviewer.id,
+            reviewee_id: team.id
+          )
+          Response.create!(map_id: mapping.id)
+        end
+
+        run_test! do |response|
+          data = JSON.parse(response.body)
+          expect(data['response_id']).to be_present
+          expect(data['redirect_to']).to include('/response/edit/')
+        end
+      end
+
+      response '404', 'Participant not found' do
+        let(:participant_id) { 999 }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Found')
+        end
+      end
+
+      response '403', 'Forbidden - Student cannot access' do
+        let(:participant_id) { participant.id }
+        let(:Authorization) { "Bearer #{student_token}" }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('You are not authorized to instructor_review this grades')
+        end
+      end
+
+      response '401', 'Unauthorized' do
+        let(:participant_id) { participant.id }
+        let(:Authorization) { 'Bearer invalid_token' }
+
+        run_test! do |response|
+          expect(JSON.parse(response.body)['error']).to eq('Not Authorized')
+        end
+      end
+    end
+  end
+
+  # Testing with Teaching Assistant permissions
+  describe 'Teaching Assistant access' do
+    before do
+      TaMapping.create!(course_id: course.id, user_id: ta.id)
+    end
+
+    it 'creates the TA mapping' do
+      expect(TaMapping.exists?(course_id: course.id, user_id: ta.id)).to be true
+    end
+
+    it 'allows TA to access view_all_scores' do
+      get "/grades/#{assignment.id}/view_all_scores", headers: { 'Authorization' => "Bearer #{ta_token}" }
+      expect(response).to have_http_status(:ok)
+    end
+
+    it 'denies TA from accessing instructor_review' do
+      get "/grades/#{participant.id}/instructor_review", headers: { 'Authorization' => "Bearer #{ta_token}" }
+      expect(response).to have_http_status(:forbidden)
+    end
+
+    it 'denies TA from assigning grades' do
+      patch "/grades/#{participant.id}/assign_grade", 
+            params: { grade_for_submission: 90 },
+            headers: { 'Authorization' => "Bearer #{ta_token}" }
+      expect(response).to have_http_status(:forbidden)
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/requests/api/v1/institution_spec.rb b/spec/requests/api/v1/institution_spec.rb
index 312692754..6a3712c2a 100644
--- a/spec/requests/api/v1/institution_spec.rb
+++ b/spec/requests/api/v1/institution_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 RSpec.describe 'Institutions API', type: :request do
@@ -16,7 +18,7 @@
 
     let(:token) { JsonWebToken.encode({id: prof.id}) }
     let(:Authorization) { "Bearer #{token}" }
-  path '/api/v1/institutions' do
+  path '/institutions' do
     get('list institutions') do
       tags 'Institutions'
       produces 'application/json'
@@ -73,7 +75,7 @@
     end
   end
 
-  path '/api/v1/institutions/{id}' do
+  path '/institutions/{id}' do
     parameter name: 'id', in: :path, type: :integer, description: 'id of the institution'
 
     let(:institution) { Institution.create(name: 'Test institution') }
@@ -94,7 +96,7 @@
       end
     end
 
-    patch('update institution') do
+    put('update institution') do 
       tags 'Institutions'
       consumes 'application/json'
       parameter name: :institution, in: :body, schema: {
@@ -102,10 +104,12 @@
         properties: {
           name: { type: :string }
         },
-        required: [ 'name' ]
+        required: ['name']
       }
-      
+
       response(200, 'successful') do
+        let(:institution) { { name: 'Updated Institution' } }
+        let(:id) { Institution.create(name: 'Old Institution').id }
 
         after do |example|
           example.metadata[:response][:content] = {
@@ -132,7 +136,8 @@
       end
     end
 
-    put('update institution') do 
+
+    patch('update institution') do
       tags 'Institutions'
       consumes 'application/json'
       parameter name: :institution, in: :body, schema: {
@@ -140,10 +145,12 @@
         properties: {
           name: { type: :string }
         },
-        required: [ 'name' ]
+        required: ['name']
       }
 
       response(200, 'successful') do
+        let(:institution) { { name: 'Updated Institution' } }
+        let(:id) { Institution.create(name: 'Old Institution').id }
 
         after do |example|
           example.metadata[:response][:content] = {
@@ -170,9 +177,12 @@
       end
     end
 
+
     delete('delete institution') do
       tags 'Institutions'
+
       response(200, 'successful') do
+        let(:id) { Institution.create(name: 'Institution to delete').id }
 
         after do |example|
           example.metadata[:response][:content] = {
@@ -184,5 +194,6 @@
         run_test!
       end
     end
+
   end
 end
diff --git a/spec/requests/api/v1/join_team_requests_controller_spec.rb b/spec/requests/api/v1/join_team_requests_controller_spec.rb
new file mode 100644
index 000000000..58713fad1
--- /dev/null
+++ b/spec/requests/api/v1/join_team_requests_controller_spec.rb
@@ -0,0 +1,424 @@
+require 'swagger_helper'
+require 'rails_helper'
+require 'json_web_token'
+
+RSpec.describe 'JoinTeamRequests API', type: :request do
+  before(:all) do
+    @roles = create_roles_hierarchy
+  end
+
+  let(:admin) {
+    User.create!(
+      name: "admin_user",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:admin].id,
+      full_name: "Admin User",
+      email: "admin@example.com"
+    )
+  }
+
+  let(:instructor) {
+    User.create!(
+      name: "instructor_user",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:instructor].id,
+      full_name: "Instructor User",
+      email: "instructor@example.com"
+    )
+  }
+
+  let(:student1) {
+    User.create!(
+      name: "student1",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student One",
+      email: "student1@example.com"
+    )
+  }
+
+  let(:student2) {
+    User.create!(
+      name: "student2",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student Two",
+      email: "student2@example.com"
+    )
+  }
+
+  let(:student3) {
+    User.create!(
+      name: "student3",
+      password_digest: BCrypt::Password.create("password"),
+      role_id: @roles[:student].id,
+      full_name: "Student Three",
+      email: "student3@example.com"
+    )
+  }
+
+  let(:assignment) {
+    Assignment.create!(
+      name: 'Test Assignment',
+      instructor_id: instructor.id,
+      has_teams: true,
+      max_team_size: 3
+    )
+  }
+
+  let(:team1) {
+    AssignmentTeam.create!(
+      name: 'Team 1',
+      parent_id: assignment.id,
+      type: 'AssignmentTeam'
+    )
+  }
+
+  let(:participant1) {
+    AssignmentParticipant.create!(
+      user_id: student1.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student1_handle'
+    )
+  }
+
+  let(:participant2) {
+    AssignmentParticipant.create!(
+      user_id: student2.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student2_handle'
+    )
+  }
+
+  let(:participant3) {
+    AssignmentParticipant.create!(
+      user_id: student3.id,
+      parent_id: assignment.id,
+      type: 'AssignmentParticipant',
+      handle: 'student3_handle'
+    )
+  }
+
+  let(:join_team_request) {
+    JoinTeamRequest.create!(
+      participant_id: participant2.id,
+      team_id: team1.id,
+      comments: 'Please let me join your team',
+      reply_status: 'PENDING'
+    )
+  }
+
+  before(:each) do
+    # Add student1 to team1
+    TeamsParticipant.create!(
+      team_id: team1.id,
+      participant_id: participant1.id,
+      user_id: student1.id
+    )
+  end
+
+  describe 'Authorization Tests' do
+    context 'when user is admin' do
+      let(:admin_token) { JsonWebToken.encode({id: admin.id}) }
+      let(:admin_headers) { { 'Authorization' => "Bearer #{admin_token}" } }
+
+      it 'allows admin to view all join team requests' do
+        join_team_request # Create the request
+        get '/api/v1/join_team_requests', headers: admin_headers
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context 'when user is student trying to access index' do
+      let(:student_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:student_headers) { { 'Authorization' => "Bearer #{student_token}" } }
+
+      it 'denies student access to index action' do
+        get '/api/v1/join_team_requests', headers: student_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when student creates a join team request' do
+      let(:student2_token) { JsonWebToken.encode({id: student2.id}) }
+      let(:student2_headers) { { 'Authorization' => "Bearer #{student2_token}" } }
+
+      it 'allows student to create a request' do
+        participant2 # Ensure participant exists
+        post '/api/v1/join_team_requests',
+             params: {
+               team_id: team1.id,
+               assignment_id: assignment.id,
+               comments: 'I want to join'
+             },
+             headers: student2_headers
+        expect(response).to have_http_status(:created)
+      end
+
+      it 'prevents student from joining a full team' do
+        # Fill the team to max capacity
+        assignment.update!(max_team_size: 1)
+        participant2 # Ensure participant exists
+        
+        post '/api/v1/join_team_requests',
+             params: {
+               team_id: team1.id,
+               assignment_id: assignment.id,
+               comments: 'I want to join'
+             },
+             headers: student2_headers
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(JSON.parse(response.body)['message']).to eq('This team is full.')
+      end
+    end
+
+    context 'when viewing a join team request' do
+      let(:creator_token) { JsonWebToken.encode({id: student2.id}) }
+      let(:creator_headers) { { 'Authorization' => "Bearer #{creator_token}" } }
+      
+      let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+      
+      let(:outsider_token) { JsonWebToken.encode({id: student3.id}) }
+      let(:outsider_headers) { { 'Authorization' => "Bearer #{outsider_token}" } }
+
+      it 'allows the request creator to view their own request' do
+        participant2 # Ensure participant exists
+        get "/api/v1/join_team_requests/#{join_team_request.id}", headers: creator_headers
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'allows team members to view requests to their team' do
+        participant1 # Ensure participant exists
+        get "/api/v1/join_team_requests/#{join_team_request.id}", headers: team_member_headers
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'denies access to students not involved in the request' do
+        participant3 # Ensure participant exists
+        get "/api/v1/join_team_requests/#{join_team_request.id}", headers: outsider_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when updating a join team request' do
+      let(:creator_token) { JsonWebToken.encode({id: student2.id}) }
+      let(:creator_headers) { { 'Authorization' => "Bearer #{creator_token}" } }
+      
+      let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+
+      it 'allows the request creator to update their own request' do
+        participant2 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}",
+              params: { join_team_request: { comments: 'Updated comment' } },
+              headers: creator_headers
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'denies team members from updating the request' do
+        participant1 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}",
+              params: { join_team_request: { comments: 'Updated comment' } },
+              headers: team_member_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when deleting a join team request' do
+      let(:creator_token) { JsonWebToken.encode({id: student2.id}) }
+      let(:creator_headers) { { 'Authorization' => "Bearer #{creator_token}" } }
+      
+      let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+
+      it 'allows the request creator to delete their own request' do
+        participant2 # Ensure participant exists
+        delete "/api/v1/join_team_requests/#{join_team_request.id}", headers: creator_headers
+        expect(response).to have_http_status(:ok)
+      end
+
+      it 'denies team members from deleting the request' do
+        participant1 # Ensure participant exists
+        delete "/api/v1/join_team_requests/#{join_team_request.id}", headers: team_member_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when declining a join team request' do
+      let(:creator_token) { JsonWebToken.encode({id: student2.id}) }
+      let(:creator_headers) { { 'Authorization' => "Bearer #{creator_token}" } }
+      
+      let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+      
+      let(:outsider_token) { JsonWebToken.encode({id: student3.id}) }
+      let(:outsider_headers) { { 'Authorization' => "Bearer #{outsider_token}" } }
+
+      it 'allows team members to decline a request' do
+        participant1 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}/decline", headers: team_member_headers
+        expect(response).to have_http_status(:ok)
+        expect(JSON.parse(response.body)['message']).to eq('Join team request declined successfully')
+      end
+
+      it 'denies the request creator from declining their own request' do
+        participant2 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}/decline", headers: creator_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+
+      it 'denies outsiders from declining the request' do
+        participant3 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}/decline", headers: outsider_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+    end
+
+    context 'when accepting a join team request' do
+      let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+      
+      let(:creator_token) { JsonWebToken.encode({id: student2.id}) }
+      let(:creator_headers) { { 'Authorization' => "Bearer #{creator_token}" } }
+
+      it 'allows team members to accept a request' do
+        participant1 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+        expect(response).to have_http_status(:ok)
+        expect(JSON.parse(response.body)['message']).to eq('Join team request accepted successfully')
+        
+        # Verify participant was added to team
+        expect(team1.participants.reload).to include(participant2)
+      end
+
+      it 'denies the request creator from accepting their own request' do
+        participant2 # Ensure participant exists
+        patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: creator_headers
+        expect(response).to have_http_status(:forbidden)
+      end
+
+      it 'prevents accepting when team is full' do
+        # Fill the team to max capacity
+        assignment.update!(max_team_size: 1)
+        participant1 # Ensure participant exists
+        
+        patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(JSON.parse(response.body)['error']).to eq('Team is full')
+      end
+    end
+
+    context 'when filtering join team requests' do
+      let(:student_token) { JsonWebToken.encode({id: student1.id}) }
+      let(:student_headers) { { 'Authorization' => "Bearer #{student_token}" } }
+
+      it 'gets requests for a specific team' do
+        participant2 # Ensure participant exists
+        join_team_request # Create the request
+        
+        get "/api/v1/join_team_requests/for_team/#{team1.id}", headers: student_headers
+        expect(response).to have_http_status(:ok)
+        
+        data = JSON.parse(response.body)
+        expect(data).to be_an(Array)
+        expect(data.length).to be >= 1
+      end
+
+      it 'gets requests by a specific user' do
+        participant2 # Ensure participant exists
+        join_team_request # Create the request
+        
+        get "/api/v1/join_team_requests/by_user/#{student2.id}", headers: student_headers
+        expect(response).to have_http_status(:ok)
+        
+        data = JSON.parse(response.body)
+        expect(data).to be_an(Array)
+      end
+
+      it 'gets only pending requests' do
+        participant2 # Ensure participant exists
+        join_team_request # Create the request
+        
+        get "/api/v1/join_team_requests/pending", headers: student_headers
+        expect(response).to have_http_status(:ok)
+        
+        data = JSON.parse(response.body)
+        expect(data).to be_an(Array)
+        expect(data.all? { |req| req['reply_status'] == 'PENDING' }).to be true
+      end
+    end
+  end
+
+  describe 'Email Notifications on Acceptance' do
+    let(:team_member_token) { JsonWebToken.encode({id: student1.id}) }
+    let(:team_member_headers) { { 'Authorization' => "Bearer #{team_member_token}" } }
+
+    before(:each) do
+      ActiveJob::Base.queue_adapter = :test
+    end
+
+    after(:each) do
+      clear_enqueued_jobs
+    end
+
+    it 'sends acceptance email to requester when join request is accepted' do
+      participant1 # Ensure participant exists
+      participant2 # Ensure participant exists
+      
+      # We use deliver_now (synchronous) so we can't test job enqueueing
+      # Instead, verify the request is accepted and status is updated
+      patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+      
+      expect(response).to have_http_status(:ok)
+      join_team_request.reload
+      expect(join_team_request.reply_status).to eq('ACCEPTED')
+    end
+
+    it 'sends email to correct recipient (requester)' do
+      participant1 # Ensure participant exists
+      participant2 # Ensure participant exists
+      
+      patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+      
+      expect(response).to have_http_status(:ok)
+      # Verify request was accepted (email is sent synchronously)
+      body = JSON.parse(response.body)
+      expect(body['join_team_request']['reply_status']).to eq('ACCEPTED')
+    end
+
+    it 'does not send email if acceptance fails due to full team' do
+      assignment.update!(max_team_size: 1)
+      participant1 # Ensure participant exists
+      participant2 # Ensure participant exists
+      
+      patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+      
+      # Request should fail with unprocessable_entity status
+      expect(response).to have_http_status(:unprocessable_entity)
+      join_team_request.reload
+      expect(join_team_request.reply_status).to eq('PENDING')  # Status should not change
+    end
+
+    it 'updates reply_status to ACCEPTED before sending email' do
+      participant1 # Ensure participant exists
+      participant2 # Ensure participant exists
+      
+      patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+      
+      join_team_request.reload
+      expect(join_team_request.reply_status).to eq('ACCEPTED')
+    end
+
+    it 'adds participant to team before sending email' do
+      participant1 # Ensure participant exists
+      participant2 # Ensure participant exists
+      
+      patch "/api/v1/join_team_requests/#{join_team_request.id}/accept", headers: team_member_headers
+      
+      expect(team1.participants.reload).to include(participant2)
+    end
+  end
+end
diff --git a/spec/requests/api/v1/participants_controller_spec.rb b/spec/requests/api/v1/participants_controller_spec.rb
index f12ef4e20..5b26e377d 100644
--- a/spec/requests/api/v1/participants_controller_spec.rb
+++ b/spec/requests/api/v1/participants_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
@@ -44,7 +46,7 @@
   let(:token) { JsonWebToken.encode({id: studenta.id}) }
   let(:Authorization) { "Bearer #{token}" }
 
-  path '/api/v1/participants/user/{user_id}' do
+  path '/participants/user/{user_id}' do
     get 'Retrieve participants for a specific user' do
       tags 'Participants'
       produces 'application/json'
@@ -93,7 +95,7 @@
     end
   end
 
-  path '/api/v1/participants/assignment/{assignment_id}' do
+  path '/participants/assignment/{assignment_id}' do
     get 'Retrieve participants for a specific assignment' do
       tags 'Participants'
       produces 'application/json'
@@ -133,7 +135,7 @@
     end
   end
 
-  path '/api/v1/participants/{id}' do
+  path '/participants/{id}' do
     get 'Retrieve a specific participant' do
       tags 'Participants'
       produces 'application/json'
@@ -199,7 +201,7 @@
     end
   end
 
-  path '/api/v1/participants/{id}/{authorization}' do
+  path '/participants/{id}/{authorization}' do
     patch 'Update participant authorization' do
       tags 'Participants'
       consumes 'application/json'
@@ -258,7 +260,7 @@
     end
   end
 
-  path '/api/v1/participants/{authorization}' do
+  path '/participants/{authorization}' do
     post 'Add a participant' do
       tags 'Participants'
       consumes 'application/json'
diff --git a/spec/requests/api/v1/questionnaires_spec.rb b/spec/requests/api/v1/questionnaires_controller_spec.rb
similarity index 70%
rename from spec/requests/api/v1/questionnaires_spec.rb
rename to spec/requests/api/v1/questionnaires_controller_spec.rb
index 9aa5dd39c..046efd83e 100644
--- a/spec/requests/api/v1/questionnaires_spec.rb
+++ b/spec/requests/api/v1/questionnaires_controller_spec.rb
@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
 # Rspec test for Questionnaires Controller
-RSpec.describe 'api/v1/questionnaires', type: :request do
+RSpec.describe 'questionnaires', type: :request do
 
   before(:all) do
     @roles = create_roles_hierarchy
   end
 
   let(:prof) {
-    User.create(
+    User.create!(
       name: "profa",
       password_digest: "password",
       role_id: @roles[:instructor].id,
@@ -22,7 +24,7 @@
   let(:token) { JsonWebToken.encode({id: prof.id}) }
   let(:Authorization) { "Bearer #{token}" }
 
-  path '/api/v1/questionnaires' do
+  path '/questionnaires' do
     let(:questionnaire1) do
       instructor
       Questionnaire.create(
@@ -47,7 +49,7 @@
       )
     end
 
-    # get request on /api/v1/questionnaires return list of questionnaires with response 200
+    # get request on /questionnaires return list of questionnaires with response 200
     get('list questionnaires') do
       tags 'Questionnaires'
       produces 'application/json'
@@ -96,7 +98,7 @@
         required: %w[id name questionnaire_type private min_question_score max_question_score instructor_id]
       }
 
-      # post request on /api/v1/questionnaires creates questionnaire with response 201 when correct params are passed
+      # post request on /questionnaires creates questionnaire with response 201 when correct params are passed
       response(201, 'created') do
         let(:questionnaire) do
           prof
@@ -107,7 +109,7 @@
         end
       end
 
-      # post request on /api/v1/questionnaires returns 422 response - unprocessable entity when wrong params is passed to create questionnaire
+      # post request on /questionnaires returns 422 response - unprocessable entity when wrong params is passed to create questionnaire
       response(422, 'unprocessable entity') do
         let(:questionnaire) do
           prof
@@ -119,7 +121,7 @@
 
   end
 
-  path '/api/v1/questionnaires/{id}' do
+  path '/questionnaires/{id}' do
     parameter name: 'id', in: :path, type: :integer
     let(:valid_questionnaire_params) do
       {
@@ -142,7 +144,7 @@
       questionnaire.id
     end
 
-    # Get request on /api/v1/questionnaires/{id} returns the response 200 successful - questionnaire with id = {id} when correct id is passed which is in the database
+    # Get request on /questionnaires/{id} returns the response 200 successful - questionnaire with id = {id} when correct id is passed which is in the database
     get('show questionnaire') do
       tags 'Questionnaires'
       produces 'application/json'
@@ -152,7 +154,7 @@
         end
       end
 
-      # Get request on /api/v1/questionnaires/{id} returns the response 404 not found - questionnaire with id = {id} when correct id is passed which is not present in the database
+      # Get request on /questionnaires/{id} returns the response 404 not found - questionnaire with id = {id} when correct id is passed which is not present in the database
       response(404, 'not_found') do
         let(:id) { 'invalid' }
         run_test! do
@@ -173,7 +175,7 @@
         }
       }
 
-      # put request on /api/v1/questionnaires/{id} returns 200 response successful when questionnaire id is present in the database and correct valid params are passed
+      # put request on /questionnaires/{id} returns 200 response successful when questionnaire id is present in the database and correct valid params are passed
       response(200, 'successful') do
         let(:body_params) do
           {
@@ -185,7 +187,7 @@
         end
       end
 
-      # put request on /api/v1/questionnaires/{id} returns 404 not found when id is not present in the database which questionnaire needs to be updated
+      # put request on /questionnaires/{id} returns 404 not found when id is not present in the database which questionnaire needs to be updated
       response(404, 'not found') do
         let(:id) { 0 }
         let(:body_params) do
@@ -198,7 +200,7 @@
         end
       end
 
-      # put request on /api/v1/questionnaires/{id} returns 422 response unprocessable entity when correct parameters for the questionnaire to be updated are not passed
+      # put request on /questionnaires/{id} returns 422 response unprocessable entity when correct parameters for the questionnaire to be updated are not passed
       response(422, 'unprocessable entity') do
         let(:body_params) do
           {
@@ -224,7 +226,7 @@
         }
       }
 
-      # patch request on /api/v1/questionnaires/{id} returns 200 response successful when questionnaire id is present in the database and correct valid params are passed
+      # patch request on /questionnaires/{id} returns 200 response successful when questionnaire id is present in the database and correct valid params are passed
       response(200, 'successful') do
         let(:body_params) do
           {
@@ -236,7 +238,7 @@
         end
       end
 
-      # patch request on /api/v1/questionnaires/{id} returns 404 not found when id is not present in the database which questionnaire needs to be updated
+      # patch request on /questionnaires/{id} returns 404 not found when id is not present in the database which questionnaire needs to be updated
       response(404, 'not found') do
         let(:id) { 0 }
         let(:body_params) do
@@ -249,7 +251,7 @@
         end
       end
 
-      # patch request on /api/v1/questionnaires/{id} returns 422 response unprocessable entity when correct parameters for the questionnaire to be updated are not passed
+      # patch request on /questionnaires/{id} returns 422 response unprocessable entity when correct parameters for the questionnaire to be updated are not passed
       response(422, 'unprocessable entity') do
         let(:body_params) do
           {
@@ -266,14 +268,14 @@
     delete('delete questionnaire') do
       tags 'Questionnaires'
       produces 'application/json'
-      # delete request on /api/v1/questionnaires/{id} returns 204 successful response when questionnaire with id present in the database is successfully deleted
+      # delete request on /questionnaires/{id} returns 204 successful response when questionnaire with id present in the database is successfully deleted
       response(204, 'successful') do
         run_test! do
           expect(Questionnaire.exists?(id)).to eq(false)
         end
       end
 
-      # delete request on /api/v1/questionnaires/{id} returns 404 not found response when questionnaire id is not present in the database
+      # delete request on /questionnaires/{id} returns 404 not found response when questionnaire id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -283,7 +285,7 @@
     end
   end
 
-  path '/api/v1/questionnaires/toggle_access/{id}' do
+  path '/questionnaires/toggle_access/{id}' do
     parameter name: 'id', in: :path, type: :integer
     let(:valid_questionnaire_params) do
       {
@@ -311,14 +313,14 @@
       tags 'Questionnaires'
       produces 'application/json'
 
-      # get request on /api/v1/questionnaires/toggle_access/{id} returns 200 successful response when correct id is passed and toggles the private variable
+      # get request on /questionnaires/toggle_access/{id} returns 200 successful response when correct id is passed and toggles the private variable
       response(200, 'successful') do
         run_test! do
           expect(response.body).to include(" has been successfully made private. ")
         end
       end
 
-      # get request on /api/v1/questionnaires/toggle_access/{id} returns 404 not found response when questionnaire id is not present in the database
+      # get request on /questionnaires/toggle_access/{id} returns 404 not found response when questionnaire id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -328,9 +330,24 @@
     end
   end
 
-  path '/api/v1/questionnaires/copy/{id}' do
+  path '/questionnaires/copy/{id}' do
     parameter name: 'id', in: :path, type: :integer
-    let(:valid_questionnaire_params) do
+    parameter name: :questionnaire1, in: :body, schema: {
+      type: :object,
+      properties: {
+        name: { type: :string },
+        questionnaire_type: { type: :string },
+        private: { type: :boolean },
+        min_question_score: { type: :integer },
+        max_question_score: { type: :integer },
+        instructor_id: { type: :integer }
+      },
+      required: ['name', 'questionnaire_type', 'instructor_id']
+    }
+    
+    before {prof}
+
+    let!(:valid_questionnaire_params) do
       {
         name: 'Test Questionnaire',
         questionnaire_type: 'AuthorFeedbackReview',
@@ -338,32 +355,31 @@
         min_question_score: 0,
         max_question_score: 5,
         instructor_id: prof.id
-      }
+      }      
     end
 
-    let(:questionnaire) do
-      prof
-      Questionnaire.create(valid_questionnaire_params)
+    let!(:questionnaire1) do
+      Questionnaire.create!(valid_questionnaire_params)
     end
-
-    let(:id) do
-      questionnaire
-      questionnaire.id
+    
+    let!(:id) do
+      questionnaire1.id
     end
-
+        
     post('copy questionnaire') do
       tags 'Questionnaires'
       consumes 'application/json'
       produces 'application/json'
 
-      # post request on /api/v1/questionnaires/copy/{id} returns 200 successful response when request returns copied questionnaire with questionnaire id is present in the database
+      # post request on /questionnaires/copy/{id} returns 200 successful response when request returns copied questionnaire with questionnaire id is present in the database
       response(200, 'successful') do
+        let(:questionnaire) { valid_questionnaire_params }
         run_test! do
           expect(response.body).to include('"name":"Copy of Test Questionnaire"')
         end
       end
 
-      # post request on /api/v1/questionnaires/copy/{id} returns 404 not found response when questionnaire id is not present in the database
+      # post request on /questionnaires/copy/{id} returns 404 not found response when questionnaire id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -372,4 +388,4 @@
       end
     end
   end
-end
+end
\ No newline at end of file
diff --git a/spec/requests/api/v1/questions_spec.rb b/spec/requests/api/v1/questions_spec.rb
index 9680a886b..7137d1e08 100644
--- a/spec/requests/api/v1/questions_spec.rb
+++ b/spec/requests/api/v1/questions_spec.rb
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 # Rspec tests for questions controller
-RSpec.describe 'api/v1/questions', type: :request do
+RSpec.describe 'questions', type: :request do
   before(:all) do
     @roles = create_roles_hierarchy
   end
@@ -29,7 +31,7 @@
 
   let(:token) { JsonWebToken.encode({id: instructor.id}) }
   let(:Authorization) { "Bearer #{token}" }
-  path '/api/v1/questions' do
+  path '/questions' do
     let(:question1) do
       questionnaire
       Item.create(
@@ -54,7 +56,7 @@
       )
     end
 
-    # get request on /api/v1/questions returns 200 successful response when it returns list of questions present in the database
+    # get request on /questions returns 200 successful response when it returns list of questions present in the database
     get('list questions') do
       tags 'Questions'
       produces 'application/json'
@@ -113,7 +115,7 @@
         required: %w[weight questionnaire_id break_before txt question_type]
       }
 
-      # post request on /api/v1/questions returns 201 created response and creates a item with given valid parameters
+      # post request on /questions returns 201 created response and creates a item with given valid parameters
       response(201, 'created') do
         let(:item) { valid_question_params }
         run_test! do
@@ -121,7 +123,7 @@
         end
       end
 
-      # post request on /api/v1/questions returns 404 not found when questionnaire id for the given item is not present in the database
+      # post request on /questions returns 404 not found when questionnaire id for the given item is not present in the database
       response(404, 'questionnaire id not found') do
         let(:item) do
           instructor
@@ -130,7 +132,7 @@
         run_test!
       end
 
-      # post request on /api/v1/questions returns 422 unprocessable entity when incorrect parameters are passed to create a item
+      # post request on /questions returns 422 unprocessable entity when incorrect parameters are passed to create a item
       response(422, 'unprocessable entity') do
         let(:item) { invalid_question_params2 }   # <--- pass invalid params directly to the request
         run_test!
@@ -140,7 +142,7 @@
 
   end
 
-  path '/api/v1/questions/{id}' do
+  path '/questions/{id}' do
 
     parameter name: 'id', in: :path, type: :integer
 
@@ -181,14 +183,14 @@
       tags 'Questions'
       produces 'application/json'
 
-      # get request on /api/v1/questions/{id} returns 200 successful response and returns item with given item id
+      # get request on /questions/{id} returns 200 successful response and returns item with given item id
       response(200, 'successful') do
         run_test! do
           expect(response.body).to include('"txt":"test item 1"')
         end
       end
 
-      # get request on /api/v1/questions/{id} returns 404 not found response when item id is not present in the database
+      # get request on /questions/{id} returns 404 not found response when item id is not present in the database
       response(404, 'not_found') do
         let(:id) { 'invalid' }
           run_test! do
@@ -210,7 +212,7 @@
         }
       }
       
-      # put request on /api/v1/questions/{id} returns 200 successful response and updates parameters of item with given item id
+      # put request on /questions/{id} returns 200 successful response and updates parameters of item with given item id
       response(200, 'successful') do
         let(:body_params) do
           {
@@ -222,7 +224,7 @@
         end
       end
 
-      # put request on /api/v1/questions/{id} returns 404 not found response when item with given id is not present in the database
+      # put request on /questions/{id} returns 404 not found response when item with given id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         let(:body_params) do
@@ -235,7 +237,7 @@
         end
       end
 
-      # put request on /api/v1/questions/{id} returns 422 unprocessable entity when incorrect parameters are passed for item with given item id
+      # put request on /questions/{id} returns 422 unprocessable entity when incorrect parameters are passed for item with given item id
       response(422, 'unprocessable entity') do
         let(:body_params) do
           {
@@ -264,7 +266,7 @@
         }
       }
       
-      # patch request on /api/v1/questions/{id} returns 200 successful response and updates parameters of item with given item id
+      # patch request on /questions/{id} returns 200 successful response and updates parameters of item with given item id
       response(200, 'successful') do
         let(:body_params) do
           {
@@ -276,7 +278,7 @@
         end
       end
 
-      # patch request on /api/v1/questions/{id} returns 404 not found response when item with given id is not present in the database
+      # patch request on /questions/{id} returns 404 not found response when item with given id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         let(:body_params) do
@@ -289,7 +291,7 @@
         end
       end
 
-      # patch request on /api/v1/questions/{id} returns 422 unprocessable entity when incorrect parameters are passed for item with given item id
+      # patch request on /questions/{id} returns 422 unprocessable entity when incorrect parameters are passed for item with given item id
       response(422, 'unprocessable entity') do
         let(:body_params) do
           {
@@ -309,14 +311,14 @@
       tags 'Questions'
       produces 'application/json'
 
-      # delete request on /api/v1/questions/{id} returns 204 successful response when it deletes item with given item id present in the database
+      # delete request on /questions/{id} returns 204 successful response when it deletes item with given item id present in the database
       response(204, 'successful') do
         run_test! do
           expect(Item.exists?(id)).to eq(false)
         end
       end
 
-      # delete request on /api/v1/questions/{id} returns 404 not found response when item with given item id is not present in the database
+      # delete request on /questions/{id} returns 404 not found response when item with given item id is not present in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -327,7 +329,7 @@
 
   end
 
-  path '/api/v1/questions/delete_all/questionnaire/{id}' do
+  path '/questions/delete_all/questionnaire/{id}' do
     parameter name: 'id', in: :path, type: :integer
 
     let(:questionnaire) do
@@ -378,14 +380,14 @@
       tags 'Questions'
       produces 'application/json'
 
-      # delete method on /api/v1/questions/delete_all/questionnaire/{id} returns 200 successful response when all questions with given questionnaire id are deleted
+      # delete method on /questions/delete_all/questionnaire/{id} returns 200 successful response when all questions with given questionnaire id are deleted
       response(200, 'successful') do
         run_test! do
           expect(Item.where(questionnaire_id: id).count).to eq(0)
         end
       end
 
-      # delete request on /api/v1/questions/delete_all/questionnaire/{id} returns 404 not found response when questionnaire id is not found in the database
+      # delete request on /questions/delete_all/questionnaire/{id} returns 404 not found response when questionnaire id is not found in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -395,7 +397,7 @@
     end
   end
 
-  path '/api/v1/questions/show_all/questionnaire/{id}' do
+  path '/questions/show_all/questionnaire/{id}' do
     parameter name: 'id', in: :path, type: :integer
 
     let(:questionnaire) do
@@ -472,7 +474,7 @@
       tags 'Questions'
       produces 'application/json'
 
-      # get method on /api/v1/questions/show_all/questionnaire/{id} returns 200 successful response when all questions with given questionnaire id are shown
+      # get method on /questions/show_all/questionnaire/{id} returns 200 successful response when all questions with given questionnaire id are shown
       response(200, 'successful') do
         run_test! do
           expect(Item.where(questionnaire_id: id).count).to eq(1)
@@ -480,7 +482,7 @@
         end
       end
 
-      # get request on /api/v1/questions/delete_all/questionnaire/{id} returns 404 not found response when questionnaire id is not found in the database
+      # get request on /questions/delete_all/questionnaire/{id} returns 404 not found response when questionnaire id is not found in the database
       response(404, 'not found') do
         let(:id) { 0 }
         run_test! do
@@ -490,7 +492,7 @@
     end
   end
 
-  path '/api/v1/questions/types' do
+  path '/questions/types' do
 
     let(:questionnaire) do
       instructor
@@ -531,7 +533,7 @@
     get('item types') do
       tags 'Questions'
       produces 'application/json'
-      # get request on /api/v1/questions/types returns types of questions present in the database
+      # get request on /questions/types returns types of questions present in the database
       response(200, 'successful') do
         run_test! do
           expect(response.body.size).to eq(2)
diff --git a/spec/requests/api/v1/roles_spec.rb b/spec/requests/api/v1/roles_spec.rb
index 78031a2fc..434de6a41 100644
--- a/spec/requests/api/v1/roles_spec.rb
+++ b/spec/requests/api/v1/roles_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
@@ -20,7 +22,7 @@
   let(:token) { JsonWebToken.encode({id: adm.id}) }
   let(:Authorization) { "Bearer #{token}" }
 
-  path '/api/v1/roles' do
+  path '/roles' do
     get('list roles') do
       tags 'Roles'
       produces 'application/json'
@@ -82,7 +84,7 @@
     end
   end
 
-  path '/api/v1/roles/{id}' do
+  path '/roles/{id}' do
     parameter name: 'id', in: :path, type: :integer, description: 'id of the role'
 
     let(:role) { Role.create(name: 'Test Role') }
diff --git a/spec/requests/api/v1/student_tasks_controller_spec.rb b/spec/requests/api/v1/student_tasks_controller_spec.rb
index cb6961356..481f7b5d1 100644
--- a/spec/requests/api/v1/student_tasks_controller_spec.rb
+++ b/spec/requests/api/v1/student_tasks_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
@@ -30,9 +32,9 @@
   let(:Authorization) { "Bearer #{token}" }
 
   # -------------------------------------------------------------------------
-  # /api/v1/student_tasks/list
+  # /student_tasks/list
   # -------------------------------------------------------------------------
-  path '/api/v1/student_tasks/list' do
+  path '/student_tasks/list' do
     get 'student tasks list' do
       tags 'StudentTasks'
       produces 'application/json'
@@ -95,9 +97,9 @@
   end
 
   # -------------------------------------------------------------------------
-  # /api/v1/student_tasks/view
+  # /student_tasks/view
   # -------------------------------------------------------------------------
-  path '/api/v1/student_tasks/view' do
+  path '/student_tasks/view' do
     get 'Retrieve a specific student task by ID' do
       tags 'StudentTasks'
       produces 'application/json'
diff --git a/spec/requests/api/v1/teams_spec.rb b/spec/requests/api/v1/teams_controller_spec.rb
similarity index 84%
rename from spec/requests/api/v1/teams_spec.rb
rename to spec/requests/api/v1/teams_controller_spec.rb
index 7e7077246..9c4e660d9 100644
--- a/spec/requests/api/v1/teams_spec.rb
+++ b/spec/requests/api/v1/teams_controller_spec.rb
@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'swagger_helper'
 require 'json_web_token'
 
-RSpec.describe Api::V1::TeamsController, type: :request do
+RSpec.describe TeamsController, type: :request do
   before(:all) do
     @roles = create_roles_hierarchy
   end
@@ -79,7 +81,6 @@
     CourseTeam.create!(
       parent_id:      course.id,
       name:           'team 2',
-      user_id:        team_owner.id
     )
   end
   
@@ -87,7 +88,6 @@
     AssignmentTeam.create!(
       parent_id:      assignment.id,
       name:           'team 1',
-      user_id:        team_owner.id
     )
   end
 
@@ -126,49 +126,49 @@
   let(:token) { JsonWebToken.encode(id: instructor.id) }
   let(:auth_headers) { { Authorization: "Bearer #{token}" } }
 
-  describe 'GET /api/v1/teams' do
+  describe 'GET /teams' do
     it 'returns all teams' do
       team_with_course
-      get '/api/v1/teams', headers: auth_headers
+      get '/teams', headers: auth_headers
       expect(response).to have_http_status(:success)
       expect(json_response.size).to eq(1)
       expect(json_response.first['id']).to eq(team_with_course.id)
     end
   end
 
-  describe 'GET /api/v1/teams/:id' do
+  describe 'GET /teams/:id' do
     it 'returns a specific team' do
-      get "/api/v1/teams/#{team_with_course.id}", headers: auth_headers
+      get "/teams/#{team_with_course.id}", headers: auth_headers
       expect(response).to have_http_status(:success)
       expect(json_response['id']).to eq(team_with_course.id)
     end
 
     it 'returns 404 for non-existent team' do
-      get '/api/v1/teams/0', headers: auth_headers
+      get '/teams/0', headers: auth_headers
       expect(response).to have_http_status(:not_found)
     end
   end
 
-  describe 'POST /api/v1/teams' do
+  describe 'POST /teams' do
     it 'returns error for invalid params' do
-      post '/api/v1/teams', params: { team: { name: '' } }, headers: auth_headers
+      post '/teams', params: { team: { name: '' } }, headers: auth_headers
       expect(response).to have_http_status(:unprocessable_entity)
       expect(json_response).to have_key('errors')
     end
   end
 
   describe 'Team Members' do
-    describe 'GET /api/v1/teams/:id/members' do
+    describe 'GET /teams/:id/members' do
       it 'returns all team members' do
         teams_participant_course
-        get "/api/v1/teams/#{team_with_course.id}/members", headers: auth_headers
+        get "/teams/#{team_with_course.id}/members", headers: auth_headers
         expect(response).to have_http_status(:success)
         expect(json_response.size).to eq(1)
         expect(json_response.first['id']).to eq(other_user.id)
       end
     end
 
-    describe 'POST /api/v1/teams/:id/members' do
+    describe 'POST /teams/:id/members' do
       let(:new_user) { create(:user) }
       let!(:new_participant) { create(:course_participant, user: new_user, parent_id: course.id) }
 
@@ -182,7 +182,7 @@
 
       it 'adds a new team member' do
         expect {
-          post "/api/v1/teams/#{team_with_course.id}/members", params: valid_participant_params, headers: auth_headers
+          post "/teams/#{team_with_course.id}/members", params: valid_participant_params, headers: auth_headers
         }.to change(TeamsParticipant, :count).by(1)
         expect(response).to have_http_status(:created)
         expect(json_response['id']).to eq(new_user.id)
@@ -202,23 +202,23 @@
           }
         }
         
-        post "/api/v1/teams/#{team_with_assignment.id}/members", params: assignment_params, headers: auth_headers
+        post "/teams/#{team_with_assignment.id}/members", params: assignment_params, headers: auth_headers
         expect(response).to have_http_status(:unprocessable_entity)
         expect(json_response).to have_key('errors')
       end
     end
 
-    describe 'DELETE /api/v1/teams/:id/members/:user_id' do
+    describe 'DELETE /teams/:id/members/:user_id' do
       it 'removes a team member' do
         teams_participant_course
         expect {
-          delete "/api/v1/teams/#{team_with_course.id}/members/#{other_user.id}", headers: auth_headers
+          delete "/teams/#{team_with_course.id}/members/#{other_user.id}", headers: auth_headers
         }.to change(TeamsParticipant, :count).by(-1)
         expect(response).to have_http_status(:no_content)
       end
 
       it 'returns 404 for non-existent member' do
-        delete "/api/v1/teams/#{team_with_course.id}/members/0", headers: auth_headers
+        delete "/teams/#{team_with_course.id}/members/0", headers: auth_headers
         expect(response).to have_http_status(:not_found)
       end
     end
diff --git a/spec/requests/api/v1/teams_participants_controller_spec.rb b/spec/requests/api/v1/teams_participants_controller_spec.rb
index e796f95a4..2b973f3a3 100644
--- a/spec/requests/api/v1/teams_participants_controller_spec.rb
+++ b/spec/requests/api/v1/teams_participants_controller_spec.rb
@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
-RSpec.describe 'api/v1/teams_participants', type: :request do
+RSpec.describe 'teams_participants', type: :request do
   # --------------------------------------------------------------------------
   # Global Setup
   # --------------------------------------------------------------------------
@@ -89,14 +91,12 @@
     AssignmentTeam.create!(
       parent_id:      assignment.id,
       name:           'team 1',
-      user_id:        team_owner.id
     )
   end
   let(:team_with_course) do
     CourseTeam.create!(
       parent_id:      course.id,
       name:           'team 2',
-      user_id:        team_owner.id
     )
   end
 
@@ -142,7 +142,7 @@
   ##########################################################################
   # update_duty Endpoint Tests
   ##########################################################################
-  path '/api/v1/teams_participants/update_duty' do
+  path '/teams_participants/update_duty' do
     put('update participant duty') do
       tags 'Teams Participants'
       consumes 'application/json'
@@ -234,7 +234,7 @@
   ##########################################################################
   # list_participants Endpoint Tests
   ##########################################################################
-  path '/api/v1/teams_participants/{id}/list_participants' do
+  path '/teams_participants/{id}/list_participants' do
     get('list participants') do
       tags 'Teams Participants'
       produces 'application/json'
@@ -279,7 +279,7 @@
   ##########################################################################
   # add_participant Endpoint Tests
   ##########################################################################
-  path '/api/v1/teams_participants/{id}/add_participant' do
+  path '/teams_participants/{id}/add_participant' do
     post('add participant') do
       tags 'Teams Participants'
       consumes 'application/json'
@@ -337,7 +337,7 @@
   ##########################################################################
   # delete_participants Endpoint Tests
   ##########################################################################
-  path '/api/v1/teams_participants/{id}/delete_participants' do
+  path '/teams_participants/{id}/delete_participants' do
     delete('delete participants') do
       tags 'Teams Participants'
       consumes 'application/json'
@@ -354,7 +354,6 @@
         AssignmentTeam.create!(
           parent_id:      assignment.id,
           name:           'team 1',
-          user_id:        team_owner.id
         )
       end
       let(:assignment_participant1) { AssignmentParticipant.create!(parent_id: assignment.id, user: student_user, handle: student_user.name) }
@@ -367,7 +366,6 @@
         CourseTeam.create!(
           parent_id:      course.id,
           name:           'team 2',
-          user_id:        team_owner.id
         )
       end
       let(:course_participant1) { CourseParticipant.create!(parent_id: course.id, user: student_user, handle: student_user.name) }
diff --git a/spec/requests/authentication_spec.rb b/spec/requests/authentication_spec.rb
index ff06e9b64..7441c7799 100644
--- a/spec/requests/authentication_spec.rb
+++ b/spec/requests/authentication_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'swagger_helper'
 require 'json_web_token'
 
diff --git a/spec/routing/courses_routing_spec.rb b/spec/routing/courses_routing_spec.rb
index 75dd7ba81..bdc1022c9 100644
--- a/spec/routing/courses_routing_spec.rb
+++ b/spec/routing/courses_routing_spec.rb
@@ -1,29 +1,31 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
-RSpec.describe Api::V1::CoursesController, type: :routing do
+RSpec.describe CoursesController, type: :routing do
   describe "routing" do
     it "routes to #index" do
-      expect(get: "/api/v1/courses").to route_to("api/v1/courses#index")
+      expect(get: "/courses").to route_to("courses#index")
     end
 
     it "routes to #show" do
-      expect(get: "/api/v1/courses/1").to route_to("api/v1/courses#show", id: "1")
+      expect(get: "/courses/1").to route_to("courses#show", id: "1")
     end
 
     it "routes to #create" do
-      expect(post: "/api/v1/courses").to route_to("api/v1/courses#create")
+      expect(post: "/courses").to route_to("courses#create")
     end
 
     it "routes to #update via PUT" do
-      expect(put: "/api/v1/courses/1").to route_to("api/v1/courses#update", id: "1")
+      expect(put: "/courses/1").to route_to("courses#update", id: "1")
     end
 
     it "routes to #update via PATCH" do
-      expect(patch: "/api/v1/courses/1").to route_to("api/v1/courses#update", id: "1")
+      expect(patch: "/courses/1").to route_to("courses#update", id: "1")
     end
 
     it "routes to #destroy" do
-      expect(delete: "/api/v1/courses/1").to route_to("api/v1/courses#destroy", id: "1")
+      expect(delete: "/courses/1").to route_to("courses#destroy", id: "1")
     end
   end
 end
\ No newline at end of file
diff --git a/spec/routing/join_team_requests_routing_spec.rb b/spec/routing/join_team_requests_routing_spec.rb
index 6175eb20f..cdc6f311e 100644
--- a/spec/routing/join_team_requests_routing_spec.rb
+++ b/spec/routing/join_team_requests_routing_spec.rb
@@ -1,29 +1,31 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
-RSpec.describe Api::V1::JoinTeamRequestsController, type: :routing do
+RSpec.describe JoinTeamRequestsController, type: :routing do
   describe "routing" do
     it "routes to #index" do
-      expect(get: "/api/v1/join_team_requests").to route_to("api/v1/join_team_requests#index")
+      expect(get: "/join_team_requests").to route_to("join_team_requests#index")
     end
 
     it "routes to #show" do
-      expect(get: "/api/v1/join_team_requests/1").to route_to("api/v1/join_team_requests#show", id: "1")
+      expect(get: "/join_team_requests/1").to route_to("join_team_requests#show", id: "1")
     end
 
     it "routes to #create" do
-      expect(post: "/api/v1/join_team_requests").to route_to("api/v1/join_team_requests#create")
+      expect(post: "/join_team_requests").to route_to("join_team_requests#create")
     end
 
     it "routes to #update via PUT" do
-      expect(put: "/api/v1/join_team_requests/1").to route_to("api/v1/join_team_requests#update", id: "1")
+      expect(put: "/join_team_requests/1").to route_to("join_team_requests#update", id: "1")
     end
 
     it "routes to #update via PATCH" do
-      expect(patch: "/api/v1/join_team_requests/1").to route_to("api/v1/join_team_requests#update", id: "1")
+      expect(patch: "/join_team_requests/1").to route_to("join_team_requests#update", id: "1")
     end
 
     it "routes to #destroy" do
-      expect(delete: "/api/v1/join_team_requests/1").to route_to("api/v1/join_team_requests#destroy", id: "1")
+      expect(delete: "/join_team_requests/1").to route_to("join_team_requests#destroy", id: "1")
     end
   end
 end
\ No newline at end of file
diff --git a/spec/routing/sign_up_topics_routing_spec.rb b/spec/routing/sign_up_topics_routing_spec.rb
index bf7cfa236..ad3ade057 100644
--- a/spec/routing/sign_up_topics_routing_spec.rb
+++ b/spec/routing/sign_up_topics_routing_spec.rb
@@ -1,29 +1,31 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
-RSpec.describe Api::V1::SignUpTopicsController, type: :routing do
+RSpec.describe SignUpTopicsController, type: :routing do
   describe "routing" do
     it "routes to #index" do
-      expect(get: "/api/v1/sign_up_topics").to route_to("api/v1/sign_up_topics#index")
+      expect(get: "/sign_up_topics").to route_to("sign_up_topics#index")
     end
 
     it "routes to #show" do
-      expect(get: "/api/v1/sign_up_topics/1").to route_to("api/v1/sign_up_topics#show", id: "1")
+      expect(get: "/sign_up_topics/1").to route_to("sign_up_topics#show", id: "1")
     end
 
     it "routes to #create" do
-      expect(post: "/api/v1/sign_up_topics").to route_to("api/v1/sign_up_topics#create")
+      expect(post: "/sign_up_topics").to route_to("sign_up_topics#create")
     end
 
     it "routes to #update via PUT" do
-      expect(put: "/api/v1/sign_up_topics/1").to route_to("api/v1/sign_up_topics#update", id: "1")
+      expect(put: "/sign_up_topics/1").to route_to("sign_up_topics#update", id: "1")
     end
 
     it "routes to #update via PATCH" do
-      expect(patch: "/api/v1/sign_up_topics/1").to route_to("api/v1/sign_up_topics#update", id: "1")
+      expect(patch: "/sign_up_topics/1").to route_to("sign_up_topics#update", id: "1")
     end
 
     it "routes to #destroy" do
-      expect(delete: "/api/v1/sign_up_topics/1").to route_to("api/v1/sign_up_topics#destroy", id: "1")
+      expect(delete: "/sign_up_topics/1").to route_to("sign_up_topics#destroy", id: "1")
     end
   end
 end
\ No newline at end of file
diff --git a/spec/routing/signed_up_teams_routing_spec.rb b/spec/routing/signed_up_teams_routing_spec.rb
index 96f84f447..bbc373e66 100644
--- a/spec/routing/signed_up_teams_routing_spec.rb
+++ b/spec/routing/signed_up_teams_routing_spec.rb
@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 # spec/routing/signed_up_teams_routing_spec.rb
 require "rails_helper"
 
-RSpec.describe Api::V1::SignedUpTeamsController, type: :routing do
+RSpec.describe SignedUpTeamsController, type: :routing do
   describe "routing" do
     it "routes to #index" do
-      expect(get: "/api/v1/signed_up_teams").to route_to("api/v1/signed_up_teams#index")
+      expect(get: "/signed_up_teams").to route_to("signed_up_teams#index")
     end
 
     it "routes to #show" do
-      expect(get: "/api/v1/signed_up_teams/1").to route_to("api/v1/signed_up_teams#show", id: "1")
+      expect(get: "/signed_up_teams/1").to route_to("signed_up_teams#show", id: "1")
     end
   end
 end
@@ -16,14 +18,14 @@
 # spec/routing/student_tasks_routing_spec.rb
 require "rails_helper"
 
-RSpec.describe Api::V1::StudentTasksController, type: :routing do
+RSpec.describe StudentTasksController, type: :routing do
   describe "routing" do
     it "routes to #index" do
-      expect(get: "/api/v1/student_tasks").to route_to("api/v1/student_tasks#index")
+      expect(get: "/student_tasks").to route_to("student_tasks#index")
     end
 
     it "routes to #show" do
-      expect(get: "/api/v1/student_tasks/1").to route_to("api/v1/student_tasks#show", id: "1")
+      expect(get: "/student_tasks/1").to route_to("student_tasks#show", id: "1")
     end
   end
 end
\ No newline at end of file
diff --git a/spec/routing/student_tasks_routing_spec.rb b/spec/routing/student_tasks_routing_spec.rb
index 02f457e80..1e34d93cb 100644
--- a/spec/routing/student_tasks_routing_spec.rb
+++ b/spec/routing/student_tasks_routing_spec.rb
@@ -1,29 +1,31 @@
+# frozen_string_literal: true
+
 require "rails_helper"
 
-RSpec.describe Api::V1::StudentTasksController, type: :routing do
+RSpec.describe StudentTasksController, type: :routing do
   describe "routing" do
     it "routes to #index" do
-      expect(get: "/api/v1/student_tasks").to route_to("api/v1/student_tasks#index")
+      expect(get: "/student_tasks").to route_to("student_tasks#index")
     end
 
     it "routes to #show" do
-      expect(get: "/api/v1/student_tasks/1").to route_to("api/v1/student_tasks#show", id: "1")
+      expect(get: "/student_tasks/1").to route_to("student_tasks#show", id: "1")
     end
 
     it "routes to #create" do
-      expect(post: "/api/v1/student_tasks").to route_to("api/v1/student_tasks#create")
+      expect(post: "/student_tasks").to route_to("student_tasks#create")
     end
 
     it "routes to #update via PUT" do
-      expect(put: "/api/v1/student_tasks/1").to route_to("api/v1/student_tasks#update", id: "1")
+      expect(put: "/student_tasks/1").to route_to("student_tasks#update", id: "1")
     end
 
     it "routes to #update via PATCH" do
-      expect(patch: "/api/v1/student_tasks/1").to route_to("api/v1/student_tasks#update", id: "1")
+      expect(patch: "/student_tasks/1").to route_to("student_tasks#update", id: "1")
     end
 
     it "routes to #destroy" do
-      expect(delete: "/api/v1/student_tasks/1").to route_to("api/v1/student_tasks#destroy", id: "1")
+      expect(delete: "/student_tasks/1").to route_to("student_tasks#destroy", id: "1")
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3e57d0007..bf34384d8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by the `rails generate rspec:install` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause
@@ -16,14 +18,17 @@
 require 'simplecov'
 require 'coveralls'
 require "simplecov_json_formatter"
-Coveralls.wear! 'rails'
+# Coveralls.wear! 'rails'
 SimpleCov.formatter = SimpleCov::Formatter::JSONFormatter
 # SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
 #                                                                  SimpleCov::Formatter::HTMLFormatter,
 #                                                                  Coveralls::SimpleCov::Formatter
 #                                                                ])
 
-SimpleCov.start 'rails'
+if !ENV['COVERAGE_STARTED']
+  SimpleCov.start 'rails'
+  ENV['COVERAGE_STARTED'] = 'true'
+end
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
diff --git a/spec/support/factory_bot.rb b/spec/support/factory_bot.rb
index 195f20aad..87d82aca7 100644
--- a/spec/support/factory_bot.rb
+++ b/spec/support/factory_bot.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
 end
\ No newline at end of file
diff --git a/spec/support/roles_helper.rb b/spec/support/roles_helper.rb
index 313a00680..d010668f1 100644
--- a/spec/support/roles_helper.rb
+++ b/spec/support/roles_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RolesHelper
   def create_roles_hierarchy
     # Ensure roles exist without duplication
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
index 54879bf02..02ac7e411 100644
--- a/spec/swagger_helper.rb
+++ b/spec/swagger_helper.rb
@@ -41,7 +41,7 @@
           url: 'http://{defaultHost}',
           variables: {
             defaultHost: {
-              default: 'localhost:3002'
+              default: '152.7.176.23:3002'
             }
           }
         }
diff --git a/swagger/v1/swagger.yaml b/swagger/v1/swagger.yaml
index de8081625..1837f420c 100644
--- a/swagger/v1/swagger.yaml
+++ b/swagger/v1/swagger.yaml
@@ -12,7 +12,7 @@ components:
 security:
 - bearerAuth: []
 paths:
-  "/api/v1/account_requests/pending":
+  "/account_requests/pending":
     get:
       summary: List all Pending Account Requests
       tags:
@@ -20,7 +20,7 @@ paths:
       responses:
         '200':
           description: List Pending Account Requests
-  "/api/v1/account_requests/processed":
+  "/account_requests/processed":
     get:
       summary: List all Processed Account Requests
       tags:
@@ -28,7 +28,7 @@ paths:
       responses:
         '200':
           description: List Processed Account Requests
-  "/api/v1/account_requests":
+  "/account_requests":
     post:
       summary: Create Account Request
       tags:
@@ -66,7 +66,7 @@ paths:
               - introduction
               - role_id
               - institution_id
-  "/api/v1/account_requests/{id}":
+  "/account_requests/{id}":
     parameters:
     - name: id
       in: path
@@ -130,7 +130,7 @@ paths:
       responses:
         '204':
           description: successful
-  "/api/v1/bookmarks":
+  "/bookmarks":
     get:
       summary: list bookmarks
       tags:
@@ -170,7 +170,7 @@ paths:
               - description
               - topic_id
               - rating
-  "/api/v1/bookmarks/{id}":
+  "/bookmarks/{id}":
     parameters:
     - name: id
       in: path
@@ -219,7 +219,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/bookmarks/{id}/bookmarkratings":
+  "/bookmarks/{id}/bookmarkratings":
     parameters:
     - name: id
       in: path
@@ -253,7 +253,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/courses/{id}/add_ta/{ta_id}":
+  "/courses/{id}/add_ta/{ta_id}":
     parameters:
     - name: id
       in: path
@@ -272,7 +272,7 @@ paths:
       responses:
         '201':
           description: successful
-  "/api/v1/courses/{id}/tas":
+  "/courses/{id}/tas":
     parameters:
     - name: id
       in: path
@@ -287,7 +287,7 @@ paths:
       responses:
         '200':
           description: successful
-  "/api/v1/courses/{id}/remove_ta/{ta_id}":
+  "/courses/{id}/remove_ta/{ta_id}":
     parameters:
     - name: id
       in: path
@@ -308,7 +308,7 @@ paths:
       responses:
         '200':
           description: successful
-  "/api/v1/courses/{id}/copy":
+  "/courses/{id}/copy":
     parameters:
     - name: id
       in: path
@@ -323,7 +323,7 @@ paths:
       responses:
         '200':
           description: successful
-  "/api/v1/courses":
+  "/courses":
     get:
       summary: list courses
       tags:
@@ -360,7 +360,7 @@ paths:
               - directory_path
               - institution_id
               - instructor_id
-  "/api/v1/courses/{id}":
+  "/courses/{id}":
     parameters:
     - name: id
       in: path
@@ -432,7 +432,7 @@ paths:
       responses:
         '204':
           description: successful
-  "/api/v1/institutions":
+  "/institutions":
     get:
       summary: list institutions
       tags:
@@ -460,7 +460,7 @@ paths:
                   type: string
               required:
               - name
-  "/api/v1/institutions/{id}":
+  "/institutions/{id}":
     parameters:
     - name: id
       in: path
@@ -522,7 +522,7 @@ paths:
       responses:
         '200':
           description: successful
-  "/api/v1/invitations":
+  "/invitations":
     get:
       summary: list invitations
       tags:
@@ -558,7 +558,7 @@ paths:
               - assignment_id
               - from_id
               - to_id
-  "/api/v1/invitations/{id}":
+  "/invitations/{id}":
     parameters:
     - name: id
       in: path
@@ -605,7 +605,7 @@ paths:
           description: Delete successful
         '404':
           description: Not found
-  "/api/v1/invitations/user/{user_id}/assignment/{assignment_id}":
+  "/invitations/user/{user_id}/assignment/{assignment_id}":
     parameters:
     - name: user_id
       in: path
@@ -628,7 +628,7 @@ paths:
           description: Show all invitations for the user for an assignment
         '404':
           description: Not found
-  "/api/v1/questionnaires":
+  "/questionnaires":
     get:
       summary: list questionnaires
       tags:
@@ -672,7 +672,7 @@ paths:
               - min_question_score
               - max_question_score
               - instructor_id
-  "/api/v1/questionnaires/{id}":
+  "/questionnaires/{id}":
     parameters:
     - name: id
       in: path
@@ -745,7 +745,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/questionnaires/toggle_access/{id}":
+  "/questionnaires/toggle_access/{id}":
     parameters:
     - name: id
       in: path
@@ -761,7 +761,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/questionnaires/copy/{id}":
+  "/questionnaires/copy/{id}":
     parameters:
     - name: id
       in: path
@@ -777,7 +777,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/questions":
+  "/questions":
     get:
       summary: list questions
       tags:
@@ -819,7 +819,7 @@ paths:
               - break_before
               - txt
               - question_type
-  "/api/v1/questions/{id}":
+  "/questions/{id}":
     parameters:
     - name: id
       in: path
@@ -896,7 +896,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/questions/delete_all/questionnaire/{id}":
+  "/questions/delete_all/questionnaire/{id}":
     parameters:
     - name: id
       in: path
@@ -912,7 +912,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/questions/show_all/questionnaire/{id}":
+  "/questions/show_all/questionnaire/{id}":
     parameters:
     - name: id
       in: path
@@ -928,7 +928,7 @@ paths:
           description: successful
         '404':
           description: not found
-  "/api/v1/questions/types":
+  "/questions/types":
     get:
       summary: item types
       tags:
@@ -936,7 +936,7 @@ paths:
       responses:
         '200':
           description: successful
-  "/api/v1/roles":
+  "/roles":
     get:
       summary: list roles
       tags:
@@ -968,7 +968,7 @@ paths:
                   type: integer
               required:
               - name
-  "/api/v1/roles/{id}":
+  "/roles/{id}":
     parameters:
     - name: id
       in: path
@@ -1038,7 +1038,7 @@ paths:
       responses:
         '204':
           description: successful
-  "/api/v1/sign_up_topics":
+  "/sign_up_topics":
     get:
       summary: Get sign-up topics
       parameters:
@@ -1114,7 +1114,7 @@ paths:
               - category
               - assignment_id
               - micropayment
-  "/api/v1/sign_up_topics/{id}":
+  "/sign_up_topics/{id}":
     parameters:
     - name: id
       in: path
@@ -1153,7 +1153,7 @@ paths:
               - topic_name
               - category
               - assignment_id
-  "/api/v1/signed_up_teams/sign_up":
+  "/signed_up_teams/sign_up":
     post:
       summary: Creates a signed up team
       tags:
@@ -1177,7 +1177,7 @@ paths:
               required:
               - team_id
               - topic_id
-  "/api/v1/signed_up_teams/sign_up_student":
+  "/signed_up_teams/sign_up_student":
     parameters:
     - name: user_id
       in: query
@@ -1205,7 +1205,7 @@ paths:
                   type: integer
               required:
               - topic_id
-  "/api/v1/signed_up_teams":
+  "/signed_up_teams":
     parameters:
     - name: topic_id
       in: query
@@ -1243,7 +1243,7 @@ paths:
                 - preference_priority_number
         '404':
           description: signed up teams not found
-  "/api/v1/signed_up_teams/{id}":
+  "/signed_up_teams/{id}":
     parameters:
     - name: id
       in: path
@@ -1303,7 +1303,7 @@ paths:
               required:
               - user_name
               - password
-  /api/v1/student_tasks/list:
+  /student_tasks/list:
       get:
         summary: List all Student Tasks
         tags:
@@ -1311,7 +1311,7 @@ paths:
         responses:
           '200':
             description: An array of student tasks
-  /api/v1/student_tasks/view:
+  /student_tasks/view:
     get:
       summary: View a student task
       tags:
@@ -1335,4 +1335,4 @@ servers:
 - url: http://{defaultHost}
   variables:
     defaultHost:
-      default: localhost:3002
+      default: 152.7.176.23:3002
diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb
index d05dbd24c..c2938056f 100644
--- a/test/channels/application_cable/connection_test.rb
+++ b/test/channels/application_cable/connection_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase
diff --git a/test/controllers/assignments_controller_test.rb b/test/controllers/assignments_controller_test.rb
index 794c2c921..05b9a7348 100644
--- a/test/controllers/assignments_controller_test.rb
+++ b/test/controllers/assignments_controller_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AssignmentsControllerTest < ActionDispatch::IntegrationTest
diff --git a/test/controllers/roles_controller_test.rb b/test/controllers/roles_controller_test.rb
index 06b109559..76307722a 100644
--- a/test/controllers/roles_controller_test.rb
+++ b/test/controllers/roles_controller_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class RolesControllerTest < ActionDispatch::IntegrationTest
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 6c3da770c..1028f8904 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UsersControllerTest < ActionDispatch::IntegrationTest
diff --git a/test/models/assignment_test.rb b/test/models/assignment_test.rb
index 350ff82ca..720e61892 100644
--- a/test/models/assignment_test.rb
+++ b/test/models/assignment_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AssignmentTest < ActiveSupport::TestCase
diff --git a/test/models/role_test.rb b/test/models/role_test.rb
index 4507a91a8..5aa2714ee 100644
--- a/test/models/role_test.rb
+++ b/test/models/role_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class RoleTest < ActiveSupport::TestCase
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 82f61e010..5cc44ed29 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class UserTest < ActiveSupport::TestCase
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d5300f88c..8aad66366 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ENV['RAILS_ENV'] ||= 'test'
 require_relative '../config/environment'
 require 'rails/test_help'