Rebase to main, fixed gemfile to run locally/ heroku and test the app

Author: gobears01

Gemfile

@@ -32,6 +32,9 @@ gem 'tzinfo-data', platforms: %i[windows jruby]
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
+# Loads environment variables from .env (local dev/test only, not Heroku)
+gem 'dotenv-rails', groups: [ :development, :test ]
+
 # Alternative Canvas API. We probably don't need this.
 # Verify instances of `LMS::Canvas`
 gem 'lms-api'
@@ -73,6 +76,7 @@ gem 'dotenv-rails', require: 'dotenv/load'
 #
 gem 'blazer'
 gem 'hypershield'
+gem 'good_job', '~> 4.0'
 
 #### Frontend related tools
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]

Gemfile.lock

@@ -193,6 +193,8 @@ GEM
     dumb_delegator (1.1.0)
     erb (6.0.2)
     erubi (1.13.1)
+    et-orbi (1.4.0)
+      tzinfo
     factory_bot (6.5.6)
       activesupport (>= 6.1.0)
     factory_bot_rails (6.5.1)
@@ -219,8 +221,18 @@ GEM
       sassc (~> 2.0)
     formatador (1.2.3)
       reline
+    fugit (1.12.1)
+      et-orbi (~> 1.4)
+      raabro (~> 1.4)
     globalid (1.3.0)
       activesupport (>= 6.1)
+    good_job (4.14.2)
+      activejob (>= 6.1.0)
+      activerecord (>= 6.1.0)
+      concurrent-ruby (>= 1.3.1)
+      fugit (>= 1.11.0)
+      railties (>= 6.1.0)
+      thor (>= 1.0.0)
     guard (2.20.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -386,6 +398,7 @@ GEM
     public_suffix (7.0.5)
     puma (7.2.0)
       nio4r (~> 2.0)
+    raabro (1.4.0)
     racc (1.8.1)
     rack (3.2.6)
     rack-protection (4.2.1)
@@ -633,6 +646,7 @@ DEPENDENCIES
   faraday
   faraday-cookie_jar
   font-awesome-sass
+  good_job (~> 4.0)
   guard-rspec
   hypershield
   importmap-rails

app/controllers/session_controller.rb

@@ -139,7 +139,7 @@ def update_user_credential(user, token)
       )
     else
       user.lms_credentials.create!(
-        lms_id: 1,
+        lms_name: 'canvas',
         token: token.token,
         refresh_token: token.refresh_token,
         expire_time: Time.zone.at(token.expires_at)

app/models/lms_credential.rb

@@ -26,11 +26,10 @@
 class LmsCredential < ApplicationRecord
   # Belongs to a User
   belongs_to :user
-  belongs_to :lms, optional: true
 
   # Encryption for tokens
   encrypts :token, :refresh_token
 
   # LMS must exist
-  validates :lms_id, presence: true
+  validates :lms_name, presence: true
 end

db/schema.rb

@@ -163,6 +163,7 @@
 
   create_table "lms_credentials", force: :cascade do |t|
     t.bigint "user_id"
+    t.string "lms_name"
     t.string "username"
     t.string "password"
     t.string "token"
@@ -171,7 +172,6 @@
     t.datetime "updated_at", null: false
     t.string "external_user_id"
     t.datetime "expire_time"
-    t.bigint "lms_id"
     t.index ["user_id"], name: "index_lms_credentials_on_user_id"
   end
 
@@ -213,7 +213,6 @@
     t.datetime "updated_at", null: false
     t.boolean "removed", default: false, null: false
     t.boolean "allow_extended_requests", default: false, null: false
-    t.text "notes"
     t.index ["course_id"], name: "index_user_to_courses_on_course_id"
     t.index ["user_id"], name: "index_user_to_courses_on_user_id"
   end
@@ -237,7 +236,6 @@
   add_foreign_key "extensions", "assignments"
   add_foreign_key "extensions", "users", column: "last_processed_by_id"
   add_foreign_key "form_settings", "courses"
-  add_foreign_key "lms_credentials", "lmss"
   add_foreign_key "lms_credentials", "users"
   add_foreign_key "requests", "assignments"
   add_foreign_key "requests", "courses"

spec/models/course_spec.rb

@@ -42,7 +42,7 @@
       course = described_class.create!(canvas_id: 'canvas_123', course_name: 'Test', course_code: 'TEST101')
       user = User.create!(email: 'test@example.com', canvas_uid: '123')
       user.lms_credentials.create!(
-        lms_id: 1,
+        lms_name: 'canvas',
         token: 'valid_token',
         refresh_token: 'refresh_token',
         expire_time: 1.hour.from_now