Merge branch 'new/course-flow' into courseflow

Author: DudeUnleashed

.ci-setup/texlive-install.sh

@@ -28,7 +28,7 @@ if ! command -v "$TEX_COMPILER" > /dev/null; then
 
   echo "----------------------------------------"
   echo "Installing additional texlive packages:"
-  tlmgr install fontawesome minted fvextra catchfile xstring framed lastpage tcolorbox environ pdfcol tikzfill markdown paralist csvsimple upquote tagpdf
+  tlmgr install fontawesome luatextra luacode minted fvextra catchfile xstring framed lastpage pdfmanagement-testphase newpax tcolorbox environ pdfcol tikzfill markdown paralist csvsimple gobble upquote tagpdf
 
   echo "----------------------------------------"
   echo "Ensuring the newpax package is sufficiently up to date:"

.rubocop.yml

@@ -9,6 +9,12 @@ AllCops:
   TargetRubyVersion: 3.1
   NewCops: disable
 
+require:
+  - rubocop-rails
+  # - rubocop-performance
+  # - rubocop-minitest
+  # - rubocop-factory_bot
+
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
 

CHANGELOG.md

@@ -22,7 +22,10 @@ group :development, :test do
   gem 'listen'
   gem 'rails_best_practices'
   gem 'rubocop'
+  gem 'rubocop-factory_bot'
   gem 'rubocop-faker'
+  gem 'rubocop-minitest'
+  gem 'rubocop-performance'
   gem 'rubocop-rails'
   gem 'ruby-lsp'
   gem 'simplecov', require: false

Gemfile

@@ -149,7 +149,7 @@ GEM
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
     e2mmap (0.1.0)
-    erubi (1.12.0)
+    erubi (1.13.0)
     erubis (2.7.0)
     et-orbi (1.2.11)
       tzinfo
@@ -162,7 +162,7 @@ GEM
       railties (>= 5.0.0)
     faker (3.4.1)
       i18n (>= 1.8.11, < 2)
-    faraday (2.9.1)
+    faraday (2.9.2)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
@@ -183,13 +183,12 @@ GEM
       raabro (~> 1.4)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    grape (2.0.0)
-      activesupport (>= 5)
-      builder
+    grape (2.1.0)
+      activesupport (>= 6)
       dry-types (>= 1.1)
-      mustermann-grape (~> 1.0.0)
-      rack (>= 1.3.0)
-      rack-accept
+      mustermann-grape (~> 1.1.0)
+      rack (>= 2)
+      zeitwerk
     grape-entity (1.0.1)
       activesupport (>= 3.0.0)
       multi_json (>= 1.3.2)
@@ -210,7 +209,7 @@ GEM
       ice_cube (~> 0.16)
     ice_cube (0.16.4)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jaro_winkler (1.6.0)
@@ -243,7 +242,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0604)
     mini_mime (1.1.5)
-    minitest (5.23.1)
+    minitest (5.24.0)
     minitest-around (0.5.0)
       minitest (~> 5.0)
     minitest-rails (7.1.0)
@@ -255,13 +254,13 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    mustermann-grape (1.0.2)
+    mustermann-grape (1.1.0)
       mustermann (>= 1.0.0)
     mutex_m (0.2.0)
     mysql2 (0.5.6)
     net-http (0.4.1)
       uri
-    net-imap (0.4.12)
+    net-imap (0.4.13)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -273,7 +272,9 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.3)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.6-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     nokogiri (1.16.5-arm-linux)
       racc (~> 1.4)
@@ -288,7 +289,7 @@ GEM
     observer (0.1.2)
     orm_adapter (0.5.0)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pdf-reader (2.12.0)
@@ -301,14 +302,12 @@ GEM
     prism (0.29.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (5.1.1)
     puma (6.4.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.0)
-    rack (3.0.11)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
+    rack (3.1.3)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-session (2.0.0)
@@ -371,7 +370,7 @@ GEM
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     require_all (3.0.0)
     responders (3.1.1)
@@ -384,7 +383,7 @@ GEM
       netrc (~> 0.8)
     reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.9)
+    rexml (3.3.0)
       strscan
     rmagick (6.0.1)
       observer (~> 0.1)
@@ -396,7 +395,7 @@ GEM
       nokogiri
       roo (>= 2.0.0, < 3)
       spreadsheet (> 0.9.0)
-    rouge (4.2.1)
+    rouge (4.3.0)
     rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -410,9 +409,17 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-faker (1.1.0)
       faker (>= 2.12.0)
       rubocop (>= 0.82.0)
+    rubocop-minitest (0.35.0)
+      rubocop (>= 1.61, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
@@ -465,7 +472,7 @@ GEM
       thor (~> 1.0)
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
-    sorbet-runtime (0.5.11422)
+    sorbet-runtime (0.5.11435)
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
@@ -479,7 +486,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     tca_client (1.0.4)
       typhoeus (~> 1.0, >= 1.0.1)
@@ -506,7 +513,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.36)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   aarch64-linux-gnu
@@ -522,6 +529,7 @@ PLATFORMS
   x86_64-linux
   x86_64-linux-gnu
   x86_64-linux-musl
+  aarch64-linux
 
 DEPENDENCIES
   better_errors
@@ -565,7 +573,10 @@ DEPENDENCIES
   roo (~> 2.7.0)
   roo-xls
   rubocop
+  rubocop-factory_bot
   rubocop-faker
+  rubocop-minitest
+  rubocop-performance
   rubocop-rails
   ruby-filemagic
   ruby-lsp

Gemfile.lock

@@ -33,8 +33,13 @@ class ApiRoot < Grape::API
     when ActionController::ParameterMissing
       message = "Missing value for #{e.param}"
       status = 400
+    when ActiveRecord::ConnectionTimeoutError
+      message = 'There is currently high load on the system. Please wait a moment and try again.'
+      status = 503
     else
+      # rubocop:disable Rails/Output
       puts e.inspect unless Rails.env.production?
+      # rubocop:enable Rails/Output
 
       logger.error "Unhandled exception: #{e.class}"
       logger.error e.inspect

app/api/api_root.rb

@@ -102,7 +102,7 @@ class AuthenticationApi < Grape::API
       # Lookup using email otherwise and set login_id
       # Otherwise create new
       user = User.find_by(login_id: login_id) ||
-             User.find_by_username(email[/(.*)@/, 1]) ||
+             User.find_by(username: email[/(.*)@/, 1]) ||
              User.find_by(email: email) ||
              User.find_or_create_by(login_id: login_id) do |new_user|
                role_response = attributes.fetch(/role/) || attributes.fetch(/userRole/)
@@ -177,7 +177,7 @@ class AuthenticationApi < Grape::API
       # Lookup using email otherwise and set login_id
       # Otherwise create new
       user = User.find_by(login_id: login_id) ||
-             User.find_by_username(email[/(.*)@/, 1]) ||
+             User.find_by(username: email[/(.*)@/, 1]) ||
              User.find_by(email: email) ||
              User.find_or_create_by(login_id: login_id) do |new_user|
                role = Role.aaf_affiliation_to_role_id(attrs[:edupersonscopedaffiliation])
@@ -242,7 +242,7 @@ class AuthenticationApi < Grape::API
 
       # Authenticate that the token is okay
       if authenticated?
-        user = User.find_by_username(params[:username])
+        user = User.find_by(username: params[:username])
         token = user.token_for_text?(params[:auth_token]) unless user.nil?
         error!({ error: 'Invalid token.' }, 404) if token.nil?
 
@@ -323,7 +323,7 @@ class AuthenticationApi < Grape::API
     logger.info "Update token #{token_param} from #{request.ip} for #{user_param}"
 
     # Find user
-    user = User.find_by_username(user_param)
+    user = User.find_by(username: user_param)
     token = user.token_for_text?(token_param) unless user.nil?
     remember = params[:remember] || false
 
@@ -358,7 +358,7 @@ class AuthenticationApi < Grape::API
          }
        }
   delete '/auth' do
-    user = User.find_by_username(headers['username'] || headers['Username'])
+    user = User.find_by(username: headers['username'] || headers['Username'])
     token = user.token_for_text?(headers['auth-token'] || headers['Auth-Token']) unless user.nil?
 
     if token.present?