From 3980559ba98d4af2a98fe5959a967e8b43b19642 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 28 Jul 2024 15:22:06 +0200
Subject: [PATCH 001/191] Initialize voucher model and add some unit tests

---
 app/models/lecture.rb                        |  4 +
 app/models/voucher.rb                        | 39 +++++++++
 config/locales/de.yml                        |  5 ++
 config/locales/en.yml                        |  5 ++
 db/migrate/20240728123817_create_vouchers.rb | 12 +++
 db/schema.rb                                 | 14 +++-
 spec/factories/vouchers.rb                   | 24 ++++++
 spec/models/voucher_spec.rb                  | 83 ++++++++++++++++++++
 8 files changed, 185 insertions(+), 1 deletion(-)
 create mode 100644 app/models/voucher.rb
 create mode 100644 db/migrate/20240728123817_create_vouchers.rb
 create mode 100644 spec/factories/vouchers.rb
 create mode 100644 spec/models/voucher_spec.rb

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 7fd197471..81eb0b960 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -63,6 +63,10 @@ class Lecture < ApplicationRecord
   # a lecture has many assignments (e.g. exercises with deadlines)
   has_many :assignments
 
+  # a lecture has many vouchers that can be redeemed to promote
+  # users to tutors, editors or teachers
+  has_many :vouchers
+
   # a lecture has many structure_ids, referring to the ids of structures
   # in the erdbeere database
   serialize :structure_ids, type: Array, coder: YAML
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
new file mode 100644
index 000000000..d7b1ea8eb
--- /dev/null
+++ b/app/models/voucher.rb
@@ -0,0 +1,39 @@
+class Voucher < ApplicationRecord
+  enum sort: { tutor: 0, editor: 1, teacher: 2 }
+
+  belongs_to :lecture
+  before_create :generate_secure_hash
+  before_create :add_expiration_datetime
+  validates :sort, presence: true
+  validate :ensure_no_other_active_voucher
+
+  scope :active, -> { where("expires_at > ?", Time.zone.now) }
+
+  self.implicit_order_column = "created_at"
+
+  def expired?
+    expires_at <= Time.now
+  end
+
+  def active?
+    expires_at > Time.now
+  end
+
+  private
+
+    def generate_secure_hash
+      self.secure_hash = SecureRandom.hex(16)
+    end
+
+    def add_expiration_datetime
+      self.expires_at = created_at + 90.days
+    end
+
+    def ensure_no_other_active_voucher
+      return unless lecture
+      return unless lecture.vouchers.where(sort: sort).any?(&:active?)
+
+      errors.add(:sort,
+                 I18n.t("activerecord.errors.models.voucher.attributes.sort.only_one_active"))
+    end
+end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 23ec38b1d..c1fb42d4c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3893,6 +3893,11 @@ de:
               out_of_range: >
                 Das abgegebene Votum ist leider außerhalb des zulässingen
                 Bereiches.
+        voucher:
+          attributes:
+            sort:
+              only_one_active: >
+                Für diese Vorlesung kann es nur einen aktiven Voucher dieses Typs geben.
         watchlist_entry:
           attributes:
             medium_id:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6eb83a3c3..21c2274d5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3684,6 +3684,11 @@ en:
             value:
               out_of_range: >
                 Your vote is outside of the allowed range.
+        voucher:
+          attributes:
+            sort:
+              only_one_active: >
+                There can be only one active voucher of this sort for the lecture.
         watchlist_entry:
           attributes:
             medium_id:
diff --git a/db/migrate/20240728123817_create_vouchers.rb b/db/migrate/20240728123817_create_vouchers.rb
new file mode 100644
index 000000000..3b0e6e8cd
--- /dev/null
+++ b/db/migrate/20240728123817_create_vouchers.rb
@@ -0,0 +1,12 @@
+class CreateVouchers < ActiveRecord::Migration[7.1]
+  def change
+    create_table :vouchers, id: :uuid, default: "gen_random_uuid()" do |t|
+      t.integer :sort, null: false
+      t.references :lecture, null: false, foreign_key: true
+      t.string :secure_hash, null: false
+      t.datetime :expires_at
+      t.timestamps
+    end
+    add_index :vouchers, :secure_hash, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6cd1b3f61..41022ff23 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_04_22_200000) do
+ActiveRecord::Schema[7.1].define(version: 2024_07_28_123817) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -902,6 +902,17 @@
     t.index ["voter_type", "voter_id"], name: "index_votes_on_voter_type_and_voter_id"
   end
 
+  create_table "vouchers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.integer "sort", null: false
+    t.bigint "lecture_id", null: false
+    t.string "secure_hash", null: false
+    t.datetime "expires_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["lecture_id"], name: "index_vouchers_on_lecture_id"
+    t.index ["secure_hash"], name: "index_vouchers_on_secure_hash", unique: true
+  end
+
   create_table "vtt_containers", force: :cascade do |t|
     t.text "table_of_contents_data"
     t.text "references_data"
@@ -973,6 +984,7 @@
   add_foreign_key "user_favorite_lecture_joins", "lectures"
   add_foreign_key "user_favorite_lecture_joins", "users"
   add_foreign_key "user_submission_joins", "users"
+  add_foreign_key "vouchers", "lectures"
   add_foreign_key "watchlist_entries", "media"
   add_foreign_key "watchlist_entries", "watchlists"
   add_foreign_key "watchlists", "users"
diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb
new file mode 100644
index 000000000..0b5524c4f
--- /dev/null
+++ b/spec/factories/vouchers.rb
@@ -0,0 +1,24 @@
+FactoryBot.define do
+  factory :voucher do
+    sort { :tutor }
+    association :lecture
+
+    trait :tutor do
+      sort { :tutor }
+    end
+
+    trait :student do
+      sort { :student }
+    end
+
+    trait :teacher do
+      sort { :teacher }
+    end
+
+    trait :expired do
+      after(:create) do |voucher|
+        voucher.update(expires_at: 1.day.ago)
+      end
+    end
+  end
+end
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
new file mode 100644
index 000000000..0f6765a14
--- /dev/null
+++ b/spec/models/voucher_spec.rb
@@ -0,0 +1,83 @@
+require "rails_helper"
+
+RSpec.describe(Voucher, type: :model) do
+  let(:lecture) { FactoryBot.create(:lecture) }
+
+  describe "callbacks" do
+    it "generates a secure hash before creating" do
+      voucher = FactoryBot.build(:voucher)
+      expect(voucher.secure_hash).to be_nil
+      voucher.save
+      expect(voucher.secure_hash).not_to be_nil
+    end
+
+    it "adds an expiration datetime before creating" do
+      voucher = FactoryBot.build(:voucher)
+      expect(voucher.expires_at).to be_nil
+      voucher.save
+      expect(voucher.expires_at).not_to be_nil
+    end
+  end
+
+  describe "scopes" do
+    describe ".active" do
+      it "returns active vouchers" do
+        active_voucher = FactoryBot.create(:voucher)
+        expired_voucher = FactoryBot.create(:voucher, :expired)
+
+        expect(expired_voucher.expired?).to be(true)
+        expect(Voucher.active.count).to eq(1)
+        expect(Voucher.active).to include(active_voucher)
+        expect(Voucher.active).not_to include(expired_voucher)
+      end
+    end
+  end
+
+  describe "instance methods" do
+    describe "#expired?" do
+      it "returns true if the voucher has expired" do
+        voucher = FactoryBot.build(:voucher, expires_at: Time.now - 1.day)
+        expect(voucher.expired?).to be(true)
+      end
+
+      it "returns false if the voucher has not expired" do
+        voucher = FactoryBot.build(:voucher, expires_at: Time.now + 1.day)
+        expect(voucher.expired?).to be(false)
+      end
+    end
+
+    describe "#active?" do
+      it "returns true if the voucher is active" do
+        voucher = FactoryBot.build(:voucher, expires_at: Time.now + 1.day)
+        expect(voucher.active?).to be(true)
+      end
+
+      it "returns false if the voucher is not active" do
+        voucher = FactoryBot.build(:voucher, expires_at: Time.now - 1.day)
+        expect(voucher.active?).to be(false)
+      end
+    end
+  end
+
+  describe "custom validations" do
+    describe "#ensure_no_other_active_voucher" do
+      it "adds an error if there is another active voucher with the same " \
+         "sort for the lecture" do
+        FactoryBot.create(:voucher, lecture: lecture, sort: :tutor)
+        voucher = FactoryBot.build(:voucher, lecture: lecture, sort: :tutor)
+
+        expect(voucher).not_to be_valid
+        expect(voucher.errors[:sort]).to include(I18n.t("activerecord.errors.models.voucher." \
+                                                        "attributes.sort.only_one_active"))
+      end
+
+      it "does not add an error if there is no other active voucher with the " \
+         "same sort for the lecture" do
+        voucher = FactoryBot.build(:voucher, lecture: lecture, sort: :tutor)
+
+        expect(voucher).to be_valid
+        expect(voucher.errors[:sort]).to be_empty
+      end
+    end
+  end
+end

From f9876e46a8f69196d81b3d189d8d5bb3deca386d Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 28 Jul 2024 15:48:51 +0200
Subject: [PATCH 002/191] Make ensure_no_other_active_voucher validation into a
 callback

---
 app/models/voucher.rb       |  2 +-
 spec/models/voucher_spec.rb | 34 ++++++++++------------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index d7b1ea8eb..34af6fd19 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -4,8 +4,8 @@ class Voucher < ApplicationRecord
   belongs_to :lecture
   before_create :generate_secure_hash
   before_create :add_expiration_datetime
+  before_create :ensure_no_other_active_voucher
   validates :sort, presence: true
-  validate :ensure_no_other_active_voucher
 
   scope :active, -> { where("expires_at > ?", Time.zone.now) }
 
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index 0f6765a14..13e5e62e6 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -17,6 +17,16 @@
       voucher.save
       expect(voucher.expires_at).not_to be_nil
     end
+
+    it "rolls back if there is another active voucher with the same sort for the lecture" do
+      FactoryBot.create(:voucher, lecture: lecture, sort: :tutor)
+      voucher = FactoryBot.build(:voucher, lecture: lecture, sort: :tutor)
+      voucher.save
+
+      expect(voucher).not_to be_valid
+      expect(voucher.errors[:sort]).to include(I18n.t("activerecord.errors.models.voucher." \
+                                                      "attributes.sort.only_one_active"))
+    end
   end
 
   describe "scopes" do
@@ -25,8 +35,6 @@
         active_voucher = FactoryBot.create(:voucher)
         expired_voucher = FactoryBot.create(:voucher, :expired)
 
-        expect(expired_voucher.expired?).to be(true)
-        expect(Voucher.active.count).to eq(1)
         expect(Voucher.active).to include(active_voucher)
         expect(Voucher.active).not_to include(expired_voucher)
       end
@@ -58,26 +66,4 @@
       end
     end
   end
-
-  describe "custom validations" do
-    describe "#ensure_no_other_active_voucher" do
-      it "adds an error if there is another active voucher with the same " \
-         "sort for the lecture" do
-        FactoryBot.create(:voucher, lecture: lecture, sort: :tutor)
-        voucher = FactoryBot.build(:voucher, lecture: lecture, sort: :tutor)
-
-        expect(voucher).not_to be_valid
-        expect(voucher.errors[:sort]).to include(I18n.t("activerecord.errors.models.voucher." \
-                                                        "attributes.sort.only_one_active"))
-      end
-
-      it "does not add an error if there is no other active voucher with the " \
-         "same sort for the lecture" do
-        voucher = FactoryBot.build(:voucher, lecture: lecture, sort: :tutor)
-
-        expect(voucher).to be_valid
-        expect(voucher.errors[:sort]).to be_empty
-      end
-    end
-  end
 end

From 1e057fc7d25f6c2bace4b561c8d4a6d9be8277d4 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 4 Aug 2024 13:02:52 +0200
Subject: [PATCH 003/191] Add throw :abort in order to halt execution

---
 app/models/voucher.rb       |  1 +
 spec/models/voucher_spec.rb | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 34af6fd19..c93aea35e 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -35,5 +35,6 @@ def ensure_no_other_active_voucher
 
       errors.add(:sort,
                  I18n.t("activerecord.errors.models.voucher.attributes.sort.only_one_active"))
+      throw(:abort)
     end
 end
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index 13e5e62e6..03d228a8a 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -19,13 +19,12 @@
     end
 
     it "rolls back if there is another active voucher with the same sort for the lecture" do
-      FactoryBot.create(:voucher, lecture: lecture, sort: :tutor)
-      voucher = FactoryBot.build(:voucher, lecture: lecture, sort: :tutor)
-      voucher.save
+      FactoryBot.create(:voucher, :tutor, lecture: lecture)
+      new_voucher = build(:voucher, :tutor, lecture: lecture)
 
-      expect(voucher).not_to be_valid
-      expect(voucher.errors[:sort]).to include(I18n.t("activerecord.errors.models.voucher." \
-                                                      "attributes.sort.only_one_active"))
+      expect(new_voucher.save).to be_falsey
+      expect(new_voucher.errors[:sort]).to include(I18n.t("activerecord.errors.models.voucher." \
+                                                          "attributes.sort.only_one_active"))
     end
   end
 

From 681fe9423662d286349ac1c09ea5786f3c88c8e2 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 4 Aug 2024 13:13:10 +0200
Subject: [PATCH 004/191] Replace Time.now by Time.zone.now

---
 app/models/voucher.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index c93aea35e..d51e828d2 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -12,11 +12,11 @@ class Voucher < ApplicationRecord
   self.implicit_order_column = "created_at"
 
   def expired?
-    expires_at <= Time.now
+    expires_at <= Time.zone.now
   end
 
   def active?
-    expires_at > Time.now
+    expires_at > Time.zone.now
   end
 
   private

From f514ffbe68f5a8cdad84e76e015646394a63cad3 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 4 Aug 2024 15:47:59 +0200
Subject: [PATCH 005/191] Set up basic functionality for display of vouchers
 for tutors

---
 app/assets/stylesheets/lectures.scss          |  5 ++++
 app/helpers/lectures_helper.rb                | 27 +++++++++++++++++++
 app/models/lecture.rb                         | 10 +++++++
 app/views/lectures/edit/_form.html.erb        | 10 ++++---
 .../lectures/edit/_tutorial_voucher.html.erb  | 27 +++++++++++++++++++
 app/views/lectures/edit/_vouchers.html.erb    | 12 +++++++++
 config/locales/de.yml                         |  7 +++++
 config/locales/en.yml                         |  7 +++++
 spec/models/lecture_spec.rb                   | 25 +++++++++++++++++
 9 files changed, 126 insertions(+), 4 deletions(-)
 create mode 100644 app/views/lectures/edit/_tutorial_voucher.html.erb
 create mode 100644 app/views/lectures/edit/_vouchers.html.erb

diff --git a/app/assets/stylesheets/lectures.scss b/app/assets/stylesheets/lectures.scss
index 2ee04b58b..bcc766892 100644
--- a/app/assets/stylesheets/lectures.scss
+++ b/app/assets/stylesheets/lectures.scss
@@ -118,6 +118,11 @@ h3.lecture-pane-header {
   font-size: 1.3em;
 }
 
+h4.lecture-pane-subheader {
+  color: #838383;
+  font-size: 1.1em;
+}
+
 #announcements-list {
   max-height: 17em;
   overflow-x: hidden;
diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index b7d7f739e..58f90e174 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -129,4 +129,31 @@ def lecture_view_icon(lecture)
       tag.i(class: "fas fa-eye")
     end
   end
+
+  # def active_voucher_details(lecture, sort)
+  #   voucher = lecture.active_voucher_of_sort(sort)
+  #   if voucher
+  #     "Expires at: #{voucher.expires_at}, Secure Hash: #{voucher.secure_hash}"
+  #   else
+  #     "No active #{sort} voucher"
+  #   end
+  # end
+
+  def active_voucher_details(lecture, sort)
+    voucher = lecture.active_voucher_of_sort(sort)
+    if voucher
+      content_tag(:div) do
+        concat(content_tag(:span, "Secure Hash: #{voucher.secure_hash}"))
+        concat(content_tag(:i, "", class: "clipboardpopup far fa-copy clickable text-secondary clipboard-btn ms-3 clipboard-button",
+                                   data: { clipboard_text: voucher.secure_hash, bs_toggle: "tooltip", id: "42" },
+                                   title: t("buttons.copy_to_clipboard"))) do
+          content_tag(:span, t("basics.code_copied_to_clipboard"),
+                      class: "clipboardpopuptext token-clipboard-popup", data: { id: "42" })
+        end
+        concat(content_tag(:span, "Expires at: #{voucher.expires_at}"))
+      end
+    else
+      content_tag(:p, "No active #{sort} voucher")
+    end
+  end
 end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 81eb0b960..cc8ebc464 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -848,6 +848,16 @@ def valid_annotations_status?
     [0, 1].include?(annotations_status)
   end
 
+  def active_voucher_of_sort?(sort)
+    vouchers.where(sort: sort).any?(&:active?)
+  end
+
+  def active_voucher_of_sort(sort)
+    return unless active_voucher_of_sort?(sort)
+
+    vouchers.find_by(sort: sort)
+  end
+
   private
 
     # used for after save callback
diff --git a/app/views/lectures/edit/_form.html.erb b/app/views/lectures/edit/_form.html.erb
index 5060e5b82..293b5f6c9 100644
--- a/app/views/lectures/edit/_form.html.erb
+++ b/app/views/lectures/edit/_form.html.erb
@@ -6,7 +6,7 @@
       <%= render partial: 'lectures/edit/header',
           locals: { lecture: lecture } %>
     </div>
-    
+
     <!-- Menu to switch between "tabs" ("pillars") -->
     <nav>
       <div class="nav nav-pills container small-width flex-column flex-sm-row"
@@ -85,7 +85,7 @@
           </div>
         </div>
       </div>
-      
+
       <!-- Settings -->
       <div class="tab-pane fade" id="lecture-pane-settings"
           role="tabpanel" aria-labelledby="lecture-nav-settings" tabindex="0">
@@ -101,6 +101,8 @@
         <div class="container small-width lecture-pane">
           <%= render partial: 'lectures/edit/people',
               locals: { lecture: lecture } %>
+          <%= render partial: 'lectures/edit/vouchers',
+              locals: { lecture: lecture } %>
           <%= render partial: 'lectures/edit/tutorials',
               locals: { lecture: lecture } %>
         </div>
@@ -145,7 +147,7 @@
             <%= t('basics.course_editors') %>
               <%= helpdesk(t('admin.lecture.info.course_editors'), false) %>
           </h3>
-          
+
           <div class="col-4">
             <% if lecture.course.editors.present? %>
               <ul>
@@ -179,7 +181,7 @@
   <%= render partial: 'announcements/modal' %>
   <%= render partial: 'lectures/publish/publish',
              locals: { lecture: lecture } %>
-   
+
   <% unless lecture.stale? %>
     <%= render partial: 'lectures/edit/user_modal',
                locals: { lecture: lecture } %>
diff --git a/app/views/lectures/edit/_tutorial_voucher.html.erb b/app/views/lectures/edit/_tutorial_voucher.html.erb
new file mode 100644
index 000000000..12a20d879
--- /dev/null
+++ b/app/views/lectures/edit/_tutorial_voucher.html.erb
@@ -0,0 +1,27 @@
+<% if lecture.active_voucher_of_sort(:tutor) %>
+  <% voucher = lecture.active_voucher_of_sort(:tutor) %>
+  <div>
+    <span>
+        <%= t('admin.voucher.secure_hash') %>:
+        <%= voucher.secure_hash %>
+    </span>
+    <i class="clipboardpopup far fa-copy clickable text-secondary clipboard-btn
+              ms-3 clipboard-button"
+       data-clipboard-text="<%= voucher.secure_hash %>"
+       data-bs-toggle="tooltip"
+       data-id="<%= voucher.secure_hash %>"
+       title="<%= t('buttons.copy_to_clipboard') %>">
+      <span class="clipboardpopuptext token-clipboard-popup"
+            data-id="<%= voucher.secure_hash %>">
+        <%= t('basics.code_copied_to_clipboard') %>
+      </span>
+    </i>
+    <p>
+      <%= t('admin.voucher.expires_at') %>:
+      <%= l(voucher.expires_at, format: :long) %>
+    </p>
+  </div>
+<% else %>
+    <%= t('admin.lecture.no_active_tutor_voucher') %>
+    <button type="button" class="btn btn-primary">Create Voucher</button>
+<% end %>
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb
new file mode 100644
index 000000000..7338143ef
--- /dev/null
+++ b/app/views/lectures/edit/_vouchers.html.erb
@@ -0,0 +1,12 @@
+<hr class="lecture-pane-separator">
+<h3 class="lecture-pane-header">
+  <%= t('basics.vouchers') %>
+</h3>
+
+<% if current_user.can_update_personell?(lecture) %>
+  <h4 class="lecture-pane-subheader">
+    <%= t('basics.voucher_for_tutors') %>
+  </h4>
+  <%= render partial: 'lectures/edit/tutorial_voucher',
+             locals: { lecture: lecture } %>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c1fb42d4c..bfbe30bda 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -480,6 +480,8 @@ de:
       import_chapters: Kapitel importieren
       import_sections: Abschnitte importieren
       import_tags: Tags importieren
+      no_active_tutor_voucher: >
+        Es gibt keinen aktiven Tutoren-Gutschein für diese Veranstaltung.
       info:
         course: >
           Hier kannst Du das Modul auswählen, zu dem diese
@@ -2034,6 +2036,9 @@ de:
       new: 'Neues Tutorium anlegen'
     assignment:
       new: 'Neue Hausaufgabe anlegen'
+    voucher:
+      secure_hash: 'Sicherheits-Hash'
+      expires_at: 'Läuft ab'
   profile:
     account: 'Account'
     name: 'Anzeigename'
@@ -3428,6 +3433,8 @@ de:
     together_with: zusammen mit
     enter_two_letters: mind. 2 Zeichen eingeben
     no_results: Keine Resultate gefunden
+    vouchers: Gutscheine
+    voucher_for_tutors: Gutschein für TutorInnen
   access:
     unpublished: 'unveröffentlicht'
     all: 'frei'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 21c2274d5..339c9ffd9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -479,6 +479,8 @@ en:
       import_chapters: import chapters
       import_sections: import sections
       import_tags: import tags
+      no_active_tutor_vouchers: >
+        There are no active tutor vouchers.
       info:
         course: >
           Here you can select the course to which this event series belongs.
@@ -1912,6 +1914,9 @@ en:
       new: 'Add tutorial'
     assignment:
       new: 'Add assignment'
+    voucher:
+      secure_hash: 'Secure Hash'
+      expires_at: 'Expires at'
   profile:
     account: 'Account'
     name: 'Display name'
@@ -3242,6 +3247,8 @@ en:
     together_with: together with
     enter_two_letters: enter at least 2 letters
     no_results: No results found
+    vouchers: Vouchers
+    voucher_for_tutors: Voucher for tutors
   warnings:
     save_before: 'Before you continue, you need to save or discard your changes'
     unsaved_changes: >
diff --git a/spec/models/lecture_spec.rb b/spec/models/lecture_spec.rb
index d2ba05682..2064a83bf 100644
--- a/spec/models/lecture_spec.rb
+++ b/spec/models/lecture_spec.rb
@@ -86,6 +86,31 @@
     end
   end
 
+  describe "#active_voucher_of_sort?" do
+    let(:lecture) { FactoryBot.create(:lecture) }
+    let(:sort) { :tutor }
+
+    context "when there is an active voucher of the specified sort" do
+      before do
+        FactoryBot.create(:voucher, lecture: lecture, sort: sort)
+      end
+
+      it "returns true" do
+        expect(lecture.active_voucher_of_sort?(sort)).to be(true)
+      end
+    end
+
+    context "when there is no active voucher of the specified sort" do
+      before do
+        FactoryBot.create(:voucher, lecture: lecture, sort: :editor)
+      end
+
+      it "returns false" do
+        expect(lecture.active_voucher_of_sort?(sort)).to be(false)
+      end
+    end
+  end
+
   # Test methods -- NEEDS TO BE REFACTORED
 
   # describe '#tags' do

From eb1d17d70370ab1c15b1188639168344a1992210 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 4 Aug 2024 15:48:59 +0200
Subject: [PATCH 006/191] Create separate file for copy and paste button code
 and decaffeinate

---
 app/assets/javascripts/application.js         |  1 +
 .../javascripts/copy_and_paste_button.js      | 20 +++++++++++++++++++
 app/assets/javascripts/submissions.coffee     | 12 -----------
 3 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 app/assets/javascripts/copy_and_paste_button.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 88e205048..3e22a57b5 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -27,6 +27,7 @@
 //= require bootstrap_popovers
 //= require chapters
 //= require clickers
+//= require copy_and_paste_button
 //= require courses
 //= require erdbeere
 //= require file_upload
diff --git a/app/assets/javascripts/copy_and_paste_button.js b/app/assets/javascripts/copy_and_paste_button.js
new file mode 100644
index 000000000..788dcf4ae
--- /dev/null
+++ b/app/assets/javascripts/copy_and_paste_button.js
@@ -0,0 +1,20 @@
+$(document).on("turbolinks:load", function () {
+  var clipboard = new Clipboard(".clipboard-btn");
+
+  $(document).on("click", ".clipboard-button", function () {
+    $(".token-clipboard-popup").removeClass("show");
+    var id = $(this).data("id");
+    $('.token-clipboard-popup[data-id="' + id + '"]').addClass("show");
+
+    var restoreClipboardButton = function () {
+      $('.token-clipboard-popup[data-id="' + id + '"]').removeClass("show");
+    };
+
+    setTimeout(restoreClipboardButton, 1500);
+  });
+});
+
+// clean up for turbolinks
+$(document).on("turbolinks:before-cache", function () {
+  $(document).off("click", ".clipboard-button");
+});
diff --git a/app/assets/javascripts/submissions.coffee b/app/assets/javascripts/submissions.coffee
index 3224b5669..cf4d9c990 100644
--- a/app/assets/javascripts/submissions.coffee
+++ b/app/assets/javascripts/submissions.coffee
@@ -1,5 +1,4 @@
 $(document).on 'turbolinks:load', ->
-  clipboard = new Clipboard('.clipboard-btn')
 
   $(document).on 'click', '#removeUserManuscript', ->
     $('#userManuscriptMetadata').hide()
@@ -9,20 +8,9 @@ $(document).on 'turbolinks:load', ->
     $('#submission_detach_user_manuscript').val('true')
     return
 
-  $(document).on 'click', '.clipboard-button', ->
-    $('.token-clipboard-popup').removeClass('show')
-    id = $(this).data('id')
-    $('.token-clipboard-popup[data-id="'+id+'"]').addClass('show')
-    restoreClipboardButton = ->
-      $('.token-clipboard-popup[data-id="'+id+'"]').removeClass('show')
-      return
-    setTimeout(restoreClipboardButton, 1500)
-    return
-
   return
 
 # clean up for turbolinks
 $(document).on 'turbolinks:before-cache', ->
   $(document).off 'click', '#removeUserManuscript'
-  $(document).off 'click', '.clipboard-button'
   return
\ No newline at end of file

From b594cc384a6b1ec62bf1ada2ef8fae87aa5e0ed9 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 4 Aug 2024 17:14:18 +0200
Subject: [PATCH 007/191] Set up destruction of tutor vouchers

---
 app/abilities/voucher_ability.rb              | 11 ++++++++
 app/controllers/vouchers_controller.rb        | 25 +++++++++++++++++++
 ...ucher.html.erb => _tutor_voucher.html.erb} | 12 +++++++++
 app/views/lectures/edit/_vouchers.html.erb    |  6 +++--
 app/views/vouchers/destroy.js                 |  2 ++
 config/routes.rb                              |  2 ++
 6 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/abilities/voucher_ability.rb
 create mode 100644 app/controllers/vouchers_controller.rb
 rename app/views/lectures/edit/{_tutorial_voucher.html.erb => _tutor_voucher.html.erb} (67%)
 create mode 100644 app/views/vouchers/destroy.js

diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb
new file mode 100644
index 000000000..bf595ae94
--- /dev/null
+++ b/app/abilities/voucher_ability.rb
@@ -0,0 +1,11 @@
+class VoucherAbility
+  include CanCan::Ability
+
+  def initialize(user)
+    clear_aliased_actions
+
+    can :destroy, Voucher do |voucher|
+      user.can_update_personell?(voucher.lecture)
+    end
+  end
+end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
new file mode 100644
index 000000000..f1230a5b5
--- /dev/null
+++ b/app/controllers/vouchers_controller.rb
@@ -0,0 +1,25 @@
+# app/controllers/vouchers_controller.rb
+class VouchersController < ApplicationController
+  before_action :set_voucher, only: [:destroy]
+  authorize_resource
+
+  def current_ability
+    @current_ability ||= VoucherAbility.new(current_user)
+  end
+
+  def destroy
+    @lecture = @voucher.lecture
+    @voucher.destroy
+    respond_to do |format|
+      format.html { head :no_content }
+      format.js
+    end
+  end
+
+  private
+
+    def set_voucher
+      @voucher = Voucher.find_by(id: params[:id])
+      head :not_found unless @voucher
+    end
+end
diff --git a/app/views/lectures/edit/_tutorial_voucher.html.erb b/app/views/lectures/edit/_tutor_voucher.html.erb
similarity index 67%
rename from app/views/lectures/edit/_tutorial_voucher.html.erb
rename to app/views/lectures/edit/_tutor_voucher.html.erb
index 12a20d879..65b3298aa 100644
--- a/app/views/lectures/edit/_tutorial_voucher.html.erb
+++ b/app/views/lectures/edit/_tutor_voucher.html.erb
@@ -16,6 +16,18 @@
         <%= t('basics.code_copied_to_clipboard') %>
       </span>
     </i>
+    <%= link_to voucher_path(voucher),
+                class: 'text-dark ms-2',
+                data: { toggle: 'tooltip',
+                        placement: 'botttom',
+                        confirm: t('confirmation.generic') },
+                style: 'text-decoration: none;',
+                title: t('buttons.delete'),
+                method: :delete,
+                remote: true do %>
+        <i class="fas fa-lg fa-trash-alt"></i>
+        </i>
+    <% end %>
     <p>
       <%= t('admin.voucher.expires_at') %>:
       <%= l(voucher.expires_at, format: :long) %>
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb
index 7338143ef..70ee198cb 100644
--- a/app/views/lectures/edit/_vouchers.html.erb
+++ b/app/views/lectures/edit/_vouchers.html.erb
@@ -7,6 +7,8 @@
   <h4 class="lecture-pane-subheader">
     <%= t('basics.voucher_for_tutors') %>
   </h4>
-  <%= render partial: 'lectures/edit/tutorial_voucher',
-             locals: { lecture: lecture } %>
+  <div id="tutor-voucher">
+    <%= render partial: 'lectures/edit/tutor_voucher',
+                locals: { lecture: lecture } %>
+  </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/destroy.js b/app/views/vouchers/destroy.js
new file mode 100644
index 000000000..94a2d85c7
--- /dev/null
+++ b/app/views/vouchers/destroy.js
@@ -0,0 +1,2 @@
+console.log ("destruction complete");
+$("#tutor-voucher").empty().append("<%= j render partial: 'lectures/edit/tutor_voucher', locals: { lecture: @lecture } %>");
diff --git a/config/routes.rb b/config/routes.rb
index 33f2dac29..18d026254 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -811,6 +811,8 @@
 
   resources :users, only: [:index, :edit, :update, :destroy]
 
+  resources :vouchers, only: [:destroy]
+
   # watchlists routes
 
   get "watchlists/add_medium/:medium_id",

From 3b5425c9bf7a85909454dfa7173c56254a8331f5 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 4 Aug 2024 18:20:21 +0200
Subject: [PATCH 008/191] Rename view file as it containes embedded ruby

---
 app/views/vouchers/{destroy.js => destroy.js.erb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/views/vouchers/{destroy.js => destroy.js.erb} (100%)

diff --git a/app/views/vouchers/destroy.js b/app/views/vouchers/destroy.js.erb
similarity index 100%
rename from app/views/vouchers/destroy.js
rename to app/views/vouchers/destroy.js.erb

From aad213422a108e1c35d3198131fe525e0c8df7f7 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 5 Aug 2024 19:12:33 +0200
Subject: [PATCH 009/191] Add create action for vouchers and corresponding
 views

---
 app/abilities/voucher_ability.rb              |  2 +-
 app/controllers/vouchers_controller.rb        | 55 ++++++++++++++++++-
 app/models/lecture.rb                         |  2 +-
 app/models/voucher.rb                         |  2 +-
 .../lectures/edit/_tutor_voucher.html.erb     |  9 ++-
 app/views/vouchers/create.js.erb              |  1 +
 app/views/vouchers/create_error.js.erb        |  1 +
 app/views/vouchers/destroy.js.erb             |  1 -
 app/views/vouchers/no_voucher_error.js.erb    |  1 +
 config/locales/de.yml                         |  2 +
 config/locales/en.yml                         |  4 +-
 config/routes.rb                              |  2 +-
 12 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 app/views/vouchers/create.js.erb
 create mode 100644 app/views/vouchers/create_error.js.erb
 create mode 100644 app/views/vouchers/no_voucher_error.js.erb

diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb
index bf595ae94..3dbc42bff 100644
--- a/app/abilities/voucher_ability.rb
+++ b/app/abilities/voucher_ability.rb
@@ -4,7 +4,7 @@ class VoucherAbility
   def initialize(user)
     clear_aliased_actions
 
-    can :destroy, Voucher do |voucher|
+    can [:create, :destroy], Voucher do |voucher|
       user.can_update_personell?(voucher.lecture)
     end
   end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index f1230a5b5..f153cea71 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -7,19 +7,70 @@ def current_ability
     @current_ability ||= VoucherAbility.new(current_user)
   end
 
+  def create
+    @lecture = Lecture.find_by(id: voucher_params[:lecture_id])
+    I18n.locale = @lecture.locale
+    @voucher = Voucher.new(lecture: @lecture, sort: voucher_params[:sort])
+    respond_to do |format|
+      if @voucher.save
+        handle_successful_save(format)
+      else
+        handle_failed_save(format)
+      end
+    end
+  end
+
   def destroy
     @lecture = @voucher.lecture
+    I18n.locale = @lecture.locale
     @voucher.destroy
     respond_to do |format|
-      format.html { head :no_content }
+      format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
       format.js
     end
   end
 
   private
 
+    def voucher_params
+      params.permit(:lecture_id, :sort)
+    end
+
     def set_voucher
       @voucher = Voucher.find_by(id: params[:id])
-      head :not_found unless @voucher
+      return if @voucher
+
+      handle_voucher_not_found
+    end
+
+    def handle_successful_save(format)
+      format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
+      format.js
+    end
+
+    def handle_failed_save(format)
+      error_message = @voucher.errors.full_messages.join(", ")
+      format.html do
+        redirect_to edit_lecture_path(@lecture, anchor: "people"),
+                    alert: error_message
+      end
+      format.js do
+        render "create_error", locals: { error_message: error_message }
+      end
+    end
+
+    def handle_voucher_not_found
+      I18n.locale = current_user.locale
+      error_message = I18n.t("controllers.no_voucher")
+      respond_to do |format|
+        format.html do
+          redirect_back(alert: error_message,
+                        fallback_location: root_path)
+        end
+        format.js do
+          render "no_voucher_error",
+                 locals: { error_message: error_message }
+        end
+      end
     end
 end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index cc8ebc464..d9d73a658 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -65,7 +65,7 @@ class Lecture < ApplicationRecord
 
   # a lecture has many vouchers that can be redeemed to promote
   # users to tutors, editors or teachers
-  has_many :vouchers
+  has_many :vouchers, dependent: :destroy
 
   # a lecture has many structure_ids, referring to the ids of structures
   # in the erdbeere database
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index d51e828d2..8e08cf88f 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -1,7 +1,7 @@
 class Voucher < ApplicationRecord
   enum sort: { tutor: 0, editor: 1, teacher: 2 }
 
-  belongs_to :lecture
+  belongs_to :lecture, touch: true
   before_create :generate_secure_hash
   before_create :add_expiration_datetime
   before_create :ensure_no_other_active_voucher
diff --git a/app/views/lectures/edit/_tutor_voucher.html.erb b/app/views/lectures/edit/_tutor_voucher.html.erb
index 65b3298aa..2f5ccbde9 100644
--- a/app/views/lectures/edit/_tutor_voucher.html.erb
+++ b/app/views/lectures/edit/_tutor_voucher.html.erb
@@ -34,6 +34,11 @@
     </p>
   </div>
 <% else %>
-    <%= t('admin.lecture.no_active_tutor_voucher') %>
-    <button type="button" class="btn btn-primary">Create Voucher</button>
+  <%= t('admin.lecture.no_active_tutor_voucher') %>
+  <%= link_to t('buttons.create_voucher'),
+              vouchers_path(params: { lecture_id: lecture.id,
+                                            sort: :tutor }),
+              class: 'btn btn-sm btn-primary',
+              method: :post,
+              remote: true %>
 <% end %>
diff --git a/app/views/vouchers/create.js.erb b/app/views/vouchers/create.js.erb
new file mode 100644
index 000000000..f783a4709
--- /dev/null
+++ b/app/views/vouchers/create.js.erb
@@ -0,0 +1 @@
+$("#tutor-voucher").empty().append("<%= j render partial: 'lectures/edit/tutor_voucher', locals: { lecture: @lecture } %>");
diff --git a/app/views/vouchers/create_error.js.erb b/app/views/vouchers/create_error.js.erb
new file mode 100644
index 000000000..debc3873c
--- /dev/null
+++ b/app/views/vouchers/create_error.js.erb
@@ -0,0 +1 @@
+alert("<%= "#{j(error_message)}" %>");
diff --git a/app/views/vouchers/destroy.js.erb b/app/views/vouchers/destroy.js.erb
index 94a2d85c7..f783a4709 100644
--- a/app/views/vouchers/destroy.js.erb
+++ b/app/views/vouchers/destroy.js.erb
@@ -1,2 +1 @@
-console.log ("destruction complete");
 $("#tutor-voucher").empty().append("<%= j render partial: 'lectures/edit/tutor_voucher', locals: { lecture: @lecture } %>");
diff --git a/app/views/vouchers/no_voucher_error.js.erb b/app/views/vouchers/no_voucher_error.js.erb
new file mode 100644
index 000000000..debc3873c
--- /dev/null
+++ b/app/views/vouchers/no_voucher_error.js.erb
@@ -0,0 +1 @@
+alert("<%= "#{j(error_message)}" %>");
diff --git a/config/locales/de.yml b/config/locales/de.yml
index bfbe30bda..be29162ec 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3465,6 +3465,7 @@ de:
     create_program: 'Studiengang anlegen'
     create_subject: 'Fach anlegen'
     create_division: 'Teilbereich anlegen'
+    create_voucher: 'Gutschein anlegen'
     create: 'Anlegen'
     edit: 'Bearbeiten'
     content: 'Inhalt'
@@ -3658,6 +3659,7 @@ de:
       abgegeben werden.
     no_assignments_in_lecture: >
       In dieser Veranstaltung gibt es bisher keine Hausaufgaben.
+    no_voucher: 'Ein Gutschein mit der angeforderten id existiert nicht.'
     tutorials:
       destruction_failed: >
         Das Tutorium konnte nicht gelöscht werden. Das kann z.B. daran liegen,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 339c9ffd9..6b75770db 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -479,7 +479,7 @@ en:
       import_chapters: import chapters
       import_sections: import sections
       import_tags: import tags
-      no_active_tutor_vouchers: >
+      no_active_tutor_voucher: >
         There are no active tutor vouchers.
       info:
         course: >
@@ -3283,6 +3283,7 @@ en:
     create_program: 'Create Study Path'
     create_subject: 'Create Subject'
     create_division: 'Create Division'
+    create_voucher: 'Create Voucher'
     create: 'Create'
     edit: 'Edit'
     content: 'Content'
@@ -3467,6 +3468,7 @@ en:
       made.
     no_assignments_in_lecture: >
       In this event series there are no assigments yet.
+    no_voucher: 'There is no voucher with this id.'
     tutorials:
       destruction_failed: >
         The tutorial could not be deleted. That may be because there are already
diff --git a/config/routes.rb b/config/routes.rb
index 18d026254..d1de4afcc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -811,7 +811,7 @@
 
   resources :users, only: [:index, :edit, :update, :destroy]
 
-  resources :vouchers, only: [:destroy]
+  resources :vouchers, only: [:create, :destroy]
 
   # watchlists routes
 

From e377f031ca069d9a7043777a9a8103366d6cf163 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 6 Aug 2024 15:05:08 +0200
Subject: [PATCH 010/191] Adapt views and controller for adding and removing of
 vouchers of different type

---
 app/controllers/vouchers_controller.rb        |  4 ++-
 app/models/voucher.rb                         |  4 ++-
 app/views/lectures/edit/_vouchers.html.erb    | 16 +++++++-----
 .../_voucher.html.erb}                        | 25 ++++++++++++-------
 app/views/vouchers/create.js.erb              |  3 ++-
 app/views/vouchers/destroy.js.erb             |  3 ++-
 config/locales/de.yml                         |  7 +++---
 7 files changed, 40 insertions(+), 22 deletions(-)
 rename app/views/{lectures/edit/_tutor_voucher.html.erb => vouchers/_voucher.html.erb} (66%)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index f153cea71..503992388 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -9,8 +9,9 @@ def current_ability
 
   def create
     @lecture = Lecture.find_by(id: voucher_params[:lecture_id])
+    @sort = voucher_params[:sort]
     I18n.locale = @lecture.locale
-    @voucher = Voucher.new(lecture: @lecture, sort: voucher_params[:sort])
+    @voucher = Voucher.new(lecture: @lecture, sort: @sort)
     respond_to do |format|
       if @voucher.save
         handle_successful_save(format)
@@ -22,6 +23,7 @@ def create
 
   def destroy
     @lecture = @voucher.lecture
+    @sort = @voucher.sort
     I18n.locale = @lecture.locale
     @voucher.destroy
     respond_to do |format|
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 8e08cf88f..023a2e141 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -1,5 +1,7 @@
 class Voucher < ApplicationRecord
-  enum sort: { tutor: 0, editor: 1, teacher: 2 }
+  SORT_HASH = { tutor: 0, editor: 1, teacher: 2 }.freeze
+
+  enum sort: SORT_HASH
 
   belongs_to :lecture, touch: true
   before_create :generate_secure_hash
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb
index 70ee198cb..55b2ebe7f 100644
--- a/app/views/lectures/edit/_vouchers.html.erb
+++ b/app/views/lectures/edit/_vouchers.html.erb
@@ -4,11 +4,15 @@
 </h3>
 
 <% if current_user.can_update_personell?(lecture) %>
-  <h4 class="lecture-pane-subheader">
-    <%= t('basics.voucher_for_tutors') %>
-  </h4>
-  <div id="tutor-voucher">
-    <%= render partial: 'lectures/edit/tutor_voucher',
-                locals: { lecture: lecture } %>
+  <% Voucher::SORT_HASH.keys.each do |sort| %>
+    <h4 class="lecture-pane-subheader">
+      <%= t("basics.voucher_for",
+             sort: t("basics.#{sort}s")) %>
+    </h4>  
+  <div id='<%= "#{sort}"%>-voucher'>
+    <%= render partial: 'vouchers/voucher',
+                locals: { lecture: lecture,
+                          sort: sort } %>
   </div>
+  <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/lectures/edit/_tutor_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
similarity index 66%
rename from app/views/lectures/edit/_tutor_voucher.html.erb
rename to app/views/vouchers/_voucher.html.erb
index 2f5ccbde9..12527b0e6 100644
--- a/app/views/lectures/edit/_tutor_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -1,5 +1,5 @@
-<% if lecture.active_voucher_of_sort(:tutor) %>
-  <% voucher = lecture.active_voucher_of_sort(:tutor) %>
+<% voucher = lecture.active_voucher_of_sort(sort) %>
+<% if voucher %>
   <div>
     <span>
         <%= t('admin.voucher.secure_hash') %>:
@@ -34,11 +34,18 @@
     </p>
   </div>
 <% else %>
-  <%= t('admin.lecture.no_active_tutor_voucher') %>
-  <%= link_to t('buttons.create_voucher'),
-              vouchers_path(params: { lecture_id: lecture.id,
-                                            sort: :tutor }),
-              class: 'btn btn-sm btn-primary',
-              method: :post,
-              remote: true %>
+  <p>
+    <%= t('admin.lecture.no_active_voucher',
+          sort: t("basics.voucher_for", sort: t("basics.#{sort}s"))) %>
+    <%= link_to vouchers_path(params: { lecture_id: lecture.id,
+                                        sort: sort }),
+                class: 'text-dark ms-2',
+                data: { toggle: 'tooltip',
+                        placement: 'botttom' },
+                title: t('buttons.create_voucher'),
+                method: :post,
+                remote: true do %>
+        <i class="fas fa-plus"></i>
+    <% end %>
+  </p>
 <% end %>
diff --git a/app/views/vouchers/create.js.erb b/app/views/vouchers/create.js.erb
index f783a4709..615339b7f 100644
--- a/app/views/vouchers/create.js.erb
+++ b/app/views/vouchers/create.js.erb
@@ -1 +1,2 @@
-$("#tutor-voucher").empty().append("<%= j render partial: 'lectures/edit/tutor_voucher', locals: { lecture: @lecture } %>");
+$("#<%= @sort %>-voucher").empty()
+  .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, sort: @sort } %>");
diff --git a/app/views/vouchers/destroy.js.erb b/app/views/vouchers/destroy.js.erb
index f783a4709..615339b7f 100644
--- a/app/views/vouchers/destroy.js.erb
+++ b/app/views/vouchers/destroy.js.erb
@@ -1 +1,2 @@
-$("#tutor-voucher").empty().append("<%= j render partial: 'lectures/edit/tutor_voucher', locals: { lecture: @lecture } %>");
+$("#<%= @sort %>-voucher").empty()
+  .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, sort: @sort } %>");
diff --git a/config/locales/de.yml b/config/locales/de.yml
index be29162ec..df148561b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -480,8 +480,8 @@ de:
       import_chapters: Kapitel importieren
       import_sections: Abschnitte importieren
       import_tags: Tags importieren
-      no_active_tutor_voucher: >
-        Es gibt keinen aktiven Tutoren-Gutschein für diese Veranstaltung.
+      no_active_voucher: >
+        Es gibt keinen aktiven %{sort} für diese Veranstaltung.
       info:
         course: >
           Hier kannst Du das Modul auswählen, zu dem diese
@@ -3433,8 +3433,9 @@ de:
     together_with: zusammen mit
     enter_two_letters: mind. 2 Zeichen eingeben
     no_results: Keine Resultate gefunden
+    editors: EditorInnen
     vouchers: Gutscheine
-    voucher_for_tutors: Gutschein für TutorInnen
+    voucher_for: Gutschein für %{sort}
   access:
     unpublished: 'unveröffentlicht'
     all: 'frei'

From 9f4edc91509b3aa89a52d6aa370c250f38d5eb3e Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 6 Aug 2024 15:44:14 +0200
Subject: [PATCH 011/191] Put duplicate lines into a separate method

---
 app/controllers/vouchers_controller.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 503992388..c37cdee7e 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -1,17 +1,16 @@
 # app/controllers/vouchers_controller.rb
 class VouchersController < ApplicationController
   before_action :set_voucher, only: [:destroy]
-  authorize_resource
+  authorize_resource except: :create
 
   def current_ability
     @current_ability ||= VoucherAbility.new(current_user)
   end
 
   def create
-    @lecture = Lecture.find_by(id: voucher_params[:lecture_id])
-    @sort = voucher_params[:sort]
-    I18n.locale = @lecture.locale
-    @voucher = Voucher.new(lecture: @lecture, sort: @sort)
+    @voucher = Voucher.new(voucher_params)
+    set_related_data
+    authorize! :create, @voucher
     respond_to do |format|
       if @voucher.save
         handle_successful_save(format)
@@ -22,9 +21,7 @@ def create
   end
 
   def destroy
-    @lecture = @voucher.lecture
-    @sort = @voucher.sort
-    I18n.locale = @lecture.locale
+    set_related_data
     @voucher.destroy
     respond_to do |format|
       format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
@@ -45,6 +42,12 @@ def set_voucher
       handle_voucher_not_found
     end
 
+    def set_related_data
+      @lecture = @voucher.lecture
+      @sort = @voucher.sort
+      I18n.locale = @lecture.locale
+    end
+
     def handle_successful_save(format)
       format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
       format.js

From 74637b31e970eedf3b6fa8618481a2ec83fd5159 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 6 Aug 2024 18:51:21 +0200
Subject: [PATCH 012/191] Set up redeeming of vouchers

---
 app/controllers/vouchers_controller.rb     |  6 +++++-
 app/views/profile/_redeem_voucher.html.erb |  9 +++++++++
 app/views/profile/edit.html.erb            | 21 +++++++++++++++++++++
 config/locales/de.yml                      |  1 +
 config/locales/en.yml                      |  1 +
 config/routes.rb                           |  4 ++++
 6 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 app/views/profile/_redeem_voucher.html.erb

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index c37cdee7e..8244d5a7a 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -1,7 +1,7 @@
 # app/controllers/vouchers_controller.rb
 class VouchersController < ApplicationController
   before_action :set_voucher, only: [:destroy]
-  authorize_resource except: :create
+  authorize_resource except: [:create, :redeem]
 
   def current_ability
     @current_ability ||= VoucherAbility.new(current_user)
@@ -29,6 +29,10 @@ def destroy
     end
   end
 
+  def redeem
+    render js: "alert('Voucher redeemed!')"
+  end
+
   private
 
     def voucher_params
diff --git a/app/views/profile/_redeem_voucher.html.erb b/app/views/profile/_redeem_voucher.html.erb
new file mode 100644
index 000000000..a9278a5f0
--- /dev/null
+++ b/app/views/profile/_redeem_voucher.html.erb
@@ -0,0 +1,9 @@
+<%= form_with url: redeem_voucher_path,
+              remote: true,
+              method: :post, 
+              html: { class: "form-inline" } do |f| %>
+    <div class="form-group d-flex">
+        <%= f.text_field :voucher_hash, class: "form-control me-2 w-50" %>
+        <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
+    </div>
+<% end %>
diff --git a/app/views/profile/edit.html.erb b/app/views/profile/edit.html.erb
index d44a0db08..69ba4c401 100644
--- a/app/views/profile/edit.html.erb
+++ b/app/views/profile/edit.html.erb
@@ -108,6 +108,25 @@
     </div>
   </div>
 <% end %>
+<div class="row mb-3">
+  <div class="col-12">
+    <div class="card bg-light">
+      <div class="card-header">
+        <div class="row">
+          <div class="col-12">
+            <h5>
+              <%= t('profile.redeem_voucher') %>
+            </h5>
+          </div>
+        </div>
+      </div>
+      <div class="card-body">
+        <%= render partial: 'profile/redeem_voucher' %>
+      </div>
+    </div>
+  </div>
+</div>
+
 <div class="row mb-3">
     <div class="col-12">
       <div class="card bg-light">
@@ -126,6 +145,8 @@
       </div>
     </div>
   </div>
+
+
 <%= render partial: 'shared/generic_modal',
            locals: { sort: 'deleteAccount',
                      title: t('profile.delete_account') } %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index df148561b..30ab2c082 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2169,6 +2169,7 @@ de:
       Daten anfordern
     data_request_sent: >
       Wir haben Deine Anfrage erhalten und werden Dir Deine Daten zeitnah schicken.
+    redeem_voucher: Gutschein einlösen
   mampf_news:
     title: 'MaMpf-News'
     check_notifications: 'Alle erledigen'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6b75770db..1747fef95 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2039,6 +2039,7 @@ en:
       Request data
     data_request_sent: >
       We have received your request and will send you your data as soon as possible.
+    redeem_voucher: Redeeem Voucher
   mampf_news:
     title: 'MaMpf News'
     check_notifications: 'Clear all'
diff --git a/config/routes.rb b/config/routes.rb
index d1de4afcc..377cded4c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -811,6 +811,10 @@
 
   resources :users, only: [:index, :edit, :update, :destroy]
 
+  post "vouchers/redeem",
+       to: "vouchers#redeem",
+       as: "redeem_voucher"
+
   resources :vouchers, only: [:create, :destroy]
 
   # watchlists routes

From db61b0427f1692aefa9642b84271723dc6725001 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 8 Aug 2024 18:42:14 +0200
Subject: [PATCH 013/191] fix typo

---
 app/views/vouchers/_voucher.html.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
index 12527b0e6..9a7e266ec 100644
--- a/app/views/vouchers/_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -19,7 +19,7 @@
     <%= link_to voucher_path(voucher),
                 class: 'text-dark ms-2',
                 data: { toggle: 'tooltip',
-                        placement: 'botttom',
+                        placement: 'bottom',
                         confirm: t('confirmation.generic') },
                 style: 'text-decoration: none;',
                 title: t('buttons.delete'),
@@ -28,10 +28,12 @@
         <i class="fas fa-lg fa-trash-alt"></i>
         </i>
     <% end %>
+
     <p>
       <%= t('admin.voucher.expires_at') %>:
       <%= l(voucher.expires_at, format: :long) %>
     </p>
+
   </div>
 <% else %>
   <p>
@@ -41,7 +43,7 @@
                                         sort: sort }),
                 class: 'text-dark ms-2',
                 data: { toggle: 'tooltip',
-                        placement: 'botttom' },
+                        placement: 'bottom' },
                 title: t('buttons.create_voucher'),
                 method: :post,
                 remote: true do %>

From 71ea44b5a032261aea665ee39a521b23afa012e4 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 8 Aug 2024 18:42:45 +0200
Subject: [PATCH 014/191] remove obsolete methods

---
 app/helpers/lectures_helper.rb | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index 58f90e174..b7d7f739e 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -129,31 +129,4 @@ def lecture_view_icon(lecture)
       tag.i(class: "fas fa-eye")
     end
   end
-
-  # def active_voucher_details(lecture, sort)
-  #   voucher = lecture.active_voucher_of_sort(sort)
-  #   if voucher
-  #     "Expires at: #{voucher.expires_at}, Secure Hash: #{voucher.secure_hash}"
-  #   else
-  #     "No active #{sort} voucher"
-  #   end
-  # end
-
-  def active_voucher_details(lecture, sort)
-    voucher = lecture.active_voucher_of_sort(sort)
-    if voucher
-      content_tag(:div) do
-        concat(content_tag(:span, "Secure Hash: #{voucher.secure_hash}"))
-        concat(content_tag(:i, "", class: "clipboardpopup far fa-copy clickable text-secondary clipboard-btn ms-3 clipboard-button",
-                                   data: { clipboard_text: voucher.secure_hash, bs_toggle: "tooltip", id: "42" },
-                                   title: t("buttons.copy_to_clipboard"))) do
-          content_tag(:span, t("basics.code_copied_to_clipboard"),
-                      class: "clipboardpopuptext token-clipboard-popup", data: { id: "42" })
-        end
-        concat(content_tag(:span, "Expires at: #{voucher.expires_at}"))
-      end
-    else
-      content_tag(:p, "No active #{sort} voucher")
-    end
-  end
 end

From d54a2abcc895b9afba98740ce170d181a3b278ca Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 8 Aug 2024 18:44:22 +0200
Subject: [PATCH 015/191] Avoid use of Time.now

---
 spec/models/voucher_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index 03d228a8a..a98daf7e8 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -43,24 +43,24 @@
   describe "instance methods" do
     describe "#expired?" do
       it "returns true if the voucher has expired" do
-        voucher = FactoryBot.build(:voucher, expires_at: Time.now - 1.day)
+        voucher = FactoryBot.build(:voucher, expires_at: 1.day.ago)
         expect(voucher.expired?).to be(true)
       end
 
       it "returns false if the voucher has not expired" do
-        voucher = FactoryBot.build(:voucher, expires_at: Time.now + 1.day)
+        voucher = FactoryBot.build(:voucher, expires_at: 1.day.from_now)
         expect(voucher.expired?).to be(false)
       end
     end
 
     describe "#active?" do
       it "returns true if the voucher is active" do
-        voucher = FactoryBot.build(:voucher, expires_at: Time.now + 1.day)
+        voucher = FactoryBot.build(:voucher, expires_at: 1.day.from_now)
         expect(voucher.active?).to be(true)
       end
 
       it "returns false if the voucher is not active" do
-        voucher = FactoryBot.build(:voucher, expires_at: Time.now - 1.day)
+        voucher = FactoryBot.build(:voucher, expires_at: 1.day.ago)
         expect(voucher.active?).to be(false)
       end
     end

From 2a91c7c3ab3b76f404f1b91b449f1d4e322097a2 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 9 Aug 2024 14:25:22 +0200
Subject: [PATCH 016/191] Refactor active_vouhcer_of_sort method

---
 app/models/lecture.rb       |  8 +-------
 spec/models/lecture_spec.rb | 18 +++++++++---------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index d9d73a658..ce4595ef9 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -848,14 +848,8 @@ def valid_annotations_status?
     [0, 1].include?(annotations_status)
   end
 
-  def active_voucher_of_sort?(sort)
-    vouchers.where(sort: sort).any?(&:active?)
-  end
-
   def active_voucher_of_sort(sort)
-    return unless active_voucher_of_sort?(sort)
-
-    vouchers.find_by(sort: sort)
+    vouchers.where(sort: sort).active&.first
   end
 
   private
diff --git a/spec/models/lecture_spec.rb b/spec/models/lecture_spec.rb
index 2064a83bf..dc689612b 100644
--- a/spec/models/lecture_spec.rb
+++ b/spec/models/lecture_spec.rb
@@ -86,27 +86,27 @@
     end
   end
 
-  describe "#active_voucher_of_sort?" do
+  describe "#active_voucher_of_sort" do
     let(:lecture) { FactoryBot.create(:lecture) }
     let(:sort) { :tutor }
 
     context "when there is an active voucher of the specified sort" do
-      before do
-        FactoryBot.create(:voucher, lecture: lecture, sort: sort)
+      let!(:active_voucher) do
+        FactoryBot.create(:voucher, sort: sort, lecture: lecture)
       end
 
-      it "returns true" do
-        expect(lecture.active_voucher_of_sort?(sort)).to be(true)
+      it "returns the voucher" do
+        expect(lecture.active_voucher_of_sort(sort)).to eq(active_voucher)
       end
     end
 
     context "when there is no active voucher of the specified sort" do
-      before do
-        FactoryBot.create(:voucher, lecture: lecture, sort: :editor)
+      let!(:inactive_voucher) do
+        FactoryBot.create(:voucher, :expired, sort: sort, lecture: lecture)
       end
 
-      it "returns false" do
-        expect(lecture.active_voucher_of_sort?(sort)).to be(false)
+      it "returns nil" do
+        expect(lecture.active_voucher_of_sort(sort)).to be(nil)
       end
     end
   end

From f63e204ac99d33605adb7878dc94ce669a46a136 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 9 Aug 2024 14:29:08 +0200
Subject: [PATCH 017/191] remove unused expired? method

---
 app/models/voucher.rb       |  4 ----
 spec/models/voucher_spec.rb | 12 ------------
 2 files changed, 16 deletions(-)

diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 023a2e141..0d5001d92 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -13,10 +13,6 @@ class Voucher < ApplicationRecord
 
   self.implicit_order_column = "created_at"
 
-  def expired?
-    expires_at <= Time.zone.now
-  end
-
   def active?
     expires_at > Time.zone.now
   end
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index a98daf7e8..8ddd39450 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -41,18 +41,6 @@
   end
 
   describe "instance methods" do
-    describe "#expired?" do
-      it "returns true if the voucher has expired" do
-        voucher = FactoryBot.build(:voucher, expires_at: 1.day.ago)
-        expect(voucher.expired?).to be(true)
-      end
-
-      it "returns false if the voucher has not expired" do
-        voucher = FactoryBot.build(:voucher, expires_at: 1.day.from_now)
-        expect(voucher.expired?).to be(false)
-      end
-    end
-
     describe "#active?" do
       it "returns true if the voucher is active" do
         voucher = FactoryBot.build(:voucher, expires_at: 1.day.from_now)

From 3a30f9794a2142aa03ea20d20cb8efb081f6e181 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 9 Aug 2024 14:52:41 +0200
Subject: [PATCH 018/191] Remove duplicate code

---
 app/controllers/vouchers_controller.rb                   | 4 ++--
 app/views/vouchers/{create_error.js.erb => error.js.erb} | 0
 app/views/vouchers/no_voucher_error.js.erb               | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename app/views/vouchers/{create_error.js.erb => error.js.erb} (100%)
 delete mode 100644 app/views/vouchers/no_voucher_error.js.erb

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 8244d5a7a..51adb3c9e 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -64,7 +64,7 @@ def handle_failed_save(format)
                     alert: error_message
       end
       format.js do
-        render "create_error", locals: { error_message: error_message }
+        render "error", locals: { error_message: error_message }
       end
     end
 
@@ -77,7 +77,7 @@ def handle_voucher_not_found
                         fallback_location: root_path)
         end
         format.js do
-          render "no_voucher_error",
+          render "error",
                  locals: { error_message: error_message }
         end
       end
diff --git a/app/views/vouchers/create_error.js.erb b/app/views/vouchers/error.js.erb
similarity index 100%
rename from app/views/vouchers/create_error.js.erb
rename to app/views/vouchers/error.js.erb
diff --git a/app/views/vouchers/no_voucher_error.js.erb b/app/views/vouchers/no_voucher_error.js.erb
deleted file mode 100644
index debc3873c..000000000
--- a/app/views/vouchers/no_voucher_error.js.erb
+++ /dev/null
@@ -1 +0,0 @@
-alert("<%= "#{j(error_message)}" %>");

From 5751c7ba98718a31246b5ae19d0b595b49ed882d Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 9 Aug 2024 14:57:52 +0200
Subject: [PATCH 019/191] remove unused variable

---
 app/assets/javascripts/copy_and_paste_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/copy_and_paste_button.js b/app/assets/javascripts/copy_and_paste_button.js
index 788dcf4ae..ce43ad7d6 100644
--- a/app/assets/javascripts/copy_and_paste_button.js
+++ b/app/assets/javascripts/copy_and_paste_button.js
@@ -1,5 +1,5 @@
 $(document).on("turbolinks:load", function () {
-  var clipboard = new Clipboard(".clipboard-btn");
+  new Clipboard(".clipboard-btn");
 
   $(document).on("click", ".clipboard-button", function () {
     $(".token-clipboard-popup").removeClass("show");

From 4149f5eef417702ea9fe11f66ab235e79e62a28a Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 9 Aug 2024 16:14:25 +0200
Subject: [PATCH 020/191] Add controller spec for vouchers

---
 spec/controllers/vouchers_controller.rb | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 spec/controllers/vouchers_controller.rb

diff --git a/spec/controllers/vouchers_controller.rb b/spec/controllers/vouchers_controller.rb
new file mode 100644
index 000000000..5b723c4d8
--- /dev/null
+++ b/spec/controllers/vouchers_controller.rb
@@ -0,0 +1,26 @@
+require "rails_helper"
+RSpec.describe(VouchersController, type: :controller) do
+  let(:user) { FactoryBot.create(:user) }
+  let(:lecture) { FactoryBot.create(:lecture, teacher: user) }
+  let(:voucher) { FactoryBot.create(:voucher, lecture: lecture) }
+
+  before do
+    sign_in user
+  end
+
+  describe "POST #create" do
+    it "creates a new voucher" do
+      expect do
+        post(:create, params: { voucher: { lecture_id: lecture.id, sort: "tutor" } })
+      end.to change(Voucher, :count).by(1)
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "deletes the voucher" do
+      expect do
+        delete(:destroy, params: { id: voucher.id })
+      end.to change(Voucher, :count).by(-1)
+    end
+  end
+end

From cab3981a753e4eca3f40f24f37f3266cc10bc5bd Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:06:46 +0200
Subject: [PATCH 021/191] Rewrite controller spec for vouchers

---
 app/controllers/application_controller.rb    |  5 +-
 spec/controllers/vouchers_controller.rb      | 26 ---------
 spec/controllers/vouchers_controller_spec.rb | 58 ++++++++++++++++++++
 spec/factories/vouchers.rb                   |  4 +-
 4 files changed, 64 insertions(+), 29 deletions(-)
 delete mode 100644 spec/controllers/vouchers_controller.rb
 create mode 100644 spec/controllers/vouchers_controller_spec.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0a5a60683..f89a07464 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :authenticate_user!
   before_action :set_locale
-  after_action :store_interaction, if: :user_signed_in?
+  after_action :store_interaction, if: :user_signed_in? # , unless: -> { Rails.env.test? }
 
   etag { current_user.try(:id) }
 
@@ -111,6 +111,9 @@ def store_interaction
       # as of Rack 2.0.8, the session_id is wrapped in a class of its own
       # it is not a string anymore
       # see https://github.com/rack/rack/issues/1433
+
+      return if request.session_options[:id].nil?
+
       InteractionSaver.perform_async(request.session_options[:id].public_id,
                                      request.original_fullpath,
                                      request.referer,
diff --git a/spec/controllers/vouchers_controller.rb b/spec/controllers/vouchers_controller.rb
deleted file mode 100644
index 5b723c4d8..000000000
--- a/spec/controllers/vouchers_controller.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require "rails_helper"
-RSpec.describe(VouchersController, type: :controller) do
-  let(:user) { FactoryBot.create(:user) }
-  let(:lecture) { FactoryBot.create(:lecture, teacher: user) }
-  let(:voucher) { FactoryBot.create(:voucher, lecture: lecture) }
-
-  before do
-    sign_in user
-  end
-
-  describe "POST #create" do
-    it "creates a new voucher" do
-      expect do
-        post(:create, params: { voucher: { lecture_id: lecture.id, sort: "tutor" } })
-      end.to change(Voucher, :count).by(1)
-    end
-  end
-
-  describe "DELETE #destroy" do
-    it "deletes the voucher" do
-      expect do
-        delete(:destroy, params: { id: voucher.id })
-      end.to change(Voucher, :count).by(-1)
-    end
-  end
-end
diff --git a/spec/controllers/vouchers_controller_spec.rb b/spec/controllers/vouchers_controller_spec.rb
new file mode 100644
index 000000000..37ef86fa3
--- /dev/null
+++ b/spec/controllers/vouchers_controller_spec.rb
@@ -0,0 +1,58 @@
+require "rails_helper"
+RSpec.describe(VouchersController, type: :controller) do
+  let(:teacher) { FactoryBot.create(:confirmed_user) }
+  let(:generic_user) { FactoryBot.create(:confirmed_user) }
+  let(:lecture) { FactoryBot.create(:lecture, teacher: teacher) }
+  let(:sort) { :tutor }
+
+  context "As an authorized user" do
+    before do
+      sign_in teacher
+    end
+
+    describe "POST #create" do
+      it "creates a new voucher" do
+        expect do
+          post(:create, params: { lecture_id: lecture.id, sort: sort })
+        end.to change(lecture.vouchers, :count).by(1)
+      end
+    end
+
+    describe "DELETE #destroy" do
+      it "deletes the voucher" do
+        voucher = FactoryBot.create(:voucher, lecture: lecture)
+        expect do
+          delete(:destroy, params: { id: voucher.id })
+        end.to change(lecture.vouchers, :count).by(-1)
+      end
+    end
+  end
+
+  context "As an unauthorized user" do
+    before do
+      sign_in generic_user
+    end
+
+    describe "POST #create" do
+      it "does not create a new voucher" do
+        expect do
+          post(:create, params: { lecture_id: lecture.id, sort: sort })
+        end.not_to change(lecture.vouchers, :count)
+      end
+
+      it "redirects to root path" do
+        post(:create, params: { lecture_id: lecture.id, sort: sort })
+        expect(response).to redirect_to(root_path)
+      end
+    end
+
+    describe "DELETE #destroy" do
+      it "does not delete the voucher" do
+        voucher = FactoryBot.create(:voucher, lecture: lecture)
+        expect do
+          delete(:destroy, params: { id: voucher.id })
+        end.not_to change(lecture.vouchers, :count)
+      end
+    end
+  end
+end
diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb
index 0b5524c4f..909a7be39 100644
--- a/spec/factories/vouchers.rb
+++ b/spec/factories/vouchers.rb
@@ -7,8 +7,8 @@
       sort { :tutor }
     end
 
-    trait :student do
-      sort { :student }
+    trait :editor do
+      sort { :editor }
     end
 
     trait :teacher do

From 5efa75387019c98ce16365c29db51e577c8b8c7a Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 11 Aug 2024 14:10:59 +0200
Subject: [PATCH 022/191] remove obsolete comment

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f89a07464..ea2e6c943 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   before_action :configure_permitted_parameters, if: :devise_controller?
   before_action :authenticate_user!
   before_action :set_locale
-  after_action :store_interaction, if: :user_signed_in? # , unless: -> { Rails.env.test? }
+  after_action :store_interaction, if: :user_signed_in?
 
   etag { current_user.try(:id) }
 

From 4ca6feae7c7325d533fca9fab3a635636000d475 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:00:43 +0200
Subject: [PATCH 023/191] Set up redemption of tutor vouchers

---
 app/abilities/lecture_ability.rb              |  4 +---
 app/abilities/voucher_ability.rb              |  2 ++
 app/controllers/lectures_controller.rb        | 22 +++++++++++++++++++
 app/controllers/vouchers_controller.rb        | 14 ++++++++++--
 app/helpers/vouchers_helper.rb                |  9 ++++++++
 app/models/lecture.rb                         | 20 +++++++++++++++++
 app/models/voucher.rb                         |  4 ++++
 app/views/lectures/error.js.erb               |  1 +
 app/views/profile/edit.html.erb               |  2 +-
 .../vouchers/_redeem_tutor_voucher.html.erb   | 17 ++++++++++++++
 app/views/vouchers/redeem.js.erb              | 10 +++++++++
 config/locales/de.yml                         |  7 ++++++
 config/locales/en.yml                         |  7 ++++++
 config/routes.rb                              |  4 ++++
 14 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 app/helpers/vouchers_helper.rb
 create mode 100644 app/views/lectures/error.js.erb
 create mode 100644 app/views/vouchers/_redeem_tutor_voucher.html.erb
 create mode 100644 app/views/vouchers/redeem.js.erb

diff --git a/app/abilities/lecture_ability.rb b/app/abilities/lecture_ability.rb
index 74f667ec5..9bec196ef 100644
--- a/app/abilities/lecture_ability.rb
+++ b/app/abilities/lecture_ability.rb
@@ -22,9 +22,7 @@ def initialize(user)
 
     # there is a redirect to the subscription page inside the controller
     # if the lecture is not a subscribed lecture of the user
-    can :show, Lecture
-
-    can :search, Lecture
+    can [:show, :search, :become_tutor], Lecture
 
     can [:show_announcements, :organizational, :show_structures,
          :search_examples, :show_random_quizzes,
diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb
index 3dbc42bff..d0727a667 100644
--- a/app/abilities/voucher_ability.rb
+++ b/app/abilities/voucher_ability.rb
@@ -7,5 +7,7 @@ def initialize(user)
     can [:create, :destroy], Voucher do |voucher|
       user.can_update_personell?(voucher.lecture)
     end
+
+    can :redeem, Voucher
   end
 end
diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 719f59540..e1f601ea6 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -297,6 +297,16 @@ def import_toc
     redirect_to edit_lecture_path(@lecture)
   end
 
+  def become_tutor
+    if Voucher.check_voucher(become_tutor_params[:voucher_hash])
+      selected_tutorials = @lecture.tutorials.where(id: become_tutor_params[:tutorial_ids])
+      @lecture.update_tutor_status!(current_user, selected_tutorials)
+      redirect_to edit_profile_path, notice: I18n.t("controllers.become_tutor_success")
+    else
+      handle_invalid_voucher
+    end
+  end
+
   private
 
     def set_lecture
@@ -455,4 +465,16 @@ def check_if_enough_questions
 
       redirect_to :root, alert: I18n.t("controllers.no_test")
     end
+
+    def become_tutor_params
+      params.permit(:voucher_hash, tutorial_ids: [])
+    end
+
+    def handle_invalid_voucher
+      error_message = I18n.t("controllers.voucher_invalid")
+      respond_to do |format|
+        format.js { render "error", locals: { error_message: error_message } }
+        format.html { redirect_to edit_profile_path, alert: error_message }
+      end
+    end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 51adb3c9e..215ab4aaa 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -1,7 +1,7 @@
 # app/controllers/vouchers_controller.rb
 class VouchersController < ApplicationController
   before_action :set_voucher, only: [:destroy]
-  authorize_resource except: [:create, :redeem]
+  authorize_resource except: :create
 
   def current_ability
     @current_ability ||= VoucherAbility.new(current_user)
@@ -30,7 +30,17 @@ def destroy
   end
 
   def redeem
-    render js: "alert('Voucher redeemed!')"
+    @voucher = Voucher.check_voucher(params[:voucher_hash])
+    respond_to do |format|
+      if @voucher
+        format.js
+        format.html { head :no_content }
+      else
+        error_message = I18n.t("controllers.voucher_invalid")
+        format.js { render "error", locals: { error_message: error_message } }
+        format.html { redirect_to edit_profile_path, alert: error_message }
+      end
+    end
   end
 
   private
diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
new file mode 100644
index 000000000..8b20db258
--- /dev/null
+++ b/app/helpers/vouchers_helper.rb
@@ -0,0 +1,9 @@
+module VouchersHelper
+  def tutorial_options(voucher)
+    voucher.lecture.tutorials.map { |t| [t.title, t.id] }
+  end
+
+  def given_tutorial_ids(user, voucher)
+    user.given_tutorials.where(lecture: voucher.lecture).pluck(:id)
+  end
+end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index ce4595ef9..7b5455acf 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -852,6 +852,18 @@ def active_voucher_of_sort(sort)
     vouchers.where(sort: sort).active&.first
   end
 
+  def update_tutor_status!(user, selected_tutorials)
+    tutorials.find_each do |t|
+      if selected_tutorials.include?(t)
+        add_tutor(t, user)
+      else
+        remove_tutor(t, user)
+      end
+    end
+    # touch to update the cache
+    touch
+  end
+
   private
 
     # used for after save callback
@@ -955,4 +967,12 @@ def only_one_lecture
 
       errors.add(:course, :already_present)
     end
+
+    def add_tutor(tutorial, user)
+      tutorial.tutors << user unless tutorial.tutors.include?(user)
+    end
+
+    def remove_tutor(tutorial, user)
+      tutorial.tutors.delete(user) if tutorial.tutors.include?(user)
+    end
 end
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 0d5001d92..e5a4f246f 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -17,6 +17,10 @@ def active?
     expires_at > Time.zone.now
   end
 
+  def self.check_voucher(secure_hash)
+    Voucher.active.find_by(secure_hash: secure_hash)
+  end
+
   private
 
     def generate_secure_hash
diff --git a/app/views/lectures/error.js.erb b/app/views/lectures/error.js.erb
new file mode 100644
index 000000000..debc3873c
--- /dev/null
+++ b/app/views/lectures/error.js.erb
@@ -0,0 +1 @@
+alert("<%= "#{j(error_message)}" %>");
diff --git a/app/views/profile/edit.html.erb b/app/views/profile/edit.html.erb
index 69ba4c401..ea2636887 100644
--- a/app/views/profile/edit.html.erb
+++ b/app/views/profile/edit.html.erb
@@ -120,7 +120,7 @@
           </div>
         </div>
       </div>
-      <div class="card-body">
+      <div class="card-body" id="redeem-voucher">
         <%= render partial: 'profile/redeem_voucher' %>
       </div>
     </div>
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
new file mode 100644
index 000000000..839df9ab6
--- /dev/null
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -0,0 +1,17 @@
+<p>
+  <%= t('profile.become_tutor', lecture: voucher.lecture.title) %>
+</p>
+<%= form_with url: become_tutor_path(voucher.lecture),
+                remote: true,
+                method: :post,
+                html: { class: "form-inline" } do |f| %>
+  <%= f.hidden_field :voucher_hash, value: voucher.secure_hash %>                 
+  <div class="form-group d-flex">                               
+    <%= f.select :tutorial_ids,
+                  options_for_select(tutorial_options(voucher),
+                  given_tutorial_ids(current_user,voucher)),
+                  { prompt: t('profile.select_tutorials') },
+                  { multiple: true, class: 'selectize me-2 w-50' } %>
+    <%= f.submit t('profile.take_over_tutorials'), class: "btn btn-primary" %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/redeem.js.erb b/app/views/vouchers/redeem.js.erb
new file mode 100644
index 000000000..64c7091e3
--- /dev/null
+++ b/app/views/vouchers/redeem.js.erb
@@ -0,0 +1,10 @@
+$("#redeem-voucher").empty()
+  .append("<%= j render partial: 'vouchers/redeem_tutor_voucher', locals: { voucher: @voucher } %>");
+;
+// activate selectize
+// @reviewer: This is used several times in our code base (in the coffeescript
+// variant). Should we extract this into a function in order to avoid code
+// duplication?)
+$(".selectize").each(function () {
+  new TomSelect("#" + this.id, { plugins: ["remove_button"] });
+});
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 30ab2c082..60cfb9809 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2170,6 +2170,11 @@ de:
     data_request_sent: >
       Wir haben Deine Anfrage erhalten und werden Dir Deine Daten zeitnah schicken.
     redeem_voucher: Gutschein einlösen
+    become_tutor: >
+      Mit diesem Gutschein kannst Du ein oder mehrere Tutorien in der
+      Vorlesung %{lecture} übernehmen.
+    select_tutorials: Tutorien auswählen
+    take_over_tutorials: Tutorien übernehmen
   mampf_news:
     title: 'MaMpf-News'
     check_notifications: 'Alle erledigen'
@@ -3662,6 +3667,8 @@ de:
     no_assignments_in_lecture: >
       In dieser Veranstaltung gibt es bisher keine Hausaufgaben.
     no_voucher: 'Ein Gutschein mit der angeforderten id existiert nicht.'
+    voucher_invalid: 'Der Gutschein ist ungültig.'
+    become_tutor_success: 'Dein Tutorenstatus wurde geupdatet.'
     tutorials:
       destruction_failed: >
         Das Tutorium konnte nicht gelöscht werden. Das kann z.B. daran liegen,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1747fef95..65258967a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2040,6 +2040,10 @@ en:
     data_request_sent: >
       We have received your request and will send you your data as soon as possible.
     redeem_voucher: Redeeem Voucher
+    become_tutor: >
+      With this voucher, you can become a tutor in the lecture %{lecture}.
+    select_tutorials: Select Tutorials
+    take_over_tutorials: Take Over Tutorials
   mampf_news:
     title: 'MaMpf News'
     check_notifications: 'Clear all'
@@ -3470,6 +3474,9 @@ en:
     no_assignments_in_lecture: >
       In this event series there are no assigments yet.
     no_voucher: 'There is no voucher with this id.'
+    voucher_invalid: 'This voucher is invalid.'
+    become_tutor_success: >
+      Your tutor status has been updated.
     tutorials:
       destruction_failed: >
         The tutorial could not be deleted. That may be because there are already
diff --git a/config/routes.rb b/config/routes.rb
index 377cded4c..c8abbb007 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -287,6 +287,10 @@
        to: "lectures#import_toc",
        as: "import_lecture_toc"
 
+  post "lectures/:id/become_tutor",
+       to: "lectures#become_tutor",
+       as: "become_tutor"
+
   resources :lectures, except: [:index]
 
   # lessons routes

From 555843bc6631d830d4abafa0c51f804b69efbf6f Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 13 Aug 2024 15:01:28 +0200
Subject: [PATCH 024/191] Remove user lookup for tutor positions

---
 app/helpers/tutorials_helper.rb    |  9 ++++-----
 app/models/tutorial.rb             |  4 ++++
 app/views/tutorials/_form.html.erb | 10 ++--------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/helpers/tutorials_helper.rb b/app/helpers/tutorials_helper.rb
index 7cb929bf7..5046e5bab 100644
--- a/app/helpers/tutorials_helper.rb
+++ b/app/helpers/tutorials_helper.rb
@@ -6,11 +6,10 @@ def cancel_editing_tutorial_path(tutorial)
     cancel_new_tutorial_path(params: { lecture: tutorial.lecture })
   end
 
-  def tutorial_preselection(tutorial)
-    return [[]] unless tutorial.persisted? && tutorial.tutors.any?
-
-    options_for_select(tutorial.tutors.map { |t| [t.tutorial_info, t.id] },
-                       tutorial.tutor_ids)
+  def tutors_preselection(tutorial)
+    options_for_select(tutorial.eligible_as_tutors.map do |t|
+                         [t.tutorial_info, t.id]
+                       end, tutorial.tutor_ids)
   end
 
   def tutorials_selection(lecture)
diff --git a/app/models/tutorial.rb b/app/models/tutorial.rb
index 824f390cf..c3d7158b3 100644
--- a/app/models/tutorial.rb
+++ b/app/models/tutorial.rb
@@ -41,6 +41,10 @@ def teams_to_csv(assignment)
     end
   end
 
+  def eligible_as_tutors
+    (lecture.tutors + lecture.editors + [lecture.teacher]).uniq
+  end
+
   private
 
     def check_destructibility
diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb
index 1fe039da7..80e038fe1 100644
--- a/app/views/tutorials/_form.html.erb
+++ b/app/views/tutorials/_form.html.erb
@@ -13,17 +13,11 @@
       </div>
       <div class="form-group col-4">
         <%= f.select :tutor_ids,
-                     tutorial_preselection(tutorial),
+                     tutors_preselection(tutorial),
                      {},
                      { class: 'selectize',
                        multiple: true,
-                       style: 'display: none;',
-                       id: "tutorial_tutor_ids_#{tutorial.id}",
-                       data: { ajax: true,
-                               filled: false,
-                               model: 'user',
-                               placeholder: t('basics.enter_two_letters'),
-                               no_results: t('basics.no_results') } } %>
+                       id: "tutorial_tutor_ids_#{tutorial.id}" } %>
       </div>
       <div class="form-group col-4">
         <%= f.submit t('buttons.save'),

From 7b7b157c9126e12b1dbecadc3978660804e97979 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 13 Aug 2024 17:30:31 +0200
Subject: [PATCH 025/191] Set up redemption of editor vouchers

---
 app/abilities/lecture_ability.rb                   |  2 +-
 app/controllers/lectures_controller.rb             | 13 +++++++++++++
 app/helpers/lectures_helper.rb                     |  6 ++++++
 app/models/lecture.rb                              | 14 +++++++++++++-
 app/views/lectures/edit/_people.html.erb           | 14 +++-----------
 app/views/vouchers/_redeem_editor_voucher.html.erb |  8 ++++++++
 app/views/vouchers/redeem.js.erb                   |  2 +-
 config/locales/de.yml                              |  5 +++++
 config/locales/en.yml                              |  5 +++++
 config/routes.rb                                   |  4 ++++
 10 files changed, 59 insertions(+), 14 deletions(-)
 create mode 100644 app/views/vouchers/_redeem_editor_voucher.html.erb

diff --git a/app/abilities/lecture_ability.rb b/app/abilities/lecture_ability.rb
index 9bec196ef..ac569e175 100644
--- a/app/abilities/lecture_ability.rb
+++ b/app/abilities/lecture_ability.rb
@@ -22,7 +22,7 @@ def initialize(user)
 
     # there is a redirect to the subscription page inside the controller
     # if the lecture is not a subscribed lecture of the user
-    can [:show, :search, :become_tutor], Lecture
+    can [:show, :search, :become_tutor, :become_editor], Lecture
 
     can [:show_announcements, :organizational, :show_structures,
          :search_examples, :show_random_quizzes,
diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index e1f601ea6..dfbf757d0 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -307,6 +307,15 @@ def become_tutor
     end
   end
 
+  def become_editor
+    if Voucher.check_voucher(become_editor_params[:voucher_hash])
+      @lecture.update_editor_status!(current_user)
+      redirect_to edit_profile_path, notice: I18n.t("controllers.become_editor_success")
+    else
+      handle_invalid_voucher
+    end
+  end
+
   private
 
     def set_lecture
@@ -470,6 +479,10 @@ def become_tutor_params
       params.permit(:voucher_hash, tutorial_ids: [])
     end
 
+    def become_editor_params
+      params.permit(:voucher_hash)
+    end
+
     def handle_invalid_voucher
       error_message = I18n.t("controllers.voucher_invalid")
       respond_to do |format|
diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index b7d7f739e..caa58c4c3 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -129,4 +129,10 @@ def lecture_view_icon(lecture)
       tag.i(class: "fas fa-eye")
     end
   end
+
+  def editors_preselection(lecture)
+    options_for_select(lecture.eligible_as_editors.map do |editor|
+                         [editor.name, editor.id]
+                       end, lecture.editor_ids)
+  end
 end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 7b5455acf..7851e4768 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -860,10 +860,22 @@ def update_tutor_status!(user, selected_tutorials)
         remove_tutor(t, user)
       end
     end
-    # touch to update the cache
+    # touch to invalidate the cache
     touch
   end
 
+  def update_editor_status!(user)
+    return if editors.include?(user)
+
+    editors << user
+    # touch to invalidate the cache
+    touch
+  end
+
+  def eligible_as_editors
+    (editors + course.editors).uniq
+  end
+
   private
 
     # used for after save callback
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index e1d047f46..16268220e 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -10,9 +10,7 @@
         <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
         <div id="lecture_teacher_select" %>
           <%= f.select :teacher_id,
-                        options_for_select([[lecture.teacher.info,
-                                            lecture.teacher.id]],
-                                            lecture.teacher.id),
+                        editors_preselection(lecture),
                         {},
                         { class: 'selectize',
                           data: { ajax: true,
@@ -34,17 +32,11 @@
         <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
         <div id="lecture_editors_select" %>
           <%= f.select :editor_ids,
-                        options_for_select([[t('none'), '']] +
-                                          lecture.select_editors,
+                        options_for_select(lecture.select_editors,
                                           lecture.editors.map(&:id)),
                         {},
                         { multiple: true,
-                          class: 'selectize',
-                          data: { ajax: true,
-                                  model: 'user',
-                                  filled: false,
-                                  placeholder: t('basics.enter_two_letters'),
-                                  no_results: t('basics.no_results') } } %>
+                          class: 'selectize' } %>
         </div>
       </div>
     </div>
diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
new file mode 100644
index 000000000..ca66b16f2
--- /dev/null
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -0,0 +1,8 @@
+<%= t('profile.become_editor', lecture: voucher.lecture.title) %>
+<%= link_to become_editor_path(voucher.lecture,
+                               params: { voucher_hash: voucher.secure_hash }),
+            class: 'btn btn-primary',
+            method: :post,
+            remote: true do %>
+  <%= t('buttons.become_editor') %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/redeem.js.erb b/app/views/vouchers/redeem.js.erb
index 64c7091e3..6e1c5b10b 100644
--- a/app/views/vouchers/redeem.js.erb
+++ b/app/views/vouchers/redeem.js.erb
@@ -1,5 +1,5 @@
 $("#redeem-voucher").empty()
-  .append("<%= j render partial: 'vouchers/redeem_tutor_voucher', locals: { voucher: @voucher } %>");
+  .append("<%= j render partial: 'vouchers/redeem_' + @voucher.sort + '_voucher', locals: { voucher: @voucher } %>");
 ;
 // activate selectize
 // @reviewer: This is used several times in our code base (in the coffeescript
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 60cfb9809..8349fe08f 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2175,6 +2175,9 @@ de:
       Vorlesung %{lecture} übernehmen.
     select_tutorials: Tutorien auswählen
     take_over_tutorials: Tutorien übernehmen
+    become_editor: >
+      Mit diesem Gutschein kannst Du Editorenrechte für die Veranstaltung
+      %{lecture} übernehmen.
   mampf_news:
     title: 'MaMpf-News'
     check_notifications: 'Alle erledigen'
@@ -3549,6 +3552,7 @@ de:
     cancel_publication: 'Stornieren'
     import_lecture_toc: 'Gliederung importieren'
     import_toc: 'Importieren'
+    become_editor: 'EditorIn werden'
   warnings:
     save_before: >
       Du musst zunächst die anderen Änderungen speichern oder verwerfen.
@@ -3669,6 +3673,7 @@ de:
     no_voucher: 'Ein Gutschein mit der angeforderten id existiert nicht.'
     voucher_invalid: 'Der Gutschein ist ungültig.'
     become_tutor_success: 'Dein Tutorenstatus wurde geupdatet.'
+    become_editor_success: 'Dein Editorenstatus wurde geupdatet.'
     tutorials:
       destruction_failed: >
         Das Tutorium konnte nicht gelöscht werden. Das kann z.B. daran liegen,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65258967a..5f8943fc2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2044,6 +2044,8 @@ en:
       With this voucher, you can become a tutor in the lecture %{lecture}.
     select_tutorials: Select Tutorials
     take_over_tutorials: Take Over Tutorials
+    become_editor: >
+      With this voucher, you can become an editor in the event series %{lecture}.
   mampf_news:
     title: 'MaMpf News'
     check_notifications: 'Clear all'
@@ -3365,6 +3367,7 @@ en:
     cancel_publication: 'Cancel'
     import_lecture_toc: 'Import TOC'
     import_toc: 'Import'
+    become_editor: 'Become Editor'
   confirmation:
     generic: 'Are you sure?'
     delete_graph: >
@@ -3477,6 +3480,8 @@ en:
     voucher_invalid: 'This voucher is invalid.'
     become_tutor_success: >
       Your tutor status has been updated.
+    become_editor_success: >
+      Your editor status has been updated.
     tutorials:
       destruction_failed: >
         The tutorial could not be deleted. That may be because there are already
diff --git a/config/routes.rb b/config/routes.rb
index c8abbb007..05cae4906 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -291,6 +291,10 @@
        to: "lectures#become_tutor",
        as: "become_tutor"
 
+  post "lectures/:id/become_editor",
+       to: "lectures#become_editor",
+       as: "become_editor"
+
   resources :lectures, except: [:index]
 
   # lessons routes

From 0da405e87cd554f6b0c81cce50fba4c58773150e Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 15 Aug 2024 16:33:02 +0200
Subject: [PATCH 026/191] Add Contract Model and setup selection of tutors and
 editors

---
 app/controllers/lectures_controller.rb        | 13 +++++---
 app/helpers/lectures_helper.rb                |  2 +-
 app/helpers/tutorials_helper.rb               |  2 +-
 app/models/contract.rb                        | 11 +++++++
 app/models/lecture.rb                         | 26 ++++++++++++++-
 app/models/tutorial.rb                        |  4 ---
 app/models/user.rb                            |  3 ++
 app/views/lectures/edit/_people.html.erb      | 33 ++++++++++---------
 config/locales/de.yml                         |  4 +--
 config/locales/en.yml                         |  2 ++
 db/migrate/20240815143156_create_contracts.rb | 11 +++++++
 db/schema.rb                                  | 14 +++++++-
 12 files changed, 95 insertions(+), 30 deletions(-)
 create mode 100644 app/models/contract.rb
 create mode 100644 db/migrate/20240815143156_create_contracts.rb

diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index c897cf35a..742325c02 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -105,10 +105,7 @@ def update
       recipients = User.where(id: new_ids)
 
       recipients.each do |r|
-        NotificationMailer.with(recipient: r,
-                                locale: r.locale,
-                                lecture: @lecture)
-                          .new_editor_email.deliver_later
+        notify_new_editor_by_mail(r)
       end
     end
 
@@ -312,6 +309,7 @@ def become_tutor
   def become_editor
     if Voucher.check_voucher(become_editor_params[:voucher_hash])
       @lecture.update_editor_status!(current_user)
+      notify_new_editor_by_mail(current_user)
       redirect_to edit_profile_path, notice: I18n.t("controllers.become_editor_success")
     else
       handle_invalid_voucher
@@ -492,4 +490,11 @@ def handle_invalid_voucher
         format.html { redirect_to edit_profile_path, alert: error_message }
       end
     end
+
+    def notify_new_editor_by_mail(editor)
+      NotificationMailer.with(recipient: editor,
+                              locale: editor.locale,
+                              lecture: @lecture)
+                        .new_editor_email.deliver_later
+    end
 end
diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index caa58c4c3..df6303c94 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -132,7 +132,7 @@ def lecture_view_icon(lecture)
 
   def editors_preselection(lecture)
     options_for_select(lecture.eligible_as_editors.map do |editor|
-                         [editor.name, editor.id]
+                         [editor.info, editor.id]
                        end, lecture.editor_ids)
   end
 end
diff --git a/app/helpers/tutorials_helper.rb b/app/helpers/tutorials_helper.rb
index 5046e5bab..533099896 100644
--- a/app/helpers/tutorials_helper.rb
+++ b/app/helpers/tutorials_helper.rb
@@ -7,7 +7,7 @@ def cancel_editing_tutorial_path(tutorial)
   end
 
   def tutors_preselection(tutorial)
-    options_for_select(tutorial.eligible_as_tutors.map do |t|
+    options_for_select(tutorial.lecture.eligible_as_tutors.map do |t|
                          [t.tutorial_info, t.id]
                        end, tutorial.tutor_ids)
   end
diff --git a/app/models/contract.rb b/app/models/contract.rb
new file mode 100644
index 000000000..cf1cd1f98
--- /dev/null
+++ b/app/models/contract.rb
@@ -0,0 +1,11 @@
+class Contract < ApplicationRecord
+  belongs_to :user
+  belongs_to :lecture
+
+  scope :tutors, -> { where(role: ROLE_HASH[:tutor]) }
+  scope :editors, -> { where(role: ROLE_HASH[:editor]) }
+
+  ROLE_HASH = { tutor: 0, editor: 1 }.freeze
+
+  enum role: ROLE_HASH
+end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 7851e4768..a9867d658 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -67,6 +67,10 @@ class Lecture < ApplicationRecord
   # users to tutors, editors or teachers
   has_many :vouchers, dependent: :destroy
 
+  # a lecture has many student assistants
+  has_many :contracts, dependent: :destroy
+  # has_many :assistants, -> { distinct }, through: :contracts, source: :assistant
+
   # a lecture has many structure_ids, referring to the ids of structures
   # in the erdbeere database
   serialize :structure_ids, type: Array, coder: YAML
@@ -860,6 +864,7 @@ def update_tutor_status!(user, selected_tutorials)
         remove_tutor(t, user)
       end
     end
+    Contract.create(user: user, lecture: self, role: :tutor)
     # touch to invalidate the cache
     touch
   end
@@ -868,12 +873,31 @@ def update_editor_status!(user)
     return if editors.include?(user)
 
     editors << user
+    Contract.create(user: user, lecture: self, role: :editor)
     # touch to invalidate the cache
     touch
   end
 
+  def eligible_as_tutors
+    (tutors + tutors_with_contract + editors + [teacher]).uniq
+    # the first one should (in the future) actually be contained in the sum of
+    # the other ones, but in the transition phase where some tutor statuses were
+    # still given by the old system, this will not be true
+  end
+
   def eligible_as_editors
-    (editors + course.editors).uniq
+    (editors + editors_with_contract + course.editors - [teacher]).uniq
+    # the first one should (in the future) actually be contained in the sum of
+    # the other ones, but in the transition phase where some editor statuses were
+    # still given by the old system, this will not be true
+  end
+
+  def tutors_with_contract
+    User.where(id: Contract.where(lecture: self, role: :tutor).select(:user_id))
+  end
+
+  def editors_with_contract
+    User.where(id: Contract.where(lecture: self, role: :editor).select(:user_id))
   end
 
   private
diff --git a/app/models/tutorial.rb b/app/models/tutorial.rb
index c3d7158b3..824f390cf 100644
--- a/app/models/tutorial.rb
+++ b/app/models/tutorial.rb
@@ -41,10 +41,6 @@ def teams_to_csv(assignment)
     end
   end
 
-  def eligible_as_tutors
-    (lecture.tutors + lecture.editors + [lecture.teacher]).uniq
-  end
-
   private
 
     def check_destructibility
diff --git a/app/models/user.rb b/app/models/user.rb
index 3952d0d1d..57be5375a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -81,6 +81,9 @@ class User < ApplicationRecord
 
   has_many :feedbacks, dependent: :destroy
 
+  # a user has contracts as asssistant in lectures
+  has_many :contracts, dependent: :destroy
+
   include ScreenshotUploader[:image]
 
   # if a homepage is given it should at leat be a valid address
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index 16268220e..eeadb8acf 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -9,17 +9,19 @@
                   class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
         <div id="lecture_teacher_select" %>
-          <%= f.select :teacher_id,
-                        editors_preselection(lecture),
-                        {},
-                        { class: 'selectize',
-                          data: { ajax: true,
-                             model: 'user',
-                                  filled: false,
-                                  placeholder:
-                                    t('basics.enter_two_letters'),
-                                  no_results:
-                                    t('basics.no_results') } } %>
+          <%= f.select :teacher_id, 
+                       options_for_select([[lecture.teacher.info,
+                       lecture.teacher.id]],
+                       lecture.teacher.id),
+                       {},
+                       { class: 'selectize',
+                         data: { ajax: true,
+                                 model: 'user',
+                                 filled: false,
+                                 placeholder:
+                                   t('basics.enter_two_letters'),
+                                 no_results:
+                                   t('basics.no_results') } } %>
           <div class="invalid-feedback" id="lecture-teacher-error">
           </div>
         </div>
@@ -32,11 +34,10 @@
         <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
         <div id="lecture_editors_select" %>
           <%= f.select :editor_ids,
-                        options_for_select(lecture.select_editors,
-                                          lecture.editors.map(&:id)),
-                        {},
-                        { multiple: true,
-                          class: 'selectize' } %>
+                       editors_preselection(lecture),
+                       {},
+                       { multiple: true,
+                         class: 'selectize' } %>
         </div>
       </div>
     </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f929faa4c..f17c04ea4 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2188,8 +2188,8 @@ de:
       Wir haben Deine Anfrage erhalten und werden Dir Deine Daten zeitnah schicken.
     redeem_voucher: Gutschein einlösen
     become_tutor: >
-      Mit diesem Gutschein kannst Du ein oder mehrere Tutorien in der
-      Vorlesung %{lecture} übernehmen.
+      Mit diesem Gutschein kannst Du TutorIn in der Vorlesung %{lecture} werden.
+      Wenn Du schon weißt, welche Tutorien du übernimmst, kannst du diese hier auswählen.
     select_tutorials: Tutorien auswählen
     take_over_tutorials: Tutorien übernehmen
     become_editor: >
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2cea0b28a..7ab98a237 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2059,6 +2059,8 @@ en:
     redeem_voucher: Redeeem Voucher
     become_tutor: >
       With this voucher, you can become a tutor in the lecture %{lecture}.
+      If you already know which tutorials you will be responsible for, 
+      you can select them here.
     select_tutorials: Select Tutorials
     take_over_tutorials: Take Over Tutorials
     become_editor: >
diff --git a/db/migrate/20240815143156_create_contracts.rb b/db/migrate/20240815143156_create_contracts.rb
new file mode 100644
index 000000000..34bc99455
--- /dev/null
+++ b/db/migrate/20240815143156_create_contracts.rb
@@ -0,0 +1,11 @@
+class CreateContracts < ActiveRecord::Migration[7.1]
+  def change
+    create_table :contracts do |t|
+      t.references :user, null: false, foreign_key: true
+      t.references :lecture, null: false, foreign_key: true
+      t.integer :role, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9567b1f57..d7ac3b0ea 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_07_28_123817) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_15_143156) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -140,6 +140,16 @@
     t.index ["commontable_type", "commontable_id"], name: "index_commontator_threads_on_c_id_and_c_type", unique: true
   end
 
+  create_table "contracts", force: :cascade do |t|
+    t.bigint "user_id", null: false
+    t.bigint "lecture_id", null: false
+    t.integer "role", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["lecture_id"], name: "index_contracts_on_lecture_id"
+    t.index ["user_id"], name: "index_contracts_on_user_id"
+  end
+
   create_table "course_self_joins", force: :cascade do |t|
     t.bigint "course_id"
     t.bigint "preceding_course_id"
@@ -950,6 +960,8 @@
   add_foreign_key "commontator_comments", "commontator_comments", column: "parent_id", on_update: :restrict, on_delete: :cascade
   add_foreign_key "commontator_comments", "commontator_threads", column: "thread_id", on_update: :cascade, on_delete: :cascade
   add_foreign_key "commontator_subscriptions", "commontator_threads", column: "thread_id", on_update: :cascade, on_delete: :cascade
+  add_foreign_key "contracts", "lectures"
+  add_foreign_key "contracts", "users"
   add_foreign_key "course_self_joins", "courses"
   add_foreign_key "divisions", "programs"
   add_foreign_key "feedbacks", "users"

From 6c8d6571f50590e42ab8696ec38fa71ab2a7da01 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 15 Aug 2024 19:59:21 +0200
Subject: [PATCH 027/191] Set up notifications for redemption of tutor vouchers

---
 app/controllers/lectures_controller.rb        | 45 +++++++++++++++++++
 app/helpers/notifications_helper.rb           | 31 +++++++++++++
 app/models/lecture.rb                         |  4 ++
 app/models/notification.rb                    | 10 ++++-
 app/views/lectures/edit/_vouchers.html.erb    |  1 +
 config/locales/de.yml                         | 13 ++++++
 config/locales/en.yml                         | 13 ++++++
 ...40815174623_add_details_to_notification.rb |  5 +++
 db/schema.rb                                  |  3 +-
 9 files changed, 123 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20240815174623_add_details_to_notification.rb

diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 742325c02..039dcb257 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -300,6 +300,7 @@ def become_tutor
     if Voucher.check_voucher(become_tutor_params[:voucher_hash])
       selected_tutorials = @lecture.tutorials.where(id: become_tutor_params[:tutorial_ids])
       @lecture.update_tutor_status!(current_user, selected_tutorials)
+      create_became_tutor_notification(selected_tutorials)
       redirect_to edit_profile_path, notice: I18n.t("controllers.become_tutor_success")
     else
       handle_invalid_voucher
@@ -497,4 +498,48 @@ def notify_new_editor_by_mail(editor)
                               lecture: @lecture)
                         .new_editor_email.deliver_later
     end
+
+    # def create_became_tutor_notification(selected_tutorials)
+    #   @lecture.editors_and_teacher.each do |editor|
+    #     details = I18n.t("notifications.became_tutor", user: current_user.info,
+    #                                                    locale: editor.locale)
+    #     if selected_tutorials
+    #       details << I18n.t("notifications.tutorial_details",
+    #                         tutorials: selected_tutorials.map(&:title).join(", "),
+    #                         locale: editor.locale)
+    #     end
+    #     Notification.create(recipient: editor,
+    #                         notifiable: @lecture,
+    #                         action: "redemption",
+    #                         details: details)
+    #   end
+    # end
+
+    def create_became_tutor_notification(selected_tutorials)
+      @lecture.editors_and_teacher.each do |editor|
+        details = build_notification_details(editor, selected_tutorials)
+        create_notification(editor, details)
+      end
+    end
+
+    def build_notification_details(editor, selected_tutorials)
+      details = I18n.t("notifications.became_tutor", user: current_user.info,
+                                                     locale: editor.locale)
+      if selected_tutorials
+        tutorial_titles = selected_tutorials.map(&:title).join(", ")
+        details << I18n.t("notifications.tutorial_details",
+                          tutorials: tutorial_titles,
+                          locale: editor.locale)
+      end
+      details
+    end
+
+    def create_notification(editor, details)
+      Notification.create(
+        recipient: editor,
+        notifiable: @lecture,
+        action: "redemption",
+        details: details
+      )
+    end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index be7160ec2..fb2bedab2 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -7,6 +7,7 @@ def notification_menu_item_header(notification)
     return medium_notification_item_header(notifiable) if notification.medium?
     return course_notification_item_header(notifiable) if notification.course?
     return lecture_notification_item_header(notifiable) if notification.lecture?
+    return redemption_notification_item_header(notifiable) if notification.redemption?
 
     announcement_notification_item_header(notifiable)
   end
@@ -17,6 +18,7 @@ def notification_menu_item_details(notification)
     return medium_notification_item_details(notifiable) if notification.medium?
     return course_notification_item_details(notifiable) if notification.course?
     return lecture_notification_item_details(notifiable) if notification.lecture?
+    return redemption_notification_item_details(notification) if notification.redemption?
 
     ""
   end
@@ -26,6 +28,7 @@ def notification_color(notification)
     return "bg-post-it-blue" if notification.generic_announcement?
     return "bg-post-it-red" if notification.announcement?
     return "bg-post-it-orange" if notification.course? || notification.lecture?
+    return "bg-post-it-green" if notification.redemption?
 
     "bg-post-it-yellow"
   end
@@ -39,6 +42,8 @@ def notification_header(notification)
       t("notifications.course_selection")
     elsif notification.lecture_announcement?
       announcement_notification_card_header(notifiable)
+    elsif notification.redemption?
+      redemption_notification_card_header(notifiable)
     else
       link_to(t("mampf_news.title"), news_path, class: "text-dark")
     end
@@ -53,6 +58,8 @@ def notification_text(notification)
       course_notification_card_text(notifiable)
     elsif notification.lecture?
       lecture_notification_card_text(notifiable)
+    elsif notification.redemption?
+      t("notifications.redemption")
     else
       t("notifications.new_announcement")
     end
@@ -69,6 +76,8 @@ def notification_link(notification)
       course_notification_card_link
     elsif notification.lecture?
       lecture_notification_card_link
+    elsif notification.redemption?
+      notification.details
     else
       notifiable.details
     end
@@ -80,4 +89,26 @@ def items_card_size(small, comments_below)
 
     "70vh"
   end
+
+  # create text for lecture announcement in notification card header
+  def redemption_notification_card_header(lecture)
+    link_to(lecture.title_for_viewers,
+            edit_lecture_path(lecture, anchor: "people"),
+            class: "text-dark")
+  end
+
+  def redemption_notification_item_header(lecture)
+    t("notifications.redemption_in_lecture", lecture: lecture.title_for_viewers)
+  end
+
+  def redemption_notification_item_details(notification)
+    extract_name_from_redemption_details(notification.details)
+  end
+
+  # this a admittedly a hack but I did not want to add another column to
+  # the notifications table
+  def extract_name_from_redemption_details(details)
+    match_data = details.match(/^(.+?) \(.+\)/)
+    match_data ? match_data[1] : nil
+  end
 end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index a9867d658..4cc9cf0b1 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -900,6 +900,10 @@ def editors_with_contract
     User.where(id: Contract.where(lecture: self, role: :editor).select(:user_id))
   end
 
+  def editors_and_teacher
+    [teacher] + editors
+  end
+
   private
 
     # used for after save callback
diff --git a/app/models/notification.rb b/app/models/notification.rb
index ee62b890c..fda36e0dc 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -20,6 +20,7 @@ class Notification < ApplicationRecord
   # and teachable for a notification of type medium, nil otherwise
   def teachable
     return if notifiable.blank?
+    return notifiable.lecture if notifiable_type == "redemption"
     return if notifiable_type.in?(["Lecture", "Course"])
     return notifiable.lecture if notifiable_type == "Announcement"
 
@@ -34,6 +35,7 @@ def teachable
   # all other cases: notifiable path
   def path(user)
     return if notifiable.blank?
+    return edit_lecture_path(notifiable, anchor: "people") if action == "redemption"
     return edit_profile_path if notifiable_type.in?(["Course", "Lecture"])
 
     if notifiable_type == "Announcement"
@@ -67,7 +69,13 @@ def course?
   def lecture?
     return false if notifiable.blank?
 
-    notifiable.instance_of?(::Lecture)
+    notifiable.instance_of?(::Lecture) && action != "redemption"
+  end
+
+  def redemption?
+    return false if notifiable.blank?
+
+    action == "redemption"
   end
 
   def announcement?
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb
index 55b2ebe7f..11f12e43f 100644
--- a/app/views/lectures/edit/_vouchers.html.erb
+++ b/app/views/lectures/edit/_vouchers.html.erb
@@ -8,6 +8,7 @@
     <h4 class="lecture-pane-subheader">
       <%= t("basics.voucher_for",
              sort: t("basics.#{sort}s")) %>
+      <%= helpdesk(t("admin.lecture.info.voucher_for_#{sort}"), false) %>
     </h4>  
   <div id='<%= "#{sort}"%>-voucher'>
     <%= render partial: 'vouchers/voucher',
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f17c04ea4..c120693b9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -729,6 +729,12 @@ de:
           Hausaufgaben noch Dateiuploads möglich sind (diese werden aber dann
           aber als verspätet gekennzeichnet und mit einem Zeitstempel versehen.)
         section_needed: Bitte erstelle zuerst einen Abschnitt
+        voucher_for_tutor: >
+          Gutscheine für TutorInnen können von NutzerInnen eingelöst werden, um
+          TutorIn für diese Veranstaltung zu werden.
+        voucher_for_editor: >
+          Gutscheine für EditorInnen können von NutzerInnen eingelöst werden, um
+          EditorIn für diese Veranstaltung zu werden.
       show_media: 'Medien einblenden'
       workflow: 'Workflow'
       content_mode: 'Inhaltsermittlung'
@@ -2230,6 +2236,13 @@ de:
       new_post_html: 'Im %{board} gibt es ein ungelesenes Thema.'
       new_posts_html: 'Im %{board} gibt es %{count} ungelesene Themen.'
     no_notifications: 'Es liegen keine neuen Benachrichtigungen für Dich vor.'
+    became_tutor: >
+      %{user} hat einen TutorInnen-Gutschein eingelöst und ist jetzt TutorIn in der
+      Veranstaltung.
+    tutorial_details: >
+      Neu übernommene Tutorien: %{tutorials}.
+    redemption: 'Gutschein eingelöst:'
+    redemption_in_lecture: 'Gutschein eingelöst in %{lecture}'
   lecture:
     content: 'Veranstaltungsinhalt'
     unpublished: 'Diese Veranstaltung ist unveröffentlicht.'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7ab98a237..af2614e9e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -698,6 +698,12 @@ en:
           grace period is expired will be accepted by the system, but will be
           timestamped and marked as "too late".
         section_needed: Please create a section first
+        voucher_for_tutor: >
+          Vouchers for tutors can be redeemed by users to become tutor for this
+          event series.
+        voucher_for_editor: >
+          Vouchers for editors can be redeemed by users to become additional
+          editor for this event series.
       show_media: 'Show media'
       workflow: 'Workflow'
       content_mode: 'Content determination'
@@ -2100,6 +2106,13 @@ en:
       new_post_html: 'There is an unread topic in the %{board}.'
       new_posts_html: 'There are %{count} unread topics in the %{board}.'
     no_notifications: 'There are no new notifications for you.'
+    became_tutor: >
+      %{user} has redeemed a tutor voucher and has therefore become tutor
+      in the event series.
+    tutorial_details: >
+      Tutorials taken over: %{tutorials}.
+    redemption: 'Voucher redeemed:'
+    redemption_in_lecture: 'Voucher redeemed in %{lecture}'    
   lecture:
     content: 'Event series contents'
     unpublished: 'This event series is unpublished.'
diff --git a/db/migrate/20240815174623_add_details_to_notification.rb b/db/migrate/20240815174623_add_details_to_notification.rb
new file mode 100644
index 000000000..75d98a0f6
--- /dev/null
+++ b/db/migrate/20240815174623_add_details_to_notification.rb
@@ -0,0 +1,5 @@
+class AddDetailsToNotification < ActiveRecord::Migration[7.1]
+  def change
+    add_column :notifications, :details, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d7ac3b0ea..900a8d974 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_08_15_143156) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_15_174623) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -409,6 +409,7 @@
     t.text "action"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.text "details"
     t.index ["notifiable_id", "notifiable_type"], name: "index_notifications_on_notifiable_id_and_notifiable_type"
     t.index ["recipient_id"], name: "index_notifications_on_recipient_id"
   end

From 93d54f9379ae8d1dc452d2474f0f815042564a02 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 16 Aug 2024 12:24:16 +0200
Subject: [PATCH 028/191] Invalidate vouchers instead of destroying them

---
 app/abilities/voucher_ability.rb              |  2 +-
 app/controllers/vouchers_controller.rb        |  6 ++---
 app/models/voucher.rb                         | 11 +++++-----
 app/views/vouchers/_voucher.html.erb          |  6 ++---
 .../{destroy.js.erb => invalidate.js.erb}     |  0
 config/locales/de.yml                         |  1 +
 config/locales/en.yml                         |  1 +
 config/routes.rb                              |  6 ++++-
 db/migrate/20240728123817_create_vouchers.rb  |  1 +
 db/schema.rb                                  |  1 +
 spec/controllers/vouchers_controller_spec.rb  | 20 ++++++++---------
 spec/factories/vouchers.rb                    |  4 ++++
 spec/models/voucher_spec.rb                   | 22 +++++++------------
 13 files changed, 43 insertions(+), 38 deletions(-)
 rename app/views/vouchers/{destroy.js.erb => invalidate.js.erb} (100%)

diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb
index 3dbc42bff..173c693ae 100644
--- a/app/abilities/voucher_ability.rb
+++ b/app/abilities/voucher_ability.rb
@@ -4,7 +4,7 @@ class VoucherAbility
   def initialize(user)
     clear_aliased_actions
 
-    can [:create, :destroy], Voucher do |voucher|
+    can [:create, :invalidate], Voucher do |voucher|
       user.can_update_personell?(voucher.lecture)
     end
   end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 51adb3c9e..643321599 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -1,6 +1,6 @@
 # app/controllers/vouchers_controller.rb
 class VouchersController < ApplicationController
-  before_action :set_voucher, only: [:destroy]
+  before_action :set_voucher, only: [:invalidate]
   authorize_resource except: [:create, :redeem]
 
   def current_ability
@@ -20,9 +20,9 @@ def create
     end
   end
 
-  def destroy
+  def invalidate
     set_related_data
-    @voucher.destroy
+    @voucher.update(invalidated_at: Time.zone.now)
     respond_to do |format|
       format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
       format.js
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 0d5001d92..cc06f5dd5 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -9,14 +9,13 @@ class Voucher < ApplicationRecord
   before_create :ensure_no_other_active_voucher
   validates :sort, presence: true
 
-  scope :active, -> { where("expires_at > ?", Time.zone.now) }
+  scope :active, lambda {
+                   where("expires_at > ? AND invalidated_at IS NULL",
+                         Time.zone.now)
+                 }
 
   self.implicit_order_column = "created_at"
 
-  def active?
-    expires_at > Time.zone.now
-  end
-
   private
 
     def generate_secure_hash
@@ -29,7 +28,7 @@ def add_expiration_datetime
 
     def ensure_no_other_active_voucher
       return unless lecture
-      return unless lecture.vouchers.where(sort: sort).any?(&:active?)
+      return unless lecture.vouchers.where(sort: sort).active.any?
 
       errors.add(:sort,
                  I18n.t("activerecord.errors.models.voucher.attributes.sort.only_one_active"))
diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
index 9a7e266ec..633e69ca8 100644
--- a/app/views/vouchers/_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -16,14 +16,14 @@
         <%= t('basics.code_copied_to_clipboard') %>
       </span>
     </i>
-    <%= link_to voucher_path(voucher),
+    <%= link_to invalidate_voucher_path(voucher),
                 class: 'text-dark ms-2',
                 data: { toggle: 'tooltip',
                         placement: 'bottom',
                         confirm: t('confirmation.generic') },
                 style: 'text-decoration: none;',
-                title: t('buttons.delete'),
-                method: :delete,
+                title: t('buttons.invalidate'),
+                method: :post,
                 remote: true do %>
         <i class="fas fa-lg fa-trash-alt"></i>
         </i>
diff --git a/app/views/vouchers/destroy.js.erb b/app/views/vouchers/invalidate.js.erb
similarity index 100%
rename from app/views/vouchers/destroy.js.erb
rename to app/views/vouchers/invalidate.js.erb
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8c57d4ef1..7ad949f6b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3578,6 +3578,7 @@ de:
     cancel_publication: 'Stornieren'
     import_lecture_toc: 'Gliederung importieren'
     import_toc: 'Importieren'
+    invalidate: 'Für ungültig erklären'
   warnings:
     save_before: >
       Du musst zunächst die anderen Änderungen speichern oder verwerfen.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9838e1953..33848351a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3394,6 +3394,7 @@ en:
     cancel_publication: 'Cancel'
     import_lecture_toc: 'Import TOC'
     import_toc: 'Import'
+    invalidate: 'Invalidate'
   confirmation:
     generic: 'Are you sure?'
     delete_graph: >
diff --git a/config/routes.rb b/config/routes.rb
index 443c0a56a..31136d072 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -815,7 +815,11 @@
        to: "vouchers#redeem",
        as: "redeem_voucher"
 
-  resources :vouchers, only: [:create, :destroy]
+  post "vouchers/:id/invalidate",
+       to: "vouchers#invalidate",
+       as: "invalidate_voucher"
+
+  resources :vouchers, only: [:create]
 
   # watchlists routes
 
diff --git a/db/migrate/20240728123817_create_vouchers.rb b/db/migrate/20240728123817_create_vouchers.rb
index 3b0e6e8cd..f00625edd 100644
--- a/db/migrate/20240728123817_create_vouchers.rb
+++ b/db/migrate/20240728123817_create_vouchers.rb
@@ -4,6 +4,7 @@ def change
       t.integer :sort, null: false
       t.references :lecture, null: false, foreign_key: true
       t.string :secure_hash, null: false
+      t.datetime :invalidated_at
       t.datetime :expires_at
       t.timestamps
     end
diff --git a/db/schema.rb b/db/schema.rb
index 9567b1f57..b98c9335d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -906,6 +906,7 @@
     t.integer "sort", null: false
     t.bigint "lecture_id", null: false
     t.string "secure_hash", null: false
+    t.datetime "invalidated_at"
     t.datetime "expires_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
diff --git a/spec/controllers/vouchers_controller_spec.rb b/spec/controllers/vouchers_controller_spec.rb
index 37ef86fa3..423e45bd7 100644
--- a/spec/controllers/vouchers_controller_spec.rb
+++ b/spec/controllers/vouchers_controller_spec.rb
@@ -18,12 +18,12 @@
       end
     end
 
-    describe "DELETE #destroy" do
-      it "deletes the voucher" do
+    describe "POST #invalidate" do
+      it "invalidates the voucher" do
         voucher = FactoryBot.create(:voucher, lecture: lecture)
-        expect do
-          delete(:destroy, params: { id: voucher.id })
-        end.to change(lecture.vouchers, :count).by(-1)
+        post(:invalidate, params: { id: voucher.id })
+        voucher.reload
+        expect(Voucher.find(voucher.id).invalidated_at).not_to be_nil
       end
     end
   end
@@ -46,12 +46,12 @@
       end
     end
 
-    describe "DELETE #destroy" do
-      it "does not delete the voucher" do
+    describe "POST #invalidate" do
+      it "does not invalidate the voucher" do
         voucher = FactoryBot.create(:voucher, lecture: lecture)
-        expect do
-          delete(:destroy, params: { id: voucher.id })
-        end.not_to change(lecture.vouchers, :count)
+        post(:invalidate, params: { id: voucher.id })
+        voucher.reload
+        expect(voucher.invalidated_at).to be_nil
       end
     end
   end
diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb
index 909a7be39..9c68bbe74 100644
--- a/spec/factories/vouchers.rb
+++ b/spec/factories/vouchers.rb
@@ -20,5 +20,9 @@
         voucher.update(expires_at: 1.day.ago)
       end
     end
+
+    trait :invalidated do
+      invalidated_at { 1.day.ago }
+    end
   end
 end
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index 8ddd39450..4baa2279d 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -30,26 +30,20 @@
 
   describe "scopes" do
     describe ".active" do
-      it "returns active vouchers" do
-        active_voucher = FactoryBot.create(:voucher)
-        expired_voucher = FactoryBot.create(:voucher, :expired)
+      let!(:active_voucher) { FactoryBot.create(:voucher) }
+      let!(:expired_voucher) { FactoryBot.create(:voucher, :expired) }
+      let!(:invalidated_voucher) { FactoryBot.create(:voucher, :invalidated) }
 
+      it "includes vouchers that are not expired and not invalidated" do
         expect(Voucher.active).to include(active_voucher)
-        expect(Voucher.active).not_to include(expired_voucher)
       end
-    end
-  end
 
-  describe "instance methods" do
-    describe "#active?" do
-      it "returns true if the voucher is active" do
-        voucher = FactoryBot.build(:voucher, expires_at: 1.day.from_now)
-        expect(voucher.active?).to be(true)
+      it "excludes vouchers that are expired" do
+        expect(Voucher.active).not_to include(expired_voucher)
       end
 
-      it "returns false if the voucher is not active" do
-        voucher = FactoryBot.build(:voucher, expires_at: 1.day.ago)
-        expect(voucher.active?).to be(false)
+      it "excludes vouchers that are invalidated" do
+        expect(Voucher.active).not_to include(invalidated_voucher)
       end
     end
   end

From b712851b351e8f9d1388048507739951a3f86c7b Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:38:08 +0200
Subject: [PATCH 029/191] Add redemption and claim models and rewrite workflow
 accordingly

---
 app/abilities/voucher_ability.rb              |  2 +-
 app/controllers/concerns/notifier.rb          | 10 ++
 app/controllers/lectures_controller.rb        | 91 +------------------
 app/controllers/vouchers_controller.rb        | 57 +++++++++++-
 app/helpers/notifications_helper.rb           | 68 +++++++++++---
 app/models/claim.rb                           |  8 ++
 app/models/contract.rb                        | 11 ---
 app/models/lecture.rb                         | 28 +++---
 app/models/notification.rb                    | 71 +++++++--------
 app/models/redemption.rb                      | 21 +++++
 app/models/tutorial.rb                        |  2 +
 app/models/user.rb                            |  4 +-
 app/models/voucher.rb                         |  4 +
 ...cher.html.erb => _verify_voucher.html.erb} |  4 +-
 app/views/profile/edit.html.erb               |  2 +-
 .../vouchers/_redeem_editor_voucher.html.erb  |  5 +-
 .../vouchers/_redeem_tutor_voucher.html.erb   | 10 +-
 .../vouchers/{redeem.js.erb => verify.js.erb} |  0
 config/locales/de.yml                         |  4 +
 config/locales/en.yml                         |  4 +
 config/routes.rb                              |  4 +
 db/migrate/20240815143156_create_contracts.rb | 11 ---
 ...40815174623_add_details_to_notification.rb |  5 -
 .../20240816142403_create_redemptions.rb      |  9 ++
 db/migrate/20240816150011_create_claims.rb    | 10 ++
 db/schema.rb                                  | 37 +++++---
 26 files changed, 273 insertions(+), 209 deletions(-)
 create mode 100644 app/controllers/concerns/notifier.rb
 create mode 100644 app/models/claim.rb
 delete mode 100644 app/models/contract.rb
 create mode 100644 app/models/redemption.rb
 rename app/views/profile/{_redeem_voucher.html.erb => _verify_voucher.html.erb} (71%)
 rename app/views/vouchers/{redeem.js.erb => verify.js.erb} (100%)
 delete mode 100644 db/migrate/20240815143156_create_contracts.rb
 delete mode 100644 db/migrate/20240815174623_add_details_to_notification.rb
 create mode 100644 db/migrate/20240816142403_create_redemptions.rb
 create mode 100644 db/migrate/20240816150011_create_claims.rb

diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb
index 81b94738f..46522ba8f 100644
--- a/app/abilities/voucher_ability.rb
+++ b/app/abilities/voucher_ability.rb
@@ -8,6 +8,6 @@ def initialize(user)
       user.can_update_personell?(voucher.lecture)
     end
 
-    can :redeem, Voucher
+    can [:verify, :redeem], Voucher
   end
 end
diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/concerns/notifier.rb
new file mode 100644
index 000000000..20f24fc16
--- /dev/null
+++ b/app/controllers/concerns/notifier.rb
@@ -0,0 +1,10 @@
+module Notifier
+  extend ActiveSupport::Concern
+
+  def notify_new_editor_by_mail(editor, lecture)
+    NotificationMailer.with(recipient: editor,
+                            locale: editor.locale,
+                            lecture: lecture)
+                      .new_editor_email.deliver_later
+  end
+end
diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 039dcb257..11a497f47 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -1,5 +1,6 @@
 # LecturesController
 class LecturesController < ApplicationController
+  include Notifier
   include ActionController::RequestForgeryProtection
   before_action :set_lecture, except: [:new, :create, :search]
   before_action :set_lecture_cookie, only: [:show, :organizational,
@@ -105,7 +106,7 @@ def update
       recipients = User.where(id: new_ids)
 
       recipients.each do |r|
-        notify_new_editor_by_mail(r)
+        notify_new_editor_by_mail(r, @lecture)
       end
     end
 
@@ -296,27 +297,6 @@ def import_toc
     redirect_to edit_lecture_path(@lecture)
   end
 
-  def become_tutor
-    if Voucher.check_voucher(become_tutor_params[:voucher_hash])
-      selected_tutorials = @lecture.tutorials.where(id: become_tutor_params[:tutorial_ids])
-      @lecture.update_tutor_status!(current_user, selected_tutorials)
-      create_became_tutor_notification(selected_tutorials)
-      redirect_to edit_profile_path, notice: I18n.t("controllers.become_tutor_success")
-    else
-      handle_invalid_voucher
-    end
-  end
-
-  def become_editor
-    if Voucher.check_voucher(become_editor_params[:voucher_hash])
-      @lecture.update_editor_status!(current_user)
-      notify_new_editor_by_mail(current_user)
-      redirect_to edit_profile_path, notice: I18n.t("controllers.become_editor_success")
-    else
-      handle_invalid_voucher
-    end
-  end
-
   private
 
     def set_lecture
@@ -475,71 +455,4 @@ def check_if_enough_questions
 
       redirect_to :root, alert: I18n.t("controllers.no_test")
     end
-
-    def become_tutor_params
-      params.permit(:voucher_hash, tutorial_ids: [])
-    end
-
-    def become_editor_params
-      params.permit(:voucher_hash)
-    end
-
-    def handle_invalid_voucher
-      error_message = I18n.t("controllers.voucher_invalid")
-      respond_to do |format|
-        format.js { render "error", locals: { error_message: error_message } }
-        format.html { redirect_to edit_profile_path, alert: error_message }
-      end
-    end
-
-    def notify_new_editor_by_mail(editor)
-      NotificationMailer.with(recipient: editor,
-                              locale: editor.locale,
-                              lecture: @lecture)
-                        .new_editor_email.deliver_later
-    end
-
-    # def create_became_tutor_notification(selected_tutorials)
-    #   @lecture.editors_and_teacher.each do |editor|
-    #     details = I18n.t("notifications.became_tutor", user: current_user.info,
-    #                                                    locale: editor.locale)
-    #     if selected_tutorials
-    #       details << I18n.t("notifications.tutorial_details",
-    #                         tutorials: selected_tutorials.map(&:title).join(", "),
-    #                         locale: editor.locale)
-    #     end
-    #     Notification.create(recipient: editor,
-    #                         notifiable: @lecture,
-    #                         action: "redemption",
-    #                         details: details)
-    #   end
-    # end
-
-    def create_became_tutor_notification(selected_tutorials)
-      @lecture.editors_and_teacher.each do |editor|
-        details = build_notification_details(editor, selected_tutorials)
-        create_notification(editor, details)
-      end
-    end
-
-    def build_notification_details(editor, selected_tutorials)
-      details = I18n.t("notifications.became_tutor", user: current_user.info,
-                                                     locale: editor.locale)
-      if selected_tutorials
-        tutorial_titles = selected_tutorials.map(&:title).join(", ")
-        details << I18n.t("notifications.tutorial_details",
-                          tutorials: tutorial_titles,
-                          locale: editor.locale)
-      end
-      details
-    end
-
-    def create_notification(editor, details)
-      Notification.create(
-        recipient: editor,
-        notifiable: @lecture,
-        action: "redemption",
-        details: details
-      )
-    end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 455fdb05f..a5c24a818 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -1,5 +1,6 @@
 # app/controllers/vouchers_controller.rb
 class VouchersController < ApplicationController
+  include Notifier
   before_action :set_voucher, only: [:invalidate]
   authorize_resource except: :create
 
@@ -29,7 +30,7 @@ def invalidate
     end
   end
 
-  def redeem
+  def verify
     @voucher = Voucher.check_voucher(params[:voucher_hash])
     respond_to do |format|
       if @voucher
@@ -43,12 +44,28 @@ def redeem
     end
   end
 
+  def redeem
+    voucher = Voucher.check_voucher(redeem_voucher_params[:voucher_hash])
+    if voucher
+      lecture = voucher.lecture
+      redemption = process_voucher(voucher, lecture)
+      redemption.create_notifications!
+      redirect_to edit_profile_path, notice: success_message(voucher)
+    else
+      handle_invalid_voucher
+    end
+  end
+
   private
 
     def voucher_params
       params.permit(:lecture_id, :sort)
     end
 
+    def redeem_voucher_params
+      params.permit(:voucher_hash, tutorial_ids: [])
+    end
+
     def set_voucher
       @voucher = Voucher.find_by(id: params[:id])
       return if @voucher
@@ -62,6 +79,36 @@ def set_related_data
       I18n.locale = @lecture.locale
     end
 
+    def process_voucher(voucher, lecture)
+      if voucher.tutor?
+        process_tutor_voucher(voucher, lecture)
+      elsif voucher.editor?
+        process_editor_voucher(voucher, lecture)
+      end
+    end
+
+    def process_tutor_voucher(voucher, lecture)
+      selected_tutorials = lecture.tutorials
+                                  .where(id: redeem_voucher_params[:tutorial_ids])
+      lecture.update_tutor_status!(current_user, selected_tutorials)
+      Redemption.create(user: current_user, voucher: voucher,
+                        claimed_tutorials: selected_tutorials)
+    end
+
+    def process_editor_voucher(voucher, lecture)
+      lecture.update_editor_status!(current_user)
+      notify_new_editor_by_mail(current_user, lecture)
+      Redemption.create(user: current_user, voucher: voucher)
+    end
+
+    def success_message(voucher)
+      if voucher.tutor?
+        I18n.t("controllers.become_tutor_success")
+      elsif voucher.editor?
+        I18n.t("controllers.become_editor_success")
+      end
+    end
+
     def handle_successful_save(format)
       format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
       format.js
@@ -92,4 +139,12 @@ def handle_voucher_not_found
         end
       end
     end
+
+    def handle_invalid_voucher
+      error_message = I18n.t("controllers.voucher_invalid")
+      respond_to do |format|
+        format.js { render "error", locals: { error_message: error_message } }
+        format.html { redirect_to edit_profile_path, alert: error_message }
+      end
+    end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index fb2bedab2..d574109f1 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -18,7 +18,7 @@ def notification_menu_item_details(notification)
     return medium_notification_item_details(notifiable) if notification.medium?
     return course_notification_item_details(notifiable) if notification.course?
     return lecture_notification_item_details(notifiable) if notification.lecture?
-    return redemption_notification_item_details(notification) if notification.redemption?
+    return redemption_notification_item_details(notifiable) if notification.redemption?
 
     ""
   end
@@ -77,7 +77,7 @@ def notification_link(notification)
     elsif notification.lecture?
       lecture_notification_card_link
     elsif notification.redemption?
-      notification.details
+      redemption_notification_details(notifiable)
     else
       notifiable.details
     end
@@ -91,24 +91,64 @@ def items_card_size(small, comments_below)
   end
 
   # create text for lecture announcement in notification card header
-  def redemption_notification_card_header(lecture)
-    link_to(lecture.title_for_viewers,
-            edit_lecture_path(lecture, anchor: "people"),
+  def redemption_notification_card_header(redemption)
+    link_to(redemption.lecture.title_for_viewers,
+            edit_lecture_path(redemption.lecture, anchor: "people"),
             class: "text-dark")
   end
 
-  def redemption_notification_item_header(lecture)
-    t("notifications.redemption_in_lecture", lecture: lecture.title_for_viewers)
+  def redemption_notification_item_header(redemption)
+    t("notifications.redemption_in_lecture",
+      lecture: redemption.lecture.title_for_viewers)
   end
 
-  def redemption_notification_item_details(notification)
-    extract_name_from_redemption_details(notification.details)
+  def redemption_notification_details(redemption)
+    if redemption.tutor?
+      details = I18n.t("notifications.became_tutor", user: redemption.user.info)
+      tutorial_titles = redemption.claimed_tutorials.map(&:title).join(", ")
+      details << I18n.t("notifications.tutorial_details",
+                        tutorials: tutorial_titles)
+    else
+      I18n.t("notifications.became_editor", user: redemption.user.info)
+    end
   end
 
-  # this a admittedly a hack but I did not want to add another column to
-  # the notifications table
-  def extract_name_from_redemption_details(details)
-    match_data = details.match(/^(.+?) \(.+\)/)
-    match_data ? match_data[1] : nil
+  def redemption_notification_item_details(redemption)
+    result = if redemption.tutor?
+      tutor_notification_item_details(redemption)
+    elsif redemption.editor?
+      editor_notification_item_details(redemption)
+    end
+
+    truncate_result(result)
   end
+
+  private
+
+    def tutor_notification_item_details(redemption)
+      tutorials = redemption.claimed_tutorials.map(&:title).join(", ")
+      "#{t("basics.tutor")} #{redemption.user.tutorial_name}: #{tutorials}"
+    end
+
+    def editor_notification_item_details(redemption)
+      "#{t("basics.editor")} #{redemption.user.tutorial_name}"
+    end
+
+    def tutor_notification_details(redemption)
+      details = I18n.t("notifications.became_tutor",
+                       user: redemption.user.info)
+      tutorial_titles = redemption.claimed_tutorials.map(&:title).join(", ")
+      details << I18n.t("notifications.tutorial_details",
+                        tutorials: tutorial_titles)
+    end
+
+    def editor_notification_details(redemption)
+      I18n.t("notifications.became_editor", user: redemption.user.info)
+    end
+
+    def truncate_result(result)
+      result.first(40).tap do |truncated|
+        return truncated.length < 40 ? truncated : truncated + "..."
+      end
+    end
 end
diff --git a/app/models/claim.rb b/app/models/claim.rb
new file mode 100644
index 000000000..dd209e3df
--- /dev/null
+++ b/app/models/claim.rb
@@ -0,0 +1,8 @@
+# Claim class
+# claims store what is beign taken over by the user when they redeem a voucher
+# (e.g. a tutorial or a talk)
+
+class Claim < ApplicationRecord
+  belongs_to :redemption
+  belongs_to :claimable, polymorphic: true
+end
diff --git a/app/models/contract.rb b/app/models/contract.rb
deleted file mode 100644
index cf1cd1f98..000000000
--- a/app/models/contract.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class Contract < ApplicationRecord
-  belongs_to :user
-  belongs_to :lecture
-
-  scope :tutors, -> { where(role: ROLE_HASH[:tutor]) }
-  scope :editors, -> { where(role: ROLE_HASH[:editor]) }
-
-  ROLE_HASH = { tutor: 0, editor: 1 }.freeze
-
-  enum role: ROLE_HASH
-end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 4cc9cf0b1..bec8bdbfe 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -864,7 +864,7 @@ def update_tutor_status!(user, selected_tutorials)
         remove_tutor(t, user)
       end
     end
-    Contract.create(user: user, lecture: self, role: :tutor)
+    # Contract.create(user: user, lecture: self, role: :tutor)
     # touch to invalidate the cache
     touch
   end
@@ -873,33 +873,37 @@ def update_editor_status!(user)
     return if editors.include?(user)
 
     editors << user
-    Contract.create(user: user, lecture: self, role: :editor)
+    # Contract.create(user: user, lecture: self, role: :editor)
     # touch to invalidate the cache
     touch
   end
 
+  def voucher_redeemers(voucher_scope)
+    User.where(id: Redemption.where(voucher: voucher_scope).select(:user_id))
+  end
+
+  def tutors_by_redemption
+    voucher_redeemers(vouchers.for_tutors)
+  end
+
+  def editors_by_redemption
+    voucher_redeemers(vouchers.for_editors)
+  end
+
   def eligible_as_tutors
-    (tutors + tutors_with_contract + editors + [teacher]).uniq
+    (tutors + tutors_by_redemption + editors + [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
     # the other ones, but in the transition phase where some tutor statuses were
     # still given by the old system, this will not be true
   end
 
   def eligible_as_editors
-    (editors + editors_with_contract + course.editors - [teacher]).uniq
+    (editors + editors_by_redemption + course.editors - [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
     # the other ones, but in the transition phase where some editor statuses were
     # still given by the old system, this will not be true
   end
 
-  def tutors_with_contract
-    User.where(id: Contract.where(lecture: self, role: :tutor).select(:user_id))
-  end
-
-  def editors_with_contract
-    User.where(id: Contract.where(lecture: self, role: :editor).select(:user_id))
-  end
-
   def editors_and_teacher
     [teacher] + editors
   end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index fda36e0dc..669d23865 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -9,20 +9,12 @@ class Notification < ApplicationRecord
 
   paginates_per 12
 
-  # retrieve notifiable defined by notifiable_type and notifiable_id
-  #  def notifiable
-  #    return unless notifiable_type.in?(Notification.allowed_notifiable_types) &&
-  #                  notifiable_id.present?
-  #    notifiable_type.constantize.find_by_id(notifiable_id)
-  #  end
-
   # returns the lecture associated to a notification of type announcement,
   # and teachable for a notification of type medium, nil otherwise
   def teachable
     return if notifiable.blank?
-    return notifiable.lecture if notifiable_type == "redemption"
-    return if notifiable_type.in?(["Lecture", "Course"])
-    return notifiable.lecture if notifiable_type == "Announcement"
+    return if lecture_or_course?
+    return notifiable.lecture if announcement_or_redemption?
 
     # notifiable will be a medium, so return its teachable
     notifiable.teachable
@@ -35,53 +27,42 @@ def teachable
   # all other cases: notifiable path
   def path(user)
     return if notifiable.blank?
-    return edit_lecture_path(notifiable, anchor: "people") if action == "redemption"
-    return edit_profile_path if notifiable_type.in?(["Course", "Lecture"])
-
-    if notifiable_type == "Announcement"
-      return notifiable.lecture.path(user) if notifiable.lecture.present?
 
-      return news_path
+    if redemption?
+      edit_lecture_path(notifiable.lecture, anchor: "people")
+    elsif lecture_or_course?
+      edit_profile_path
+    elsif lecture_announcement?
+      notifiable.lecture.path(user)
+    elsif generic_announcement?
+      news_path
+    elsif quiz?
+      medium_path(notifiable)
+    else
+      polymorphic_url(notifiable, only_path: true)
     end
-    return medium_path(notifiable) if notifiable_type == "Medium" && notifiable.sort == "Quiz"
-
-    polymorphic_url(notifiable, only_path: true)
-  end
-
-  def self.allowed_notifiable_types
-    ["Medium", "Course", "Lecture", "Announcement"]
   end
 
   # the next methods are for the determination which kind of notification it is
 
   def medium?
-    return false if notifiable.blank?
-
-    notifiable_type == "Medium"
+    notifiable.is_a?(Medium)
   end
 
   def course?
-    return false if notifiable.blank?
-
-    notifiable.instance_of?(::Course)
+    notifiable.is_a?(Course)
   end
 
   def lecture?
-    return false if notifiable.blank?
-
-    notifiable.instance_of?(::Lecture) && action != "redemption"
+    notifiable.is_a?(Lecture)
   end
 
   def redemption?
-    return false if notifiable.blank?
-
-    action == "redemption"
+    notifiable.is_a?(Redemption)
   end
 
   def announcement?
-    return false if notifiable.blank?
-
-    notifiable.instance_of?(::Announcement)
+    notifiable.is_a?(Announcement)
   end
 
   def generic_announcement?
@@ -91,4 +72,18 @@ def generic_announcement?
   def lecture_announcement?
     announcement? && notifiable.lecture.present?
   end
+
+  def quiz?
+    medium? && notifiable.sort == "Quiz"
+  end
+
+  private
+
+    def lecture_or_course?
+      notifiable_type.in?(["Lecture", "Course"])
+    end
+
+    def announcement_or_redemption?
+      notifiable_type.in?(["Announcement", "Redemption"])
+    end
 end
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
new file mode 100644
index 000000000..093c3bfe8
--- /dev/null
+++ b/app/models/redemption.rb
@@ -0,0 +1,21 @@
+# Redempetion class
+# redemptions store the event of a user redeeming a voucher
+
+class Redemption < ApplicationRecord
+  belongs_to :voucher
+  belongs_to :user
+  has_many :claims, dependent: :destroy
+  has_many :claimed_tutorials, through: :claims, source: :claimable,
+                               source_type: "Tutorial"
+
+  delegate :lecture, to: :voucher
+  delegate :sort, to: :voucher
+  delegate :tutor?, to: :voucher
+  delegate :editor?, to: :voucher
+
+  def create_notifications!
+    lecture.editors_and_teacher.each do |editor|
+      Notification.create(notifiable: self, recipient: editor)
+    end
+  end
+end
diff --git a/app/models/tutorial.rb b/app/models/tutorial.rb
index 824f390cf..9e3dcd6fb 100644
--- a/app/models/tutorial.rb
+++ b/app/models/tutorial.rb
@@ -9,6 +9,8 @@ class Tutorial < ApplicationRecord
 
   has_many :submissions, dependent: :destroy
 
+  has_many :claims, as: :claimable, dependent: :destroy
+
   before_destroy :check_destructibility, prepend: true
 
   # rubocop:todo Rails/UniqueValidationWithoutIndex
diff --git a/app/models/user.rb b/app/models/user.rb
index 57be5375a..35cc87d0b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -81,8 +81,8 @@ class User < ApplicationRecord
 
   has_many :feedbacks, dependent: :destroy
 
-  # a user has contracts as asssistant in lectures
-  has_many :contracts, dependent: :destroy
+  # a user has redemptions of vouchers
+  has_many :redemptions, dependent: :destroy
 
   include ScreenshotUploader[:image]
 
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index f22811aea..606ad7abe 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -5,6 +5,8 @@ class Voucher < ApplicationRecord
 
   belongs_to :lecture, touch: true
   before_create :generate_secure_hash
+  has_many :redemptions, dependent: :destroy
+
   before_create :add_expiration_datetime
   before_create :ensure_no_other_active_voucher
   validates :sort, presence: true
@@ -13,6 +15,8 @@ class Voucher < ApplicationRecord
                    where("expires_at > ? AND invalidated_at IS NULL",
                          Time.zone.now)
                  }
+  scope :for_tutors, -> { where(sort: :tutor) }
+  scope :for_editors, -> { where(sort: :editor) }
 
   self.implicit_order_column = "created_at"
 
diff --git a/app/views/profile/_redeem_voucher.html.erb b/app/views/profile/_verify_voucher.html.erb
similarity index 71%
rename from app/views/profile/_redeem_voucher.html.erb
rename to app/views/profile/_verify_voucher.html.erb
index a9278a5f0..40e97aebe 100644
--- a/app/views/profile/_redeem_voucher.html.erb
+++ b/app/views/profile/_verify_voucher.html.erb
@@ -1,9 +1,9 @@
-<%= form_with url: redeem_voucher_path,
+<%= form_with url: verify_voucher_path,
               remote: true,
               method: :post, 
               html: { class: "form-inline" } do |f| %>
     <div class="form-group d-flex">
         <%= f.text_field :voucher_hash, class: "form-control me-2 w-50" %>
-        <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
+        <%= f.submit t('buttons.verify_voucher'), class: "btn btn-primary" %>
     </div>
 <% end %>
diff --git a/app/views/profile/edit.html.erb b/app/views/profile/edit.html.erb
index ea2636887..4156b3c39 100644
--- a/app/views/profile/edit.html.erb
+++ b/app/views/profile/edit.html.erb
@@ -121,7 +121,7 @@
         </div>
       </div>
       <div class="card-body" id="redeem-voucher">
-        <%= render partial: 'profile/redeem_voucher' %>
+        <%= render partial: 'profile/verify_voucher' %>
       </div>
     </div>
   </div>
diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index ca66b16f2..cad10cd3b 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -1,8 +1,7 @@
 <%= t('profile.become_editor', lecture: voucher.lecture.title) %>
-<%= link_to become_editor_path(voucher.lecture,
-                               params: { voucher_hash: voucher.secure_hash }),
+<%= link_to redeem_voucher_path(params: { voucher_hash: voucher.secure_hash }),
             class: 'btn btn-primary',
             method: :post,
             remote: true do %>
-  <%= t('buttons.become_editor') %>
+  <%= t('profile.redeem_voucher') %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 839df9ab6..590eacd72 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -1,10 +1,10 @@
 <p>
   <%= t('profile.become_tutor', lecture: voucher.lecture.title) %>
 </p>
-<%= form_with url: become_tutor_path(voucher.lecture),
-                remote: true,
-                method: :post,
-                html: { class: "form-inline" } do |f| %>
+<%= form_with url: redeem_voucher_path,
+              remote: true,
+              method: :post,
+              html: { class: "form-inline" } do |f| %>
   <%= f.hidden_field :voucher_hash, value: voucher.secure_hash %>                 
   <div class="form-group d-flex">                               
     <%= f.select :tutorial_ids,
@@ -12,6 +12,6 @@
                   given_tutorial_ids(current_user,voucher)),
                   { prompt: t('profile.select_tutorials') },
                   { multiple: true, class: 'selectize me-2 w-50' } %>
-    <%= f.submit t('profile.take_over_tutorials'), class: "btn btn-primary" %>
+    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/redeem.js.erb b/app/views/vouchers/verify.js.erb
similarity index 100%
rename from app/views/vouchers/redeem.js.erb
rename to app/views/vouchers/verify.js.erb
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b2f6d128d..4bb120c62 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2239,6 +2239,9 @@ de:
     became_tutor: >
       %{user} hat einen TutorInnen-Gutschein eingelöst und ist jetzt TutorIn in der
       Veranstaltung.
+    became_editor: >
+      %{user} hat einen EditorInnen-Gutschein eingelöst und ist jetzt EditorIn in der
+      Veranstaltung.
     tutorial_details: >
       Neu übernommene Tutorien: %{tutorials}.
     redemption: 'Gutschein eingelöst:'
@@ -3601,6 +3604,7 @@ de:
     import_toc: 'Importieren'
     become_editor: 'EditorIn werden'
     invalidate: 'Für ungültig erklären'
+    verify_voucher: 'Gutschein prüfen'
   warnings:
     save_before: >
       Du musst zunächst die anderen Änderungen speichern oder verwerfen.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ea6ec3615..5db47e051 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2109,6 +2109,9 @@ en:
     became_tutor: >
       %{user} has redeemed a tutor voucher and has therefore become tutor
       in the event series.
+    became_editor: >
+      %{user} has redeemed an editor voucher and has therefore become editor
+      in the event series.
     tutorial_details: >
       Tutorials taken over: %{tutorials}.
     redemption: 'Voucher redeemed:'
@@ -3417,6 +3420,7 @@ en:
     import_toc: 'Import'
     become_editor: 'Become Editor'
     invalidate: 'Invalidate'
+    verify_voucher: 'Verify Voucher'
   confirmation:
     generic: 'Are you sure?'
     delete_graph: >
diff --git a/config/routes.rb b/config/routes.rb
index 42868900a..c9618b868 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -819,6 +819,10 @@
 
   resources :users, only: [:index, :edit, :update, :destroy]
 
+  post "vouchers/verify",
+       to: "vouchers#verify",
+       as: "verify_voucher"
+
   post "vouchers/redeem",
        to: "vouchers#redeem",
        as: "redeem_voucher"
diff --git a/db/migrate/20240815143156_create_contracts.rb b/db/migrate/20240815143156_create_contracts.rb
deleted file mode 100644
index 34bc99455..000000000
--- a/db/migrate/20240815143156_create_contracts.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-class CreateContracts < ActiveRecord::Migration[7.1]
-  def change
-    create_table :contracts do |t|
-      t.references :user, null: false, foreign_key: true
-      t.references :lecture, null: false, foreign_key: true
-      t.integer :role, null: false
-
-      t.timestamps
-    end
-  end
-end
diff --git a/db/migrate/20240815174623_add_details_to_notification.rb b/db/migrate/20240815174623_add_details_to_notification.rb
deleted file mode 100644
index 75d98a0f6..000000000
--- a/db/migrate/20240815174623_add_details_to_notification.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddDetailsToNotification < ActiveRecord::Migration[7.1]
-  def change
-    add_column :notifications, :details, :text
-  end
-end
diff --git a/db/migrate/20240816142403_create_redemptions.rb b/db/migrate/20240816142403_create_redemptions.rb
new file mode 100644
index 000000000..5529182f6
--- /dev/null
+++ b/db/migrate/20240816142403_create_redemptions.rb
@@ -0,0 +1,9 @@
+class CreateRedemptions < ActiveRecord::Migration[7.1]
+  def change
+    create_table :redemptions do |t|
+      t.references :voucher, type: :uuid, null: false, foreign_key: true
+      t.references :user, null: false, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20240816150011_create_claims.rb b/db/migrate/20240816150011_create_claims.rb
new file mode 100644
index 000000000..c6bba4d21
--- /dev/null
+++ b/db/migrate/20240816150011_create_claims.rb
@@ -0,0 +1,10 @@
+class CreateClaims < ActiveRecord::Migration[7.1]
+  def change
+    create_table :claims do |t|
+      t.references :redemption, null: false, foreign_key: true
+      t.references :claimable, polymorphic: true, null: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5a6d50c61..17bf1bee5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_08_15_174623) do
+ActiveRecord::Schema[7.1].define(version: 2024_08_16_150011) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -77,6 +77,16 @@
     t.index ["lecture_id"], name: "index_chapters_on_lecture_id"
   end
 
+  create_table "claims", force: :cascade do |t|
+    t.bigint "redemption_id", null: false
+    t.string "claimable_type", null: false
+    t.bigint "claimable_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["claimable_type", "claimable_id"], name: "index_claims_on_claimable"
+    t.index ["redemption_id"], name: "index_claims_on_redemption_id"
+  end
+
   create_table "clicker_votes", force: :cascade do |t|
     t.integer "value"
     t.integer "clicker_id"
@@ -140,16 +150,6 @@
     t.index ["commontable_type", "commontable_id"], name: "index_commontator_threads_on_c_id_and_c_type", unique: true
   end
 
-  create_table "contracts", force: :cascade do |t|
-    t.bigint "user_id", null: false
-    t.bigint "lecture_id", null: false
-    t.integer "role", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["lecture_id"], name: "index_contracts_on_lecture_id"
-    t.index ["user_id"], name: "index_contracts_on_user_id"
-  end
-
   create_table "course_self_joins", force: :cascade do |t|
     t.bigint "course_id"
     t.bigint "preceding_course_id"
@@ -409,7 +409,6 @@
     t.text "action"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.text "details"
     t.index ["notifiable_id", "notifiable_type"], name: "index_notifications_on_notifiable_id_and_notifiable_type"
     t.index ["recipient_id"], name: "index_notifications_on_recipient_id"
   end
@@ -459,6 +458,15 @@
     t.datetime "updated_at", null: false
   end
 
+  create_table "redemptions", force: :cascade do |t|
+    t.uuid "voucher_id", null: false
+    t.bigint "user_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_redemptions_on_user_id"
+    t.index ["voucher_id"], name: "index_redemptions_on_voucher_id"
+  end
+
   create_table "referrals", force: :cascade do |t|
     t.text "start_time"
     t.text "end_time"
@@ -959,11 +967,10 @@
   add_foreign_key "announcements", "lectures"
   add_foreign_key "announcements", "users", column: "announcer_id"
   add_foreign_key "assignments", "lectures"
+  add_foreign_key "claims", "redemptions"
   add_foreign_key "commontator_comments", "commontator_comments", column: "parent_id", on_update: :restrict, on_delete: :cascade
   add_foreign_key "commontator_comments", "commontator_threads", column: "thread_id", on_update: :cascade, on_delete: :cascade
   add_foreign_key "commontator_subscriptions", "commontator_threads", column: "thread_id", on_update: :cascade, on_delete: :cascade
-  add_foreign_key "contracts", "lectures"
-  add_foreign_key "contracts", "users"
   add_foreign_key "course_self_joins", "courses"
   add_foreign_key "divisions", "programs"
   add_foreign_key "feedbacks", "users"
@@ -979,6 +986,8 @@
   add_foreign_key "programs", "subjects"
   add_foreign_key "quiz_certificates", "media", column: "quiz_id"
   add_foreign_key "quiz_certificates", "users"
+  add_foreign_key "redemptions", "users"
+  add_foreign_key "redemptions", "vouchers"
   add_foreign_key "referrals", "items"
   add_foreign_key "referrals", "media"
   add_foreign_key "speaker_talk_joins", "talks"

From 08ffc49d303b926fdbe4c8e5b57ae727b88388c9 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:41:31 +0200
Subject: [PATCH 030/191] Restore to previous state

---
 app/abilities/lecture_ability.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/abilities/lecture_ability.rb b/app/abilities/lecture_ability.rb
index ac569e175..74f667ec5 100644
--- a/app/abilities/lecture_ability.rb
+++ b/app/abilities/lecture_ability.rb
@@ -22,7 +22,9 @@ def initialize(user)
 
     # there is a redirect to the subscription page inside the controller
     # if the lecture is not a subscribed lecture of the user
-    can [:show, :search, :become_tutor, :become_editor], Lecture
+    can :show, Lecture
+
+    can :search, Lecture
 
     can [:show_announcements, :organizational, :show_structures,
          :search_examples, :show_random_quizzes,

From b1a6614a779c274ef935904b0ca47bc91ec1bf02 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:42:07 +0200
Subject: [PATCH 031/191] Fix typo

---
 app/models/claim.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/claim.rb b/app/models/claim.rb
index dd209e3df..5901e7189 100644
--- a/app/models/claim.rb
+++ b/app/models/claim.rb
@@ -1,5 +1,5 @@
 # Claim class
-# claims store what is beign taken over by the user when they redeem a voucher
+# claims store what is being taken over by the user when they redeem a voucher
 # (e.g. a tutorial or a talk)
 
 class Claim < ApplicationRecord

From ab82c87172209015bbc70f1bc4cb3d3575e8f553 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Fri, 16 Aug 2024 18:45:05 +0200
Subject: [PATCH 032/191] Implement Rubocop suggestion

---
 app/helpers/notifications_helper.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index d574109f1..bb9654096 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -104,12 +104,9 @@ def redemption_notification_item_header(redemption)
 
   def redemption_notification_details(redemption)
     if redemption.tutor?
-      details = I18n.t("notifications.became_tutor", user: redemption.user.info)
-      tutorial_titles = redemption.claimed_tutorials.map(&:title).join(", ")
-      details << I18n.t("notifications.tutorial_details",
-                        tutorials: tutorial_titles)
+      tutor_notification_details(redemption)
     else
-      I18n.t("notifications.became_editor", user: redemption.user.info)
+      editor_notification_details(redemption)
     end
   end
 
@@ -148,7 +145,7 @@ def editor_notification_details(redemption)
 
     def truncate_result(result)
       result.first(40).tap do |truncated|
-        return truncated.length < 40 ? truncated : truncated + "..."
+        return truncated.length < 40 ? truncated : "#{truncated}..."
       end
     end
 end

From f7e9b574f13e392101a66d501e4ef709394cbc42 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 14:24:44 +0200
Subject: [PATCH 033/191] Replace voucher_hash by secure_hash

---
 app/controllers/vouchers_controller.rb             | 8 ++++----
 app/views/profile/_verify_voucher.html.erb         | 4 ++--
 app/views/vouchers/_redeem_editor_voucher.html.erb | 2 +-
 app/views/vouchers/_redeem_tutor_voucher.html.erb  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index a5c24a818..be4da39e7 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -31,7 +31,7 @@ def invalidate
   end
 
   def verify
-    @voucher = Voucher.check_voucher(params[:voucher_hash])
+    @voucher = Voucher.check_voucher(check_voucher_params[:secure_hash])
     respond_to do |format|
       if @voucher
         format.js
@@ -45,7 +45,7 @@ def verify
   end
 
   def redeem
-    voucher = Voucher.check_voucher(redeem_voucher_params[:voucher_hash])
+    voucher = Voucher.check_voucher(check_voucher_params[:secure_hash])
     if voucher
       lecture = voucher.lecture
       redemption = process_voucher(voucher, lecture)
@@ -62,8 +62,8 @@ def voucher_params
       params.permit(:lecture_id, :sort)
     end
 
-    def redeem_voucher_params
-      params.permit(:voucher_hash, tutorial_ids: [])
+    def check_voucher_params
+      params.permit(:secure_hash, tutorial_ids: [])
     end
 
     def set_voucher
diff --git a/app/views/profile/_verify_voucher.html.erb b/app/views/profile/_verify_voucher.html.erb
index 40e97aebe..697cb58a0 100644
--- a/app/views/profile/_verify_voucher.html.erb
+++ b/app/views/profile/_verify_voucher.html.erb
@@ -1,9 +1,9 @@
 <%= form_with url: verify_voucher_path,
               remote: true,
-              method: :post, 
+              method: :post,
               html: { class: "form-inline" } do |f| %>
     <div class="form-group d-flex">
-        <%= f.text_field :voucher_hash, class: "form-control me-2 w-50" %>
+        <%= f.text_field :secure_hash, class: "form-control me-2 w-50" %>
         <%= f.submit t('buttons.verify_voucher'), class: "btn btn-primary" %>
     </div>
 <% end %>
diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index cad10cd3b..038528354 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -1,5 +1,5 @@
 <%= t('profile.become_editor', lecture: voucher.lecture.title) %>
-<%= link_to redeem_voucher_path(params: { voucher_hash: voucher.secure_hash }),
+<%= link_to redeem_voucher_path(params: { secure_hash: voucher.secure_hash }),
             class: 'btn btn-primary',
             method: :post,
             remote: true do %>
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 590eacd72..eee138667 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -5,8 +5,8 @@
               remote: true,
               method: :post,
               html: { class: "form-inline" } do |f| %>
-  <%= f.hidden_field :voucher_hash, value: voucher.secure_hash %>                 
-  <div class="form-group d-flex">                               
+  <%= f.hidden_field :secure_hash, value: voucher.secure_hash %>
+  <div class="form-group d-flex">
     <%= f.select :tutorial_ids,
                   options_for_select(tutorial_options(voucher),
                   given_tutorial_ids(current_user,voucher)),

From 19148e3d375fdbcaedd0f9fd6c9a60a873783ecf Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 14:26:36 +0200
Subject: [PATCH 034/191] Replace redeem_voucher_params by check_voucher_params

---
 app/controllers/vouchers_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index be4da39e7..7d3e61d91 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -89,7 +89,7 @@ def process_voucher(voucher, lecture)
 
     def process_tutor_voucher(voucher, lecture)
       selected_tutorials = lecture.tutorials
-                                  .where(id: redeem_voucher_params[:tutorial_ids])
+                                  .where(id: check_voucher_params[:tutorial_ids])
       lecture.update_tutor_status!(current_user, selected_tutorials)
       Redemption.create(user: current_user, voucher: voucher,
                         claimed_tutorials: selected_tutorials)

From d2bdba7ebe86581c92f2ad2421cd56d70c055856 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 14:39:46 +0200
Subject: [PATCH 035/191] Add cancel action to vouchers controller

---
 app/abilities/voucher_ability.rb                   | 2 +-
 app/controllers/vouchers_controller.rb             | 7 +++++++
 app/views/vouchers/_redeem_editor_voucher.html.erb | 4 +++-
 app/views/vouchers/_redeem_tutor_voucher.html.erb  | 2 ++
 app/views/vouchers/cancel.js.erb                   | 2 ++
 app/views/vouchers/verify.js.erb                   | 2 +-
 config/routes.rb                                   | 4 ++++
 7 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 app/views/vouchers/cancel.js.erb

diff --git a/app/abilities/voucher_ability.rb b/app/abilities/voucher_ability.rb
index 46522ba8f..9f491d4d4 100644
--- a/app/abilities/voucher_ability.rb
+++ b/app/abilities/voucher_ability.rb
@@ -8,6 +8,6 @@ def initialize(user)
       user.can_update_personell?(voucher.lecture)
     end
 
-    can [:verify, :redeem], Voucher
+    can [:verify, :redeem, :cancel], Voucher
   end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 7d3e61d91..547408574 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -56,6 +56,13 @@ def redeem
     end
   end
 
+  def cancel
+    respond_to do |format|
+      format.html { redirect_to edit_profile_path }
+      format.js
+    end
+  end
+
   private
 
     def voucher_params
diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index 038528354..7e830b500 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -4,4 +4,6 @@
             method: :post,
             remote: true do %>
   <%= t('profile.redeem_voucher') %>
-<% end %>
\ No newline at end of file
+<% end %>
+<%= link_to t('buttons.cancel'), cancel_voucher_path,
+            class: "btn btn-secondary ms-2", remote: true %>
\ No newline at end of file
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index eee138667..4183974f9 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -13,5 +13,7 @@
                   { prompt: t('profile.select_tutorials') },
                   { multiple: true, class: 'selectize me-2 w-50' } %>
     <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
+    <%= link_to t('buttons.cancel'), cancel_voucher_path,
+                class: "btn btn-secondary ms-2", remote: true %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/cancel.js.erb b/app/views/vouchers/cancel.js.erb
new file mode 100644
index 000000000..dbbd25178
--- /dev/null
+++ b/app/views/vouchers/cancel.js.erb
@@ -0,0 +1,2 @@
+$("#redeem-voucher").empty()
+  .append("<%= j render partial: 'profile/verify_voucher' %>");
diff --git a/app/views/vouchers/verify.js.erb b/app/views/vouchers/verify.js.erb
index 6e1c5b10b..4558c8d90 100644
--- a/app/views/vouchers/verify.js.erb
+++ b/app/views/vouchers/verify.js.erb
@@ -1,6 +1,6 @@
 $("#redeem-voucher").empty()
   .append("<%= j render partial: 'vouchers/redeem_' + @voucher.sort + '_voucher', locals: { voucher: @voucher } %>");
-;
+
 // activate selectize
 // @reviewer: This is used several times in our code base (in the coffeescript
 // variant). Should we extract this into a function in order to avoid code
diff --git a/config/routes.rb b/config/routes.rb
index c9618b868..e547d5641 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -831,6 +831,10 @@
        to: "vouchers#invalidate",
        as: "invalidate_voucher"
 
+  get "vouchers/cancel",
+      to: "vouchers#cancel",
+      as: "cancel_voucher"
+
   resources :vouchers, only: [:create]
 
   # watchlists routes

From 2538684324023776f6295b73882cb5f9e128fca2 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 17:02:34 +0200
Subject: [PATCH 036/191] Differentiate between different cases of tutor
 voucher redemption

---
 app/helpers/vouchers_helper.rb                | 20 +++++++-
 app/models/lecture.rb                         | 20 ++++----
 .../vouchers/_redeem_tutor_voucher.html.erb   | 47 +++++++++++++------
 app/views/vouchers/_tutorials_form.html.erb   | 14 ++++++
 config/locales/de.yml                         | 20 ++++++--
 config/locales/en.yml                         | 21 +++++++--
 6 files changed, 110 insertions(+), 32 deletions(-)
 create mode 100644 app/views/vouchers/_tutorials_form.html.erb

diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index 8b20db258..c9d1a6337 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -1,9 +1,25 @@
 module VouchersHelper
-  def tutorial_options(voucher)
-    voucher.lecture.tutorials.map { |t| [t.title, t.id] }
+  def tutorial_options(user, voucher)
+    voucher.lecture.tutorials_without_tutor(user).map { |t| [t.title, t.id] }
   end
 
   def given_tutorial_ids(user, voucher)
     user.given_tutorials.where(lecture: voucher.lecture).pluck(:id)
   end
+
+  def tutorials_with_tutor_titles(user, voucher)
+    voucher.lecture.tutorials_with_tutor(user).map(&:title).join(", ")
+  end
+
+  def redeem_voucher_button(voucher)
+    link_to(t("profile.redeem_voucher"),
+            redeem_voucher_path(params: { secure_hash: voucher.secure_hash }),
+            class: "btn btn-primary",
+            method: :post, remote: true)
+  end
+
+  def cancel_voucher_button
+    link_to(t("buttons.cancel"), cancel_voucher_path,
+            class: "btn btn-secondary ms-2", remote: true)
+  end
 end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index bec8bdbfe..d92d5dacb 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -858,13 +858,8 @@ def active_voucher_of_sort(sort)
 
   def update_tutor_status!(user, selected_tutorials)
     tutorials.find_each do |t|
-      if selected_tutorials.include?(t)
-        add_tutor(t, user)
-      else
-        remove_tutor(t, user)
-      end
+      add_tutor(t, user) if selected_tutorials.include?(t)
     end
-    # Contract.create(user: user, lecture: self, role: :tutor)
     # touch to invalidate the cache
     touch
   end
@@ -873,7 +868,6 @@ def update_editor_status!(user)
     return if editors.include?(user)
 
     editors << user
-    # Contract.create(user: user, lecture: self, role: :editor)
     # touch to invalidate the cache
     touch
   end
@@ -908,6 +902,14 @@ def editors_and_teacher
     [teacher] + editors
   end
 
+  def tutorials_with_tutor(tutor)
+    tutorials.where(id: tutorial_ids_for_tutor(tutor))
+  end
+
+  def tutorials_without_tutor(tutor)
+    tutorials.where.not(id: tutorial_ids_for_tutor(tutor))
+  end
+
   private
 
     # used for after save callback
@@ -1016,7 +1018,7 @@ def add_tutor(tutorial, user)
       tutorial.tutors << user unless tutorial.tutors.include?(user)
     end
 
-    def remove_tutor(tutorial, user)
-      tutorial.tutors.delete(user) if tutorial.tutors.include?(user)
+    def tutorial_ids_for_tutor(tutor)
+      TutorTutorialJoin.where(tutor: tutor).select(:tutorial_id)
     end
 end
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 4183974f9..4c68c117d 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -1,19 +1,36 @@
 <p>
   <%= t('profile.become_tutor', lecture: voucher.lecture.title) %>
+
+  <% if current_user.in?(voucher.lecture.tutors) %>
+    <%= t('profile.already_tutor',
+          tutorials: tutorials_with_tutor_titles(current_user, voucher)) %>
+  <% end %>
 </p>
-<%= form_with url: redeem_voucher_path,
-              remote: true,
-              method: :post,
-              html: { class: "form-inline" } do |f| %>
-  <%= f.hidden_field :secure_hash, value: voucher.secure_hash %>
-  <div class="form-group d-flex">
-    <%= f.select :tutorial_ids,
-                  options_for_select(tutorial_options(voucher),
-                  given_tutorial_ids(current_user,voucher)),
-                  { prompt: t('profile.select_tutorials') },
-                  { multiple: true, class: 'selectize me-2 w-50' } %>
-    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
-    <%= link_to t('buttons.cancel'), cancel_voucher_path,
-                class: "btn btn-secondary ms-2", remote: true %>
-  </div>
+
+<% if voucher.lecture.tutorials_without_tutor(current_user).any? %>
+
+  <%= render partial: "vouchers/tutorials_form", locals: { voucher: voucher } %>
+
+<% elsif voucher.lecture.tutorials.any? %>
+
+    <%= t('profile.no_tutorials_available') %>
+    <%= cancel_voucher_button %>
+
+<% else %>
+
+  <%= t('profile.no_tutorials_yet') %>
+
+  <% if current_user.in?(voucher.lecture.tutors_by_redemption) %>
+
+      <%= t('profile.already_tutor_by_redemption') %>
+      <%= cancel_voucher_button %>
+
+  <% else %>
+
+    <p class="mt-4">
+      <%= redeem_voucher_button(voucher) %>
+      <%= cancel_voucher_button %>
+    </p>
+
+  <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/_tutorials_form.html.erb b/app/views/vouchers/_tutorials_form.html.erb
new file mode 100644
index 000000000..187f9fbb7
--- /dev/null
+++ b/app/views/vouchers/_tutorials_form.html.erb
@@ -0,0 +1,14 @@
+<%= form_with url: redeem_voucher_path,
+              remote: true,
+              method: :post,
+              html: { class: "form-inline" } do |f| %>
+  <%= f.hidden_field :secure_hash, value: voucher.secure_hash %>
+  <div class="form-group d-flex">
+    <%= f.select :tutorial_ids,
+                 options_for_select(tutorial_options(current_user, voucher)),
+                 { prompt: t('profile.select_tutorials') },
+                 { multiple: true, class: 'selectize me-2 w-50' } %>
+    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
+    <%= cancel_voucher_button %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4bb120c62..4a06fe5ff 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2194,12 +2194,26 @@ de:
       Wir haben Deine Anfrage erhalten und werden Dir Deine Daten zeitnah schicken.
     redeem_voucher: Gutschein einlösen
     become_tutor: >
-      Mit diesem Gutschein kannst Du TutorIn in der Vorlesung %{lecture} werden.
-      Wenn Du schon weißt, welche Tutorien du übernimmst, kannst du diese hier auswählen.
+      Mit diesem Gutschein erhältst Du TutorInnenstatus in der Veranstaltung
+      %{lecture}. Dadurch können Dir VeranstaltungseditorInnen Tutorien zuweisen.
+      Ggf. kannst Du an dieser Stelle bereits Tutorien auswählen,
+      die Du übernehmen möchtest.
+    already_tutor: >
+      Du bist bereits als TutorIn eingetragen für: %{tutorials}.
+    new_tutor_select: >
+      Wenn Du schon weißt, welche Tutorien du übernimmst, kannst du diese hier
+      auswählen.
+    already_tutor_select: >
+      Du kannst hier weitere Tutorien auswählen, die Du übernimmst.
     select_tutorials: Tutorien auswählen
     take_over_tutorials: Tutorien übernehmen
+    no_tutorials_available: >
+      Es sind keine weiteren Tutorien verfügbar, die Du noch übernehmen kannst.
+    no_tutorials_yet: Für diese Vorlesung wurden noch keine Tutorien angelegt.
+    already_tutor_by_redemption: >
+      Du hast bereits einen Gutschein eingelöst, um TutorInnenstatus zu erhalten.
     become_editor: >
-      Mit diesem Gutschein kannst Du Editorenrechte für die Veranstaltung
+      Mit diesem Gutschein kannst Du EditorInnenrechte für die Veranstaltung
       %{lecture} übernehmen.
   mampf_news:
     title: 'MaMpf-News'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5db47e051..f4f392f4d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2064,11 +2064,26 @@ en:
       We have received your request and will send you your data as soon as possible.
     redeem_voucher: Redeeem Voucher
     become_tutor: >
-      With this voucher, you can become a tutor in the lecture %{lecture}.
-      If you already know which tutorials you will be responsible for, 
+      With this voucher, you can obatin tutor status for the %{lecture}.
+      With that, editors for the event series can assign you tutorials.
+      If applicable, you can select the tutorials you will be responsible for
+      right here.
+    already_tutor: >
+      You are already registered as a tutor for: %{tutorials}.
+    new_tutor_select: >
+      If you already know which tutorials you will be responsible for,
       you can select them here.
+    already_tutor_select: >
+      You can select further tutorials to take over here.
     select_tutorials: Select Tutorials
     take_over_tutorials: Take Over Tutorials
+    no_tutorials_available: >
+      There are no more tutorials available for this lecture that you can take
+      over.
+    no_tutorials_yet: >
+      There are no tutorials available for this lecture yet.
+    already_tutor_by_redemption: >
+      You have already redeemed a tutor voucher for this event series.
     become_editor: >
       With this voucher, you can become an editor in the event series %{lecture}.
   mampf_news:
@@ -2115,7 +2130,7 @@ en:
     tutorial_details: >
       Tutorials taken over: %{tutorials}.
     redemption: 'Voucher redeemed:'
-    redemption_in_lecture: 'Voucher redeemed in %{lecture}'    
+    redemption_in_lecture: 'Voucher redeemed in %{lecture}'
   lecture:
     content: 'Event series contents'
     unpublished: 'This event series is unpublished.'

From 0e728d40f4d2012ec0228446efed7d189ed20e04 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 17:28:24 +0200
Subject: [PATCH 037/191] Differentiate between different cases of editor
 voucher redemption

---
 .../vouchers/_redeem_editor_voucher.html.erb     | 16 +++++++++-------
 config/locales/de.yml                            | 10 ++++++++--
 config/locales/en.yml                            |  9 +++++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index 7e830b500..3df3bb9ad 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -1,9 +1,11 @@
 <%= t('profile.become_editor', lecture: voucher.lecture.title) %>
-<%= link_to redeem_voucher_path(params: { secure_hash: voucher.secure_hash }),
-            class: 'btn btn-primary',
-            method: :post,
-            remote: true do %>
-  <%= t('profile.redeem_voucher') %>
+
+<% if current_user == voucher.lecture.teacher %>
+  <%= t('profile.teacher_cant_become_editor') %>
+<% elsif current_user.in?(voucher.lecture.editors_by_redemption) %>
+  <%= t('profile.already_editor_by_redemption') %>
+<% else %>
+  <%= redeem_voucher_button(voucher) %>
 <% end %>
-<%= link_to t('buttons.cancel'), cancel_voucher_path,
-            class: "btn btn-secondary ms-2", remote: true %>
\ No newline at end of file
+
+<%= cancel_voucher_button %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4a06fe5ff..50f2982b5 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2213,8 +2213,14 @@ de:
     already_tutor_by_redemption: >
       Du hast bereits einen Gutschein eingelöst, um TutorInnenstatus zu erhalten.
     become_editor: >
-      Mit diesem Gutschein kannst Du EditorInnenrechte für die Veranstaltung
-      %{lecture} übernehmen.
+      Mit diesem Gutschein erhältst Du EditorInnenstatus für die Veranstaltung
+      %{lecture}.
+    already_editor_by_redemption: >
+      Du hast bereits einen Gutschein eingelöst, um EditorInnenstatus zu
+      erhalten.
+    teacher_cant_become_editor: >
+      Du kannst nicht zusätzlich EditorInnenstatus in einer Veranstaltung
+      erhalten, in der Du bereits DozentIn bist.
   mampf_news:
     title: 'MaMpf-News'
     check_notifications: 'Alle erledigen'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f4f392f4d..6423dfe1f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2064,7 +2064,7 @@ en:
       We have received your request and will send you your data as soon as possible.
     redeem_voucher: Redeeem Voucher
     become_tutor: >
-      With this voucher, you can obatin tutor status for the %{lecture}.
+      With this voucher, you can obtain tutor status for %{lecture}.
       With that, editors for the event series can assign you tutorials.
       If applicable, you can select the tutorials you will be responsible for
       right here.
@@ -2085,7 +2085,12 @@ en:
     already_tutor_by_redemption: >
       You have already redeemed a tutor voucher for this event series.
     become_editor: >
-      With this voucher, you can become an editor in the event series %{lecture}.
+      With this voucher, you can obtain editor status for %{lecture}.
+    already_editor_by_redemption: >
+      You have already redeemed an editor voucher for this event series.
+    teacher_cant_become_editor: >
+      You are already a teacher for this event series. Therefore, you cannot
+      redeem an editor voucher.
   mampf_news:
     title: 'MaMpf News'
     check_notifications: 'Clear all'

From 102bcc26177be30dcb4b324311b6b72fd50684cf Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 17:49:22 +0200
Subject: [PATCH 038/191] Take first steps in setting up redemption of teacher
 vouchers

---
 app/controllers/vouchers_controller.rb          |  9 +++++++++
 app/models/lecture.rb                           | 10 ++++++++++
 .../vouchers/_redeem_teacher_voucher.html.erb   |  9 +++++++++
 config/locales/de.yml                           | 17 +++++++++++++----
 config/locales/en.yml                           | 11 ++++++++++-
 5 files changed, 51 insertions(+), 5 deletions(-)
 create mode 100644 app/views/vouchers/_redeem_teacher_voucher.html.erb

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 547408574..4f214eec1 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -91,6 +91,8 @@ def process_voucher(voucher, lecture)
         process_tutor_voucher(voucher, lecture)
       elsif voucher.editor?
         process_editor_voucher(voucher, lecture)
+      elsif voucher.teacher?
+        process_teacher_voucher(voucher, lecture)
       end
     end
 
@@ -108,6 +110,13 @@ def process_editor_voucher(voucher, lecture)
       Redemption.create(user: current_user, voucher: voucher)
     end
 
+    def process_teacher_voucher(voucher, lecture)
+      lecture.update_teacher_status!(current_user)
+      # notify_new_teacher_by_mail(current_user, lecture)
+      # notify_previous_teacher_by_mail(lecture)
+      Redemption.create(user: current_user, voucher: voucher)
+    end
+
     def success_message(voucher)
       if voucher.tutor?
         I18n.t("controllers.become_tutor_success")
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index d92d5dacb..9550c61b3 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -872,6 +872,16 @@ def update_editor_status!(user)
     touch
   end
 
+  def update_teacher_status!(user)
+    return if teacher == user
+
+    previous_teacher = teacher
+    self.teacher = user
+    editors << previous_teacher
+    # touch to invalidate the cache
+    touch
+  end
+
   def voucher_redeemers(voucher_scope)
     User.where(id: Redemption.where(voucher: voucher_scope).select(:user_id))
   end
diff --git a/app/views/vouchers/_redeem_teacher_voucher.html.erb b/app/views/vouchers/_redeem_teacher_voucher.html.erb
new file mode 100644
index 000000000..759d659d7
--- /dev/null
+++ b/app/views/vouchers/_redeem_teacher_voucher.html.erb
@@ -0,0 +1,9 @@
+<%= t('profile.become_teacher', lecture: voucher.lecture.title) %>
+
+<% if current_user == voucher.lecture.teacher %>
+  <%= t('profile.already_teacher') %>
+<% else %>
+  <%= redeem_voucher_button(voucher) %>
+<% end %>
+
+<%= cancel_voucher_button %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 50f2982b5..0277479e8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2195,9 +2195,10 @@ de:
     redeem_voucher: Gutschein einlösen
     become_tutor: >
       Mit diesem Gutschein erhältst Du TutorInnenstatus in der Veranstaltung
-      %{lecture}. Dadurch können Dir VeranstaltungseditorInnen Tutorien zuweisen.
-      Ggf. kannst Du an dieser Stelle bereits Tutorien auswählen,
-      die Du übernehmen möchtest.
+      %{lecture}. Dadurch können Dir VeranstaltungseditorInnen und die DozentIn
+      Tutorien zuweisen. Ggf. kannst Du an dieser Stelle bereits Tutorien
+      auswählen, die Du übernehmen möchtest. Die VeranstaltungseditorInnen
+      und die DozentIn werden benachrichtigt, wenn Du den Gutschein einlöst.
     already_tutor: >
       Du bist bereits als TutorIn eingetragen für: %{tutorials}.
     new_tutor_select: >
@@ -2217,10 +2218,18 @@ de:
       %{lecture}.
     already_editor_by_redemption: >
       Du hast bereits einen Gutschein eingelöst, um EditorInnenstatus zu
-      erhalten.
+      erhalten. Die anderen VeranstaltungseditorInnen und die DozentIn werden
+      benachrichtigt, wenn Du den Gutschein einlöst.
     teacher_cant_become_editor: >
       Du kannst nicht zusätzlich EditorInnenstatus in einer Veranstaltung
       erhalten, in der Du bereits DozentIn bist.
+    become_teacher: >
+      Mit diesem Gutschein erhältst Du DozentInnenstatus für die Veranstaltung
+      %{lecture}. Die bisherige DozentIn erhält EditorInnenstatus.
+      Die VeranstaltungseditorInnen werden benachrichtigt,
+      wenn Du den Gutschein einlöst.
+    already_teacher: >
+      Du bist bereits DozentIn in dieser Veranstaltung.
   mampf_news:
     title: 'MaMpf-News'
     check_notifications: 'Alle erledigen'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6423dfe1f..c905a0dce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2067,7 +2067,8 @@ en:
       With this voucher, you can obtain tutor status for %{lecture}.
       With that, editors for the event series can assign you tutorials.
       If applicable, you can select the tutorials you will be responsible for
-      right here.
+      right here. The editors and the teacher will be notified when you have
+      redeemed the voucher.
     already_tutor: >
       You are already registered as a tutor for: %{tutorials}.
     new_tutor_select: >
@@ -2086,11 +2087,19 @@ en:
       You have already redeemed a tutor voucher for this event series.
     become_editor: >
       With this voucher, you can obtain editor status for %{lecture}.
+      The other editors and the teacher will be notified when you have
+      redeemed the voucher.
     already_editor_by_redemption: >
       You have already redeemed an editor voucher for this event series.
     teacher_cant_become_editor: >
       You are already a teacher for this event series. Therefore, you cannot
       redeem an editor voucher.
+    become_teacher: >
+      With this voucher, you can obtain teacher status for %{lecture}.
+      The previous teacher will be demoted to editor. The editors will be
+      notified when you have redeemed the voucher.
+    already_teacher: >
+      You are already the teacher for this event series.
   mampf_news:
     title: 'MaMpf News'
     check_notifications: 'Clear all'

From 09f47c2731b5426f1cd68fd20a364f9de2660a68 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 18:31:17 +0200
Subject: [PATCH 039/191] Add notifications for redemption of teacher vouchers

---
 app/controllers/vouchers_controller.rb        |  2 +
 app/helpers/application_helper.rb             |  6 ++
 app/helpers/notifications_helper.rb           | 59 -----------------
 app/helpers/redemptions_helper.rb             | 66 +++++++++++++++++++
 app/models/lecture.rb                         |  2 +-
 app/models/redemption.rb                      |  1 +
 .../vouchers/_redeem_teacher_voucher.html.erb |  4 +-
 config/locales/de.yml                         | 13 +++-
 config/locales/en.yml                         |  5 ++
 9 files changed, 95 insertions(+), 63 deletions(-)
 create mode 100644 app/helpers/redemptions_helper.rb

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 4f214eec1..2867f3407 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -122,6 +122,8 @@ def success_message(voucher)
         I18n.t("controllers.become_tutor_success")
       elsif voucher.editor?
         I18n.t("controllers.become_editor_success")
+      elsif voucher.teacher?
+        I18n.t("controllers.become_teacher_success")
       end
     end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f267191e3..495f7a96e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -327,4 +327,10 @@ def get_class_for_any_path(paths)
   def get_class_for_any_path_startswith(paths)
     paths.any? { |path| request.path.starts_with?(path) } ? ACTIVE_CSS_CLASS : ""
   end
+
+  def truncate_result(result, length = 40)
+    result.first(length).tap do |truncated|
+      return truncated.length < length ? truncated : "#{truncated}..."
+    end
+  end
 end
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index bb9654096..6efe5a44e 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -89,63 +89,4 @@ def items_card_size(small, comments_below)
 
     "70vh"
   end
-
-  # create text for lecture announcement in notification card header
-  def redemption_notification_card_header(redemption)
-    link_to(redemption.lecture.title_for_viewers,
-            edit_lecture_path(redemption.lecture, anchor: "people"),
-            class: "text-dark")
-  end
-
-  def redemption_notification_item_header(redemption)
-    t("notifications.redemption_in_lecture",
-      lecture: redemption.lecture.title_for_viewers)
-  end
-
-  def redemption_notification_details(redemption)
-    if redemption.tutor?
-      tutor_notification_details(redemption)
-    else
-      editor_notification_details(redemption)
-    end
-  end
-
-  def redemption_notification_item_details(redemption)
-    result = if redemption.tutor?
-      tutor_notification_item_details(redemption)
-    elsif redemption.editor?
-      editor_notification_item_details(redemption)
-    end
-
-    truncate_result(result)
-  end
-
-  private
-
-    def tutor_notification_item_details(redemption)
-      tutorials = redemption.claimed_tutorials.map(&:title).join(", ")
-      "#{t("basics.tutor")} #{redemption.user.tutorial_name}: #{tutorials}"
-    end
-
-    def editor_notification_item_details(redemption)
-      "#{t("basics.editor")} #{redemption.user.tutorial_name}"
-    end
-
-    def tutor_notification_details(redemption)
-      details = I18n.t("notifications.became_tutor",
-                       user: redemption.user.info)
-      tutorial_titles = redemption.claimed_tutorials.map(&:title).join(", ")
-      details << I18n.t("notifications.tutorial_details",
-                        tutorials: tutorial_titles)
-    end
-
-    def editor_notification_details(redemption)
-      I18n.t("notifications.became_editor", user: redemption.user.info)
-    end
-
-    def truncate_result(result)
-      result.first(40).tap do |truncated|
-        return truncated.length < 40 ? truncated : "#{truncated}..."
-      end
-    end
 end
diff --git a/app/helpers/redemptions_helper.rb b/app/helpers/redemptions_helper.rb
new file mode 100644
index 000000000..f7a33abd4
--- /dev/null
+++ b/app/helpers/redemptions_helper.rb
@@ -0,0 +1,66 @@
+# Redemptions Helper
+module RedemptionsHelper
+  def redemption_notification_card_header(redemption)
+    link_to(redemption.lecture.title_for_viewers,
+            edit_lecture_path(redemption.lecture, anchor: "people"),
+            class: "text-dark")
+  end
+
+  def redemption_notification_item_header(redemption)
+    t("notifications.redemption_in_lecture",
+      lecture: redemption.lecture.title_for_viewers)
+  end
+
+  def redemption_notification_details(redemption)
+    if redemption.tutor?
+      tutor_notification_details(redemption)
+    elsif redemption.editor?
+      editor_notification_details(redemption)
+    elsif redemption.teacher?
+      teacher_notification_details(redemption)
+    end
+  end
+
+  def redemption_notification_item_details(redemption)
+    result = if redemption.tutor?
+      tutor_notification_item_details(redemption)
+    elsif redemption.editor?
+      editor_notification_item_details(redemption)
+    elsif redemption.teacher?
+      teacher_notification_item_details(redemption)
+    end
+
+    truncate_result(result)
+  end
+
+  private
+
+    def tutor_notification_item_details(redemption)
+      tutorials = redemption.claimed_tutorials.map(&:title).join(", ")
+      "#{t("basics.tutor")} #{redemption.user.tutorial_name}: #{tutorials}"
+    end
+
+    def editor_notification_item_details(redemption)
+      "#{t("basics.editor")} #{redemption.user.tutorial_name}"
+    end
+
+    def teacher_notification_item_details(redemption)
+      "#{t("basics.teacher")} #{redemption.user.tutorial_name}"
+    end
+
+    def tutor_notification_details(redemption)
+      details = I18n.t("notifications.became_tutor",
+                       user: redemption.user.info)
+      tutorial_titles = redemption.claimed_tutorials.map(&:title).join(", ")
+      details << I18n.t("notifications.tutorial_details",
+                        tutorials: tutorial_titles)
+    end
+
+    def editor_notification_details(redemption)
+      I18n.t("notifications.became_editor", user: redemption.user.info)
+    end
+
+    def teacher_notification_details(redemption)
+      I18n.t("notifications.became_teacher", user: redemption.user.info)
+    end
+end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 9550c61b3..c3f070bf8 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -876,7 +876,7 @@ def update_teacher_status!(user)
     return if teacher == user
 
     previous_teacher = teacher
-    self.teacher = user
+    update(teacher: user)
     editors << previous_teacher
     # touch to invalidate the cache
     touch
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 093c3bfe8..c23079397 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -12,6 +12,7 @@ class Redemption < ApplicationRecord
   delegate :sort, to: :voucher
   delegate :tutor?, to: :voucher
   delegate :editor?, to: :voucher
+  delegate :teacher?, to: :voucher
 
   def create_notifications!
     lecture.editors_and_teacher.each do |editor|
diff --git a/app/views/vouchers/_redeem_teacher_voucher.html.erb b/app/views/vouchers/_redeem_teacher_voucher.html.erb
index 759d659d7..656eb12b9 100644
--- a/app/views/vouchers/_redeem_teacher_voucher.html.erb
+++ b/app/views/vouchers/_redeem_teacher_voucher.html.erb
@@ -1,4 +1,6 @@
-<%= t('profile.become_teacher', lecture: voucher.lecture.title) %>
+<p>
+  <%= t('profile.become_teacher', lecture: voucher.lecture.title) %>
+</p>
 
 <% if current_user == voucher.lecture.teacher %>
   <%= t('profile.already_teacher') %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 0277479e8..3113fbd12 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -731,10 +731,15 @@ de:
         section_needed: Bitte erstelle zuerst einen Abschnitt
         voucher_for_tutor: >
           Gutscheine für TutorInnen können von NutzerInnen eingelöst werden, um
-          TutorIn für diese Veranstaltung zu werden.
+          TutorInnenstatus für diese Veranstaltung zu erhalten und ggf. direkt
+          Tutorien zu übernehmen.
         voucher_for_editor: >
           Gutscheine für EditorInnen können von NutzerInnen eingelöst werden, um
-          EditorIn für diese Veranstaltung zu werden.
+          EditorInnenstatus für diese Veranstaltung zu ehalten.
+        voucher_for_teacher: >
+          Gutscheine für DozentInnen können von NutzerInnen eingelöst werden, um
+          DozentInnenstatus für diese Veranstaltung zu erhalten. Die bisherige
+          DozentIn wird dann EditorIn.
       show_media: 'Medien einblenden'
       workflow: 'Workflow'
       content_mode: 'Inhaltsermittlung'
@@ -2271,6 +2276,9 @@ de:
     became_editor: >
       %{user} hat einen EditorInnen-Gutschein eingelöst und ist jetzt EditorIn in der
       Veranstaltung.
+    became_teacher: >
+      %{user} hat einen DozentInnen-Gutschein eingelöst und ist jetzt DozentIn
+      der Veranstaltung.
     tutorial_details: >
       Neu übernommene Tutorien: %{tutorials}.
     redemption: 'Gutschein eingelöst:'
@@ -3755,6 +3763,7 @@ de:
     voucher_invalid: 'Der Gutschein ist ungültig.'
     become_tutor_success: 'Dein Tutorenstatus wurde geupdatet.'
     become_editor_success: 'Dein Editorenstatus wurde geupdatet.'
+    become_teacher_success: 'Dein DozentInnenstatus wurde geupdatet.'
     tutorials:
       destruction_failed: >
         Das Tutorium konnte nicht gelöscht werden. Das kann z.B. daran liegen,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c905a0dce..87ad8f02f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2141,6 +2141,9 @@ en:
     became_editor: >
       %{user} has redeemed an editor voucher and has therefore become editor
       in the event series.
+    became_teacher: >
+      %{user} has redeemed a teacher voucher and has therefore become teacher
+      in the event series.
     tutorial_details: >
       Tutorials taken over: %{tutorials}.
     redemption: 'Voucher redeemed:'
@@ -3564,6 +3567,8 @@ en:
       Your tutor status has been updated.
     become_editor_success: >
       Your editor status has been updated.
+    become_teacher_success: >
+      Your teacher status has been updated.
     tutorials:
       destruction_failed: >
         The tutorial could not be deleted. That may be because there are already

From 2205752dad5829acf524da0eb095bc9d69535589 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 19:23:55 +0200
Subject: [PATCH 040/191] Add notification mails for teacher change by voucher
 redemption

---
 app/controllers/concerns/notifier.rb          | 14 +++++++++++
 app/controllers/vouchers_controller.rb        |  9 +++++---
 app/mailers/notification_mailer.rb            | 23 +++++++++++++++++++
 .../new_teacher_email.html.erb                |  7 ++++++
 .../new_teacher_email.text.erb                |  1 +
 .../previous_teacher_email.html.erb           | 10 ++++++++
 .../previous_teacher_email.text.erb           |  4 ++++
 config/locales/de.yml                         |  8 +++++++
 config/locales/en.yml                         |  8 +++++++
 9 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 app/views/notification_mailer/new_teacher_email.html.erb
 create mode 100644 app/views/notification_mailer/new_teacher_email.text.erb
 create mode 100644 app/views/notification_mailer/previous_teacher_email.html.erb
 create mode 100644 app/views/notification_mailer/previous_teacher_email.text.erb

diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/concerns/notifier.rb
index 20f24fc16..0f8515646 100644
--- a/app/controllers/concerns/notifier.rb
+++ b/app/controllers/concerns/notifier.rb
@@ -7,4 +7,18 @@ def notify_new_editor_by_mail(editor, lecture)
                             lecture: lecture)
                       .new_editor_email.deliver_later
   end
+
+  def notify_new_teacher_by_mail(teacher, lecture)
+    NotificationMailer.with(recipient: teacher,
+                            locale: teacher.locale,
+                            lecture: lecture)
+                      .new_teacher_email.deliver_later
+  end
+
+  def notify_previous_teacher_by_mail(previous_teacher, lecture)
+    NotificationMailer.with(recipient: previous_teacher,
+                            locale: previous_teacher.locale,
+                            lecture: lecture)
+                      .previous_teacher_email.deliver_later
+  end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 2867f3407..c443b3791 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -49,7 +49,7 @@ def redeem
     if voucher
       lecture = voucher.lecture
       redemption = process_voucher(voucher, lecture)
-      redemption.create_notifications!
+      redemption&.create_notifications!
       redirect_to edit_profile_path, notice: success_message(voucher)
     else
       handle_invalid_voucher
@@ -111,9 +111,12 @@ def process_editor_voucher(voucher, lecture)
     end
 
     def process_teacher_voucher(voucher, lecture)
+      previous_teacher = lecture.teacher
       lecture.update_teacher_status!(current_user)
-      # notify_new_teacher_by_mail(current_user, lecture)
-      # notify_previous_teacher_by_mail(lecture)
+      if previous_teacher != current_user
+        notify_new_teacher_by_mail(current_user, lecture)
+        notify_previous_teacher_by_mail(previous_teacher, lecture)
+      end
       Redemption.create(user: current_user, voucher: voucher)
     end
 
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index ae6a281c1..cdf2a4dfc 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -62,6 +62,29 @@ def new_editor_email
                     title: @lecture.title_for_viewers))
   end
 
+  def new_teacher_email
+    @lecture = params[:lecture]
+    @recipient = params[:recipient]
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.new_teacher_subject",
+                    title: @lecture.title_for_viewers))
+  end
+
+  def previous_teacher_email
+    @lecture = params[:lecture]
+    @recipient = params[:recipient]
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.previous_teacher_subject",
+                    title: @lecture.title_for_viewers,
+                    new_teacher: @lecture.teacher.tutorial_name))
+  end
+
   def submission_invitation_email
     @recipient = params[:recipient]
     @assignment = params[:assignment]
diff --git a/app/views/notification_mailer/new_teacher_email.html.erb b/app/views/notification_mailer/new_teacher_email.html.erb
new file mode 100644
index 000000000..effab3acf
--- /dev/null
+++ b/app/views/notification_mailer/new_teacher_email.html.erb
@@ -0,0 +1,7 @@
+<%= t('mailer.new_teacher', title: @lecture.title_with_teacher, username: @username) %>
+<br>
+<p class="pt-2">
+  <%= link_to(t('notifications.edit_lecture'),
+              edit_lecture_url(@lecture),
+              class: 'btn btn-primary') %>
+</p>
diff --git a/app/views/notification_mailer/new_teacher_email.text.erb b/app/views/notification_mailer/new_teacher_email.text.erb
new file mode 100644
index 000000000..6236279c3
--- /dev/null
+++ b/app/views/notification_mailer/new_teacher_email.text.erb
@@ -0,0 +1 @@
+<%= t('mailer.new_teacher', title: @lecture.title_with_teacher, username: @username) %>
diff --git a/app/views/notification_mailer/previous_teacher_email.html.erb b/app/views/notification_mailer/previous_teacher_email.html.erb
new file mode 100644
index 000000000..620441f57
--- /dev/null
+++ b/app/views/notification_mailer/previous_teacher_email.html.erb
@@ -0,0 +1,10 @@
+<%= t('mailer.previous_teacher',
+      title: @lecture.title_with_teacher,
+      username: @username,
+      new_teacher: @lecture.teacher.info) %>
+<br>
+<p class="pt-2">
+  <%= link_to(t('notifications.edit_lecture'),
+              edit_lecture_url(@lecture),
+              class: 'btn btn-primary') %>
+</p>
diff --git a/app/views/notification_mailer/previous_teacher_email.text.erb b/app/views/notification_mailer/previous_teacher_email.text.erb
new file mode 100644
index 000000000..e27b04ae1
--- /dev/null
+++ b/app/views/notification_mailer/previous_teacher_email.text.erb
@@ -0,0 +1,4 @@
+<%= t('mailer.previous_teacher',
+      title: @lecture.title_with_teacher,
+      username: @username,
+      new_teacher: @lecture.teacher.info) %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 3113fbd12..516641574 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3158,6 +3158,14 @@ de:
     text: 'Text'
     new_editor_subject: 'EditorInnenrechte für %{title}'
     new_editor: 'Hallo %{username}, Du hast soeben Bearbeitungsrechte für %{title} erhalten.'
+    new_teacher_subject: 'DozentInnenstatus für %{title}'
+    new_teacher: 'Hallo %{username}, Du hast soeben DozentInnenstatus für %{title} erhalten.'
+    previous_teacher_subject: 'DozentInnenwechsel in %{title}'
+    previous_teacher: >
+      Hallo %{username}, in der Veranstaltung %{title} gab es einen
+      DozentInnenwechsel. %{new_teacher} hat einen DozentInnengutschein eingelöst
+      und ist jetzt DozentIn. Du bist nicht mehr DozentIn in %{title}, sondern
+      stattdessen VeranstaltungseditorIn.
     new_lecture_subject: 'Neue Veranstaltung %{title}'
     new_lecture: 'Es wurde eine neue Veranstaltung angelegt: %{title}.'
     subscribe_lecture: >
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 87ad8f02f..391fb46fa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2969,6 +2969,14 @@ en:
     text: 'Text'
     new_editor_subject: 'Editing Rights for %{title}'
     new_editor: 'Dear %{username}, you have been given editing rights for %{title}.'
+    new_teacher_subject: 'Teacher Status for %{title}'
+    new_teacher: 'Dear %{username}, you have been given teacher status for %{title}.'
+    previous_teacher_subject: 'Teacher Change for %{title}'
+    previous_teacher: >
+      Dear %{username}, ther has been a teacher change for %{title}.
+      %{new_teacher} has redeemed a teacher voucher and is now the teacher for
+      this event series. You are no longer teacher for %{title}, but
+      editor instead.
     new_lecture_subject: 'New event series %{title}'
     new_lecture: 'A new event series has been made available: %{title}.'
     subscribe_lecture: 'You can subscribe to it in your profile settings.'

From 3b69eb19f294f67e372252b4bc9ff7b125c34093 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 17 Aug 2024 19:44:41 +0200
Subject: [PATCH 041/191] Invalidate teacher vouchers after first use

---
 app/controllers/vouchers_controller.rb |  3 ++-
 app/models/voucher.rb                  |  4 ++++
 config/locales/de.yml                  |  3 ++-
 config/locales/en.yml                  | 14 ++++++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index c443b3791..e74d59c30 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -23,7 +23,7 @@ def create
 
   def invalidate
     set_related_data
-    @voucher.update(invalidated_at: Time.zone.now)
+    @voucher.invalidate!
     respond_to do |format|
       format.html { redirect_to edit_lecture_path(@lecture, anchor: "people") }
       format.js
@@ -117,6 +117,7 @@ def process_teacher_voucher(voucher, lecture)
         notify_new_teacher_by_mail(current_user, lecture)
         notify_previous_teacher_by_mail(previous_teacher, lecture)
       end
+      voucher.invalidate!
       Redemption.create(user: current_user, voucher: voucher)
     end
 
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 606ad7abe..82f3dfbed 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -24,6 +24,10 @@ def self.check_voucher(secure_hash)
     Voucher.active.find_by(secure_hash: secure_hash)
   end
 
+  def invalidate!
+    update(invalidated_at: Time.zone.now)
+  end
+
   private
 
     def generate_secure_hash
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 516641574..9b9902850 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -739,7 +739,8 @@ de:
         voucher_for_teacher: >
           Gutscheine für DozentInnen können von NutzerInnen eingelöst werden, um
           DozentInnenstatus für diese Veranstaltung zu erhalten. Die bisherige
-          DozentIn wird dann EditorIn.
+          DozentIn wird dann EditorIn. Aus Sicherheitsgründen wird ein solcher
+          Gutschein direkt nach dem Einlösen für ungültig erklärt.
       show_media: 'Medien einblenden'
       workflow: 'Workflow'
       content_mode: 'Inhaltsermittlung'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 391fb46fa..0034616e2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -699,11 +699,17 @@ en:
           timestamped and marked as "too late".
         section_needed: Please create a section first
         voucher_for_tutor: >
-          Vouchers for tutors can be redeemed by users to become tutor for this
-          event series.
+          Vouchers for tutors can be redeemed by users to obtain tutor status
+          for this event series and if possible, to directly take over
+          tutorials.
         voucher_for_editor: >
-          Vouchers for editors can be redeemed by users to become additional
-          editor for this event series.
+          Vouchers for editors can be redeemed by users to obtain
+          editor status for this event series.
+        voucher_for_teacher: >
+          Vouchers for teachers can be redeemed by users to obtain teacher
+          status for this event series. The previous teacher will be demoted
+          and becomes an editor. For security reasons such a voucher will
+          be invalidated directly after its redemption.
       show_media: 'Show media'
       workflow: 'Workflow'
       content_mode: 'Content determination'

From c00f482e23406e3ddd5045d3f362d940fa75a845 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 18 Aug 2024 13:49:52 +0200
Subject: [PATCH 042/191] Add vouchers for seminar speakers

---
 app/models/voucher.rb                      | 34 ++++++++-
 app/views/lectures/edit/_vouchers.html.erb |  4 +-
 config/locales/de.yml                      |  3 +
 config/locales/en.yml                      |  9 ++-
 spec/models/voucher_spec.rb                | 89 ++++++++++++++++++++--
 5 files changed, 125 insertions(+), 14 deletions(-)

diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index cc06f5dd5..b88ee4b5c 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -1,5 +1,8 @@
 class Voucher < ApplicationRecord
-  SORT_HASH = { tutor: 0, editor: 1, teacher: 2 }.freeze
+  SORT_HASH = { tutor: 0, editor: 1, teacher: 2, speaker: 3 }.freeze
+  SPEAKER_EXPIRATION_DAYS = 30
+  TUTOR_EXPIRATION_DAYS = 14
+  DEFAULT_EXPIRATION_DAYS = 3
 
   enum sort: SORT_HASH
 
@@ -7,6 +10,7 @@ class Voucher < ApplicationRecord
   before_create :generate_secure_hash
   before_create :add_expiration_datetime
   before_create :ensure_no_other_active_voucher
+  before_create :ensure_speaker_vouchers_only_for_seminars
   validates :sort, presence: true
 
   scope :active, lambda {
@@ -16,6 +20,12 @@ class Voucher < ApplicationRecord
 
   self.implicit_order_column = "created_at"
 
+  def self.sorts_for_lecture(lecture)
+    return SORT_HASH.keys if lecture.seminar?
+
+    SORT_HASH.keys - [:speaker]
+  end
+
   private
 
     def generate_secure_hash
@@ -23,7 +33,7 @@ def generate_secure_hash
     end
 
     def add_expiration_datetime
-      self.expires_at = created_at + 90.days
+      self.expires_at = created_at + expiration_days.days
     end
 
     def ensure_no_other_active_voucher
@@ -31,7 +41,25 @@ def ensure_no_other_active_voucher
       return unless lecture.vouchers.where(sort: sort).active.any?
 
       errors.add(:sort,
-                 I18n.t("activerecord.errors.models.voucher.attributes.sort.only_one_active"))
+                 I18n.t("activerecord.errors.models.voucher.attributes.sort." \
+                        "only_one_active"))
+      throw(:abort)
+    end
+
+    def ensure_speaker_vouchers_only_for_seminars
+      return unless speaker?
+      return if lecture.seminar?
+
+      errors.add(:sort,
+                 I18n.t("activerecord.errors.models.voucher.attributes.sort." \
+                        "speaker_vouchers_only_for_seminars"))
       throw(:abort)
     end
+
+    def expiration_days
+      return SPEAKER_EXPIRATION_DAYS if speaker?
+      return TUTOR_EXPIRATION_DAYS if tutor?
+
+      DEFAULT_EXPIRATION_DAYS
+    end
 end
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb
index 55b2ebe7f..b2260e983 100644
--- a/app/views/lectures/edit/_vouchers.html.erb
+++ b/app/views/lectures/edit/_vouchers.html.erb
@@ -4,11 +4,11 @@
 </h3>
 
 <% if current_user.can_update_personell?(lecture) %>
-  <% Voucher::SORT_HASH.keys.each do |sort| %>
+  <% Voucher.sorts_for_lecture(lecture).each do |sort| %>
     <h4 class="lecture-pane-subheader">
       <%= t("basics.voucher_for",
              sort: t("basics.#{sort}s")) %>
-    </h4>  
+    </h4>
   <div id='<%= "#{sort}"%>-voucher'>
     <%= render partial: 'vouchers/voucher',
                 locals: { lecture: lecture,
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 7ad949f6b..29e045996 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3471,6 +3471,7 @@ de:
     editors: EditorInnen
     vouchers: Gutscheine
     voucher_for: Gutschein für %{sort}
+    speakers: Vortragende
   access:
     unpublished: 'unveröffentlicht'
     all: 'frei'
@@ -3944,6 +3945,8 @@ de:
             sort:
               only_one_active: >
                 Für diese Vorlesung kann es nur einen aktiven Voucher dieses Typs geben.
+              speaker_vouchers_only_for_seminars: >
+                Vortragenden-Gutscheine können nur für Seminare erstellt werden.
         watchlist_entry:
           attributes:
             medium_id:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 33848351a..4a65a3c6c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -496,8 +496,8 @@ en:
       import_chapters: import chapters
       import_sections: import sections
       import_tags: import tags
-      no_active_tutor_voucher: >
-        There are no active tutor vouchers.
+      no_active_voucher: >
+        There is no active %{sort} for this event series.
       info:
         course: >
           Here you can select the course to which this event series belongs.
@@ -3282,7 +3282,8 @@ en:
     enter_two_letters: enter at least 2 letters
     no_results: No results found
     vouchers: Vouchers
-    voucher_for_tutors: Voucher for tutors
+    voucher_for: Voucher for %{sort}
+    speakers: Speakers
   warnings:
     save_before: 'Before you continue, you need to save or discard your changes'
     unsaved_changes: >
@@ -3733,6 +3734,8 @@ en:
             sort:
               only_one_active: >
                 There can be only one active voucher of this sort for the lecture.
+              speaker_vouchers_only_for_seminars: >
+                Speaker vouchers are only allowed for seminars.
         watchlist_entry:
           attributes:
             medium_id:
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index 4baa2279d..db6c3724d 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -2,6 +2,7 @@
 
 RSpec.describe(Voucher, type: :model) do
   let(:lecture) { FactoryBot.create(:lecture) }
+  let(:seminar) { FactoryBot.create(:lecture, :is_seminar) }
 
   describe "callbacks" do
     it "generates a secure hash before creating" do
@@ -18,13 +19,77 @@
       expect(voucher.expires_at).not_to be_nil
     end
 
-    it "rolls back if there is another active voucher with the same sort for the lecture" do
-      FactoryBot.create(:voucher, :tutor, lecture: lecture)
-      new_voucher = build(:voucher, :tutor, lecture: lecture)
+    describe "#add_expiration_datetime" do
+      let(:voucher) { build(:voucher, sort: sort, created_at: Time.zone.now) }
 
-      expect(new_voucher.save).to be_falsey
-      expect(new_voucher.errors[:sort]).to include(I18n.t("activerecord.errors.models.voucher." \
-                                                          "attributes.sort.only_one_active"))
+      context "when the voucher is for a speaker" do
+        let(:sort) { :speaker }
+
+        it "sets the expiration date to SPEAKER_EXPIRATION_DAYS from created_at" do
+          voucher.save
+          expect(voucher.expires_at).to(
+            eq(voucher.created_at + Voucher::SPEAKER_EXPIRATION_DAYS.days)
+          )
+        end
+      end
+
+      context "when the voucher is for a tutor" do
+        let(:sort) { :tutor }
+
+        it "sets the expiration date to TUTOR_EXPIRATION_DAYS from created_at" do
+          voucher.save
+          expect(voucher.expires_at).to(
+            eq(voucher.created_at + Voucher::TUTOR_EXPIRATION_DAYS.days)
+          )
+        end
+      end
+
+      context "when the voucher is for another sort" do
+        let(:sort) { :teacher }
+
+        it "sets the expiration date to DEFAULT_EXPIRATION_DAYS from created_at" do
+          voucher.save
+          expect(voucher.expires_at).to(
+            eq(voucher.created_at + Voucher::DEFAULT_EXPIRATION_DAYS.days)
+          )
+        end
+      end
+    end
+
+    describe "#ensure_no_other_active_voucher" do
+      it "rolls back if there is another active voucher with the same sort for the lecture" do
+        FactoryBot.create(:voucher, :tutor, lecture: lecture)
+        new_voucher = build(:voucher, :tutor, lecture: lecture)
+
+        expect(new_voucher.save).to be_falsey
+        expect(new_voucher.errors[:sort]).to(
+          include(I18n.t("activerecord.errors.models.voucher." \
+                         "attributes.sort.only_one_active"))
+        )
+      end
+    end
+
+    describe "#ensure_speaker_vouchers_only_for_seminars" do
+      context "whe the lecture is a seminar" do
+        let(:voucher) { build(:voucher, :speaker, lecture: seminar) }
+
+        it "does not add an error" do
+          expect(voucher.save).to be_truthy
+          expect(voucher.errors[:sort]).to be_empty
+        end
+      end
+
+      context "when the lecture is not a seminar" do
+        let(:voucher) { build(:voucher, :speaker, lecture: lecture) }
+
+        it "rolls back and adds an error" do
+          expect(voucher.save).to be_falsey
+          expect(voucher.errors[:sort]).to(
+            include(I18n.t("activerecord.errors.models.voucher.attributes." \
+                           "sort.speaker_vouchers_only_for_seminars"))
+          )
+        end
+      end
     end
   end
 
@@ -47,4 +112,16 @@
       end
     end
   end
+
+  describe "class methods" do
+    describe ".sorts_for_lecture" do
+      it "returns all sorts if the lecture is a seminar" do
+        expect(Voucher.sorts_for_lecture(seminar)).to eq(Voucher::SORT_HASH.keys)
+      end
+
+      it "returns all sorts except :speaker if the lecture is not a seminar" do
+        expect(Voucher.sorts_for_lecture(lecture)).to eq(Voucher::SORT_HASH.keys - [:speaker])
+      end
+    end
+  end
 end

From 8f6c2350e581dd5715e9195c04f00d9c6beeee9e Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 18 Aug 2024 14:02:15 +0200
Subject: [PATCH 043/191] Add helpdesk for speaker vouchers

---
 config/locales/de.yml | 8 ++++++--
 config/locales/en.yml | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8670df0d4..141ad469a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -739,8 +739,12 @@ de:
         voucher_for_teacher: >
           Gutscheine für DozentInnen können von NutzerInnen eingelöst werden, um
           DozentInnenstatus für diese Veranstaltung zu erhalten. Die bisherige
-          DozentIn wird dann EditorIn. Aus Sicherheitsgründen wird ein solcher
-          Gutschein direkt nach dem Einlösen für ungültig erklärt.
+          DozentIn wird dann EditorIn. Ein solcher
+          Gutschein wird direkt nach dem Einlösen für ungültig erklärt.
+        voucher_for_speaker: >
+          Gutscheine für Vortragende können von NutzerInnen eingelöst werden, um
+          Vortragendenstatus für das Seminar zu erhalten und ggf. direkt
+          Vorträge zu übernehmen.
       show_media: 'Medien einblenden'
       workflow: 'Workflow'
       content_mode: 'Inhaltsermittlung'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 550b9abbb..48bade0f2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -708,8 +708,12 @@ en:
         voucher_for_teacher: >
           Vouchers for teachers can be redeemed by users to obtain teacher
           status for this event series. The previous teacher will be demoted
-          and becomes an editor. For security reasons such a voucher will
-          be invalidated directly after its redemption.
+          and becomes an editor. Such a voucher will be invalidated directly
+          after its redemption.
+        vouchers_for_speaker: >
+          Vouchers for speakers can be redeemed by users to obtain speaker
+          status for this seminar and if possible, to directly take over
+          talks.
       show_media: 'Show media'
       workflow: 'Workflow'
       content_mode: 'Content determination'

From 34e00639b6fc4f1910719b4636962ecd0d59f7d6 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 18 Aug 2024 16:07:26 +0200
Subject: [PATCH 044/191] Set up redemption of speaker vouchers

---
 app/controllers/concerns/notifier.rb          |  5 ++
 app/controllers/vouchers_controller.rb        | 19 +++++--
 app/helpers/talks_helper.rb                   | 18 +++++++
 app/helpers/vouchers_helper.rb                |  9 ++++
 app/models/lecture.rb                         | 37 ++++++++++++--
 app/models/redemption.rb                      |  4 ++
 app/models/talk.rb                            | 12 +++++
 app/models/tutorial.rb                        |  4 ++
 app/models/voucher.rb                         |  1 +
 app/views/lectures/edit/_tutorials.html.erb   |  1 +
 app/views/talks/_basics.html.erb              | 12 ++---
 app/views/talks/_new.html.erb                 | 16 +-----
 .../vouchers/_redeem_speaker_voucher.html.erb | 36 +++++++++++++
 .../vouchers/_redeem_tutor_voucher.html.erb   |  2 +-
 app/views/vouchers/_talks_form.html.erb       | 14 +++++
 config/locales/de.yml                         | 46 +++++++++++++++--
 config/locales/en.yml                         | 51 +++++++++++++++----
 17 files changed, 239 insertions(+), 48 deletions(-)
 create mode 100644 app/views/vouchers/_redeem_speaker_voucher.html.erb
 create mode 100644 app/views/vouchers/_talks_form.html.erb

diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/concerns/notifier.rb
index 0f8515646..a92cf12db 100644
--- a/app/controllers/concerns/notifier.rb
+++ b/app/controllers/concerns/notifier.rb
@@ -21,4 +21,9 @@ def notify_previous_teacher_by_mail(previous_teacher, lecture)
                             lecture: lecture)
                       .previous_teacher_email.deliver_later
   end
+
+  def notify_about_teacher_change(lecture, previous_teacher)
+    notify_new_teacher_by_mail(current_user, lecture)
+    notify_previous_teacher_by_mail(previous_teacher, lecture)
+  end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index e74d59c30..303065bab 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -70,7 +70,7 @@ def voucher_params
     end
 
     def check_voucher_params
-      params.permit(:secure_hash, tutorial_ids: [])
+      params.permit(:secure_hash, tutorial_ids: [], talk_ids: [])
     end
 
     def set_voucher
@@ -93,6 +93,8 @@ def process_voucher(voucher, lecture)
         process_editor_voucher(voucher, lecture)
       elsif voucher.teacher?
         process_teacher_voucher(voucher, lecture)
+      else
+        process_speaker_voucher(voucher, lecture)
       end
     end
 
@@ -113,14 +115,21 @@ def process_editor_voucher(voucher, lecture)
     def process_teacher_voucher(voucher, lecture)
       previous_teacher = lecture.teacher
       lecture.update_teacher_status!(current_user)
-      if previous_teacher != current_user
-        notify_new_teacher_by_mail(current_user, lecture)
-        notify_previous_teacher_by_mail(previous_teacher, lecture)
-      end
+      # no need to send out notifications if the teacher stays the same
+      # because then there is no demotion to editor
+      # (this case is actually not possible to trigger via the GUI)
+      notify_about_teacher_change(lecture, previous_teacher) if previous_teacher != current_user
       voucher.invalidate!
       Redemption.create(user: current_user, voucher: voucher)
     end
 
+    def process_speaker_voucher(voucher, seminar)
+      selected_talks = seminar.talks.where(id: check_voucher_params[:talk_ids])
+      seminar.update_speaker_status!(current_user, selected_talks)
+      Redemption.create(user: current_user, voucher: voucher,
+                        claimed_talks: selected_talks)
+    end
+
     def success_message(voucher)
       if voucher.tutor?
         I18n.t("controllers.become_tutor_success")
diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb
index 4546dba81..857d9f865 100644
--- a/app/helpers/talks_helper.rb
+++ b/app/helpers/talks_helper.rb
@@ -42,4 +42,22 @@ def date_list(talk)
   def cospeaker_list(talk, user)
     (talk.speakers.to_a - [user]).map(&:tutorial_name).join(", ")
   end
+
+  def speakers_preselection(talk)
+    options_for_select(talk.lecture.eligible_as_speakers.map do |s|
+                         [s.tutorial_info, s.id]
+                       end, talk.speaker_ids)
+  end
+
+  def speaker_select(form, talk)
+    content_tag(:div, class: "mb-3") do
+      label = form.label(:speaker_ids, t("admin.talk.speakers"),
+                         class: "form-label")
+      help_desk = helpdesk(t("admin.talk.info.speakers"), false)
+      select = form.select(:speaker_ids, speakers_preselection(talk), {},
+                           class: "selectize", multiple: true)
+
+      label + help_desk + select
+    end
+  end
 end
diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index c9d1a6337..0ec0ddf91 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -11,6 +11,15 @@ def tutorials_with_tutor_titles(user, voucher)
     voucher.lecture.tutorials_with_tutor(user).map(&:title).join(", ")
   end
 
+  def talks_with_titles(user, voucher)
+    voucher.lecture.talks_with_speaker(user).map(&:to_label).join("; ")
+  end
+
+  def talk_options(user, voucher)
+    voucher.lecture.talks_without_speaker(user)
+           .map { |t| [t.to_label_with_speakers, t.id] }
+  end
+
   def redeem_voucher_button(voucher)
     link_to(t("profile.redeem_voucher"),
             redeem_voucher_path(params: { secure_hash: voucher.secure_hash }),
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index c3f070bf8..6446db29e 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -858,7 +858,7 @@ def active_voucher_of_sort(sort)
 
   def update_tutor_status!(user, selected_tutorials)
     tutorials.find_each do |t|
-      add_tutor(t, user) if selected_tutorials.include?(t)
+      t.add_tutor(user) if selected_tutorials.include?(t)
     end
     # touch to invalidate the cache
     touch
@@ -882,6 +882,14 @@ def update_teacher_status!(user)
     touch
   end
 
+  def update_speaker_status!(user, selected_talks)
+    talks.find_each do |t|
+      t.add_speaker(user) if selected_talks.include?(t)
+    end
+    # touch to invalidate the cache
+    touch
+  end
+
   def voucher_redeemers(voucher_scope)
     User.where(id: Redemption.where(voucher: voucher_scope).select(:user_id))
   end
@@ -894,6 +902,10 @@ def editors_by_redemption
     voucher_redeemers(vouchers.for_editors)
   end
 
+  def speakers_by_redemption
+    voucher_redeemers(vouchers.for_speakers)
+  end
+
   def eligible_as_tutors
     (tutors + tutors_by_redemption + editors + [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
@@ -908,6 +920,13 @@ def eligible_as_editors
     # still given by the old system, this will not be true
   end
 
+  def eligible_as_speakers
+    (speakers + speakers_by_redemption + editors + [teacher]).uniq
+    # the first one should (in the future) actually be contained in the sum of
+    # the other ones, but in the transition phase where some editor statuses were
+    # still given by the old system, this will not be true
+  end
+
   def editors_and_teacher
     [teacher] + editors
   end
@@ -920,6 +939,14 @@ def tutorials_without_tutor(tutor)
     tutorials.where.not(id: tutorial_ids_for_tutor(tutor))
   end
 
+  def talks_with_speaker(speaker)
+    talks.where(id: talk_ids_for_speaker(speaker))
+  end
+
+  def talks_without_speaker(speaker)
+    talks.where.not(id: talk_ids_for_speaker(speaker))
+  end
+
   private
 
     # used for after save callback
@@ -1024,11 +1051,11 @@ def only_one_lecture
       errors.add(:course, :already_present)
     end
 
-    def add_tutor(tutorial, user)
-      tutorial.tutors << user unless tutorial.tutors.include?(user)
-    end
-
     def tutorial_ids_for_tutor(tutor)
       TutorTutorialJoin.where(tutor: tutor).select(:tutorial_id)
     end
+
+    def talk_ids_for_speaker(speaker)
+      SpeakerTalkJoin.where(speaker: speaker).select(:talk_id)
+    end
 end
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index c23079397..7fbc7a416 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -7,6 +7,8 @@ class Redemption < ApplicationRecord
   has_many :claims, dependent: :destroy
   has_many :claimed_tutorials, through: :claims, source: :claimable,
                                source_type: "Tutorial"
+  has_many :claimed_talks, through: :claims, source: :claimable,
+                           source_type: "Talk"
 
   delegate :lecture, to: :voucher
   delegate :sort, to: :voucher
@@ -15,6 +17,8 @@ class Redemption < ApplicationRecord
   delegate :teacher?, to: :voucher
 
   def create_notifications!
+    return if voucher.speaker?
+
     lecture.editors_and_teacher.each do |editor|
       Notification.create(notifiable: self, recipient: editor)
     end
diff --git a/app/models/talk.rb b/app/models/talk.rb
index 2afef84a1..650eb1f22 100644
--- a/app/models/talk.rb
+++ b/app/models/talk.rb
@@ -4,6 +4,8 @@ class Talk < ApplicationRecord
 
   has_many :speaker_talk_joins, dependent: :destroy
   has_many :speakers, through: :speaker_talk_joins
+  has_many :claims, as: :claimable, dependent: :destroy
+
   validates :title, presence: true
 
   # being a teachable (course/lecture/lesson), a talk has associated media
@@ -35,6 +37,12 @@ def to_label
     I18n.t("talk", number: position, title: title)
   end
 
+  def to_label_with_speakers
+    return to_label unless speakers.any?
+
+    "#{to_label} (#{speakers.map(&:tutorial_name).join(", ")})"
+  end
+
   def long_title
     title_for_viewers
   end
@@ -100,6 +108,10 @@ def editors_with_inheritance
     (speakers + lecture.editors_with_inheritance).uniq
   end
 
+  def add_speaker(speaker)
+    speakers << speaker unless speaker.in?(speakers)
+  end
+
   private
 
     def touch_lecture
diff --git a/app/models/tutorial.rb b/app/models/tutorial.rb
index 9e3dcd6fb..8fd72418a 100644
--- a/app/models/tutorial.rb
+++ b/app/models/tutorial.rb
@@ -43,6 +43,10 @@ def teams_to_csv(assignment)
     end
   end
 
+  def add_tutor(tutor)
+    tutors << tutor unless tutors.include?(tutor)
+  end
+
   private
 
     def check_destructibility
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 8e6193dcc..a95e81c30 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -21,6 +21,7 @@ class Voucher < ApplicationRecord
                  }
   scope :for_tutors, -> { where(sort: :tutor) }
   scope :for_editors, -> { where(sort: :editor) }
+  scope :for_speakers, -> { where(sort: :speaker) }
 
   self.implicit_order_column = "created_at"
 
diff --git a/app/views/lectures/edit/_tutorials.html.erb b/app/views/lectures/edit/_tutorials.html.erb
index 1dded934e..62c8a7bc0 100644
--- a/app/views/lectures/edit/_tutorials.html.erb
+++ b/app/views/lectures/edit/_tutorials.html.erb
@@ -26,6 +26,7 @@
         <div class="col-4">
           <h6>
             <%= t('basics.tutors') %>
+            <%= helpdesk(t('tutorial.info.tutors'), true) %>
           </h6>
         </div>
         <div class="col-4">
diff --git a/app/views/talks/_basics.html.erb b/app/views/talks/_basics.html.erb
index 6fc304b59..826d853d8 100644
--- a/app/views/talks/_basics.html.erb
+++ b/app/views/talks/_basics.html.erb
@@ -52,18 +52,12 @@
         <%= f.label :speaker_ids,
                     t('admin.talk.speakers'),
                     class: "form-label" %>
+        <%= helpdesk(t('admin.talk.info.speakers'), false) %>
         <%= f.select :speaker_ids,
-                     options_for_select(talk.speakers.map { |s| [s.tutorial_info, s.id] },
-                       talk.speaker_ids),
+                     speakers_preselection(talk),
                      {},
                      { class: 'selectize',
-                       style: 'display: none;',
-                       multiple: true,
-                       data: { ajax: true,
-                               filled: false,
-                               model: 'user',
-                               placeholder: t('basics.enter_two_letters'),
-                               no_results: t('basics.no_results') } } %>
+                       multiple: true } %>
       </div>
     </div>
     <div class="row">
diff --git a/app/views/talks/_new.html.erb b/app/views/talks/_new.html.erb
index 5cfa3ae3a..f53ef2515 100644
--- a/app/views/talks/_new.html.erb
+++ b/app/views/talks/_new.html.erb
@@ -30,21 +30,7 @@
       </div>
     </div>
     <div class="col-12 mb-3">
-      <%= f.label :speaker_ids,
-                  t('admin.talk.speakers'),
-                  class: "form-label" %>
-      <%= f.select :speaker_ids,
-                   [[]],
-                   {},
-                   { class: 'selectize',
-                     style: 'display: none;',
-                     multiple: true,
-                     data: { ajax: true,
-                             filled: false,
-                             model: 'user',
-                             placeholder: t('basics.enter_two_letters'),
-                             no_results: t('basics.no_results'),
-                             modal: true } } %>
+      <%= speaker_select(f, talk) %>
     </div>
     <% if lecture.talks.exists? %>
       <div class="col-12 mb-3">
diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb
new file mode 100644
index 000000000..bda4fbe06
--- /dev/null
+++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb
@@ -0,0 +1,36 @@
+<p>
+    <%= t('profile.become_speaker', seminar: voucher.lecture.title) %>
+
+    <% if current_user.in?(voucher.lecture.speakers) %>
+      <%= t('profile.already_speaker',
+            talks: talks_with_titles(current_user, voucher)) %>
+    <% end %>
+  </p>
+
+  <% if voucher.lecture.talks_without_speaker(current_user).any? %>
+
+    <%= render partial: "vouchers/talks_form", locals: { voucher: voucher } %>
+
+  <% elsif voucher.lecture.talks.any? %>
+
+      <%= t('profile.all_talks_taken') %>
+      <%= cancel_voucher_button %>
+
+  <% else %>
+
+    <%= t('profile.no_talks_yet') %>
+
+    <% if current_user.in?(voucher.lecture.speakers_by_redemption) %>
+
+        <%= t('profile.already_speaker_by_redemption') %>
+        <%= cancel_voucher_button %>
+
+    <% else %>
+
+      <p class="mt-4">
+        <%= redeem_voucher_button(voucher) %>
+        <%= cancel_voucher_button %>
+      </p>
+
+    <% end %>
+  <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 4c68c117d..5532bc722 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -13,7 +13,7 @@
 
 <% elsif voucher.lecture.tutorials.any? %>
 
-    <%= t('profile.no_tutorials_available') %>
+    <%= t('profile.all_tutorials_taken') %>
     <%= cancel_voucher_button %>
 
 <% else %>
diff --git a/app/views/vouchers/_talks_form.html.erb b/app/views/vouchers/_talks_form.html.erb
new file mode 100644
index 000000000..9e1cd9a38
--- /dev/null
+++ b/app/views/vouchers/_talks_form.html.erb
@@ -0,0 +1,14 @@
+<%= form_with url: redeem_voucher_path,
+              remote: true,
+              method: :post,
+              html: { class: "form-inline" } do |f| %>
+  <%= f.hidden_field :secure_hash, value: voucher.secure_hash %>
+  <div class="form-group d-flex">
+    <%= f.select :talk_ids,
+                 options_for_select(talk_options(current_user, voucher)),
+                 { prompt: t('profile.select_talks') },
+                 { multiple: true, class: 'selectize me-2 w-50' } %>
+    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
+    <%= cancel_voucher_button %>
+  </div>
+<% end %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 141ad469a..70c761b33 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -612,7 +612,13 @@ de:
           bearbeitungsberechtigte Personen, die verschieden von der
           DozentIn und von den ModuleditorInnen sind. Das können z.B.
           VeranstaltungsassistentInnen sein, die Materialien zur
-          Veranstaltung einpflegen.
+          Veranstaltung einpflegen. Du kannst nur Personen auswählen,
+          die von Ihrem Rechtestatus her dafür in Frage kommen.
+          Um den entsprechenden Rechtestatus an Personen zu vergeben,
+          die ihn bisher noch nicht haben, musst Du einen Voucher
+          erstellen und diesen an die entsprechende Person weitergeben.
+          Die Person kann dann den Voucher auf ihrer Profilseite einlösen
+          und wird dadurch zusätzliche VeranstaltungseditorIn.
         subscribers_count: >
           Das ist die Zahl aller NutzerInnen, die diese
           Veranstaltung in ihrem Profil abonniert haben.
@@ -1025,6 +1031,15 @@ de:
           nicht gesetzt sein, wenn es sich bei dem Text noch um einen Entwurf
           handelt). Du kannst als DozentIn diesen Text von der Vortragsseite
           entfernen.
+        speakers: >
+          Hier kannst Du die Vortragenden eintragen. Diese können
+          den Vortrag bearbeiten und Medien hinzufügen. Du kannst nur Personen
+          auswählen, die den Status "Vortragender" in dem Seminar haben,
+          dazu EditorInnen und Dich selbst. Um Studierenden des Status
+          eines Vortragenden zu geben, musst Du unter "Personen/Tutorien" einen
+          Gutschein erstellen, den die Studierenden einlösen können.
+          Der Gutschein muss außerhalb von MaMpf an die Studierenden verteilt
+          werden
     lesson:
       edit: 'Sitzung bearbeiten'
       inspect: 'Sitzung ansehen'
@@ -2214,11 +2229,9 @@ de:
     new_tutor_select: >
       Wenn Du schon weißt, welche Tutorien du übernimmst, kannst du diese hier
       auswählen.
-    already_tutor_select: >
-      Du kannst hier weitere Tutorien auswählen, die Du übernimmst.
     select_tutorials: Tutorien auswählen
     take_over_tutorials: Tutorien übernehmen
-    no_tutorials_available: >
+    all_tutorials_taken: >
       Es sind keine weiteren Tutorien verfügbar, die Du noch übernehmen kannst.
     no_tutorials_yet: Für diese Vorlesung wurden noch keine Tutorien angelegt.
     already_tutor_by_redemption: >
@@ -2240,6 +2253,21 @@ de:
       wenn Du den Gutschein einlöst.
     already_teacher: >
       Du bist bereits DozentIn in dieser Veranstaltung.
+    become_speaker: >
+      Mit diesem Gutschein erhältst Du Vortragendenstatus im Seminar %{seminar}.
+      Dadurch können Dir SeminareditorInnen und die DozentIn Vorträge zuweisen.
+      Ggf. kannst Du an dieser Stelle bereits Vorträge auswählen, die Du
+      übernehmen möchtest. Die SeminareditorInnen und die DozentIn werden
+      benachrichtigt, wenn Du den Gutschein einlöst.
+    already_speaker: >
+      Du bist bereits VortragendeR in diesem Seminar für: %{talks}.
+    all_talks_taken: >
+      Es sind keine weiteren Vorträge verfügbar, die Du noch übernehmen kannst.
+    no_talks_yet: Für dieses Seminar wurden noch keine Vorträge angelegt.
+    already_speaker_by_redemption: >
+      Du hast bereits einen Gutschein eingelöst, um Vortragendenstatus zu
+      erhalten.
+    select_talks: Vorträge auswählen
   mampf_news:
     title: 'MaMpf-News'
     check_notifications: 'Alle erledigen'
@@ -3073,6 +3101,16 @@ de:
       Der Code ist gültig. Er gehört zu NutzerIn %{user} und zum Quiz %{quiz}.
     certificate_invalid: Der Code ist ungültig.
     teams_as_csv: Teams als .csv
+    info:
+      tutors: >
+        Hier kannst Du TutorInnen für dieses Tutorium eintragen.
+        Diese können Abgaben einsehen und Korrekturen hochladen.
+        Du kannst nur Personen auswählen, die den Status "TutorIn" in der
+        Veranstaltung haben, dazu EditorInnen und Dich selbst.
+        Um Studierenden den Status einer TutorIn zu geben, musst Du
+        einen Gutschein erstellen, den die Studierenden einlösen können.
+        Der Gutschein muss außerhalb von MaMpf an die Studierenden verteilt
+        werden.
     bulk_upload:
       report: Bericht zum Paketupload der Korrekturen
       number_of_submissions: Anzahl der Abgaben
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 48bade0f2..5d2fb2573 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -593,7 +593,11 @@ en:
         lecture_editors: >
           Additional event series editors can edit event series, but are
           neither teacher nor course editor, e.g. teaching assistants uploading
-          materials for an event series.
+          materials for an event series. You can select only users who are
+          eligible. In order to grant editing status to users who
+          are not yet eligible you have to
+          create a voucher and communicate the voucher to the user outside of
+          MaMpf. The user can then redeem the voucher in their profile settings.
         subscribers_count: >
           This is the number of all users subscribed to this event series in
           their profile settings.
@@ -973,6 +977,14 @@ en:
           talk's page (this box will typically be unchecked if the text is
           still preliminary). You can remove the text from the talk's page
           as teacher.
+        speakers: >
+          Here you can select the speakers of the talk. They can edit the talk
+          and add media to it. You can only select users who have the status of
+          speaker in the seminar, or editors or yourself. In order to grant
+          students the status of speaker, you have to create a voucher in
+          the "People/Tutorials" tab. You have to communicate the voucher to
+          the students outside of MaMpf. The voucher can then be redeemed by the
+          students.
     lesson:
       edit: 'Edit Session'
       inspect: 'Inspect Session'
@@ -2075,20 +2087,17 @@ en:
     redeem_voucher: Redeeem Voucher
     become_tutor: >
       With this voucher, you can obtain tutor status for %{lecture}.
-      With that, editors for the event series can assign you tutorials.
-      If applicable, you can select the tutorials you will be responsible for
-      right here. The editors and the teacher will be notified when you have
-      redeemed the voucher.
+      With that, editors for the event series and the teacher can assign you
+      tutorials. If applicable, you can select the tutorials you will be
+      responsible for right here. The editors and the teacher will be notified
+      when you have redeemed the voucher.
     already_tutor: >
       You are already registered as a tutor for: %{tutorials}.
     new_tutor_select: >
       If you already know which tutorials you will be responsible for,
       you can select them here.
-    already_tutor_select: >
-      You can select further tutorials to take over here.
     select_tutorials: Select Tutorials
-    take_over_tutorials: Take Over Tutorials
-    no_tutorials_available: >
+    all_tutorials_taken: >
       There are no more tutorials available for this lecture that you can take
       over.
     no_tutorials_yet: >
@@ -2110,6 +2119,21 @@ en:
       notified when you have redeemed the voucher.
     already_teacher: >
       You are already the teacher for this event series.
+    become_speaker: >
+      With this voucher, you can obtain speaker status for %{seminar}.
+      With that, editors for the seminar and the teacher can assign you talks.
+      If applicable, you can select the talks you will be responsible for
+      right here. The editors and the teacher will be notified when you have
+      redeemed the voucher.
+    already_speaker: >
+      You are already registered as a speaker for: %{talks}.
+    all_talks_taken: >
+      There are no more talks available for this seminar that you can take over.
+    no_talks_yet: >
+      There are no talks available for this seminar yet.
+    already_speaker_by_redemption: >
+      You have already redeemed a speaker voucher for this seminar.
+    select_talks: Select Talks
   mampf_news:
     title: 'MaMpf News'
     check_notifications: 'Clear all'
@@ -2896,6 +2920,15 @@ en:
       The code is valid. It belongs to user %{user} and quiz %{quiz}.
     teams_as_csv: Teams as .csv
     certificate_invalid: This code is invalid.
+    info:
+      tutors:
+        Here you can select the tutors of the tutorial. They can view
+        the submissions and upload corrections.
+        You can only select users who have the status of tutor in the
+        event series, or editors or yourself. In order to grant students the
+        status of tutor, you have to create a voucher.
+        You have to communicate the voucher to the students outside
+        of MaMpf. The students can then redeem the voucher.
     bulk_upload:
       report: Report on the bulk upload of the corrections
       number_of_submissions: Number of submissions

From 6b662eafda7b0a7997a0b9e93a2c2e0f5fd0f384 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 18 Aug 2024 19:06:40 +0200
Subject: [PATCH 045/191] Add notifications for redemption of speaker vouchers

---
 app/controllers/concerns/notifier.rb          | 16 +++++-
 app/controllers/vouchers_controller.rb        |  7 ++-
 app/helpers/redemptions_helper.rb             | 52 ++++++++++++++++---
 app/helpers/vouchers_helper.rb                |  2 +-
 app/mailers/notification_mailer.rb            | 13 +++++
 app/models/redemption.rb                      |  3 +-
 .../new_speaker_email.html.erb                | 10 ++++
 .../new_speaker_email.text.erb                |  4 ++
 config/locales/de.yml                         | 37 +++++++++++--
 config/locales/en.yml                         | 21 ++++++--
 10 files changed, 144 insertions(+), 21 deletions(-)
 create mode 100644 app/views/notification_mailer/new_speaker_email.html.erb
 create mode 100644 app/views/notification_mailer/new_speaker_email.text.erb

diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/concerns/notifier.rb
index a92cf12db..293dff087 100644
--- a/app/controllers/concerns/notifier.rb
+++ b/app/controllers/concerns/notifier.rb
@@ -22,8 +22,22 @@ def notify_previous_teacher_by_mail(previous_teacher, lecture)
                       .previous_teacher_email.deliver_later
   end
 
-  def notify_about_teacher_change(lecture, previous_teacher)
+  def notify_about_teacher_change_by_mail(lecture, previous_teacher)
     notify_new_teacher_by_mail(current_user, lecture)
     notify_previous_teacher_by_mail(previous_teacher, lecture)
   end
+
+  def notify_cospeakers_by_mail(speaker, talks)
+    talks.each do |talk|
+      talk.speakers.each do |cospeaker|
+        next if cospeaker == speaker
+
+        NotificationMailer.with(recipient: cospeaker,
+                                locale: cospeaker.locale,
+                                talk: talk,
+                                speaker: speaker)
+                          .new_speaker_email.deliver_later
+      end
+    end
+  end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 303065bab..dc643deb5 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -50,6 +50,7 @@ def redeem
       lecture = voucher.lecture
       redemption = process_voucher(voucher, lecture)
       redemption&.create_notifications!
+      current_user.subscribe_lecture!(lecture)
       redirect_to edit_profile_path, notice: success_message(voucher)
     else
       handle_invalid_voucher
@@ -118,7 +119,10 @@ def process_teacher_voucher(voucher, lecture)
       # no need to send out notifications if the teacher stays the same
       # because then there is no demotion to editor
       # (this case is actually not possible to trigger via the GUI)
-      notify_about_teacher_change(lecture, previous_teacher) if previous_teacher != current_user
+      if previous_teacher != current_user
+        notify_about_teacher_change_by_mail(lecture,
+                                            previous_teacher)
+      end
       voucher.invalidate!
       Redemption.create(user: current_user, voucher: voucher)
     end
@@ -126,6 +130,7 @@ def process_teacher_voucher(voucher, lecture)
     def process_speaker_voucher(voucher, seminar)
       selected_talks = seminar.talks.where(id: check_voucher_params[:talk_ids])
       seminar.update_speaker_status!(current_user, selected_talks)
+      notify_cospeakers_by_mail(current_user, selected_talks)
       Redemption.create(user: current_user, voucher: voucher,
                         claimed_talks: selected_talks)
     end
diff --git a/app/helpers/redemptions_helper.rb b/app/helpers/redemptions_helper.rb
index f7a33abd4..e8381edc8 100644
--- a/app/helpers/redemptions_helper.rb
+++ b/app/helpers/redemptions_helper.rb
@@ -2,7 +2,8 @@
 module RedemptionsHelper
   def redemption_notification_card_header(redemption)
     link_to(redemption.lecture.title_for_viewers,
-            edit_lecture_path(redemption.lecture, anchor: "people"),
+            edit_lecture_path(redemption.lecture,
+                              anchor: ("people" unless redemption.speaker?)),
             class: "text-dark")
   end
 
@@ -18,6 +19,8 @@ def redemption_notification_details(redemption)
       editor_notification_details(redemption)
     elsif redemption.teacher?
       teacher_notification_details(redemption)
+    else
+      speaker_notification_details(redemption)
     end
   end
 
@@ -28,6 +31,8 @@ def redemption_notification_item_details(redemption)
       editor_notification_item_details(redemption)
     elsif redemption.teacher?
       teacher_notification_item_details(redemption)
+    else
+      speaker_notification_item_details(redemption)
     end
 
     truncate_result(result)
@@ -36,8 +41,11 @@ def redemption_notification_item_details(redemption)
   private
 
     def tutor_notification_item_details(redemption)
-      tutorials = redemption.claimed_tutorials.map(&:title).join(", ")
-      "#{t("basics.tutor")} #{redemption.user.tutorial_name}: #{tutorials}"
+      tutorials = redemption.claimed_tutorials
+      tutorial_details = tutorials.map(&:title).join(", ")
+
+      base_message = "#{t("basics.tutor")} #{redemption.user.tutorial_name}"
+      tutorials.any? ? "#{base_message}: #{tutorial_details}" : base_message
     end
 
     def editor_notification_item_details(redemption)
@@ -48,12 +56,26 @@ def teacher_notification_item_details(redemption)
       "#{t("basics.teacher")} #{redemption.user.tutorial_name}"
     end
 
+    def speaker_notification_item_details(redemption)
+      talks = redemption.claimed_talks
+      talk_details = talks.map(&:to_label).join(", ")
+
+      base_message = "#{t("basics.speaker")} #{redemption.user.tutorial_name}"
+      talks.any? ? "#{base_message}: #{talk_details}" : base_message
+    end
+
     def tutor_notification_details(redemption)
-      details = I18n.t("notifications.became_tutor",
-                       user: redemption.user.info)
-      tutorial_titles = redemption.claimed_tutorials.map(&:title).join(", ")
-      details << I18n.t("notifications.tutorial_details",
-                        tutorials: tutorial_titles)
+      user_info = I18n.t("notifications.became_tutor", user: redemption.user.info)
+      tutorials = redemption.claimed_tutorials
+
+      tutorial_details = if tutorials.present?
+        I18n.t("notifications.tutorial_details",
+               tutorials: tutorials.map(&:title).join(", "))
+      else
+        I18n.t("notifications.no_tutorials_taken")
+      end
+
+      user_info + tutorial_details
     end
 
     def editor_notification_details(redemption)
@@ -63,4 +85,18 @@ def editor_notification_details(redemption)
     def teacher_notification_details(redemption)
       I18n.t("notifications.became_teacher", user: redemption.user.info)
     end
+
+    def speaker_notification_details(redemption)
+      user_info = I18n.t("notifications.became_speaker", user: redemption.user.info)
+      talks = redemption.claimed_talks
+
+      talk_details = if talks.present?
+        I18n.t("notifications.talk_details",
+               talks: talks.map(&:to_label).join(", "))
+      else
+        I18n.t("notifications.no_talks_taken")
+      end
+
+      user_info + talk_details
+    end
 end
diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index 0ec0ddf91..000a33f17 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -12,7 +12,7 @@ def tutorials_with_tutor_titles(user, voucher)
   end
 
   def talks_with_titles(user, voucher)
-    voucher.lecture.talks_with_speaker(user).map(&:to_label).join("; ")
+    voucher.lecture.talks_with_speaker(user).map(&:to_label).join(", ")
   end
 
   def talk_options(user, voucher)
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index cdf2a4dfc..7a538288f 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -85,6 +85,19 @@ def previous_teacher_email
                     new_teacher: @lecture.teacher.tutorial_name))
   end
 
+  def new_speaker_email
+    @talk = params[:talk]
+    @recipient = params[:recipient]
+    @speaker = params[:speaker].info
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.new_speaker_subject",
+                    seminar: @talk.lecture.title,
+                    title: @talk.to_label))
+  end
+
   def submission_invitation_email
     @recipient = params[:recipient]
     @assignment = params[:assignment]
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 7fbc7a416..4c92e0701 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -15,10 +15,9 @@ class Redemption < ApplicationRecord
   delegate :tutor?, to: :voucher
   delegate :editor?, to: :voucher
   delegate :teacher?, to: :voucher
+  delegate :speaker?, to: :voucher
 
   def create_notifications!
-    return if voucher.speaker?
-
     lecture.editors_and_teacher.each do |editor|
       Notification.create(notifiable: self, recipient: editor)
     end
diff --git a/app/views/notification_mailer/new_speaker_email.html.erb b/app/views/notification_mailer/new_speaker_email.html.erb
new file mode 100644
index 000000000..640d919ea
--- /dev/null
+++ b/app/views/notification_mailer/new_speaker_email.html.erb
@@ -0,0 +1,10 @@
+<%= t('mailer.new_speaker', speaker: @speaker,
+                            title: @talk.to_label,
+                            seminar: @talk.lecture.title,
+                            username: @username) %>
+<br>
+<p class="pt-2">
+  <%= link_to(t('buttons.edit_talk'),
+              assemble_talk_url(@talk),
+              class: 'btn btn-primary') %>
+</p>
diff --git a/app/views/notification_mailer/new_speaker_email.text.erb b/app/views/notification_mailer/new_speaker_email.text.erb
new file mode 100644
index 000000000..7a9e80865
--- /dev/null
+++ b/app/views/notification_mailer/new_speaker_email.text.erb
@@ -0,0 +1,4 @@
+<%= t('mailer.new_speaker', speaker: @speaker,
+                            title: @talk.to_label,
+                            seminar: @talk.lecture.title,
+                            username: @username) %>
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 70c761b33..eacac0f2e 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -738,19 +738,25 @@ de:
         voucher_for_tutor: >
           Gutscheine für TutorInnen können von NutzerInnen eingelöst werden, um
           TutorInnenstatus für diese Veranstaltung zu erhalten und ggf. direkt
-          Tutorien zu übernehmen.
+          Tutorien zu übernehmen. Außerdem werden sie damit automatisch
+          zu AbonenntInnen dieser Veranstaltung.
         voucher_for_editor: >
           Gutscheine für EditorInnen können von NutzerInnen eingelöst werden, um
           EditorInnenstatus für diese Veranstaltung zu ehalten.
+          Außerdem werden sie damit automatisch zu AbonenntInnen dieser
+          Veranstaltung.
         voucher_for_teacher: >
           Gutscheine für DozentInnen können von NutzerInnen eingelöst werden, um
           DozentInnenstatus für diese Veranstaltung zu erhalten. Die bisherige
           DozentIn wird dann EditorIn. Ein solcher
           Gutschein wird direkt nach dem Einlösen für ungültig erklärt.
+          Außerdem werden die NutzerIn damit automatisch
+          zu einer AbonenntIn dieser Veranstaltung.
         voucher_for_speaker: >
           Gutscheine für Vortragende können von NutzerInnen eingelöst werden, um
           Vortragendenstatus für das Seminar zu erhalten und ggf. direkt
-          Vorträge zu übernehmen.
+          Vorträge zu übernehmen. Außerdem werden sie damit automatisch zu
+          AbonenntInnen des Seminars.
       show_media: 'Medien einblenden'
       workflow: 'Workflow'
       content_mode: 'Inhaltsermittlung'
@@ -2224,6 +2230,8 @@ de:
       Tutorien zuweisen. Ggf. kannst Du an dieser Stelle bereits Tutorien
       auswählen, die Du übernehmen möchtest. Die VeranstaltungseditorInnen
       und die DozentIn werden benachrichtigt, wenn Du den Gutschein einlöst.
+      Zudem wird die Veranstaltung automatisch zu Deinen abonnierten
+      Veranstaltungen hinzugefügt.
     already_tutor: >
       Du bist bereits als TutorIn eingetragen für: %{tutorials}.
     new_tutor_select: >
@@ -2238,7 +2246,8 @@ de:
       Du hast bereits einen Gutschein eingelöst, um TutorInnenstatus zu erhalten.
     become_editor: >
       Mit diesem Gutschein erhältst Du EditorInnenstatus für die Veranstaltung
-      %{lecture}.
+      %{lecture}. Zudem wird die Veranstaltung automatisch zu Deinen abonnierten
+      Veranstaltungen hinzugefügt.
     already_editor_by_redemption: >
       Du hast bereits einen Gutschein eingelöst, um EditorInnenstatus zu
       erhalten. Die anderen VeranstaltungseditorInnen und die DozentIn werden
@@ -2250,7 +2259,8 @@ de:
       Mit diesem Gutschein erhältst Du DozentInnenstatus für die Veranstaltung
       %{lecture}. Die bisherige DozentIn erhält EditorInnenstatus.
       Die VeranstaltungseditorInnen werden benachrichtigt,
-      wenn Du den Gutschein einlöst.
+      wenn Du den Gutschein einlöst. Zudem wird die Veranstaltung automatisch
+      zu Deinen abonnierten Veranstaltungen hinzugefügt.
     already_teacher: >
       Du bist bereits DozentIn in dieser Veranstaltung.
     become_speaker: >
@@ -2258,7 +2268,8 @@ de:
       Dadurch können Dir SeminareditorInnen und die DozentIn Vorträge zuweisen.
       Ggf. kannst Du an dieser Stelle bereits Vorträge auswählen, die Du
       übernehmen möchtest. Die SeminareditorInnen und die DozentIn werden
-      benachrichtigt, wenn Du den Gutschein einlöst.
+      benachrichtigt, wenn Du den Gutschein einlöst. Zudem wird das Seminar
+      automatisch zu Deinen abonnierten Veranstaltungen hinzugefügt.
     already_speaker: >
       Du bist bereits VortragendeR in diesem Seminar für: %{talks}.
     all_talks_taken: >
@@ -2312,10 +2323,17 @@ de:
     became_teacher: >
       %{user} hat einen DozentInnen-Gutschein eingelöst und ist jetzt DozentIn
       der Veranstaltung.
+    became_speaker: >
+      %{user} hat einen Vortragenden-Gutschein eingelöst und ist jetzt VortragendeR
+      im Seminar.
     tutorial_details: >
       Neu übernommene Tutorien: %{tutorials}.
+    talk_details: >
+      Neu übernommene Vorträge: %{talks}.
     redemption: 'Gutschein eingelöst:'
     redemption_in_lecture: 'Gutschein eingelöst in %{lecture}'
+    no_tutorials_taken: 'Dabei wurden keine Tutorien übernommen.'
+    no_talks_taken: 'Dabei wurden keine Vorträge übernommen.'
   lecture:
     content: 'Veranstaltungsinhalt'
     unpublished: 'Diese Veranstaltung ist unveröffentlicht.'
@@ -3209,6 +3227,13 @@ de:
       DozentInnenwechsel. %{new_teacher} hat einen DozentInnengutschein eingelöst
       und ist jetzt DozentIn. Du bist nicht mehr DozentIn in %{title}, sondern
       stattdessen VeranstaltungseditorIn.
+    new_speaker_subject: 'WeitereR VortragendeR für %{seminar}, %{title}'
+    new_speaker: >
+      Hallo %{username}, im Seminar %{seminar} hat sich %{speaker}
+      als weitereR VortragendeR für %{title} eingetragen.
+      Du bist jetzt nicht mehr alleinigeR VortragendeR für diesen Vortrag.
+      Wende Dich bitte an Deine DozentIn, wenn Du denkst, dass hier ein Fehler
+      passiert ist.
     new_lecture_subject: 'Neue Veranstaltung %{title}'
     new_lecture: 'Es wurde eine neue Veranstaltung angelegt: %{title}.'
     subscribe_lecture: >
@@ -3583,6 +3608,7 @@ de:
     editors: EditorInnen
     vouchers: Gutscheine
     voucher_for: Gutschein für %{sort}
+    speaker: VortragendeR
     speakers: Vortragende
   access:
     unpublished: 'unveröffentlicht'
@@ -3694,6 +3720,7 @@ de:
     become_editor: 'EditorIn werden'
     invalidate: 'Für ungültig erklären'
     verify_voucher: 'Gutschein prüfen'
+    edit_talk: 'Vortrag bearbeiten'
   warnings:
     save_before: >
       Du musst zunächst die anderen Änderungen speichern oder verwerfen.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5d2fb2573..31e93fbfb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -595,9 +595,9 @@ en:
           neither teacher nor course editor, e.g. teaching assistants uploading
           materials for an event series. You can select only users who are
           eligible. In order to grant editing status to users who
-          are not yet eligible you have to
-          create a voucher and communicate the voucher to the user outside of
-          MaMpf. The user can then redeem the voucher in their profile settings.
+          are not yet eligible you have to create a voucher and communicate the
+          voucher to the user outside of MaMpf. The user can then redeem the
+          voucher in their profile settings and will become a lecture editor.
         subscribers_count: >
           This is the number of all users subscribed to this event series in
           their profile settings.
@@ -2178,10 +2178,17 @@ en:
     became_teacher: >
       %{user} has redeemed a teacher voucher and has therefore become teacher
       in the event series.
+    became_speaker: >
+      %{user} has redeemed a speaker voucher and has therefore become speaker
+      in the seminar.
     tutorial_details: >
       Tutorials taken over: %{tutorials}.
+    talk_details: >
+      Talks taken over: %{talks}.
     redemption: 'Voucher redeemed:'
     redemption_in_lecture: 'Voucher redeemed in %{lecture}'
+    no_tutorials_taken: 'No tutorials have been taken over by the redemption.'
+    no_talks_taken: 'No talks have been taken over by the redemption.'
   lecture:
     content: 'Event series contents'
     unpublished: 'This event series is unpublished.'
@@ -3020,6 +3027,12 @@ en:
       %{new_teacher} has redeemed a teacher voucher and is now the teacher for
       this event series. You are no longer teacher for %{title}, but
       editor instead.
+    new_speaker_subject: 'Additional speaker for %{seminar}, %{title}'
+    new_speaker: >
+      Dear %{username}, in the seminar %{seminar}, %{speaker} has
+      registered as an additional speaker for %{title}.
+      You are no longer the only speaker for this talk.
+      Please contact your teacher if you think this happened by mistake.
     new_lecture_subject: 'New event series %{title}'
     new_lecture: 'A new event series has been made available: %{title}.'
     subscribe_lecture: 'You can subscribe to it in your profile settings.'
@@ -3390,6 +3403,7 @@ en:
     no_results: No results found
     vouchers: Vouchers
     voucher_for: Voucher for %{sort}
+    speaker: Speaker
     speakers: Speakers
   warnings:
     save_before: 'Before you continue, you need to save or discard your changes'
@@ -3505,6 +3519,7 @@ en:
     become_editor: 'Become Editor'
     invalidate: 'Invalidate'
     verify_voucher: 'Verify Voucher'
+    edit_talk: 'Edit Talk'
   confirmation:
     generic: 'Are you sure?'
     delete_graph: >

From 9d441ff088fb24202a72e91d1d68062c7c5b444a Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 18 Aug 2024 19:07:57 +0200
Subject: [PATCH 046/191] Restrict access user select

---
 app/abilities/user_ability.rb                 |  6 +---
 app/helpers/lectures_helper.rb                | 12 +++++++
 app/models/lecture.rb                         |  4 +++
 .../administration/index/_my_courses.html.erb | 14 +++++----
 app/views/lectures/_new.html.erb              | 31 ++++++++++++-------
 app/views/lectures/edit/_people.html.erb      | 31 ++++++++++++-------
 6 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/app/abilities/user_ability.rb b/app/abilities/user_ability.rb
index 3cfabfd8a..725d2d52b 100644
--- a/app/abilities/user_ability.rb
+++ b/app/abilities/user_ability.rb
@@ -14,11 +14,7 @@ def initialize(user)
       user.admin? || (!user.generic? && user == given_user)
     end
 
-    can :fill_user_select, User do
-      user.active_teachable_editor?
-    end
-
-    can :list_generic_users, User do
+    can [:fill_user_select, :list_generic_users], User do
       user.admin?
     end
   end
diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index df6303c94..ba08cbb5a 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -135,4 +135,16 @@ def editors_preselection(lecture)
                          [editor.info, editor.id]
                        end, lecture.editor_ids)
   end
+
+  def teachers_preselection(lecture)
+    options_for_select(lecture.eligible_as_teachers.map do |teacher|
+                         [teacher.info, teacher.id]
+                       end, lecture.teacher_id)
+  end
+
+  def teachers_preselection_for_new_lecture(lecture)
+    options_for_select((User.teachers + [current_user]).map do |teacher|
+                         [teacher.info, teacher.id]
+                       end)
+  end
 end
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 6446db29e..96b48d328 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -920,6 +920,10 @@ def eligible_as_editors
     # still given by the old system, this will not be true
   end
 
+  def eligible_as_teachers
+    (User.teachers + editors + course.editors + [teacher]).uniq
+  end
+
   def eligible_as_speakers
     (speakers + speakers_by_redemption + editors + [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
diff --git a/app/views/administration/index/_my_courses.html.erb b/app/views/administration/index/_my_courses.html.erb
index 93d8112bb..eb74229c8 100644
--- a/app/views/administration/index/_my_courses.html.erb
+++ b/app/views/administration/index/_my_courses.html.erb
@@ -18,12 +18,14 @@
     </div>
   </div>
   <div class="card-body scrollable">
-    <div id="new-course-area"
-         class="bg-green-lighten-4 p-3 mb-3 rounded"
-         style="display: none;">
-      <%= render partial: 'courses/new',
-                 locals: { course: Course.new } %>
-    </div>
+    <% if current_user.admin? %>
+      <div id="new-course-area"
+           class="bg-green-lighten-4 p-3 mb-3 rounded"
+           style="display: none;">
+        <%= render partial: 'courses/new',
+                   locals: { course: Course.new } %>
+      </div>
+    <% end %>
     <% if current_user.edited_courses.any? %>
       <%= render partial: 'administration/index/courses_card',
                  locals: { courses:
diff --git a/app/views/lectures/_new.html.erb b/app/views/lectures/_new.html.erb
index cf2c99f11..159ba4e9e 100644
--- a/app/views/lectures/_new.html.erb
+++ b/app/views/lectures/_new.html.erb
@@ -57,18 +57,25 @@
                     t('basics.teacher'),
                     class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
-        <%= f.select :teacher_id,
-                     options_for_select([[current_user.info, current_user.id]],
-                                        current_user.id),
-                     {},
-                     { class: 'selectize',
-                       data: { ajax: true,
-                               model: 'user',
-                               filled: false,
-                               placeholder: t('basics.enter_two_letters'),
-                               no_results: t('basics.no_results'),
-                               current: current_user.id,
-                               modal: modal } } %>
+        <% if current_user.admin? %>
+          <%= f.select :teacher_id,
+                       options_for_select([[current_user.info, current_user.id]],
+                                          current_user.id),
+                       {},
+                       { class: 'selectize',
+                         data: { ajax: true,
+                                 model: 'user',
+                                 filled: false,
+                                 placeholder: t('basics.enter_two_letters'),
+                                 no_results: t('basics.no_results'),
+                                 current: current_user.id,
+                                 modal: modal } } %>
+        <% else %>
+          <%= f.select :teacher_id,
+                       teachers_preselection_for_new_lecture(lecture),
+                       {},
+                       { class: 'selectize' } %>
+        <% end %>
       </div>
       <div class="col-12" id="newLectureSort"
            style="<%= term_independent ? 'display: none;' : '' %>">
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index eeadb8acf..536d42e84 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -9,19 +9,26 @@
                   class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
         <div id="lecture_teacher_select" %>
-          <%= f.select :teacher_id, 
-                       options_for_select([[lecture.teacher.info,
-                       lecture.teacher.id]],
-                       lecture.teacher.id),
-                       {},
-                       { class: 'selectize',
-                         data: { ajax: true,
-                                 model: 'user',
-                                 filled: false,
-                                 placeholder:
-                                   t('basics.enter_two_letters'),
-                                 no_results:
+          <% if current_user.admin? %>
+            <%= f.select :teacher_id,
+                         options_for_select([[lecture.teacher.info,
+                         lecture.teacher.id]],
+                         lecture.teacher.id),
+                         {},
+                         { class: 'selectize',
+                           data: { ajax: true,
+                                   model: 'user',
+                                   filled: false,
+                                   placeholder:
+                                     t('basics.enter_two_letters'),
+                                   no_results:
                                    t('basics.no_results') } } %>
+          <% else %>
+            <%= f.select :teacher_id,
+                         teachers_preselection(lecture),
+                         {},
+                         { class: 'selectize' } %>
+          <% end %>
           <div class="invalid-feedback" id="lecture-teacher-error">
           </div>
         </div>

From 587b72f3aad9cd1f6090f695c83d47324c7a0422 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 18 Aug 2024 19:10:43 +0200
Subject: [PATCH 047/191] Remove unused parameter

---
 app/helpers/lectures_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index ba08cbb5a..0102186b8 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -142,7 +142,7 @@ def teachers_preselection(lecture)
                        end, lecture.teacher_id)
   end
 
-  def teachers_preselection_for_new_lecture(lecture)
+  def teachers_preselection_for_new_lecture
     options_for_select((User.teachers + [current_user]).map do |teacher|
                          [teacher.info, teacher.id]
                        end)

From a3e99ed4153bf83321e8d1b6c10ccb5e55271287 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:11:14 +0200
Subject: [PATCH 048/191] Introduce VoucherProcessor service object

---
 app/controllers/concerns/notifier.rb   |  8 +--
 app/controllers/vouchers_controller.rb | 53 +-----------------
 app/models/redemption.rb               |  8 +--
 app/services/application_service.rb    | 10 ++++
 app/services/voucher_processor.rb      | 74 ++++++++++++++++++++++++++
 config/locales/de.yml                  |  1 -
 config/locales/en.yml                  |  1 -
 7 files changed, 90 insertions(+), 65 deletions(-)
 create mode 100644 app/services/application_service.rb
 create mode 100644 app/services/voucher_processor.rb

diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/concerns/notifier.rb
index 293dff087..86c8bcfaa 100644
--- a/app/controllers/concerns/notifier.rb
+++ b/app/controllers/concerns/notifier.rb
@@ -8,9 +8,9 @@ def notify_new_editor_by_mail(editor, lecture)
                       .new_editor_email.deliver_later
   end
 
-  def notify_new_teacher_by_mail(teacher, lecture)
-    NotificationMailer.with(recipient: teacher,
-                            locale: teacher.locale,
+  def notify_new_teacher_by_mail(lecture)
+    NotificationMailer.with(recipient: lecture.teacher,
+                            locale: lecture.teacher.locale,
                             lecture: lecture)
                       .new_teacher_email.deliver_later
   end
@@ -23,7 +23,7 @@ def notify_previous_teacher_by_mail(previous_teacher, lecture)
   end
 
   def notify_about_teacher_change_by_mail(lecture, previous_teacher)
-    notify_new_teacher_by_mail(current_user, lecture)
+    notify_new_teacher_by_mail(lecture)
     notify_previous_teacher_by_mail(previous_teacher, lecture)
   end
 
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index dc643deb5..6d35e1f23 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -47,10 +47,7 @@ def verify
   def redeem
     voucher = Voucher.check_voucher(check_voucher_params[:secure_hash])
     if voucher
-      lecture = voucher.lecture
-      redemption = process_voucher(voucher, lecture)
-      redemption&.create_notifications!
-      current_user.subscribe_lecture!(lecture)
+      VoucherProcessor.call(voucher, current_user, check_voucher_params)
       redirect_to edit_profile_path, notice: success_message(voucher)
     else
       handle_invalid_voucher
@@ -87,54 +84,6 @@ def set_related_data
       I18n.locale = @lecture.locale
     end
 
-    def process_voucher(voucher, lecture)
-      if voucher.tutor?
-        process_tutor_voucher(voucher, lecture)
-      elsif voucher.editor?
-        process_editor_voucher(voucher, lecture)
-      elsif voucher.teacher?
-        process_teacher_voucher(voucher, lecture)
-      else
-        process_speaker_voucher(voucher, lecture)
-      end
-    end
-
-    def process_tutor_voucher(voucher, lecture)
-      selected_tutorials = lecture.tutorials
-                                  .where(id: check_voucher_params[:tutorial_ids])
-      lecture.update_tutor_status!(current_user, selected_tutorials)
-      Redemption.create(user: current_user, voucher: voucher,
-                        claimed_tutorials: selected_tutorials)
-    end
-
-    def process_editor_voucher(voucher, lecture)
-      lecture.update_editor_status!(current_user)
-      notify_new_editor_by_mail(current_user, lecture)
-      Redemption.create(user: current_user, voucher: voucher)
-    end
-
-    def process_teacher_voucher(voucher, lecture)
-      previous_teacher = lecture.teacher
-      lecture.update_teacher_status!(current_user)
-      # no need to send out notifications if the teacher stays the same
-      # because then there is no demotion to editor
-      # (this case is actually not possible to trigger via the GUI)
-      if previous_teacher != current_user
-        notify_about_teacher_change_by_mail(lecture,
-                                            previous_teacher)
-      end
-      voucher.invalidate!
-      Redemption.create(user: current_user, voucher: voucher)
-    end
-
-    def process_speaker_voucher(voucher, seminar)
-      selected_talks = seminar.talks.where(id: check_voucher_params[:talk_ids])
-      seminar.update_speaker_status!(current_user, selected_talks)
-      notify_cospeakers_by_mail(current_user, selected_talks)
-      Redemption.create(user: current_user, voucher: voucher,
-                        claimed_talks: selected_talks)
-    end
-
     def success_message(voucher)
       if voucher.tutor?
         I18n.t("controllers.become_tutor_success")
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 4c92e0701..18940376a 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -1,4 +1,4 @@
-# Redempetion class
+# Redemption class
 # redemptions store the event of a user redeeming a voucher
 
 class Redemption < ApplicationRecord
@@ -16,10 +16,4 @@ class Redemption < ApplicationRecord
   delegate :editor?, to: :voucher
   delegate :teacher?, to: :voucher
   delegate :speaker?, to: :voucher
-
-  def create_notifications!
-    lecture.editors_and_teacher.each do |editor|
-      Notification.create(notifiable: self, recipient: editor)
-    end
-  end
 end
diff --git a/app/services/application_service.rb b/app/services/application_service.rb
new file mode 100644
index 000000000..6a9138c11
--- /dev/null
+++ b/app/services/application_service.rb
@@ -0,0 +1,10 @@
+# ApplicationService is a base class for all services in the application.
+# See https://www.toptal.com/ruby-on-rails/rails-service-objects-tutorial
+class ApplicationService
+  def self.call(...)
+    new(...).call
+  end
+
+  def initialize(*args)
+  end
+end
diff --git a/app/services/voucher_processor.rb b/app/services/voucher_processor.rb
new file mode 100644
index 000000000..776fb11cb
--- /dev/null
+++ b/app/services/voucher_processor.rb
@@ -0,0 +1,74 @@
+class VoucherProcessor < ApplicationService
+  include Notifier
+
+  def initialize(voucher, user, params)
+    super
+    @voucher = voucher
+    @lecture = voucher.lecture
+    @user = user
+    @params = params
+  end
+
+  def call
+    redemption = process_voucher
+    create_notifications!(redemption)
+    @user.subscribe_lecture!(@lecture)
+  end
+
+  private
+
+    def process_voucher
+      case @voucher.sort
+      when "tutor"
+        process_tutor_voucher
+      when "editor"
+        process_editor_voucher
+      when "teacher"
+        process_teacher_voucher
+      when "speaker"
+        process_speaker_voucher
+      end
+    end
+
+    def process_tutor_voucher
+      selected_tutorials = @lecture.tutorials.where(id: @params[:tutorial_ids])
+      @lecture.update_tutor_status!(@user, selected_tutorials)
+
+      Redemption.create(user: @user, voucher: @voucher,
+                        claimed_tutorials: selected_tutorials)
+    end
+
+    def process_editor_voucher
+      @lecture.update_editor_status!(@user)
+      notify_new_editor_by_mail(@user, @lecture)
+
+      Redemption.create(user: @user, voucher: @voucher)
+    end
+
+    def process_teacher_voucher
+      previous_teacher = @lecture.teacher
+      @lecture.update_teacher_status!(@user)
+      # no need to send out notifications if the teacher stays the same
+      # because then there is no demotion to editor
+      # (it is actually not possible to trigger this case via the GUI)
+      notify_about_teacher_change_by_mail(@lecture, previous_teacher) if previous_teacher != @user
+      @voucher.invalidate!
+
+      Redemption.create(user: @user, voucher: @voucher)
+    end
+
+    def process_speaker_voucher
+      selected_talks = @lecture.talks.where(id: @params[:talk_ids])
+      @lecture.update_speaker_status!(@user, selected_talks)
+      notify_cospeakers_by_mail(@user, selected_talks)
+
+      Redemption.create(user: @user, voucher: @voucher,
+                        claimed_talks: selected_talks)
+    end
+
+    def create_notifications!(redemption)
+      @lecture.editors_and_teacher.each do |editor|
+        Notification.create(notifiable: redemption, recipient: editor)
+      end
+    end
+end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index eacac0f2e..b819ae8c8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3231,7 +3231,6 @@ de:
     new_speaker: >
       Hallo %{username}, im Seminar %{seminar} hat sich %{speaker}
       als weitereR VortragendeR für %{title} eingetragen.
-      Du bist jetzt nicht mehr alleinigeR VortragendeR für diesen Vortrag.
       Wende Dich bitte an Deine DozentIn, wenn Du denkst, dass hier ein Fehler
       passiert ist.
     new_lecture_subject: 'Neue Veranstaltung %{title}'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 31e93fbfb..1b5d3a981 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3031,7 +3031,6 @@ en:
     new_speaker: >
       Dear %{username}, in the seminar %{seminar}, %{speaker} has
       registered as an additional speaker for %{title}.
-      You are no longer the only speaker for this talk.
       Please contact your teacher if you think this happened by mistake.
     new_lecture_subject: 'New event series %{title}'
     new_lecture: 'A new event series has been made available: %{title}.'

From b71af1afa175ce42d2b57549909bf21f1341f9f3 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:28:56 +0200
Subject: [PATCH 049/191] Use common partial for redemption of tutor and
 speeaker vouchers

---
 app/helpers/vouchers_helper.rb                     | 13 +++++++++++++
 .../vouchers/_redeem_speaker_voucher.html.erb      |  2 +-
 app/views/vouchers/_redeem_tutor_voucher.html.erb  |  2 +-
 app/views/vouchers/_tutorials_form.html.erb        | 14 --------------
 ..._talks_form.html.erb => _voucher_form.html.erb} | 10 ++++++----
 5 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 app/views/vouchers/_tutorials_form.html.erb
 rename app/views/vouchers/{_talks_form.html.erb => _voucher_form.html.erb} (62%)

diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index 000a33f17..3db690ed4 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -31,4 +31,17 @@ def cancel_voucher_button
     link_to(t("buttons.cancel"), cancel_voucher_path,
             class: "btn btn-secondary ms-2", remote: true)
   end
+
+  def claim_select_field(form, user, voucher)
+    field_name, options, prompt = if voucher.tutor?
+      [:tutorial_ids, tutorial_options(user, voucher), t("profile.select_tutorials")]
+    elsif voucher.speaker?
+      [:talk_ids, talk_options(user, voucher), t("profile.select_talks")]
+    end
+
+    form.select(field_name,
+                options_for_select(options),
+                { prompt: prompt },
+                { multiple: true, class: "selectize me-2 w-50" })
+  end
 end
diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb
index bda4fbe06..537a264c8 100644
--- a/app/views/vouchers/_redeem_speaker_voucher.html.erb
+++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb
@@ -9,7 +9,7 @@
 
   <% if voucher.lecture.talks_without_speaker(current_user).any? %>
 
-    <%= render partial: "vouchers/talks_form", locals: { voucher: voucher } %>
+    <%= render partial: "vouchers/voucher_form", locals: { voucher: voucher } %>
 
   <% elsif voucher.lecture.talks.any? %>
 
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 5532bc722..e078bde1a 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -9,7 +9,7 @@
 
 <% if voucher.lecture.tutorials_without_tutor(current_user).any? %>
 
-  <%= render partial: "vouchers/tutorials_form", locals: { voucher: voucher } %>
+  <%= render partial: "vouchers/voucher_form", locals: { voucher: voucher } %>
 
 <% elsif voucher.lecture.tutorials.any? %>
 
diff --git a/app/views/vouchers/_tutorials_form.html.erb b/app/views/vouchers/_tutorials_form.html.erb
deleted file mode 100644
index 187f9fbb7..000000000
--- a/app/views/vouchers/_tutorials_form.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= form_with url: redeem_voucher_path,
-              remote: true,
-              method: :post,
-              html: { class: "form-inline" } do |f| %>
-  <%= f.hidden_field :secure_hash, value: voucher.secure_hash %>
-  <div class="form-group d-flex">
-    <%= f.select :tutorial_ids,
-                 options_for_select(tutorial_options(current_user, voucher)),
-                 { prompt: t('profile.select_tutorials') },
-                 { multiple: true, class: 'selectize me-2 w-50' } %>
-    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
-    <%= cancel_voucher_button %>
-  </div>
-<% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/_talks_form.html.erb b/app/views/vouchers/_voucher_form.html.erb
similarity index 62%
rename from app/views/vouchers/_talks_form.html.erb
rename to app/views/vouchers/_voucher_form.html.erb
index 9e1cd9a38..9cf471f77 100644
--- a/app/views/vouchers/_talks_form.html.erb
+++ b/app/views/vouchers/_voucher_form.html.erb
@@ -2,13 +2,15 @@
               remote: true,
               method: :post,
               html: { class: "form-inline" } do |f| %>
+
   <%= f.hidden_field :secure_hash, value: voucher.secure_hash %>
+
   <div class="form-group d-flex">
-    <%= f.select :talk_ids,
-                 options_for_select(talk_options(current_user, voucher)),
-                 { prompt: t('profile.select_talks') },
-                 { multiple: true, class: 'selectize me-2 w-50' } %>
+
+    <%= claim_select_field(f, current_user, voucher) %>
+    
     <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
     <%= cancel_voucher_button %>
   </div>
+
 <% end %>
\ No newline at end of file

From a704e57ba5647b36d29dd99d8c01c31bce9dd1f9 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 19 Aug 2024 14:58:25 +0200
Subject: [PATCH 050/191] Rename sort attribute of vouchers to role

---
 app/controllers/vouchers_controller.rb       |  4 +--
 app/models/lecture.rb                        |  4 +--
 app/models/voucher.rb                        | 22 +++++++-------
 app/views/lectures/edit/_vouchers.html.erb   |  8 +++---
 app/views/vouchers/_voucher.html.erb         |  6 ++--
 app/views/vouchers/create.js.erb             |  4 +--
 app/views/vouchers/invalidate.js.erb         |  4 +--
 config/locales/de.yml                        |  6 ++--
 config/locales/en.yml                        |  8 +++---
 db/migrate/20240728123817_create_vouchers.rb |  2 +-
 db/schema.rb                                 |  2 +-
 spec/controllers/vouchers_controller_spec.rb |  8 +++---
 spec/factories/vouchers.rb                   |  8 +++---
 spec/models/lecture_spec.rb                  | 16 +++++------
 spec/models/voucher_spec.rb                  | 30 ++++++++++----------
 15 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 643321599..81b65d9d3 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -36,7 +36,7 @@ def redeem
   private
 
     def voucher_params
-      params.permit(:lecture_id, :sort)
+      params.permit(:lecture_id, :role)
     end
 
     def set_voucher
@@ -48,7 +48,7 @@ def set_voucher
 
     def set_related_data
       @lecture = @voucher.lecture
-      @sort = @voucher.sort
+      @role = @voucher.role
       I18n.locale = @lecture.locale
     end
 
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index ce4595ef9..e53f0e765 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -848,8 +848,8 @@ def valid_annotations_status?
     [0, 1].include?(annotations_status)
   end
 
-  def active_voucher_of_sort(sort)
-    vouchers.where(sort: sort).active&.first
+  def active_voucher_of_role(role)
+    vouchers.where(role: role).active&.first
   end
 
   private
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index b88ee4b5c..2f319433b 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -1,17 +1,17 @@
 class Voucher < ApplicationRecord
-  SORT_HASH = { tutor: 0, editor: 1, teacher: 2, speaker: 3 }.freeze
+  ROLE_HASH = { tutor: 0, editor: 1, teacher: 2, speaker: 3 }.freeze
   SPEAKER_EXPIRATION_DAYS = 30
   TUTOR_EXPIRATION_DAYS = 14
   DEFAULT_EXPIRATION_DAYS = 3
 
-  enum sort: SORT_HASH
+  enum role: ROLE_HASH
 
   belongs_to :lecture, touch: true
   before_create :generate_secure_hash
   before_create :add_expiration_datetime
   before_create :ensure_no_other_active_voucher
   before_create :ensure_speaker_vouchers_only_for_seminars
-  validates :sort, presence: true
+  validates :role, presence: true
 
   scope :active, lambda {
                    where("expires_at > ? AND invalidated_at IS NULL",
@@ -20,10 +20,10 @@ class Voucher < ApplicationRecord
 
   self.implicit_order_column = "created_at"
 
-  def self.sorts_for_lecture(lecture)
-    return SORT_HASH.keys if lecture.seminar?
+  def self.roles_for_lecture(lecture)
+    return ROLE_HASH.keys if lecture.seminar?
 
-    SORT_HASH.keys - [:speaker]
+    ROLE_HASH.keys - [:speaker]
   end
 
   private
@@ -38,10 +38,10 @@ def add_expiration_datetime
 
     def ensure_no_other_active_voucher
       return unless lecture
-      return unless lecture.vouchers.where(sort: sort).active.any?
+      return unless lecture.vouchers.where(role: role).active.any?
 
-      errors.add(:sort,
-                 I18n.t("activerecord.errors.models.voucher.attributes.sort." \
+      errors.add(:role,
+                 I18n.t("activerecord.errors.models.voucher.attributes.role." \
                         "only_one_active"))
       throw(:abort)
     end
@@ -50,8 +50,8 @@ def ensure_speaker_vouchers_only_for_seminars
       return unless speaker?
       return if lecture.seminar?
 
-      errors.add(:sort,
-                 I18n.t("activerecord.errors.models.voucher.attributes.sort." \
+      errors.add(:role,
+                 I18n.t("activerecord.errors.models.voucher.attributes.role." \
                         "speaker_vouchers_only_for_seminars"))
       throw(:abort)
     end
diff --git a/app/views/lectures/edit/_vouchers.html.erb b/app/views/lectures/edit/_vouchers.html.erb
index b2260e983..e0cb6ebb4 100644
--- a/app/views/lectures/edit/_vouchers.html.erb
+++ b/app/views/lectures/edit/_vouchers.html.erb
@@ -4,15 +4,15 @@
 </h3>
 
 <% if current_user.can_update_personell?(lecture) %>
-  <% Voucher.sorts_for_lecture(lecture).each do |sort| %>
+  <% Voucher.roles_for_lecture(lecture).each do |role| %>
     <h4 class="lecture-pane-subheader">
       <%= t("basics.voucher_for",
-             sort: t("basics.#{sort}s")) %>
+             role: t("basics.#{role}s")) %>
     </h4>
-  <div id='<%= "#{sort}"%>-voucher'>
+  <div id='<%= "#{role}"%>-voucher'>
     <%= render partial: 'vouchers/voucher',
                 locals: { lecture: lecture,
-                          sort: sort } %>
+                          role: role } %>
   </div>
   <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
index 633e69ca8..d1c6f787a 100644
--- a/app/views/vouchers/_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -1,4 +1,4 @@
-<% voucher = lecture.active_voucher_of_sort(sort) %>
+<% voucher = lecture.active_voucher_of_role(role) %>
 <% if voucher %>
   <div>
     <span>
@@ -38,9 +38,9 @@
 <% else %>
   <p>
     <%= t('admin.lecture.no_active_voucher',
-          sort: t("basics.voucher_for", sort: t("basics.#{sort}s"))) %>
+          role: t("basics.voucher_for", role: t("basics.#{role}s"))) %>
     <%= link_to vouchers_path(params: { lecture_id: lecture.id,
-                                        sort: sort }),
+                                        role: role }),
                 class: 'text-dark ms-2',
                 data: { toggle: 'tooltip',
                         placement: 'bottom' },
diff --git a/app/views/vouchers/create.js.erb b/app/views/vouchers/create.js.erb
index 615339b7f..5a86aa776 100644
--- a/app/views/vouchers/create.js.erb
+++ b/app/views/vouchers/create.js.erb
@@ -1,2 +1,2 @@
-$("#<%= @sort %>-voucher").empty()
-  .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, sort: @sort } %>");
+$("#<%= @role %>-voucher").empty()
+  .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, role: @role } %>");
diff --git a/app/views/vouchers/invalidate.js.erb b/app/views/vouchers/invalidate.js.erb
index 615339b7f..5a86aa776 100644
--- a/app/views/vouchers/invalidate.js.erb
+++ b/app/views/vouchers/invalidate.js.erb
@@ -1,2 +1,2 @@
-$("#<%= @sort %>-voucher").empty()
-  .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, sort: @sort } %>");
+$("#<%= @role %>-voucher").empty()
+  .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, role: @role } %>");
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 29e045996..a255b8bb6 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -498,7 +498,7 @@ de:
       import_sections: Abschnitte importieren
       import_tags: Tags importieren
       no_active_voucher: >
-        Es gibt keinen aktiven %{sort} für diese Veranstaltung.
+        Es gibt keinen aktiven %{role} für diese Veranstaltung.
       info:
         course: >
           Hier kannst Du das Modul auswählen, zu dem diese
@@ -3470,7 +3470,7 @@ de:
     no_results: Keine Resultate gefunden
     editors: EditorInnen
     vouchers: Gutscheine
-    voucher_for: Gutschein für %{sort}
+    voucher_for: Gutschein für %{role}
     speakers: Vortragende
   access:
     unpublished: 'unveröffentlicht'
@@ -3942,7 +3942,7 @@ de:
                 Bereiches.
         voucher:
           attributes:
-            sort:
+            role:
               only_one_active: >
                 Für diese Vorlesung kann es nur einen aktiven Voucher dieses Typs geben.
               speaker_vouchers_only_for_seminars: >
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4a65a3c6c..19727c981 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -497,7 +497,7 @@ en:
       import_sections: import sections
       import_tags: import tags
       no_active_voucher: >
-        There is no active %{sort} for this event series.
+        There is no active %{role} for this event series.
       info:
         course: >
           Here you can select the course to which this event series belongs.
@@ -3282,7 +3282,7 @@ en:
     enter_two_letters: enter at least 2 letters
     no_results: No results found
     vouchers: Vouchers
-    voucher_for: Voucher for %{sort}
+    voucher_for: Voucher for %{role}
     speakers: Speakers
   warnings:
     save_before: 'Before you continue, you need to save or discard your changes'
@@ -3731,9 +3731,9 @@ en:
                 Your vote is outside of the allowed range.
         voucher:
           attributes:
-            sort:
+            role:
               only_one_active: >
-                There can be only one active voucher of this sort for the lecture.
+                There can be only one active voucher of this type for the lecture.
               speaker_vouchers_only_for_seminars: >
                 Speaker vouchers are only allowed for seminars.
         watchlist_entry:
diff --git a/db/migrate/20240728123817_create_vouchers.rb b/db/migrate/20240728123817_create_vouchers.rb
index f00625edd..155a4eaa5 100644
--- a/db/migrate/20240728123817_create_vouchers.rb
+++ b/db/migrate/20240728123817_create_vouchers.rb
@@ -1,7 +1,7 @@
 class CreateVouchers < ActiveRecord::Migration[7.1]
   def change
     create_table :vouchers, id: :uuid, default: "gen_random_uuid()" do |t|
-      t.integer :sort, null: false
+      t.integer :role, null: false
       t.references :lecture, null: false, foreign_key: true
       t.string :secure_hash, null: false
       t.datetime :invalidated_at
diff --git a/db/schema.rb b/db/schema.rb
index b98c9335d..e2e803c9a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -903,7 +903,7 @@
   end
 
   create_table "vouchers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.integer "sort", null: false
+    t.integer "role", null: false
     t.bigint "lecture_id", null: false
     t.string "secure_hash", null: false
     t.datetime "invalidated_at"
diff --git a/spec/controllers/vouchers_controller_spec.rb b/spec/controllers/vouchers_controller_spec.rb
index 423e45bd7..44a26e6de 100644
--- a/spec/controllers/vouchers_controller_spec.rb
+++ b/spec/controllers/vouchers_controller_spec.rb
@@ -3,7 +3,7 @@
   let(:teacher) { FactoryBot.create(:confirmed_user) }
   let(:generic_user) { FactoryBot.create(:confirmed_user) }
   let(:lecture) { FactoryBot.create(:lecture, teacher: teacher) }
-  let(:sort) { :tutor }
+  let(:role) { :tutor }
 
   context "As an authorized user" do
     before do
@@ -13,7 +13,7 @@
     describe "POST #create" do
       it "creates a new voucher" do
         expect do
-          post(:create, params: { lecture_id: lecture.id, sort: sort })
+          post(:create, params: { lecture_id: lecture.id, role: role })
         end.to change(lecture.vouchers, :count).by(1)
       end
     end
@@ -36,12 +36,12 @@
     describe "POST #create" do
       it "does not create a new voucher" do
         expect do
-          post(:create, params: { lecture_id: lecture.id, sort: sort })
+          post(:create, params: { lecture_id: lecture.id, role: role })
         end.not_to change(lecture.vouchers, :count)
       end
 
       it "redirects to root path" do
-        post(:create, params: { lecture_id: lecture.id, sort: sort })
+        post(:create, params: { lecture_id: lecture.id, role: role })
         expect(response).to redirect_to(root_path)
       end
     end
diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb
index 9c68bbe74..1242923c4 100644
--- a/spec/factories/vouchers.rb
+++ b/spec/factories/vouchers.rb
@@ -1,18 +1,18 @@
 FactoryBot.define do
   factory :voucher do
-    sort { :tutor }
+    role { :tutor }
     association :lecture
 
     trait :tutor do
-      sort { :tutor }
+      role { :tutor }
     end
 
     trait :editor do
-      sort { :editor }
+      role { :editor }
     end
 
     trait :teacher do
-      sort { :teacher }
+      role { :teacher }
     end
 
     trait :expired do
diff --git a/spec/models/lecture_spec.rb b/spec/models/lecture_spec.rb
index dc689612b..a307c4e36 100644
--- a/spec/models/lecture_spec.rb
+++ b/spec/models/lecture_spec.rb
@@ -86,27 +86,27 @@
     end
   end
 
-  describe "#active_voucher_of_sort" do
+  describe "#active_voucher_of_role" do
     let(:lecture) { FactoryBot.create(:lecture) }
-    let(:sort) { :tutor }
+    let(:role) { :tutor }
 
-    context "when there is an active voucher of the specified sort" do
+    context "when there is an active voucher of the specified role" do
       let!(:active_voucher) do
-        FactoryBot.create(:voucher, sort: sort, lecture: lecture)
+        FactoryBot.create(:voucher, role: role, lecture: lecture)
       end
 
       it "returns the voucher" do
-        expect(lecture.active_voucher_of_sort(sort)).to eq(active_voucher)
+        expect(lecture.active_voucher_of_role(role)).to eq(active_voucher)
       end
     end
 
-    context "when there is no active voucher of the specified sort" do
+    context "when there is no active voucher of the specified role" do
       let!(:inactive_voucher) do
-        FactoryBot.create(:voucher, :expired, sort: sort, lecture: lecture)
+        FactoryBot.create(:voucher, :expired, role: role, lecture: lecture)
       end
 
       it "returns nil" do
-        expect(lecture.active_voucher_of_sort(sort)).to be(nil)
+        expect(lecture.active_voucher_of_role(role)).to be(nil)
       end
     end
   end
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index db6c3724d..641b69b5a 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -20,10 +20,10 @@
     end
 
     describe "#add_expiration_datetime" do
-      let(:voucher) { build(:voucher, sort: sort, created_at: Time.zone.now) }
+      let(:voucher) { build(:voucher, role: role, created_at: Time.zone.now) }
 
       context "when the voucher is for a speaker" do
-        let(:sort) { :speaker }
+        let(:role) { :speaker }
 
         it "sets the expiration date to SPEAKER_EXPIRATION_DAYS from created_at" do
           voucher.save
@@ -34,7 +34,7 @@
       end
 
       context "when the voucher is for a tutor" do
-        let(:sort) { :tutor }
+        let(:role) { :tutor }
 
         it "sets the expiration date to TUTOR_EXPIRATION_DAYS from created_at" do
           voucher.save
@@ -44,8 +44,8 @@
         end
       end
 
-      context "when the voucher is for another sort" do
-        let(:sort) { :teacher }
+      context "when the voucher is for another role" do
+        let(:role) { :teacher }
 
         it "sets the expiration date to DEFAULT_EXPIRATION_DAYS from created_at" do
           voucher.save
@@ -57,14 +57,14 @@
     end
 
     describe "#ensure_no_other_active_voucher" do
-      it "rolls back if there is another active voucher with the same sort for the lecture" do
+      it "rolls back if there is another active voucher with the same role for the lecture" do
         FactoryBot.create(:voucher, :tutor, lecture: lecture)
         new_voucher = build(:voucher, :tutor, lecture: lecture)
 
         expect(new_voucher.save).to be_falsey
-        expect(new_voucher.errors[:sort]).to(
+        expect(new_voucher.errors[:role]).to(
           include(I18n.t("activerecord.errors.models.voucher." \
-                         "attributes.sort.only_one_active"))
+                         "attributes.role.only_one_active"))
         )
       end
     end
@@ -75,7 +75,7 @@
 
         it "does not add an error" do
           expect(voucher.save).to be_truthy
-          expect(voucher.errors[:sort]).to be_empty
+          expect(voucher.errors[:role]).to be_empty
         end
       end
 
@@ -84,9 +84,9 @@
 
         it "rolls back and adds an error" do
           expect(voucher.save).to be_falsey
-          expect(voucher.errors[:sort]).to(
+          expect(voucher.errors[:role]).to(
             include(I18n.t("activerecord.errors.models.voucher.attributes." \
-                           "sort.speaker_vouchers_only_for_seminars"))
+                           "role.speaker_vouchers_only_for_seminars"))
           )
         end
       end
@@ -114,13 +114,13 @@
   end
 
   describe "class methods" do
-    describe ".sorts_for_lecture" do
-      it "returns all sorts if the lecture is a seminar" do
-        expect(Voucher.sorts_for_lecture(seminar)).to eq(Voucher::SORT_HASH.keys)
+    describe ".roles_for_lecture" do
+      it "returns all roles if the lecture is a seminar" do
+        expect(Voucher.roles_for_lecture(seminar)).to eq(Voucher::ROLE_HASH.keys)
       end
 
       it "returns all sorts except :speaker if the lecture is not a seminar" do
-        expect(Voucher.sorts_for_lecture(lecture)).to eq(Voucher::SORT_HASH.keys - [:speaker])
+        expect(Voucher.roles_for_lecture(lecture)).to eq(Voucher::ROLE_HASH.keys - [:speaker])
       end
     end
   end

From 0c705e2f04baa49e46d1296e437454816cb72e54 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 19 Aug 2024 15:05:39 +0200
Subject: [PATCH 051/191] Rename remaining occurences of sort attribute of
 voucher to role

---
 app/models/redemption.rb          | 2 +-
 app/models/voucher.rb             | 6 +++---
 app/services/voucher_processor.rb | 2 +-
 app/views/vouchers/verify.js.erb  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 18940376a..190a3aa94 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -11,7 +11,7 @@ class Redemption < ApplicationRecord
                            source_type: "Talk"
 
   delegate :lecture, to: :voucher
-  delegate :sort, to: :voucher
+  delegate :role, to: :voucher
   delegate :tutor?, to: :voucher
   delegate :editor?, to: :voucher
   delegate :teacher?, to: :voucher
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index 813bf0862..45a7f9584 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -19,9 +19,9 @@ class Voucher < ApplicationRecord
                    where("expires_at > ? AND invalidated_at IS NULL",
                          Time.zone.now)
                  }
-  scope :for_tutors, -> { where(sort: :tutor) }
-  scope :for_editors, -> { where(sort: :editor) }
-  scope :for_speakers, -> { where(sort: :speaker) }
+  scope :for_tutors, -> { where(role: :tutor) }
+  scope :for_editors, -> { where(role: :editor) }
+  scope :for_speakers, -> { where(role: :speaker) }
 
   self.implicit_order_column = "created_at"
 
diff --git a/app/services/voucher_processor.rb b/app/services/voucher_processor.rb
index 776fb11cb..2a428d42b 100644
--- a/app/services/voucher_processor.rb
+++ b/app/services/voucher_processor.rb
@@ -18,7 +18,7 @@ def call
   private
 
     def process_voucher
-      case @voucher.sort
+      case @voucher.role
       when "tutor"
         process_tutor_voucher
       when "editor"
diff --git a/app/views/vouchers/verify.js.erb b/app/views/vouchers/verify.js.erb
index 4558c8d90..9a8ef568b 100644
--- a/app/views/vouchers/verify.js.erb
+++ b/app/views/vouchers/verify.js.erb
@@ -1,5 +1,5 @@
 $("#redeem-voucher").empty()
-  .append("<%= j render partial: 'vouchers/redeem_' + @voucher.sort + '_voucher', locals: { voucher: @voucher } %>");
+  .append("<%= j render partial: 'vouchers/redeem_' + @voucher.role + '_voucher', locals: { voucher: @voucher } %>");
 
 // activate selectize
 // @reviewer: This is used several times in our code base (in the coffeescript

From 4ed95d57cd9e1fe86bbe2f08bf9019fd6171759b Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:36:05 +0200
Subject: [PATCH 052/191] Add unit tests for VoucherProcessor

---
 spec/controllers/vouchers_controller_spec.rb |  34 +++++-
 spec/models/voucher_spec.rb                  |  11 ++
 spec/services/voucher_processor_spec.rb      | 115 +++++++++++++++++++
 3 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 spec/services/voucher_processor_spec.rb

diff --git a/spec/controllers/vouchers_controller_spec.rb b/spec/controllers/vouchers_controller_spec.rb
index 44a26e6de..e5c00aa4e 100644
--- a/spec/controllers/vouchers_controller_spec.rb
+++ b/spec/controllers/vouchers_controller_spec.rb
@@ -28,7 +28,7 @@
     end
   end
 
-  context "As an unauthorized user" do
+  context "As a generic user" do
     before do
       sign_in generic_user
     end
@@ -54,5 +54,37 @@
         expect(voucher.invalidated_at).to be_nil
       end
     end
+
+    describe "POST #verify" do
+      it "displays an error message if the secure hash is incorrect" do
+        post(:verify, params: { secure_hash: "incorrect_hash" })
+        expect(flash[:alert]).to eq(I18n.t("controllers.voucher_invalid"))
+      end
+
+      it "redirects to edit profile path if the secure hash is incorrect" do
+        post(:verify, params: { secure_hash: "incorrect_hash" })
+        expect(response).to redirect_to(edit_profile_path)
+      end
+    end
+
+    describe "POST #redeem" do
+      it "it does not redeem if the secure hash is incorrect" do
+        expect do
+          post(:redeem, params: { secure_hash: "incorrect_hash" })
+        end.not_to change(Redemption, :count)
+      end
+
+      it "displays an error message if the secure hash is incorrect" do
+        post(:redeem, params: { secure_hash: "incorrect_hash" })
+        expect(flash[:alert]).to eq(I18n.t("controllers.voucher_invalid"))
+      end
+
+      it "redeems if voucher secure hash is correct" do
+        voucher = FactoryBot.create(:voucher, lecture: lecture)
+        expect do
+          post(:redeem, params: { secure_hash: voucher.secure_hash })
+        end.to change(Redemption, :count).by(1)
+      end
+    end
   end
 end
diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index 641b69b5a..43acd86d0 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -124,4 +124,15 @@
       end
     end
   end
+
+  describe "instance methods" do
+    describe "#invalidate!" do
+      it "sets the invalidated_at attribute to the current time" do
+        voucher = FactoryBot.create(:voucher)
+        expect(voucher.invalidated_at).to be_nil
+        voucher.invalidate!
+        expect(voucher.invalidated_at).not_to be_nil
+      end
+    end
+  end
 end
diff --git a/spec/services/voucher_processor_spec.rb b/spec/services/voucher_processor_spec.rb
new file mode 100644
index 000000000..c7b4997f3
--- /dev/null
+++ b/spec/services/voucher_processor_spec.rb
@@ -0,0 +1,115 @@
+require "rails_helper"
+
+RSpec.describe(VoucherProcessor, type: :model) do
+  describe "#call" do
+    let(:lecture) { FactoryBot.create(:lecture) }
+    let(:voucher) { FactoryBot.create(:voucher, lecture: lecture, role: role) }
+    let(:user) { FactoryBot.create(:confirmed_user) }
+    let(:params) { {} }
+    let(:role) { :tutor }
+    let(:processor) { VoucherProcessor.new(voucher, user, params) }
+
+    shared_examples "common voucher processing" do
+      it "creates a redemption" do
+        expect { processor.call }.to change { Redemption.count }.by(1)
+      end
+
+      it "subscribes the user to the lecture" do
+        processor.call
+        expect(user.lectures).to include(lecture)
+      end
+
+      it "creates notifications about the voucher's redemption" do
+        count_before = Notification.count
+        processor.call
+        lecture.reload
+        expect(Notification.count).to eq(count_before + lecture.editors_and_teacher.count)
+      end
+    end
+
+    context "when the voucher is for a tutor" do
+      let(:tutorial1) { FactoryBot.create(:tutorial, lecture: lecture) }
+      let(:tutorial2) { FactoryBot.create(:tutorial, lecture: lecture) }
+      let(:params) { { tutorial_ids: [tutorial1.id, tutorial2.id] } }
+
+      include_examples "common voucher processing"
+
+      it "adds the tutorials to the user's given tutorials" do
+        processor.call
+        expect(user.given_tutorials).to include(tutorial1, tutorial2)
+      end
+
+      it "does not add a tutorial if its id is not in the params" do
+        tutorial3 = FactoryBot.create(:tutorial, lecture: lecture)
+        processor.call
+        expect(user.given_tutorials).not_to include(tutorial3)
+      end
+
+      it "creates a redemption with the claimed tutorials" do
+        processor.call
+        redemption = Redemption.last
+        expect(redemption.claimed_tutorials).to include(tutorial1, tutorial2)
+      end
+    end
+
+    context "when the voucher is for an editor" do
+      let(:role) { :editor }
+
+      include_examples "common voucher processing"
+
+      it "adds the user to the lecture's editors" do
+        processor.call
+        expect(lecture.editors).to include(user)
+      end
+    end
+
+    context "when the voucher is for a teacher" do
+      let(:role) { :teacher }
+
+      include_examples "common voucher processing"
+
+      it "sets the user as the lecture's teacher" do
+        processor.call
+        expect(lecture.teacher).to eq(user)
+      end
+
+      it "demotes the previous teacher to an editor" do
+        previous_teacher = lecture.teacher
+        processor.call
+        expect(lecture.editors).to include(previous_teacher)
+      end
+
+      it "invalidates the voucher" do
+        processor.call
+        expect(voucher.invalidated_at).not_to be_nil
+      end
+    end
+
+    context "when the voucher is for a speaker" do
+      let(:lecture) { FactoryBot.create(:lecture, :is_seminar) }
+      let(:role) { :speaker }
+      let(:talk1) { FactoryBot.create(:talk, lecture: lecture) }
+      let(:talk2) { FactoryBot.create(:talk, lecture: lecture) }
+      let(:params) { { talk_ids: [talk1.id, talk2.id] } }
+
+      include_examples "common voucher processing"
+
+      it "adds the talks to the user's given talks" do
+        processor.call
+        expect(user.talks).to include(talk1, talk2)
+      end
+
+      it "does not add a talk if its id is not in the params" do
+        talk3 = FactoryBot.create(:talk, lecture: lecture)
+        processor.call
+        expect(user.talks).not_to include(talk3)
+      end
+
+      it "creates a redemption with the claimed talks" do
+        processor.call
+        redemption = Redemption.last
+        expect(redemption.claimed_talks).to include(talk1, talk2)
+      end
+    end
+  end
+end

From 06d06ac441dcd4b2c2efdbb6146d7baa4afeb401 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 19 Aug 2024 18:36:52 +0200
Subject: [PATCH 053/191] Add .uniq to method

---
 app/models/lecture.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 85b35bd89..36436ab5c 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -932,7 +932,7 @@ def eligible_as_speakers
   end
 
   def editors_and_teacher
-    [teacher] + editors
+    ([teacher] + editors).uniq
   end
 
   def tutorials_with_tutor(tutor)

From d57e66f4165e9366a3a0adbeff407eeb0ed6cb8c Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 20 Aug 2024 14:29:07 +0200
Subject: [PATCH 054/191] Remove teacher selection for non-admins

---
 app/helpers/lectures_helper.rb           | 12 ---------
 app/views/lectures/_new.html.erb         | 24 ++++++++++-------
 app/views/lectures/edit/_people.html.erb | 34 +++++++++++++-----------
 config/locales/de.yml                    | 20 ++++++++++++++
 config/locales/en.yml                    | 19 +++++++++++++
 5 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index 0102186b8..df6303c94 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -135,16 +135,4 @@ def editors_preselection(lecture)
                          [editor.info, editor.id]
                        end, lecture.editor_ids)
   end
-
-  def teachers_preselection(lecture)
-    options_for_select(lecture.eligible_as_teachers.map do |teacher|
-                         [teacher.info, teacher.id]
-                       end, lecture.teacher_id)
-  end
-
-  def teachers_preselection_for_new_lecture
-    options_for_select((User.teachers + [current_user]).map do |teacher|
-                         [teacher.info, teacher.id]
-                       end)
-  end
 end
diff --git a/app/views/lectures/_new.html.erb b/app/views/lectures/_new.html.erb
index 159ba4e9e..9366afb1a 100644
--- a/app/views/lectures/_new.html.erb
+++ b/app/views/lectures/_new.html.erb
@@ -52,12 +52,12 @@
              id="new-lecture-term-error">
         </div>
       </div>
-      <div class="col-12">
-        <%= f.label :teacher_id,
-                    t('basics.teacher'),
-                    class: "form-label" %>
-        <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
-        <% if current_user.admin? %>
+      <div class="col-12 mt-4">
+        <% if current_user.admin? %>        
+          <%= f.label :teacher_id,
+                      t('basics.teacher'),
+                      class: "form-label" %>
+          <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
           <%= f.select :teacher_id,
                        options_for_select([[current_user.info, current_user.id]],
                                           current_user.id),
@@ -71,10 +71,14 @@
                                  current: current_user.id,
                                  modal: modal } } %>
         <% else %>
-          <%= f.select :teacher_id,
-                       teachers_preselection_for_new_lecture(lecture),
-                       {},
-                       { class: 'selectize' } %>
+          <p>
+            <%= t('basics.teacher') %>
+            <%= helpdesk(t('admin.lecture.info.teacher_fixed_new_lecture'),
+                          false) %>
+          </p>        
+          <p>
+            <%= current_user.info %>
+          </p>
         <% end %>
       </div>
       <div class="col-12" id="newLectureSort"
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index 536d42e84..f4a4c7080 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -4,12 +4,12 @@
       <h3 class="lecture-pane-header"><%= t('basics.people') %></h3>
 
       <div class="col-6 mb-3">
-        <%= f.label :teacher_id,
-                    t('basics.teacher'),
-                  class: "form-label" %>
-        <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
-        <div id="lecture_teacher_select" %>
-          <% if current_user.admin? %>
+        <% if current_user.admin? %>
+          <div id="lecture_teacher_select" %>
+            <%= f.label :teacher_id,
+                        t('basics.teacher'),
+                        class: "form-label" %>
+            <%= helpdesk(t('admin.lecture.info.teacher'), false) %>          
             <%= f.select :teacher_id,
                          options_for_select([[lecture.teacher.info,
                          lecture.teacher.id]],
@@ -23,17 +23,19 @@
                                      t('basics.enter_two_letters'),
                                    no_results:
                                    t('basics.no_results') } } %>
-          <% else %>
-            <%= f.select :teacher_id,
-                         teachers_preselection(lecture),
-                         {},
-                         { class: 'selectize' } %>
-          <% end %>
-          <div class="invalid-feedback" id="lecture-teacher-error">
-          </div>
-        </div>
+            <div class="invalid-feedback" id="lecture-teacher-error">
+            </div>
+          </div>                                   
+        <% else %>
+          <p>
+          <%= t('basics.teacher') %>
+          <%= helpdesk(t('admin.lecture.info.teacher_fixed'), false) %>
+          </p>
+          <p>
+            <%= lecture.teacher.info %>
+          </p>  
+        <% end %>
       </div>
-
       <div class="col-6 mb-3">
         <%= f.label :editor_ids,
                     t('basics.lecture_editors'),
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 66f6b4f34..627463cc7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -513,6 +513,26 @@ de:
           sich nicht selbst um das Einstellen von Materialien
           kümmern, so kann dies durch zusätzliche
           VeranstaltungseditorInnen geschehen.
+        teacher_fixed: >
+          Die DozentIn sollte im Normalfall diejenige Person sein,
+          die die Veranstaltung hält. Möchte die entsprechende Person
+          sich nicht selbst um das Einstellen von Materialien
+          kümmern, so kann dies durch zusätzliche
+          VeranstaltungseditorInnen geschehen. Soll die DozentIn geändert
+          werden, so kann dies dadurch geschehen, dass ein Gutschein erstellt
+          wird, der an die neue DozentIn weitergegeben wird und von dieser
+          in ihrem Nutzerprofil eingelöst wird. Die bisherige DozentIn wird
+          dann automatisch VeranstaltungeditorIn.
+        teacher_fixed_new_lecture: >
+          Die DozentIn sollte im Normalfall diejenige Person sein,
+          die die Veranstaltung hält. Solltest Du nicht DozentIn der
+          Veranstaltung sein, so kannst Du sie erstmal mit Dir als DozentIn
+          anlegen und danach an die entsprechende Person übertragen.
+          Dies geschieht dadurch, dass auf der Veranstaltungsbearbeitungsseite
+          im Tab "Personen/Tutorien" ein Gutschein erstellt wird,
+          der an die neue DozentIn weitergegeben
+          wird und von dieser in ihrem Nutzerprofil eingelöst wird.
+          Du wirst dann automatisch VeranstaltungeditorIn.
         workflow: >
           Wir beschreiben im Folgenden sinnvolle
           Workflows. Hierbei sollte man unterscheiden, ob die Veranstaltung
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0e9a04096..020c0f1ed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -509,6 +509,25 @@ en:
           Normally this should be the person that actually gives the event series.
           If this person does not want to upload materials himself or
           herself, additional event series editors can do this instead.
+        teacher_fixed: >
+          Normally the teacher should be the person that actually gives the
+          event series. If this person does not want to upload materials
+          himself or herself, additional event series editors can do this
+          instead. If the teacher needs to be changed, proceed as follows:
+          Create a voucher for teachers and communicate the voucher to the new
+          teacher outside of MaMpf. This person can then redeem the voucher
+          in their profile settings and will become the new teacher.
+          The previous teacher will be demoted to editor.
+        teacher_fixed_new_lecture: >
+          Normally the teacher should be the person that actually gives the
+          event series. If you are not the actual teacher, you can create
+          the lecture nonetheless with you as teacher and then transfer it
+          to the new teacher. For that, proceed as follows:
+          Create a voucher for teachers in the "People/Tutorials" tab on the
+          lecture's edit page and communicate the voucher to the new teacher
+          outside of MaMpf. This person can then redeem the voucher
+          in their profile settings and will become the new teacher.
+          You will then automatically be demoted to editor.
         workflow: >
           These are possible workflows.
           The workflow depends on whether the event series is

From 692dd161332dc4c6e1df544695691f794790d6c7 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 20 Aug 2024 14:36:14 +0200
Subject: [PATCH 055/191] Remove obsolete reference to non-existent model

---
 app/models/lecture.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 36436ab5c..bb87f0248 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -67,10 +67,6 @@ class Lecture < ApplicationRecord
   # users to tutors, editors or teachers
   has_many :vouchers, dependent: :destroy
 
-  # a lecture has many student assistants
-  has_many :contracts, dependent: :destroy
-  # has_many :assistants, -> { distinct }, through: :contracts, source: :assistant
-
   # a lecture has many structure_ids, referring to the ids of structures
   # in the erdbeere database
   serialize :structure_ids, type: Array, coder: YAML

From e5f471efa76987df7a12d7916edff42aec86008d Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 20 Aug 2024 14:36:57 +0200
Subject: [PATCH 056/191] Remove permissions from non-admins to change teachers

---
 app/controllers/lectures_controller.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 11a497f47..23d1f79ec 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -334,9 +334,10 @@ def lecture_params
                         :submission_max_team_size, :submission_grace_period,
                         :annotations_status]
       if action_name == "update" && current_user.can_update_personell?(@lecture)
-        allowed_params.push(:teacher_id, { editor_ids: [] })
+        allowed_params.push({ editor_ids: [] })
       end
-      allowed_params.push(:course_id, :teacher_id, { editor_ids: [] }) if action_name == "create"
+      allowed_params.push(:course_id, { editor_ids: [] }) if action_name == "create"
+      allowed_params.push(:teacher_id) if current_user.admin?
       params.require(:lecture).permit(allowed_params)
     end
 

From 11fb080956ab4b5b37fbf1e765fe34f1fe4634c4 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:04:49 +0200
Subject: [PATCH 057/191] Add cypress data attributes

---
 app/views/lectures/edit/_form.html.erb | 1 +
 app/views/vouchers/_voucher.html.erb   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/lectures/edit/_form.html.erb b/app/views/lectures/edit/_form.html.erb
index 293b5f6c9..f1d9c69b3 100644
--- a/app/views/lectures/edit/_form.html.erb
+++ b/app/views/lectures/edit/_form.html.erb
@@ -29,6 +29,7 @@
             id="lecture-nav-people" type="button" role="tab"
             href="#people"
             data-bs-toggle="pill" data-bs-target="#lecture-pane-people"
+            data-cy="people-tab-btn"
             aria-controls="lecture-pane-people" aria-selected="false">
           <%= t('basics.people') %>/<%= t('basics.tutorials') %>
         </button>
diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
index d1c6f787a..bded3c010 100644
--- a/app/views/vouchers/_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -43,7 +43,8 @@
                                         role: role }),
                 class: 'text-dark ms-2',
                 data: { toggle: 'tooltip',
-                        placement: 'bottom' },
+                        placement: 'bottom',
+                        cy: "create-#{role}-voucher-btn" },
                 title: t('buttons.create_voucher'),
                 method: :post,
                 remote: true do %>

From 215b46bd363576ccac4cd5d58a32ffab3f418d02 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 20 Aug 2024 19:05:17 +0200
Subject: [PATCH 058/191] Add first cypress tests

---
 spec/cypress/e2e/vouchers_spec.cy.js | 52 ++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 spec/cypress/e2e/vouchers_spec.cy.js

diff --git a/spec/cypress/e2e/vouchers_spec.cy.js b/spec/cypress/e2e/vouchers_spec.cy.js
new file mode 100644
index 000000000..eda502d53
--- /dev/null
+++ b/spec/cypress/e2e/vouchers_spec.cy.js
@@ -0,0 +1,52 @@
+import FactoryBot from "../support/factorybot";
+
+const ROLES = ["tutor", "editor", "teacher", "speaker"];
+
+function createLectureScenario(context, type = "lecture") {
+  cy.createUserAndLogin("teacher").as("teacher");
+
+  cy.then(() => {
+    FactoryBot.create(type, "with_teacher_by_id", { teacher_id: context.teacher.id }).as("lecture");
+  });
+
+  cy.then(() => {
+    cy.visit(`/lectures/${context.lecture.id}/edit`);
+    cy.getBySelector("people-tab-btn").click();
+  });
+
+  cy.i18n("basics.vouchers").as("vouchers");
+}
+
+describe("If the lecture is not a seminar", () => {
+  beforeEach(function () {
+    createLectureScenario(this);
+  });
+
+  describe("People tab in lecture edit page", () => {
+    it("shows buttons for creating tutor, editor and teacher vouchers", function () {
+      cy.then(() => {
+        cy.contains(this.vouchers).should("be.visible");
+        ROLES.filter(role => role !== "speaker").forEach((role) => {
+          cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
+        });
+      });
+    });
+  });
+});
+
+describe("If the lecture is a seminar", () => {
+  beforeEach(function () {
+    createLectureScenario(this, "seminar");
+  });
+
+  describe("People tab in lecture edit page", () => {
+    it("shows buttons for creating tutor, editor, teacher, and speaker vouchers", function () {
+      cy.then(() => {
+        cy.contains(this.vouchers).should("be.visible");
+        ROLES.forEach((role) => {
+          cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
+        });
+      });
+    });
+  });
+});

From e33db992b6a9a15d0ea31a114b26b48196f209a7 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Wed, 21 Aug 2024 13:48:47 +0200
Subject: [PATCH 059/191] Add more cypress tests

---
 app/views/vouchers/_voucher.html.erb | 10 ++--
 spec/cypress/e2e/vouchers_spec.cy.js | 68 ++++++++++++++++++++++++----
 2 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
index bded3c010..98348867d 100644
--- a/app/views/vouchers/_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -1,15 +1,18 @@
 <% voucher = lecture.active_voucher_of_role(role) %>
 <% if voucher %>
   <div>
-    <span>
+    <span data-cy='<%= "#{role}-voucher-data" %>'>
         <%= t('admin.voucher.secure_hash') %>:
-        <%= voucher.secure_hash %>
+        <span data-cy='<%= "#{role}-voucher-secure-hash" %>'>
+          <%= voucher.secure_hash %>
+        </span>
     </span>
     <i class="clipboardpopup far fa-copy clickable text-secondary clipboard-btn
               ms-3 clipboard-button"
        data-clipboard-text="<%= voucher.secure_hash %>"
        data-bs-toggle="tooltip"
        data-id="<%= voucher.secure_hash %>"
+       data-cy="copy-<%= role %>-voucher-btn"
        title="<%= t('buttons.copy_to_clipboard') %>">
       <span class="clipboardpopuptext token-clipboard-popup"
             data-id="<%= voucher.secure_hash %>">
@@ -20,7 +23,8 @@
                 class: 'text-dark ms-2',
                 data: { toggle: 'tooltip',
                         placement: 'bottom',
-                        confirm: t('confirmation.generic') },
+                        confirm: t('confirmation.generic'),
+                        cy: "invalidate-#{role}-voucher-btn" },
                 style: 'text-decoration: none;',
                 title: t('buttons.invalidate'),
                 method: :post,
diff --git a/spec/cypress/e2e/vouchers_spec.cy.js b/spec/cypress/e2e/vouchers_spec.cy.js
index eda502d53..b277a1297 100644
--- a/spec/cypress/e2e/vouchers_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_spec.cy.js
@@ -17,6 +17,29 @@ function createLectureScenario(context, type = "lecture") {
   cy.i18n("basics.vouchers").as("vouchers");
 }
 
+function testCreateVoucher(role) {
+  cy.getBySelector(`create-${role}-voucher-btn`).click();
+
+  cy.then(() => {
+    cy.getBySelector(`${role}-voucher-data`).should("be.visible");
+    cy.getBySelector(`${role}-voucher-secure-hash`).should("not.be.empty");
+    cy.getBySelector(`invalidate-${role}-voucher-btn`).should("be.visible");
+  });
+}
+
+function testInvalidateVoucher(role) {
+  cy.getBySelector(`invalidate-${role}-voucher-btn`).click();
+
+  // Confirm popup
+  cy.on("window:confirm", () => true);
+
+  cy.then(() => {
+    cy.getBySelector(`${role}-voucher-data`).should("not.exist");
+    cy.getBySelector(`invalidate-${role}-voucher-btn`).should("not.exist");
+    cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
+  });
+}
+
 describe("If the lecture is not a seminar", () => {
   beforeEach(function () {
     createLectureScenario(this);
@@ -24,11 +47,25 @@ describe("If the lecture is not a seminar", () => {
 
   describe("People tab in lecture edit page", () => {
     it("shows buttons for creating tutor, editor and teacher vouchers", function () {
-      cy.then(() => {
-        cy.contains(this.vouchers).should("be.visible");
-        ROLES.filter(role => role !== "speaker").forEach((role) => {
-          cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
-        });
+      cy.contains(this.vouchers).should("be.visible");
+
+      ROLES.filter(role => role !== "speaker").forEach((role) => {
+        cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
+      });
+
+      cy.getBySelector("create-speaker-voucher-btn").should("not.exist");
+    });
+
+    it("displays the voucher and invalidate button after the create button is clicked", function () {
+      ROLES.filter(role => role !== "speaker").forEach((role) => {
+        testCreateVoucher(role);
+      });
+    });
+
+    it("displays that there is no active voucher after the invalidate button is clicked", function () {
+      ROLES.filter(role => role !== "speaker").forEach((role) => {
+        testCreateVoucher(role);
+        testInvalidateVoucher(role);
       });
     });
   });
@@ -41,11 +78,22 @@ describe("If the lecture is a seminar", () => {
 
   describe("People tab in lecture edit page", () => {
     it("shows buttons for creating tutor, editor, teacher, and speaker vouchers", function () {
-      cy.then(() => {
-        cy.contains(this.vouchers).should("be.visible");
-        ROLES.forEach((role) => {
-          cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
-        });
+      cy.contains(this.vouchers).should("be.visible");
+      ROLES.forEach((role) => {
+        cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
+      });
+    });
+
+    it("displays the voucher and invalidate button after the create button is clicked", function () {
+      ROLES.forEach((role) => {
+        testCreateVoucher(role);
+      });
+    });
+
+    it("displays that there is no active voucher after the invalidate button is clicked", function () {
+      ROLES.forEach((role) => {
+        testCreateVoucher(role);
+        testInvalidateVoucher(role);
       });
     });
   });

From 8a0e9654e3fe7a81e123eb117f3bf84ae347b1ce Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:37:05 +0200
Subject: [PATCH 060/191] Add first cypress tests for voucher redemption

---
 app/helpers/vouchers_helper.rb                |  1 +
 .../layouts/application_no_sidebar.html.erb   |  2 +-
 app/views/profile/_verify_voucher.html.erb    |  9 ++-
 app/views/profile/edit.html.erb               |  2 +-
 .../vouchers/_redeem_tutor_voucher.html.erb   |  2 +-
 spec/cypress/e2e/voucher_redemption.cy.js     | 81 +++++++++++++++++++
 spec/factories/vouchers.rb                    |  7 ++
 7 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 spec/cypress/e2e/voucher_redemption.cy.js

diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index 3db690ed4..78b7b48ff 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -24,6 +24,7 @@ def redeem_voucher_button(voucher)
     link_to(t("profile.redeem_voucher"),
             redeem_voucher_path(params: { secure_hash: voucher.secure_hash }),
             class: "btn btn-primary",
+            data: { cy: "redeem-voucher-btn" },
             method: :post, remote: true)
   end
 
diff --git a/app/views/layouts/application_no_sidebar.html.erb b/app/views/layouts/application_no_sidebar.html.erb
index e23124bb0..24d45f890 100644
--- a/app/views/layouts/application_no_sidebar.html.erb
+++ b/app/views/layouts/application_no_sidebar.html.erb
@@ -17,7 +17,7 @@
             </div>
           <% end %>
           <% if notice.present? %>
-            <div class="alert alert-secondary" role="alert">
+            <div class="alert alert-secondary" role="alert" data-cy="flash-notice">
               <%= sanitize notice, :tags => %w(br) %>
             </div>
           <% end %>
diff --git a/app/views/profile/_verify_voucher.html.erb b/app/views/profile/_verify_voucher.html.erb
index 697cb58a0..954c1cbd5 100644
--- a/app/views/profile/_verify_voucher.html.erb
+++ b/app/views/profile/_verify_voucher.html.erb
@@ -1,9 +1,12 @@
 <%= form_with url: verify_voucher_path,
               remote: true,
               method: :post,
-              html: { class: "form-inline" } do |f| %>
+              html: { class: "form-inline",
+                      data: { cy: "verify-voucher-form"} } do |f| %>
     <div class="form-group d-flex">
-        <%= f.text_field :secure_hash, class: "form-control me-2 w-50" %>
-        <%= f.submit t('buttons.verify_voucher'), class: "btn btn-primary" %>
+        <%= f.text_field :secure_hash, class: "form-control me-2 w-50",
+                         data: { cy: "secure-hash-input" } %>
+        <%= f.submit t('buttons.verify_voucher'), class: "btn btn-primary",
+                     data: { cy: "verify-voucher-submit" } %>
     </div>
 <% end %>
diff --git a/app/views/profile/edit.html.erb b/app/views/profile/edit.html.erb
index 4156b3c39..875d0b3bc 100644
--- a/app/views/profile/edit.html.erb
+++ b/app/views/profile/edit.html.erb
@@ -110,7 +110,7 @@
 <% end %>
 <div class="row mb-3">
   <div class="col-12">
-    <div class="card bg-light">
+    <div class="card bg-light" data-cy="redeem-voucher-card">
       <div class="card-header">
         <div class="row">
           <div class="col-12">
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index e078bde1a..73c167889 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -1,4 +1,4 @@
-<p>
+<p data-cy="redeem-voucher-text">
   <%= t('profile.become_tutor', lecture: voucher.lecture.title) %>
 
   <% if current_user.in?(voucher.lecture.tutors) %>
diff --git a/spec/cypress/e2e/voucher_redemption.cy.js b/spec/cypress/e2e/voucher_redemption.cy.js
new file mode 100644
index 000000000..e280f9034
--- /dev/null
+++ b/spec/cypress/e2e/voucher_redemption.cy.js
@@ -0,0 +1,81 @@
+import FactoryBot from "../support/factorybot";
+
+function createRedemptionScenario(context) {
+  cy.createUserAndLogin("generic").as("user");
+
+  cy.then(() => {
+    FactoryBot.create("lecture").as("lecture");
+  });
+
+  cy.then(() => {
+    console.log("lecture: ", context.lecture);
+  });
+
+  cy.then(() => {
+    FactoryBot.create("voucher", "with_lecture_by_id", { lecture_id: context.lecture.id }).as("voucher");
+  });
+
+  cy.then(() => {
+    cy.visit("/profile/edit");
+  });
+
+  cy.i18n("profile.redeem_voucher").as("redeem_voucher");
+}
+
+function submitVoucher(voucher) {
+  cy.getBySelector("secure-hash-input").type(voucher.secure_hash);
+  cy.getBySelector("verify-voucher-submit").click();
+}
+
+function verifyVoucherRedemption() {
+  cy.getBySelector("redeem-voucher-text").should("be.visible");
+}
+
+function verifyNoTutorialsYetMessage(context) {
+  cy.i18n("profile.no_tutorials_yet").as("no_tutorials_yet");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.no_tutorials_yet);
+    cy.getBySelector("redeem-voucher-btn").should("be.visible");
+  });
+}
+
+function redeemVoucherToBecomeTutor(context) {
+  cy.i18n("controllers.become_tutor_success").as("become_tutor_success");
+  cy.getBySelector("redeem-voucher-btn").click();
+  cy.then(() => {
+    cy.getBySelector("flash-notice").should("be.visible").and("contain", context.become_tutor_success);
+  });
+}
+
+describe("Profile page", () => {
+  beforeEach(function () {
+    createRedemptionScenario(this);
+  });
+
+  it("shows redeem voucher card and verify voucher form", function () {
+    cy.getBySelector("redeem-voucher-card").should("contain", this.redeem_voucher);
+    cy.getBySelector("verify-voucher-form").should("be.visible");
+  });
+
+  describe("Verify voucher form", () => {
+    describe("for tutor vouchers", () => {
+      it("can submit a valid voucher", function () {
+        submitVoucher(this.voucher);
+        verifyVoucherRedemption();
+      });
+
+      describe("if the lecture has no tutorials yet", () => {
+        it("shows a message after submission that there are no tutorials and a redeem voucher button", function () {
+          submitVoucher(this.voucher);
+          verifyNoTutorialsYetMessage(this);
+        });
+
+        it("allows redemption of voucher to become tutor", function () {
+          submitVoucher(this.voucher);
+          redeemVoucherToBecomeTutor(this);
+        });
+      });
+    });
+  });
+});
diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb
index 1242923c4..91c8f1be2 100644
--- a/spec/factories/vouchers.rb
+++ b/spec/factories/vouchers.rb
@@ -24,5 +24,12 @@
     trait :invalidated do
       invalidated_at { 1.day.ago }
     end
+
+    trait :with_lecture_by_id do
+      transient do
+        lecture_id { nil }
+      end
+      lecture { Lecture.find(lecture_id) }
+    end
   end
 end

From 7429387b46bd4c563d80fe4289279c07c156e0fe Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 21 Aug 2024 19:05:33 +0200
Subject: [PATCH 061/191] Init future possibility to check clipboard content

---
 .config/.cypress.js                  | 30 ++++++++++++++++
 spec/cypress/e2e/vouchers_spec.cy.js | 11 ++++++
 spec/cypress/support/commands.js     | 51 ++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)

diff --git a/.config/.cypress.js b/.config/.cypress.js
index 5d8e10485..da8f635df 100644
--- a/.config/.cypress.js
+++ b/.config/.cypress.js
@@ -3,5 +3,35 @@ module.exports = {
     // Base URL is set via Docker environment variable
     viewportHeight: 1000,
     viewportWidth: 1400,
+
+    // https://docs.cypress.io/api/plugins/browser-launch-api#Changing-browser-preferences
+    setupNodeEvents(on, _config) {
+      on("before:browser:launch", (browser, launchOptions) => {
+        if (browser.family === "chromium" && browser.name !== "electron") {
+          // auto open devtools
+          launchOptions.args.push("--auto-open-devtools-for-tabs");
+
+          // TODO (clipboard): We use the obsolete clipboard API from browsers, i.e.
+          // document.execCommand("copy"). There's a new Clipboard API that is supported
+          // by modern browsers. Once we switch to that API, use the following code
+          // to allow requesting permission (clipboard permission) in a non-secure
+          // context (http). Remaining TODO in this case: search for the equivalent
+          // flag in Firefox & Electron (if we also want to test them).
+          // launchOptions.args.push("--unsafely-treat-insecure-origin-as-secure=http://mampf:3000");
+        }
+
+        if (browser.family === "firefox") {
+          // auto open devtools
+          launchOptions.args.push("-devtools");
+        }
+
+        if (browser.name === "electron") {
+          // auto open devtools
+          launchOptions.preferences.devTools = true;
+        }
+
+        return launchOptions;
+      });
+    },
   },
 };
diff --git a/spec/cypress/e2e/vouchers_spec.cy.js b/spec/cypress/e2e/vouchers_spec.cy.js
index b277a1297..02321ee5f 100644
--- a/spec/cypress/e2e/vouchers_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_spec.cy.js
@@ -68,6 +68,17 @@ describe("If the lecture is not a seminar", () => {
         testInvalidateVoucher(role);
       });
     });
+
+    it.skip("copies the voucher hash to the clipboard", function () {
+      ROLES.filter(role => role !== "speaker").forEach((role) => {
+        cy.getBySelector(`create-${role}-voucher-btn`).click();
+        cy.getBySelector(`${role}-voucher-secure-hash`).then(($hash) => {
+          const hashText = $hash.text();
+          cy.getBySelector(`copy-${role}-voucher-btn`).click();
+          cy.assertCopiedToClipboard(hashText);
+        });
+      });
+    });
   });
 });
 
diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js
index f965e0486..5d2a6db15 100644
--- a/spec/cypress/support/commands.js
+++ b/spec/cypress/support/commands.js
@@ -20,6 +20,57 @@ Cypress.Commands.add("clickExpectNewTab", { prevSubject: true }, ($subject, args
   return cy.wrap($subject).invoke("removeAttr", "target").click(args);
 });
 
+Cypress.Commands.add("assertCopiedToClipboard", (_expectedText) => {
+  cy.fail("Not implemented yet");
+
+  // An old method would consist of something like this:
+  // adapted from https://stackoverflow.com/a/69571115
+  // and https://stackoverflow.com/a/33928558
+
+  //////////////////////////////////////////////////////////////////////////////
+  // NEW PROPOSED SOLUTION for the new Clipboard API
+  //////////////////////////////////////////////////////////////////////////////
+
+  // TODO (clipboard): We currently use the obsolete clipboard API from browsers,
+  // i.e. document.execCommand("copy") via the clipboard.js library.
+  // There's a new Clipboard API that is supported by modern browsers.
+  // Once we switch to that API, use the following code to test copying to
+  // the clipboard. Also see this GitHub issue for more information:
+  // https://github.com/cypress-io/cypress/issues/2752
+  //
+  // Note that another option to test the clipboard content then would be
+  // https://github.com/cypress-io/cypress/issues/2752#issuecomment-1039285381
+  // which wouldn't even require requesting permissions but might have its
+  // own limitations.
+
+  // Request clipboard permissions
+  // by https://stackoverflow.com/a/73329952/9655481
+  // Note that this won't work by default in a non-secure context (http), so we need to
+  // pass the flag --unsafely-treat-insecure-origin-as-secure=http://mampf:3000
+  // to the browser when starting it (see the cypress config)
+  // cy.wrap(Cypress.automation("remote:debugger:protocol", {
+  //   command: "Browser.grantPermissions",
+  //   params: {
+  //     permissions: ["clipboardReadWrite", "clipboardSanitizedWrite"],
+  //   },
+  // }));
+
+  // Make sure clipboard permissions were granted
+  // https://stackoverflow.com/questions/61650737/how-to-fetch-copied-to-clipboard-content-in-cypress/73329952#comment137190789_69571115
+  // cy.window().its("navigator.permissions")
+  //   .then(api => api.query({ name: "clipboard-read" }))
+  //   .its("state").should("equal", "granted");
+
+  // https://stackoverflow.com/a/75928308/
+  // cy.window().its("navigator.clipboard")
+  //   .then(clip => clip.readText())
+  //   .should("equal", expectedText);
+});
+
+////////////////////////////////////////////////////////////////////////////////
+// Custom commands for backend interaction
+////////////////////////////////////////////////////////////////////////////////
+
 Cypress.Commands.add("cleanDatabase", () => {
   return BackendCaller.callCypressRoute("database_cleaner", "cy.cleanDatabase()", {});
 });

From 3710ee1f03e58e75c689f529864db924c33cc9f2 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:14:10 +0200
Subject: [PATCH 062/191] Add missing teacher field for non-admins

---
 app/controllers/lectures_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 23d1f79ec..7361ba778 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -67,6 +67,7 @@ def edit
 
   def create
     @lecture = Lecture.new(lecture_params)
+    @lecture.teacher = current_user unless current_user.admin?
     authorize! :create, @lecture
     @lecture.save
     if @lecture.valid?

From 049edecf9c50e8de07b5b0afc46800c8fb356a35 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 22 Aug 2024 19:00:07 +0200
Subject: [PATCH 063/191] Add cypress tests for redemption form

---
 app/helpers/vouchers_helper.rb            |  3 +-
 spec/cypress/e2e/voucher_redemption.cy.js | 36 +++++++++++++++++------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index 78b7b48ff..f81e23a09 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -43,6 +43,7 @@ def claim_select_field(form, user, voucher)
     form.select(field_name,
                 options_for_select(options),
                 { prompt: prompt },
-                { multiple: true, class: "selectize me-2 w-50" })
+                { multiple: true, class: "selectize me-2 w-50",
+                  data: { cy: "claim-select" } })
   end
 end
diff --git a/spec/cypress/e2e/voucher_redemption.cy.js b/spec/cypress/e2e/voucher_redemption.cy.js
index e280f9034..72542ce81 100644
--- a/spec/cypress/e2e/voucher_redemption.cy.js
+++ b/spec/cypress/e2e/voucher_redemption.cy.js
@@ -64,18 +64,36 @@ describe("Profile page", () => {
         submitVoucher(this.voucher);
         verifyVoucherRedemption();
       });
+    });
+  });
 
-      describe("if the lecture has no tutorials yet", () => {
-        it("shows a message after submission that there are no tutorials and a redeem voucher button", function () {
-          submitVoucher(this.voucher);
-          verifyNoTutorialsYetMessage(this);
-        });
+  describe("Tutor voucher redemption", () => {
+    describe("if the lecture has no tutorials yet", () => {
+      it("shows a message that there are no tutorials and a redeem voucher button", function () {
+        submitVoucher(this.voucher);
+        verifyNoTutorialsYetMessage(this);
+      });
 
-        it("allows redemption of voucher to become tutor", function () {
-          submitVoucher(this.voucher);
-          redeemVoucherToBecomeTutor(this);
-        });
+      it("allows redemption of voucher to become tutor", function () {
+        submitVoucher(this.voucher);
+        redeemVoucherToBecomeTutor(this);
       });
     });
+
+    describe("if the lecture has tutorials", () => {
+      it("shows a message after submission that there are tutorials and a select form",
+        function () {
+          FactoryBot.create("tutorial", { lecture_id: this.lecture.id })
+            .as("tutorial1");
+          FactoryBot.create("tutorial", { lecture_id: this.lecture.id })
+            .as("tutorial2");
+
+          cy.then(() => {
+            submitVoucher(this.voucher);
+            cy.getBySelector("claim-select").should("be.visible");
+            cy.getBySelector("claim-select").select([this.tutorial1.id, this.tutorial2.id]);
+          });
+        });
+    });
   });
 });

From 329194fca8330b26988370ca3d6bf3f4a5b4ffb1 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 22 Aug 2024 19:58:22 +0200
Subject: [PATCH 064/191] Add cypress command .tomselect to select in TomSelect
 forms

---
 spec/cypress/support/commands.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js
index 5d2a6db15..9e4232f25 100644
--- a/spec/cypress/support/commands.js
+++ b/spec/cypress/support/commands.js
@@ -5,6 +5,14 @@ Cypress.Commands.add("getBySelector", (selector, ...args) => {
   return cy.get(`[data-cy=${selector}]`, ...args);
 });
 
+// Extend the .select() command to automatically set the force: true flag
+Cypress.Commands.add("tomselect", { prevSubject: "element" }, (subject, values, options = {}) => {
+  // Merge the provided options with the force: true option
+  const mergedOptions = { ...options, force: true };
+
+  // Call the original .select() command with the merged options
+  return cy.wrap(subject).select(values, mergedOptions);
+});
 /**
  * Expects the subject to be an anchor element `<a>` with a target attribute set
  * to "_blank", such that the link opens in a new tab.

From 913f816d73cc9aa4b3b06a7af7ca8dc989dfd052 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Thu, 22 Aug 2024 19:59:10 +0200
Subject: [PATCH 065/191] Add test for redemption form using the new .tomselect
 command

---
 app/views/vouchers/_voucher_form.html.erb | 3 ++-
 spec/cypress/e2e/voucher_redemption.cy.js | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/views/vouchers/_voucher_form.html.erb b/app/views/vouchers/_voucher_form.html.erb
index 9cf471f77..befa4b0f2 100644
--- a/app/views/vouchers/_voucher_form.html.erb
+++ b/app/views/vouchers/_voucher_form.html.erb
@@ -9,7 +9,8 @@
 
     <%= claim_select_field(f, current_user, voucher) %>
     
-    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary" %>
+    <%= f.submit t('profile.redeem_voucher'), class: "btn btn-primary",
+                 data: { cy: "claim-submit"} %>
     <%= cancel_voucher_button %>
   </div>
 
diff --git a/spec/cypress/e2e/voucher_redemption.cy.js b/spec/cypress/e2e/voucher_redemption.cy.js
index 72542ce81..b829c41c6 100644
--- a/spec/cypress/e2e/voucher_redemption.cy.js
+++ b/spec/cypress/e2e/voucher_redemption.cy.js
@@ -4,7 +4,7 @@ function createRedemptionScenario(context) {
   cy.createUserAndLogin("generic").as("user");
 
   cy.then(() => {
-    FactoryBot.create("lecture").as("lecture");
+    FactoryBot.create("lecture", "released_for_all", { teacher_id: context.user.id }).as("lecture");
   });
 
   cy.then(() => {
@@ -91,7 +91,11 @@ describe("Profile page", () => {
           cy.then(() => {
             submitVoucher(this.voucher);
             cy.getBySelector("claim-select").should("be.visible");
-            cy.getBySelector("claim-select").select([this.tutorial1.id, this.tutorial2.id]);
+            cy.getBySelector("claim-select").tomselect([this.tutorial1.id, this.tutorial2.id]);
+            cy.getBySelector("claim-submit").click();
+            cy.then(() => {
+              cy.getBySelector("flash-notice").should("be.visible");
+            });
           });
         });
     });

From 72890539d824e75f65a9efdf110ee876271367b6 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:18:01 +0200
Subject: [PATCH 066/191] Remove unnecessary call of trait

---
 spec/cypress/e2e/vouchers_spec.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/cypress/e2e/vouchers_spec.cy.js b/spec/cypress/e2e/vouchers_spec.cy.js
index 02321ee5f..f198b0ae5 100644
--- a/spec/cypress/e2e/vouchers_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_spec.cy.js
@@ -6,7 +6,7 @@ function createLectureScenario(context, type = "lecture") {
   cy.createUserAndLogin("teacher").as("teacher");
 
   cy.then(() => {
-    FactoryBot.create(type, "with_teacher_by_id", { teacher_id: context.teacher.id }).as("lecture");
+    FactoryBot.create(type, { teacher_id: context.teacher.id }).as("lecture");
   });
 
   cy.then(() => {

From 5a6570872b594c8f87a32a0da26ab937d62826b4 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:20:42 +0200
Subject: [PATCH 067/191] Use NO_SEMINAR_ROLES constant

---
 spec/cypress/e2e/vouchers_spec.cy.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_spec.cy.js b/spec/cypress/e2e/vouchers_spec.cy.js
index f198b0ae5..6264329bc 100644
--- a/spec/cypress/e2e/vouchers_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_spec.cy.js
@@ -1,6 +1,7 @@
 import FactoryBot from "../support/factorybot";
 
 const ROLES = ["tutor", "editor", "teacher", "speaker"];
+const NO_SEMINAR_ROLES = ROLES.filter(role => role !== "speaker");
 
 function createLectureScenario(context, type = "lecture") {
   cy.createUserAndLogin("teacher").as("teacher");
@@ -49,7 +50,7 @@ describe("If the lecture is not a seminar", () => {
     it("shows buttons for creating tutor, editor and teacher vouchers", function () {
       cy.contains(this.vouchers).should("be.visible");
 
-      ROLES.filter(role => role !== "speaker").forEach((role) => {
+      NO_SEMINAR_ROLES.forEach((role) => {
         cy.getBySelector(`create-${role}-voucher-btn`).should("be.visible");
       });
 
@@ -57,20 +58,20 @@ describe("If the lecture is not a seminar", () => {
     });
 
     it("displays the voucher and invalidate button after the create button is clicked", function () {
-      ROLES.filter(role => role !== "speaker").forEach((role) => {
+      NO_SEMINAR_ROLES.forEach((role) => {
         testCreateVoucher(role);
       });
     });
 
     it("displays that there is no active voucher after the invalidate button is clicked", function () {
-      ROLES.filter(role => role !== "speaker").forEach((role) => {
+      NO_SEMINAR_ROLES.forEach((role) => {
         testCreateVoucher(role);
         testInvalidateVoucher(role);
       });
     });
 
     it.skip("copies the voucher hash to the clipboard", function () {
-      ROLES.filter(role => role !== "speaker").forEach((role) => {
+      NO_SEMINAR_ROLES.forEach((role) => {
         cy.getBySelector(`create-${role}-voucher-btn`).click();
         cy.getBySelector(`${role}-voucher-secure-hash`).then(($hash) => {
           const hashText = $hash.text();

From 7f68ee9ea90c15a0b6a98c08e78eb8358468f54e Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:45:04 +0200
Subject: [PATCH 068/191] Clean up some experiments

---
 ...edemption.cy.js => voucher_redemption_spec.cy.js} | 12 +++++-------
 spec/factories/vouchers.rb                           |  7 -------
 2 files changed, 5 insertions(+), 14 deletions(-)
 rename spec/cypress/e2e/{voucher_redemption.cy.js => voucher_redemption_spec.cy.js} (90%)

diff --git a/spec/cypress/e2e/voucher_redemption.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
similarity index 90%
rename from spec/cypress/e2e/voucher_redemption.cy.js
rename to spec/cypress/e2e/voucher_redemption_spec.cy.js
index b829c41c6..8c04a1aa2 100644
--- a/spec/cypress/e2e/voucher_redemption.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -4,15 +4,11 @@ function createRedemptionScenario(context) {
   cy.createUserAndLogin("generic").as("user");
 
   cy.then(() => {
-    FactoryBot.create("lecture", "released_for_all", { teacher_id: context.user.id }).as("lecture");
+    FactoryBot.create("lecture").as("lecture");
   });
 
   cy.then(() => {
-    console.log("lecture: ", context.lecture);
-  });
-
-  cy.then(() => {
-    FactoryBot.create("voucher", "with_lecture_by_id", { lecture_id: context.lecture.id }).as("voucher");
+    FactoryBot.create("voucher", { lecture_id: context.lecture.id }).as("voucher");
   });
 
   cy.then(() => {
@@ -76,7 +72,9 @@ describe("Profile page", () => {
 
       it("allows redemption of voucher to become tutor", function () {
         submitVoucher(this.voucher);
-        redeemVoucherToBecomeTutor(this);
+        cy.then(() => {
+          redeemVoucherToBecomeTutor(this);
+        });
       });
     });
 
diff --git a/spec/factories/vouchers.rb b/spec/factories/vouchers.rb
index 91c8f1be2..1242923c4 100644
--- a/spec/factories/vouchers.rb
+++ b/spec/factories/vouchers.rb
@@ -24,12 +24,5 @@
     trait :invalidated do
       invalidated_at { 1.day.ago }
     end
-
-    trait :with_lecture_by_id do
-      transient do
-        lecture_id { nil }
-      end
-      lecture { Lecture.find(lecture_id) }
-    end
   end
 end

From 74cae071fe643679c8a2cac592506c56d679c1e6 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 12:48:15 +0200
Subject: [PATCH 069/191] Remove .tomselect Command for cypress

---
 spec/cypress/e2e/voucher_redemption_spec.cy.js | 3 ++-
 spec/cypress/support/commands.js               | 8 --------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index 8c04a1aa2..ef0857459 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -89,7 +89,8 @@ describe("Profile page", () => {
           cy.then(() => {
             submitVoucher(this.voucher);
             cy.getBySelector("claim-select").should("be.visible");
-            cy.getBySelector("claim-select").tomselect([this.tutorial1.id, this.tutorial2.id]);
+            cy.getBySelector("claim-select")
+              .select([this.tutorial1.id, this.tutorial2.id], { force: true });
             cy.getBySelector("claim-submit").click();
             cy.then(() => {
               cy.getBySelector("flash-notice").should("be.visible");
diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js
index 9e4232f25..5d2a6db15 100644
--- a/spec/cypress/support/commands.js
+++ b/spec/cypress/support/commands.js
@@ -5,14 +5,6 @@ Cypress.Commands.add("getBySelector", (selector, ...args) => {
   return cy.get(`[data-cy=${selector}]`, ...args);
 });
 
-// Extend the .select() command to automatically set the force: true flag
-Cypress.Commands.add("tomselect", { prevSubject: "element" }, (subject, values, options = {}) => {
-  // Merge the provided options with the force: true option
-  const mergedOptions = { ...options, force: true };
-
-  // Call the original .select() command with the merged options
-  return cy.wrap(subject).select(values, mergedOptions);
-});
 /**
  * Expects the subject to be an anchor element `<a>` with a target attribute set
  * to "_blank", such that the link opens in a new tab.

From 9e5d4e495aaaa54f89317f106febd289e70563f8 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:32:42 +0200
Subject: [PATCH 070/191] Enlarge test user json by some data

---
 app/controllers/cypress/user_creator_controller.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb
index f82b4dd18..e611c2c02 100644
--- a/app/controllers/cypress/user_creator_controller.rb
+++ b/app/controllers/cypress/user_creator_controller.rb
@@ -1,6 +1,8 @@
 module Cypress
   # Creates a user for use in Cypress tests.
   class UserCreatorController < CypressController
+    CYPRESS_PASSWORD = "cypress123".freeze
+
     def create
       unless params[:role].is_a?(String)
         msg = "First argument must be a string indicating the user role."
@@ -12,11 +14,12 @@ def create
       is_admin = (role == "admin")
 
       user = User.create(name: "#{role} Cypress", email: "#{role}@mampf.cypress",
-                         password: "cypress123", consents: true, admin: is_admin,
-                         locale: I18n.default_locale)
+                         password: CYPRESS_PASSWORD, consents: true,
+                         admin: is_admin, locale: I18n.default_locale)
       user.confirm
 
-      render json: user.to_json, status: :created
+      additional_data = { password: CYPRESS_PASSWORD }
+      render json: user.as_json.merge(additional_data), status: :created
     end
   end
 end

From cec8dc66e3dc2cc7600f4c7ba680b3d49f690109 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 14:33:58 +0200
Subject: [PATCH 071/191] Add logout command and expect correct statuses for
 login and logout requests

---
 spec/cypress/support/commands.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/spec/cypress/support/commands.js b/spec/cypress/support/commands.js
index 5d2a6db15..0cb23c707 100644
--- a/spec/cypress/support/commands.js
+++ b/spec/cypress/support/commands.js
@@ -96,6 +96,19 @@ Cypress.Commands.add("login", (user) => {
       "user[email]": user.email,
       "user[password]": user.password,
     },
+  }).then((response) => {
+    expect(response.status).to.eq(200);
+  });
+});
+
+Cypress.Commands.add("logout", () => {
+  return cy.request({
+    method: "DELETE",
+    url: "/users/sign_out",
+    form: true,
+    failOnStatusCode: true,
+  }).then((response) => {
+    expect(response.status).to.eq(204);
   });
 });
 

From b3ae17963dd9917d79162f4bd348f87b3d266d8f Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:24:46 +0200
Subject: [PATCH 072/191] Add more cypress tests for redemption of tutor
 vouchers

---
 .../cypress/user_creator_controller.rb        |   1 +
 app/views/lectures/edit/_tutorials.html.erb   |   1 +
 app/views/tutorials/_form.html.erb            |   5 +-
 app/views/tutorials/_row.html.erb             |   3 +-
 .../cypress/e2e/voucher_redemption_spec.cy.js | 130 +++++++++++++-----
 5 files changed, 104 insertions(+), 36 deletions(-)

diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb
index e611c2c02..9beb3abd3 100644
--- a/app/controllers/cypress/user_creator_controller.rb
+++ b/app/controllers/cypress/user_creator_controller.rb
@@ -14,6 +14,7 @@ def create
       is_admin = (role == "admin")
 
       user = User.create(name: "#{role} Cypress", email: "#{role}@mampf.cypress",
+                         name_in_tutorials: "#{role} Real Cypress Name",
                          password: CYPRESS_PASSWORD, consents: true,
                          admin: is_admin, locale: I18n.default_locale)
       user.confirm
diff --git a/app/views/lectures/edit/_tutorials.html.erb b/app/views/lectures/edit/_tutorials.html.erb
index 62c8a7bc0..37ae6b55c 100644
--- a/app/views/lectures/edit/_tutorials.html.erb
+++ b/app/views/lectures/edit/_tutorials.html.erb
@@ -10,6 +10,7 @@
                   new_tutorial_path(params: { lecture_id: lecture.id }),
                   class: 'btn btn-sm btn-primary',
                   id: 'newTutorialButton',
+                  data: { cy: 'new-tutorial-btn' },
                   remote: true %>
     </div>
   </div>
diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb
index 80e038fe1..a770ff71f 100644
--- a/app/views/tutorials/_form.html.erb
+++ b/app/views/tutorials/_form.html.erb
@@ -1,7 +1,7 @@
 
 <div class="list-group-item tutorialRow"
        data-id="<%= tutorial.id.to_i %>">
-  <%= form_with model: tutorial do |f| %>
+  <%= form_with model: tutorial, data: { cy: 'tutorial-form' } do |f| %>
     <div class="row">
       <div class="form-group col-4">
         <%= f.text_field :title,
@@ -17,7 +17,8 @@
                      {},
                      { class: 'selectize',
                        multiple: true,
-                       id: "tutorial_tutor_ids_#{tutorial.id}" } %>
+                       id: "tutorial_tutor_ids_#{tutorial.id}",
+                       data: { cy: "tutor-select"} } %>
       </div>
       <div class="form-group col-4">
         <%= f.submit t('buttons.save'),
diff --git a/app/views/tutorials/_row.html.erb b/app/views/tutorials/_row.html.erb
index dfda617fe..d1ad8a889 100644
--- a/app/views/tutorials/_row.html.erb
+++ b/app/views/tutorials/_row.html.erb
@@ -1,5 +1,6 @@
 <div class="list-group-item tutorialRow"
-     data-id="<%= tutorial.id.to_i %>">
+     data-id="<%= tutorial.id.to_i %>"
+     data-cy="tutorial-row">
   <div class="row">
     <div class="col-4">
       <%= tutorial.title %>
diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index ef0857459..346933198 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -1,10 +1,11 @@
 import FactoryBot from "../support/factorybot";
 
 function createRedemptionScenario(context) {
+  cy.createUser("teacher").as("teacher");
   cy.createUserAndLogin("generic").as("user");
 
   cy.then(() => {
-    FactoryBot.create("lecture").as("lecture");
+    FactoryBot.create("lecture", { teacher_id: context.teacher.id }).as("lecture");
   });
 
   cy.then(() => {
@@ -23,7 +24,7 @@ function submitVoucher(voucher) {
   cy.getBySelector("verify-voucher-submit").click();
 }
 
-function verifyVoucherRedemption() {
+function verifyVoucherRedemptionText() {
   cy.getBySelector("redeem-voucher-text").should("be.visible");
 }
 
@@ -44,6 +45,77 @@ function redeemVoucherToBecomeTutor(context) {
   });
 }
 
+function createTutorials(context) {
+  FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial1");
+  FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial2");
+  FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial3");
+}
+
+function selectTutorialsAndSubmit(tutorialIds) {
+  const tutorialIdsAsStrings = tutorialIds.map(id => id.toString());
+
+  cy.getBySelector("claim-select").should("be.visible");
+  cy.getBySelector("claim-select").select(tutorialIdsAsStrings, { force: true });
+  cy.getBySelector("claim-submit").click();
+  console.log(tutorialIds);
+  cy.getBySelector("flash-notice").should("be.visible");
+}
+
+function verifyTutorialRowsContainTutorName(context, tutorialIds) {
+  cy.getBySelector("tutorial-row").should("have.length", 3).each(($el) => {
+    const dataId = parseInt($el.attr("data-id"), 10);
+    console.log(tutorialIds);
+    console.log(dataId);
+    if (tutorialIds.includes(dataId)) {
+      cy.wrap($el).should("contain", context.user.name_in_tutorials);
+    }
+    else {
+      cy.wrap($el).should("not.contain", context.user.name_in_tutorials);
+    }
+  });
+}
+
+function loginAsTeacherAndVisitLectureEdit(context) {
+  cy.logout();
+  cy.login(context.teacher);
+  cy.visit(`/lectures/${context.lecture.id}/edit`);
+  cy.getBySelector("people-tab-btn").click();
+}
+
+function runTutorialTest(tutorialCount) {
+  it(`allows the user to successfully submit ${tutorialCount} tutorial(s) and become their tutor`, function () {
+    createTutorials(this);
+
+    let tutorialIds;
+
+    cy.then(() => {
+      switch (tutorialCount) {
+        case 1:
+          tutorialIds = [this.tutorial1.id];
+          break;
+        case 2:
+          tutorialIds = [this.tutorial1.id, this.tutorial2.id];
+          break;
+        case 3:
+          tutorialIds = [this.tutorial1.id, this.tutorial2.id, this.tutorial3.id];
+          break;
+        default:
+          throw new Error("Invalid tutorial count");
+      }
+      submitVoucher(this.voucher);
+      selectTutorialsAndSubmit(tutorialIds);
+    });
+
+    cy.then(() => {
+      loginAsTeacherAndVisitLectureEdit(this);
+    });
+
+    cy.then(() => {
+      verifyTutorialRowsContainTutorName(this, tutorialIds);
+    });
+  });
+}
+
 describe("Profile page", () => {
   beforeEach(function () {
     createRedemptionScenario(this);
@@ -54,49 +126,41 @@ describe("Profile page", () => {
     cy.getBySelector("verify-voucher-form").should("be.visible");
   });
 
-  describe("Verify voucher form", () => {
-    describe("for tutor vouchers", () => {
-      it("can submit a valid voucher", function () {
-        submitVoucher(this.voucher);
-        verifyVoucherRedemption();
-      });
-    });
-  });
-
   describe("Tutor voucher redemption", () => {
     describe("if the lecture has no tutorials yet", () => {
-      it("shows a message that there are no tutorials and a redeem voucher button", function () {
+      it("allows redemption of voucher to successfully become tutor", function () {
         submitVoucher(this.voucher);
+        verifyVoucherRedemptionText();
         verifyNoTutorialsYetMessage(this);
-      });
 
-      it("allows redemption of voucher to become tutor", function () {
-        submitVoucher(this.voucher);
         cy.then(() => {
           redeemVoucherToBecomeTutor(this);
         });
+
+        cy.then(() => {
+          loginAsTeacherAndVisitLectureEdit(this);
+        });
+
+        cy.then(() => {
+          cy.getBySelector("tutorial-row").should("not.exist");
+          cy.getBySelector("new-tutorial-btn").should("be.visible").click();
+        });
+
+        cy.then(() => {
+          cy.getBySelector("tutorial-form").should("be.visible");
+          cy.getBySelector("tutor-select").should("be.visible").within(() => {
+            cy.get("option").should("contain", this.user.name_in_tutorials)
+              .and("contain", this.user.email)
+              .and("not.contain", this.user.name);
+          });
+        });
       });
     });
 
     describe("if the lecture has tutorials", () => {
-      it("shows a message after submission that there are tutorials and a select form",
-        function () {
-          FactoryBot.create("tutorial", { lecture_id: this.lecture.id })
-            .as("tutorial1");
-          FactoryBot.create("tutorial", { lecture_id: this.lecture.id })
-            .as("tutorial2");
-
-          cy.then(() => {
-            submitVoucher(this.voucher);
-            cy.getBySelector("claim-select").should("be.visible");
-            cy.getBySelector("claim-select")
-              .select([this.tutorial1.id, this.tutorial2.id], { force: true });
-            cy.getBySelector("claim-submit").click();
-            cy.then(() => {
-              cy.getBySelector("flash-notice").should("be.visible");
-            });
-          });
-        });
+      runTutorialTest(1);
+      runTutorialTest(2);
+      runTutorialTest(3);
     });
   });
 });

From 1f5a9f61aae7cc587b09641500885b31602a7581 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 18:33:47 +0200
Subject: [PATCH 073/191] Parse hashes with integer keys into arrays of strings

---
 app/controllers/cypress/factories_controller.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/cypress/factories_controller.rb b/app/controllers/cypress/factories_controller.rb
index 157e9e331..dc23550f7 100644
--- a/app/controllers/cypress/factories_controller.rb
+++ b/app/controllers/cypress/factories_controller.rb
@@ -35,7 +35,14 @@ def params_to_attributes(params)
             if value.key?("validate")
               should_validate = (value["validate"] != "false")
             else
-              value.transform_keys(&:to_sym)
+              value.transform_keys(&:to_sym).transform_values do |v|
+                if v.is_a?(Hash) && v.keys.all? { |k| k.match?(/^\d+$/) }
+                  # Convert nested arrays to arrays of strings
+                  v.values.map(&:to_s)
+                else
+                  v
+                end
+              end
             end
           elsif value.is_a?(String)
             value.to_sym

From e57e35f6d496d1482235a2868526eeb0401c1bd2 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sat, 24 Aug 2024 18:34:54 +0200
Subject: [PATCH 074/191] Add tests for tutor voucher redemption in the case
 that all tutorials are already taken

---
 .../cypress/e2e/voucher_redemption_spec.cy.js | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index 346933198..7d91b2350 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -51,21 +51,25 @@ function createTutorials(context) {
   FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial3");
 }
 
+function createTutorialsWithTutor(context, tutor) {
+  console.log(tutor.id);
+  FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial1");
+  FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial2");
+  FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial3");
+}
+
 function selectTutorialsAndSubmit(tutorialIds) {
   const tutorialIdsAsStrings = tutorialIds.map(id => id.toString());
 
   cy.getBySelector("claim-select").should("be.visible");
   cy.getBySelector("claim-select").select(tutorialIdsAsStrings, { force: true });
   cy.getBySelector("claim-submit").click();
-  console.log(tutorialIds);
   cy.getBySelector("flash-notice").should("be.visible");
 }
 
 function verifyTutorialRowsContainTutorName(context, tutorialIds) {
   cy.getBySelector("tutorial-row").should("have.length", 3).each(($el) => {
     const dataId = parseInt($el.attr("data-id"), 10);
-    console.log(tutorialIds);
-    console.log(dataId);
     if (tutorialIds.includes(dataId)) {
       cy.wrap($el).should("contain", context.user.name_in_tutorials);
     }
@@ -162,5 +166,15 @@ describe("Profile page", () => {
       runTutorialTest(2);
       runTutorialTest(3);
     });
+
+    describe("if the lecture has tutorials and the user is already a tutor for all of them", () => {
+      it("displays a message that the user is already a tutor for all tutorials", function () {
+        createTutorialsWithTutor(this, this.user);
+
+        cy.then(() => {
+          submitVoucher(this.voucher);
+        });
+      });
+    });
   });
 });

From 9ccf03f991fbc3f970d1a573b4583653d55b3454 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:09:35 +0200
Subject: [PATCH 075/191] Add possibility to pass instance methods and refactor

---
 .../cypress/factories_controller.rb           | 78 ++++++++++++++-----
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/app/controllers/cypress/factories_controller.rb b/app/controllers/cypress/factories_controller.rb
index dc23550f7..4c1f7b922 100644
--- a/app/controllers/cypress/factories_controller.rb
+++ b/app/controllers/cypress/factories_controller.rb
@@ -7,26 +7,34 @@ module Cypress
   class FactoriesController < CypressController
     # Wrapper around FactoryBot.create to create a factory via a POST request.
     def create
-      unless params["0"].is_a?(String)
-        msg = "First argument must be a string indicating the factory name."
-        msg += " But we got: '#{params["0"]}'"
-        raise(ArgumentError, msg)
-      end
+      validate_factory_name(params["0"])
 
       attributes, should_validate = params_to_attributes(params.except(:controller, :action,
                                                                        :number))
 
-      res = if should_validate
-        FactoryBot.create(*attributes) # default case
-      else
-        FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) }
-      end
+      # Partition the attributes into valid attributes and instance methods
+      attributes, instance_methods = partition_attributes(attributes)
 
-      render json: res.to_json, status: :created
+      # Extract the values from the instance_methods hashes
+      instance_methods = extract_instance_methods(instance_methods)
+
+      res = create_or_build_factory(attributes, should_validate)
+
+      instance_methods_results = evaluate_instance_methods(res, instance_methods)
+
+      render json: res.as_json.merge(instance_methods_results), status: :created
     end
 
     private
 
+      def validate_factory_name(factory_name)
+        return if factory_name.is_a?(String)
+
+        msg = "First argument must be a string indicating the factory name."
+        msg += " But we got: '#{factory_name}'"
+        raise(ArgumentError, msg)
+      end
+
       def params_to_attributes(params)
         should_validate = true
 
@@ -35,14 +43,7 @@ def params_to_attributes(params)
             if value.key?("validate")
               should_validate = (value["validate"] != "false")
             else
-              value.transform_keys(&:to_sym).transform_values do |v|
-                if v.is_a?(Hash) && v.keys.all? { |k| k.match?(/^\d+$/) }
-                  # Convert nested arrays to arrays of strings
-                  v.values.map(&:to_s)
-                else
-                  v
-                end
-              end
+              transform_hash(value)
             end
           elsif value.is_a?(String)
             value.to_sym
@@ -53,5 +54,44 @@ def params_to_attributes(params)
 
         return attributes, should_validate
       end
+
+      def transform_hash(value)
+        value.transform_keys(&:to_sym).transform_values do |v|
+          if v.is_a?(Hash) && v.keys.all? { |k| k.match?(/^\d+$/) }
+            # Convert nested arrays to arrays of strings
+            v.values.map(&:to_s)
+          else
+            v
+          end
+        end
+      end
+
+      def partition_attributes(attributes)
+        attributes.partition do |attr|
+          !(attr.is_a?(Hash) && attr.keys == ["instance_methods"])
+        end
+      end
+
+      def extract_instance_methods(instance_methods)
+        instance_methods.flat_map { |hash| hash["instance_methods"] }
+      end
+
+      def create_or_build_factory(attributes, should_validate)
+        if should_validate
+          FactoryBot.create(*attributes) # default case
+        else
+          FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) }
+        end
+      end
+
+      def evaluate_instance_methods(instance, methods)
+        methods.index_with do |method_name|
+          if instance.respond_to?(method_name)
+            instance.send(method_name)
+          else
+            throw("Method not found: #{method_name}")
+          end
+        end
+      end
   end
 end

From f6a2d1f58b036e4cb815bbb3d75ec15377b461d7 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:10:25 +0200
Subject: [PATCH 076/191] Update documentation

---
 spec/cypress/support/factorybot.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/cypress/support/factorybot.js b/spec/cypress/support/factorybot.js
index 973ffacd0..1a030ee91 100644
--- a/spec/cypress/support/factorybot.js
+++ b/spec/cypress/support/factorybot.js
@@ -9,10 +9,13 @@ class FactoryBot {
    * @param args The arguments to pass to FactoryBot.create(), e.g.
    * factory name, traits, and attributes. Pass them in as separated
    * string arguments. Attributes should be passed as an object.
-   * @returns The FactoryBot.create() response
+   * You can also pass instance methods as an array of strings.
+   * @returns The FactoryBot.create() response. If you added instance methods,
+   * the response will be enriched by the results of the instance methods.
    *
-   * @example
+   * @examples
    * FactoryBot.create("factory_name", "with_trait", { another_attribute: ".pdf"})
+   * FactoryBot.create("factory_name", { instance_methods: ["method_name"] })
    */
   create(...args) {
     return BackendCaller.callCypressRoute("factories", "FactoryBot.create()", args);

From c5c125c9f1a5e253bc1aded7fb0546d16b912544 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 25 Aug 2024 13:11:06 +0200
Subject: [PATCH 077/191] Add tests for voucher redemption that check
 notifications

---
 .../notifications/_notification.html.erb      |  6 +-
 .../shared/_dropdown_notifications.html.erb   |  5 +-
 .../cypress/e2e/voucher_redemption_spec.cy.js | 91 ++++++++++---------
 3 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb
index 7a668aab3..53f53c784 100644
--- a/app/views/notifications/_notification.html.erb
+++ b/app/views/notifications/_notification.html.erb
@@ -1,5 +1,5 @@
-<div class="card <%= notification_color(notification) %>">
-  <div class="card-header">
+<div class="card <%= notification_color(notification) %>" data-cy="notification-card">
+  <div class="card-header" data-cy="notification-header">
     <div class="row">
       <div class="col-6">
         <h5>
@@ -26,7 +26,7 @@
       </div>
     </div>
   </div>
-  <div class="card-body">
+  <div class="card-body" data-cy="notification-body">
     <%= simple_format(notification_text(notification)) %>
     <%= simple_format(notification_link(notification)) %>
   </div>
diff --git a/app/views/shared/_dropdown_notifications.html.erb b/app/views/shared/_dropdown_notifications.html.erb
index 5405d3bc0..55c939d3a 100644
--- a/app/views/shared/_dropdown_notifications.html.erb
+++ b/app/views/shared/_dropdown_notifications.html.erb
@@ -10,7 +10,8 @@
           <i class="far fa-bell text-light">
           </i>
           <span class="badge text-dark lecture-tag notificationCounter"
-                data-count="<%= relevant_notifications.count %>">
+                data-count="<%= relevant_notifications.count %>"
+                data-cy="notification-dropdown-counter"">
             <%= relevant_notifications.count %>
           </span>
         </a>
@@ -22,7 +23,7 @@
             <%= t('buttons.toggle') %>
           </span>
         </button>
-        <div class="dropdown-menu">
+        <div class="dropdown-menu" data-cy="notification-dropdown-menu">
           <% relevant_notifications.first(5).each do |n| %>
             <a href="<%= n.path(current_user) %>"
                class="dropdown-item border-top"
diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index 7d91b2350..151412b05 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -5,7 +5,9 @@ function createRedemptionScenario(context) {
   cy.createUserAndLogin("generic").as("user");
 
   cy.then(() => {
-    FactoryBot.create("lecture", { teacher_id: context.teacher.id }).as("lecture");
+    FactoryBot.create("lecture",
+      { teacher_id: context.teacher.id },
+      { instance_methods: ["title_for_viewers"] }).as("lecture");
   });
 
   cy.then(() => {
@@ -86,36 +88,15 @@ function loginAsTeacherAndVisitLectureEdit(context) {
   cy.getBySelector("people-tab-btn").click();
 }
 
-function runTutorialTest(tutorialCount) {
-  it(`allows the user to successfully submit ${tutorialCount} tutorial(s) and become their tutor`, function () {
-    createTutorials(this);
-
-    let tutorialIds;
-
-    cy.then(() => {
-      switch (tutorialCount) {
-        case 1:
-          tutorialIds = [this.tutorial1.id];
-          break;
-        case 2:
-          tutorialIds = [this.tutorial1.id, this.tutorial2.id];
-          break;
-        case 3:
-          tutorialIds = [this.tutorial1.id, this.tutorial2.id, this.tutorial3.id];
-          break;
-        default:
-          throw new Error("Invalid tutorial count");
-      }
-      submitVoucher(this.voucher);
-      selectTutorialsAndSubmit(tutorialIds);
-    });
-
-    cy.then(() => {
-      loginAsTeacherAndVisitLectureEdit(this);
-    });
-
-    cy.then(() => {
-      verifyTutorialRowsContainTutorName(this, tutorialIds);
+function verifyNoTutorialsButUserEligibleAsTutor(context) {
+  cy.getBySelector("tutorial-row").should("not.exist");
+  cy.getBySelector("new-tutorial-btn").should("be.visible").click();
+  cy.then(() => {
+    cy.getBySelector("tutorial-form").should("be.visible");
+    cy.getBySelector("tutor-select").should("be.visible").within(() => {
+      cy.get("option").should("contain", context.user.name_in_tutorials)
+        .and("contain", context.user.email)
+        .and("not.contain", context.user.name);
     });
   });
 }
@@ -146,25 +127,51 @@ describe("Profile page", () => {
         });
 
         cy.then(() => {
-          cy.getBySelector("tutorial-row").should("not.exist");
-          cy.getBySelector("new-tutorial-btn").should("be.visible").click();
+          verifyNoTutorialsButUserEligibleAsTutor(this);
         });
 
+        cy.i18n("basics.tutor").as("tutorMessage");
+        cy.i18n("notifications.redemption").as("redemptionMessage");
+        cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
         cy.then(() => {
-          cy.getBySelector("tutorial-form").should("be.visible");
-          cy.getBySelector("tutor-select").should("be.visible").within(() => {
-            cy.get("option").should("contain", this.user.name_in_tutorials)
-              .and("contain", this.user.email)
-              .and("not.contain", this.user.name);
-          });
+          cy.visit("/main/start");
+          cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+          cy.getBySelector("notification-dropdown-menu").should("contain", this.tutorMessage)
+            .and("contain", this.user.name_in_tutorials);
+          cy.visit("/notifications");
+          cy.getBySelector("notification-card").should("have.length", 1);
+          console.log("hi");
+          console.log(this.lecture);
+          cy.getBySelector("notification-header").should("contain", this.lecture.title_for_viewers);
+          cy.getBySelector("notification-body").should("contain", this.redemptionMessage)
+            .and("contain", this.user.name_in_tutorials).and("contain", this.noTutorialsTaken);
         });
       });
     });
 
     describe("if the lecture has tutorials", () => {
-      runTutorialTest(1);
-      runTutorialTest(2);
-      runTutorialTest(3);
+      it("allows the user to successfully submit tutorials and become their tutor", function () {
+        let tutorialIds;
+
+        createTutorials(this);
+
+        cy.then(() => {
+          tutorialIds = [this.tutorial1.id, this.tutorial2.id];
+        });
+
+        cy.then(() => {
+          submitVoucher(this.voucher);
+          selectTutorialsAndSubmit(tutorialIds);
+        });
+
+        cy.then(() => {
+          loginAsTeacherAndVisitLectureEdit(this);
+        });
+
+        cy.then(() => {
+          verifyTutorialRowsContainTutorName(this, tutorialIds);
+        });
+      });
     });
 
     describe("if the lecture has tutorials and the user is already a tutor for all of them", () => {

From a1736555cb1427a7fa5145a10306257ffce3f679 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:42:59 +0200
Subject: [PATCH 078/191] Add missing speaker voucher case

---
 app/controllers/vouchers_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 35af2c22b..87809ee5c 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -91,6 +91,8 @@ def success_message(voucher)
         I18n.t("controllers.become_editor_success")
       elsif voucher.teacher?
         I18n.t("controllers.become_teacher_success")
+      elsif voucher.speaker?
+        I18n.t("controllers.become_speaker_success")
       end
     end
 

From 05f99598336ebf7303f7b2f68fb9730fe7d1e175 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:43:40 +0200
Subject: [PATCH 079/191] Add missing locales

---
 config/locales/de.yml | 1 +
 config/locales/en.yml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 627463cc7..90b0e081b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3862,6 +3862,7 @@ de:
     become_tutor_success: 'Dein Tutorenstatus wurde geupdatet.'
     become_editor_success: 'Dein Editorenstatus wurde geupdatet.'
     become_teacher_success: 'Dein DozentInnenstatus wurde geupdatet.'
+    become_speaker_success: 'Dein Vortragendenstatus wurde geupdatet.'
     tutorials:
       destruction_failed: >
         Das Tutorium konnte nicht gelöscht werden. Das kann z.B. daran liegen,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 020c0f1ed..9aecbbf4a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3654,6 +3654,8 @@ en:
       Your editor status has been updated.
     become_teacher_success: >
       Your teacher status has been updated.
+    become_speaker_success: >
+      Your speaker status has been updated.
     tutorials:
       destruction_failed: >
         The tutorial could not be deleted. That may be because there are already

From 13e0386b8c98bbd693db557545073a6a5ba93810 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Sun, 25 Aug 2024 20:44:10 +0200
Subject: [PATCH 080/191] Add cypress tests fo editor vouchers, teacher
 vouchers and speaker vouchers

---
 app/helpers/talks_helper.rb                   |   4 +-
 app/helpers/vouchers_helper.rb                |   3 +-
 app/views/lectures/edit/_people.html.erb      |  11 +-
 .../lectures/edit/_seminar_content.html.erb   |   5 +-
 app/views/main/start.html.erb                 |   9 +-
 .../shared/_dropdown_notifications.html.erb   |   3 +-
 app/views/talks/_card.html.erb                |   3 +-
 app/views/talks/_new.html.erb                 |   2 +-
 .../vouchers/_redeem_editor_voucher.html.erb  |   4 +-
 .../vouchers/_redeem_speaker_voucher.html.erb |  48 +-
 .../vouchers/_redeem_teacher_voucher.html.erb |   2 +-
 .../cypress/e2e/voucher_redemption_spec.cy.js | 611 ++++++++++++++++--
 12 files changed, 613 insertions(+), 92 deletions(-)

diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb
index 857d9f865..2f87df9d4 100644
--- a/app/helpers/talks_helper.rb
+++ b/app/helpers/talks_helper.rb
@@ -55,7 +55,9 @@ def speaker_select(form, talk)
                          class: "form-label")
       help_desk = helpdesk(t("admin.talk.info.speakers"), false)
       select = form.select(:speaker_ids, speakers_preselection(talk), {},
-                           class: "selectize", multiple: true)
+                           class: "selectize",
+                           data: { cy: "speaker-select" },
+                           multiple: true)
 
       label + help_desk + select
     end
diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index f81e23a09..47dcef084 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -30,7 +30,8 @@ def redeem_voucher_button(voucher)
 
   def cancel_voucher_button
     link_to(t("buttons.cancel"), cancel_voucher_path,
-            class: "btn btn-secondary ms-2", remote: true)
+            class: "btn btn-secondary ms-2", data: { cy: "cancel-voucher-btn" },
+            remote: true)
   end
 
   def claim_select_field(form, user, voucher)
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index f4a4c7080..ef89cea0a 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -9,7 +9,7 @@
             <%= f.label :teacher_id,
                         t('basics.teacher'),
                         class: "form-label" %>
-            <%= helpdesk(t('admin.lecture.info.teacher'), false) %>          
+            <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
             <%= f.select :teacher_id,
                          options_for_select([[lecture.teacher.info,
                          lecture.teacher.id]],
@@ -25,15 +25,15 @@
                                    t('basics.no_results') } } %>
             <div class="invalid-feedback" id="lecture-teacher-error">
             </div>
-          </div>                                   
+          </div>
         <% else %>
           <p>
           <%= t('basics.teacher') %>
           <%= helpdesk(t('admin.lecture.info.teacher_fixed'), false) %>
           </p>
-          <p>
+          <p data-cy="teacher-info">
             <%= lecture.teacher.info %>
-          </p>  
+          </p>
         <% end %>
       </div>
       <div class="col-6 mb-3">
@@ -46,7 +46,8 @@
                        editors_preselection(lecture),
                        {},
                        { multiple: true,
-                         class: 'selectize' } %>
+                         class: 'selectize',
+                         data: { cy: 'lecture-editors-select'} } %>
         </div>
       </div>
     </div>
diff --git a/app/views/lectures/edit/_seminar_content.html.erb b/app/views/lectures/edit/_seminar_content.html.erb
index b7b74ead1..64675bcfd 100644
--- a/app/views/lectures/edit/_seminar_content.html.erb
+++ b/app/views/lectures/edit/_seminar_content.html.erb
@@ -16,6 +16,7 @@
                     new_talk_path(lecture_id: lecture.id),
                     remote: true,
                     class: 'btn btn-sm btn-secondary new-in-lecture',
+                    data: { cy: 'new-talk-btn' },
                     id: 'new_talk_button' %>
       </div>
     </div>
@@ -29,7 +30,9 @@
         <% end %>
       </div>
     <% else %>
-      <%= t('admin.lecture.no_talks') %>
+      <span data-cy="no-talks-yet">
+        <%= t('admin.lecture.no_talks') %>
+      </span>
     <% end %>
   </div>
 </div>
diff --git a/app/views/main/start.html.erb b/app/views/main/start.html.erb
index 8d16e8ab9..ae4cbc1bd 100644
--- a/app/views/main/start.html.erb
+++ b/app/views/main/start.html.erb
@@ -63,7 +63,8 @@
          data-bs-parent="#subscriptionsAccordion" data-link="#inactiveLecturesLink">
       <div class="accordion-body">
         <div class="row row-cols-1 row-cols-xs-2 row-cols-md-3 row-cols-lg-3 row-cols-xl-4 row-cols-xxl-6"
-             id="collapseInactiveLecturesContent">
+             id="collapseInactiveLecturesContent"
+             data-cy="subscribed-inactive-lectures-collapse">
           <% if @current_stuff.empty? %>
             <%= render partial: 'main/start/lecture',
                        collection: @inactive_lectures,
@@ -117,7 +118,8 @@
               data-bs-toggle="collapse"
               data-bs-target="#collapseTalks"
               aria-expanded="false"
-              aria-controls="collapseTalks">
+              aria-controls="collapseTalks"
+              data-cy="my-talks-collapse-btn">
         <h4 class="text-dark"
             id="talkLink">
           <%= t('profile.my_talks') %>
@@ -126,7 +128,8 @@
     </div>
     <div class="collapse subscriptionsCollapse" id="collapseTalks"
          data-bs-parent="#subscriptionsAccordion"
-         data-link="#talkLink">
+         data-link="#talkLink"
+         data-cy="my-talks-collapse">
       <div class="accordion-body">
         <%= render partial: 'main/start/talks',
                    locals: { talks: @talks } %>
diff --git a/app/views/shared/_dropdown_notifications.html.erb b/app/views/shared/_dropdown_notifications.html.erb
index 55c939d3a..1db2a2490 100644
--- a/app/views/shared/_dropdown_notifications.html.erb
+++ b/app/views/shared/_dropdown_notifications.html.erb
@@ -2,7 +2,8 @@
                                         .sort_by(&:created_at).reverse %>
 <% if relevant_notifications.present? %>
   <ul class="navbar-nav"
-      id="notificationDropdown">
+      id="notificationDropdown"
+      data-cy="notification-dropdown">
     <li class="nav-item">
       <div class="btn-group">
         <a class="btn btn-primary btn-sm"
diff --git a/app/views/talks/_card.html.erb b/app/views/talks/_card.html.erb
index 0b440f561..e74dcfad9 100644
--- a/app/views/talks/_card.html.erb
+++ b/app/views/talks/_card.html.erb
@@ -1,7 +1,8 @@
 <div class="col-sm-12 col-lg-6 p-2" >
   <div class="card bg-mdb-color-lighten-5 %>">
     <div id="<%= dom_id(talk) %>"
-        class="card-header <%= talk_card_color(talk, current_user) %>">
+         class="card-header <%= talk_card_color(talk, current_user) %>"
+         data-cy="talk-header" data-id="<%= talk.id %>">
       <div class="row">
         <div class="col-12 talkheader">
           <div>
diff --git a/app/views/talks/_new.html.erb b/app/views/talks/_new.html.erb
index f53ef2515..6b97e9447 100644
--- a/app/views/talks/_new.html.erb
+++ b/app/views/talks/_new.html.erb
@@ -1,4 +1,4 @@
-<%= form_with model: talk do |f| %>
+<%= form_with model: talk, html: { data: { cy: 'talk-form' } } do |f| %>
   <div class="row">
     <div class="col-12 mb-3">
       <%= f.label :title, t('basics.title'),
diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index 3df3bb9ad..bcd38ba9e 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -1,4 +1,6 @@
-<%= t('profile.become_editor', lecture: voucher.lecture.title) %>
+<span data-cy="redeem-voucher-text">
+  <%= t('profile.become_editor', lecture: voucher.lecture.title) %>
+</span>
 
 <% if current_user == voucher.lecture.teacher %>
   <%= t('profile.teacher_cant_become_editor') %>
diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb
index 537a264c8..05c364dfe 100644
--- a/app/views/vouchers/_redeem_speaker_voucher.html.erb
+++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb
@@ -1,36 +1,36 @@
-<p>
-    <%= t('profile.become_speaker', seminar: voucher.lecture.title) %>
+<p data-cy="redeem-voucher-text">
+  <%= t('profile.become_speaker', seminar: voucher.lecture.title) %>
 
-    <% if current_user.in?(voucher.lecture.speakers) %>
-      <%= t('profile.already_speaker',
-            talks: talks_with_titles(current_user, voucher)) %>
-    <% end %>
-  </p>
+  <% if current_user.in?(voucher.lecture.speakers) %>
+    <%= t('profile.already_speaker',
+          talks: talks_with_titles(current_user, voucher)) %>
+  <% end %>
+</p>
 
-  <% if voucher.lecture.talks_without_speaker(current_user).any? %>
+<% if voucher.lecture.talks_without_speaker(current_user).any? %>
 
-    <%= render partial: "vouchers/voucher_form", locals: { voucher: voucher } %>
+  <%= render partial: "vouchers/voucher_form", locals: { voucher: voucher } %>
 
-  <% elsif voucher.lecture.talks.any? %>
+<% elsif voucher.lecture.talks.any? %>
 
-      <%= t('profile.all_talks_taken') %>
-      <%= cancel_voucher_button %>
+    <%= t('profile.all_talks_taken') %>
+    <%= cancel_voucher_button %>
 
-  <% else %>
+<% else %>
 
-    <%= t('profile.no_talks_yet') %>
+  <%= t('profile.no_talks_yet') %>
 
-    <% if current_user.in?(voucher.lecture.speakers_by_redemption) %>
+  <% if current_user.in?(voucher.lecture.speakers_by_redemption) %>
 
-        <%= t('profile.already_speaker_by_redemption') %>
-        <%= cancel_voucher_button %>
+    <%= t('profile.already_speaker_by_redemption') %>
+    <%= cancel_voucher_button %>
 
-    <% else %>
+  <% else %>
 
-      <p class="mt-4">
-        <%= redeem_voucher_button(voucher) %>
-        <%= cancel_voucher_button %>
-      </p>
+    <p class="mt-4">
+      <%= redeem_voucher_button(voucher) %>
+      <%= cancel_voucher_button %>
+    </p>
 
-    <% end %>
-  <% end %>
\ No newline at end of file
+  <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/vouchers/_redeem_teacher_voucher.html.erb b/app/views/vouchers/_redeem_teacher_voucher.html.erb
index 656eb12b9..0fd7b6516 100644
--- a/app/views/vouchers/_redeem_teacher_voucher.html.erb
+++ b/app/views/vouchers/_redeem_teacher_voucher.html.erb
@@ -1,4 +1,4 @@
-<p>
+<p data-cy="redeem-voucher-text">
   <%= t('profile.become_teacher', lecture: voucher.lecture.title) %>
 </p>
 
diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index 151412b05..30c79a75d 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -1,17 +1,17 @@
 import FactoryBot from "../support/factorybot";
 
-function createRedemptionScenario(context) {
+function createRedemptionScenario(context, role = "tutor", sort = "lecture") {
   cy.createUser("teacher").as("teacher");
   cy.createUserAndLogin("generic").as("user");
 
   cy.then(() => {
     FactoryBot.create("lecture",
-      { teacher_id: context.teacher.id },
-      { instance_methods: ["title_for_viewers"] }).as("lecture");
+      { teacher_id: context.teacher.id, sort: sort, released: "all" },
+      { instance_methods: ["title_no_term", "title_for_viewers"] }).as("lecture");
   });
 
   cy.then(() => {
-    FactoryBot.create("voucher", { lecture_id: context.lecture.id }).as("voucher");
+    FactoryBot.create("voucher", { lecture_id: context.lecture.id, role: role }).as("voucher");
   });
 
   cy.then(() => {
@@ -39,11 +39,20 @@ function verifyNoTutorialsYetMessage(context) {
   });
 }
 
+function verifyAlreadyRedeemedTutorVoucherMessage(context) {
+  cy.i18n("profile.already_tutor_by_redemption").as("alreadyRedeemedTutorVoucher");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.alreadyRedeemedTutorVoucher);
+  });
+}
+
 function redeemVoucherToBecomeTutor(context) {
-  cy.i18n("controllers.become_tutor_success").as("become_tutor_success");
+  cy.i18n("controllers.become_tutor_success").as("becomeTutorSuccess");
   cy.getBySelector("redeem-voucher-btn").click();
   cy.then(() => {
-    cy.getBySelector("flash-notice").should("be.visible").and("contain", context.become_tutor_success);
+    cy.getBySelector("flash-notice").should("be.visible")
+      .and("contain", context.becomeTutorSuccess);
   });
 }
 
@@ -54,7 +63,6 @@ function createTutorials(context) {
 }
 
 function createTutorialsWithTutor(context, tutor) {
-  console.log(tutor.id);
   FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial1");
   FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial2");
   FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial3");
@@ -69,7 +77,7 @@ function selectTutorialsAndSubmit(tutorialIds) {
   cy.getBySelector("flash-notice").should("be.visible");
 }
 
-function verifyTutorialRowsContainTutorName(context, tutorialIds) {
+function verifyTutorialsContainTutorName(context, tutorialIds) {
   cy.getBySelector("tutorial-row").should("have.length", 3).each(($el) => {
     const dataId = parseInt($el.attr("data-id"), 10);
     if (tutorialIds.includes(dataId)) {
@@ -81,9 +89,12 @@ function verifyTutorialRowsContainTutorName(context, tutorialIds) {
   });
 }
 
-function loginAsTeacherAndVisitLectureEdit(context) {
+function loginAsTeacher(context) {
   cy.logout();
   cy.login(context.teacher);
+}
+
+function visitLectureEdit(context) {
   cy.visit(`/lectures/${context.lecture.id}/edit`);
   cy.getBySelector("people-tab-btn").click();
 }
@@ -93,7 +104,7 @@ function verifyNoTutorialsButUserEligibleAsTutor(context) {
   cy.getBySelector("new-tutorial-btn").should("be.visible").click();
   cy.then(() => {
     cy.getBySelector("tutorial-form").should("be.visible");
-    cy.getBySelector("tutor-select").should("be.visible").within(() => {
+    cy.getBySelector("tutor-select").within(() => {
       cy.get("option").should("contain", context.user.name_in_tutorials)
         .and("contain", context.user.email)
         .and("not.contain", context.user.name);
@@ -101,86 +112,582 @@ function verifyNoTutorialsButUserEligibleAsTutor(context) {
   });
 }
 
-describe("Profile page", () => {
+function verifyLectureIsSubscribed(context) {
+  cy.visit("/main/start");
+  cy.getBySelector("subscribed-inactive-lectures-collapse").should("contain", context.lecture.title_no_term);
+}
+
+function verifyTutorNotification(context) {
+  cy.i18n("basics.tutor").as("tutorMessage");
+  cy.i18n("notifications.redemption").as("redemptionMessage");
+
+  cy.then(() => {
+    cy.visit("/main/start");
+    cy.getBySelector("notification-dropdown").should("be.visible");
+    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+    cy.getBySelector("notification-dropdown-menu").should("contain", context.tutorMessage)
+      .and("contain", context.user.name_in_tutorials);
+    cy.visit("/notifications");
+    cy.getBySelector("notification-card").should("have.length", 1);
+    cy.getBySelector("notification-header").should("contain", context.lecture.title_for_viewers);
+    cy.getBySelector("notification-body").should("contain", context.redemptionMessage)
+      .and("contain", context.user.name_in_tutorials).and("contain", context.user.email);
+  });
+}
+
+function verifyAllTutorialsTakenMessage(context) {
+  cy.i18n("profile.all_tutorials_taken").as("all_tutorials_taken");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.all_tutorials_taken)
+      .and("contain", context.tutorial1.title).and("contain", context.tutorial2.title)
+      .and("contain", context.tutorial3.title);
+  });
+}
+
+function verifyCancelVoucherButton() {
+  cy.getBySelector("cancel-voucher-btn").should("be.visible");
+  cy.getBySelector("cancel-voucher-btn").click();
+  cy.then(() => {
+    cy.getBySelector("verify-voucher-form").should("be.visible");
+  });
+}
+
+function verifyNoNotification() {
+  cy.visit("/main/start");
+  cy.getBySelector("notification-dropdown").should("not.exist");
+}
+
+function redeemVoucherToBecomeEditor(context) {
+  cy.i18n("controllers.become_editor_success").as("becomeEditorSuccess");
+  cy.getBySelector("redeem-voucher-btn").click();
+  cy.then(() => {
+    cy.getBySelector("flash-notice").should("be.visible")
+      .and("contain", context.becomeEditorSuccess);
+  });
+}
+
+function verifyEditorNotification(context) {
+  cy.i18n("basics.editor").as("editorMessage");
+  cy.i18n("notifications.redemption").as("redemptionMessage");
+
+  cy.then(() => {
+    cy.visit("/main/start");
+    cy.getBySelector("notification-dropdown").should("be.visible");
+    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+    cy.getBySelector("notification-dropdown-menu").should("contain", context.editorMessage)
+      .and("contain", context.user.name_in_tutorials);
+    cy.visit("/notifications");
+    cy.getBySelector("notification-card").should("have.length", 1);
+    cy.getBySelector("notification-header").should("contain", context.lecture.title_for_viewers);
+    cy.getBySelector("notification-body").should("contain", context.redemptionMessage)
+      .and("contain", context.user.name_in_tutorials).and("contain", context.user.email);
+  });
+}
+
+function verifyAlreadyRedeemedEditorVoucherMessage(context) {
+  cy.i18n("profile.already_editor_by_redemption").as("alreadyRedeemedEditorVoucher");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.alreadyRedeemedEditorVoucher);
+  });
+}
+
+function verifyNoNewNotification() {
+  cy.visit("/main/start");
+  cy.getBySelector("notification-dropdown").should("be.visible");
+  cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+}
+
+function verifyTeachersCantBecomeEditorsMessage(context) {
+  cy.i18n("profile.teacher_cant_become_editor").as("teacherCantBecomeEditor");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.teacherCantBecomeEditor);
+  });
+}
+
+function redeemVoucherToBecomeTeacher(context) {
+  cy.i18n("controllers.become_teacher_success").as("becomeTeacherSuccess");
+  cy.getBySelector("redeem-voucher-btn").click();
+  cy.then(() => {
+    cy.getBySelector("flash-notice").should("be.visible")
+      .and("contain", context.becomeTeacherSuccess);
+  });
+}
+
+function verifyUserIsTeacher(context) {
+  cy.getBySelector("teacher-info").should("contain", context.user.name_in_tutorials)
+    .and("contain", context.user.email)
+    .and("not.contain", context.user.name);
+};
+
+function verifyPreviousTeacherIsEditor(context) {
+  cy.getBySelector("lecture-editors-select").within(() => {
+    cy.get("option").should("contain", context.teacher.name_in_tutorials)
+      .and("contain", context.teacher.email)
+      .and("not.contain", context.teacher.name);
+  });
+}
+
+function verifyAlreadyTeacherMessage(context) {
+  cy.i18n("profile.already_teacher").as("alreadyTeacher");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.alreadyTeacher);
+  });
+}
+
+function verifyNoTalksYetMessage(context) {
+  cy.i18n("profile.no_talks_yet").as("noTalksYet");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.noTalksYet);
+    cy.getBySelector("redeem-voucher-btn").should("be.visible");
+  });
+}
+
+function redeemVoucherToBecomeSpeaker(context) {
+  cy.i18n("controllers.become_speaker_success").as("becomeSpeakerSuccess");
+  cy.getBySelector("redeem-voucher-btn").click();
+  cy.then(() => {
+    cy.getBySelector("flash-notice").should("be.visible")
+      .and("contain", context.becomeSpeakerSuccess);
+  });
+}
+
+function visitLectureContentEdit(context) {
+  cy.visit(`/lectures/${context.lecture.id}/edit`);
+}
+
+function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
+  cy.i18n("admin.lecture.no_talks").as("noTalksYet");
+  cy.then(() => {
+    cy.getBySelector("no-talks-yet").should("contain", context.noTalksYet);
+    cy.getBySelector("new-talk-btn").should("be.visible");
+    cy.getBySelector("new-talk-btn").click();
+  });
+
+  cy.then(() => {
+    cy.getBySelector("talk-form").should("be.visible");
+    cy.getBySelector("speaker-select").within(() => {
+      cy.get("option").should("contain", context.user.name_in_tutorials)
+        .and("contain", context.user.email)
+        .and("not.contain", context.user.name);
+    });
+  });
+}
+
+function verifySpeakerNotification(context) {
+  cy.i18n("basics.speaker").as("speakerMessage");
+  cy.i18n("notifications.redemption").as("redemptionMessage");
+
+  cy.then(() => {
+    cy.visit("/main/start");
+    cy.getBySelector("notification-dropdown").should("be.visible");
+    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+    cy.getBySelector("notification-dropdown-menu").should("contain", context.speakerMessage)
+      .and("contain", context.user.name_in_tutorials);
+    cy.visit("/notifications");
+    cy.getBySelector("notification-card").should("have.length", 1);
+    cy.getBySelector("notification-header").should("contain", context.lecture.title_for_viewers);
+    cy.getBySelector("notification-body").should("contain", context.redemptionMessage)
+      .and("contain", context.user.name_in_tutorials).and("contain", context.user.email);
+  });
+}
+
+function verifyAlreadyRedeemedSpeakerVoucherMessage(context) {
+  cy.i18n("profile.already_speaker_by_redemption").as("alreadyRedeemedSpeakerVoucher");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card")
+      .should("contain", context.alreadyRedeemedSpeakerVoucher);
+  });
+}
+
+function createTalks(context) {
+  FactoryBot.create("talk", { lecture_id: context.lecture.id }).as("talk1");
+  FactoryBot.create("talk", { lecture_id: context.lecture.id }).as("talk2");
+  FactoryBot.create("talk", { lecture_id: context.lecture.id }).as("talk3");
+}
+
+function createTalksWithSpeaker(context) {
+  FactoryBot.create("talk", { lecture_id: context.lecture.id, speaker_ids: [context.user.id] })
+    .as("talk1");
+  FactoryBot.create("talk", { lecture_id: context.lecture.id, speaker_ids: [context.user.id] })
+    .as("talk2");
+  FactoryBot.create("talk", { lecture_id: context.lecture.id, speaker_ids: [context.user.id] })
+    .as("talk3");
+}
+
+function selectTalksAndSubmit(talkIds) {
+  const talkIdsAsStrings = talkIds.map(id => id.toString());
+
+  cy.getBySelector("claim-select").should("be.visible");
+  cy.getBySelector("claim-select").select(talkIdsAsStrings, { force: true });
+  cy.getBySelector("claim-submit").click();
+  cy.getBySelector("flash-notice").should("be.visible");
+}
+
+function verifyTalksContainSpeakerName(context, talkIds) {
+  cy.getBySelector("talk-header").should("have.length", 3).each(($el) => {
+    const dataId = parseInt($el.attr("data-id"), 10);
+    if (talkIds.includes(dataId)) {
+      cy.wrap($el).should("contain", context.user.name_in_tutorials);
+    }
+    else {
+      cy.wrap($el).should("not.contain", context.user.name_in_tutorials);
+    }
+  });
+}
+
+function verifyAllTalksTakenMessage(context) {
+  cy.i18n("profile.all_talks_taken").as("allTalksTaken");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.allTalksTaken)
+      .and("contain", context.talk1.title).and("contain", context.talk2.title)
+      .and("contain", context.talk3.title);
+  });
+}
+
+function verifyTalksAreListedInMyTalks(context) {
+  cy.visit("/main/start");
+  cy.getBySelector("my-talks-collapse-btn").click();
+  cy.then(() => {
+    cy.getBySelector("my-talks-collapse").should("contain", context.talk1.title)
+      .and("contain", context.talk2.title);
+  });
+}
+
+describe("Verify Voucher Form", () => {
   beforeEach(function () {
     createRedemptionScenario(this);
   });
 
-  it("shows redeem voucher card and verify voucher form", function () {
-    cy.getBySelector("redeem-voucher-card").should("contain", this.redeem_voucher);
-    cy.getBySelector("verify-voucher-form").should("be.visible");
+  it("is shown on the profile page", function () {
+    cy.then(() => {
+      cy.getBySelector("redeem-voucher-card").should("contain", this.redeem_voucher);
+      cy.getBySelector("verify-voucher-form").should("be.visible");
+    });
   });
 
-  describe("Tutor voucher redemption", () => {
-    describe("if the lecture has no tutorials yet", () => {
-      it("allows redemption of voucher to successfully become tutor", function () {
-        submitVoucher(this.voucher);
-        verifyVoucherRedemptionText();
-        verifyNoTutorialsYetMessage(this);
+  it("displays an alert if the voucher is invalid", function () {
+    cy.getBySelector("secure-hash-input").type("incorrect hash");
+    cy.i18n("controllers.voucher_invalid").as("voucherInvalid");
 
+    cy.then(() => {
+      cy.getBySelector("verify-voucher-submit").click();
+    });
+
+    cy.on("window:alert", (message) => {
+      expect(message).to.equal(this.voucherInvalid);
+    });
+  });
+});
+
+describe("Tutor voucher redemption", () => {
+  beforeEach(function () {
+    createRedemptionScenario(this, "tutor");
+  });
+
+  describe("if the lecture has no tutorials yet", () => {
+    it("allows redemption of voucher to successfully become tutor", function () {
+      cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
+      submitVoucher(this.voucher);
+      verifyVoucherRedemptionText();
+      verifyNoTutorialsYetMessage(this);
+
+      cy.then(() => {
+        redeemVoucherToBecomeTutor(this);
+      });
+
+      cy.then(() => {
+        verifyLectureIsSubscribed(this);
+      });
+
+      cy.then(() => {
+        loginAsTeacher(this);
+        visitLectureEdit(this);
+      });
+
+      cy.then(() => {
+        verifyNoTutorialsButUserEligibleAsTutor(this);
+      });
+
+      cy.then(() => {
+        verifyTutorNotification(this);
+        cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
         cy.then(() => {
-          redeemVoucherToBecomeTutor(this);
+          cy.getBySelector("notification-body").should("contain", this.noTutorialsTaken);
         });
+      });
+    });
+
+    describe("and the user has already redeemed the voucher", () => {
+      it("displays a message that the user has already redeemed the voucher", function () {
+        submitVoucher(this.voucher);
+        redeemVoucherToBecomeTutor(this);
 
+        // redeem the voucher again
         cy.then(() => {
-          loginAsTeacherAndVisitLectureEdit(this);
+          submitVoucher(this.voucher);
+          verifyAlreadyRedeemedTutorVoucherMessage(this);
+          verifyCancelVoucherButton();
         });
 
+        loginAsTeacher(this);
+        verifyNoNewNotification();
+      });
+    });
+  });
+
+  describe("if the lecture has tutorials", () => {
+    it("allows the user to successfully submit tutorials and become their tutor", function () {
+      let tutorialIds;
+
+      createTutorials(this);
+
+      cy.then(() => {
+        tutorialIds = [this.tutorial1.id, this.tutorial2.id];
+      });
+
+      cy.then(() => {
+        submitVoucher(this.voucher);
+        selectTutorialsAndSubmit(tutorialIds);
+      });
+
+      cy.then(() => {
+        verifyLectureIsSubscribed(this);
+      });
+
+      cy.then(() => {
+        loginAsTeacher(this);
+        visitLectureEdit(this);
+      });
+
+      cy.then(() => {
+        verifyTutorialsContainTutorName(this, tutorialIds);
+      });
+
+      cy.then(() => {
+        verifyTutorNotification(this);
+        cy.getBySelector("notification-body").should("contain", this.tutorial1.title)
+          .and("contain", this.tutorial2.title);
+      });
+    });
+
+    describe("and the user is already a tutor for all of them", () => {
+      it("displays a message that the user is already a tutor for all tutorials", function () {
+        createTutorialsWithTutor(this, this.user);
+
         cy.then(() => {
-          verifyNoTutorialsButUserEligibleAsTutor(this);
+          submitVoucher(this.voucher);
         });
 
-        cy.i18n("basics.tutor").as("tutorMessage");
-        cy.i18n("notifications.redemption").as("redemptionMessage");
-        cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
         cy.then(() => {
-          cy.visit("/main/start");
-          cy.getBySelector("notification-dropdown-counter").should("contain", "1");
-          cy.getBySelector("notification-dropdown-menu").should("contain", this.tutorMessage)
-            .and("contain", this.user.name_in_tutorials);
-          cy.visit("/notifications");
-          cy.getBySelector("notification-card").should("have.length", 1);
-          console.log("hi");
-          console.log(this.lecture);
-          cy.getBySelector("notification-header").should("contain", this.lecture.title_for_viewers);
-          cy.getBySelector("notification-body").should("contain", this.redemptionMessage)
-            .and("contain", this.user.name_in_tutorials).and("contain", this.noTutorialsTaken);
+          verifyAllTutorialsTakenMessage(this);
+          verifyCancelVoucherButton();
         });
+
+        loginAsTeacher(this);
+        verifyNoNotification();
       });
     });
+  });
+});
+
+describe("Editor voucher redemption", () => {
+  beforeEach(function () {
+    createRedemptionScenario(this, "editor");
+  });
+
+  it("allows the user to successfully become an editor", function () {
+    submitVoucher(this.voucher);
+    verifyVoucherRedemptionText();
+    redeemVoucherToBecomeEditor(this);
+
+    cy.then(() => {
+      verifyLectureIsSubscribed(this);
+    });
+
+    cy.then(() => {
+      visitLectureEdit(this);
+    });
 
-    describe("if the lecture has tutorials", () => {
-      it("allows the user to successfully submit tutorials and become their tutor", function () {
-        let tutorialIds;
+    cy.then(() => {
+      cy.getBySelector("lecture-editors-select").within(() => {
+        cy.get("option").should("contain", this.user.name_in_tutorials)
+          .and("contain", this.user.email)
+          .and("not.contain", this.user.name);
+      });
+    });
 
-        createTutorials(this);
+    cy.then(() => {
+      verifyEditorNotification(this);
+    });
+  });
 
+  describe("if the user has already redeemed the voucher", () => {
+    it("displays a message that the user has already redeemed the voucher", function () {
+      submitVoucher(this.voucher);
+      redeemVoucherToBecomeEditor(this);
+
+      // redeem the voucher again
+      cy.then(() => {
+        submitVoucher(this.voucher);
+        verifyAlreadyRedeemedEditorVoucherMessage(this);
+        verifyCancelVoucherButton();
+      });
+
+      loginAsTeacher(this);
+      verifyNoNewNotification();
+    });
+  });
+
+  describe("if the user is the teacher of the lecture", () => {
+    it("displays the message that a teacher cannot become an editor", function () {
+      loginAsTeacher(this);
+      submitVoucher(this.voucher);
+
+      cy.then(() => {
+        verifyTeachersCantBecomeEditorsMessage(this);
+        verifyCancelVoucherButton();
+      });
+    });
+  });
+});
+
+describe("Teacher voucher redemption", () => {
+  beforeEach(function () {
+    createRedemptionScenario(this, "teacher");
+  });
+
+  it("allows the user to successfully become a teacher", function () {
+    submitVoucher(this.voucher);
+    verifyVoucherRedemptionText();
+    redeemVoucherToBecomeTeacher(this);
+
+    verifyLectureIsSubscribed(this);
+    visitLectureEdit(this);
+    verifyUserIsTeacher(this);
+    verifyPreviousTeacherIsEditor(this);
+  });
+
+  describe("if the user is already the teacher", () => {
+    it("displays a message that the user is already the teacher", function () {
+      loginAsTeacher(this);
+      submitVoucher(this.voucher);
+
+      cy.then(() => {
+        verifyAlreadyTeacherMessage(this);
+        verifyCancelVoucherButton();
+      });
+    });
+  });
+});
+
+describe("Speaker voucher redemption", () => {
+  beforeEach(function () {
+    createRedemptionScenario(this, "speaker", "seminar");
+  });
+
+  describe("If the seminar has no talks yet", () => {
+    it("allows the user to successfully become a speaker", function () {
+      submitVoucher(this.voucher);
+      verifyVoucherRedemptionText();
+      verifyNoTalksYetMessage(this);
+      redeemVoucherToBecomeSpeaker(this);
+      verifyLectureIsSubscribed(this);
+
+      cy.then(() => {
+        loginAsTeacher(this);
+        visitLectureContentEdit(this);
+      });
+
+      cy.then(() => {
+        verifyNoTalksYetButUserEligibleAsSpeaker(this);
+      });
+
+      cy.then(() => {
+        verifySpeakerNotification(this);
+        cy.i18n("notifications.no_talks_taken").as("noTalksTaken");
         cy.then(() => {
-          tutorialIds = [this.tutorial1.id, this.tutorial2.id];
+          cy.getBySelector("notification-body").should("contain", this.noTalksTaken);
         });
+      });
+    });
+
+    describe("and the user has already redeemed the voucher", () => {
+      it("displays a message that the user has already redeemed the voucher", function () {
+        submitVoucher(this.voucher);
+        redeemVoucherToBecomeSpeaker(this);
 
+        // redeem the voucher again
         cy.then(() => {
           submitVoucher(this.voucher);
-          selectTutorialsAndSubmit(tutorialIds);
+          verifyAlreadyRedeemedSpeakerVoucherMessage(this);
+          verifyCancelVoucherButton();
         });
 
-        cy.then(() => {
-          loginAsTeacherAndVisitLectureEdit(this);
-        });
+        loginAsTeacher(this);
+        verifyNoNewNotification();
+      });
+    });
+  });
 
-        cy.then(() => {
-          verifyTutorialRowsContainTutorName(this, tutorialIds);
-        });
+  describe("if the seminar has talks", () => {
+    it("allows the user to successfully submit talks and become their speaker", function () {
+      let talkIds;
+
+      createTalks(this);
+
+      cy.then(() => {
+        talkIds = [this.talk1.id, this.talk2.id];
+      });
+
+      cy.then(() => {
+        submitVoucher(this.voucher);
+        selectTalksAndSubmit(talkIds);
+      });
+
+      verifyLectureIsSubscribed(this);
+
+      cy.then(() => {
+        verifyTalksAreListedInMyTalks(this);
+      });
+
+      cy.then(() => {
+        loginAsTeacher(this);
+        visitLectureContentEdit(this);
+      });
+
+      cy.then(() => {
+        verifyTalksContainSpeakerName(this, talkIds);
+      });
+
+      cy.then(() => {
+        verifySpeakerNotification(this);
+        cy.getBySelector("notification-body").should("contain", this.talk1.title)
+          .and("contain", this.talk2.title);
       });
     });
 
-    describe("if the lecture has tutorials and the user is already a tutor for all of them", () => {
-      it("displays a message that the user is already a tutor for all tutorials", function () {
-        createTutorialsWithTutor(this, this.user);
+    describe("and the user is already a speaker for all of them", () => {
+      it("displays a message that the user is already a speaker for all talks", function () {
+        createTalksWithSpeaker(this);
 
         cy.then(() => {
           submitVoucher(this.voucher);
         });
+
+        cy.then(() => {
+          verifyAllTalksTakenMessage(this);
+          verifyCancelVoucherButton();
+        });
+
+        loginAsTeacher(this);
+        verifyNoNotification();
       });
     });
   });

From 6422123a7b95cbcd3d7a3c8af231dccd636d3b09 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 13:41:48 +0200
Subject: [PATCH 081/191] Remove out of scope test

---
 spec/cypress/e2e/voucher_redemption_spec.cy.js | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index 30c79a75d..bd59f78e6 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -6,7 +6,7 @@ function createRedemptionScenario(context, role = "tutor", sort = "lecture") {
 
   cy.then(() => {
     FactoryBot.create("lecture",
-      { teacher_id: context.teacher.id, sort: sort, released: "all" },
+      { teacher_id: context.teacher.id, sort: sort },
       { instance_methods: ["title_no_term", "title_for_viewers"] }).as("lecture");
   });
 
@@ -351,15 +351,6 @@ function verifyAllTalksTakenMessage(context) {
   });
 }
 
-function verifyTalksAreListedInMyTalks(context) {
-  cy.visit("/main/start");
-  cy.getBySelector("my-talks-collapse-btn").click();
-  cy.then(() => {
-    cy.getBySelector("my-talks-collapse").should("contain", context.talk1.title)
-      .and("contain", context.talk2.title);
-  });
-}
-
 describe("Verify Voucher Form", () => {
   beforeEach(function () {
     createRedemptionScenario(this);
@@ -653,10 +644,6 @@ describe("Speaker voucher redemption", () => {
 
       verifyLectureIsSubscribed(this);
 
-      cy.then(() => {
-        verifyTalksAreListedInMyTalks(this);
-      });
-
       cy.then(() => {
         loginAsTeacher(this);
         visitLectureContentEdit(this);

From 352ade6f8e99c77150cd6e1ea1d874612c2ecac6 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 16:06:31 +0200
Subject: [PATCH 082/191] Refactor helper methods

---
 .../cypress/e2e/voucher_redemption_spec.cy.js | 263 +++++-------------
 1 file changed, 69 insertions(+), 194 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index bd59f78e6..695272e63 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -30,57 +30,67 @@ function verifyVoucherRedemptionText() {
   cy.getBySelector("redeem-voucher-text").should("be.visible");
 }
 
-function verifyNoTutorialsYetMessage(context) {
-  cy.i18n("profile.no_tutorials_yet").as("no_tutorials_yet");
+function verifyNoItemsYetMessage(context, itemType) {
+  cy.i18n(`profile.no_${itemType}s_yet`).as("noItemsYet");
 
   cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.no_tutorials_yet);
+    cy.getBySelector("redeem-voucher-card").should("contain", context.noItemsYet);
     cy.getBySelector("redeem-voucher-btn").should("be.visible");
   });
 }
 
-function verifyAlreadyRedeemedTutorVoucherMessage(context) {
-  cy.i18n("profile.already_tutor_by_redemption").as("alreadyRedeemedTutorVoucher");
+function verifyAlreadyRedeemedVoucherMessage(context, role) {
+  cy.i18n(`profile.already_${role}_by_redemption`).as("alreadyRedeemedVoucher");
 
   cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.alreadyRedeemedTutorVoucher);
+    cy.getBySelector("redeem-voucher-card")
+      .should("contain", context.alreadyRedeemedVoucher);
   });
 }
 
-function redeemVoucherToBecomeTutor(context) {
-  cy.i18n("controllers.become_tutor_success").as("becomeTutorSuccess");
+function redeemVoucherToBecomeRole(context, role) {
+  cy.i18n(`controllers.become_${role}_success`).as("successMessage");
   cy.getBySelector("redeem-voucher-btn").click();
+
   cy.then(() => {
     cy.getBySelector("flash-notice").should("be.visible")
-      .and("contain", context.becomeTutorSuccess);
+      .and("contain", context.successMessage);
   });
 }
 
-function createTutorials(context) {
-  FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial1");
-  FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial2");
-  FactoryBot.create("tutorial", { lecture_id: context.lecture.id }).as("tutorial3");
-}
+// Creates tutorials or talks, number is specified by count parameter.
+// If user is given as parameter, the user is assigned as tutor or speaker.
+function createTutorialsOrTalks(context, entityType, user = null, count = 3) {
+  const entityData = { lecture_id: context.lecture.id };
+  if (user) {
+    const personKey = entityType === "tutorial" ? "tutor_ids" : "speaker_ids";
+    entityData[personKey] = [user.id];
+  }
 
-function createTutorialsWithTutor(context, tutor) {
-  FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial1");
-  FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial2");
-  FactoryBot.create("tutorial", { lecture_id: context.lecture.id, tutor_ids: [tutor.id] }).as("tutorial3");
+  for (let i = 1; i <= count; i++) {
+    FactoryBot.create(entityType, entityData).as(`${entityType}${i}`);
+  }
 }
 
-function selectTutorialsAndSubmit(tutorialIds) {
-  const tutorialIdsAsStrings = tutorialIds.map(id => id.toString());
+function selectClaimsAndSubmit(entityIds) {
+  const entityIdsAsStrings = entityIds.map(id => id.toString());
 
   cy.getBySelector("claim-select").should("be.visible");
-  cy.getBySelector("claim-select").select(tutorialIdsAsStrings, { force: true });
+  cy.getBySelector("claim-select").select(entityIdsAsStrings, { force: true });
   cy.getBySelector("claim-submit").click();
   cy.getBySelector("flash-notice").should("be.visible");
 }
 
-function verifyTutorialsContainTutorName(context, tutorialIds) {
-  cy.getBySelector("tutorial-row").should("have.length", 3).each(($el) => {
+// Verifies that the tutorials or talks that were claimed are
+// displayed in the lecture edit page and contain the user's name
+// (and all the other ones do not)
+// If totalCount is specified, it is used to check the total number of
+// tutorials or talks in the lecture.
+function verifyClaimsContainUserName(context, claimType, claimIds, totalCount = 3) {
+  let claimSelector = claimType === "tutorial" ? "tutorial-row" : "talk-header";
+  cy.getBySelector(claimSelector).should("have.length", totalCount).each(($el) => {
     const dataId = parseInt($el.attr("data-id"), 10);
-    if (tutorialIds.includes(dataId)) {
+    if (claimIds.includes(dataId)) {
       cy.wrap($el).should("contain", context.user.name_in_tutorials);
     }
     else {
@@ -117,15 +127,15 @@ function verifyLectureIsSubscribed(context) {
   cy.getBySelector("subscribed-inactive-lectures-collapse").should("contain", context.lecture.title_no_term);
 }
 
-function verifyTutorNotification(context) {
-  cy.i18n("basics.tutor").as("tutorMessage");
+function verifyRoleNotification(context, role) {
+  cy.i18n(`basics.${role}`).as("roleMessage");
   cy.i18n("notifications.redemption").as("redemptionMessage");
 
   cy.then(() => {
     cy.visit("/main/start");
     cy.getBySelector("notification-dropdown").should("be.visible");
     cy.getBySelector("notification-dropdown-counter").should("contain", "1");
-    cy.getBySelector("notification-dropdown-menu").should("contain", context.tutorMessage)
+    cy.getBySelector("notification-dropdown-menu").should("contain", context.roleMessage)
       .and("contain", context.user.name_in_tutorials);
     cy.visit("/notifications");
     cy.getBySelector("notification-card").should("have.length", 1);
@@ -135,13 +145,11 @@ function verifyTutorNotification(context) {
   });
 }
 
-function verifyAllTutorialsTakenMessage(context) {
-  cy.i18n("profile.all_tutorials_taken").as("all_tutorials_taken");
+function verifyAllItemsTakenMessage(context, itemType) {
+  cy.i18n(`profile.all_${itemType}s_taken`).as("allItemsTaken");
 
   cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.all_tutorials_taken)
-      .and("contain", context.tutorial1.title).and("contain", context.tutorial2.title)
-      .and("contain", context.tutorial3.title);
+    cy.getBySelector("redeem-voucher-card").should("contain", context.allItemsTaken);
   });
 }
 
@@ -158,41 +166,6 @@ function verifyNoNotification() {
   cy.getBySelector("notification-dropdown").should("not.exist");
 }
 
-function redeemVoucherToBecomeEditor(context) {
-  cy.i18n("controllers.become_editor_success").as("becomeEditorSuccess");
-  cy.getBySelector("redeem-voucher-btn").click();
-  cy.then(() => {
-    cy.getBySelector("flash-notice").should("be.visible")
-      .and("contain", context.becomeEditorSuccess);
-  });
-}
-
-function verifyEditorNotification(context) {
-  cy.i18n("basics.editor").as("editorMessage");
-  cy.i18n("notifications.redemption").as("redemptionMessage");
-
-  cy.then(() => {
-    cy.visit("/main/start");
-    cy.getBySelector("notification-dropdown").should("be.visible");
-    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
-    cy.getBySelector("notification-dropdown-menu").should("contain", context.editorMessage)
-      .and("contain", context.user.name_in_tutorials);
-    cy.visit("/notifications");
-    cy.getBySelector("notification-card").should("have.length", 1);
-    cy.getBySelector("notification-header").should("contain", context.lecture.title_for_viewers);
-    cy.getBySelector("notification-body").should("contain", context.redemptionMessage)
-      .and("contain", context.user.name_in_tutorials).and("contain", context.user.email);
-  });
-}
-
-function verifyAlreadyRedeemedEditorVoucherMessage(context) {
-  cy.i18n("profile.already_editor_by_redemption").as("alreadyRedeemedEditorVoucher");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.alreadyRedeemedEditorVoucher);
-  });
-}
-
 function verifyNoNewNotification() {
   cy.visit("/main/start");
   cy.getBySelector("notification-dropdown").should("be.visible");
@@ -207,15 +180,6 @@ function verifyTeachersCantBecomeEditorsMessage(context) {
   });
 }
 
-function redeemVoucherToBecomeTeacher(context) {
-  cy.i18n("controllers.become_teacher_success").as("becomeTeacherSuccess");
-  cy.getBySelector("redeem-voucher-btn").click();
-  cy.then(() => {
-    cy.getBySelector("flash-notice").should("be.visible")
-      .and("contain", context.becomeTeacherSuccess);
-  });
-}
-
 function verifyUserIsTeacher(context) {
   cy.getBySelector("teacher-info").should("contain", context.user.name_in_tutorials)
     .and("contain", context.user.email)
@@ -238,24 +202,6 @@ function verifyAlreadyTeacherMessage(context) {
   });
 }
 
-function verifyNoTalksYetMessage(context) {
-  cy.i18n("profile.no_talks_yet").as("noTalksYet");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.noTalksYet);
-    cy.getBySelector("redeem-voucher-btn").should("be.visible");
-  });
-}
-
-function redeemVoucherToBecomeSpeaker(context) {
-  cy.i18n("controllers.become_speaker_success").as("becomeSpeakerSuccess");
-  cy.getBySelector("redeem-voucher-btn").click();
-  cy.then(() => {
-    cy.getBySelector("flash-notice").should("be.visible")
-      .and("contain", context.becomeSpeakerSuccess);
-  });
-}
-
 function visitLectureContentEdit(context) {
   cy.visit(`/lectures/${context.lecture.id}/edit`);
 }
@@ -278,79 +224,6 @@ function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
   });
 }
 
-function verifySpeakerNotification(context) {
-  cy.i18n("basics.speaker").as("speakerMessage");
-  cy.i18n("notifications.redemption").as("redemptionMessage");
-
-  cy.then(() => {
-    cy.visit("/main/start");
-    cy.getBySelector("notification-dropdown").should("be.visible");
-    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
-    cy.getBySelector("notification-dropdown-menu").should("contain", context.speakerMessage)
-      .and("contain", context.user.name_in_tutorials);
-    cy.visit("/notifications");
-    cy.getBySelector("notification-card").should("have.length", 1);
-    cy.getBySelector("notification-header").should("contain", context.lecture.title_for_viewers);
-    cy.getBySelector("notification-body").should("contain", context.redemptionMessage)
-      .and("contain", context.user.name_in_tutorials).and("contain", context.user.email);
-  });
-}
-
-function verifyAlreadyRedeemedSpeakerVoucherMessage(context) {
-  cy.i18n("profile.already_speaker_by_redemption").as("alreadyRedeemedSpeakerVoucher");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card")
-      .should("contain", context.alreadyRedeemedSpeakerVoucher);
-  });
-}
-
-function createTalks(context) {
-  FactoryBot.create("talk", { lecture_id: context.lecture.id }).as("talk1");
-  FactoryBot.create("talk", { lecture_id: context.lecture.id }).as("talk2");
-  FactoryBot.create("talk", { lecture_id: context.lecture.id }).as("talk3");
-}
-
-function createTalksWithSpeaker(context) {
-  FactoryBot.create("talk", { lecture_id: context.lecture.id, speaker_ids: [context.user.id] })
-    .as("talk1");
-  FactoryBot.create("talk", { lecture_id: context.lecture.id, speaker_ids: [context.user.id] })
-    .as("talk2");
-  FactoryBot.create("talk", { lecture_id: context.lecture.id, speaker_ids: [context.user.id] })
-    .as("talk3");
-}
-
-function selectTalksAndSubmit(talkIds) {
-  const talkIdsAsStrings = talkIds.map(id => id.toString());
-
-  cy.getBySelector("claim-select").should("be.visible");
-  cy.getBySelector("claim-select").select(talkIdsAsStrings, { force: true });
-  cy.getBySelector("claim-submit").click();
-  cy.getBySelector("flash-notice").should("be.visible");
-}
-
-function verifyTalksContainSpeakerName(context, talkIds) {
-  cy.getBySelector("talk-header").should("have.length", 3).each(($el) => {
-    const dataId = parseInt($el.attr("data-id"), 10);
-    if (talkIds.includes(dataId)) {
-      cy.wrap($el).should("contain", context.user.name_in_tutorials);
-    }
-    else {
-      cy.wrap($el).should("not.contain", context.user.name_in_tutorials);
-    }
-  });
-}
-
-function verifyAllTalksTakenMessage(context) {
-  cy.i18n("profile.all_talks_taken").as("allTalksTaken");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.allTalksTaken)
-      .and("contain", context.talk1.title).and("contain", context.talk2.title)
-      .and("contain", context.talk3.title);
-  });
-}
-
 describe("Verify Voucher Form", () => {
   beforeEach(function () {
     createRedemptionScenario(this);
@@ -387,10 +260,10 @@ describe("Tutor voucher redemption", () => {
       cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
       submitVoucher(this.voucher);
       verifyVoucherRedemptionText();
-      verifyNoTutorialsYetMessage(this);
+      verifyNoItemsYetMessage(this, "tutorial");
 
       cy.then(() => {
-        redeemVoucherToBecomeTutor(this);
+        redeemVoucherToBecomeRole(this, "tutor");
       });
 
       cy.then(() => {
@@ -407,7 +280,7 @@ describe("Tutor voucher redemption", () => {
       });
 
       cy.then(() => {
-        verifyTutorNotification(this);
+        verifyRoleNotification(this, "tutor"); ;
         cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
         cy.then(() => {
           cy.getBySelector("notification-body").should("contain", this.noTutorialsTaken);
@@ -418,12 +291,12 @@ describe("Tutor voucher redemption", () => {
     describe("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
         submitVoucher(this.voucher);
-        redeemVoucherToBecomeTutor(this);
+        redeemVoucherToBecomeRole(this, "tutor");
 
         // redeem the voucher again
         cy.then(() => {
           submitVoucher(this.voucher);
-          verifyAlreadyRedeemedTutorVoucherMessage(this);
+          verifyAlreadyRedeemedVoucherMessage(this, "tutor");
           verifyCancelVoucherButton();
         });
 
@@ -437,7 +310,7 @@ describe("Tutor voucher redemption", () => {
     it("allows the user to successfully submit tutorials and become their tutor", function () {
       let tutorialIds;
 
-      createTutorials(this);
+      createTutorialsOrTalks(this, "tutorial");
 
       cy.then(() => {
         tutorialIds = [this.tutorial1.id, this.tutorial2.id];
@@ -445,7 +318,7 @@ describe("Tutor voucher redemption", () => {
 
       cy.then(() => {
         submitVoucher(this.voucher);
-        selectTutorialsAndSubmit(tutorialIds);
+        selectClaimsAndSubmit(tutorialIds);
       });
 
       cy.then(() => {
@@ -458,11 +331,11 @@ describe("Tutor voucher redemption", () => {
       });
 
       cy.then(() => {
-        verifyTutorialsContainTutorName(this, tutorialIds);
+        verifyClaimsContainUserName(this, "tutorial", tutorialIds);
       });
 
       cy.then(() => {
-        verifyTutorNotification(this);
+        verifyRoleNotification(this, "tutor"); ;
         cy.getBySelector("notification-body").should("contain", this.tutorial1.title)
           .and("contain", this.tutorial2.title);
       });
@@ -470,14 +343,14 @@ describe("Tutor voucher redemption", () => {
 
     describe("and the user is already a tutor for all of them", () => {
       it("displays a message that the user is already a tutor for all tutorials", function () {
-        createTutorialsWithTutor(this, this.user);
+        createTutorialsOrTalks(this, "tutorial", this.user);
 
         cy.then(() => {
           submitVoucher(this.voucher);
         });
 
         cy.then(() => {
-          verifyAllTutorialsTakenMessage(this);
+          verifyAllItemsTakenMessage(this, "tutorial");
           verifyCancelVoucherButton();
         });
 
@@ -496,7 +369,7 @@ describe("Editor voucher redemption", () => {
   it("allows the user to successfully become an editor", function () {
     submitVoucher(this.voucher);
     verifyVoucherRedemptionText();
-    redeemVoucherToBecomeEditor(this);
+    redeemVoucherToBecomeRole(this, "editor");
 
     cy.then(() => {
       verifyLectureIsSubscribed(this);
@@ -515,19 +388,19 @@ describe("Editor voucher redemption", () => {
     });
 
     cy.then(() => {
-      verifyEditorNotification(this);
+      verifyRoleNotification(this, "editor");
     });
   });
 
   describe("if the user has already redeemed the voucher", () => {
     it("displays a message that the user has already redeemed the voucher", function () {
       submitVoucher(this.voucher);
-      redeemVoucherToBecomeEditor(this);
+      redeemVoucherToBecomeRole(this, "editor");
 
       // redeem the voucher again
       cy.then(() => {
         submitVoucher(this.voucher);
-        verifyAlreadyRedeemedEditorVoucherMessage(this);
+        verifyAlreadyRedeemedVoucherMessage(this, "editor");
         verifyCancelVoucherButton();
       });
 
@@ -557,12 +430,14 @@ describe("Teacher voucher redemption", () => {
   it("allows the user to successfully become a teacher", function () {
     submitVoucher(this.voucher);
     verifyVoucherRedemptionText();
-    redeemVoucherToBecomeTeacher(this);
+    redeemVoucherToBecomeRole(this, "teacher");
 
     verifyLectureIsSubscribed(this);
     visitLectureEdit(this);
     verifyUserIsTeacher(this);
     verifyPreviousTeacherIsEditor(this);
+
+    verifyRoleNotification(this, "teacher");
   });
 
   describe("if the user is already the teacher", () => {
@@ -587,8 +462,8 @@ describe("Speaker voucher redemption", () => {
     it("allows the user to successfully become a speaker", function () {
       submitVoucher(this.voucher);
       verifyVoucherRedemptionText();
-      verifyNoTalksYetMessage(this);
-      redeemVoucherToBecomeSpeaker(this);
+      verifyNoItemsYetMessage(this, "talk");
+      redeemVoucherToBecomeRole(this, "speaker");
       verifyLectureIsSubscribed(this);
 
       cy.then(() => {
@@ -601,7 +476,7 @@ describe("Speaker voucher redemption", () => {
       });
 
       cy.then(() => {
-        verifySpeakerNotification(this);
+        verifyRoleNotification(this, "speaker"); ;
         cy.i18n("notifications.no_talks_taken").as("noTalksTaken");
         cy.then(() => {
           cy.getBySelector("notification-body").should("contain", this.noTalksTaken);
@@ -612,12 +487,12 @@ describe("Speaker voucher redemption", () => {
     describe("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
         submitVoucher(this.voucher);
-        redeemVoucherToBecomeSpeaker(this);
+        redeemVoucherToBecomeRole(this, "speaker");
 
         // redeem the voucher again
         cy.then(() => {
           submitVoucher(this.voucher);
-          verifyAlreadyRedeemedSpeakerVoucherMessage(this);
+          verifyAlreadyRedeemedVoucherMessage(this, "speaker");
           verifyCancelVoucherButton();
         });
 
@@ -631,7 +506,7 @@ describe("Speaker voucher redemption", () => {
     it("allows the user to successfully submit talks and become their speaker", function () {
       let talkIds;
 
-      createTalks(this);
+      createTutorialsOrTalks(this, "talk");
 
       cy.then(() => {
         talkIds = [this.talk1.id, this.talk2.id];
@@ -639,7 +514,7 @@ describe("Speaker voucher redemption", () => {
 
       cy.then(() => {
         submitVoucher(this.voucher);
-        selectTalksAndSubmit(talkIds);
+        selectClaimsAndSubmit(talkIds);
       });
 
       verifyLectureIsSubscribed(this);
@@ -650,11 +525,11 @@ describe("Speaker voucher redemption", () => {
       });
 
       cy.then(() => {
-        verifyTalksContainSpeakerName(this, talkIds);
+        verifyClaimsContainUserName(this, "talk", talkIds);
       });
 
       cy.then(() => {
-        verifySpeakerNotification(this);
+        verifyRoleNotification(this, "speaker"); ;
         cy.getBySelector("notification-body").should("contain", this.talk1.title)
           .and("contain", this.talk2.title);
       });
@@ -662,14 +537,14 @@ describe("Speaker voucher redemption", () => {
 
     describe("and the user is already a speaker for all of them", () => {
       it("displays a message that the user is already a speaker for all talks", function () {
-        createTalksWithSpeaker(this);
+        createTutorialsOrTalks(this, "talk", this.user);
 
         cy.then(() => {
           submitVoucher(this.voucher);
         });
 
         cy.then(() => {
-          verifyAllTalksTakenMessage(this);
+          verifyAllItemsTakenMessage(this, "talk");
           verifyCancelVoucherButton();
         });
 

From 4ebc186eadef20bcd35b4abb0edcc12ecb9bba54 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 16:34:58 +0200
Subject: [PATCH 083/191] Extract helper functions to separate file

---
 .../cypress/e2e/voucher_redemption_spec.cy.js | 414 ++++--------------
 .../support/voucher_redemption_helpers.js     | 235 ++++++++++
 2 files changed, 330 insertions(+), 319 deletions(-)
 create mode 100644 spec/cypress/support/voucher_redemption_helpers.js

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index 695272e63..c25f95ec8 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -1,232 +1,8 @@
-import FactoryBot from "../support/factorybot";
-
-function createRedemptionScenario(context, role = "tutor", sort = "lecture") {
-  cy.createUser("teacher").as("teacher");
-  cy.createUserAndLogin("generic").as("user");
-
-  cy.then(() => {
-    FactoryBot.create("lecture",
-      { teacher_id: context.teacher.id, sort: sort },
-      { instance_methods: ["title_no_term", "title_for_viewers"] }).as("lecture");
-  });
-
-  cy.then(() => {
-    FactoryBot.create("voucher", { lecture_id: context.lecture.id, role: role }).as("voucher");
-  });
-
-  cy.then(() => {
-    cy.visit("/profile/edit");
-  });
-
-  cy.i18n("profile.redeem_voucher").as("redeem_voucher");
-}
-
-function submitVoucher(voucher) {
-  cy.getBySelector("secure-hash-input").type(voucher.secure_hash);
-  cy.getBySelector("verify-voucher-submit").click();
-}
-
-function verifyVoucherRedemptionText() {
-  cy.getBySelector("redeem-voucher-text").should("be.visible");
-}
-
-function verifyNoItemsYetMessage(context, itemType) {
-  cy.i18n(`profile.no_${itemType}s_yet`).as("noItemsYet");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.noItemsYet);
-    cy.getBySelector("redeem-voucher-btn").should("be.visible");
-  });
-}
-
-function verifyAlreadyRedeemedVoucherMessage(context, role) {
-  cy.i18n(`profile.already_${role}_by_redemption`).as("alreadyRedeemedVoucher");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card")
-      .should("contain", context.alreadyRedeemedVoucher);
-  });
-}
-
-function redeemVoucherToBecomeRole(context, role) {
-  cy.i18n(`controllers.become_${role}_success`).as("successMessage");
-  cy.getBySelector("redeem-voucher-btn").click();
-
-  cy.then(() => {
-    cy.getBySelector("flash-notice").should("be.visible")
-      .and("contain", context.successMessage);
-  });
-}
-
-// Creates tutorials or talks, number is specified by count parameter.
-// If user is given as parameter, the user is assigned as tutor or speaker.
-function createTutorialsOrTalks(context, entityType, user = null, count = 3) {
-  const entityData = { lecture_id: context.lecture.id };
-  if (user) {
-    const personKey = entityType === "tutorial" ? "tutor_ids" : "speaker_ids";
-    entityData[personKey] = [user.id];
-  }
-
-  for (let i = 1; i <= count; i++) {
-    FactoryBot.create(entityType, entityData).as(`${entityType}${i}`);
-  }
-}
-
-function selectClaimsAndSubmit(entityIds) {
-  const entityIdsAsStrings = entityIds.map(id => id.toString());
-
-  cy.getBySelector("claim-select").should("be.visible");
-  cy.getBySelector("claim-select").select(entityIdsAsStrings, { force: true });
-  cy.getBySelector("claim-submit").click();
-  cy.getBySelector("flash-notice").should("be.visible");
-}
-
-// Verifies that the tutorials or talks that were claimed are
-// displayed in the lecture edit page and contain the user's name
-// (and all the other ones do not)
-// If totalCount is specified, it is used to check the total number of
-// tutorials or talks in the lecture.
-function verifyClaimsContainUserName(context, claimType, claimIds, totalCount = 3) {
-  let claimSelector = claimType === "tutorial" ? "tutorial-row" : "talk-header";
-  cy.getBySelector(claimSelector).should("have.length", totalCount).each(($el) => {
-    const dataId = parseInt($el.attr("data-id"), 10);
-    if (claimIds.includes(dataId)) {
-      cy.wrap($el).should("contain", context.user.name_in_tutorials);
-    }
-    else {
-      cy.wrap($el).should("not.contain", context.user.name_in_tutorials);
-    }
-  });
-}
-
-function loginAsTeacher(context) {
-  cy.logout();
-  cy.login(context.teacher);
-}
-
-function visitLectureEdit(context) {
-  cy.visit(`/lectures/${context.lecture.id}/edit`);
-  cy.getBySelector("people-tab-btn").click();
-}
-
-function verifyNoTutorialsButUserEligibleAsTutor(context) {
-  cy.getBySelector("tutorial-row").should("not.exist");
-  cy.getBySelector("new-tutorial-btn").should("be.visible").click();
-  cy.then(() => {
-    cy.getBySelector("tutorial-form").should("be.visible");
-    cy.getBySelector("tutor-select").within(() => {
-      cy.get("option").should("contain", context.user.name_in_tutorials)
-        .and("contain", context.user.email)
-        .and("not.contain", context.user.name);
-    });
-  });
-}
-
-function verifyLectureIsSubscribed(context) {
-  cy.visit("/main/start");
-  cy.getBySelector("subscribed-inactive-lectures-collapse").should("contain", context.lecture.title_no_term);
-}
-
-function verifyRoleNotification(context, role) {
-  cy.i18n(`basics.${role}`).as("roleMessage");
-  cy.i18n("notifications.redemption").as("redemptionMessage");
-
-  cy.then(() => {
-    cy.visit("/main/start");
-    cy.getBySelector("notification-dropdown").should("be.visible");
-    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
-    cy.getBySelector("notification-dropdown-menu").should("contain", context.roleMessage)
-      .and("contain", context.user.name_in_tutorials);
-    cy.visit("/notifications");
-    cy.getBySelector("notification-card").should("have.length", 1);
-    cy.getBySelector("notification-header").should("contain", context.lecture.title_for_viewers);
-    cy.getBySelector("notification-body").should("contain", context.redemptionMessage)
-      .and("contain", context.user.name_in_tutorials).and("contain", context.user.email);
-  });
-}
-
-function verifyAllItemsTakenMessage(context, itemType) {
-  cy.i18n(`profile.all_${itemType}s_taken`).as("allItemsTaken");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.allItemsTaken);
-  });
-}
-
-function verifyCancelVoucherButton() {
-  cy.getBySelector("cancel-voucher-btn").should("be.visible");
-  cy.getBySelector("cancel-voucher-btn").click();
-  cy.then(() => {
-    cy.getBySelector("verify-voucher-form").should("be.visible");
-  });
-}
-
-function verifyNoNotification() {
-  cy.visit("/main/start");
-  cy.getBySelector("notification-dropdown").should("not.exist");
-}
-
-function verifyNoNewNotification() {
-  cy.visit("/main/start");
-  cy.getBySelector("notification-dropdown").should("be.visible");
-  cy.getBySelector("notification-dropdown-counter").should("contain", "1");
-}
-
-function verifyTeachersCantBecomeEditorsMessage(context) {
-  cy.i18n("profile.teacher_cant_become_editor").as("teacherCantBecomeEditor");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.teacherCantBecomeEditor);
-  });
-}
-
-function verifyUserIsTeacher(context) {
-  cy.getBySelector("teacher-info").should("contain", context.user.name_in_tutorials)
-    .and("contain", context.user.email)
-    .and("not.contain", context.user.name);
-};
-
-function verifyPreviousTeacherIsEditor(context) {
-  cy.getBySelector("lecture-editors-select").within(() => {
-    cy.get("option").should("contain", context.teacher.name_in_tutorials)
-      .and("contain", context.teacher.email)
-      .and("not.contain", context.teacher.name);
-  });
-}
-
-function verifyAlreadyTeacherMessage(context) {
-  cy.i18n("profile.already_teacher").as("alreadyTeacher");
-
-  cy.then(() => {
-    cy.getBySelector("redeem-voucher-card").should("contain", context.alreadyTeacher);
-  });
-}
-
-function visitLectureContentEdit(context) {
-  cy.visit(`/lectures/${context.lecture.id}/edit`);
-}
-
-function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
-  cy.i18n("admin.lecture.no_talks").as("noTalksYet");
-  cy.then(() => {
-    cy.getBySelector("no-talks-yet").should("contain", context.noTalksYet);
-    cy.getBySelector("new-talk-btn").should("be.visible");
-    cy.getBySelector("new-talk-btn").click();
-  });
-
-  cy.then(() => {
-    cy.getBySelector("talk-form").should("be.visible");
-    cy.getBySelector("speaker-select").within(() => {
-      cy.get("option").should("contain", context.user.name_in_tutorials)
-        .and("contain", context.user.email)
-        .and("not.contain", context.user.name);
-    });
-  });
-}
+import * as helpers from "../support/voucher_redemption_helpers";
 
 describe("Verify Voucher Form", () => {
   beforeEach(function () {
-    createRedemptionScenario(this);
+    helpers.createRedemptionScenario(this);
   });
 
   it("is shown on the profile page", function () {
@@ -252,35 +28,35 @@ describe("Verify Voucher Form", () => {
 
 describe("Tutor voucher redemption", () => {
   beforeEach(function () {
-    createRedemptionScenario(this, "tutor");
+    helpers.createRedemptionScenario(this, "tutor");
   });
 
   describe("if the lecture has no tutorials yet", () => {
     it("allows redemption of voucher to successfully become tutor", function () {
       cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
-      submitVoucher(this.voucher);
-      verifyVoucherRedemptionText();
-      verifyNoItemsYetMessage(this, "tutorial");
+      helpers.submitVoucher(this.voucher);
+      helpers.verifyVoucherRedemptionText();
+      helpers.verifyNoItemsYetMessage(this, "tutorial");
 
       cy.then(() => {
-        redeemVoucherToBecomeRole(this, "tutor");
+        helpers.redeemVoucherToBecomeRole(this, "tutor");
       });
 
       cy.then(() => {
-        verifyLectureIsSubscribed(this);
+        helpers.verifyLectureIsSubscribed(this);
       });
 
       cy.then(() => {
-        loginAsTeacher(this);
-        visitLectureEdit(this);
+        helpers.loginAsTeacher(this);
+        helpers.visitLectureEdit(this);
       });
 
       cy.then(() => {
-        verifyNoTutorialsButUserEligibleAsTutor(this);
+        helpers.verifyNoTutorialsButUserEligibleAsTutor(this);
       });
 
       cy.then(() => {
-        verifyRoleNotification(this, "tutor"); ;
+        helpers.verifyRoleNotification(this, "tutor"); ;
         cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
         cy.then(() => {
           cy.getBySelector("notification-body").should("contain", this.noTutorialsTaken);
@@ -290,18 +66,18 @@ describe("Tutor voucher redemption", () => {
 
     describe("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
-        submitVoucher(this.voucher);
-        redeemVoucherToBecomeRole(this, "tutor");
+        helpers.submitVoucher(this.voucher);
+        helpers.redeemVoucherToBecomeRole(this, "tutor");
 
         // redeem the voucher again
         cy.then(() => {
-          submitVoucher(this.voucher);
-          verifyAlreadyRedeemedVoucherMessage(this, "tutor");
-          verifyCancelVoucherButton();
+          helpers.submitVoucher(this.voucher);
+          helpers.verifyAlreadyRedeemedVoucherMessage(this, "tutor");
+          helpers.verifyCancelVoucherButton();
         });
 
-        loginAsTeacher(this);
-        verifyNoNewNotification();
+        helpers.loginAsTeacher(this);
+        helpers.verifyNoNewNotification();
       });
     });
   });
@@ -310,32 +86,32 @@ describe("Tutor voucher redemption", () => {
     it("allows the user to successfully submit tutorials and become their tutor", function () {
       let tutorialIds;
 
-      createTutorialsOrTalks(this, "tutorial");
+      helpers.createTutorialsOrTalks(this, "tutorial");
 
       cy.then(() => {
         tutorialIds = [this.tutorial1.id, this.tutorial2.id];
       });
 
       cy.then(() => {
-        submitVoucher(this.voucher);
-        selectClaimsAndSubmit(tutorialIds);
+        helpers.submitVoucher(this.voucher);
+        helpers.selectClaimsAndSubmit(tutorialIds);
       });
 
       cy.then(() => {
-        verifyLectureIsSubscribed(this);
+        helpers.verifyLectureIsSubscribed(this);
       });
 
       cy.then(() => {
-        loginAsTeacher(this);
-        visitLectureEdit(this);
+        helpers.loginAsTeacher(this);
+        helpers.visitLectureEdit(this);
       });
 
       cy.then(() => {
-        verifyClaimsContainUserName(this, "tutorial", tutorialIds);
+        helpers.verifyClaimsContainUserName(this, "tutorial", tutorialIds);
       });
 
       cy.then(() => {
-        verifyRoleNotification(this, "tutor"); ;
+        helpers.verifyRoleNotification(this, "tutor"); ;
         cy.getBySelector("notification-body").should("contain", this.tutorial1.title)
           .and("contain", this.tutorial2.title);
       });
@@ -343,19 +119,19 @@ describe("Tutor voucher redemption", () => {
 
     describe("and the user is already a tutor for all of them", () => {
       it("displays a message that the user is already a tutor for all tutorials", function () {
-        createTutorialsOrTalks(this, "tutorial", this.user);
+        helpers.createTutorialsOrTalks(this, "tutorial", this.user);
 
         cy.then(() => {
-          submitVoucher(this.voucher);
+          helpers.submitVoucher(this.voucher);
         });
 
         cy.then(() => {
-          verifyAllItemsTakenMessage(this, "tutorial");
-          verifyCancelVoucherButton();
+          helpers.verifyAllItemsTakenMessage(this, "tutorial");
+          helpers.verifyCancelVoucherButton();
         });
 
-        loginAsTeacher(this);
-        verifyNoNotification();
+        helpers.loginAsTeacher(this);
+        helpers.verifyNoNotification();
       });
     });
   });
@@ -363,20 +139,20 @@ describe("Tutor voucher redemption", () => {
 
 describe("Editor voucher redemption", () => {
   beforeEach(function () {
-    createRedemptionScenario(this, "editor");
+    helpers.createRedemptionScenario(this, "editor");
   });
 
   it("allows the user to successfully become an editor", function () {
-    submitVoucher(this.voucher);
-    verifyVoucherRedemptionText();
-    redeemVoucherToBecomeRole(this, "editor");
+    helpers.submitVoucher(this.voucher);
+    helpers.verifyVoucherRedemptionText();
+    helpers.redeemVoucherToBecomeRole(this, "editor");
 
     cy.then(() => {
-      verifyLectureIsSubscribed(this);
+      helpers.verifyLectureIsSubscribed(this);
     });
 
     cy.then(() => {
-      visitLectureEdit(this);
+      helpers.visitLectureEdit(this);
     });
 
     cy.then(() => {
@@ -388,35 +164,35 @@ describe("Editor voucher redemption", () => {
     });
 
     cy.then(() => {
-      verifyRoleNotification(this, "editor");
+      helpers.verifyRoleNotification(this, "editor");
     });
   });
 
   describe("if the user has already redeemed the voucher", () => {
     it("displays a message that the user has already redeemed the voucher", function () {
-      submitVoucher(this.voucher);
-      redeemVoucherToBecomeRole(this, "editor");
+      helpers.submitVoucher(this.voucher);
+      helpers.redeemVoucherToBecomeRole(this, "editor");
 
       // redeem the voucher again
       cy.then(() => {
-        submitVoucher(this.voucher);
-        verifyAlreadyRedeemedVoucherMessage(this, "editor");
-        verifyCancelVoucherButton();
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyAlreadyRedeemedVoucherMessage(this, "editor");
+        helpers.verifyCancelVoucherButton();
       });
 
-      loginAsTeacher(this);
-      verifyNoNewNotification();
+      helpers.loginAsTeacher(this);
+      helpers.verifyNoNewNotification();
     });
   });
 
   describe("if the user is the teacher of the lecture", () => {
     it("displays the message that a teacher cannot become an editor", function () {
-      loginAsTeacher(this);
-      submitVoucher(this.voucher);
+      helpers.loginAsTeacher(this);
+      helpers.submitVoucher(this.voucher);
 
       cy.then(() => {
-        verifyTeachersCantBecomeEditorsMessage(this);
-        verifyCancelVoucherButton();
+        helpers.verifyTeachersCantBecomeEditorsMessage(this);
+        helpers.verifyCancelVoucherButton();
       });
     });
   });
@@ -424,30 +200,30 @@ describe("Editor voucher redemption", () => {
 
 describe("Teacher voucher redemption", () => {
   beforeEach(function () {
-    createRedemptionScenario(this, "teacher");
+    helpers.createRedemptionScenario(this, "teacher");
   });
 
   it("allows the user to successfully become a teacher", function () {
-    submitVoucher(this.voucher);
-    verifyVoucherRedemptionText();
-    redeemVoucherToBecomeRole(this, "teacher");
+    helpers.submitVoucher(this.voucher);
+    helpers.verifyVoucherRedemptionText();
+    helpers.redeemVoucherToBecomeRole(this, "teacher");
 
-    verifyLectureIsSubscribed(this);
-    visitLectureEdit(this);
-    verifyUserIsTeacher(this);
-    verifyPreviousTeacherIsEditor(this);
+    helpers.verifyLectureIsSubscribed(this);
+    helpers.visitLectureEdit(this);
+    helpers.verifyUserIsTeacher(this);
+    helpers.verifyPreviousTeacherIsEditor(this);
 
-    verifyRoleNotification(this, "teacher");
+    helpers.verifyRoleNotification(this, "teacher");
   });
 
   describe("if the user is already the teacher", () => {
     it("displays a message that the user is already the teacher", function () {
-      loginAsTeacher(this);
-      submitVoucher(this.voucher);
+      helpers.loginAsTeacher(this);
+      helpers.submitVoucher(this.voucher);
 
       cy.then(() => {
-        verifyAlreadyTeacherMessage(this);
-        verifyCancelVoucherButton();
+        helpers.verifyAlreadyTeacherMessage(this);
+        helpers.verifyCancelVoucherButton();
       });
     });
   });
@@ -455,28 +231,28 @@ describe("Teacher voucher redemption", () => {
 
 describe("Speaker voucher redemption", () => {
   beforeEach(function () {
-    createRedemptionScenario(this, "speaker", "seminar");
+    helpers.createRedemptionScenario(this, "speaker", "seminar");
   });
 
   describe("If the seminar has no talks yet", () => {
     it("allows the user to successfully become a speaker", function () {
-      submitVoucher(this.voucher);
-      verifyVoucherRedemptionText();
-      verifyNoItemsYetMessage(this, "talk");
-      redeemVoucherToBecomeRole(this, "speaker");
-      verifyLectureIsSubscribed(this);
+      helpers.submitVoucher(this.voucher);
+      helpers.verifyVoucherRedemptionText();
+      helpers.verifyNoItemsYetMessage(this, "talk");
+      helpers.redeemVoucherToBecomeRole(this, "speaker");
+      helpers.verifyLectureIsSubscribed(this);
 
       cy.then(() => {
-        loginAsTeacher(this);
-        visitLectureContentEdit(this);
+        helpers.loginAsTeacher(this);
+        helpers.visitLectureContentEdit(this);
       });
 
       cy.then(() => {
-        verifyNoTalksYetButUserEligibleAsSpeaker(this);
+        helpers.verifyNoTalksYetButUserEligibleAsSpeaker(this);
       });
 
       cy.then(() => {
-        verifyRoleNotification(this, "speaker"); ;
+        helpers.verifyRoleNotification(this, "speaker"); ;
         cy.i18n("notifications.no_talks_taken").as("noTalksTaken");
         cy.then(() => {
           cy.getBySelector("notification-body").should("contain", this.noTalksTaken);
@@ -486,18 +262,18 @@ describe("Speaker voucher redemption", () => {
 
     describe("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
-        submitVoucher(this.voucher);
-        redeemVoucherToBecomeRole(this, "speaker");
+        helpers.submitVoucher(this.voucher);
+        helpers.redeemVoucherToBecomeRole(this, "speaker");
 
         // redeem the voucher again
         cy.then(() => {
-          submitVoucher(this.voucher);
-          verifyAlreadyRedeemedVoucherMessage(this, "speaker");
-          verifyCancelVoucherButton();
+          helpers.submitVoucher(this.voucher);
+          helpers.verifyAlreadyRedeemedVoucherMessage(this, "speaker");
+          helpers.verifyCancelVoucherButton();
         });
 
-        loginAsTeacher(this);
-        verifyNoNewNotification();
+        helpers.loginAsTeacher(this);
+        helpers.verifyNoNewNotification();
       });
     });
   });
@@ -506,30 +282,30 @@ describe("Speaker voucher redemption", () => {
     it("allows the user to successfully submit talks and become their speaker", function () {
       let talkIds;
 
-      createTutorialsOrTalks(this, "talk");
+      helpers.createTutorialsOrTalks(this, "talk");
 
       cy.then(() => {
         talkIds = [this.talk1.id, this.talk2.id];
       });
 
       cy.then(() => {
-        submitVoucher(this.voucher);
-        selectClaimsAndSubmit(talkIds);
+        helpers.submitVoucher(this.voucher);
+        helpers.selectClaimsAndSubmit(talkIds);
       });
 
-      verifyLectureIsSubscribed(this);
+      helpers.verifyLectureIsSubscribed(this);
 
       cy.then(() => {
-        loginAsTeacher(this);
-        visitLectureContentEdit(this);
+        helpers.loginAsTeacher(this);
+        helpers.visitLectureContentEdit(this);
       });
 
       cy.then(() => {
-        verifyClaimsContainUserName(this, "talk", talkIds);
+        helpers.verifyClaimsContainUserName(this, "talk", talkIds);
       });
 
       cy.then(() => {
-        verifyRoleNotification(this, "speaker"); ;
+        helpers.verifyRoleNotification(this, "speaker"); ;
         cy.getBySelector("notification-body").should("contain", this.talk1.title)
           .and("contain", this.talk2.title);
       });
@@ -537,19 +313,19 @@ describe("Speaker voucher redemption", () => {
 
     describe("and the user is already a speaker for all of them", () => {
       it("displays a message that the user is already a speaker for all talks", function () {
-        createTutorialsOrTalks(this, "talk", this.user);
+        helpers.createTutorialsOrTalks(this, "talk", this.user);
 
         cy.then(() => {
-          submitVoucher(this.voucher);
+          helpers.submitVoucher(this.voucher);
         });
 
         cy.then(() => {
-          verifyAllItemsTakenMessage(this, "talk");
-          verifyCancelVoucherButton();
+          helpers.verifyAllItemsTakenMessage(this, "talk");
+          helpers.verifyCancelVoucherButton();
         });
 
-        loginAsTeacher(this);
-        verifyNoNotification();
+        helpers.loginAsTeacher(this);
+        helpers.verifyNoNotification();
       });
     });
   });
diff --git a/spec/cypress/support/voucher_redemption_helpers.js b/spec/cypress/support/voucher_redemption_helpers.js
new file mode 100644
index 000000000..8626b7763
--- /dev/null
+++ b/spec/cypress/support/voucher_redemption_helpers.js
@@ -0,0 +1,235 @@
+import FactoryBot from "./factorybot";
+
+export function createRedemptionScenario(context, role = "tutor", sort = "lecture") {
+  cy.createUser("teacher").as("teacher");
+  cy.createUserAndLogin("generic").as("user");
+
+  cy.then(() => {
+    FactoryBot.create("lecture",
+      { teacher_id: context.teacher.id, sort: sort },
+      { instance_methods: ["title_no_term", "title_for_viewers"] }).as("lecture");
+  });
+
+  cy.then(() => {
+    FactoryBot.create("voucher", { lecture_id: context.lecture.id, role: role })
+      .as("voucher");
+  });
+
+  cy.then(() => {
+    cy.visit("/profile/edit");
+  });
+
+  cy.i18n("profile.redeem_voucher").as("redeem_voucher");
+}
+
+export function submitVoucher(voucher) {
+  cy.getBySelector("secure-hash-input").type(voucher.secure_hash);
+  cy.getBySelector("verify-voucher-submit").click();
+}
+
+export function verifyVoucherRedemptionText() {
+  cy.getBySelector("redeem-voucher-text").should("be.visible");
+}
+
+export function verifyNoItemsYetMessage(context, itemType) {
+  cy.i18n(`profile.no_${itemType}s_yet`).as("noItemsYet");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card").should("contain", context.noItemsYet);
+    cy.getBySelector("redeem-voucher-btn").should("be.visible");
+  });
+}
+
+export function verifyAlreadyRedeemedVoucherMessage(context, role) {
+  cy.i18n(`profile.already_${role}_by_redemption`).as("alreadyRedeemedVoucher");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card")
+      .should("contain", context.alreadyRedeemedVoucher);
+  });
+}
+
+export function redeemVoucherToBecomeRole(context, role) {
+  cy.i18n(`controllers.become_${role}_success`).as("successMessage");
+  cy.getBySelector("redeem-voucher-btn").click();
+
+  cy.then(() => {
+    cy.getBySelector("flash-notice").should("be.visible")
+      .and("contain", context.successMessage);
+  });
+}
+
+// Creates tutorials or talks, number is specified by count parameter.
+// If user is given as parameter, the user is assigned as tutor or speaker.
+export function createTutorialsOrTalks(context, entityType, user = null, count = 3) {
+  const entityData = { lecture_id: context.lecture.id };
+  if (user) {
+    const personKey = entityType === "tutorial" ? "tutor_ids" : "speaker_ids";
+    entityData[personKey] = [user.id];
+  }
+
+  for (let i = 1; i <= count; i++) {
+    FactoryBot.create(entityType, entityData).as(`${entityType}${i}`);
+  }
+}
+
+export function selectClaimsAndSubmit(entityIds) {
+  const entityIdsAsStrings = entityIds.map(id => id.toString());
+
+  cy.getBySelector("claim-select").should("be.visible");
+  cy.getBySelector("claim-select").select(entityIdsAsStrings, { force: true });
+  cy.getBySelector("claim-submit").click();
+  cy.getBySelector("flash-notice").should("be.visible");
+}
+
+// Verifies that the tutorials or talks that were claimed are
+// displayed in the lecture edit page and contain the user's name
+// (and all the other ones do not)
+// If totalCount is specified, it is used to check the total number of
+// tutorials or talks in the lecture.
+export function verifyClaimsContainUserName(context, claimType, claimIds, totalCount = 3) {
+  let claimSelector = claimType === "tutorial" ? "tutorial-row" : "talk-header";
+  cy.getBySelector(claimSelector).should("have.length", totalCount).each(($el) => {
+    const dataId = parseInt($el.attr("data-id"), 10);
+    if (claimIds.includes(dataId)) {
+      cy.wrap($el).should("contain", context.user.name_in_tutorials);
+    }
+    else {
+      cy.wrap($el).should("not.contain", context.user.name_in_tutorials);
+    }
+  });
+}
+
+export function loginAsTeacher(context) {
+  cy.logout();
+  cy.login(context.teacher);
+}
+
+export function visitLectureEdit(context) {
+  cy.visit(`/lectures/${context.lecture.id}/edit`);
+  cy.getBySelector("people-tab-btn").click();
+}
+
+export function verifyNoTutorialsButUserEligibleAsTutor(context) {
+  cy.getBySelector("tutorial-row").should("not.exist");
+  cy.getBySelector("new-tutorial-btn").should("be.visible").click();
+  cy.then(() => {
+    cy.getBySelector("tutorial-form").should("be.visible");
+    cy.getBySelector("tutor-select").within(() => {
+      cy.get("option").should("contain", context.user.name_in_tutorials)
+        .and("contain", context.user.email)
+        .and("not.contain", context.user.name);
+    });
+  });
+}
+
+export function verifyLectureIsSubscribed(context) {
+  cy.visit("/main/start");
+  cy.getBySelector("subscribed-inactive-lectures-collapse")
+    .should("contain", context.lecture.title_no_term);
+}
+
+export function verifyRoleNotification(context, role) {
+  cy.i18n(`basics.${role}`).as("roleMessage");
+  cy.i18n("notifications.redemption").as("redemptionMessage");
+
+  cy.then(() => {
+    cy.visit("/main/start");
+    cy.getBySelector("notification-dropdown").should("be.visible");
+    cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+    cy.getBySelector("notification-dropdown-menu")
+      .should("contain", context.roleMessage)
+      .and("contain", context.user.name_in_tutorials);
+    cy.visit("/notifications");
+    cy.getBySelector("notification-card").should("have.length", 1);
+    cy.getBySelector("notification-header")
+      .should("contain", context.lecture.title_for_viewers);
+    cy.getBySelector("notification-body")
+      .should("contain", context.redemptionMessage)
+      .and("contain", context.user.name_in_tutorials)
+      .and("contain", context.user.email);
+  });
+}
+
+export function verifyAllItemsTakenMessage(context, itemType) {
+  cy.i18n(`profile.all_${itemType}s_taken`).as("allItemsTaken");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card")
+      .should("contain", context.allItemsTaken);
+  });
+}
+
+export function verifyCancelVoucherButton() {
+  cy.getBySelector("cancel-voucher-btn").should("be.visible");
+  cy.getBySelector("cancel-voucher-btn").click();
+  cy.then(() => {
+    cy.getBySelector("verify-voucher-form").should("be.visible");
+  });
+}
+
+export function verifyNoNotification() {
+  cy.visit("/main/start");
+  cy.getBySelector("notification-dropdown").should("not.exist");
+}
+
+export function verifyNoNewNotification() {
+  cy.visit("/main/start");
+  cy.getBySelector("notification-dropdown").should("be.visible");
+  cy.getBySelector("notification-dropdown-counter").should("contain", "1");
+}
+
+export function verifyTeachersCantBecomeEditorsMessage(context) {
+  cy.i18n("profile.teacher_cant_become_editor").as("teacherCantBecomeEditor");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card")
+      .should("contain", context.teacherCantBecomeEditor);
+  });
+}
+
+export function verifyUserIsTeacher(context) {
+  cy.getBySelector("teacher-info")
+    .should("contain", context.user.name_in_tutorials)
+    .and("contain", context.user.email)
+    .and("not.contain", context.user.name);
+};
+
+export function verifyPreviousTeacherIsEditor(context) {
+  cy.getBySelector("lecture-editors-select").within(() => {
+    cy.get("option").should("contain", context.teacher.name_in_tutorials)
+      .and("contain", context.teacher.email)
+      .and("not.contain", context.teacher.name);
+  });
+}
+
+export function verifyAlreadyTeacherMessage(context) {
+  cy.i18n("profile.already_teacher").as("alreadyTeacher");
+
+  cy.then(() => {
+    cy.getBySelector("redeem-voucher-card")
+      .should("contain", context.alreadyTeacher);
+  });
+}
+
+export function visitLectureContentEdit(context) {
+  cy.visit(`/lectures/${context.lecture.id}/edit`);
+}
+
+export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
+  cy.i18n("admin.lecture.no_talks").as("noTalksYet");
+  cy.then(() => {
+    cy.getBySelector("no-talks-yet").should("contain", context.noTalksYet);
+    cy.getBySelector("new-talk-btn").should("be.visible");
+    cy.getBySelector("new-talk-btn").click();
+  });
+
+  cy.then(() => {
+    cy.getBySelector("talk-form").should("be.visible");
+    cy.getBySelector("speaker-select").within(() => {
+      cy.get("option").should("contain", context.user.name_in_tutorials)
+        .and("contain", context.user.email)
+        .and("not.contain", context.user.name);
+    });
+  });
+}

From fdb4efe568ccd60f6d29547fd026ff52c10a42d3 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:23:30 +0200
Subject: [PATCH 084/191] Refactor tests

---
 .../cypress/e2e/voucher_redemption_spec.cy.js | 201 ++++++------------
 .../support/voucher_redemption_helpers.js     |   3 +-
 2 files changed, 63 insertions(+), 141 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index c25f95ec8..ea081e04c 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -6,10 +6,8 @@ describe("Verify Voucher Form", () => {
   });
 
   it("is shown on the profile page", function () {
-    cy.then(() => {
-      cy.getBySelector("redeem-voucher-card").should("contain", this.redeem_voucher);
-      cy.getBySelector("verify-voucher-form").should("be.visible");
-    });
+    cy.getBySelector("redeem-voucher-card").should("contain", this.redeem_voucher);
+    cy.getBySelector("verify-voucher-form").should("be.visible");
   });
 
   it("displays an alert if the voucher is invalid", function () {
@@ -33,34 +31,19 @@ describe("Tutor voucher redemption", () => {
 
   describe("if the lecture has no tutorials yet", () => {
     it("allows redemption of voucher to successfully become tutor", function () {
-      cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
       helpers.submitVoucher(this.voucher);
       helpers.verifyVoucherRedemptionText();
       helpers.verifyNoItemsYetMessage(this, "tutorial");
+      helpers.redeemVoucherToBecomeRole(this, "tutor");
+      helpers.verifyLectureIsSubscribed(this);
+      helpers.logoutAndLoginAsTeacher(this);
+      helpers.visitLectureEdit(this);
+      helpers.verifyNoTutorialsButUserEligibleAsTutor(this);
+      helpers.verifyRoleNotification(this, "tutor");
 
-      cy.then(() => {
-        helpers.redeemVoucherToBecomeRole(this, "tutor");
-      });
-
-      cy.then(() => {
-        helpers.verifyLectureIsSubscribed(this);
-      });
-
-      cy.then(() => {
-        helpers.loginAsTeacher(this);
-        helpers.visitLectureEdit(this);
-      });
-
-      cy.then(() => {
-        helpers.verifyNoTutorialsButUserEligibleAsTutor(this);
-      });
-
-      cy.then(() => {
-        helpers.verifyRoleNotification(this, "tutor"); ;
-        cy.i18n("notifications.no_tutorials_taken").as("noTutorialsTaken");
-        cy.then(() => {
-          cy.getBySelector("notification-body").should("contain", this.noTutorialsTaken);
-        });
+      cy.i18n("notifications.no_tutorials_taken").then((noTutorialsTaken) => {
+        cy.getBySelector("notification-body")
+          .should("contain", noTutorialsTaken);
       });
     });
 
@@ -68,15 +51,11 @@ describe("Tutor voucher redemption", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
         helpers.submitVoucher(this.voucher);
         helpers.redeemVoucherToBecomeRole(this, "tutor");
-
         // redeem the voucher again
-        cy.then(() => {
-          helpers.submitVoucher(this.voucher);
-          helpers.verifyAlreadyRedeemedVoucherMessage(this, "tutor");
-          helpers.verifyCancelVoucherButton();
-        });
-
-        helpers.loginAsTeacher(this);
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyAlreadyRedeemedVoucherMessage(this, "tutor");
+        helpers.verifyCancelVoucherButton();
+        helpers.logoutAndLoginAsTeacher(this);
         helpers.verifyNoNewNotification();
       });
     });
@@ -84,12 +63,12 @@ describe("Tutor voucher redemption", () => {
 
   describe("if the lecture has tutorials", () => {
     it("allows the user to successfully submit tutorials and become their tutor", function () {
-      let tutorialIds;
+      const tutorialIds = [];
 
       helpers.createTutorialsOrTalks(this, "tutorial");
 
       cy.then(() => {
-        tutorialIds = [this.tutorial1.id, this.tutorial2.id];
+        tutorialIds.push(this.tutorial1.id, this.tutorial2.id);
       });
 
       cy.then(() => {
@@ -97,21 +76,16 @@ describe("Tutor voucher redemption", () => {
         helpers.selectClaimsAndSubmit(tutorialIds);
       });
 
-      cy.then(() => {
-        helpers.verifyLectureIsSubscribed(this);
-      });
-
-      cy.then(() => {
-        helpers.loginAsTeacher(this);
-        helpers.visitLectureEdit(this);
-      });
+      helpers.verifyLectureIsSubscribed(this);
+      helpers.logoutAndLoginAsTeacher(this);
+      helpers.visitLectureEdit(this);
 
       cy.then(() => {
         helpers.verifyClaimsContainUserName(this, "tutorial", tutorialIds);
       });
 
       cy.then(() => {
-        helpers.verifyRoleNotification(this, "tutor"); ;
+        helpers.verifyRoleNotification(this, "tutor");
         cy.getBySelector("notification-body").should("contain", this.tutorial1.title)
           .and("contain", this.tutorial2.title);
       });
@@ -120,17 +94,10 @@ describe("Tutor voucher redemption", () => {
     describe("and the user is already a tutor for all of them", () => {
       it("displays a message that the user is already a tutor for all tutorials", function () {
         helpers.createTutorialsOrTalks(this, "tutorial", this.user);
-
-        cy.then(() => {
-          helpers.submitVoucher(this.voucher);
-        });
-
-        cy.then(() => {
-          helpers.verifyAllItemsTakenMessage(this, "tutorial");
-          helpers.verifyCancelVoucherButton();
-        });
-
-        helpers.loginAsTeacher(this);
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyAllItemsTakenMessage(this, "tutorial");
+        helpers.verifyCancelVoucherButton();
+        helpers.logoutAndLoginAsTeacher(this);
         helpers.verifyNoNotification();
       });
     });
@@ -146,54 +113,36 @@ describe("Editor voucher redemption", () => {
     helpers.submitVoucher(this.voucher);
     helpers.verifyVoucherRedemptionText();
     helpers.redeemVoucherToBecomeRole(this, "editor");
+    helpers.verifyLectureIsSubscribed(this);
+    helpers.visitLectureEdit(this);
 
-    cy.then(() => {
-      helpers.verifyLectureIsSubscribed(this);
-    });
-
-    cy.then(() => {
-      helpers.visitLectureEdit(this);
-    });
-
-    cy.then(() => {
-      cy.getBySelector("lecture-editors-select").within(() => {
-        cy.get("option").should("contain", this.user.name_in_tutorials)
-          .and("contain", this.user.email)
-          .and("not.contain", this.user.name);
-      });
+    cy.getBySelector("lecture-editors-select").within(() => {
+      cy.get("option").should("contain", this.user.name_in_tutorials)
+        .and("contain", this.user.email)
+        .and("not.contain", this.user.name);
     });
 
-    cy.then(() => {
-      helpers.verifyRoleNotification(this, "editor");
-    });
+    helpers.verifyRoleNotification(this, "editor");
   });
 
   describe("if the user has already redeemed the voucher", () => {
     it("displays a message that the user has already redeemed the voucher", function () {
       helpers.submitVoucher(this.voucher);
       helpers.redeemVoucherToBecomeRole(this, "editor");
-
-      // redeem the voucher again
-      cy.then(() => {
-        helpers.submitVoucher(this.voucher);
-        helpers.verifyAlreadyRedeemedVoucherMessage(this, "editor");
-        helpers.verifyCancelVoucherButton();
-      });
-
-      helpers.loginAsTeacher(this);
+      helpers.submitVoucher(this.voucher);
+      helpers.verifyAlreadyRedeemedVoucherMessage(this, "editor");
+      helpers.verifyCancelVoucherButton();
+      helpers.logoutAndLoginAsTeacher(this);
       helpers.verifyNoNewNotification();
     });
   });
 
   describe("if the user is the teacher of the lecture", () => {
     it("displays the message that a teacher cannot become an editor", function () {
-      helpers.loginAsTeacher(this);
+      helpers.logoutAndLoginAsTeacher(this);
       helpers.submitVoucher(this.voucher);
-
-      cy.then(() => {
-        helpers.verifyTeachersCantBecomeEditorsMessage(this);
-        helpers.verifyCancelVoucherButton();
-      });
+      helpers.verifyTeachersCantBecomeEditorsMessage(this);
+      helpers.verifyCancelVoucherButton();
     });
   });
 });
@@ -207,24 +156,19 @@ describe("Teacher voucher redemption", () => {
     helpers.submitVoucher(this.voucher);
     helpers.verifyVoucherRedemptionText();
     helpers.redeemVoucherToBecomeRole(this, "teacher");
-
     helpers.verifyLectureIsSubscribed(this);
     helpers.visitLectureEdit(this);
     helpers.verifyUserIsTeacher(this);
     helpers.verifyPreviousTeacherIsEditor(this);
-
     helpers.verifyRoleNotification(this, "teacher");
   });
 
   describe("if the user is already the teacher", () => {
     it("displays a message that the user is already the teacher", function () {
-      helpers.loginAsTeacher(this);
+      helpers.logoutAndLoginAsTeacher(this);
       helpers.submitVoucher(this.voucher);
-
-      cy.then(() => {
-        helpers.verifyAlreadyTeacherMessage(this);
-        helpers.verifyCancelVoucherButton();
-      });
+      helpers.verifyAlreadyTeacherMessage(this);
+      helpers.verifyCancelVoucherButton();
     });
   });
 });
@@ -241,22 +185,13 @@ describe("Speaker voucher redemption", () => {
       helpers.verifyNoItemsYetMessage(this, "talk");
       helpers.redeemVoucherToBecomeRole(this, "speaker");
       helpers.verifyLectureIsSubscribed(this);
+      helpers.logoutAndLoginAsTeacher(this);
+      helpers.visitLectureContentEdit(this);
+      helpers.verifyNoTalksYetButUserEligibleAsSpeaker(this);
+      helpers.verifyRoleNotification(this, "speaker");
 
-      cy.then(() => {
-        helpers.loginAsTeacher(this);
-        helpers.visitLectureContentEdit(this);
-      });
-
-      cy.then(() => {
-        helpers.verifyNoTalksYetButUserEligibleAsSpeaker(this);
-      });
-
-      cy.then(() => {
-        helpers.verifyRoleNotification(this, "speaker"); ;
-        cy.i18n("notifications.no_talks_taken").as("noTalksTaken");
-        cy.then(() => {
-          cy.getBySelector("notification-body").should("contain", this.noTalksTaken);
-        });
+      cy.i18n("notifications.no_talks_taken").then((noTalksTaken) => {
+        cy.getBySelector("notification-body").should("contain", noTalksTaken);
       });
     });
 
@@ -264,15 +199,11 @@ describe("Speaker voucher redemption", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
         helpers.submitVoucher(this.voucher);
         helpers.redeemVoucherToBecomeRole(this, "speaker");
-
         // redeem the voucher again
-        cy.then(() => {
-          helpers.submitVoucher(this.voucher);
-          helpers.verifyAlreadyRedeemedVoucherMessage(this, "speaker");
-          helpers.verifyCancelVoucherButton();
-        });
-
-        helpers.loginAsTeacher(this);
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyAlreadyRedeemedVoucherMessage(this, "speaker");
+        helpers.verifyCancelVoucherButton();
+        helpers.logoutAndLoginAsTeacher(this);
         helpers.verifyNoNewNotification();
       });
     });
@@ -280,12 +211,12 @@ describe("Speaker voucher redemption", () => {
 
   describe("if the seminar has talks", () => {
     it("allows the user to successfully submit talks and become their speaker", function () {
-      let talkIds;
+      const talkIds = [];
 
       helpers.createTutorialsOrTalks(this, "talk");
 
       cy.then(() => {
-        talkIds = [this.talk1.id, this.talk2.id];
+        talkIds.push(this.talk1.id, this.talk2.id);
       });
 
       cy.then(() => {
@@ -294,18 +225,15 @@ describe("Speaker voucher redemption", () => {
       });
 
       helpers.verifyLectureIsSubscribed(this);
-
-      cy.then(() => {
-        helpers.loginAsTeacher(this);
-        helpers.visitLectureContentEdit(this);
-      });
+      helpers.logoutAndLoginAsTeacher(this);
+      helpers.visitLectureContentEdit(this);
 
       cy.then(() => {
         helpers.verifyClaimsContainUserName(this, "talk", talkIds);
       });
 
       cy.then(() => {
-        helpers.verifyRoleNotification(this, "speaker"); ;
+        helpers.verifyRoleNotification(this, "speaker");
         cy.getBySelector("notification-body").should("contain", this.talk1.title)
           .and("contain", this.talk2.title);
       });
@@ -314,17 +242,10 @@ describe("Speaker voucher redemption", () => {
     describe("and the user is already a speaker for all of them", () => {
       it("displays a message that the user is already a speaker for all talks", function () {
         helpers.createTutorialsOrTalks(this, "talk", this.user);
-
-        cy.then(() => {
-          helpers.submitVoucher(this.voucher);
-        });
-
-        cy.then(() => {
-          helpers.verifyAllItemsTakenMessage(this, "talk");
-          helpers.verifyCancelVoucherButton();
-        });
-
-        helpers.loginAsTeacher(this);
+        helpers.submitVoucher(this.voucher);
+        helpers.verifyAllItemsTakenMessage(this, "talk");
+        helpers.verifyCancelVoucherButton();
+        helpers.logoutAndLoginAsTeacher(this);
         helpers.verifyNoNotification();
       });
     });
diff --git a/spec/cypress/support/voucher_redemption_helpers.js b/spec/cypress/support/voucher_redemption_helpers.js
index 8626b7763..059c24a14 100644
--- a/spec/cypress/support/voucher_redemption_helpers.js
+++ b/spec/cypress/support/voucher_redemption_helpers.js
@@ -100,7 +100,7 @@ export function verifyClaimsContainUserName(context, claimType, claimIds, totalC
   });
 }
 
-export function loginAsTeacher(context) {
+export function logoutAndLoginAsTeacher(context) {
   cy.logout();
   cy.login(context.teacher);
 }
@@ -218,6 +218,7 @@ export function visitLectureContentEdit(context) {
 
 export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
   cy.i18n("admin.lecture.no_talks").as("noTalksYet");
+
   cy.then(() => {
     cy.getBySelector("no-talks-yet").should("contain", context.noTalksYet);
     cy.getBySelector("new-talk-btn").should("be.visible");

From 3f68b1fdd65340dee548a86dc7f3db09f92fd607 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:37:25 +0200
Subject: [PATCH 085/191] Extract more methods into helper

---
 .../cypress/e2e/voucher_redemption_spec.cy.js | 19 +++----------------
 .../support/voucher_redemption_helpers.js     | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemption_spec.cy.js
index ea081e04c..f177c436c 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemption_spec.cy.js
@@ -40,11 +40,7 @@ describe("Tutor voucher redemption", () => {
       helpers.visitLectureEdit(this);
       helpers.verifyNoTutorialsButUserEligibleAsTutor(this);
       helpers.verifyRoleNotification(this, "tutor");
-
-      cy.i18n("notifications.no_tutorials_taken").then((noTutorialsTaken) => {
-        cy.getBySelector("notification-body")
-          .should("contain", noTutorialsTaken);
-      });
+      helpers.verifyNothingClaimedInNotification(this, "tutorial");
     });
 
     describe("and the user has already redeemed the voucher", () => {
@@ -115,13 +111,7 @@ describe("Editor voucher redemption", () => {
     helpers.redeemVoucherToBecomeRole(this, "editor");
     helpers.verifyLectureIsSubscribed(this);
     helpers.visitLectureEdit(this);
-
-    cy.getBySelector("lecture-editors-select").within(() => {
-      cy.get("option").should("contain", this.user.name_in_tutorials)
-        .and("contain", this.user.email)
-        .and("not.contain", this.user.name);
-    });
-
+    helpers.verifyUserIsEditor(this);
     helpers.verifyRoleNotification(this, "editor");
   });
 
@@ -189,10 +179,7 @@ describe("Speaker voucher redemption", () => {
       helpers.visitLectureContentEdit(this);
       helpers.verifyNoTalksYetButUserEligibleAsSpeaker(this);
       helpers.verifyRoleNotification(this, "speaker");
-
-      cy.i18n("notifications.no_talks_taken").then((noTalksTaken) => {
-        cy.getBySelector("notification-body").should("contain", noTalksTaken);
-      });
+      helpers.verifyNothingClaimedInNotification(this, "talk");
     });
 
     describe("and the user has already redeemed the voucher", () => {
diff --git a/spec/cypress/support/voucher_redemption_helpers.js b/spec/cypress/support/voucher_redemption_helpers.js
index 059c24a14..fb1ae315c 100644
--- a/spec/cypress/support/voucher_redemption_helpers.js
+++ b/spec/cypress/support/voucher_redemption_helpers.js
@@ -234,3 +234,20 @@ export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
     });
   });
 }
+
+export function verifyUserIsEditor(context) {
+  cy.getBySelector("lecture-editors-select").within(() => {
+    cy.get("option").should("contain", context.user.name_in_tutorials)
+      .and("contain", context.user.email)
+      .and("not.contain", context.user.name);
+  });
+}
+
+export function verifyNothingClaimedInNotification(context, claimType) {
+  cy.i18n(`notifications.no_${claimType}s_taken`).as("nothingClaimed");
+
+  cy.then(() => {
+    cy.getBySelector("notification-body")
+      .should("contain", context.nothingClaimed);
+  });
+}

From c2c8b9d4566e65e12856c7f1140f39597497ea73 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:39:11 +0200
Subject: [PATCH 086/191] Rename files according to conventions

---
 ...her_redemption_spec.cy.js => voucher_redemptions_spec.cy.js} | 2 +-
 ...her_redemption_helpers.js => voucher_redemptions_helpers.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename spec/cypress/e2e/{voucher_redemption_spec.cy.js => voucher_redemptions_spec.cy.js} (99%)
 rename spec/cypress/support/{voucher_redemption_helpers.js => voucher_redemptions_helpers.js} (100%)

diff --git a/spec/cypress/e2e/voucher_redemption_spec.cy.js b/spec/cypress/e2e/voucher_redemptions_spec.cy.js
similarity index 99%
rename from spec/cypress/e2e/voucher_redemption_spec.cy.js
rename to spec/cypress/e2e/voucher_redemptions_spec.cy.js
index f177c436c..614d7019c 100644
--- a/spec/cypress/e2e/voucher_redemption_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemptions_spec.cy.js
@@ -1,4 +1,4 @@
-import * as helpers from "../support/voucher_redemption_helpers";
+import * as helpers from "../support/voucher_redemptions_helpers";
 
 describe("Verify Voucher Form", () => {
   beforeEach(function () {
diff --git a/spec/cypress/support/voucher_redemption_helpers.js b/spec/cypress/support/voucher_redemptions_helpers.js
similarity index 100%
rename from spec/cypress/support/voucher_redemption_helpers.js
rename to spec/cypress/support/voucher_redemptions_helpers.js

From 7acfa684c07d080d4d253e3c8a72a0d7682941e6 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:48:10 +0200
Subject: [PATCH 087/191] Add controller specs for changed lecture update
 policy

---
 spec/controllers/lectures_controller_spec.rb | 57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 spec/controllers/lectures_controller_spec.rb

diff --git a/spec/controllers/lectures_controller_spec.rb b/spec/controllers/lectures_controller_spec.rb
new file mode 100644
index 000000000..f115a00d2
--- /dev/null
+++ b/spec/controllers/lectures_controller_spec.rb
@@ -0,0 +1,57 @@
+require "rails_helper"
+RSpec.describe(LecturesController, type: :controller) do
+  let(:teacher) { FactoryBot.create(:confirmed_user) }
+  let(:generic_user) { FactoryBot.create(:confirmed_user) }
+  let(:lecture) { FactoryBot.create(:lecture, teacher: teacher) }
+  let(:admin) { FactoryBot.create(:confirmed_user, admin: true) }
+  let(:editor) { FactoryBot.create(:confirmed_user, edited_lectures: [lecture]) }
+
+  context "As a teacher" do
+    before do
+      sign_in teacher
+    end
+
+    describe "POST #update" do
+      it "does not update the teacher" do
+        new_teacher = FactoryBot.create(:confirmed_user)
+        post(:update, params: { id: lecture.id,
+                                lecture: { teacher_id: new_teacher.id } })
+        lecture.reload
+        expect(lecture.teacher).to eq(teacher)
+      end
+    end
+  end
+
+  context "As an editor" do
+    before do
+      sign_in editor
+    end
+
+    describe "POST #update" do
+      it "does not update the teacher" do
+        edited_lecture = editor.edited_lectures.first
+        new_teacher = FactoryBot.create(:confirmed_user)
+        post(:update, params: { id: edited_lecture.id,
+                                lecture: { teacher_id: new_teacher.id } })
+        lecture.reload
+        expect(lecture.teacher).to eq(teacher)
+      end
+    end
+  end
+
+  context "As an admin" do
+    before do
+      sign_in admin
+    end
+
+    describe "POST #update" do
+      it "updates the teacher" do
+        new_teacher = FactoryBot.create(:confirmed_user)
+        post(:update, params: { id: lecture.id,
+                                lecture: { teacher_id: new_teacher.id } })
+        lecture.reload
+        expect(lecture.teacher).to eq(new_teacher)
+      end
+    end
+  end
+end

From 2ce127f92e427b9362b26fbb5c2ffcb3705ef539 Mon Sep 17 00:00:00 2001
From: fosterfarrell9 <28628554+fosterfarrell9@users.noreply.github.com>
Date: Tue, 27 Aug 2024 16:37:26 +0200
Subject: [PATCH 088/191] Refactor tests by extracting methods

---
 .../e2e/voucher_redemptions_spec.cy.js        | 177 ++++++++----------
 .../support/voucher_redemptions_helpers.js    |  19 +-
 2 files changed, 86 insertions(+), 110 deletions(-)

diff --git a/spec/cypress/e2e/voucher_redemptions_spec.cy.js b/spec/cypress/e2e/voucher_redemptions_spec.cy.js
index 614d7019c..6e4af3afd 100644
--- a/spec/cypress/e2e/voucher_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/voucher_redemptions_spec.cy.js
@@ -1,5 +1,68 @@
 import * as helpers from "../support/voucher_redemptions_helpers";
 
+function testVoucherRedemptionWithNothingToClaim(context, role, itemType) {
+  helpers.submitVoucher(context.voucher);
+  helpers.verifyVoucherRedemptionText();
+  helpers.verifyNoItemsYetMessage(context, itemType);
+  helpers.redeemVoucherToBecomeRole(context, role);
+  helpers.verifyLectureIsSubscribed(context);
+  helpers.logoutAndLoginAsTeacher(context);
+  helpers.visitEditPage(context, itemType);
+  helpers.verifyNoClaimsYetButUserEligibleForRole(context, role);
+  helpers.verifyRoleNotification(context, role);
+  helpers.verifyNothingClaimedInNotification(context, itemType);
+}
+
+function testVoucherRedemptionWithSomethingClaimed(context, itemType, role) {
+  helpers.createTutorialsOrTalks(context, itemType);
+
+  const itemIds = [];
+  const itemTitles = [];
+
+  cy.then(() => {
+    itemIds.push(context[`${itemType}1`].id, context[`${itemType}2`].id);
+    itemTitles.push(context[`${itemType}1`].title, context[`${itemType}2`].title);
+  });
+
+  cy.then(() => {
+    helpers.submitVoucher(context.voucher);
+    helpers.selectClaimsAndSubmit(itemIds);
+  });
+
+  helpers.verifyLectureIsSubscribed(context);
+  helpers.logoutAndLoginAsTeacher(context);
+  helpers.visitEditPage(context, itemType);
+
+  cy.then(() => {
+    helpers.verifyClaimsContainUserName(context, itemType, itemIds);
+  });
+
+  cy.then(() => {
+    helpers.verifyRoleNotification(context, role);
+    cy.getBySelector("notification-body").should("contain", itemTitles[0])
+      .and("contain", itemTitles[1]);
+  });
+}
+
+function testAlreadyRedeemedVoucher(context, role) {
+  helpers.submitVoucher(context.voucher);
+  helpers.redeemVoucherToBecomeRole(context, role);
+  helpers.submitVoucher(context.voucher);
+  helpers.verifyAlreadyRedeemedVoucherMessage(context, role);
+  helpers.verifyCancelVoucherButton();
+  helpers.logoutAndLoginAsTeacher(context);
+  helpers.verifyNoNewNotification();
+}
+
+function testAlreadyRoleForAllItems(context, itemType) {
+  helpers.createTutorialsOrTalks(context, itemType, context.user);
+  helpers.submitVoucher(context.voucher);
+  helpers.verifyAllItemsTakenMessage(context, itemType);
+  helpers.verifyCancelVoucherButton();
+  helpers.logoutAndLoginAsTeacher(context);
+  helpers.verifyNoNotification();
+}
+
 describe("Verify Voucher Form", () => {
   beforeEach(function () {
     helpers.createRedemptionScenario(this);
@@ -31,70 +94,24 @@ describe("Tutor voucher redemption", () => {
 
   describe("if the lecture has no tutorials yet", () => {
     it("allows redemption of voucher to successfully become tutor", function () {
-      helpers.submitVoucher(this.voucher);
-      helpers.verifyVoucherRedemptionText();
-      helpers.verifyNoItemsYetMessage(this, "tutorial");
-      helpers.redeemVoucherToBecomeRole(this, "tutor");
-      helpers.verifyLectureIsSubscribed(this);
-      helpers.logoutAndLoginAsTeacher(this);
-      helpers.visitLectureEdit(this);
-      helpers.verifyNoTutorialsButUserEligibleAsTutor(this);
-      helpers.verifyRoleNotification(this, "tutor");
-      helpers.verifyNothingClaimedInNotification(this, "tutorial");
+      testVoucherRedemptionWithNothingToClaim(this, "tutor", "tutorial");
     });
 
     describe("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
-        helpers.submitVoucher(this.voucher);
-        helpers.redeemVoucherToBecomeRole(this, "tutor");
-        // redeem the voucher again
-        helpers.submitVoucher(this.voucher);
-        helpers.verifyAlreadyRedeemedVoucherMessage(this, "tutor");
-        helpers.verifyCancelVoucherButton();
-        helpers.logoutAndLoginAsTeacher(this);
-        helpers.verifyNoNewNotification();
+        testAlreadyRedeemedVoucher(this, "tutor");
       });
     });
   });
 
   describe("if the lecture has tutorials", () => {
     it("allows the user to successfully submit tutorials and become their tutor", function () {
-      const tutorialIds = [];
-
-      helpers.createTutorialsOrTalks(this, "tutorial");
-
-      cy.then(() => {
-        tutorialIds.push(this.tutorial1.id, this.tutorial2.id);
-      });
-
-      cy.then(() => {
-        helpers.submitVoucher(this.voucher);
-        helpers.selectClaimsAndSubmit(tutorialIds);
-      });
-
-      helpers.verifyLectureIsSubscribed(this);
-      helpers.logoutAndLoginAsTeacher(this);
-      helpers.visitLectureEdit(this);
-
-      cy.then(() => {
-        helpers.verifyClaimsContainUserName(this, "tutorial", tutorialIds);
-      });
-
-      cy.then(() => {
-        helpers.verifyRoleNotification(this, "tutor");
-        cy.getBySelector("notification-body").should("contain", this.tutorial1.title)
-          .and("contain", this.tutorial2.title);
-      });
+      testVoucherRedemptionWithSomethingClaimed(this, "tutorial", "tutor");
     });
 
     describe("and the user is already a tutor for all of them", () => {
       it("displays a message that the user is already a tutor for all tutorials", function () {
-        helpers.createTutorialsOrTalks(this, "tutorial", this.user);
-        helpers.submitVoucher(this.voucher);
-        helpers.verifyAllItemsTakenMessage(this, "tutorial");
-        helpers.verifyCancelVoucherButton();
-        helpers.logoutAndLoginAsTeacher(this);
-        helpers.verifyNoNotification();
+        testAlreadyRoleForAllItems(this, "tutorial");
       });
     });
   });
@@ -110,7 +127,7 @@ describe("Editor voucher redemption", () => {
     helpers.verifyVoucherRedemptionText();
     helpers.redeemVoucherToBecomeRole(this, "editor");
     helpers.verifyLectureIsSubscribed(this);
-    helpers.visitLectureEdit(this);
+    helpers.visitEditPage(this, "editor");
     helpers.verifyUserIsEditor(this);
     helpers.verifyRoleNotification(this, "editor");
   });
@@ -147,7 +164,7 @@ describe("Teacher voucher redemption", () => {
     helpers.verifyVoucherRedemptionText();
     helpers.redeemVoucherToBecomeRole(this, "teacher");
     helpers.verifyLectureIsSubscribed(this);
-    helpers.visitLectureEdit(this);
+    helpers.visitEditPage(this, "teacher");
     helpers.verifyUserIsTeacher(this);
     helpers.verifyPreviousTeacherIsEditor(this);
     helpers.verifyRoleNotification(this, "teacher");
@@ -170,70 +187,24 @@ describe("Speaker voucher redemption", () => {
 
   describe("If the seminar has no talks yet", () => {
     it("allows the user to successfully become a speaker", function () {
-      helpers.submitVoucher(this.voucher);
-      helpers.verifyVoucherRedemptionText();
-      helpers.verifyNoItemsYetMessage(this, "talk");
-      helpers.redeemVoucherToBecomeRole(this, "speaker");
-      helpers.verifyLectureIsSubscribed(this);
-      helpers.logoutAndLoginAsTeacher(this);
-      helpers.visitLectureContentEdit(this);
-      helpers.verifyNoTalksYetButUserEligibleAsSpeaker(this);
-      helpers.verifyRoleNotification(this, "speaker");
-      helpers.verifyNothingClaimedInNotification(this, "talk");
+      testVoucherRedemptionWithNothingToClaim(this, "speaker", "talk");
     });
 
     describe("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
-        helpers.submitVoucher(this.voucher);
-        helpers.redeemVoucherToBecomeRole(this, "speaker");
-        // redeem the voucher again
-        helpers.submitVoucher(this.voucher);
-        helpers.verifyAlreadyRedeemedVoucherMessage(this, "speaker");
-        helpers.verifyCancelVoucherButton();
-        helpers.logoutAndLoginAsTeacher(this);
-        helpers.verifyNoNewNotification();
+        testAlreadyRedeemedVoucher(this, "speaker");
       });
     });
   });
 
   describe("if the seminar has talks", () => {
     it("allows the user to successfully submit talks and become their speaker", function () {
-      const talkIds = [];
-
-      helpers.createTutorialsOrTalks(this, "talk");
-
-      cy.then(() => {
-        talkIds.push(this.talk1.id, this.talk2.id);
-      });
-
-      cy.then(() => {
-        helpers.submitVoucher(this.voucher);
-        helpers.selectClaimsAndSubmit(talkIds);
-      });
-
-      helpers.verifyLectureIsSubscribed(this);
-      helpers.logoutAndLoginAsTeacher(this);
-      helpers.visitLectureContentEdit(this);
-
-      cy.then(() => {
-        helpers.verifyClaimsContainUserName(this, "talk", talkIds);
-      });
-
-      cy.then(() => {
-        helpers.verifyRoleNotification(this, "speaker");
-        cy.getBySelector("notification-body").should("contain", this.talk1.title)
-          .and("contain", this.talk2.title);
-      });
+      testVoucherRedemptionWithSomethingClaimed(this, "talk", "speaker");
     });
 
     describe("and the user is already a speaker for all of them", () => {
-      it("displays a message that the user is already a speaker for all talks", function () {
-        helpers.createTutorialsOrTalks(this, "talk", this.user);
-        helpers.submitVoucher(this.voucher);
-        helpers.verifyAllItemsTakenMessage(this, "talk");
-        helpers.verifyCancelVoucherButton();
-        helpers.logoutAndLoginAsTeacher(this);
-        helpers.verifyNoNotification();
+      it("displays a message that the user is already a speaker for all talks ", function () {
+        testAlreadyRoleForAllItems(this, "talk");
       });
     });
   });
diff --git a/spec/cypress/support/voucher_redemptions_helpers.js b/spec/cypress/support/voucher_redemptions_helpers.js
index fb1ae315c..079478f5d 100644
--- a/spec/cypress/support/voucher_redemptions_helpers.js
+++ b/spec/cypress/support/voucher_redemptions_helpers.js
@@ -105,11 +105,6 @@ export function logoutAndLoginAsTeacher(context) {
   cy.login(context.teacher);
 }
 
-export function visitLectureEdit(context) {
-  cy.visit(`/lectures/${context.lecture.id}/edit`);
-  cy.getBySelector("people-tab-btn").click();
-}
-
 export function verifyNoTutorialsButUserEligibleAsTutor(context) {
   cy.getBySelector("tutorial-row").should("not.exist");
   cy.getBySelector("new-tutorial-btn").should("be.visible").click();
@@ -212,8 +207,14 @@ export function verifyAlreadyTeacherMessage(context) {
   });
 }
 
-export function visitLectureContentEdit(context) {
-  cy.visit(`/lectures/${context.lecture.id}/edit`);
+export function visitEditPage(context, type) {
+  if (type === "talk") {
+    cy.visit(`/lectures/${context.lecture.id}/edit`);
+  }
+  else {
+    cy.visit(`/lectures/${context.lecture.id}/edit`);
+    cy.getBySelector("people-tab-btn").click();
+  }
 }
 
 export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
@@ -235,6 +236,10 @@ export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
   });
 }
 
+export function verifyNoClaimsYetButUserEligibleForRole(context, role) {
+  role === "tutor" ? verifyNoTutorialsButUserEligibleAsTutor(context) : verifyNoTalksYetButUserEligibleAsSpeaker(context);
+}
+
 export function verifyUserIsEditor(context) {
   cy.getBySelector("lecture-editors-select").within(() => {
     cy.get("option").should("contain", context.user.name_in_tutorials)

From ee16ca229010e53a671cf6293964bf44de951ac4 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 21 Sep 2024 21:55:35 +0200
Subject: [PATCH 089/191] Don't define `redeem` method twice

Apparently I missed that one during the merge.
---
 app/controllers/vouchers_controller.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index b83d0479a..c173a00db 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -51,11 +51,6 @@ def redeem
     end
   end
 
-  def redeem
-    # TODO: this will be dealt with in the corresponding 2nd PR
-    render js: "alert('Voucher redeemed!')"
-  end
-
   def cancel
     respond_to do |format|
       format.html { redirect_to edit_profile_path }

From d01ec9707dd12bd51e64cd10b2682b14c4f71351 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 21 Sep 2024 21:57:06 +0200
Subject: [PATCH 090/191] Pluralize voucher redemption spec filename

---
 ...her_redemptions_spec.cy.js => vouchers_redemptions_spec.cy.js} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/cypress/e2e/{voucher_redemptions_spec.cy.js => vouchers_redemptions_spec.cy.js} (100%)

diff --git a/spec/cypress/e2e/voucher_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
similarity index 100%
rename from spec/cypress/e2e/voucher_redemptions_spec.cy.js
rename to spec/cypress/e2e/vouchers_redemptions_spec.cy.js

From b741b1f463fe25fad3fcdcc860e1c70c81e71861 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 21 Sep 2024 23:04:51 +0200
Subject: [PATCH 091/191] Delete duplicate migration & update new migration
 dates/schema

---
 db/migrate/20240728123817_create_vouchers.rb        | 13 -------------
 ...ions.rb => 20240921200000_create_redemptions.rb} |  0
 ...te_claims.rb => 20240921221000_create_claims.rb} |  1 -
 db/schema.rb                                        |  2 +-
 4 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 db/migrate/20240728123817_create_vouchers.rb
 rename db/migrate/{20240816142403_create_redemptions.rb => 20240921200000_create_redemptions.rb} (100%)
 rename db/migrate/{20240816150011_create_claims.rb => 20240921221000_create_claims.rb} (99%)

diff --git a/db/migrate/20240728123817_create_vouchers.rb b/db/migrate/20240728123817_create_vouchers.rb
deleted file mode 100644
index 155a4eaa5..000000000
--- a/db/migrate/20240728123817_create_vouchers.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class CreateVouchers < ActiveRecord::Migration[7.1]
-  def change
-    create_table :vouchers, id: :uuid, default: "gen_random_uuid()" do |t|
-      t.integer :role, null: false
-      t.references :lecture, null: false, foreign_key: true
-      t.string :secure_hash, null: false
-      t.datetime :invalidated_at
-      t.datetime :expires_at
-      t.timestamps
-    end
-    add_index :vouchers, :secure_hash, unique: true
-  end
-end
diff --git a/db/migrate/20240816142403_create_redemptions.rb b/db/migrate/20240921200000_create_redemptions.rb
similarity index 100%
rename from db/migrate/20240816142403_create_redemptions.rb
rename to db/migrate/20240921200000_create_redemptions.rb
diff --git a/db/migrate/20240816150011_create_claims.rb b/db/migrate/20240921221000_create_claims.rb
similarity index 99%
rename from db/migrate/20240816150011_create_claims.rb
rename to db/migrate/20240921221000_create_claims.rb
index c6bba4d21..0c5ded8de 100644
--- a/db/migrate/20240816150011_create_claims.rb
+++ b/db/migrate/20240921221000_create_claims.rb
@@ -3,7 +3,6 @@ def change
     create_table :claims do |t|
       t.references :redemption, null: false, foreign_key: true
       t.references :claimable, polymorphic: true, null: false
-
       t.timestamps
     end
   end
diff --git a/db/schema.rb b/db/schema.rb
index de6c72b2d..0a6d204ba 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_09_06_200000) do
+ActiveRecord::Schema[7.1].define(version: 2024_09_21_221000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"

From d8e5d36ddd8494d14a221764b4d79e803a4cde78 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 21 Sep 2024 23:16:15 +0200
Subject: [PATCH 092/191] Move cypress helpers to e2e folder

`support` folder should be used for general test-stuff, i.e. not-related
to individual, specific tests.
---
 spec/cypress/e2e/vouchers_redemptions_spec.cy.js                | 2 +-
 .../vouchers_redemptions_spec_helpers.js}                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename spec/cypress/{support/voucher_redemptions_helpers.js => e2e/vouchers_redemptions_spec_helpers.js} (99%)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
index 6e4af3afd..e3e98b62a 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
@@ -1,4 +1,4 @@
-import * as helpers from "../support/voucher_redemptions_helpers";
+import * as helpers from "./vouchers_redemptions_spec_helpers";
 
 function testVoucherRedemptionWithNothingToClaim(context, role, itemType) {
   helpers.submitVoucher(context.voucher);
diff --git a/spec/cypress/support/voucher_redemptions_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
similarity index 99%
rename from spec/cypress/support/voucher_redemptions_helpers.js
rename to spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index 079478f5d..b81eb1679 100644
--- a/spec/cypress/support/voucher_redemptions_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -1,4 +1,4 @@
-import FactoryBot from "./factorybot";
+import FactoryBot from "../support/factorybot";
 
 export function createRedemptionScenario(context, role = "tutor", sort = "lecture") {
   cy.createUser("teacher").as("teacher");

From 4a18ac74af42a27e2e475ba43d1f56fc9e249025 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 22 Sep 2024 22:53:52 +0200
Subject: [PATCH 093/191] Improve naming for voucher finding method

also moved one private function around
---
 app/controllers/vouchers_controller.rb | 12 ++++++------
 app/models/voucher.rb                  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index c173a00db..d873d5800 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -28,7 +28,7 @@ def invalidate
   end
 
   def verify
-    @voucher = Voucher.check_voucher(check_voucher_params[:secure_hash])
+    @voucher = Voucher.find_voucher_by_hash(check_voucher_params[:secure_hash])
     respond_to do |format|
       if @voucher
         format.js
@@ -42,7 +42,7 @@ def verify
   end
 
   def redeem
-    voucher = Voucher.check_voucher(check_voucher_params[:secure_hash])
+    voucher = Voucher.find_voucher_by_hash(check_voucher_params[:secure_hash])
     if voucher
       VoucherProcessor.call(voucher, current_user, check_voucher_params)
       redirect_to edit_profile_path, notice: success_message(voucher)
@@ -64,6 +64,10 @@ def voucher_params
       params.permit(:lecture_id, :role)
     end
 
+    def check_voucher_params
+      params.permit(:secure_hash, tutorial_ids: [], talk_ids: [])
+    end
+
     def find_voucher
       @voucher = Voucher.find_by(id: params[:id])
       return if @voucher
@@ -71,10 +75,6 @@ def find_voucher
       handle_voucher_not_found
     end
 
-    def check_voucher_params
-      params.permit(:secure_hash, tutorial_ids: [], talk_ids: [])
-    end
-
     def set_related_data
       @lecture = @voucher.lecture
       @role = @voucher.role
diff --git a/app/models/voucher.rb b/app/models/voucher.rb
index ad4c4a7f1..4fba68565 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher.rb
@@ -30,7 +30,7 @@ def self.roles_for_lecture(lecture)
     ROLE_HASH.keys - [:speaker]
   end
 
-  def self.check_voucher(secure_hash)
+  def self.find_voucher_by_hash(secure_hash)
     Voucher.active.find_by(secure_hash: secure_hash)
   end
 

From b16f599f1674cba0cc9691b3cdaa5def20570049 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 22 Sep 2024 23:58:03 +0200
Subject: [PATCH 094/191] Inline JSON object in user creator controller

---
 app/controllers/cypress/user_creator_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb
index 9beb3abd3..bc0d637d2 100644
--- a/app/controllers/cypress/user_creator_controller.rb
+++ b/app/controllers/cypress/user_creator_controller.rb
@@ -19,8 +19,8 @@ def create
                          admin: is_admin, locale: I18n.default_locale)
       user.confirm
 
-      additional_data = { password: CYPRESS_PASSWORD }
-      render json: user.as_json.merge(additional_data), status: :created
+      render json: user.as_json.merge({ password: CYPRESS_PASSWORD }),
+             status: :created
     end
   end
 end

From abe2ad9a2643334cdbc8f8dcf50d79e3088e2b61 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 00:16:32 +0200
Subject: [PATCH 095/191] Use symbolic keys upon voucher type case statement

---
 app/services/voucher_processor.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/services/voucher_processor.rb b/app/services/voucher_processor.rb
index 2a428d42b..1ac895d03 100644
--- a/app/services/voucher_processor.rb
+++ b/app/services/voucher_processor.rb
@@ -18,14 +18,14 @@ def call
   private
 
     def process_voucher
-      case @voucher.role
-      when "tutor"
+      case @voucher.role.to_sym
+      when :tutor
         process_tutor_voucher
-      when "editor"
+      when :editor
         process_editor_voucher
-      when "teacher"
+      when :teacher
         process_teacher_voucher
-      when "speaker"
+      when :speaker
         process_speaker_voucher
       end
     end

From 9ab103018be21f663e24b5b20f67699877811780 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 00:24:21 +0200
Subject: [PATCH 096/191] Fix "Redeem voucher" spelling mistake

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 251b1cf75..b29e127b8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2111,7 +2111,7 @@ en:
       Request data
     data_request_sent: >
       We have received your request and will send you your data as soon as possible.
-    redeem_voucher: Redeeem Voucher
+    redeem_voucher: Redeem Voucher
     become_tutor: >
       With this voucher, you can obtain tutor status for %{lecture}.
       With that, editors for the event series and the teacher can assign you

From 8ecb489a3ea760875fb227580ba7a09330173bea Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 10:55:15 +0200
Subject: [PATCH 097/191] Use fixed width for voucher redemption selectize
 field

---
 app/helpers/vouchers_helper.rb             | 2 +-
 app/views/profile/_verify_voucher.html.erb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/vouchers_helper.rb b/app/helpers/vouchers_helper.rb
index 47dcef084..9bde9da15 100644
--- a/app/helpers/vouchers_helper.rb
+++ b/app/helpers/vouchers_helper.rb
@@ -44,7 +44,7 @@ def claim_select_field(form, user, voucher)
     form.select(field_name,
                 options_for_select(options),
                 { prompt: prompt },
-                { multiple: true, class: "selectize me-2 w-50",
+                { multiple: true, class: "selectize me-2", style: "width: 20rem",
                   data: { cy: "claim-select" } })
   end
 end
diff --git a/app/views/profile/_verify_voucher.html.erb b/app/views/profile/_verify_voucher.html.erb
index 954c1cbd5..3e97bf407 100644
--- a/app/views/profile/_verify_voucher.html.erb
+++ b/app/views/profile/_verify_voucher.html.erb
@@ -4,7 +4,8 @@
               html: { class: "form-inline",
                       data: { cy: "verify-voucher-form"} } do |f| %>
     <div class="form-group d-flex">
-        <%= f.text_field :secure_hash, class: "form-control me-2 w-50",
+        <%= f.text_field :secure_hash, class: "form-control me-2",
+                         style: "width: 20rem;",
                          data: { cy: "secure-hash-input" } %>
         <%= f.submit t('buttons.verify_voucher'), class: "btn btn-primary",
                      data: { cy: "verify-voucher-submit" } %>

From c372a2eeefcaaf80efc433ef0280f1319b5e45ea Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 10:56:40 +0200
Subject: [PATCH 098/191] Rename view file to `voucher_redemption_form`

---
 app/views/vouchers/_redeem_speaker_voucher.html.erb             | 2 +-
 app/views/vouchers/_redeem_tutor_voucher.html.erb               | 2 +-
 ..._voucher_form.html.erb => _voucher_redemption_form.html.erb} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename app/views/vouchers/{_voucher_form.html.erb => _voucher_redemption_form.html.erb} (100%)

diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb
index 05c364dfe..879f01bf2 100644
--- a/app/views/vouchers/_redeem_speaker_voucher.html.erb
+++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb
@@ -9,7 +9,7 @@
 
 <% if voucher.lecture.talks_without_speaker(current_user).any? %>
 
-  <%= render partial: "vouchers/voucher_form", locals: { voucher: voucher } %>
+  <%= render partial: "vouchers/voucher_redemption_form", locals: { voucher: voucher } %>
 
 <% elsif voucher.lecture.talks.any? %>
 
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 73c167889..48247e4b6 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -9,7 +9,7 @@
 
 <% if voucher.lecture.tutorials_without_tutor(current_user).any? %>
 
-  <%= render partial: "vouchers/voucher_form", locals: { voucher: voucher } %>
+  <%= render partial: "vouchers/voucher_redemption_form", locals: { voucher: voucher } %>
 
 <% elsif voucher.lecture.tutorials.any? %>
 
diff --git a/app/views/vouchers/_voucher_form.html.erb b/app/views/vouchers/_voucher_redemption_form.html.erb
similarity index 100%
rename from app/views/vouchers/_voucher_form.html.erb
rename to app/views/vouchers/_voucher_redemption_form.html.erb

From 49b7077969cd4c14e8d393fbffd3653bb5db1379 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 10:57:14 +0200
Subject: [PATCH 099/191] Fix indentation in view file (tutor voucher)

---
 app/views/vouchers/_redeem_tutor_voucher.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 48247e4b6..9b5f1da3d 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -22,8 +22,8 @@
 
   <% if current_user.in?(voucher.lecture.tutors_by_redemption) %>
 
-      <%= t('profile.already_tutor_by_redemption') %>
-      <%= cancel_voucher_button %>
+    <%= t('profile.already_tutor_by_redemption') %>
+    <%= cancel_voucher_button %>
 
   <% else %>
 

From 68a3c63e0352473e2ffb700ad8bad214e124e5e2 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 11:51:48 +0200
Subject: [PATCH 100/191] Replace cypress `describe` by `context`

---
 .../e2e/vouchers_redemptions_spec.cy.js       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
index e3e98b62a..305d0ff80 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
@@ -92,24 +92,24 @@ describe("Tutor voucher redemption", () => {
     helpers.createRedemptionScenario(this, "tutor");
   });
 
-  describe("if the lecture has no tutorials yet", () => {
+  context("when the lecture has no tutorials yet", () => {
     it("allows redemption of voucher to successfully become tutor", function () {
       testVoucherRedemptionWithNothingToClaim(this, "tutor", "tutorial");
     });
 
-    describe("and the user has already redeemed the voucher", () => {
+    context("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
         testAlreadyRedeemedVoucher(this, "tutor");
       });
     });
   });
 
-  describe("if the lecture has tutorials", () => {
+  context("when the lecture has tutorials", () => {
     it("allows the user to successfully submit tutorials and become their tutor", function () {
       testVoucherRedemptionWithSomethingClaimed(this, "tutorial", "tutor");
     });
 
-    describe("and the user is already a tutor for all of them", () => {
+    context("and the user is already a tutor for all of them", () => {
       it("displays a message that the user is already a tutor for all tutorials", function () {
         testAlreadyRoleForAllItems(this, "tutorial");
       });
@@ -132,7 +132,7 @@ describe("Editor voucher redemption", () => {
     helpers.verifyRoleNotification(this, "editor");
   });
 
-  describe("if the user has already redeemed the voucher", () => {
+  context("when the user has already redeemed the voucher", () => {
     it("displays a message that the user has already redeemed the voucher", function () {
       helpers.submitVoucher(this.voucher);
       helpers.redeemVoucherToBecomeRole(this, "editor");
@@ -144,7 +144,7 @@ describe("Editor voucher redemption", () => {
     });
   });
 
-  describe("if the user is the teacher of the lecture", () => {
+  context("when the user is the teacher of the lecture", () => {
     it("displays the message that a teacher cannot become an editor", function () {
       helpers.logoutAndLoginAsTeacher(this);
       helpers.submitVoucher(this.voucher);
@@ -170,7 +170,7 @@ describe("Teacher voucher redemption", () => {
     helpers.verifyRoleNotification(this, "teacher");
   });
 
-  describe("if the user is already the teacher", () => {
+  context("when the user is already the teacher", () => {
     it("displays a message that the user is already the teacher", function () {
       helpers.logoutAndLoginAsTeacher(this);
       helpers.submitVoucher(this.voucher);
@@ -185,24 +185,24 @@ describe("Speaker voucher redemption", () => {
     helpers.createRedemptionScenario(this, "speaker", "seminar");
   });
 
-  describe("If the seminar has no talks yet", () => {
+  context("when the seminar has no talks yet", () => {
     it("allows the user to successfully become a speaker", function () {
       testVoucherRedemptionWithNothingToClaim(this, "speaker", "talk");
     });
 
-    describe("and the user has already redeemed the voucher", () => {
+    context("and the user has already redeemed the voucher", () => {
       it("displays a message that the user has already redeemed the voucher", function () {
         testAlreadyRedeemedVoucher(this, "speaker");
       });
     });
   });
 
-  describe("if the seminar has talks", () => {
+  context("when the seminar has talks", () => {
     it("allows the user to successfully submit talks and become their speaker", function () {
       testVoucherRedemptionWithSomethingClaimed(this, "talk", "speaker");
     });
 
-    describe("and the user is already a speaker for all of them", () => {
+    context("and the user is already a speaker for all of them", () => {
       it("displays a message that the user is already a speaker for all talks ", function () {
         testAlreadyRoleForAllItems(this, "talk");
       });

From c1199be90c7e5124190fa1b79393557439be3ef9 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Mon, 23 Sep 2024 12:00:13 +0200
Subject: [PATCH 101/191] Remove reviewer-TODO comments (selectize tomselect)

---
 .vscode/settings.json            | 1 +
 app/views/vouchers/verify.js.erb | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index c9fefa3fe..d6a9bd6e4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -107,6 +107,7 @@
         "factorybot",
         "helpdesk",
         "katex",
+        "selectize",
         "Timecop",
         "turbolinks"
     ]
diff --git a/app/views/vouchers/verify.js.erb b/app/views/vouchers/verify.js.erb
index 9a8ef568b..5a77f0735 100644
--- a/app/views/vouchers/verify.js.erb
+++ b/app/views/vouchers/verify.js.erb
@@ -1,10 +1,7 @@
 $("#redeem-voucher").empty()
-  .append("<%= j render partial: 'vouchers/redeem_' + @voucher.role + '_voucher', locals: { voucher: @voucher } %>");
+  .append("<%= j render partial: 'vouchers/redeem_' + @voucher.role + '_voucher',
+          locals: { voucher: @voucher } %>");
 
-// activate selectize
-// @reviewer: This is used several times in our code base (in the coffeescript
-// variant). Should we extract this into a function in order to avoid code
-// duplication?)
 $(".selectize").each(function () {
   new TomSelect("#" + this.id, { plugins: ["remove_button"] });
 });

From 09502a7f8dbe97225d0d34416fff1c845a314d97 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 25 Sep 2024 23:18:17 +0200
Subject: [PATCH 102/191] Reset Cypress-related code to 49cf16af3790

Command used:
git checkout 49cf16af37901682cc7148b6e4dda8db1c6e3cee -- ./.vscode/settings.json ./app/controllers/cypress/factories_controller.rb ./app/controllers/cypress/user_creator_controller.rb ./spec/cypress/support/factorybot.js
---
 .vscode/settings.json                         |  1 -
 .../cypress/factories_controller.rb           | 71 ++++---------------
 .../cypress/user_creator_controller.rb        | 10 +--
 spec/cypress/support/factorybot.js            |  7 +-
 4 files changed, 17 insertions(+), 72 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d6a9bd6e4..c9fefa3fe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -107,7 +107,6 @@
         "factorybot",
         "helpdesk",
         "katex",
-        "selectize",
         "Timecop",
         "turbolinks"
     ]
diff --git a/app/controllers/cypress/factories_controller.rb b/app/controllers/cypress/factories_controller.rb
index 4c1f7b922..157e9e331 100644
--- a/app/controllers/cypress/factories_controller.rb
+++ b/app/controllers/cypress/factories_controller.rb
@@ -7,34 +7,26 @@ module Cypress
   class FactoriesController < CypressController
     # Wrapper around FactoryBot.create to create a factory via a POST request.
     def create
-      validate_factory_name(params["0"])
+      unless params["0"].is_a?(String)
+        msg = "First argument must be a string indicating the factory name."
+        msg += " But we got: '#{params["0"]}'"
+        raise(ArgumentError, msg)
+      end
 
       attributes, should_validate = params_to_attributes(params.except(:controller, :action,
                                                                        :number))
 
-      # Partition the attributes into valid attributes and instance methods
-      attributes, instance_methods = partition_attributes(attributes)
-
-      # Extract the values from the instance_methods hashes
-      instance_methods = extract_instance_methods(instance_methods)
-
-      res = create_or_build_factory(attributes, should_validate)
-
-      instance_methods_results = evaluate_instance_methods(res, instance_methods)
+      res = if should_validate
+        FactoryBot.create(*attributes) # default case
+      else
+        FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) }
+      end
 
-      render json: res.as_json.merge(instance_methods_results), status: :created
+      render json: res.to_json, status: :created
     end
 
     private
 
-      def validate_factory_name(factory_name)
-        return if factory_name.is_a?(String)
-
-        msg = "First argument must be a string indicating the factory name."
-        msg += " But we got: '#{factory_name}'"
-        raise(ArgumentError, msg)
-      end
-
       def params_to_attributes(params)
         should_validate = true
 
@@ -43,7 +35,7 @@ def params_to_attributes(params)
             if value.key?("validate")
               should_validate = (value["validate"] != "false")
             else
-              transform_hash(value)
+              value.transform_keys(&:to_sym)
             end
           elsif value.is_a?(String)
             value.to_sym
@@ -54,44 +46,5 @@ def params_to_attributes(params)
 
         return attributes, should_validate
       end
-
-      def transform_hash(value)
-        value.transform_keys(&:to_sym).transform_values do |v|
-          if v.is_a?(Hash) && v.keys.all? { |k| k.match?(/^\d+$/) }
-            # Convert nested arrays to arrays of strings
-            v.values.map(&:to_s)
-          else
-            v
-          end
-        end
-      end
-
-      def partition_attributes(attributes)
-        attributes.partition do |attr|
-          !(attr.is_a?(Hash) && attr.keys == ["instance_methods"])
-        end
-      end
-
-      def extract_instance_methods(instance_methods)
-        instance_methods.flat_map { |hash| hash["instance_methods"] }
-      end
-
-      def create_or_build_factory(attributes, should_validate)
-        if should_validate
-          FactoryBot.create(*attributes) # default case
-        else
-          FactoryBot.build(*attributes).tap { |instance| instance.save(validate: false) }
-        end
-      end
-
-      def evaluate_instance_methods(instance, methods)
-        methods.index_with do |method_name|
-          if instance.respond_to?(method_name)
-            instance.send(method_name)
-          else
-            throw("Method not found: #{method_name}")
-          end
-        end
-      end
   end
 end
diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb
index bc0d637d2..f82b4dd18 100644
--- a/app/controllers/cypress/user_creator_controller.rb
+++ b/app/controllers/cypress/user_creator_controller.rb
@@ -1,8 +1,6 @@
 module Cypress
   # Creates a user for use in Cypress tests.
   class UserCreatorController < CypressController
-    CYPRESS_PASSWORD = "cypress123".freeze
-
     def create
       unless params[:role].is_a?(String)
         msg = "First argument must be a string indicating the user role."
@@ -14,13 +12,11 @@ def create
       is_admin = (role == "admin")
 
       user = User.create(name: "#{role} Cypress", email: "#{role}@mampf.cypress",
-                         name_in_tutorials: "#{role} Real Cypress Name",
-                         password: CYPRESS_PASSWORD, consents: true,
-                         admin: is_admin, locale: I18n.default_locale)
+                         password: "cypress123", consents: true, admin: is_admin,
+                         locale: I18n.default_locale)
       user.confirm
 
-      render json: user.as_json.merge({ password: CYPRESS_PASSWORD }),
-             status: :created
+      render json: user.to_json, status: :created
     end
   end
 end
diff --git a/spec/cypress/support/factorybot.js b/spec/cypress/support/factorybot.js
index 1a030ee91..973ffacd0 100644
--- a/spec/cypress/support/factorybot.js
+++ b/spec/cypress/support/factorybot.js
@@ -9,13 +9,10 @@ class FactoryBot {
    * @param args The arguments to pass to FactoryBot.create(), e.g.
    * factory name, traits, and attributes. Pass them in as separated
    * string arguments. Attributes should be passed as an object.
-   * You can also pass instance methods as an array of strings.
-   * @returns The FactoryBot.create() response. If you added instance methods,
-   * the response will be enriched by the results of the instance methods.
+   * @returns The FactoryBot.create() response
    *
-   * @examples
+   * @example
    * FactoryBot.create("factory_name", "with_trait", { another_attribute: ".pdf"})
-   * FactoryBot.create("factory_name", { instance_methods: ["method_name"] })
    */
   create(...args) {
     return BackendCaller.callCypressRoute("factories", "FactoryBot.create()", args);

From 035c6bd1778e90269ba208bae8c0fa957660db9f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 26 Sep 2024 00:08:07 +0200
Subject: [PATCH 103/191] Use new .call syntax in cypress tests

(in order to call instance methods, see #696
---
 .../e2e/vouchers_redemptions_spec_helpers.js        | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index b81eb1679..8ad3a0384 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -6,8 +6,7 @@ export function createRedemptionScenario(context, role = "tutor", sort = "lectur
 
   cy.then(() => {
     FactoryBot.create("lecture",
-      { teacher_id: context.teacher.id, sort: sort },
-      { instance_methods: ["title_no_term", "title_for_viewers"] }).as("lecture");
+      { teacher_id: context.teacher.id, sort: sort }).as("lecture");
   });
 
   cy.then(() => {
@@ -120,8 +119,9 @@ export function verifyNoTutorialsButUserEligibleAsTutor(context) {
 
 export function verifyLectureIsSubscribed(context) {
   cy.visit("/main/start");
-  cy.getBySelector("subscribed-inactive-lectures-collapse")
-    .should("contain", context.lecture.title_no_term);
+  context.lecture.call.title_no_term().then((title) => {
+    cy.getBySelector("subscribed-inactive-lectures-collapse").should("contain", title);
+  });
 }
 
 export function verifyRoleNotification(context, role) {
@@ -137,8 +137,9 @@ export function verifyRoleNotification(context, role) {
       .and("contain", context.user.name_in_tutorials);
     cy.visit("/notifications");
     cy.getBySelector("notification-card").should("have.length", 1);
-    cy.getBySelector("notification-header")
-      .should("contain", context.lecture.title_for_viewers);
+    context.lecture.call.title_for_viewers().then((title) => {
+      cy.getBySelector("notification-header").should("contain", title);
+    });
     cy.getBySelector("notification-body")
       .should("contain", context.redemptionMessage)
       .and("contain", context.user.name_in_tutorials)

From 0b88647c9df8de1dd6cde3225c4f400c71edbad4 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 26 Sep 2024 00:08:36 +0200
Subject: [PATCH 104/191] Explicitly set `name_in_tutorials` for users

---
 app/controllers/cypress/user_creator_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb
index 41366accc..46f4f830e 100644
--- a/app/controllers/cypress/user_creator_controller.rb
+++ b/app/controllers/cypress/user_creator_controller.rb
@@ -16,6 +16,7 @@ def create
 
       user = User.create(name: "#{role} Cypress #{random_hash}",
                          email: "#{role}-#{random_hash}@mampf.cypress",
+                         name_in_tutorials: "cy-#{role}-#{random_hash}",
                          password: CYPRESS_PASSWORD, consents: true, admin: is_admin,
                          locale: I18n.default_locale)
       user.confirm

From 15fe4f126bf6b94c17eab65c25f4e2ec1678ae51 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 26 Sep 2024 00:09:12 +0200
Subject: [PATCH 105/191] Remove constraint that user id must be a number

This is such that UUIDs also work.
---
 spec/cypress/support/factorybot.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/spec/cypress/support/factorybot.js b/spec/cypress/support/factorybot.js
index d5b136a14..40c1e5faa 100644
--- a/spec/cypress/support/factorybot.js
+++ b/spec/cypress/support/factorybot.js
@@ -70,13 +70,6 @@ class FactoryBot {
       msg += " Did you really use FactoryBot.create() (or similar) to create the record?";
       throw new Error(msg);
     }
-
-    if (typeof response.id !== "number") {
-      let msg = "FactoryBot call response does not contain a valid id key (number).";
-      msg += " Did you really use FactoryBot.create() (or similar) to create the record?";
-      throw new Error(msg);
-    }
-
     const call = this.#allowDynamicMethods({}, factoryName, response.id);
     response.call = call;
   }

From 8cb3c43e75a92b1d9c2eb0c79e0c6416de9d0a60 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 3 Oct 2024 17:14:17 +0200
Subject: [PATCH 106/191] Init support for entity-relationship-diagram creation

---
 .config/commands/utils.justfile | 71 +++++++++++++++++++++++++++++++++
 .justfile                       |  3 ++
 docker/development/Dockerfile   |  2 +-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 .config/commands/utils.justfile

diff --git a/.config/commands/utils.justfile b/.config/commands/utils.justfile
new file mode 100644
index 000000000..1e5e29b9d
--- /dev/null
+++ b/.config/commands/utils.justfile
@@ -0,0 +1,71 @@
+# Prints this help message
+[private]
+help:
+    @just --list --justfile {{source_file()}}
+
+# Generates entity-relationship diagrams (ERD) of the database
+erd:
+    #!/usr/bin/env bash
+
+    # Make sure the mampf dev container is running
+    cd {{justfile_directory()}}/docker/development/
+    if [ -z "$(docker compose ps --services --filter 'status=running' | grep mampf)" ]; then
+        echo "The mampf dev container is not running. Please start it first (use 'just docker')."
+        exit 1
+    fi
+
+    mkdir -p {{justfile_directory()}}/tmp/erd/
+
+    # ▶ Generate ERDs
+    # Customize it with options from here: https://voormedia.github.io/rails-erd/customise.html
+    # Also see the output from: 'bundle exec erd --help' (inside the dev container)
+
+    # Ignore some tables
+    ignored_thredded="Thredded::Post,Thredded::UserPostNotification,Thredded::PrivateUser,Thredded::UserPrivateTopicReadState,Thredded::PrivateTopic,Thredded::MessageboardUser,Thredded::PrivatePost,Thredded:UserDetail,Thredded::MessageboardGroup,Thredded::Messageboard,Thredded::Category,Thredded::TopicCategory,Thredded::Topic,Thredded::UserTopicReadState,Thredded::UserTopicFollow,Thredded::NotificationsForFollowedTopics,Thredded::MessageboardNotificationsForFollowedTopics,Thredded::UserPreference,Thredded::UserMessageboardPreference,Thredded::NotificationsForPrivateTopics,Thredded::PostModerationRecord,Thredded::UserDetail"
+    ignored_translation="Mobility::Backends::ActiveRecord::Table::Translation,Subject::Translation,Program::Translation,Division::Translation"
+    ignored_commontator="Commontable,Votable,Subscriber,Creator"
+    other_ignored="ActionMailbox::Record,ActionText::Record,ActiveStorage::Record,Sluggable,FriendlyId::Slug,ApplicationRecord,InteractionsRecord"
+    exclude_default="${ignored_thredded},${ignored_translation},${ignored_commontator},${other_ignored}"
+
+    # 🌟 Overview with attributes (warnings will be printed only here)
+    docker compose exec -it mampf rake erd \
+        title=false filename=/usr/src/app/tmp/erd/mampf-erd-overview-with-attributes \
+        inheritance=false polymorphism=true indirect=false attributes=content \
+        exclude="${exclude_default}"
+
+    # 🌟 Generic Overview
+    docker compose exec -it mampf rake erd warn=false \
+        title=false filename=/usr/src/app/tmp/erd/mampf-erd-overview \
+        inheritance=false polymorphism=true indirect=false attributes=false \
+        exclude="${exclude_default}"
+
+    # 🌟 Vouchers
+    docker compose exec -it mampf rake erd warn=false \
+        title="Vouchers" filename=/usr/src/app/tmp/erd/mampf-erd-vouchers \
+        inheritance=true polymorphism=true indirect=true attributes=content \
+        exclude="${exclude_default},Teachable,Editable" \
+        only="User,Claim,Voucher,Redemption,Lecture,Tutorial,Talk"
+
+    # 🌟 Tutorials
+    docker compose exec -it mampf rake erd warn=false \
+        title="Tutorials" filename=/usr/src/app/tmp/erd/mampf-erd-tutorials \
+        inheritance=true polymorphism=true indirect=true attributes=content \
+        exclude="${exclude_default},Claimable,Editable,Teachable" \
+        only="User,Lecture,Tutorial,Submission,Assignment,TutorTutorialJoin,UserSubmissionJoin"
+
+    # 🌟 Courses
+    docker compose exec -it mampf rake erd warn=false \
+        title="Courses" filename=/usr/src/app/tmp/erd/mampf-erd-courses \
+        inheritance=true polymorphism=true indirect=true attributes=content \
+        exclude="${exclude_default},Claimable,Editable" \
+        only="Subject,Program,Division,DivisionCourseJoin,Course,Lecture,CourseSelfJoin,Lesson"
+
+    # 🌟 Lectures
+    docker compose exec -it mampf rake erd warn=false \
+        title="Lectures" filename=/usr/src/app/tmp/erd/mampf-erd-lectures \
+        inheritance=true polymorphism=true indirect=true attributes=content \
+        exclude="${exclude_default},Claimable,Editable,Teachable" \
+        only="Lecture,Lesson,Chapter,Section,Item,LessonSectionJoin,Term"
+
+    echo "📂 Diagrams are ready for you in the folder {{justfile_directory()}}/tmp/erd/"
+    echo "🔀 For the meanings of the arrows, refer to https://voormedia.github.io/rails-erd/gallery.html#notations"
diff --git a/.justfile b/.justfile
index 5b36d3496..db8231023 100644
--- a/.justfile
+++ b/.justfile
@@ -13,6 +13,9 @@ mod test ".config/commands/test.justfile"
 # Docker-related commands
 mod docker ".config/commands/docker.justfile"
 
+# Some utils, e.g. ERD-generation etc.
+mod utils ".config/commands/utils.justfile"
+
 # Opens the MaMpf wiki in the default browser
 wiki:
     #!/usr/bin/env bash
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 8b6201bd7..7a3efdf5b 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -53,7 +53,7 @@ RUN yarn set version "${YARN_VERSION}"
 RUN apt update && \
     apt-get install -y --no-install-recommends \
         ffmpeg imagemagick pdftk ghostscript shared-mime-info \
-        libarchive-tools postgresql-client-13 wget wait-for-it
+        libarchive-tools postgresql-client-13 wget wait-for-it graphviz
 
 # Setup ImageMagick
 RUN sed -i '/disable ghostscript format types/,+6d' /etc/ImageMagick-6/policy.xml

From 16bb7659710e49887c502a41f973d57d4a8dbacb Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 12:31:41 +0200
Subject: [PATCH 107/191] Add `has_many :notifications` for better ERD
 visibility

---
 app/models/announcement.rb | 2 ++
 app/models/course.rb       | 2 ++
 app/models/lecture.rb      | 2 ++
 app/models/medium.rb       | 2 ++
 app/models/redemption.rb   | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/app/models/announcement.rb b/app/models/announcement.rb
index 4504b0ff7..c1f2f4c28 100644
--- a/app/models/announcement.rb
+++ b/app/models/announcement.rb
@@ -4,6 +4,8 @@ class Announcement < ApplicationRecord
   belongs_to :lecture, optional: true, touch: true
   belongs_to :announcer, class_name: "User"
 
+  has_many :notifications, as: :notifiable, dependent: :destroy
+
   validates :details, presence: true
 
   paginates_per 10
diff --git a/app/models/course.rb b/app/models/course.rb
index 5edf63bfa..574e1f4e6 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -4,6 +4,8 @@ class Course < ApplicationRecord
 
   has_many :lectures, dependent: :destroy
 
+  has_many :notifications, as: :notifiable, dependent: :destroy
+
   # tags are notions that treated in the course
   # e.g.: vector space, linear map are tags for the course 'Linear Algebra 1'
   has_many :course_tag_joins, dependent: :destroy
diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index d0932eed3..35a654c2e 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -4,6 +4,8 @@ class Lecture < ApplicationRecord
 
   belongs_to :course
 
+  has_many :notifications, as: :notifiable, dependent: :destroy
+
   # teacher is the user that gives the lecture
   belongs_to :teacher, class_name: "User"
 
diff --git a/app/models/medium.rb b/app/models/medium.rb
index ab667c7cb..bd59866d5 100644
--- a/app/models/medium.rb
+++ b/app/models/medium.rb
@@ -3,6 +3,8 @@ class Medium < ApplicationRecord
   include ApplicationHelper
   include ActiveModel::Dirty
 
+  has_many :notifications, as: :notifiable, dependent: :destroy
+
   # a teachable is a course/lecture/lesson
   belongs_to :teachable, polymorphic: true, optional: true
   acts_as_list scope: [:teachable_id, :teachable_type], top_of_list: 0
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 190a3aa94..49e6fa6d8 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -10,6 +10,8 @@ class Redemption < ApplicationRecord
   has_many :claimed_talks, through: :claims, source: :claimable,
                            source_type: "Talk"
 
+  has_many :notifications, as: :notifiable, dependent: :destroy
+
   delegate :lecture, to: :voucher
   delegate :role, to: :voucher
   delegate :tutor?, to: :voucher

From b5d5453919f09bb39fcefbd9b6d14641d177f085 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 12:35:16 +0200
Subject: [PATCH 108/191] Remove usage of delegate methods from redemption

---
 app/helpers/redemptions_helper.rb | 20 ++++++++++----------
 app/models/notification.rb        |  2 +-
 app/models/redemption.rb          |  7 -------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/helpers/redemptions_helper.rb b/app/helpers/redemptions_helper.rb
index e8381edc8..50cbad850 100644
--- a/app/helpers/redemptions_helper.rb
+++ b/app/helpers/redemptions_helper.rb
@@ -1,23 +1,23 @@
 # Redemptions Helper
 module RedemptionsHelper
   def redemption_notification_card_header(redemption)
-    link_to(redemption.lecture.title_for_viewers,
-            edit_lecture_path(redemption.lecture,
-                              anchor: ("people" unless redemption.speaker?)),
+    link_to(redemption.voucher.lecture.title_for_viewers,
+            edit_lecture_path(redemption.voucher.lecture,
+                              anchor: ("people" unless redemption.voucher.speaker?)),
             class: "text-dark")
   end
 
   def redemption_notification_item_header(redemption)
     t("notifications.redemption_in_lecture",
-      lecture: redemption.lecture.title_for_viewers)
+      lecture: redemption.voucher.lecture.title_for_viewers)
   end
 
   def redemption_notification_details(redemption)
-    if redemption.tutor?
+    if redemption.voucher.tutor?
       tutor_notification_details(redemption)
-    elsif redemption.editor?
+    elsif redemption.voucher.editor?
       editor_notification_details(redemption)
-    elsif redemption.teacher?
+    elsif redemption.voucher.teacher?
       teacher_notification_details(redemption)
     else
       speaker_notification_details(redemption)
@@ -25,11 +25,11 @@ def redemption_notification_details(redemption)
   end
 
   def redemption_notification_item_details(redemption)
-    result = if redemption.tutor?
+    result = if redemption.voucher.tutor?
       tutor_notification_item_details(redemption)
-    elsif redemption.editor?
+    elsif redemption.voucher.editor?
       editor_notification_item_details(redemption)
-    elsif redemption.teacher?
+    elsif redemption.voucher.teacher?
       teacher_notification_item_details(redemption)
     else
       speaker_notification_item_details(redemption)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 669d23865..fb0627215 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -29,7 +29,7 @@ def path(user)
     return if notifiable.blank?
 
     if redemption?
-      edit_lecture_path(notifiable.lecture, anchor: "people")
+      edit_lecture_path(notifiable.voucher.lecture, anchor: "people")
     elsif lecture_or_course?
       edit_profile_path
     elsif lecture_announcement?
diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 49e6fa6d8..5185f95f5 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -11,11 +11,4 @@ class Redemption < ApplicationRecord
                            source_type: "Talk"
 
   has_many :notifications, as: :notifiable, dependent: :destroy
-
-  delegate :lecture, to: :voucher
-  delegate :role, to: :voucher
-  delegate :tutor?, to: :voucher
-  delegate :editor?, to: :voucher
-  delegate :teacher?, to: :voucher
-  delegate :speaker?, to: :voucher
 end

From e2786e3f49bd8b1a4471ea2a6f2c99c8d7b7d946 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 12:36:17 +0200
Subject: [PATCH 109/191] Don't hardcode source_type as string

---
 app/models/redemption.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/redemption.rb b/app/models/redemption.rb
index 5185f95f5..eaa960336 100644
--- a/app/models/redemption.rb
+++ b/app/models/redemption.rb
@@ -6,9 +6,9 @@ class Redemption < ApplicationRecord
   belongs_to :user
   has_many :claims, dependent: :destroy
   has_many :claimed_tutorials, through: :claims, source: :claimable,
-                               source_type: "Tutorial"
+                               source_type: Tutorial.name
   has_many :claimed_talks, through: :claims, source: :claimable,
-                           source_type: "Talk"
+                           source_type: Talk.name
 
   has_many :notifications, as: :notifiable, dependent: :destroy
 end

From d33072d5895ca23d63f354b8aded14133cd73a63 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 15:48:11 +0200
Subject: [PATCH 110/191] Refactor voucher_processor into model concern

According to concepts discussed in #694.
Also auto-load subdirectories in models folder
and set Current.user for usage in models.
---
 app/controllers/application_controller.rb |  6 ++
 app/controllers/vouchers_controller.rb    | 10 +--
 app/models/concerns/.keep                 |  0
 app/models/current.rb                     |  4 ++
 app/models/voucher/redeemable.rb          | 68 +++++++++++++++++++++
 app/models/{ => voucher}/redemption.rb    |  0
 app/models/{ => voucher}/voucher.rb       |  2 +
 app/services/application_service.rb       | 10 ---
 app/services/voucher_processor.rb         | 74 -----------------------
 config/application.rb                     |  4 ++
 10 files changed, 87 insertions(+), 91 deletions(-)
 delete mode 100644 app/models/concerns/.keep
 create mode 100644 app/models/current.rb
 create mode 100644 app/models/voucher/redeemable.rb
 rename app/models/{ => voucher}/redemption.rb (100%)
 rename app/models/{ => voucher}/voucher.rb (98%)
 delete mode 100644 app/services/application_service.rb
 delete mode 100644 app/services/voucher_processor.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ea2e6c943..dfe2dbb0f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -8,6 +8,7 @@ class ApplicationController < ActionController::Base
   before_action :authenticate_user!
   before_action :set_locale
   after_action :store_interaction, if: :user_signed_in?
+  before_action :set_current_user
 
   etag { current_user.try(:id) }
 
@@ -135,4 +136,9 @@ def cookie_locale_param
     def available_locales
       I18n.available_locales.map(&:to_s)
     end
+
+    # https://stackoverflow.com/a/69313330/
+    def set_current_user
+      Current.user = current_user
+    end
 end
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index d873d5800..334385c0b 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -28,7 +28,7 @@ def invalidate
   end
 
   def verify
-    @voucher = Voucher.find_voucher_by_hash(check_voucher_params[:secure_hash])
+    @voucher = Voucher.find_voucher_by_hash(params[:secure_hash])
     respond_to do |format|
       if @voucher
         format.js
@@ -42,9 +42,9 @@ def verify
   end
 
   def redeem
-    voucher = Voucher.find_voucher_by_hash(check_voucher_params[:secure_hash])
+    voucher = Voucher.find_voucher_by_hash(params[:secure_hash])
     if voucher
-      VoucherProcessor.call(voucher, current_user, check_voucher_params)
+      voucher.redeem(params.permit(:tutorial_ids, :talk_ids))
       redirect_to edit_profile_path, notice: success_message(voucher)
     else
       handle_invalid_voucher
@@ -64,10 +64,6 @@ def voucher_params
       params.permit(:lecture_id, :role)
     end
 
-    def check_voucher_params
-      params.permit(:secure_hash, tutorial_ids: [], talk_ids: [])
-    end
-
     def find_voucher
       @voucher = Voucher.find_by(id: params[:id])
       return if @voucher
diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/models/current.rb b/app/models/current.rb
new file mode 100644
index 000000000..619f480c5
--- /dev/null
+++ b/app/models/current.rb
@@ -0,0 +1,4 @@
+# https://api.rubyonrails.org/classes/ActiveSupport/CurrentAttributes.html
+class Current < ActiveSupport::CurrentAttributes
+  attribute :user
+end
diff --git a/app/models/voucher/redeemable.rb b/app/models/voucher/redeemable.rb
new file mode 100644
index 000000000..bbbb5d2dd
--- /dev/null
+++ b/app/models/voucher/redeemable.rb
@@ -0,0 +1,68 @@
+module Redeemable
+  extend ActiveSupport::Concern
+  include Notifier
+
+  included do
+    has_many :redemptions, dependent: :destroy
+  end
+
+  def redeem(params)
+    case role.to_sym
+    when :tutor
+      process_tutor_voucher(params[:tutorial_ids])
+    when :editor
+      process_editor_voucher
+    when :teacher
+      process_teacher_voucher
+    when :speaker
+      process_speaker_voucher(params[:talk_ids])
+    end
+  end
+
+  private
+
+    def process_tutor_voucher(tutorial_ids)
+      selected_tutorials = lecture.tutorials.where(id: tutorial_ids)
+      lecture.update_tutor_status!(Current.user, selected_tutorials)
+
+      Redemption.create(user: Current.user, voucher: self,
+                        claimed_tutorials: selected_tutorials)
+    end
+
+    def process_editor_voucher
+      lecture.update_editor_status!(Current.user)
+      notify_new_editor_by_mail(Current.user, lecture)
+
+      Redemption.create(user: Current.user, voucher: self)
+    end
+
+    def process_teacher_voucher
+      previous_teacher = lecture.teacher
+      lecture.update_teacher_status!(Current.user)
+      # no need to send out notifications if the teacher stays the same
+      # because then there is no demotion to editor
+      # (it is actually not possible to trigger this case via the GUI)
+      if previous_teacher != Current.user
+        notify_about_teacher_change_by_mail(lecture,
+                                            previous_teacher)
+      end
+      invalidate!
+
+      Redemption.create(user: Current.user, voucher: self)
+    end
+
+    def process_speaker_voucher(talk_ids)
+      selected_talks = lecture.talks.where(id: talk_ids)
+      lecture.update_speaker_status!(Current.user, selected_talks)
+      notify_cospeakers_by_mail(Current.user, selected_talks)
+
+      Redemption.create(user: Current.user, voucher: self,
+                        claimed_talks: selected_talks)
+    end
+
+    def create_notifications!(redemption)
+      lecture.editors_and_teacher.each do |editor|
+        Notification.create(notifiable: redemption, recipient: editor)
+      end
+    end
+end
diff --git a/app/models/redemption.rb b/app/models/voucher/redemption.rb
similarity index 100%
rename from app/models/redemption.rb
rename to app/models/voucher/redemption.rb
diff --git a/app/models/voucher.rb b/app/models/voucher/voucher.rb
similarity index 98%
rename from app/models/voucher.rb
rename to app/models/voucher/voucher.rb
index 4fba68565..37af63377 100644
--- a/app/models/voucher.rb
+++ b/app/models/voucher/voucher.rb
@@ -1,4 +1,6 @@
 class Voucher < ApplicationRecord
+  include Redeemable
+
   SPEAKER_EXPIRATION_DAYS = 30
   TUTOR_EXPIRATION_DAYS = 14
   DEFAULT_EXPIRATION_DAYS = 3
diff --git a/app/services/application_service.rb b/app/services/application_service.rb
deleted file mode 100644
index 6a9138c11..000000000
--- a/app/services/application_service.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# ApplicationService is a base class for all services in the application.
-# See https://www.toptal.com/ruby-on-rails/rails-service-objects-tutorial
-class ApplicationService
-  def self.call(...)
-    new(...).call
-  end
-
-  def initialize(*args)
-  end
-end
diff --git a/app/services/voucher_processor.rb b/app/services/voucher_processor.rb
deleted file mode 100644
index 1ac895d03..000000000
--- a/app/services/voucher_processor.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-class VoucherProcessor < ApplicationService
-  include Notifier
-
-  def initialize(voucher, user, params)
-    super
-    @voucher = voucher
-    @lecture = voucher.lecture
-    @user = user
-    @params = params
-  end
-
-  def call
-    redemption = process_voucher
-    create_notifications!(redemption)
-    @user.subscribe_lecture!(@lecture)
-  end
-
-  private
-
-    def process_voucher
-      case @voucher.role.to_sym
-      when :tutor
-        process_tutor_voucher
-      when :editor
-        process_editor_voucher
-      when :teacher
-        process_teacher_voucher
-      when :speaker
-        process_speaker_voucher
-      end
-    end
-
-    def process_tutor_voucher
-      selected_tutorials = @lecture.tutorials.where(id: @params[:tutorial_ids])
-      @lecture.update_tutor_status!(@user, selected_tutorials)
-
-      Redemption.create(user: @user, voucher: @voucher,
-                        claimed_tutorials: selected_tutorials)
-    end
-
-    def process_editor_voucher
-      @lecture.update_editor_status!(@user)
-      notify_new_editor_by_mail(@user, @lecture)
-
-      Redemption.create(user: @user, voucher: @voucher)
-    end
-
-    def process_teacher_voucher
-      previous_teacher = @lecture.teacher
-      @lecture.update_teacher_status!(@user)
-      # no need to send out notifications if the teacher stays the same
-      # because then there is no demotion to editor
-      # (it is actually not possible to trigger this case via the GUI)
-      notify_about_teacher_change_by_mail(@lecture, previous_teacher) if previous_teacher != @user
-      @voucher.invalidate!
-
-      Redemption.create(user: @user, voucher: @voucher)
-    end
-
-    def process_speaker_voucher
-      selected_talks = @lecture.talks.where(id: @params[:talk_ids])
-      @lecture.update_speaker_status!(@user, selected_talks)
-      notify_cospeakers_by_mail(@user, selected_talks)
-
-      Redemption.create(user: @user, voucher: @voucher,
-                        claimed_talks: selected_talks)
-    end
-
-    def create_notifications!(redemption)
-      @lecture.editors_and_teacher.each do |editor|
-        Notification.create(notifiable: redemption, recipient: editor)
-      end
-    end
-end
diff --git a/config/application.rb b/config/application.rb
index a1093b31f..3776f95e9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -12,6 +12,10 @@ class Application < Rails::Application
     config.load_defaults(7.1)
     config.autoloader = :zeitwerk
 
+    # Autoload subfolders of modules (recursively)
+    # https://stackoverflow.com/a/4794775/
+    config.autoload_paths += Rails.root.glob("app/models/**/")
+
     # Autoload lib extensions path
     config.autoload_lib(ignore: ["assets", "collectors", "core_ext", "scrapers", "tasks"])
 

From 0c98e6ac6ec8b800f417cf718cff79215b94b6d7 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 15:55:07 +0200
Subject: [PATCH 111/191] Add missing notification and subscribe lecture steps

---
 app/models/voucher/redeemable.rb | 34 +++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/models/voucher/redeemable.rb b/app/models/voucher/redeemable.rb
index bbbb5d2dd..82586c920 100644
--- a/app/models/voucher/redeemable.rb
+++ b/app/models/voucher/redeemable.rb
@@ -7,21 +7,27 @@ module Redeemable
   end
 
   def redeem(params)
-    case role.to_sym
-    when :tutor
-      process_tutor_voucher(params[:tutorial_ids])
-    when :editor
-      process_editor_voucher
-    when :teacher
-      process_teacher_voucher
-    when :speaker
-      process_speaker_voucher(params[:talk_ids])
-    end
+    redemption = create_redemption(params)
+    create_notifications!(redemption)
+    Current.user.subscribe_lecture!(lecture)
   end
 
   private
 
-    def process_tutor_voucher(tutorial_ids)
+    def create_redemption(params)
+      case role.to_sym
+      when :tutor
+        redeem_tutor_voucher(params[:tutorial_ids])
+      when :editor
+        redeem_editor_voucher
+      when :teacher
+        redeem_teacher_voucher
+      when :speaker
+        redeem_speaker_voucher(params[:talk_ids])
+      end
+    end
+
+    def redeem_tutor_voucher(tutorial_ids)
       selected_tutorials = lecture.tutorials.where(id: tutorial_ids)
       lecture.update_tutor_status!(Current.user, selected_tutorials)
 
@@ -29,14 +35,14 @@ def process_tutor_voucher(tutorial_ids)
                         claimed_tutorials: selected_tutorials)
     end
 
-    def process_editor_voucher
+    def redeem_editor_voucher
       lecture.update_editor_status!(Current.user)
       notify_new_editor_by_mail(Current.user, lecture)
 
       Redemption.create(user: Current.user, voucher: self)
     end
 
-    def process_teacher_voucher
+    def redeem_teacher_voucher
       previous_teacher = lecture.teacher
       lecture.update_teacher_status!(Current.user)
       # no need to send out notifications if the teacher stays the same
@@ -51,7 +57,7 @@ def process_teacher_voucher
       Redemption.create(user: Current.user, voucher: self)
     end
 
-    def process_speaker_voucher(talk_ids)
+    def redeem_speaker_voucher(talk_ids)
       selected_talks = lecture.talks.where(id: talk_ids)
       lecture.update_speaker_status!(Current.user, selected_talks)
       notify_cospeakers_by_mail(Current.user, selected_talks)

From 66b6edf6d190a01890a2a9ff0bd51fbc5c873b07 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 16:00:00 +0200
Subject: [PATCH 112/191] Move vouchers down in UI (lecture edit page)

---
 app/views/lectures/edit/_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/lectures/edit/_form.html.erb b/app/views/lectures/edit/_form.html.erb
index d6d254d1d..5aee9c997 100644
--- a/app/views/lectures/edit/_form.html.erb
+++ b/app/views/lectures/edit/_form.html.erb
@@ -103,10 +103,10 @@
         <div class="container small-width lecture-pane">
           <%= render partial: 'lectures/edit/people',
               locals: { lecture: lecture } %>
-          <%= render partial: 'lectures/edit/vouchers',
-              locals: { lecture: lecture } %>
           <%= render partial: 'lectures/edit/tutorials',
               locals: { lecture: lecture } %>
+          <%= render partial: 'lectures/edit/vouchers',
+              locals: { lecture: lecture } %>
         </div>
       </div>
 

From 84ab9754db382d179ff855b86d27600e8f5631c3 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 16:03:30 +0200
Subject: [PATCH 113/191] Turn off autocomplete for redeem voucher text field

---
 app/views/profile/_verify_voucher.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/profile/_verify_voucher.html.erb b/app/views/profile/_verify_voucher.html.erb
index 3e97bf407..8abdb76c9 100644
--- a/app/views/profile/_verify_voucher.html.erb
+++ b/app/views/profile/_verify_voucher.html.erb
@@ -5,8 +5,9 @@
                       data: { cy: "verify-voucher-form"} } do |f| %>
     <div class="form-group d-flex">
         <%= f.text_field :secure_hash, class: "form-control me-2",
-                         style: "width: 20rem;",
-                         data: { cy: "secure-hash-input" } %>
+                 style: "width: 20rem;",
+                 autocomplete: "off",
+                 data: { cy: "secure-hash-input" } %>
         <%= f.submit t('buttons.verify_voucher'), class: "btn btn-primary",
                      data: { cy: "verify-voucher-submit" } %>
     </div>

From ae0b22c2be5f95c9d65fc5dced3522c9cc8f748c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 16:10:26 +0200
Subject: [PATCH 114/191] Strip secure hash to avoid copy-pasting issues with
 voucher

---
 app/models/voucher/voucher.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/voucher/voucher.rb b/app/models/voucher/voucher.rb
index 37af63377..caf57c3f4 100644
--- a/app/models/voucher/voucher.rb
+++ b/app/models/voucher/voucher.rb
@@ -33,7 +33,8 @@ def self.roles_for_lecture(lecture)
   end
 
   def self.find_voucher_by_hash(secure_hash)
-    Voucher.active.find_by(secure_hash: secure_hash)
+    # strip() to avoid issues with leading/trailing whitespaces when copy-pasting
+    Voucher.active.find_by(secure_hash: secure_hash.strip)
   end
 
   def invalidate!

From 4530ef8e3d9856130326ac43b4789b2496c63b4a Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 16:42:40 +0200
Subject: [PATCH 115/191] Improve voucher-model docstrings

---
 app/models/voucher/redeemable.rb |  5 +++++
 app/models/voucher/redemption.rb |  7 ++++---
 app/models/voucher/voucher.rb    | 14 ++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/models/voucher/redeemable.rb b/app/models/voucher/redeemable.rb
index 82586c920..e53e4039d 100644
--- a/app/models/voucher/redeemable.rb
+++ b/app/models/voucher/redeemable.rb
@@ -1,3 +1,8 @@
+# The Redeemable module is included in the Voucher model to encapsulate the
+# redemption logic of a voucher.
+#
+# Note that this is not the same as "Claimable", which is used for roles
+# that can be claimed via a voucher, e.g. becoming a tutor for a lecture etc.
 module Redeemable
   extend ActiveSupport::Concern
   include Notifier
diff --git a/app/models/voucher/redemption.rb b/app/models/voucher/redemption.rb
index eaa960336..26e0fd6f6 100644
--- a/app/models/voucher/redemption.rb
+++ b/app/models/voucher/redemption.rb
@@ -1,6 +1,7 @@
-# Redemption class
-# redemptions store the event of a user redeeming a voucher
-
+# Redemptions store the event of a user redeeming a voucher.
+#
+# During one redemption of a voucher, a user might claim multiple objects, e.g.
+# two tutorial slots. The respective claims are stored in the Claims model.
 class Redemption < ApplicationRecord
   belongs_to :voucher
   belongs_to :user
diff --git a/app/models/voucher/voucher.rb b/app/models/voucher/voucher.rb
index caf57c3f4..37c29e6bf 100644
--- a/app/models/voucher/voucher.rb
+++ b/app/models/voucher/voucher.rb
@@ -1,3 +1,17 @@
+# A voucher is a unique (secure) hash that can be used by users to redeem a role,
+# such as tutor, teacher etc. That is, the voucher grants the user elevated
+# permissions.
+#
+# Vouchers are created by lecture editors, e.g. teachers. They will then send
+# the voucher to the user by means of a different communication channel,
+# e.g. email. Users can redeem the voucher by entering the code on their
+# profile page.
+#
+# Before the introduction of vouchers, teachers could select from the whole pool
+# of MaMpf users to assign them a role, e.g. to select tutors for their lecture.
+# To better align this process with GDPR requirements, the concept of voucher
+# was introduced. This way, teachers can only assign roles to users who have
+# actively redeemed a voucher.
 class Voucher < ApplicationRecord
   include Redeemable
 

From 47784ca0deafac00c57a7ff5bab72da27c249a97 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 17:49:23 +0200
Subject: [PATCH 116/191] Fix wrong permit syntax for arrays

---
 app/controllers/vouchers_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index 334385c0b..e8641bbd0 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -44,7 +44,7 @@ def verify
   def redeem
     voucher = Voucher.find_voucher_by_hash(params[:secure_hash])
     if voucher
-      voucher.redeem(params.permit(:tutorial_ids, :talk_ids))
+      voucher.redeem(params.permit(tutorial_ids: [], talk_ids: []))
       redirect_to edit_profile_path, notice: success_message(voucher)
     else
       handle_invalid_voucher

From 57530f29f6eb5df03b92698def74723eacd9e7ae Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 8 Oct 2024 17:49:34 +0200
Subject: [PATCH 117/191] Move Claim model to voucher folder

---
 app/models/claim.rb         | 8 --------
 app/models/voucher/claim.rb | 6 ++++++
 2 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 app/models/claim.rb
 create mode 100644 app/models/voucher/claim.rb

diff --git a/app/models/claim.rb b/app/models/claim.rb
deleted file mode 100644
index 5901e7189..000000000
--- a/app/models/claim.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Claim class
-# claims store what is being taken over by the user when they redeem a voucher
-# (e.g. a tutorial or a talk)
-
-class Claim < ApplicationRecord
-  belongs_to :redemption
-  belongs_to :claimable, polymorphic: true
-end
diff --git a/app/models/voucher/claim.rb b/app/models/voucher/claim.rb
new file mode 100644
index 000000000..e8fe5aa6d
--- /dev/null
+++ b/app/models/voucher/claim.rb
@@ -0,0 +1,6 @@
+# A Claim stores a Claimable that is being taken over by the user when they
+# redeem a voucher. Claimables include tutorials and talks.
+class Claim < ApplicationRecord
+  belongs_to :redemption
+  belongs_to :claimable, polymorphic: true
+end

From 6d0be7ebc73d1f153772408a17e23c0f3ad5eeb4 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 9 Oct 2024 00:31:19 +0200
Subject: [PATCH 118/191] Adapt Redeemer specs to new architecture

Also rename Redeemable to Redeemer to better reflect what it's doing.
---
 app/controllers/application_controller.rb     |  8 +++++
 .../voucher/{redeemable.rb => redeemer.rb}    |  4 +--
 app/models/voucher/voucher.rb                 |  2 +-
 .../redeemer_spec.rb}                         | 35 ++++++++++---------
 4 files changed, 30 insertions(+), 19 deletions(-)
 rename app/models/voucher/{redeemable.rb => redeemer.rb} (96%)
 rename spec/{services/voucher_processor_spec.rb => models/redeemer_spec.rb} (84%)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index dfe2dbb0f..fe9fb6090 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -66,6 +66,14 @@ def prevent_caching
     response.headers["Expires"] = "Mon, 01 Jan 1990 00:00:00 GMT"
   end
 
+  # Sets the current user of the Current model.
+  #
+  # This should be only used for (model) tests where the set_current_user
+  # method of the ApplicationController is not available.
+  def self.current_user=(user)
+    Current.user = user
+  end
+
   protected
 
     def configure_permitted_parameters
diff --git a/app/models/voucher/redeemable.rb b/app/models/voucher/redeemer.rb
similarity index 96%
rename from app/models/voucher/redeemable.rb
rename to app/models/voucher/redeemer.rb
index e53e4039d..7e78a44ca 100644
--- a/app/models/voucher/redeemable.rb
+++ b/app/models/voucher/redeemer.rb
@@ -1,9 +1,9 @@
-# The Redeemable module is included in the Voucher model to encapsulate the
+# The Redeemer module is included in the Voucher model to encapsulate the
 # redemption logic of a voucher.
 #
 # Note that this is not the same as "Claimable", which is used for roles
 # that can be claimed via a voucher, e.g. becoming a tutor for a lecture etc.
-module Redeemable
+module Redeemer
   extend ActiveSupport::Concern
   include Notifier
 
diff --git a/app/models/voucher/voucher.rb b/app/models/voucher/voucher.rb
index 37c29e6bf..ccd1ac2da 100644
--- a/app/models/voucher/voucher.rb
+++ b/app/models/voucher/voucher.rb
@@ -13,7 +13,7 @@
 # was introduced. This way, teachers can only assign roles to users who have
 # actively redeemed a voucher.
 class Voucher < ApplicationRecord
-  include Redeemable
+  include Redeemer
 
   SPEAKER_EXPIRATION_DAYS = 30
   TUTOR_EXPIRATION_DAYS = 14
diff --git a/spec/services/voucher_processor_spec.rb b/spec/models/redeemer_spec.rb
similarity index 84%
rename from spec/services/voucher_processor_spec.rb
rename to spec/models/redeemer_spec.rb
index c7b4997f3..92fe1c983 100644
--- a/spec/services/voucher_processor_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -1,27 +1,30 @@
 require "rails_helper"
 
-RSpec.describe(VoucherProcessor, type: :model) do
-  describe "#call" do
+RSpec.describe(Redeemer, type: :model) do
+  describe "#redeem" do
     let(:lecture) { FactoryBot.create(:lecture) }
     let(:voucher) { FactoryBot.create(:voucher, lecture: lecture, role: role) }
     let(:user) { FactoryBot.create(:confirmed_user) }
     let(:params) { {} }
     let(:role) { :tutor }
-    let(:processor) { VoucherProcessor.new(voucher, user, params) }
+
+    before :each do
+      ApplicationController.current_user = user
+    end
 
     shared_examples "common voucher processing" do
       it "creates a redemption" do
-        expect { processor.call }.to change { Redemption.count }.by(1)
+        expect { voucher.redeem(params) }.to change { Redemption.count }.by(1)
       end
 
       it "subscribes the user to the lecture" do
-        processor.call
+        voucher.redeem(params)
         expect(user.lectures).to include(lecture)
       end
 
       it "creates notifications about the voucher's redemption" do
         count_before = Notification.count
-        processor.call
+        voucher.redeem(params)
         lecture.reload
         expect(Notification.count).to eq(count_before + lecture.editors_and_teacher.count)
       end
@@ -35,18 +38,18 @@
       include_examples "common voucher processing"
 
       it "adds the tutorials to the user's given tutorials" do
-        processor.call
+        voucher.redeem(params)
         expect(user.given_tutorials).to include(tutorial1, tutorial2)
       end
 
       it "does not add a tutorial if its id is not in the params" do
         tutorial3 = FactoryBot.create(:tutorial, lecture: lecture)
-        processor.call
+        voucher.redeem(params)
         expect(user.given_tutorials).not_to include(tutorial3)
       end
 
       it "creates a redemption with the claimed tutorials" do
-        processor.call
+        voucher.redeem(params)
         redemption = Redemption.last
         expect(redemption.claimed_tutorials).to include(tutorial1, tutorial2)
       end
@@ -58,7 +61,7 @@
       include_examples "common voucher processing"
 
       it "adds the user to the lecture's editors" do
-        processor.call
+        voucher.redeem(params)
         expect(lecture.editors).to include(user)
       end
     end
@@ -69,18 +72,18 @@
       include_examples "common voucher processing"
 
       it "sets the user as the lecture's teacher" do
-        processor.call
+        voucher.redeem(params)
         expect(lecture.teacher).to eq(user)
       end
 
       it "demotes the previous teacher to an editor" do
         previous_teacher = lecture.teacher
-        processor.call
+        voucher.redeem(params)
         expect(lecture.editors).to include(previous_teacher)
       end
 
       it "invalidates the voucher" do
-        processor.call
+        voucher.redeem(params)
         expect(voucher.invalidated_at).not_to be_nil
       end
     end
@@ -95,18 +98,18 @@
       include_examples "common voucher processing"
 
       it "adds the talks to the user's given talks" do
-        processor.call
+        voucher.redeem(params)
         expect(user.talks).to include(talk1, talk2)
       end
 
       it "does not add a talk if its id is not in the params" do
         talk3 = FactoryBot.create(:talk, lecture: lecture)
-        processor.call
+        voucher.redeem(params)
         expect(user.talks).not_to include(talk3)
       end
 
       it "creates a redemption with the claimed talks" do
-        processor.call
+        voucher.redeem(params)
         redemption = Redemption.last
         expect(redemption.claimed_talks).to include(talk1, talk2)
       end

From 8f9ef78ef957cf4bf785f89b6d3d26de0813b7ec Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 9 Oct 2024 00:31:57 +0200
Subject: [PATCH 119/191] Use `pluck` instead of `select` for better
 performance

Also use .uniq just to be sure.
---
 app/models/lecture.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index 35a654c2e..e109be270 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -886,7 +886,8 @@ def update_speaker_status!(user, selected_talks)
   end
 
   def voucher_redeemers(voucher_scope)
-    User.where(id: Redemption.where(voucher: voucher_scope).select(:user_id))
+    user_ids = Redemption.where(voucher: voucher_scope).pluck(:user_id)
+    User.where(id: user_ids.uniq)
   end
 
   def tutors_by_redemption

From cab6097a9c1f357cef9c6306df989ea9682bd835 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 9 Oct 2024 01:01:02 +0200
Subject: [PATCH 120/191] Test timestamp in invalidate! voucher spec

---
 spec/models/voucher_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/models/voucher_spec.rb b/spec/models/voucher_spec.rb
index f571ef858..f64887795 100644
--- a/spec/models/voucher_spec.rb
+++ b/spec/models/voucher_spec.rb
@@ -119,8 +119,11 @@ def expiration_days(role)
       it "sets the invalidated_at attribute to the current time" do
         voucher = FactoryBot.create(:voucher)
         expect(voucher.invalidated_at).to be_nil
-        voucher.invalidate!
-        expect(voucher.invalidated_at).not_to be_nil
+        frozen_time = Time.zone.now.change(nsec: 0)
+        Timecop.freeze(frozen_time) do
+          voucher.invalidate!
+          expect(voucher.invalidated_at).to eq(frozen_time)
+        end
       end
     end
   end

From 71fc49aec89630f06c57f817563c933fe9c082c7 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 9 Oct 2024 11:38:12 +0200
Subject: [PATCH 121/191] Remove unused routes

---
 config/routes.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 9ec19336b..f567579cd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -290,14 +290,6 @@
        to: "lectures#import_toc",
        as: "import_lecture_toc"
 
-  post "lectures/:id/become_tutor",
-       to: "lectures#become_tutor",
-       as: "become_tutor"
-
-  post "lectures/:id/become_editor",
-       to: "lectures#become_editor",
-       as: "become_editor"
-
   resources :lectures, except: [:index]
 
   # lessons routes

From 7df4ee12d9be4a304679795f261b1037896d90cc Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 9 Oct 2024 12:18:34 +0200
Subject: [PATCH 122/191] Fix missing CSpell configuration

---
 .vscode/settings.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index c9fefa3fe..4f9a11422 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -102,6 +102,12 @@
     //////////////////////////////////////
     // Spell Checker
     //////////////////////////////////////
+    "cSpell.enabled": true,
+    "cSpell.ignorePaths": [
+        "node_modules",
+        ".git"
+    ],
+    "cSpell.language": "en,de",
     "cSpell.words": [
         "commontator",
         "factorybot",
@@ -109,5 +115,10 @@
         "katex",
         "Timecop",
         "turbolinks"
-    ]
+    ],
+    "cSpell.enableFiletypes": [
+        "ruby"
+        // Other filetypes are handled by the default spell checker
+    ],
+    "cSpell.maxNumberOfProblems": 10000
 }
\ No newline at end of file

From bd22c937ab953b00fc96af86b8885d3110b05ad6 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 18:21:59 +0200
Subject: [PATCH 123/191] Improve tutor voucher redemption messages

also remove unused locale keys
---
 .../vouchers/_redeem_tutor_voucher.html.erb   | 37 +++++++++++--------
 config/locales/de.yml                         | 29 +++++++--------
 config/locales/en.yml                         | 27 +++++++-------
 3 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 9b5f1da3d..18249e8a8 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -1,36 +1,43 @@
 <p data-cy="redeem-voucher-text">
-  <%= t('profile.become_tutor', lecture: voucher.lecture.title) %>
-
-  <% if current_user.in?(voucher.lecture.tutors) %>
-    <%= t('profile.already_tutor',
-          tutorials: tutorials_with_tutor_titles(current_user, voucher)) %>
-  <% end %>
+  <%= t('profile.become_tutor_html', lecture: voucher.lecture.title) %>
 </p>
 
+<% if current_user.in?(voucher.lecture.tutors) %>
+  <p>
+    <%= t('profile.already_tutor_html', tutorials: tutorials_with_tutor_titles(current_user, voucher)) %>
+  </p>
+<% end %>
+
 <% if voucher.lecture.tutorials_without_tutor(current_user).any? %>
 
+  <p>
+    <%= t('profile.tutorials_available') %>
+  </p>
   <%= render partial: "vouchers/voucher_redemption_form", locals: { voucher: voucher } %>
 
 <% elsif voucher.lecture.tutorials.any? %>
 
+  <p>
     <%= t('profile.all_tutorials_taken') %>
     <%= cancel_voucher_button %>
+  </p>
 
 <% else %>
 
-  <%= t('profile.no_tutorials_yet') %>
-
   <% if current_user.in?(voucher.lecture.tutors_by_redemption) %>
 
-    <%= t('profile.already_tutor_by_redemption') %>
-    <%= cancel_voucher_button %>
-
-  <% else %>
-
+    <p>
+      <%= t('profile.already_tutor_by_redemption') %>
+      <%= cancel_voucher_button %>
+    </p>
+    
+    <% else %>
+    
     <p class="mt-4">
+      <%= t('profile.no_tutorials_redemption') %>
       <%= redeem_voucher_button(voucher) %>
       <%= cancel_voucher_button %>
     </p>
-
   <% end %>
-<% end %>
\ No newline at end of file
+
+<% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 066b087e8..4e22536d0 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2253,26 +2253,23 @@ de:
     data_request_sent: >
       Wir haben Deine Anfrage erhalten und werden Dir Deine Daten zeitnah schicken.
     redeem_voucher: Gutschein einlösen
-    become_tutor: >
-      Mit diesem Gutschein erhältst Du TutorInnenstatus in der Veranstaltung
-      %{lecture}. Dadurch können Dir VeranstaltungseditorInnen und die DozentIn
-      Tutorien zuweisen. Ggf. kannst Du an dieser Stelle bereits Tutorien
-      auswählen, die Du übernehmen möchtest. Die VeranstaltungseditorInnen
-      und die DozentIn werden benachrichtigt, wenn Du den Gutschein einlöst.
-      Zudem wird die Veranstaltung automatisch zu Deinen abonnierten
-      Veranstaltungen hinzugefügt.
-    already_tutor: >
-      Du bist bereits als TutorIn eingetragen für: %{tutorials}.
-    new_tutor_select: >
-      Wenn Du schon weißt, welche Tutorien du übernimmst, kannst du diese hier
-      auswählen.
+    become_tutor_html: >
+      Mit diesem Gutschein erhältst Du TutorInnenstatus für
+      <strong>%{lecture}</strong>.
+    tutorials_available: >
+      Wenn Du schon weißt, welche Tutorien du übernimmst, kannst Du diese hier
+      auswählen. Ansonsten lasse das Feld frei, dann kannst Du dennoch den
+      Gutschein einlösen, damit Dich die DozentIn später den Tutorien zuweisen kann.
+    already_tutor_html: >
+      Du bist bereits als TutorIn eingetragen für: <strong>%{tutorials}</strong>.
+    no_tutorials_redemption: >
+      Nachdem Du den Gutschein eingelöst hast, kann Dich die DozentIn den
+      Tutorien zuweisen.
     select_tutorials: Tutorien auswählen
-    take_over_tutorials: Tutorien übernehmen
     all_tutorials_taken: >
       Es sind keine weiteren Tutorien verfügbar, die Du noch übernehmen kannst.
-    no_tutorials_yet: Für diese Vorlesung wurden noch keine Tutorien angelegt.
     already_tutor_by_redemption: >
-      Du hast bereits einen Gutschein eingelöst, um TutorInnenstatus zu erhalten.
+      Du hast diesen Gutschein bereits eingelöst, um TutorInnenstatus zu erhalten.
     become_editor: >
       Mit diesem Gutschein erhältst Du EditorInnenstatus für die Veranstaltung
       %{lecture}. Zudem wird die Veranstaltung automatisch zu Deinen abonnierten
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b29e127b8..99990bd21 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2112,25 +2112,24 @@ en:
     data_request_sent: >
       We have received your request and will send you your data as soon as possible.
     redeem_voucher: Redeem Voucher
-    become_tutor: >
-      With this voucher, you can obtain tutor status for %{lecture}.
-      With that, editors for the event series and the teacher can assign you
-      tutorials. If applicable, you can select the tutorials you will be
-      responsible for right here. The editors and the teacher will be notified
-      when you have redeemed the voucher.
-    already_tutor: >
-      You are already registered as a tutor for: %{tutorials}.
-    new_tutor_select: >
-      If you already know which tutorials you will be responsible for,
-      you can select them here.
+    become_tutor_html: >
+      By redeeming this voucher, you will obtain tutor status for
+      <strong>%{lecture}</strong>.
+    tutorials_available: >
+      If you already know which tutorials you will be responsible for, you can
+      select them here. Otherwise, leave the field empty; then you can still
+      redeem the voucher so that the teacher can assign you tutorials later.
+    already_tutor_html: >
+      You are already registered as a tutor for: <strong>%{tutorials}</strong>.
+    no_tutorials_redemption: >
+      After having redeemed the voucher, the teacher can assign you
+      to the tutorials.
     select_tutorials: Select Tutorials
     all_tutorials_taken: >
       There are no more tutorials available for this lecture that you can take
       over.
-    no_tutorials_yet: >
-      There are no tutorials available for this lecture yet.
     already_tutor_by_redemption: >
-      You have already redeemed a tutor voucher for this event series.
+      You have already redeemed this voucher to become a tutor.
     become_editor: >
       With this voucher, you can obtain editor status for %{lecture}.
       The other editors and the teacher will be notified when you have

From 79d2c8a27d41afb0956ec6a5cc86ddb1bd2df552 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 18:40:15 +0200
Subject: [PATCH 124/191] Improve speaker voucher redemption messages

---
 .../vouchers/_redeem_speaker_voucher.html.erb | 30 ++++++++++++-------
 .../vouchers/_redeem_tutor_voucher.html.erb   |  9 +++---
 config/locales/de.yml                         | 27 +++++++++--------
 config/locales/en.yml                         | 23 +++++++-------
 4 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb
index 879f01bf2..75c4bfce9 100644
--- a/app/views/vouchers/_redeem_speaker_voucher.html.erb
+++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb
@@ -1,33 +1,41 @@
 <p data-cy="redeem-voucher-text">
-  <%= t('profile.become_speaker', seminar: voucher.lecture.title) %>
-
-  <% if current_user.in?(voucher.lecture.speakers) %>
-    <%= t('profile.already_speaker',
-          talks: talks_with_titles(current_user, voucher)) %>
-  <% end %>
+  <%= t('profile.become_speaker_html', seminar: voucher.lecture.title) %>
 </p>
 
+<% if current_user.in?(voucher.lecture.speakers) %>
+  <p>
+    <%= t('profile.already_speaker_html',
+      talks: talks_with_titles(current_user, voucher)) %>
+  </p>
+<% end %>
+
 <% if voucher.lecture.talks_without_speaker(current_user).any? %>
 
+  <p>
+    <%= t('profile.talks_available') %>
+  </p>
   <%= render partial: "vouchers/voucher_redemption_form", locals: { voucher: voucher } %>
 
 <% elsif voucher.lecture.talks.any? %>
 
+  <p>
     <%= t('profile.all_talks_taken') %>
     <%= cancel_voucher_button %>
+  </p>
 
 <% else %>
 
-  <%= t('profile.no_talks_yet') %>
-
   <% if current_user.in?(voucher.lecture.speakers_by_redemption) %>
 
-    <%= t('profile.already_speaker_by_redemption') %>
-    <%= cancel_voucher_button %>
+    <p>
+      <%= t('profile.already_speaker_by_redemption') %>
+      <%= cancel_voucher_button %>
+    </p>
 
   <% else %>
 
-    <p class="mt-4">
+    <p>
+      <%= t('profile.no_talks_redemption') %>
       <%= redeem_voucher_button(voucher) %>
       <%= cancel_voucher_button %>
     </p>
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 18249e8a8..9a9ba9b63 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -4,7 +4,8 @@
 
 <% if current_user.in?(voucher.lecture.tutors) %>
   <p>
-    <%= t('profile.already_tutor_html', tutorials: tutorials_with_tutor_titles(current_user, voucher)) %>
+    <%= t('profile.already_tutor_html',
+      tutorials: tutorials_with_tutor_titles(current_user, voucher)) %>
   </p>
 <% end %>
 
@@ -31,13 +32,13 @@
       <%= cancel_voucher_button %>
     </p>
     
-    <% else %>
+  <% else %>
     
-    <p class="mt-4">
+    <p>
       <%= t('profile.no_tutorials_redemption') %>
       <%= redeem_voucher_button(voucher) %>
       <%= cancel_voucher_button %>
     </p>
-  <% end %>
 
+  <% end %>
 <% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4e22536d0..5968ae2a9 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2289,21 +2289,24 @@ de:
       zu Deinen abonnierten Veranstaltungen hinzugefügt.
     already_teacher: >
       Du bist bereits DozentIn in dieser Veranstaltung.
-    become_speaker: >
-      Mit diesem Gutschein erhältst Du Vortragendenstatus im Seminar %{seminar}.
-      Dadurch können Dir SeminareditorInnen und die DozentIn Vorträge zuweisen.
-      Ggf. kannst Du an dieser Stelle bereits Vorträge auswählen, die Du
-      übernehmen möchtest. Die SeminareditorInnen und die DozentIn werden
-      benachrichtigt, wenn Du den Gutschein einlöst. Zudem wird das Seminar
-      automatisch zu Deinen abonnierten Veranstaltungen hinzugefügt.
-    already_speaker: >
-      Du bist bereits VortragendeR in diesem Seminar für: %{talks}.
+    become_speaker_html: >
+      Mit diesem Gutschein erhältst Du Vortragendenstatus im Seminar
+      <strong>%{seminar}</strong>.
+    already_speaker_html: >
+      Du bist bereits VortragendeR für: <strong>%{talks}</strong>.
+    talks_available: >
+      Wenn Du schon weißt, welche Vorträge du übernimmst, kannst Du diese hier
+      auswählen. Ansonsten lasse das Feld frei, dann kannst Du dennoch den
+      Gutschein einlösen, damit Dich die DozentIn später den Vorträgen zuweisen
+      kann.
+    no_talks_redemption: >
+      Nachdem Du den Gutschein eingelöst hast, kann Dich die DozentIn den
+      Vorträgen zuweisen.
     all_talks_taken: >
       Es sind keine weiteren Vorträge verfügbar, die Du noch übernehmen kannst.
-    no_talks_yet: Für dieses Seminar wurden noch keine Vorträge angelegt.
     already_speaker_by_redemption: >
-      Du hast bereits einen Gutschein eingelöst, um Vortragendenstatus zu
-      erhalten.
+      Du hast diesen Gutschein bereits eingelöst, um Vortragendenstatus
+      zu erhalten.
     select_talks: Vorträge auswählen
   mampf_news:
     title: 'MaMpf-News'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 99990bd21..d757533ad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2145,20 +2145,21 @@ en:
       notified when you have redeemed the voucher.
     already_teacher: >
       You are already the teacher for this event series.
-    become_speaker: >
-      With this voucher, you can obtain speaker status for %{seminar}.
-      With that, editors for the seminar and the teacher can assign you talks.
-      If applicable, you can select the talks you will be responsible for
-      right here. The editors and the teacher will be notified when you have
-      redeemed the voucher.
-    already_speaker: >
-      You are already registered as a speaker for: %{talks}.
+    become_speaker_html: >
+      By redeeming this voucher, you will obtain speaker status for the seminar
+      <strong>%{seminar}</strong>.
+    already_speaker_html: >
+      You are already registered as speaker for: <strong>%{talks}</strong>.
+    talks_available: >
+      If you already know which talks you will be responsible for, you can
+      select them here. Otherwise, leave the field empty; then you can still
+      redeem the voucher so that the teacher can assign you talks later.
+    no_talks_redemption: >
+      After having redeemed the voucher, the teacher can assign you to the talks.
     all_talks_taken: >
       There are no more talks available for this seminar that you can take over.
-    no_talks_yet: >
-      There are no talks available for this seminar yet.
     already_speaker_by_redemption: >
-      You have already redeemed a speaker voucher for this seminar.
+      You have already redeemed this voucher to become a speaker.
     select_talks: Select Talks
   mampf_news:
     title: 'MaMpf News'

From ce0c83189b2ef45bd545a754fdcbbced18a675ef Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 18:49:00 +0200
Subject: [PATCH 125/191] Replace "Voucher" by "Gutschein" in German texts

---
 config/locales/de.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5968ae2a9..9410063ea 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -637,9 +637,9 @@ de:
           Veranstaltung einpflegen. Du kannst nur Personen auswählen,
           die von Ihrem Rechtestatus her dafür in Frage kommen.
           Um den entsprechenden Rechtestatus an Personen zu vergeben,
-          die ihn bisher noch nicht haben, musst Du einen Voucher
+          die ihn bisher noch nicht haben, musst Du einen Gutschein
           erstellen und diesen an die entsprechende Person weitergeben.
-          Die Person kann dann den Voucher auf ihrer Profilseite einlösen
+          Die Person kann dann den Gutschein auf ihrer Profilseite einlösen
           und wird dadurch zusätzliche VeranstaltungseditorIn.
         subscribers_count: >
           Das ist die Zahl aller NutzerInnen, die diese
@@ -4118,7 +4118,7 @@ de:
           attributes:
             role:
               only_one_active: >
-                Für diese Vorlesung kann es nur einen aktiven Voucher dieses Typs geben.
+                Für diese Vorlesung kann es nur einen aktiven Gutschein dieses Typs geben.
               speaker_vouchers_only_for_seminars: >
                 Vortragenden-Gutscheine können nur für Seminare erstellt werden.
         watchlist_entry:

From ab7c6b4a9d02084cf4a880242bcb6d25ed5e2651 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 18:55:44 +0200
Subject: [PATCH 126/191] Improve teacher voucher redemption messages

---
 .../vouchers/_redeem_teacher_voucher.html.erb | 21 ++++++++++++-------
 config/locales/de.yml                         | 14 ++++++-------
 config/locales/en.yml                         | 12 +++++------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/app/views/vouchers/_redeem_teacher_voucher.html.erb b/app/views/vouchers/_redeem_teacher_voucher.html.erb
index 0fd7b6516..f52d3f515 100644
--- a/app/views/vouchers/_redeem_teacher_voucher.html.erb
+++ b/app/views/vouchers/_redeem_teacher_voucher.html.erb
@@ -1,11 +1,16 @@
-<p data-cy="redeem-voucher-text">
-  <%= t('profile.become_teacher', lecture: voucher.lecture.title) %>
-</p>
-
 <% if current_user == voucher.lecture.teacher %>
-  <%= t('profile.already_teacher') %>
+
+  <p>
+    <%= t('profile.already_teacher_html', lecture: voucher.lecture.title) %>
+    <%= cancel_voucher_button %>
+  </p>
+
 <% else %>
-  <%= redeem_voucher_button(voucher) %>
-<% end %>
 
-<%= cancel_voucher_button %>
\ No newline at end of file
+  <p data-cy="redeem-voucher-text">
+    <%= t('profile.become_teacher_html', lecture: voucher.lecture.title) %>
+    <%= redeem_voucher_button(voucher) %>
+    <%= cancel_voucher_button %>
+  </p>
+
+<% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9410063ea..30aa26b4c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2281,14 +2281,12 @@ de:
     teacher_cant_become_editor: >
       Du kannst nicht zusätzlich EditorInnenstatus in einer Veranstaltung
       erhalten, in der Du bereits DozentIn bist.
-    become_teacher: >
-      Mit diesem Gutschein erhältst Du DozentInnenstatus für die Veranstaltung
-      %{lecture}. Die bisherige DozentIn erhält EditorInnenstatus.
-      Die VeranstaltungseditorInnen werden benachrichtigt,
-      wenn Du den Gutschein einlöst. Zudem wird die Veranstaltung automatisch
-      zu Deinen abonnierten Veranstaltungen hinzugefügt.
-    already_teacher: >
-      Du bist bereits DozentIn in dieser Veranstaltung.
+    become_teacher_html: >
+      Mit diesem Gutschein erhältst Du DozentInnenstatus für
+      <strong>%{lecture}</strong>.
+      Die bisherige DozentIn wird zur EditorIn herabgestuft.
+    already_teacher_html: >
+      Du bist bereits DozentIn für <strong>%{lecture}</strong>.
     become_speaker_html: >
       Mit diesem Gutschein erhältst Du Vortragendenstatus im Seminar
       <strong>%{seminar}</strong>.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d757533ad..20a876401 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2139,12 +2139,12 @@ en:
     teacher_cant_become_editor: >
       You are already a teacher for this event series. Therefore, you cannot
       redeem an editor voucher.
-    become_teacher: >
-      With this voucher, you can obtain teacher status for %{lecture}.
-      The previous teacher will be demoted to editor. The editors will be
-      notified when you have redeemed the voucher.
-    already_teacher: >
-      You are already the teacher for this event series.
+    become_teacher_html: >
+      With this voucher, you obtain teacher status for
+      <strong>%{lecture}</strong>.
+      The former teacher will be demoted to editor.
+    already_teacher_html: >
+      You are already the teacher for <strong>%{lecture}</strong>.
     become_speaker_html: >
       By redeeming this voucher, you will obtain speaker status for the seminar
       <strong>%{seminar}</strong>.

From 6990a2cabebad8eed1fa34a7f1283017b354d489 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 20:02:51 +0200
Subject: [PATCH 127/191] Improve editor voucher redemption messages

---
 .../vouchers/_redeem_editor_voucher.html.erb  | 25 +++++++++++++------
 config/locales/de.yml                         | 10 +++-----
 config/locales/en.yml                         | 15 ++++++-----
 3 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index bcd38ba9e..df3ed572e 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -1,13 +1,24 @@
-<span data-cy="redeem-voucher-text">
-  <%= t('profile.become_editor', lecture: voucher.lecture.title) %>
-</span>
+<p data-cy="redeem-voucher-text">
+  <%= t('profile.become_editor_html', lecture: voucher.lecture.title) %>
+</p>
 
 <% if current_user == voucher.lecture.teacher %>
-  <%= t('profile.teacher_cant_become_editor') %>
+
+  <p>
+    <%= t('profile.teacher_cant_become_editor') %>
+    <%= cancel_voucher_button %>
+  </p>
+
 <% elsif current_user.in?(voucher.lecture.editors_by_redemption) %>
-  <%= t('profile.already_editor_by_redemption') %>
+
+  <p>
+    <%= t('profile.already_editor_by_redemption') %>
+    <%= cancel_voucher_button %>
+  </p>
+
 <% else %>
+
   <%= redeem_voucher_button(voucher) %>
-<% end %>
+  <%= cancel_voucher_button %>
 
-<%= cancel_voucher_button %>
\ No newline at end of file
+<% end %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 30aa26b4c..5182394a0 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2270,17 +2270,15 @@ de:
       Es sind keine weiteren Tutorien verfügbar, die Du noch übernehmen kannst.
     already_tutor_by_redemption: >
       Du hast diesen Gutschein bereits eingelöst, um TutorInnenstatus zu erhalten.
-    become_editor: >
-      Mit diesem Gutschein erhältst Du EditorInnenstatus für die Veranstaltung
-      %{lecture}. Zudem wird die Veranstaltung automatisch zu Deinen abonnierten
-      Veranstaltungen hinzugefügt.
+    become_editor_html: >
+      Mit diesem Gutschein erhältst Du EditorInnenstatus für
+      <strong>%{lecture}</strong>.
     already_editor_by_redemption: >
       Du hast bereits einen Gutschein eingelöst, um EditorInnenstatus zu
       erhalten. Die anderen VeranstaltungseditorInnen und die DozentIn werden
       benachrichtigt, wenn Du den Gutschein einlöst.
     teacher_cant_become_editor: >
-      Du kannst nicht zusätzlich EditorInnenstatus in einer Veranstaltung
-      erhalten, in der Du bereits DozentIn bist.
+      Du bist bereits DozentIn und kannst daher nicht zusätzlich EditorIn werden.
     become_teacher_html: >
       Mit diesem Gutschein erhältst Du DozentInnenstatus für
       <strong>%{lecture}</strong>.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 20a876401..f8b9e0198 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2113,7 +2113,7 @@ en:
       We have received your request and will send you your data as soon as possible.
     redeem_voucher: Redeem Voucher
     become_tutor_html: >
-      By redeeming this voucher, you will obtain tutor status for
+      With this voucher, you obtain tutor status for
       <strong>%{lecture}</strong>.
     tutorials_available: >
       If you already know which tutorials you will be responsible for, you can
@@ -2130,15 +2130,14 @@ en:
       over.
     already_tutor_by_redemption: >
       You have already redeemed this voucher to become a tutor.
-    become_editor: >
-      With this voucher, you can obtain editor status for %{lecture}.
-      The other editors and the teacher will be notified when you have
-      redeemed the voucher.
+    become_editor_html: >
+      With this voucher, you obtain editor status for
+      <strong>%{lecture}</strong>.
     already_editor_by_redemption: >
       You have already redeemed an editor voucher for this event series.
     teacher_cant_become_editor: >
-      You are already a teacher for this event series. Therefore, you cannot
-      redeem an editor voucher.
+      You are already a teacher and therefore cannot additionally become
+      an editor.
     become_teacher_html: >
       With this voucher, you obtain teacher status for
       <strong>%{lecture}</strong>.
@@ -2146,7 +2145,7 @@ en:
     already_teacher_html: >
       You are already the teacher for <strong>%{lecture}</strong>.
     become_speaker_html: >
-      By redeeming this voucher, you will obtain speaker status for the seminar
+      With this voucher, you will obtain speaker status for the seminar
       <strong>%{seminar}</strong>.
     already_speaker_html: >
       You are already registered as speaker for: <strong>%{talks}</strong>.

From 787eb96c307d506d87a42e534aa3ca5d0c234264 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 20:21:57 +0200
Subject: [PATCH 128/191] Remove duplicate `no_active_voucher` i18n key

---
 config/locales/de.yml | 2 --
 config/locales/en.yml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5182394a0..4fc4e23fd 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -497,8 +497,6 @@ de:
       import_chapters: Kapitel importieren
       import_sections: Abschnitte importieren
       import_tags: Tags importieren
-      no_active_voucher: >
-        Es gibt keinen aktiven %{role} für diese Veranstaltung.
       no_active_voucher: >
         Es gibt keinen aktiven %{role} für diese Veranstaltung.
       info:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f8b9e0198..cf6347dd9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -496,8 +496,6 @@ en:
       import_chapters: import chapters
       import_sections: import sections
       import_tags: import tags
-      no_active_voucher: >
-        There is no active %{role} for this event series.
       no_active_voucher: >
         There is no active %{role} for this event series.
       info:

From 57fa450d9b750987b8c2ff43e9948df4efc35dfd Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 12 Oct 2024 20:38:03 +0200
Subject: [PATCH 129/191] Add help texts to voucher creation

---
 app/views/vouchers/_voucher.html.erb |  1 +
 app/views/vouchers/create.js.erb     |  2 ++
 app/views/vouchers/invalidate.js.erb |  2 ++
 config/locales/de.yml                | 20 +++++++-------------
 config/locales/en.yml                |  8 +++-----
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/views/vouchers/_voucher.html.erb b/app/views/vouchers/_voucher.html.erb
index 6e87d2d06..7a5014787 100644
--- a/app/views/vouchers/_voucher.html.erb
+++ b/app/views/vouchers/_voucher.html.erb
@@ -4,6 +4,7 @@
 
   <h4 class="card-title lecture-pane-subheader">
     <%= t("basics.voucher_for", role: t("basics.#{role}s")) %>
+    <%= helpdesk(t("admin.lecture.info.voucher_for_#{role}"), html=false) %>
   </h4>
 
   <% if voucher %>
diff --git a/app/views/vouchers/create.js.erb b/app/views/vouchers/create.js.erb
index 5a86aa776..6d02f9ee5 100644
--- a/app/views/vouchers/create.js.erb
+++ b/app/views/vouchers/create.js.erb
@@ -1,2 +1,4 @@
 $("#<%= @role %>-voucher").empty()
   .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, role: @role } %>");
+
+initBootstrapPopovers();
diff --git a/app/views/vouchers/invalidate.js.erb b/app/views/vouchers/invalidate.js.erb
index 5a86aa776..6d02f9ee5 100644
--- a/app/views/vouchers/invalidate.js.erb
+++ b/app/views/vouchers/invalidate.js.erb
@@ -1,2 +1,4 @@
 $("#<%= @role %>-voucher").empty()
   .append("<%= j render partial: 'vouchers/voucher', locals: { lecture: @lecture, role: @role } %>");
+
+initBootstrapPopovers();
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4fc4e23fd..b55e7d082 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -757,26 +757,20 @@ de:
         section_needed: Bitte erstelle zuerst einen Abschnitt
         voucher_for_tutor: >
           Gutscheine für TutorInnen können von NutzerInnen eingelöst werden, um
-          TutorInnenstatus für diese Veranstaltung zu erhalten und ggf. direkt
-          Tutorien zu übernehmen. Außerdem werden sie damit automatisch
-          zu AbonenntInnen dieser Veranstaltung.
+          TutorInnenstatus für diese Veranstaltung zu erhalten und direkt
+          Tutorien zu übernehmen.
         voucher_for_editor: >
           Gutscheine für EditorInnen können von NutzerInnen eingelöst werden, um
-          EditorInnenstatus für diese Veranstaltung zu ehalten.
-          Außerdem werden sie damit automatisch zu AbonenntInnen dieser
-          Veranstaltung.
+          EditorInnenstatus für diese Veranstaltung zu erhalten.
         voucher_for_teacher: >
           Gutscheine für DozentInnen können von NutzerInnen eingelöst werden, um
           DozentInnenstatus für diese Veranstaltung zu erhalten. Die bisherige
-          DozentIn wird dann EditorIn. Ein solcher
-          Gutschein wird direkt nach dem Einlösen für ungültig erklärt.
-          Außerdem werden die NutzerIn damit automatisch
-          zu einer AbonenntIn dieser Veranstaltung.
+          DozentIn wird dann EditorIn. Ein solcher Gutschein wird direkt nach
+          dem Einlösen für ungültig erklärt.
         voucher_for_speaker: >
           Gutscheine für Vortragende können von NutzerInnen eingelöst werden, um
-          Vortragendenstatus für das Seminar zu erhalten und ggf. direkt
-          Vorträge zu übernehmen. Außerdem werden sie damit automatisch zu
-          AbonenntInnen des Seminars.
+          Vortragendenstatus für das Seminar zu erhalten und direkt Vorträge
+          zu übernehmen.
       show_media: 'Medien einblenden'
       workflow: 'Workflow'
       content_mode: 'Inhaltsermittlung'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cf6347dd9..06bf2d31d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -723,8 +723,7 @@ en:
         section_needed: Please create a section first
         voucher_for_tutor: >
           Vouchers for tutors can be redeemed by users to obtain tutor status
-          for this event series and if possible, to directly take over
-          tutorials.
+          for this event series and to directly take over tutorials.
         voucher_for_editor: >
           Vouchers for editors can be redeemed by users to obtain
           editor status for this event series.
@@ -733,10 +732,9 @@ en:
           status for this event series. The previous teacher will be demoted
           and becomes an editor. Such a voucher will be invalidated directly
           after its redemption.
-        vouchers_for_speaker: >
+        voucher_for_speaker: >
           Vouchers for speakers can be redeemed by users to obtain speaker
-          status for this seminar and if possible, to directly take over
-          talks.
+          status for this seminar and to directly take over talks.
       show_media: 'Show media'
       workflow: 'Workflow'
       content_mode: 'Content determination'

From 4ed73bccabf9b3a28682077296661ab689abdf9b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 12:20:45 +0200
Subject: [PATCH 130/191] Also eager_load additional modules

This is to ensure that `Rails.application.eager_load!` in the rails_erd
gem respects all our modules.

See this line:
https://github.com/voormedia/rails-erd/blob/7c66258b6818c47b4d878c2ad7ff6decebdf834a/lib/rails_erd/tasks.rake#L45
---
 config/application.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 3776f95e9..de5fae844 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -14,7 +14,9 @@ class Application < Rails::Application
 
     # Autoload subfolders of modules (recursively)
     # https://stackoverflow.com/a/4794775/
-    config.autoload_paths += Rails.root.glob("app/models/**/")
+    additional_paths = Rails.root.glob("app/models/**/")
+    config.autoload_paths += additional_paths
+    config.eager_load_paths += additional_paths
 
     # Autoload lib extensions path
     config.autoload_lib(ignore: ["assets", "collectors", "core_ext", "scrapers", "tasks"])
@@ -29,7 +31,6 @@ class Application < Rails::Application
     # See: https://guides.rubyonrails.org/v7.1/configuring.html#config-active-support-message-serializer
     Rails.application.config.active_support.message_serializer = :json
 
-    # config.eager_load_paths << Rails.root.join("extras")
     # Make `form_with` generate remote forms by default.
     config.action_view.form_with_generates_remote_forms = true
     # Settings in config/environments/* take precedence over those specified here.

From 008ae7d131b9739e6395be94262e5c88ece7db5c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 13:26:47 +0200
Subject: [PATCH 131/191] Outsource x_by_redemption methods from lecture to
 redemption

---
 app/models/lecture.rb                         | 23 ++-------------
 app/models/voucher/redemption.rb              | 29 +++++++++++++++++++
 .../vouchers/_redeem_editor_voucher.html.erb  |  2 +-
 .../vouchers/_redeem_speaker_voucher.html.erb |  2 +-
 .../vouchers/_redeem_tutor_voucher.html.erb   |  2 +-
 5 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/app/models/lecture.rb b/app/models/lecture.rb
index e109be270..c42267298 100644
--- a/app/models/lecture.rb
+++ b/app/models/lecture.rb
@@ -885,32 +885,15 @@ def update_speaker_status!(user, selected_talks)
     touch
   end
 
-  def voucher_redeemers(voucher_scope)
-    user_ids = Redemption.where(voucher: voucher_scope).pluck(:user_id)
-    User.where(id: user_ids.uniq)
-  end
-
-  def tutors_by_redemption
-    voucher_redeemers(vouchers.for_tutors)
-  end
-
-  def editors_by_redemption
-    voucher_redeemers(vouchers.for_editors)
-  end
-
-  def speakers_by_redemption
-    voucher_redeemers(vouchers.for_speakers)
-  end
-
   def eligible_as_tutors
-    (tutors + tutors_by_redemption + editors + [teacher]).uniq
+    (tutors + Redemption.tutors_by_redemption_in(self) + editors + [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
     # the other ones, but in the transition phase where some tutor statuses were
     # still given by the old system, this will not be true
   end
 
   def eligible_as_editors
-    (editors + editors_by_redemption + course.editors - [teacher]).uniq
+    (editors + Redemption.editors_by_redemption_in(self) + course.editors - [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
     # the other ones, but in the transition phase where some editor statuses were
     # still given by the old system, this will not be true
@@ -921,7 +904,7 @@ def eligible_as_teachers
   end
 
   def eligible_as_speakers
-    (speakers + speakers_by_redemption + editors + [teacher]).uniq
+    (speakers + Redemption.speakers_by_redemption_in(self) + editors + [teacher]).uniq
     # the first one should (in the future) actually be contained in the sum of
     # the other ones, but in the transition phase where some editor statuses were
     # still given by the old system, this will not be true
diff --git a/app/models/voucher/redemption.rb b/app/models/voucher/redemption.rb
index 26e0fd6f6..2e6e68176 100644
--- a/app/models/voucher/redemption.rb
+++ b/app/models/voucher/redemption.rb
@@ -2,6 +2,9 @@
 #
 # During one redemption of a voucher, a user might claim multiple objects, e.g.
 # two tutorial slots. The respective claims are stored in the Claims model.
+#
+# Also provides class methods to find out about users who have redeemed
+# specific vouchers, e.g. tutors by redemption in a given lecture.
 class Redemption < ApplicationRecord
   belongs_to :voucher
   belongs_to :user
@@ -12,4 +15,30 @@ class Redemption < ApplicationRecord
                            source_type: Talk.name
 
   has_many :notifications, as: :notifiable, dependent: :destroy
+
+  class << self
+    def tutors_by_redemption_in(lecture)
+      users_that_redeemed_vouchers(lecture.vouchers.for_tutors)
+    end
+
+    def editors_by_redemption_in(lecture)
+      users_that_redeemed_vouchers(lecture.vouchers.for_editors)
+    end
+
+    def speakers_by_redemption_in(lecture)
+      users_that_redeemed_vouchers(lecture.vouchers.for_speakers)
+    end
+
+    private
+
+      # Returns the users who have redeemed the given vouchers.
+      #
+      # These users could be called "Redeemers", but note that this should not
+      # be confused with the Redeemer module that is responsible for the redemption
+      # process of a voucher.
+      def users_that_redeemed_vouchers(relevant_vouchers)
+        user_ids = Redemption.where(voucher: relevant_vouchers).pluck(:user_id)
+        User.where(id: user_ids.uniq)
+      end
+  end
 end
diff --git a/app/views/vouchers/_redeem_editor_voucher.html.erb b/app/views/vouchers/_redeem_editor_voucher.html.erb
index df3ed572e..4f964f2be 100644
--- a/app/views/vouchers/_redeem_editor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_editor_voucher.html.erb
@@ -9,7 +9,7 @@
     <%= cancel_voucher_button %>
   </p>
 
-<% elsif current_user.in?(voucher.lecture.editors_by_redemption) %>
+<% elsif current_user.in?(Redemption.editors_by_redemption_in(voucher.lecture)) %>
 
   <p>
     <%= t('profile.already_editor_by_redemption') %>
diff --git a/app/views/vouchers/_redeem_speaker_voucher.html.erb b/app/views/vouchers/_redeem_speaker_voucher.html.erb
index 75c4bfce9..364a33e8f 100644
--- a/app/views/vouchers/_redeem_speaker_voucher.html.erb
+++ b/app/views/vouchers/_redeem_speaker_voucher.html.erb
@@ -25,7 +25,7 @@
 
 <% else %>
 
-  <% if current_user.in?(voucher.lecture.speakers_by_redemption) %>
+  <% if current_user.in?(Redemption.speakers_by_redemption_in(voucher.lecture)) %>
 
     <p>
       <%= t('profile.already_speaker_by_redemption') %>
diff --git a/app/views/vouchers/_redeem_tutor_voucher.html.erb b/app/views/vouchers/_redeem_tutor_voucher.html.erb
index 9a9ba9b63..8d036813f 100644
--- a/app/views/vouchers/_redeem_tutor_voucher.html.erb
+++ b/app/views/vouchers/_redeem_tutor_voucher.html.erb
@@ -25,7 +25,7 @@
 
 <% else %>
 
-  <% if current_user.in?(voucher.lecture.tutors_by_redemption) %>
+  <% if current_user.in?(Redemption.tutors_by_redemption_in(voucher.lecture)) %>
 
     <p>
       <%= t('profile.already_tutor_by_redemption') %>

From ee13d40bf43dd5f8b8928b9af652abb88e2a2f98 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 16:17:12 +0200
Subject: [PATCH 132/191] Fix wrong i18n controller error

The code always errored since the JSON objects are passed as strings
from the frontend.
---
 app/controllers/cypress/i18n_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/cypress/i18n_controller.rb b/app/controllers/cypress/i18n_controller.rb
index cc3e5ec1a..cd68c4e91 100644
--- a/app/controllers/cypress/i18n_controller.rb
+++ b/app/controllers/cypress/i18n_controller.rb
@@ -10,16 +10,16 @@ def create
 
       substitutions = {}
       if params[:substitutions].present?
-        unless params[:substitutions].is_a?(Hash)
-          msg = "Argument `substitution` must be a hash indicating the substitutions."
-          msg += " But we got: '#{params[:substitutions]}'"
+        begin
+          substitutions = params[:substitutions].to_unsafe_hash.symbolize_keys
+        rescue NoMethodError
+          msg = "Argument `substitution` is '#{params[:substitutions]}'."
+          msg += " We cannot convert that to  a hash."
           raise(ArgumentError, msg)
         end
-        substitutions = params[:substitutions].to_unsafe_hash.symbolize_keys
       end
 
       i18n_key = params[:i18n_key]
-
       render json: I18n.t(i18n_key, **substitutions), status: :created
     end
   end

From 509a1ecc17e845ba98b067cb35eb796d6f2bea5f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 16:18:25 +0200
Subject: [PATCH 133/191] Fix cypress test (due to renaming of i18n keys /
 html)

---
 spec/cypress/e2e/vouchers_redemptions_spec_helpers.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index 8ad3a0384..1ba492e7d 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -31,7 +31,7 @@ export function verifyVoucherRedemptionText() {
 }
 
 export function verifyNoItemsYetMessage(context, itemType) {
-  cy.i18n(`profile.no_${itemType}s_yet`).as("noItemsYet");
+  cy.i18n(`profile.no_${itemType}s_redemption`).as("noItemsYet");
 
   cy.then(() => {
     cy.getBySelector("redeem-voucher-card").should("contain", context.noItemsYet);
@@ -200,11 +200,13 @@ export function verifyPreviousTeacherIsEditor(context) {
 }
 
 export function verifyAlreadyTeacherMessage(context) {
-  cy.i18n("profile.already_teacher").as("alreadyTeacher");
+  context.lecture.call.title().then((lectureTitle) => {
+    cy.i18n("profile.already_teacher_html", { lecture: lectureTitle }).as("alreadyTeacher");
+  });
 
   cy.then(() => {
     cy.getBySelector("redeem-voucher-card")
-      .should("contain", context.alreadyTeacher);
+      .should("contain.html", context.alreadyTeacher);
   });
 }
 

From 32f0d00808a2dad87ac048e89547916f314beab5 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 16:30:00 +0200
Subject: [PATCH 134/191] Cypress test that whitespaces in voucher hash work

---
 .vscode/settings.json                            | 3 ++-
 spec/cypress/e2e/vouchers_redemptions_spec.cy.js | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4f9a11422..d440bee39 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -114,7 +114,8 @@
         "helpdesk",
         "katex",
         "Timecop",
-        "turbolinks"
+        "turbolinks",
+        "whitespaces"
     ],
     "cSpell.enableFiletypes": [
         "ruby"
diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
index 305d0ff80..71db6b0cc 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
@@ -85,6 +85,12 @@ describe("Verify Voucher Form", () => {
       expect(message).to.equal(this.voucherInvalid);
     });
   });
+
+  it.only("is valid even if voucher string contains whitespaces at the beginning/end", function () {
+    cy.getBySelector("secure-hash-input").type(`\t  ${this.voucher.secure_hash} `);
+    cy.getBySelector("verify-voucher-submit").click();
+    helpers.verifyVoucherRedemptionText();
+  });
 });
 
 describe("Tutor voucher redemption", () => {

From baac57b682903d610c7e72e89a8298ec0436315d Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 16:52:05 +0200
Subject: [PATCH 135/191] Verify voucher is invalid after user became teacher

---
 spec/cypress/e2e/vouchers_redemptions_spec.cy.js  | 15 ++++-----------
 .../e2e/vouchers_redemptions_spec_helpers.js      | 11 +++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
index 71db6b0cc..3f14143ca 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
@@ -74,19 +74,10 @@ describe("Verify Voucher Form", () => {
   });
 
   it("displays an alert if the voucher is invalid", function () {
-    cy.getBySelector("secure-hash-input").type("incorrect hash");
-    cy.i18n("controllers.voucher_invalid").as("voucherInvalid");
-
-    cy.then(() => {
-      cy.getBySelector("verify-voucher-submit").click();
-    });
-
-    cy.on("window:alert", (message) => {
-      expect(message).to.equal(this.voucherInvalid);
-    });
+    helpers.verifyVoucherInvalidAlert(this, "incorrect hash");
   });
 
-  it.only("is valid even if voucher string contains whitespaces at the beginning/end", function () {
+  it("is valid even if voucher string contains whitespaces at the beginning/end", function () {
     cy.getBySelector("secure-hash-input").type(`\t  ${this.voucher.secure_hash} `);
     cy.getBySelector("verify-voucher-submit").click();
     helpers.verifyVoucherRedemptionText();
@@ -174,6 +165,8 @@ describe("Teacher voucher redemption", () => {
     helpers.verifyUserIsTeacher(this);
     helpers.verifyPreviousTeacherIsEditor(this);
     helpers.verifyRoleNotification(this, "teacher");
+    cy.visit("/profile/edit");
+    helpers.verifyVoucherInvalidAlert(this, this.voucher.secure_hash);
   });
 
   context("when the user is already the teacher", () => {
diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index 1ba492e7d..ae3333499 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -26,6 +26,17 @@ export function submitVoucher(voucher) {
   cy.getBySelector("verify-voucher-submit").click();
 }
 
+export function verifyVoucherInvalidAlert(context, hash) {
+  expect(hash).to.not.be.empty;
+  cy.getBySelector("secure-hash-input").type(hash);
+  cy.i18n("controllers.voucher_invalid").then((voucherInvalidMsg) => {
+    cy.on("window:alert", (message) => {
+      expect(message).to.equal(voucherInvalidMsg);
+    });
+    cy.getBySelector("verify-voucher-submit").click();
+  });
+}
+
 export function verifyVoucherRedemptionText() {
   cy.getBySelector("redeem-voucher-text").should("be.visible");
 }

From aa7aec93728c3c551c0117970bed5958627b9ddd Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 15 Oct 2024 18:23:47 +0200
Subject: [PATCH 136/191] Add user deletion cypress spec (for tutor)

---
 app/views/profile/_account.html.erb           |  2 +-
 app/views/users/_delete_account.html.erb      |  4 +++-
 .../e2e/vouchers_redemptions_spec.cy.js       | 22 +++++++++++++++++++
 .../e2e/vouchers_redemptions_spec_helpers.js  |  7 +++---
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/views/profile/_account.html.erb b/app/views/profile/_account.html.erb
index 0847f3662..087bfbc38 100644
--- a/app/views/profile/_account.html.erb
+++ b/app/views/profile/_account.html.erb
@@ -4,5 +4,5 @@
 <%= link_to t('profile.delete_account'),
             delete_account_path,
             class: "btn btn-outline-danger mb-2",
+            "data-cy": "delete-account-btn",
             remote: true %>
-
diff --git a/app/views/users/_delete_account.html.erb b/app/views/users/_delete_account.html.erb
index 6c01e7a44..a384b2118 100644
--- a/app/views/users/_delete_account.html.erb
+++ b/app/views/users/_delete_account.html.erb
@@ -3,6 +3,7 @@
 <%= t('profile.confirm_account_deletion') %>
 <%= f.password_field :password,
                      class: 'form-control my-2',
+                     "data-cy": "delete-account-pwd-field",
                      required: true %>
 <% if current_user.contributor? %>
   <div class="row mt-2">
@@ -57,7 +58,8 @@
 <div class="row mt-3">
   <div class="col-12 text-center">
     <%= f.submit t('profile.delete_account'),
-                 class: "btn btn-danger mb-2" %>
+                 class: "btn btn-danger mb-2",
+                 "data-cy": "delete-account-confirm-btn" %>
   </div>
 </div>
 <% end %>
\ No newline at end of file
diff --git a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
index 3f14143ca..61ee1bf4e 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec.cy.js
@@ -208,3 +208,25 @@ describe("Speaker voucher redemption", () => {
     });
   });
 });
+
+describe("User & Redemption deletion", () => {
+  beforeEach(function () {
+    helpers.createRedemptionScenario(this, "tutor");
+  });
+
+  it("after deletion of tutor user, it is no longer selectable", function () {
+    helpers.submitVoucher(this.voucher);
+    helpers.redeemVoucherToBecomeRole(this, "tutor");
+
+    cy.visit("/profile/edit");
+    cy.getBySelector("delete-account-btn").click();
+    cy.getBySelector("delete-account-pwd-field").type(this.user.password);
+    cy.getBySelector("delete-account-confirm-btn").click();
+
+    cy.then(() => {
+      helpers.logoutAndLoginAsTeacher(this);
+      helpers.visitEditPage(this, "tutorial");
+      helpers.verifyNoTutorialsButUserEligibleAsTutor(this, false);
+    });
+  });
+});
diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index ae3333499..b007f03ee 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -115,14 +115,15 @@ export function logoutAndLoginAsTeacher(context) {
   cy.login(context.teacher);
 }
 
-export function verifyNoTutorialsButUserEligibleAsTutor(context) {
+export function verifyNoTutorialsButUserEligibleAsTutor(context, shouldBeEligible = true) {
   cy.getBySelector("tutorial-row").should("not.exist");
   cy.getBySelector("new-tutorial-btn").should("be.visible").click();
   cy.then(() => {
     cy.getBySelector("tutorial-form").should("be.visible");
     cy.getBySelector("tutor-select").within(() => {
-      cy.get("option").should("contain", context.user.name_in_tutorials)
-        .and("contain", context.user.email)
+      const containStr = shouldBeEligible ? "contain" : "not.contain";
+      cy.get("option").should(containStr, context.user.name_in_tutorials)
+        .and(containStr, context.user.email)
         .and("not.contain", context.user.name);
     });
   });

From ef15a6eb0660f4e615e5dc3dc247600732acf13a Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 16 Oct 2024 00:01:52 +0200
Subject: [PATCH 137/191] Add word to cspell list

---
 .vscode/settings.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index d440bee39..44c0d4842 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -110,6 +110,7 @@
     "cSpell.language": "en,de",
     "cSpell.words": [
         "commontator",
+        "cospeakers",
         "factorybot",
         "helpdesk",
         "katex",

From 831f5a3aba1e6cf2a41c4207f3f31510ae942d7d Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 16 Oct 2024 00:06:36 +0200
Subject: [PATCH 138/191] Replace "display" by "show"

For me, "display" is closer to the frontend, while this is a backend test,
that's why I renamed it. Not really that important in the end ;)
---
 spec/controllers/vouchers_controller_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/controllers/vouchers_controller_spec.rb b/spec/controllers/vouchers_controller_spec.rb
index 61b01b87e..694b4c668 100644
--- a/spec/controllers/vouchers_controller_spec.rb
+++ b/spec/controllers/vouchers_controller_spec.rb
@@ -1,4 +1,5 @@
 require "rails_helper"
+
 RSpec.describe(VouchersController, type: :controller) do
   let(:teacher) { FactoryBot.create(:confirmed_user) }
   let(:generic_user) { FactoryBot.create(:confirmed_user) }
@@ -56,7 +57,7 @@
     end
 
     describe "POST #verify" do
-      it "displays an error message if the secure hash is incorrect" do
+      it "shows an error message if the secure hash is incorrect" do
         post(:verify, params: { secure_hash: "incorrect_hash" })
         expect(flash[:alert]).to eq(I18n.t("controllers.voucher_invalid"))
       end
@@ -74,7 +75,7 @@
         end.not_to change(Redemption, :count)
       end
 
-      it "displays an error message if the secure hash is incorrect" do
+      it "shows an error message if the secure hash is incorrect" do
         post(:redeem, params: { secure_hash: "incorrect_hash" })
         expect(flash[:alert]).to eq(I18n.t("controllers.voucher_invalid"))
       end

From 0ba6696720c2d433edeb5c64effe39598fea3367 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 16 Oct 2024 00:14:12 +0200
Subject: [PATCH 139/191] Fix two spelling mistakes (out of scope)

---
 app/controllers/lectures_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 7361ba778..01137d84c 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -74,9 +74,9 @@ def create
       @lecture.update(sort: "special") if @lecture.course.term_independent
       # set organizational_concept to default
       set_organizational_defaults
-      # set lenguage to default language
+      # set language to default language
       set_language
-      # depending on where the create action was trriggered from, return
+      # depending on where the create action was triggered from, return
       # to admin index view or edit course view
       unless params[:lecture][:from] == "course"
         redirect_to administration_path,

From 68afdec661ed70213991fb6ae8b8568da9b00d09 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 17 Oct 2024 13:47:11 +0200
Subject: [PATCH 140/191] Move lecture notifications to separate file

---
 .vscode/settings.json                      |  1 +
 app/controllers/concerns/notifier.rb       | 34 ++++++-------
 app/mailers/lecture_notification_mailer.rb | 50 ++++++++++++++++++++
 app/mailers/notification_mailer.rb         | 55 ++++------------------
 4 files changed, 76 insertions(+), 64 deletions(-)
 create mode 100644 app/mailers/lecture_notification_mailer.rb

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 44c0d4842..6b800d5e3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -110,6 +110,7 @@
     "cSpell.language": "en,de",
     "cSpell.words": [
         "commontator",
+        "cospeaker",
         "cospeakers",
         "factorybot",
         "helpdesk",
diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/concerns/notifier.rb
index 86c8bcfaa..abe390226 100644
--- a/app/controllers/concerns/notifier.rb
+++ b/app/controllers/concerns/notifier.rb
@@ -2,24 +2,24 @@ module Notifier
   extend ActiveSupport::Concern
 
   def notify_new_editor_by_mail(editor, lecture)
-    NotificationMailer.with(recipient: editor,
-                            locale: editor.locale,
-                            lecture: lecture)
-                      .new_editor_email.deliver_later
+    LectureNotificationMailer.with(recipient: editor,
+                                   locale: editor.locale,
+                                   lecture: lecture)
+                             .new_editor_email.deliver_later
   end
 
   def notify_new_teacher_by_mail(lecture)
-    NotificationMailer.with(recipient: lecture.teacher,
-                            locale: lecture.teacher.locale,
-                            lecture: lecture)
-                      .new_teacher_email.deliver_later
+    LectureNotificationMailer.with(recipient: lecture.teacher,
+                                   locale: lecture.teacher.locale,
+                                   lecture: lecture)
+                             .new_teacher_email.deliver_later
   end
 
   def notify_previous_teacher_by_mail(previous_teacher, lecture)
-    NotificationMailer.with(recipient: previous_teacher,
-                            locale: previous_teacher.locale,
-                            lecture: lecture)
-                      .previous_teacher_email.deliver_later
+    LectureNotificationMailer.with(recipient: previous_teacher,
+                                   locale: previous_teacher.locale,
+                                   lecture: lecture)
+                             .previous_teacher_email.deliver_later
   end
 
   def notify_about_teacher_change_by_mail(lecture, previous_teacher)
@@ -32,11 +32,11 @@ def notify_cospeakers_by_mail(speaker, talks)
       talk.speakers.each do |cospeaker|
         next if cospeaker == speaker
 
-        NotificationMailer.with(recipient: cospeaker,
-                                locale: cospeaker.locale,
-                                talk: talk,
-                                speaker: speaker)
-                          .new_speaker_email.deliver_later
+        LectureNotificationMailer.with(recipient: cospeaker,
+                                       locale: cospeaker.locale,
+                                       talk: talk,
+                                       speaker: speaker)
+                                 .new_speaker_email.deliver_later
       end
     end
   end
diff --git a/app/mailers/lecture_notification_mailer.rb b/app/mailers/lecture_notification_mailer.rb
new file mode 100644
index 000000000..e93b5d617
--- /dev/null
+++ b/app/mailers/lecture_notification_mailer.rb
@@ -0,0 +1,50 @@
+class LectureNotificationMailer < ApplicationMailer
+  before_action NotificationMailer.set_sender_and_locale
+
+  def new_editor_email
+    @lecture = params[:lecture]
+    @recipient = params[:recipient]
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.new_editor_subject",
+                    title: @lecture.title_for_viewers))
+  end
+
+  def new_teacher_email
+    @lecture = params[:lecture]
+    @recipient = params[:recipient]
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.new_teacher_subject",
+                    title: @lecture.title_for_viewers))
+  end
+
+  def previous_teacher_email
+    @lecture = params[:lecture]
+    @recipient = params[:recipient]
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.previous_teacher_subject",
+                    title: @lecture.title_for_viewers,
+                    new_teacher: @lecture.teacher.tutorial_name))
+  end
+
+  def new_speaker_email
+    @talk = params[:talk]
+    @recipient = params[:recipient]
+    @speaker = params[:speaker].info
+    @username = @recipient.tutorial_name
+
+    mail(from: @sender,
+         to: @recipient.email,
+         subject: t("mailer.new_speaker_subject",
+                    seminar: @talk.lecture.title,
+                    title: @talk.to_label))
+  end
+end
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 7a538288f..047a45350 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -51,53 +51,6 @@ def new_lecture_email
                     title: @lecture.title_for_viewers))
   end
 
-  def new_editor_email
-    @lecture = params[:lecture]
-    @recipient = params[:recipient]
-    @username = @recipient.tutorial_name
-
-    mail(from: @sender,
-         to: @recipient.email,
-         subject: t("mailer.new_editor_subject",
-                    title: @lecture.title_for_viewers))
-  end
-
-  def new_teacher_email
-    @lecture = params[:lecture]
-    @recipient = params[:recipient]
-    @username = @recipient.tutorial_name
-
-    mail(from: @sender,
-         to: @recipient.email,
-         subject: t("mailer.new_teacher_subject",
-                    title: @lecture.title_for_viewers))
-  end
-
-  def previous_teacher_email
-    @lecture = params[:lecture]
-    @recipient = params[:recipient]
-    @username = @recipient.tutorial_name
-
-    mail(from: @sender,
-         to: @recipient.email,
-         subject: t("mailer.previous_teacher_subject",
-                    title: @lecture.title_for_viewers,
-                    new_teacher: @lecture.teacher.tutorial_name))
-  end
-
-  def new_speaker_email
-    @talk = params[:talk]
-    @recipient = params[:recipient]
-    @speaker = params[:speaker].info
-    @username = @recipient.tutorial_name
-
-    mail(from: @sender,
-         to: @recipient.email,
-         subject: t("mailer.new_speaker_subject",
-                    seminar: @talk.lecture.title,
-                    title: @talk.to_label))
-  end
-
   def submission_invitation_email
     @recipient = params[:recipient]
     @assignment = params[:assignment]
@@ -209,8 +162,16 @@ def submission_destruction_lecture_email
                     lecture: @lecture.title))
   end
 
+  def self.set_sender_and_locale
+    @sender = "#{t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
+    I18n.locale = params[:locale]
+  end
+
   private
 
+    # This method should be replaced by the one above (self.set_sender_and_locale).
+    # It only stays here during the transition phase where this file is split
+    # into multiple files regarding concerns like vouchers, submissions, etc.
     def set_sender_and_locale
       @sender = "#{t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
       I18n.locale = params[:locale]

From 11f748d94c327e6f8af4a3044ad4bbc496ad2f5f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 17 Oct 2024 14:05:11 +0200
Subject: [PATCH 141/191] Replace Notifier concern by LectureNotifier module

---
 app/controllers/concerns/.keep                |  0
 .../notifier.rb => lecture_notifier.rb}       | 34 +++++++++----------
 app/controllers/lectures_controller.rb        |  3 +-
 app/controllers/vouchers_controller.rb        |  1 -
 app/models/voucher/redeemer.rb                |  9 +++--
 5 files changed, 22 insertions(+), 25 deletions(-)
 delete mode 100644 app/controllers/concerns/.keep
 rename app/controllers/{concerns/notifier.rb => lecture_notifier.rb} (58%)

diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/controllers/concerns/notifier.rb b/app/controllers/lecture_notifier.rb
similarity index 58%
rename from app/controllers/concerns/notifier.rb
rename to app/controllers/lecture_notifier.rb
index abe390226..47b5b59e0 100644
--- a/app/controllers/concerns/notifier.rb
+++ b/app/controllers/lecture_notifier.rb
@@ -1,6 +1,4 @@
-module Notifier
-  extend ActiveSupport::Concern
-
+module LectureNotifier
   def notify_new_editor_by_mail(editor, lecture)
     LectureNotificationMailer.with(recipient: editor,
                                    locale: editor.locale,
@@ -8,20 +6,6 @@ def notify_new_editor_by_mail(editor, lecture)
                              .new_editor_email.deliver_later
   end
 
-  def notify_new_teacher_by_mail(lecture)
-    LectureNotificationMailer.with(recipient: lecture.teacher,
-                                   locale: lecture.teacher.locale,
-                                   lecture: lecture)
-                             .new_teacher_email.deliver_later
-  end
-
-  def notify_previous_teacher_by_mail(previous_teacher, lecture)
-    LectureNotificationMailer.with(recipient: previous_teacher,
-                                   locale: previous_teacher.locale,
-                                   lecture: lecture)
-                             .previous_teacher_email.deliver_later
-  end
-
   def notify_about_teacher_change_by_mail(lecture, previous_teacher)
     notify_new_teacher_by_mail(lecture)
     notify_previous_teacher_by_mail(previous_teacher, lecture)
@@ -40,4 +24,20 @@ def notify_cospeakers_by_mail(speaker, talks)
       end
     end
   end
+
+  private
+
+    def notify_new_teacher_by_mail(lecture)
+      LectureNotificationMailer.with(recipient: lecture.teacher,
+                                     locale: lecture.teacher.locale,
+                                     lecture: lecture)
+                               .new_teacher_email.deliver_later
+    end
+
+    def notify_previous_teacher_by_mail(previous_teacher, lecture)
+      LectureNotificationMailer.with(recipient: previous_teacher,
+                                     locale: previous_teacher.locale,
+                                     lecture: lecture)
+                               .previous_teacher_email.deliver_later
+    end
 end
diff --git a/app/controllers/lectures_controller.rb b/app/controllers/lectures_controller.rb
index 01137d84c..d0b3b1a48 100644
--- a/app/controllers/lectures_controller.rb
+++ b/app/controllers/lectures_controller.rb
@@ -1,6 +1,5 @@
 # LecturesController
 class LecturesController < ApplicationController
-  include Notifier
   include ActionController::RequestForgeryProtection
   before_action :set_lecture, except: [:new, :create, :search]
   before_action :set_lecture_cookie, only: [:show, :organizational,
@@ -107,7 +106,7 @@ def update
       recipients = User.where(id: new_ids)
 
       recipients.each do |r|
-        notify_new_editor_by_mail(r, @lecture)
+        LectureNotifier.notify_new_editor_by_mail(r, @lecture)
       end
     end
 
diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb
index e8641bbd0..e73dc38cb 100644
--- a/app/controllers/vouchers_controller.rb
+++ b/app/controllers/vouchers_controller.rb
@@ -1,5 +1,4 @@
 class VouchersController < ApplicationController
-  include Notifier
   load_and_authorize_resource
   before_action :find_voucher, only: :invalidate
 
diff --git a/app/models/voucher/redeemer.rb b/app/models/voucher/redeemer.rb
index 7e78a44ca..ad9ede97c 100644
--- a/app/models/voucher/redeemer.rb
+++ b/app/models/voucher/redeemer.rb
@@ -5,7 +5,6 @@
 # that can be claimed via a voucher, e.g. becoming a tutor for a lecture etc.
 module Redeemer
   extend ActiveSupport::Concern
-  include Notifier
 
   included do
     has_many :redemptions, dependent: :destroy
@@ -42,7 +41,7 @@ def redeem_tutor_voucher(tutorial_ids)
 
     def redeem_editor_voucher
       lecture.update_editor_status!(Current.user)
-      notify_new_editor_by_mail(Current.user, lecture)
+      LectureNotifier.notify_new_editor_by_mail(Current.user, lecture)
 
       Redemption.create(user: Current.user, voucher: self)
     end
@@ -54,8 +53,8 @@ def redeem_teacher_voucher
       # because then there is no demotion to editor
       # (it is actually not possible to trigger this case via the GUI)
       if previous_teacher != Current.user
-        notify_about_teacher_change_by_mail(lecture,
-                                            previous_teacher)
+        LectureNotifier.notify_about_teacher_change_by_mail(lecture,
+                                                            previous_teacher)
       end
       invalidate!
 
@@ -65,7 +64,7 @@ def redeem_teacher_voucher
     def redeem_speaker_voucher(talk_ids)
       selected_talks = lecture.talks.where(id: talk_ids)
       lecture.update_speaker_status!(Current.user, selected_talks)
-      notify_cospeakers_by_mail(Current.user, selected_talks)
+      LectureNotifier.notify_cospeakers_by_mail(Current.user, selected_talks)
 
       Redemption.create(user: Current.user, voucher: self,
                         claimed_talks: selected_talks)

From 7fec45375c9fab0e388c53227fee1bcd3d354481 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 17 Oct 2024 14:10:41 +0200
Subject: [PATCH 142/191] Remove unused set_recipients method for "new editor
 mail"

---
 app/mailers/notification_mailer.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 047a45350..3e6d959f8 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -2,7 +2,6 @@ class NotificationMailer < ApplicationMailer
   before_action :set_sender_and_locale
   before_action :set_recipients, only: [:medium_email, :announcement_email,
                                         :new_lecture_email,
-                                        :new_editor_email,
                                         :submission_deletion_email,
                                         :submission_deletion_lecture_email,
                                         :submission_destruction_email,

From 82d6c676f2f0537a5f9da3245f3eb0316df40384 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 29 Oct 2024 23:14:46 +0100
Subject: [PATCH 143/191] Move email templates to right folder

---
 .../new_editor_email.html.erb                                     | 0
 .../new_editor_email.text.erb                                     | 0
 .../new_speaker_email.html.erb                                    | 0
 .../new_speaker_email.text.erb                                    | 0
 .../new_teacher_email.html.erb                                    | 0
 .../new_teacher_email.text.erb                                    | 0
 .../previous_teacher_email.html.erb                               | 0
 .../previous_teacher_email.text.erb                               | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename app/views/{notification_mailer => lecture_notification_mailer}/new_editor_email.html.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/new_editor_email.text.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/new_speaker_email.html.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/new_speaker_email.text.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/new_teacher_email.html.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/new_teacher_email.text.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/previous_teacher_email.html.erb (100%)
 rename app/views/{notification_mailer => lecture_notification_mailer}/previous_teacher_email.text.erb (100%)

diff --git a/app/views/notification_mailer/new_editor_email.html.erb b/app/views/lecture_notification_mailer/new_editor_email.html.erb
similarity index 100%
rename from app/views/notification_mailer/new_editor_email.html.erb
rename to app/views/lecture_notification_mailer/new_editor_email.html.erb
diff --git a/app/views/notification_mailer/new_editor_email.text.erb b/app/views/lecture_notification_mailer/new_editor_email.text.erb
similarity index 100%
rename from app/views/notification_mailer/new_editor_email.text.erb
rename to app/views/lecture_notification_mailer/new_editor_email.text.erb
diff --git a/app/views/notification_mailer/new_speaker_email.html.erb b/app/views/lecture_notification_mailer/new_speaker_email.html.erb
similarity index 100%
rename from app/views/notification_mailer/new_speaker_email.html.erb
rename to app/views/lecture_notification_mailer/new_speaker_email.html.erb
diff --git a/app/views/notification_mailer/new_speaker_email.text.erb b/app/views/lecture_notification_mailer/new_speaker_email.text.erb
similarity index 100%
rename from app/views/notification_mailer/new_speaker_email.text.erb
rename to app/views/lecture_notification_mailer/new_speaker_email.text.erb
diff --git a/app/views/notification_mailer/new_teacher_email.html.erb b/app/views/lecture_notification_mailer/new_teacher_email.html.erb
similarity index 100%
rename from app/views/notification_mailer/new_teacher_email.html.erb
rename to app/views/lecture_notification_mailer/new_teacher_email.html.erb
diff --git a/app/views/notification_mailer/new_teacher_email.text.erb b/app/views/lecture_notification_mailer/new_teacher_email.text.erb
similarity index 100%
rename from app/views/notification_mailer/new_teacher_email.text.erb
rename to app/views/lecture_notification_mailer/new_teacher_email.text.erb
diff --git a/app/views/notification_mailer/previous_teacher_email.html.erb b/app/views/lecture_notification_mailer/previous_teacher_email.html.erb
similarity index 100%
rename from app/views/notification_mailer/previous_teacher_email.html.erb
rename to app/views/lecture_notification_mailer/previous_teacher_email.html.erb
diff --git a/app/views/notification_mailer/previous_teacher_email.text.erb b/app/views/lecture_notification_mailer/previous_teacher_email.text.erb
similarity index 100%
rename from app/views/notification_mailer/previous_teacher_email.text.erb
rename to app/views/lecture_notification_mailer/previous_teacher_email.text.erb

From 555e26eeeedaf4fcdfe529dfd435e403819b8b48 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 29 Oct 2024 23:15:37 +0100
Subject: [PATCH 144/191] Correct sender_nad_locale setting

---
 app/controllers/lecture_notifier.rb        | 2 ++
 app/mailers/lecture_notification_mailer.rb | 2 +-
 app/mailers/notification_mailer.rb         | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/controllers/lecture_notifier.rb b/app/controllers/lecture_notifier.rb
index 47b5b59e0..a35103641 100644
--- a/app/controllers/lecture_notifier.rb
+++ b/app/controllers/lecture_notifier.rb
@@ -1,4 +1,6 @@
 module LectureNotifier
+  extend self
+
   def notify_new_editor_by_mail(editor, lecture)
     LectureNotificationMailer.with(recipient: editor,
                                    locale: editor.locale,
diff --git a/app/mailers/lecture_notification_mailer.rb b/app/mailers/lecture_notification_mailer.rb
index e93b5d617..a859cd491 100644
--- a/app/mailers/lecture_notification_mailer.rb
+++ b/app/mailers/lecture_notification_mailer.rb
@@ -1,5 +1,5 @@
 class LectureNotificationMailer < ApplicationMailer
-  before_action NotificationMailer.set_sender_and_locale
+  before_action { NotificationMailer.sender_and_locale(params[:locale]) }
 
   def new_editor_email
     @lecture = params[:lecture]
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 3e6d959f8..b74e3db7d 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -161,9 +161,9 @@ def submission_destruction_lecture_email
                     lecture: @lecture.title))
   end
 
-  def self.set_sender_and_locale
-    @sender = "#{t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
-    I18n.locale = params[:locale]
+  def self.sender_and_locale(locale)
+    I18n.locale = locale
+    @sender = "#{I18n.t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
   end
 
   private

From ae7a5cd0849861f9e8d60bdb0fd34ab94555b53a Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 29 Oct 2024 23:15:55 +0100
Subject: [PATCH 145/191] Introduce enqueue_mail_with_params matcher & test for
 editor

---
 spec/models/redeemer_spec.rb                      |  7 +++++++
 spec/support/matchers/enqueue_mail_with_params.rb | 14 ++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 spec/support/matchers/enqueue_mail_with_params.rb

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 92fe1c983..316add4c6 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -64,6 +64,13 @@
         voucher.redeem(params)
         expect(lecture.editors).to include(user)
       end
+
+      it "sends an email to the new editor" do
+        expect do
+          voucher.redeem(params)
+        end.to enqueue_mail_with_params(LectureNotificationMailer, :new_editor_email,
+                                        recipient: user, lecture: lecture, locale: user.locale)
+      end
     end
 
     context "when the voucher is for a teacher" do
diff --git a/spec/support/matchers/enqueue_mail_with_params.rb b/spec/support/matchers/enqueue_mail_with_params.rb
new file mode 100644
index 000000000..52eda8e18
--- /dev/null
+++ b/spec/support/matchers/enqueue_mail_with_params.rb
@@ -0,0 +1,14 @@
+RSpec::Matchers.define(:enqueue_mail_with_params) do |mailer, method, params|
+  supports_block_expectations
+
+  match do |block|
+    expect do
+      block.call
+    end.to have_enqueued_mail(mailer, method)
+      .with(hash_including(params: hash_including(params)))
+  end
+
+  failure_message do |_block|
+    "expected to enqueue #{mailer}.#{method} with #{params}, but instead enqueued: #{enqueued_jobs}"
+  end
+end

From b8c3fbfbefd58d16d461cbf83a17b75093c86f72 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 29 Oct 2024 23:37:01 +0100
Subject: [PATCH 146/191] Add spec for Current user model

---
 spec/models/current_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 spec/models/current_spec.rb

diff --git a/spec/models/current_spec.rb b/spec/models/current_spec.rb
new file mode 100644
index 000000000..b4fc44d71
--- /dev/null
+++ b/spec/models/current_spec.rb
@@ -0,0 +1,19 @@
+require "rails_helper"
+
+RSpec.describe(Current) do
+  let(:user) { FactoryBot.create(:confirmed_user) }
+
+  describe ".user" do
+    it "returns the current user" do
+      Current.user = :user
+      expect(Current.user).to eq(:user)
+    end
+  end
+
+  describe "current_user= via ApplicationController" do
+    it "sets the current user" do
+      ApplicationController.current_user = :user
+      expect(Current.user).to eq(:user)
+    end
+  end
+end

From d080a0ca31d6d4cc238eba5003a43d22c811dc3c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 00:08:35 +0100
Subject: [PATCH 147/191] Inline sender_and_locale

---
 app/mailers/lecture_notification_mailer.rb | 4 +++-
 app/mailers/notification_mailer.rb         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/mailers/lecture_notification_mailer.rb b/app/mailers/lecture_notification_mailer.rb
index a859cd491..2f99d3b33 100644
--- a/app/mailers/lecture_notification_mailer.rb
+++ b/app/mailers/lecture_notification_mailer.rb
@@ -1,7 +1,9 @@
 class LectureNotificationMailer < ApplicationMailer
-  before_action { NotificationMailer.sender_and_locale(params[:locale]) }
+  # TODO: find alternative
+  # before_action { NotificationMailer.sender_and_locale(params[:locale]) }
 
   def new_editor_email
+    @sender = NotificationMailer.sender_and_locale(params[:locale])
     @lecture = params[:lecture]
     @recipient = params[:recipient]
     @username = @recipient.tutorial_name
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index b74e3db7d..f7e452b9c 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -163,7 +163,7 @@ def submission_destruction_lecture_email
 
   def self.sender_and_locale(locale)
     I18n.locale = locale
-    @sender = "#{I18n.t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
+    "#{I18n.t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
   end
 
   private

From 663b27f1cfed414f34313715505ae82a5012845b Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 00:09:06 +0100
Subject: [PATCH 148/191] Try to test email sending for editor voucher (fails)

---
 spec/models/redeemer_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 316add4c6..97b79ebe4 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -66,10 +66,21 @@
       end
 
       it "sends an email to the new editor" do
+        expect(Current.user).to eq(user)
+
         expect do
           voucher.redeem(params)
         end.to enqueue_mail_with_params(LectureNotificationMailer, :new_editor_email,
                                         recipient: user, lecture: lecture, locale: user.locale)
+
+        perform_enqueued_jobs do
+          voucher.redeem(params)
+        end
+        mail = ActionMailer::Base.deliveries.last
+        expect(mail.from).to include(DefaultSetting::PROJECT_NOTIFICATION_EMAIL)
+        expect(mail.to).to include(user.email)
+        expect(mail.subject).to include(I18n.t("mailer.new_editor_subject",
+                                               title: lecture.title_for_viewers))
       end
     end
 

From 1d326402b36b9722fa60225c2c136de44c6da878 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 01:42:06 +0100
Subject: [PATCH 149/191] Mock Current model in RSpec tests

---
 app/controllers/application_controller.rb | 8 --------
 spec/models/redeemer_spec.rb              | 5 +++--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fe9fb6090..dfe2dbb0f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -66,14 +66,6 @@ def prevent_caching
     response.headers["Expires"] = "Mon, 01 Jan 1990 00:00:00 GMT"
   end
 
-  # Sets the current user of the Current model.
-  #
-  # This should be only used for (model) tests where the set_current_user
-  # method of the ApplicationController is not available.
-  def self.current_user=(user)
-    Current.user = user
-  end
-
   protected
 
     def configure_permitted_parameters
diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 97b79ebe4..36ff34ebc 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -9,7 +9,7 @@
     let(:role) { :tutor }
 
     before :each do
-      ApplicationController.current_user = user
+      allow(Current).to receive(:user).and_return(user)
     end
 
     shared_examples "common voucher processing" do
@@ -80,7 +80,8 @@
         expect(mail.from).to include(DefaultSetting::PROJECT_NOTIFICATION_EMAIL)
         expect(mail.to).to include(user.email)
         expect(mail.subject).to include(I18n.t("mailer.new_editor_subject",
-                                               title: lecture.title_for_viewers))
+                                               title: lecture.title_for_viewers,
+                                               locale: user.locale))
       end
     end
 

From 8470fc0e02e96d34b76455453e28bc68a876d9ab Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 02:50:49 +0100
Subject: [PATCH 150/191] Rework sender and locale setting

---
 app/mailers/lecture_notification_mailer.rb | 5 ++---
 app/mailers/notification_mailer.rb         | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/mailers/lecture_notification_mailer.rb b/app/mailers/lecture_notification_mailer.rb
index 2f99d3b33..62263765a 100644
--- a/app/mailers/lecture_notification_mailer.rb
+++ b/app/mailers/lecture_notification_mailer.rb
@@ -1,9 +1,8 @@
 class LectureNotificationMailer < ApplicationMailer
-  # TODO: find alternative
-  # before_action { NotificationMailer.sender_and_locale(params[:locale]) }
+  before_action { I18n.locale = params[:locale] }
+  before_action { @sender = NotificationMailer.sender(params[:locale]) }
 
   def new_editor_email
-    @sender = NotificationMailer.sender_and_locale(params[:locale])
     @lecture = params[:lecture]
     @recipient = params[:recipient]
     @username = @recipient.tutorial_name
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index f7e452b9c..5f0c789ec 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -161,9 +161,9 @@ def submission_destruction_lecture_email
                     lecture: @lecture.title))
   end
 
-  def self.sender_and_locale(locale)
-    I18n.locale = locale
-    "#{I18n.t("mailer.notification")} <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
+  def self.sender(locale)
+    I18n.t("mailer.notification", locale: locale) \
+      +" <#{DefaultSetting::PROJECT_NOTIFICATION_EMAIL}>"
   end
 
   private

From 7fdfc851cae47be19b14bcb2c6f173ed39023231 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 02:51:02 +0100
Subject: [PATCH 151/191] Fix mail sending test for editor

---
 spec/models/redeemer_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 36ff34ebc..24715bb38 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -78,10 +78,11 @@
         end
         mail = ActionMailer::Base.deliveries.last
         expect(mail.from).to include(DefaultSetting::PROJECT_NOTIFICATION_EMAIL)
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification",
+                                                            locale: user.locale))
         expect(mail.to).to include(user.email)
         expect(mail.subject).to include(I18n.t("mailer.new_editor_subject",
-                                               title: lecture.title_for_viewers,
-                                               locale: user.locale))
+                                               title: lecture.title_for_viewers))
       end
     end
 

From 7264926bc989d6bad9c76037b9f8f487bf37913a Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 19:23:44 +0100
Subject: [PATCH 152/191] Test mail body (editor)

---
 spec/models/redeemer_spec.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 24715bb38..b30cd6453 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -66,8 +66,6 @@
       end
 
       it "sends an email to the new editor" do
-        expect(Current.user).to eq(user)
-
         expect do
           voucher.redeem(params)
         end.to enqueue_mail_with_params(LectureNotificationMailer, :new_editor_email,
@@ -81,8 +79,14 @@
         expect(mail[:from].display_names).to include(I18n.t("mailer.notification",
                                                             locale: user.locale))
         expect(mail.to).to include(user.email)
-        expect(mail.subject).to include(I18n.t("mailer.new_editor_subject",
-                                               title: lecture.title_for_viewers))
+        expect(mail.subject).to include(
+          I18n.t("mailer.new_editor_subject", title: lecture.title_for_viewers,
+                                              locale: user.locale)
+        )
+        expect(mail.html_part.body).to include(
+          I18n.t("mailer.new_editor", title: lecture.title_with_teacher,
+                                      username: user.tutorial_name, locale: user.locale)
+        )
       end
     end
 

From 10d28fbf98a9dbdfdeeb495fb1a0cfa9ab9a666c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 30 Oct 2024 19:40:06 +0100
Subject: [PATCH 153/191] Set locale in broader scope test

---
 spec/models/redeemer_spec.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index b30cd6453..960501878 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -74,18 +74,18 @@
         perform_enqueued_jobs do
           voucher.redeem(params)
         end
+
         mail = ActionMailer::Base.deliveries.last
+        I18n.locale = user.locale
         expect(mail.from).to include(DefaultSetting::PROJECT_NOTIFICATION_EMAIL)
-        expect(mail[:from].display_names).to include(I18n.t("mailer.notification",
-                                                            locale: user.locale))
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
         expect(mail.to).to include(user.email)
         expect(mail.subject).to include(
-          I18n.t("mailer.new_editor_subject", title: lecture.title_for_viewers,
-                                              locale: user.locale)
+          I18n.t("mailer.new_editor_subject", title: lecture.title_for_viewers)
         )
         expect(mail.html_part.body).to include(
-          I18n.t("mailer.new_editor", title: lecture.title_with_teacher,
-                                      username: user.tutorial_name, locale: user.locale)
+          I18n.t("mailer.new_editor",
+                 title: lecture.title_with_teacher, username: user.tutorial_name)
         )
       end
     end

From a003fbcdc64f21908ec6d48a186228ce70b8c63e Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 00:46:30 +0100
Subject: [PATCH 154/191] Fix comment

---
 app/mailers/notification_mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index 5f0c789ec..8445cbe7d 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -168,7 +168,7 @@ def self.sender(locale)
 
   private
 
-    # This method should be replaced by the one above (self.set_sender_and_locale).
+    # This method should be replaced by the one above (self.sender).
     # It only stays here during the transition phase where this file is split
     # into multiple files regarding concerns like vouchers, submissions, etc.
     def set_sender_and_locale

From a78c767430240a8f92217075fa980dd9291b1aae Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 00:46:56 +0100
Subject: [PATCH 155/191] Test previous and new teacher mail

---
 spec/models/redeemer_spec.rb | 50 ++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 960501878..3751553e0 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -110,6 +110,56 @@
         voucher.redeem(params)
         expect(voucher.invalidated_at).not_to be_nil
       end
+
+      it "enqueues an email to previous and new teacher" do
+        previous_teacher = lecture.teacher
+        expect do
+          voucher.redeem(params)
+        end.to enqueue_mail_with_params(LectureNotificationMailer, :new_teacher_email,
+                                        recipient: user, lecture: lecture, locale: user.locale)
+          .and(enqueue_mail_with_params(LectureNotificationMailer, :previous_teacher_email,
+                                        recipient: previous_teacher, lecture: lecture,
+                                        locale: previous_teacher.locale))
+      end
+
+      it "sends an email to previous and new teacher" do
+        previous_teacher = lecture.teacher
+
+        perform_enqueued_jobs do
+          voucher.redeem(params)
+        end
+
+        # Mail to previous teacher
+        mail = ActionMailer::Base.deliveries.last
+        I18n.locale = previous_teacher.locale
+        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        expect(mail.to).to include(previous_teacher.email)
+        expect(mail.subject).to include(
+          I18n.t("mailer.previous_teacher_subject", title: lecture.title_for_viewers,
+                                                    new_teacher: user.tutorial_name)
+        )
+        expect(mail.html_part.body.decoded.gsub(/[\r\n]/, "")).to include(
+          I18n.t("mailer.previous_teacher",
+                 title: lecture.title_with_teacher,
+                 new_teacher: lecture.teacher.info, username: previous_teacher.tutorial_name)
+              .gsub(/[\r\n]/, "")
+        )
+
+        # Mail to new teacher
+        mail = ActionMailer::Base.deliveries[-2]
+        I18n.locale = user.locale
+        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        expect(mail.to).to include(user.email)
+        expect(mail.subject).to include(
+          I18n.t("mailer.new_teacher_subject", title: lecture.title_for_viewers)
+        )
+        expect(mail.html_part.body).to include(
+          I18n.t("mailer.new_teacher",
+                 title: lecture.title_with_teacher, username: user.tutorial_name)
+        )
+      end
     end
 
     context "when the voucher is for a speaker" do

From 7da4d8466acce9edf0e972f4df458bd99981c7bf Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 00:56:41 +0100
Subject: [PATCH 156/191] Use custom html body matcher (ignore \r\n)

---
 spec/models/redeemer_spec.rb             |  5 ++---
 spec/support/matchers/match_html_body.rb | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 spec/support/matchers/match_html_body.rb

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 3751553e0..45a03eff5 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -139,11 +139,10 @@
           I18n.t("mailer.previous_teacher_subject", title: lecture.title_for_viewers,
                                                     new_teacher: user.tutorial_name)
         )
-        expect(mail.html_part.body.decoded.gsub(/[\r\n]/, "")).to include(
+        expect(mail).to include_in_html_body(
           I18n.t("mailer.previous_teacher",
                  title: lecture.title_with_teacher,
                  new_teacher: lecture.teacher.info, username: previous_teacher.tutorial_name)
-              .gsub(/[\r\n]/, "")
         )
 
         # Mail to new teacher
@@ -155,7 +154,7 @@
         expect(mail.subject).to include(
           I18n.t("mailer.new_teacher_subject", title: lecture.title_for_viewers)
         )
-        expect(mail.html_part.body).to include(
+        expect(mail).to include_in_html_body(
           I18n.t("mailer.new_teacher",
                  title: lecture.title_with_teacher, username: user.tutorial_name)
         )
diff --git a/spec/support/matchers/match_html_body.rb b/spec/support/matchers/match_html_body.rb
new file mode 100644
index 000000000..2d1fc44d0
--- /dev/null
+++ b/spec/support/matchers/match_html_body.rb
@@ -0,0 +1,14 @@
+RSpec::Matchers.define(:include_in_html_body) do |expected|
+  # ignore \r and \n in the comparison
+  mail_body_stripped = ->(mail) { mail.html_part.body.decoded.gsub(/[\r\n]/, "") }
+  expected_stripped = expected.gsub(/[\r\n]/, "")
+
+  match do |mail|
+    mail_body_stripped.call(mail).include?(expected_stripped)
+  end
+
+  failure_message do |mail|
+    "Expected that the HTML body would match:\n#{expected_stripped}\n" \
+      + "But got:\n#{mail_body_stripped.call(mail)}"
+  end
+end

From 535024514a058e09dfb818fcaf711e733eca8fe2 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 01:25:36 +0100
Subject: [PATCH 157/191] Improve wording in html body failure message

---
 spec/support/matchers/match_html_body.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/support/matchers/match_html_body.rb b/spec/support/matchers/match_html_body.rb
index 2d1fc44d0..d281f6e46 100644
--- a/spec/support/matchers/match_html_body.rb
+++ b/spec/support/matchers/match_html_body.rb
@@ -8,7 +8,7 @@
   end
 
   failure_message do |mail|
-    "Expected that the HTML body would match:\n#{expected_stripped}\n" \
+    "Expected that the HTML body would include:\n#{expected_stripped}\n" \
       + "But got:\n#{mail_body_stripped.call(mail)}"
   end
 end

From 5b8be7efa60ffc874f6fcd8fe60e9c7e5852cd5a Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 01:43:12 +0100
Subject: [PATCH 158/191] Test mails for co-speakers

---
 spec/models/redeemer_spec.rb | 82 ++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 45a03eff5..080c6107b 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -28,6 +28,11 @@
         lecture.reload
         expect(Notification.count).to eq(count_before + lecture.editors_and_teacher.count)
       end
+
+      it "does not allow multiple redemptions" do
+        voucher.redeem(params)
+        expect { voucher.redeem(params) }.not_to(change { Redemption.count })
+      end
     end
 
     context "when the voucher is for a tutor" do
@@ -167,6 +172,15 @@
       let(:talk1) { FactoryBot.create(:talk, lecture: lecture) }
       let(:talk2) { FactoryBot.create(:talk, lecture: lecture) }
       let(:params) { { talk_ids: [talk1.id, talk2.id] } }
+      let(:cospeaker_talk1) { FactoryBot.create(:confirmed_user) }
+      let(:cospeaker_talk2) { FactoryBot.create(:confirmed_user) }
+      let(:cospeaker_talk2_other) { FactoryBot.create(:confirmed_user) }
+
+      before do
+        talk1.speakers << cospeaker_talk1
+        talk2.speakers << cospeaker_talk2
+        talk2.speakers << cospeaker_talk2_other
+      end
 
       include_examples "common voucher processing"
 
@@ -186,6 +200,74 @@
         redemption = Redemption.last
         expect(redemption.claimed_talks).to include(talk1, talk2)
       end
+
+      it "enqueues emails to every co-speaker" do
+        expect do
+          voucher.redeem(params)
+        end.to enqueue_mail_with_params(LectureNotificationMailer, :new_speaker_email,
+                                        recipient: cospeaker_talk1, speaker: user,
+                                        locale: cospeaker_talk1.locale, talk: talk1)
+          .and(enqueue_mail_with_params(LectureNotificationMailer, :new_speaker_email,
+                                        recipient: cospeaker_talk2, speaker: user,
+                                        locale: cospeaker_talk2.locale, talk: talk2))
+          .and(enqueue_mail_with_params(LectureNotificationMailer, :new_speaker_email,
+                                        recipient: cospeaker_talk2_other, speaker: user,
+                                        locale: cospeaker_talk2_other.locale, talk: talk2))
+      end
+
+      it "sends emails to every co-speaker" do
+        perform_enqueued_jobs do
+          voucher.redeem(params)
+        end
+
+        # Mail to cospeaker in talk1
+        I18n.locale = cospeaker_talk1.locale
+        mail = ActionMailer::Base.deliveries.detect do |m|
+          m.to.include?(cospeaker_talk1.email) &&
+            m.subject.include?(I18n.t("mailer.new_speaker_subject",
+                                      seminar: talk1.lecture.title, title: talk1.to_label))
+        end
+        expect(mail).not_to be_nil
+        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        expect(mail).to include_in_html_body(
+          I18n.t("mailer.new_speaker",
+                 seminar: talk1.lecture.title, title: talk1.to_label,
+                 username: cospeaker_talk1.tutorial_name, speaker: user.info)
+        )
+
+        # Mail to cospeaker in talk2
+        I18n.locale = cospeaker_talk2.locale
+        mail = ActionMailer::Base.deliveries.detect do |m|
+          m.to.include?(cospeaker_talk2.email) &&
+            m.subject.include?(I18n.t("mailer.new_speaker_subject",
+                                      seminar: talk2.lecture.title, title: talk2.to_label))
+        end
+        expect(mail).not_to be_nil
+        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        expect(mail).to include_in_html_body(
+          I18n.t("mailer.new_speaker",
+                 seminar: talk2.lecture.title, title: talk2.to_label,
+                 username: cospeaker_talk2.tutorial_name, speaker: user.info)
+        )
+
+        # Mail to other cospeaker in talk2
+        I18n.locale = cospeaker_talk2_other.locale
+        mail = ActionMailer::Base.deliveries.detect do |m|
+          m.to.include?(cospeaker_talk2_other.email) &&
+            m.subject.include?(I18n.t("mailer.new_speaker_subject",
+                                      seminar: talk2.lecture.title, title: talk2.to_label))
+        end
+        expect(mail).not_to be_nil
+        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        expect(mail).to include_in_html_body(
+          I18n.t("mailer.new_speaker",
+                 seminar: talk2.lecture.title, title: talk2.to_label,
+                 username: cospeaker_talk2_other.tutorial_name, speaker: user.info)
+        )
+      end
     end
   end
 end

From ccaa9ec4deea443be1ebbe7b17f7a9defb8f8898 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 01:53:17 +0100
Subject: [PATCH 159/191] Ensure user that is now speaker doesn't receive a
 mail

---
 spec/models/redeemer_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 080c6107b..045884f4e 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -215,6 +215,13 @@
                                         locale: cospeaker_talk2_other.locale, talk: talk2))
       end
 
+      it "does not enqueue an email to the user that redeemed the voucher" do
+        expect do
+          voucher.redeem(params)
+        end.not_to have_enqueued_mail(LectureNotificationMailer, :new_speaker_email)
+          .with(hash_including(params: hash_including(recipient: user)))
+      end
+
       it "sends emails to every co-speaker" do
         perform_enqueued_jobs do
           voucher.redeem(params)

From c25aa28b7b6fcfc07c6755cd95aa3a847bbc01f7 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 01:54:14 +0100
Subject: [PATCH 160/191] Use just one file for mail matchers

---
 .../match_html_body.rb => mail_matcher.rb}        | 15 +++++++++++++++
 spec/support/matchers/enqueue_mail_with_params.rb | 14 --------------
 2 files changed, 15 insertions(+), 14 deletions(-)
 rename spec/support/{matchers/match_html_body.rb => mail_matcher.rb} (54%)
 delete mode 100644 spec/support/matchers/enqueue_mail_with_params.rb

diff --git a/spec/support/matchers/match_html_body.rb b/spec/support/mail_matcher.rb
similarity index 54%
rename from spec/support/matchers/match_html_body.rb
rename to spec/support/mail_matcher.rb
index d281f6e46..e3349481e 100644
--- a/spec/support/matchers/match_html_body.rb
+++ b/spec/support/mail_matcher.rb
@@ -1,3 +1,18 @@
+RSpec::Matchers.define(:enqueue_mail_with_params) do |mailer, method, params|
+  supports_block_expectations
+
+  match do |block|
+    expect do
+      block.call
+    end.to have_enqueued_mail(mailer, method)
+      .with(hash_including(params: hash_including(params)))
+  end
+
+  failure_message do |_block|
+    "expected to enqueue #{mailer}.#{method} with #{params}, but instead enqueued: #{enqueued_jobs}"
+  end
+end
+
 RSpec::Matchers.define(:include_in_html_body) do |expected|
   # ignore \r and \n in the comparison
   mail_body_stripped = ->(mail) { mail.html_part.body.decoded.gsub(/[\r\n]/, "") }
diff --git a/spec/support/matchers/enqueue_mail_with_params.rb b/spec/support/matchers/enqueue_mail_with_params.rb
deleted file mode 100644
index 52eda8e18..000000000
--- a/spec/support/matchers/enqueue_mail_with_params.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-RSpec::Matchers.define(:enqueue_mail_with_params) do |mailer, method, params|
-  supports_block_expectations
-
-  match do |block|
-    expect do
-      block.call
-    end.to have_enqueued_mail(mailer, method)
-      .with(hash_including(params: hash_including(params)))
-  end
-
-  failure_message do |_block|
-    "expected to enqueue #{mailer}.#{method} with #{params}, but instead enqueued: #{enqueued_jobs}"
-  end
-end

From 0ce9536a68bbf3304432e0316bb8ad783b784890 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 01:55:39 +0100
Subject: [PATCH 161/191] Rename matcher to enqueue_mail_including_params

---
 spec/models/redeemer_spec.rb | 32 ++++++++++++++++----------------
 spec/support/mail_matcher.rb |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 045884f4e..628217178 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -73,8 +73,8 @@
       it "sends an email to the new editor" do
         expect do
           voucher.redeem(params)
-        end.to enqueue_mail_with_params(LectureNotificationMailer, :new_editor_email,
-                                        recipient: user, lecture: lecture, locale: user.locale)
+        end.to enqueue_mail_including_params(LectureNotificationMailer, :new_editor_email,
+                                             recipient: user, lecture: lecture, locale: user.locale)
 
         perform_enqueued_jobs do
           voucher.redeem(params)
@@ -120,11 +120,11 @@
         previous_teacher = lecture.teacher
         expect do
           voucher.redeem(params)
-        end.to enqueue_mail_with_params(LectureNotificationMailer, :new_teacher_email,
-                                        recipient: user, lecture: lecture, locale: user.locale)
-          .and(enqueue_mail_with_params(LectureNotificationMailer, :previous_teacher_email,
-                                        recipient: previous_teacher, lecture: lecture,
-                                        locale: previous_teacher.locale))
+        end.to enqueue_mail_including_params(LectureNotificationMailer, :new_teacher_email,
+                                             recipient: user, lecture: lecture, locale: user.locale)
+          .and(enqueue_mail_including_params(LectureNotificationMailer, :previous_teacher_email,
+                                             recipient: previous_teacher, lecture: lecture,
+                                             locale: previous_teacher.locale))
       end
 
       it "sends an email to previous and new teacher" do
@@ -204,15 +204,15 @@
       it "enqueues emails to every co-speaker" do
         expect do
           voucher.redeem(params)
-        end.to enqueue_mail_with_params(LectureNotificationMailer, :new_speaker_email,
-                                        recipient: cospeaker_talk1, speaker: user,
-                                        locale: cospeaker_talk1.locale, talk: talk1)
-          .and(enqueue_mail_with_params(LectureNotificationMailer, :new_speaker_email,
-                                        recipient: cospeaker_talk2, speaker: user,
-                                        locale: cospeaker_talk2.locale, talk: talk2))
-          .and(enqueue_mail_with_params(LectureNotificationMailer, :new_speaker_email,
-                                        recipient: cospeaker_talk2_other, speaker: user,
-                                        locale: cospeaker_talk2_other.locale, talk: talk2))
+        end.to enqueue_mail_including_params(LectureNotificationMailer, :new_speaker_email,
+                                             recipient: cospeaker_talk1, speaker: user,
+                                             locale: cospeaker_talk1.locale, talk: talk1)
+          .and(enqueue_mail_including_params(LectureNotificationMailer, :new_speaker_email,
+                                             recipient: cospeaker_talk2, speaker: user,
+                                             locale: cospeaker_talk2.locale, talk: talk2))
+          .and(enqueue_mail_including_params(LectureNotificationMailer, :new_speaker_email,
+                                             recipient: cospeaker_talk2_other, speaker: user,
+                                             locale: cospeaker_talk2_other.locale, talk: talk2))
       end
 
       it "does not enqueue an email to the user that redeemed the voucher" do
diff --git a/spec/support/mail_matcher.rb b/spec/support/mail_matcher.rb
index e3349481e..be78e5b4f 100644
--- a/spec/support/mail_matcher.rb
+++ b/spec/support/mail_matcher.rb
@@ -1,4 +1,4 @@
-RSpec::Matchers.define(:enqueue_mail_with_params) do |mailer, method, params|
+RSpec::Matchers.define(:enqueue_mail_including_params) do |mailer, method, params|
   supports_block_expectations
 
   match do |block|

From 7db17b5c10b633ebaf023bb433c1b0b425cb7ae7 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 02:01:52 +0100
Subject: [PATCH 162/191] Outsource from notification mailer assertion

---
 spec/models/redeemer_spec.rb    | 17 ++++++-----------
 spec/support/mail_assertions.rb |  6 ++++++
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 spec/support/mail_assertions.rb

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 628217178..2a6e8431b 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -82,8 +82,7 @@
 
         mail = ActionMailer::Base.deliveries.last
         I18n.locale = user.locale
-        expect(mail.from).to include(DefaultSetting::PROJECT_NOTIFICATION_EMAIL)
-        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        assert_from_notification_mailer(mail)
         expect(mail.to).to include(user.email)
         expect(mail.subject).to include(
           I18n.t("mailer.new_editor_subject", title: lecture.title_for_viewers)
@@ -137,7 +136,7 @@
         # Mail to previous teacher
         mail = ActionMailer::Base.deliveries.last
         I18n.locale = previous_teacher.locale
-        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+        assert_from_notification_mailer(mail)
         expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
         expect(mail.to).to include(previous_teacher.email)
         expect(mail.subject).to include(
@@ -153,8 +152,7 @@
         # Mail to new teacher
         mail = ActionMailer::Base.deliveries[-2]
         I18n.locale = user.locale
-        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
-        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        assert_from_notification_mailer(mail)
         expect(mail.to).to include(user.email)
         expect(mail.subject).to include(
           I18n.t("mailer.new_teacher_subject", title: lecture.title_for_viewers)
@@ -235,8 +233,7 @@
                                       seminar: talk1.lecture.title, title: talk1.to_label))
         end
         expect(mail).not_to be_nil
-        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
-        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        assert_from_notification_mailer(mail)
         expect(mail).to include_in_html_body(
           I18n.t("mailer.new_speaker",
                  seminar: talk1.lecture.title, title: talk1.to_label,
@@ -251,8 +248,7 @@
                                       seminar: talk2.lecture.title, title: talk2.to_label))
         end
         expect(mail).not_to be_nil
-        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
-        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        assert_from_notification_mailer(mail)
         expect(mail).to include_in_html_body(
           I18n.t("mailer.new_speaker",
                  seminar: talk2.lecture.title, title: talk2.to_label,
@@ -267,8 +263,7 @@
                                       seminar: talk2.lecture.title, title: talk2.to_label))
         end
         expect(mail).not_to be_nil
-        expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
-        expect(mail[:from].display_names).to include(I18n.t("mailer.notification"))
+        assert_from_notification_mailer(mail)
         expect(mail).to include_in_html_body(
           I18n.t("mailer.new_speaker",
                  seminar: talk2.lecture.title, title: talk2.to_label,
diff --git a/spec/support/mail_assertions.rb b/spec/support/mail_assertions.rb
new file mode 100644
index 000000000..bd21b135b
--- /dev/null
+++ b/spec/support/mail_assertions.rb
@@ -0,0 +1,6 @@
+# Asserts that the given email is sent from the project notification email
+# and that the display name is set to the correct value.
+def assert_from_notification_mailer(mail)
+  expect(mail.from).to eq([DefaultSetting::PROJECT_NOTIFICATION_EMAIL])
+  expect(mail[:from].display_names).to eq([I18n.t("mailer.notification")])
+end

From a40e13c6184dfac987e0dfda468ef2f6b5a25d6d Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 02:03:16 +0100
Subject: [PATCH 163/191] Refactor send mail to co-speaker test

---
 spec/models/redeemer_spec.rb | 58 ++++++++++--------------------------
 1 file changed, 15 insertions(+), 43 deletions(-)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index 2a6e8431b..b82ee0a6b 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -225,50 +225,22 @@
           voucher.redeem(params)
         end
 
-        # Mail to cospeaker in talk1
-        I18n.locale = cospeaker_talk1.locale
-        mail = ActionMailer::Base.deliveries.detect do |m|
-          m.to.include?(cospeaker_talk1.email) &&
-            m.subject.include?(I18n.t("mailer.new_speaker_subject",
-                                      seminar: talk1.lecture.title, title: talk1.to_label))
+        [cospeaker_talk1, cospeaker_talk2, cospeaker_talk2_other].each do |cospeaker|
+          talk = cospeaker == cospeaker_talk1 ? talk1 : talk2
+          I18n.locale = cospeaker.locale
+          mail = ActionMailer::Base.deliveries.detect do |m|
+            m.to.include?(cospeaker.email) &&
+              m.subject.include?(I18n.t("mailer.new_speaker_subject",
+                                        seminar: talk.lecture.title, title: talk.to_label))
+          end
+          expect(mail).not_to be_nil
+          assert_from_notification_mailer(mail)
+          expect(mail).to include_in_html_body(
+            I18n.t("mailer.new_speaker",
+                   seminar: talk.lecture.title, title: talk.to_label,
+                   username: cospeaker.tutorial_name, speaker: user.info)
+          )
         end
-        expect(mail).not_to be_nil
-        assert_from_notification_mailer(mail)
-        expect(mail).to include_in_html_body(
-          I18n.t("mailer.new_speaker",
-                 seminar: talk1.lecture.title, title: talk1.to_label,
-                 username: cospeaker_talk1.tutorial_name, speaker: user.info)
-        )
-
-        # Mail to cospeaker in talk2
-        I18n.locale = cospeaker_talk2.locale
-        mail = ActionMailer::Base.deliveries.detect do |m|
-          m.to.include?(cospeaker_talk2.email) &&
-            m.subject.include?(I18n.t("mailer.new_speaker_subject",
-                                      seminar: talk2.lecture.title, title: talk2.to_label))
-        end
-        expect(mail).not_to be_nil
-        assert_from_notification_mailer(mail)
-        expect(mail).to include_in_html_body(
-          I18n.t("mailer.new_speaker",
-                 seminar: talk2.lecture.title, title: talk2.to_label,
-                 username: cospeaker_talk2.tutorial_name, speaker: user.info)
-        )
-
-        # Mail to other cospeaker in talk2
-        I18n.locale = cospeaker_talk2_other.locale
-        mail = ActionMailer::Base.deliveries.detect do |m|
-          m.to.include?(cospeaker_talk2_other.email) &&
-            m.subject.include?(I18n.t("mailer.new_speaker_subject",
-                                      seminar: talk2.lecture.title, title: talk2.to_label))
-        end
-        expect(mail).not_to be_nil
-        assert_from_notification_mailer(mail)
-        expect(mail).to include_in_html_body(
-          I18n.t("mailer.new_speaker",
-                 seminar: talk2.lecture.title, title: talk2.to_label,
-                 username: cospeaker_talk2_other.tutorial_name, speaker: user.info)
-        )
       end
     end
   end

From b9f28e8a79ff69cb8d13a4bb84d38c05c3d4314f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 31 Oct 2024 02:10:39 +0100
Subject: [PATCH 164/191] Remove unwanted test

I accidentally added this even though it's not the
wanted behavior.
---
 spec/models/redeemer_spec.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/spec/models/redeemer_spec.rb b/spec/models/redeemer_spec.rb
index b82ee0a6b..53f2a39c9 100644
--- a/spec/models/redeemer_spec.rb
+++ b/spec/models/redeemer_spec.rb
@@ -28,11 +28,6 @@
         lecture.reload
         expect(Notification.count).to eq(count_before + lecture.editors_and_teacher.count)
       end
-
-      it "does not allow multiple redemptions" do
-        voucher.redeem(params)
-        expect { voucher.redeem(params) }.not_to(change { Redemption.count })
-      end
     end
 
     context "when the voucher is for a tutor" do

From f7d9d79c79cddf9405e566210736e6e6ff6bcd63 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 5 Nov 2024 20:13:50 +0100
Subject: [PATCH 165/191] Add tests for teacher selection dropdown

---
 app/views/lectures/edit/_people.html.erb |  2 +-
 spec/cypress/e2e/lectures_spec.cy.js     | 43 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index ef89cea0a..a9fa13879 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -5,7 +5,7 @@
 
       <div class="col-6 mb-3">
         <% if current_user.admin? %>
-          <div id="lecture_teacher_select" %>
+          <div id="lecture_teacher_select" data-cy="teacher-admin-select" %>
             <%= f.label :teacher_id,
                         t('basics.teacher'),
                         class: "form-label" %>
diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_spec.cy.js
index 59b59cbb2..71a325d12 100644
--- a/spec/cypress/e2e/lectures_spec.cy.js
+++ b/spec/cypress/e2e/lectures_spec.cy.js
@@ -13,3 +13,46 @@ describe("Lecture edit page", () => {
     });
   });
 });
+
+describe("Lecture people edit page", () => {
+  beforeEach(function () {
+    cy.createUser("generic").as("user");
+    cy.createUserAndLogin("teacher").as("teacher");
+    cy.then(() => {
+      FactoryBot.create("lecture", { teacher_id: this.teacher.id }).as("lecture");
+    });
+    cy.then(() => {
+      cy.wrap(`/lectures/${this.lecture.id}/edit#people`).as("lecturePeopleUrl");
+    });
+  });
+
+  context("when logged in as teacher", () => {
+    it.only("does not show element to select teacher", function () {
+      cy.visit(this.lecturePeopleUrl);
+      cy.getBySelector("teacher-admin-select").should("not.exist");
+      cy.getBySelector("teacher-info").should("exist");
+    });
+  });
+
+  context("when logged in as admin", () => {
+    beforeEach(function () {
+      cy.createUserAndLogin("admin").as("admin");
+    });
+
+    it("shows element to select teacher", function () {
+      cy.logout();
+      cy.createUserAndLogin("admin").as("admin");
+      cy.visit(this.lecturePeopleUrl);
+
+      cy.getBySelector("teacher-admin-select").should("be.visible");
+      cy.getBySelector("teacher-admin-select").type("cy");
+
+      cy.getBySelector("teacher-admin-select").should("contain", this.user.name_in_tutorials);
+      cy.getBySelector("teacher-admin-select").should("contain", this.user.email);
+      cy.getBySelector("teacher-admin-select").should("contain", this.teacher.name_in_tutorials);
+      cy.getBySelector("teacher-admin-select").should("contain", this.teacher.email);
+      cy.getBySelector("teacher-admin-select").should("contain", this.admin.name_in_tutorials);
+      cy.getBySelector("teacher-admin-select").should("contain", this.admin.email);
+    });
+  });
+});

From 8b2de36511f898c4f60c200b93913ea3d5e00380 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Tue, 5 Nov 2024 20:43:10 +0100
Subject: [PATCH 166/191] Write test for editor dropdown selection

---
 app/views/lectures/edit/_people.html.erb |  4 ++-
 spec/cypress/e2e/lectures_spec.cy.js     | 41 ++++++++++++++++++------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index a9fa13879..6ccd356e1 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -36,12 +36,13 @@
           </p>
         <% end %>
       </div>
+
       <div class="col-6 mb-3">
         <%= f.label :editor_ids,
                     t('basics.lecture_editors'),
                   class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
-        <div id="lecture_editors_select" %>
+        <div id="lecture_editors_select" data-cy="editor-select" %>
           <%= f.select :editor_ids,
                        editors_preselection(lecture),
                        {},
@@ -50,6 +51,7 @@
                          data: { cy: 'lecture-editors-select'} } %>
         </div>
       </div>
+
     </div>
     <div class="row mb-3">
       <div class="col-12">
diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_spec.cy.js
index 71a325d12..3acb2c22e 100644
--- a/spec/cypress/e2e/lectures_spec.cy.js
+++ b/spec/cypress/e2e/lectures_spec.cy.js
@@ -27,32 +27,53 @@ describe("Lecture people edit page", () => {
   });
 
   context("when logged in as teacher", () => {
-    it.only("does not show element to select teacher", function () {
+    it("does not show element to select teacher", function () {
       cy.visit(this.lecturePeopleUrl);
+
       cy.getBySelector("teacher-admin-select").should("not.exist");
       cy.getBySelector("teacher-info").should("exist");
     });
+
+    it("prohibits searching for arbitrary users in the editor dropdown", function () {
+      cy.visit(this.lecturePeopleUrl);
+
+      cy.getBySelector("editor-select").click();
+      cy.getBySelector("editor-select").type("cy");
+
+      cy.getBySelector("editor-select").should("not.contain", this.user.name_in_tutorials);
+      cy.getBySelector("editor-select").should("not.contain", this.user.email);
+    });
   });
 
   context("when logged in as admin", () => {
     beforeEach(function () {
+      cy.logout();
       cy.createUserAndLogin("admin").as("admin");
     });
 
-    it("shows element to select teacher", function () {
-      cy.logout();
-      cy.createUserAndLogin("admin").as("admin");
+    function shouldContainAllUsers(selector, context) {
+      cy.getBySelector(selector).should("contain", context.user.name_in_tutorials);
+      cy.getBySelector(selector).should("contain", context.user.email);
+      cy.getBySelector(selector).should("contain", context.teacher.name_in_tutorials);
+      cy.getBySelector(selector).should("contain", context.teacher.email);
+      cy.getBySelector(selector).should("contain", context.admin.name_in_tutorials);
+      cy.getBySelector(selector).should("contain", context.admin.email);
+    }
+
+    it("allows searching for arbitrary users to assign them as teachers", function () {
       cy.visit(this.lecturePeopleUrl);
 
       cy.getBySelector("teacher-admin-select").should("be.visible");
       cy.getBySelector("teacher-admin-select").type("cy");
+      shouldContainAllUsers("teacher-admin-select", this);
+    });
+
+    it.only("allows searching for arbitrary users to assign them as editors", function () {
+      cy.visit(this.lecturePeopleUrl);
 
-      cy.getBySelector("teacher-admin-select").should("contain", this.user.name_in_tutorials);
-      cy.getBySelector("teacher-admin-select").should("contain", this.user.email);
-      cy.getBySelector("teacher-admin-select").should("contain", this.teacher.name_in_tutorials);
-      cy.getBySelector("teacher-admin-select").should("contain", this.teacher.email);
-      cy.getBySelector("teacher-admin-select").should("contain", this.admin.name_in_tutorials);
-      cy.getBySelector("teacher-admin-select").should("contain", this.admin.email);
+      cy.getBySelector("editor-select").click();
+      cy.getBySelector("editor-select").type("cy");
+      shouldContainAllUsers("editor-select", this);
     });
   });
 });

From c1d843ffb5f7c06f5b59da5ccdccbb9f7b5182ee Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 20:00:51 +0100
Subject: [PATCH 167/191] Allow admin to select any user in lecture editor
 select

---
 app/views/lectures/edit/_people.html.erb | 26 ++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index 6ccd356e1..617d07589 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -43,12 +43,26 @@
                   class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
         <div id="lecture_editors_select" data-cy="editor-select" %>
-          <%= f.select :editor_ids,
-                       editors_preselection(lecture),
-                       {},
-                       { multiple: true,
-                         class: 'selectize',
-                         data: { cy: 'lecture-editors-select'} } %>
+          <% if current_user.admin? %>
+              <%= f.select :editor_ids,
+                        options_for_select(lecture.select_editors,
+                                          lecture.editors.map(&:id)),
+                        {},
+                        { multiple: true,
+                          class: 'selectize',
+                          data: { ajax: true,
+                                  model: 'user',
+                                  filled: false,
+                                  placeholder: t('basics.enter_two_letters'),
+                                  no_results: t('basics.no_results') } } %>
+          <% else %>
+            <%= f.select :editor_ids,
+                        editors_preselection(lecture),
+                        {},
+                        { multiple: true,
+                          class: 'selectize',
+                          data: { cy: 'lecture-editors-select'} } %>
+          <% end %>
         </div>
       </div>
 

From cd628394f08c42fc6b4b9e7eae79f34b56e54396 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 20:29:11 +0100
Subject: [PATCH 168/191] Remove `only` from cypress test

---
 spec/cypress/e2e/lectures_spec.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_spec.cy.js
index 3acb2c22e..2a94605b5 100644
--- a/spec/cypress/e2e/lectures_spec.cy.js
+++ b/spec/cypress/e2e/lectures_spec.cy.js
@@ -68,7 +68,7 @@ describe("Lecture people edit page", () => {
       shouldContainAllUsers("teacher-admin-select", this);
     });
 
-    it.only("allows searching for arbitrary users to assign them as editors", function () {
+    it("allows searching for arbitrary users to assign them as editors", function () {
       cy.visit(this.lecturePeopleUrl);
 
       cy.getBySelector("editor-select").click();

From 7d795f7ab2a24e5f6ae80d8e1dfb615c29dda526 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 20:29:23 +0100
Subject: [PATCH 169/191] Add more words to spell checker

---
 .vscode/settings.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6b800d5e3..5fb4302b3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -109,14 +109,18 @@
     ],
     "cSpell.language": "en,de",
     "cSpell.words": [
+        "activerecord",
         "commontator",
         "cospeaker",
         "cospeakers",
+        "datetime",
         "factorybot",
         "helpdesk",
         "katex",
+        "preselection",
         "Timecop",
         "turbolinks",
+        "uncached",
         "whitespaces"
     ],
     "cSpell.enableFiletypes": [

From e265d8c99283ba7b47033318edd773fda18e9c6d Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 20:49:58 +0100
Subject: [PATCH 170/191] Add tests for tutor selection dropdown

---
 app/views/tutorials/_form.html.erb   |  2 +-
 spec/cypress/e2e/lectures_spec.cy.js | 27 +++++++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb
index a770ff71f..3a9287cb3 100644
--- a/app/views/tutorials/_form.html.erb
+++ b/app/views/tutorials/_form.html.erb
@@ -11,7 +11,7 @@
              id="tutorial-title-error">
         </div>
       </div>
-      <div class="form-group col-4">
+      <div class="form-group col-4" data-cy="tutor-select-div">
         <%= f.select :tutor_ids,
                      tutors_preselection(tutorial),
                      {},
diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_spec.cy.js
index 2a94605b5..9847100e2 100644
--- a/spec/cypress/e2e/lectures_spec.cy.js
+++ b/spec/cypress/e2e/lectures_spec.cy.js
@@ -14,7 +14,7 @@ describe("Lecture edit page", () => {
   });
 });
 
-describe("Lecture people edit page", () => {
+describe("Lecture people edit page: teacher & editor", () => {
   beforeEach(function () {
     cy.createUser("generic").as("user");
     cy.createUserAndLogin("teacher").as("teacher");
@@ -29,20 +29,29 @@ describe("Lecture people edit page", () => {
   context("when logged in as teacher", () => {
     it("does not show element to select teacher", function () {
       cy.visit(this.lecturePeopleUrl);
-
       cy.getBySelector("teacher-admin-select").should("not.exist");
       cy.getBySelector("teacher-info").should("exist");
     });
 
     it("prohibits searching for arbitrary users in the editor dropdown", function () {
       cy.visit(this.lecturePeopleUrl);
-
       cy.getBySelector("editor-select").click();
       cy.getBySelector("editor-select").type("cy");
-
       cy.getBySelector("editor-select").should("not.contain", this.user.name_in_tutorials);
       cy.getBySelector("editor-select").should("not.contain", this.user.email);
     });
+
+    it("prohibits searching for arbitrary users in the tutor dropdown", function () {
+      cy.visit(this.lecturePeopleUrl);
+      cy.getBySelector("new-tutorial-btn").click();
+      cy.getBySelector("tutor-select-div").click();
+      cy.getBySelector("tutor-select-div").type("cy");
+
+      cy.getBySelector("tutor-select-div").should("not.contain", this.user.name_in_tutorials);
+      cy.getBySelector("tutor-select-div").should("not.contain", this.user.email);
+      cy.getBySelector("tutor-select-div").should("contain", this.teacher.name_in_tutorials);
+      cy.getBySelector("tutor-select-div").should("contain", this.teacher.email);
+    });
   });
 
   context("when logged in as admin", () => {
@@ -62,7 +71,6 @@ describe("Lecture people edit page", () => {
 
     it("allows searching for arbitrary users to assign them as teachers", function () {
       cy.visit(this.lecturePeopleUrl);
-
       cy.getBySelector("teacher-admin-select").should("be.visible");
       cy.getBySelector("teacher-admin-select").type("cy");
       shouldContainAllUsers("teacher-admin-select", this);
@@ -70,10 +78,17 @@ describe("Lecture people edit page", () => {
 
     it("allows searching for arbitrary users to assign them as editors", function () {
       cy.visit(this.lecturePeopleUrl);
-
       cy.getBySelector("editor-select").click();
       cy.getBySelector("editor-select").type("cy");
       shouldContainAllUsers("editor-select", this);
     });
+
+    it.only("allows to search for arbitrary users to assign them as tutors", function () {
+      cy.visit(this.lecturePeopleUrl);
+      cy.getBySelector("new-tutorial-btn").click();
+      cy.getBySelector("tutor-select-div").click();
+      cy.getBySelector("tutor-select-div").type("cy");
+      shouldContainAllUsers("tutor-select-div", this);
+    });
   });
 });

From f65f57309bf919fdd4a4b0edbb47a7beeb1a4ea5 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 21:04:33 +0100
Subject: [PATCH 171/191] Add back ability for admin to select any user as
 tutor

---
 .vscode/settings.json              |  1 +
 app/views/tutorials/_form.html.erb | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5fb4302b3..adce886a5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -118,6 +118,7 @@
         "helpdesk",
         "katex",
         "preselection",
+        "selectize",
         "Timecop",
         "turbolinks",
         "uncached",
diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb
index 3a9287cb3..fecf64e0a 100644
--- a/app/views/tutorials/_form.html.erb
+++ b/app/views/tutorials/_form.html.erb
@@ -12,13 +12,28 @@
         </div>
       </div>
       <div class="form-group col-4" data-cy="tutor-select-div">
-        <%= f.select :tutor_ids,
+        <% if current_user.admin? %>
+          <%= f.select :tutor_ids,
                      tutors_preselection(tutorial),
                      {},
                      { class: 'selectize',
                        multiple: true,
+                       style: 'display: none;',
                        id: "tutorial_tutor_ids_#{tutorial.id}",
-                       data: { cy: "tutor-select"} } %>
+                       data: { ajax: true,
+                               filled: false,
+                               model: 'user',
+                               placeholder: t('basics.enter_two_letters'),
+                               no_results: t('basics.no_results') } } %>
+        <% else %>
+          <%= f.select :tutor_ids,
+                      tutors_preselection(tutorial),
+                      {},
+                      { class: 'selectize',
+                        multiple: true,
+                        id: "tutorial_tutor_ids_#{tutorial.id}",
+                        data: { cy: "tutor-select"} } %>
+        <% end %>
       </div>
       <div class="form-group col-4">
         <%= f.submit t('buttons.save'),

From 4f1746447dc7d555c7e5e77b0f387301aedb8600 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 23:22:49 +0100
Subject: [PATCH 172/191] Allow admin to choose arbitrary users as speakers &
 test

---
 .vscode/settings.json                         |  1 +
 .../cypress/user_creator_controller.rb        |  2 +
 app/helpers/talks_helper.rb                   | 25 +++++--
 app/views/talks/_new.html.erb                 |  2 +-
 spec/cypress/e2e/lectures_spec.cy.js          | 67 ++++++++++++++++++-
 5 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index adce886a5..4b4d1cfa7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -110,6 +110,7 @@
     "cSpell.language": "en,de",
     "cSpell.words": [
         "activerecord",
+        "ajax",
         "commontator",
         "cospeaker",
         "cospeakers",
diff --git a/app/controllers/cypress/user_creator_controller.rb b/app/controllers/cypress/user_creator_controller.rb
index 46f4f830e..29855eb03 100644
--- a/app/controllers/cypress/user_creator_controller.rb
+++ b/app/controllers/cypress/user_creator_controller.rb
@@ -16,6 +16,8 @@ def create
 
       user = User.create(name: "#{role} Cypress #{random_hash}",
                          email: "#{role}-#{random_hash}@mampf.cypress",
+                         # Note that some Cypress tests rely on the username
+                         # beginning with "cy" (!)
                          name_in_tutorials: "cy-#{role}-#{random_hash}",
                          password: CYPRESS_PASSWORD, consents: true, admin: is_admin,
                          locale: I18n.default_locale)
diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb
index 2f87df9d4..6332bc58a 100644
--- a/app/helpers/talks_helper.rb
+++ b/app/helpers/talks_helper.rb
@@ -54,10 +54,27 @@ def speaker_select(form, talk)
       label = form.label(:speaker_ids, t("admin.talk.speakers"),
                          class: "form-label")
       help_desk = helpdesk(t("admin.talk.info.speakers"), false)
-      select = form.select(:speaker_ids, speakers_preselection(talk), {},
-                           class: "selectize",
-                           data: { cy: "speaker-select" },
-                           multiple: true)
+
+      select = if current_user.admin?
+        form.select(:speaker_ids, [[]], {}, {
+                      class: "selectize",
+                      multiple: true,
+                      data: {
+                        ajax: true,
+                        filled: false,
+                        model: "user",
+                        placeholder: t("basics.enter_two_letters"),
+                        no_results: t("basics.no_results"),
+                        modal: true,
+                        cy: "speaker-select"
+                      }
+                    })
+      else
+        form.select(:speaker_ids, speakers_preselection(talk), {},
+                    class: "selectize",
+                    data: { cy: "speaker-select" },
+                    multiple: true)
+      end
 
       label + help_desk + select
     end
diff --git a/app/views/talks/_new.html.erb b/app/views/talks/_new.html.erb
index 6b97e9447..6f9a50896 100644
--- a/app/views/talks/_new.html.erb
+++ b/app/views/talks/_new.html.erb
@@ -29,7 +29,7 @@
       <div class="invalid-feedback" id="talk-date-error">
       </div>
     </div>
-    <div class="col-12 mb-3">
+    <div class="col-12 mb-3" data-cy="speaker-select-div">
       <%= speaker_select(f, talk) %>
     </div>
     <% if lecture.talks.exists? %>
diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_spec.cy.js
index 9847100e2..f2c36bd15 100644
--- a/spec/cypress/e2e/lectures_spec.cy.js
+++ b/spec/cypress/e2e/lectures_spec.cy.js
@@ -83,7 +83,7 @@ describe("Lecture people edit page: teacher & editor", () => {
       shouldContainAllUsers("editor-select", this);
     });
 
-    it.only("allows to search for arbitrary users to assign them as tutors", function () {
+    it("allows to search for arbitrary users to assign them as tutors", function () {
       cy.visit(this.lecturePeopleUrl);
       cy.getBySelector("new-tutorial-btn").click();
       cy.getBySelector("tutor-select-div").click();
@@ -92,3 +92,68 @@ describe("Lecture people edit page: teacher & editor", () => {
     });
   });
 });
+
+describe("Seminar speakers", () => {
+  beforeEach(function () {
+    cy.createUser("generic").as("user");
+    cy.createUserAndLogin("teacher").as("teacher");
+    cy.then(() => {
+      FactoryBot.create("seminar", { teacher_id: this.teacher.id }).as("seminar");
+    });
+    cy.then(() => {
+      cy.wrap(`/lectures/${this.seminar.id}/edit`).as("seminarUrl");
+    });
+  });
+
+  context("when logged in as teacher", () => {
+    it("prohibits searching for arbitrary users in the speakers dropdown", function () {
+      cy.visit(this.seminarUrl);
+      cy.getBySelector("new-talk-btn").click();
+      cy.getBySelector("talk-form").should("be.visible");
+      cy.getBySelector("speaker-select").within(() => {
+        cy.get("option")
+          .should("not.contain", this.user.name_in_tutorials)
+          .and("not.contain", this.user.email)
+          .and("not.contain", this.user.name);
+      });
+
+      // type "cy" to trigger search
+      cy.getBySelector("speaker-select-div").click();
+      cy.getBySelector("speaker-select-div").type("cy");
+
+      cy.getBySelector("speaker-select-div")
+        .should("not.contain", this.user.name_in_tutorials)
+        .and("not.contain", this.user.email)
+        .and("not.contain", this.user.name);
+      cy.getBySelector("speaker-select-div")
+        .should("contain", this.teacher.name_in_tutorials)
+        .and("contain", this.teacher.email)
+        .and("not.contain", this.teacher.name);
+    });
+  });
+
+  context("when logged in as admin", () => {
+    beforeEach(function () {
+      cy.logout();
+      cy.createUserAndLogin("admin").as("admin");
+    });
+
+    it("allows searching for arbitrary users to assign them as speakers", function () {
+      cy.visit(this.seminarUrl);
+      cy.getBySelector("new-talk-btn").click();
+      cy.getBySelector("talk-form").should("be.visible");
+
+      cy.getBySelector("speaker-select-div").click();
+      cy.getBySelector("speaker-select-div").type("cy");
+
+      cy.getBySelector("speaker-select-div")
+        .should("contain", this.user.name_in_tutorials)
+        .and("contain", this.user.email)
+        .and("not.contain", this.user.name);
+      cy.getBySelector("speaker-select-div")
+        .should("contain", this.teacher.name_in_tutorials)
+        .and("contain", this.teacher.email)
+        .and("not.contain", this.teacher.name);
+    });
+  });
+});

From 28f10784696c2fbd7f1690c6c78a1d073171b154 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 23:22:58 +0100
Subject: [PATCH 173/191] Remove unnecessary display: none

---
 app/views/tutorials/_form.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/tutorials/_form.html.erb b/app/views/tutorials/_form.html.erb
index fecf64e0a..f3beb69d0 100644
--- a/app/views/tutorials/_form.html.erb
+++ b/app/views/tutorials/_form.html.erb
@@ -18,7 +18,6 @@
                      {},
                      { class: 'selectize',
                        multiple: true,
-                       style: 'display: none;',
                        id: "tutorial_tutor_ids_#{tutorial.id}",
                        data: { ajax: true,
                                filled: false,

From b12cff87317375bb31882b4a4f29f5db84e169da Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 23:27:08 +0100
Subject: [PATCH 174/191] Improve if statement in voucher redemption

---
 spec/cypress/e2e/vouchers_redemptions_spec_helpers.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index b007f03ee..5092d34d1 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -223,11 +223,8 @@ export function verifyAlreadyTeacherMessage(context) {
 }
 
 export function visitEditPage(context, type) {
-  if (type === "talk") {
-    cy.visit(`/lectures/${context.lecture.id}/edit`);
-  }
-  else {
-    cy.visit(`/lectures/${context.lecture.id}/edit`);
+  cy.visit(`/lectures/${context.lecture.id}/edit`);
+  if (type !== "talk") {
     cy.getBySelector("people-tab-btn").click();
   }
 }
@@ -237,7 +234,6 @@ export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {
 
   cy.then(() => {
     cy.getBySelector("no-talks-yet").should("contain", context.noTalksYet);
-    cy.getBySelector("new-talk-btn").should("be.visible");
     cy.getBySelector("new-talk-btn").click();
   });
 

From 437deb166d5742752e78b9dacf3cccb1b23e9771 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 23:27:54 +0100
Subject: [PATCH 175/191] Remove another unnecessary "be.visible" statement

---
 spec/cypress/e2e/vouchers_redemptions_spec_helpers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index 5092d34d1..c7c0e7312 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -117,7 +117,7 @@ export function logoutAndLoginAsTeacher(context) {
 
 export function verifyNoTutorialsButUserEligibleAsTutor(context, shouldBeEligible = true) {
   cy.getBySelector("tutorial-row").should("not.exist");
-  cy.getBySelector("new-tutorial-btn").should("be.visible").click();
+  cy.getBySelector("new-tutorial-btn").click();
   cy.then(() => {
     cy.getBySelector("tutorial-form").should("be.visible");
     cy.getBySelector("tutor-select").within(() => {

From 016a142994e56aeafae9fb4ac2a5e0885b9cf6c1 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Wed, 6 Nov 2024 23:59:43 +0100
Subject: [PATCH 176/191] Allow admins to select arbitrary users in existing
 talks & test

---
 app/views/talks/_basics.html.erb     | 24 ++++++++--
 spec/cypress/e2e/lectures_spec.cy.js | 67 ++++++++++++++++++++++++++--
 spec/factories/talks.rb              | 16 +++++--
 3 files changed, 97 insertions(+), 10 deletions(-)

diff --git a/app/views/talks/_basics.html.erb b/app/views/talks/_basics.html.erb
index 826d853d8..a1786c380 100644
--- a/app/views/talks/_basics.html.erb
+++ b/app/views/talks/_basics.html.erb
@@ -48,16 +48,34 @@
       </div>
     </div>
     <div class="row">
-      <div class="col-12 mb-3">
+      <div class="col-12 mb-3" data-cy="speaker-select-div">
         <%= f.label :speaker_ids,
                     t('admin.talk.speakers'),
                     class: "form-label" %>
         <%= helpdesk(t('admin.talk.info.speakers'), false) %>
-        <%= f.select :speaker_ids,
+
+        <% if current_user.admin? %>
+          <%= f.select :speaker_ids,
                      speakers_preselection(talk),
                      {},
                      { class: 'selectize',
-                       multiple: true } %>
+                       style: 'display: none;',
+                       multiple: true,
+                       data: { ajax: true,
+                               filled: false,
+                               model: 'user',
+                               placeholder: t('basics.enter_two_letters'),
+                               no_results: t('basics.no_results'),
+                               cy: 'speaker-select' }
+                      } %>
+        <% else %>
+          <%= f.select :speaker_ids,
+                      speakers_preselection(talk),
+                      {},
+                      { class: 'selectize',
+                        multiple: true,
+                        'data-cy': 'speaker-select' } %>
+        <% end %>
       </div>
     </div>
     <div class="row">
diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_spec.cy.js
index f2c36bd15..4f679d3a8 100644
--- a/spec/cypress/e2e/lectures_spec.cy.js
+++ b/spec/cypress/e2e/lectures_spec.cy.js
@@ -93,7 +93,7 @@ describe("Lecture people edit page: teacher & editor", () => {
   });
 });
 
-describe("Seminar speakers", () => {
+describe("Seminar speakers (new talk)", () => {
   beforeEach(function () {
     cy.createUser("generic").as("user");
     cy.createUserAndLogin("teacher").as("teacher");
@@ -109,7 +109,6 @@ describe("Seminar speakers", () => {
     it("prohibits searching for arbitrary users in the speakers dropdown", function () {
       cy.visit(this.seminarUrl);
       cy.getBySelector("new-talk-btn").click();
-      cy.getBySelector("talk-form").should("be.visible");
       cy.getBySelector("speaker-select").within(() => {
         cy.get("option")
           .should("not.contain", this.user.name_in_tutorials)
@@ -141,7 +140,6 @@ describe("Seminar speakers", () => {
     it("allows searching for arbitrary users to assign them as speakers", function () {
       cy.visit(this.seminarUrl);
       cy.getBySelector("new-talk-btn").click();
-      cy.getBySelector("talk-form").should("be.visible");
 
       cy.getBySelector("speaker-select-div").click();
       cy.getBySelector("speaker-select-div").type("cy");
@@ -157,3 +155,66 @@ describe("Seminar speakers", () => {
     });
   });
 });
+
+describe("Seminar speakers (existing talk)", () => {
+  beforeEach(function () {
+    cy.createUser("generic").as("speaker");
+    cy.createUser("generic").as("user");
+    cy.createUserAndLogin("teacher").as("teacher");
+    cy.then(() => {
+      FactoryBot.create("seminar", { teacher_id: this.teacher.id }).as("seminar");
+    });
+    cy.then(() => {
+      FactoryBot.create("talk",
+        { lecture_id: this.seminar.id, speaker_ids: [this.speaker.id] }).as("talk");
+    });
+    cy.then(() => {
+      cy.wrap(`/talks/${this.talk.id}/edit`).as("talkUrl");
+    });
+  });
+
+  context("when logged in as teacher", () => {
+    it("prohibits searching for arbitrary users in the speakers dropdown", function () {
+      cy.visit(this.talkUrl);
+      cy.getBySelector("speaker-select").within(() => {
+        cy.get("option")
+          .should("not.contain", this.user.name_in_tutorials)
+          .and("not.contain", this.user.email)
+          .and("not.contain", this.user.name);
+      });
+
+      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
+
+      cy.getBySelector("speaker-select-div")
+        .should("not.contain", this.user.name_in_tutorials)
+        .and("not.contain", this.user.email)
+        .and("not.contain", this.user.name);
+      cy.getBySelector("speaker-select-div")
+        .should("contain", this.teacher.name_in_tutorials)
+        .and("contain", this.teacher.email)
+        .and("not.contain", this.teacher.name);
+    });
+  });
+
+  context("when logged in as admin", () => {
+    beforeEach(function () {
+      cy.logout();
+      cy.createUserAndLogin("admin").as("admin");
+    });
+
+    it.only("allows searching for arbitrary users to assign them as speakers", function () {
+      cy.visit(this.talkUrl);
+
+      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
+
+      cy.getBySelector("speaker-select-div")
+        .should("contain", this.user.name_in_tutorials)
+        .and("contain", this.user.email)
+        .and("not.contain", this.user.name);
+      cy.getBySelector("speaker-select-div")
+        .should("contain", this.teacher.name_in_tutorials)
+        .and("contain", this.teacher.email)
+        .and("not.contain", this.teacher.name);
+    });
+  });
+});
diff --git a/spec/factories/talks.rb b/spec/factories/talks.rb
index 9b77103a7..9cd4624b6 100644
--- a/spec/factories/talks.rb
+++ b/spec/factories/talks.rb
@@ -2,6 +2,8 @@
 
 FactoryBot.define do
   factory :talk do
+    association :lecture, factory: :seminar
+
     # the generic factory for lesson will just produce an empty talk
     # as it is rather expensive to build a valid lesson from scratch
     # (and in most tests you will probably start with an empty talk and
@@ -13,10 +15,6 @@
       "#{Faker::Book.title} #{Faker::Number.between(from: 1, to: 9999)}"
     end
 
-    trait :with_seminar do
-      association :lecture, factory: :seminar
-    end
-
     trait :with_date
     dates do
       [Faker::Date.in_date_period]
@@ -29,6 +27,16 @@
       end
     end
 
+    transient do
+      speaker_ids { [] }
+    end
+
+    after(:create) do |talk, evaluator|
+      evaluator.speaker_ids.each do |id|
+        talk.speakers << User.find(id)
+      end
+    end
+
     factory :valid_talk, traits: [:with_seminar]
 
     factory :valid_talk_with_speaker, traits: [:with_seminar, :with_speaker]

From ddc48ec6680121bbd646571ed03ed71e9a9acc40 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 7 Nov 2024 00:00:20 +0100
Subject: [PATCH 177/191] Rename lecture spec file

---
 .../{lectures_spec.cy.js => lectures_people_select_specs.cy.js}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename spec/cypress/e2e/{lectures_spec.cy.js => lectures_people_select_specs.cy.js} (100%)

diff --git a/spec/cypress/e2e/lectures_spec.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
similarity index 100%
rename from spec/cypress/e2e/lectures_spec.cy.js
rename to spec/cypress/e2e/lectures_people_select_specs.cy.js

From 95eaa1fc7c65ff180e0d6aec1abaf1f1d25c1729 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Thu, 7 Nov 2024 00:42:28 +0100
Subject: [PATCH 178/191] Refactor lecture people select spec (extract methods)

---
 .../e2e/lectures_people_select_specs.cy.js    | 112 ++++++------------
 1 file changed, 38 insertions(+), 74 deletions(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index 4f679d3a8..febb9753a 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -14,6 +14,21 @@ describe("Lecture edit page", () => {
   });
 });
 
+function shouldContainUsers(selector, context, shouldContainUser, shouldContainTeacher) {
+  const containUser = shouldContainUser ? "contain" : "not.contain";
+  const containTeacher = shouldContainTeacher ? "contain" : "not.contain";
+
+  cy.getBySelector(selector)
+    .should(containUser, context.user.name_in_tutorials)
+    .and(containUser, context.user.email)
+    .and("not.contain", context.user.name);
+
+  cy.getBySelector(selector)
+    .should(containTeacher, context.teacher.name_in_tutorials)
+    .and(containTeacher, context.teacher.email)
+    .and("not.contain", context.teacher.name);
+}
+
 describe("Lecture people edit page: teacher & editor", () => {
   beforeEach(function () {
     cy.createUser("generic").as("user");
@@ -37,8 +52,7 @@ describe("Lecture people edit page: teacher & editor", () => {
       cy.visit(this.lecturePeopleUrl);
       cy.getBySelector("editor-select").click();
       cy.getBySelector("editor-select").type("cy");
-      cy.getBySelector("editor-select").should("not.contain", this.user.name_in_tutorials);
-      cy.getBySelector("editor-select").should("not.contain", this.user.email);
+      shouldContainUsers("editor-select", this, false, false);
     });
 
     it("prohibits searching for arbitrary users in the tutor dropdown", function () {
@@ -46,11 +60,7 @@ describe("Lecture people edit page: teacher & editor", () => {
       cy.getBySelector("new-tutorial-btn").click();
       cy.getBySelector("tutor-select-div").click();
       cy.getBySelector("tutor-select-div").type("cy");
-
-      cy.getBySelector("tutor-select-div").should("not.contain", this.user.name_in_tutorials);
-      cy.getBySelector("tutor-select-div").should("not.contain", this.user.email);
-      cy.getBySelector("tutor-select-div").should("contain", this.teacher.name_in_tutorials);
-      cy.getBySelector("tutor-select-div").should("contain", this.teacher.email);
+      shouldContainUsers("tutor-select-div", this, false, true);
     });
   });
 
@@ -60,27 +70,17 @@ describe("Lecture people edit page: teacher & editor", () => {
       cy.createUserAndLogin("admin").as("admin");
     });
 
-    function shouldContainAllUsers(selector, context) {
-      cy.getBySelector(selector).should("contain", context.user.name_in_tutorials);
-      cy.getBySelector(selector).should("contain", context.user.email);
-      cy.getBySelector(selector).should("contain", context.teacher.name_in_tutorials);
-      cy.getBySelector(selector).should("contain", context.teacher.email);
-      cy.getBySelector(selector).should("contain", context.admin.name_in_tutorials);
-      cy.getBySelector(selector).should("contain", context.admin.email);
-    }
-
     it("allows searching for arbitrary users to assign them as teachers", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("teacher-admin-select").should("be.visible");
       cy.getBySelector("teacher-admin-select").type("cy");
-      shouldContainAllUsers("teacher-admin-select", this);
+      shouldContainUsers("teacher-admin-select", this, true, true);
     });
 
     it("allows searching for arbitrary users to assign them as editors", function () {
       cy.visit(this.lecturePeopleUrl);
       cy.getBySelector("editor-select").click();
       cy.getBySelector("editor-select").type("cy");
-      shouldContainAllUsers("editor-select", this);
+      shouldContainUsers("editor-select", this, true, true);
     });
 
     it("allows to search for arbitrary users to assign them as tutors", function () {
@@ -88,11 +88,20 @@ describe("Lecture people edit page: teacher & editor", () => {
       cy.getBySelector("new-tutorial-btn").click();
       cy.getBySelector("tutor-select-div").click();
       cy.getBySelector("tutor-select-div").type("cy");
-      shouldContainAllUsers("tutor-select-div", this);
+      shouldContainUsers("tutor-select-div", this, true, true);
     });
   });
 });
 
+function shouldNotContainUserInOptions(selector, user) {
+  cy.getBySelector(selector).within(() => {
+    cy.get("option")
+      .should("not.contain", user.name_in_tutorials)
+      .and("not.contain", user.email)
+      .and("not.contain", user.name);
+  });
+}
+
 describe("Seminar speakers (new talk)", () => {
   beforeEach(function () {
     cy.createUser("generic").as("user");
@@ -109,25 +118,11 @@ describe("Seminar speakers (new talk)", () => {
     it("prohibits searching for arbitrary users in the speakers dropdown", function () {
       cy.visit(this.seminarUrl);
       cy.getBySelector("new-talk-btn").click();
-      cy.getBySelector("speaker-select").within(() => {
-        cy.get("option")
-          .should("not.contain", this.user.name_in_tutorials)
-          .and("not.contain", this.user.email)
-          .and("not.contain", this.user.name);
-      });
-
-      // type "cy" to trigger search
+      cy.getBySelector("talk-form").should("be.visible");
+      shouldNotContainUserInOptions("speaker-select", this.user);
       cy.getBySelector("speaker-select-div").click();
       cy.getBySelector("speaker-select-div").type("cy");
-
-      cy.getBySelector("speaker-select-div")
-        .should("not.contain", this.user.name_in_tutorials)
-        .and("not.contain", this.user.email)
-        .and("not.contain", this.user.name);
-      cy.getBySelector("speaker-select-div")
-        .should("contain", this.teacher.name_in_tutorials)
-        .and("contain", this.teacher.email)
-        .and("not.contain", this.teacher.name);
+      shouldContainUsers("speaker-select-div", this, false, true);
     });
   });
 
@@ -140,18 +135,10 @@ describe("Seminar speakers (new talk)", () => {
     it("allows searching for arbitrary users to assign them as speakers", function () {
       cy.visit(this.seminarUrl);
       cy.getBySelector("new-talk-btn").click();
-
+      cy.getBySelector("talk-form").should("be.visible");
       cy.getBySelector("speaker-select-div").click();
       cy.getBySelector("speaker-select-div").type("cy");
-
-      cy.getBySelector("speaker-select-div")
-        .should("contain", this.user.name_in_tutorials)
-        .and("contain", this.user.email)
-        .and("not.contain", this.user.name);
-      cy.getBySelector("speaker-select-div")
-        .should("contain", this.teacher.name_in_tutorials)
-        .and("contain", this.teacher.email)
-        .and("not.contain", this.teacher.name);
+      shouldContainUsers("speaker-select-div", this, true, true);
     });
   });
 });
@@ -176,23 +163,9 @@ describe("Seminar speakers (existing talk)", () => {
   context("when logged in as teacher", () => {
     it("prohibits searching for arbitrary users in the speakers dropdown", function () {
       cy.visit(this.talkUrl);
-      cy.getBySelector("speaker-select").within(() => {
-        cy.get("option")
-          .should("not.contain", this.user.name_in_tutorials)
-          .and("not.contain", this.user.email)
-          .and("not.contain", this.user.name);
-      });
-
+      shouldNotContainUserInOptions("speaker-select", this.user);
       cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
-
-      cy.getBySelector("speaker-select-div")
-        .should("not.contain", this.user.name_in_tutorials)
-        .and("not.contain", this.user.email)
-        .and("not.contain", this.user.name);
-      cy.getBySelector("speaker-select-div")
-        .should("contain", this.teacher.name_in_tutorials)
-        .and("contain", this.teacher.email)
-        .and("not.contain", this.teacher.name);
+      shouldContainUsers("speaker-select-div", this, false, true);
     });
   });
 
@@ -202,19 +175,10 @@ describe("Seminar speakers (existing talk)", () => {
       cy.createUserAndLogin("admin").as("admin");
     });
 
-    it.only("allows searching for arbitrary users to assign them as speakers", function () {
+    it("allows searching for arbitrary users to assign them as speakers", function () {
       cy.visit(this.talkUrl);
-
       cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
-
-      cy.getBySelector("speaker-select-div")
-        .should("contain", this.user.name_in_tutorials)
-        .and("contain", this.user.email)
-        .and("not.contain", this.user.name);
-      cy.getBySelector("speaker-select-div")
-        .should("contain", this.teacher.name_in_tutorials)
-        .and("contain", this.teacher.email)
-        .and("not.contain", this.teacher.name);
+      shouldContainUsers("speaker-select-div", this, true, true);
     });
   });
 });

From 58091e6026ec622df786247c57b49fcdcaf6a5db Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 18:24:54 +0100
Subject: [PATCH 179/191] Reuse speaker_select helper

---
 app/helpers/talks_helper.rb      |  5 +++--
 app/views/talks/_basics.html.erb | 28 +---------------------------
 app/views/talks/_new.html.erb    |  2 +-
 3 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb
index 6332bc58a..4edd2c23e 100644
--- a/app/helpers/talks_helper.rb
+++ b/app/helpers/talks_helper.rb
@@ -49,14 +49,15 @@ def speakers_preselection(talk)
                        end, talk.speaker_ids)
   end
 
-  def speaker_select(form, talk)
+  def speaker_select(form, talk, with_preselection)
     content_tag(:div, class: "mb-3") do
       label = form.label(:speaker_ids, t("admin.talk.speakers"),
                          class: "form-label")
       help_desk = helpdesk(t("admin.talk.info.speakers"), false)
 
       select = if current_user.admin?
-        form.select(:speaker_ids, [[]], {}, {
+        preselection = with_preselection ? speakers_preselection(talk) : [[]]
+        form.select(:speaker_ids, preselection, {}, {
                       class: "selectize",
                       multiple: true,
                       data: {
diff --git a/app/views/talks/_basics.html.erb b/app/views/talks/_basics.html.erb
index a1786c380..62e62ced5 100644
--- a/app/views/talks/_basics.html.erb
+++ b/app/views/talks/_basics.html.erb
@@ -49,33 +49,7 @@
     </div>
     <div class="row">
       <div class="col-12 mb-3" data-cy="speaker-select-div">
-        <%= f.label :speaker_ids,
-                    t('admin.talk.speakers'),
-                    class: "form-label" %>
-        <%= helpdesk(t('admin.talk.info.speakers'), false) %>
-
-        <% if current_user.admin? %>
-          <%= f.select :speaker_ids,
-                     speakers_preselection(talk),
-                     {},
-                     { class: 'selectize',
-                       style: 'display: none;',
-                       multiple: true,
-                       data: { ajax: true,
-                               filled: false,
-                               model: 'user',
-                               placeholder: t('basics.enter_two_letters'),
-                               no_results: t('basics.no_results'),
-                               cy: 'speaker-select' }
-                      } %>
-        <% else %>
-          <%= f.select :speaker_ids,
-                      speakers_preselection(talk),
-                      {},
-                      { class: 'selectize',
-                        multiple: true,
-                        'data-cy': 'speaker-select' } %>
-        <% end %>
+        <%= speaker_select(f, talk, with_preselection=true) %>
       </div>
     </div>
     <div class="row">
diff --git a/app/views/talks/_new.html.erb b/app/views/talks/_new.html.erb
index 6f9a50896..d36f8512e 100644
--- a/app/views/talks/_new.html.erb
+++ b/app/views/talks/_new.html.erb
@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="col-12 mb-3" data-cy="speaker-select-div">
-      <%= speaker_select(f, talk) %>
+      <%= speaker_select(f, talk, with_preselection=false) %>
     </div>
     <% if lecture.talks.exists? %>
       <div class="col-12 mb-3">

From 7d53f83b024bd526d6c82760ef13981e51ce0b10 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 19:55:31 +0100
Subject: [PATCH 180/191] Outsource to new teacher_select helper

---
 app/helpers/lectures_helper.rb                | 48 +++++++++++++++++++
 app/views/lectures/_new.html.erb              | 28 +----------
 app/views/lectures/edit/_people.html.erb      | 34 +------------
 .../e2e/lectures_people_select_specs.cy.js    |  4 +-
 4 files changed, 53 insertions(+), 61 deletions(-)

diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index df6303c94..30d4d12a1 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -135,4 +135,52 @@ def editors_preselection(lecture)
                          [editor.info, editor.id]
                        end, lecture.editor_ids)
   end
+
+  def teacher_select(form, is_new_lecture, lecture = nil)
+    if current_user.admin?
+      label = form.label(:teacher_id, t("basics.teacher"), class: "form-label")
+      help_desk = helpdesk(t("admin.lecture.info.teacher"), false)
+
+      preselection = if is_new_lecture
+        options_for_select([[current_user.info, current_user.id]], current_user.id)
+      else
+        options_for_select([[lecture.teacher.info, lecture.teacher.id]], lecture.teacher.id)
+      end
+
+      # TODO: Rubocop bug when trying to break the last object on a new line
+      select = form.select(:teacher_id, preselection, {}, { class: "selectize",
+                                                            multiple: true,
+                                                            data: {
+                                                              ajax: true,
+                                                              filled: false,
+                                                              model: "user",
+                                                              placeholder: t("basics.enter_two_letters"), # rubocop:disable Layout/LineLength
+                                                              no_results: t("basics.no_results"),
+                                                              modal: true,
+                                                              cy: "teacher-admin-select"
+                                                            } })
+
+      error_div = content_tag(:div, "", class: "invalid-feedback", id: "lecture-teacher-error")
+
+      return label + help_desk + select + error_div
+    end
+
+    # Non-admin cases
+    if is_new_lecture
+      p1 = content_tag(:p) do
+        concat(t("basics.teacher"))
+        concat(helpdesk(t("admin.lecture.info.teacher_fixed_new_lecture"), false))
+      end
+      p2 = content_tag(:p, current_user.info)
+
+    else
+      p1 = content_tag(:p) do
+        concat(t("basics.teacher"))
+        concat(helpdesk(t("admin.lecture.info.teacher_fixed"), false))
+      end
+      p2 = content_tag(:p, lecture.teacher.info, "data-cy": "teacher-info")
+    end
+
+    p1 + p2
+  end
 end
diff --git a/app/views/lectures/_new.html.erb b/app/views/lectures/_new.html.erb
index 9366afb1a..5bec0475e 100644
--- a/app/views/lectures/_new.html.erb
+++ b/app/views/lectures/_new.html.erb
@@ -53,33 +53,7 @@
         </div>
       </div>
       <div class="col-12 mt-4">
-        <% if current_user.admin? %>        
-          <%= f.label :teacher_id,
-                      t('basics.teacher'),
-                      class: "form-label" %>
-          <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
-          <%= f.select :teacher_id,
-                       options_for_select([[current_user.info, current_user.id]],
-                                          current_user.id),
-                       {},
-                       { class: 'selectize',
-                         data: { ajax: true,
-                                 model: 'user',
-                                 filled: false,
-                                 placeholder: t('basics.enter_two_letters'),
-                                 no_results: t('basics.no_results'),
-                                 current: current_user.id,
-                                 modal: modal } } %>
-        <% else %>
-          <p>
-            <%= t('basics.teacher') %>
-            <%= helpdesk(t('admin.lecture.info.teacher_fixed_new_lecture'),
-                          false) %>
-          </p>        
-          <p>
-            <%= current_user.info %>
-          </p>
-        <% end %>
+        <%= teacher_select(f, is_new_lecture=true) %>
       </div>
       <div class="col-12" id="newLectureSort"
            style="<%= term_independent ? 'display: none;' : '' %>">
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index 617d07589..2051ee028 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -3,38 +3,8 @@
     <div class="row">
       <h3 class="lecture-pane-header"><%= t('basics.people') %></h3>
 
-      <div class="col-6 mb-3">
-        <% if current_user.admin? %>
-          <div id="lecture_teacher_select" data-cy="teacher-admin-select" %>
-            <%= f.label :teacher_id,
-                        t('basics.teacher'),
-                        class: "form-label" %>
-            <%= helpdesk(t('admin.lecture.info.teacher'), false) %>
-            <%= f.select :teacher_id,
-                         options_for_select([[lecture.teacher.info,
-                         lecture.teacher.id]],
-                         lecture.teacher.id),
-                         {},
-                         { class: 'selectize',
-                           data: { ajax: true,
-                                   model: 'user',
-                                   filled: false,
-                                   placeholder:
-                                     t('basics.enter_two_letters'),
-                                   no_results:
-                                   t('basics.no_results') } } %>
-            <div class="invalid-feedback" id="lecture-teacher-error">
-            </div>
-          </div>
-        <% else %>
-          <p>
-          <%= t('basics.teacher') %>
-          <%= helpdesk(t('admin.lecture.info.teacher_fixed'), false) %>
-          </p>
-          <p data-cy="teacher-info">
-            <%= lecture.teacher.info %>
-          </p>
-        <% end %>
+      <div id="lecture_teacher_select" class="col-6 mb-3" data-cy="teacher-select">
+        <%= teacher_select(f, is_new_lecture=false, lecture) %>
       </div>
 
       <div class="col-6 mb-3">
diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index febb9753a..a7e223e53 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -72,8 +72,8 @@ describe("Lecture people edit page: teacher & editor", () => {
 
     it("allows searching for arbitrary users to assign them as teachers", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("teacher-admin-select").type("cy");
-      shouldContainUsers("teacher-admin-select", this, true, true);
+      cy.getBySelector("teacher-select").find("input:not([type='hidden'])").type("cy");
+      shouldContainUsers("teacher-select", this, true, true);
     });
 
     it("allows searching for arbitrary users to assign them as editors", function () {

From 1ae8f9108799dedb3cb2900884d73cb28d10c3a6 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 20:02:25 +0100
Subject: [PATCH 181/191] Outsource to new editors_select helper

---
 app/helpers/lectures_helper.rb           | 23 +++++++++++++++++++++++
 app/views/lectures/edit/_people.html.erb | 21 +--------------------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/app/helpers/lectures_helper.rb b/app/helpers/lectures_helper.rb
index 30d4d12a1..bd9757890 100644
--- a/app/helpers/lectures_helper.rb
+++ b/app/helpers/lectures_helper.rb
@@ -183,4 +183,27 @@ def teacher_select(form, is_new_lecture, lecture = nil)
 
     p1 + p2
   end
+
+  def editors_select(form, lecture)
+    if current_user.admin?
+      preselection = options_for_select(lecture.select_editors, lecture.editors.map(&:id))
+      form.select(:editor_ids, preselection, {}, {
+                    class: "selectize",
+                    multiple: true,
+                    data: {
+                      ajax: true,
+                      filled: false,
+                      model: "user",
+                      placeholder: t("basics.enter_two_letters"),
+                      no_results: t("basics.no_results"),
+                      modal: true
+                    }
+                  })
+    else
+      form.select(:editor_ids, editors_preselection(lecture), {},
+                  class: "selectize",
+                  multiple: true,
+                  "data-cy": "lecture-editors-select")
+    end
+  end
 end
diff --git a/app/views/lectures/edit/_people.html.erb b/app/views/lectures/edit/_people.html.erb
index 2051ee028..63b432872 100644
--- a/app/views/lectures/edit/_people.html.erb
+++ b/app/views/lectures/edit/_people.html.erb
@@ -13,26 +13,7 @@
                   class: "form-label" %>
         <%= helpdesk(t('admin.lecture.info.lecture_editors'), false) %>
         <div id="lecture_editors_select" data-cy="editor-select" %>
-          <% if current_user.admin? %>
-              <%= f.select :editor_ids,
-                        options_for_select(lecture.select_editors,
-                                          lecture.editors.map(&:id)),
-                        {},
-                        { multiple: true,
-                          class: 'selectize',
-                          data: { ajax: true,
-                                  model: 'user',
-                                  filled: false,
-                                  placeholder: t('basics.enter_two_letters'),
-                                  no_results: t('basics.no_results') } } %>
-          <% else %>
-            <%= f.select :editor_ids,
-                        editors_preselection(lecture),
-                        {},
-                        { multiple: true,
-                          class: 'selectize',
-                          data: { cy: 'lecture-editors-select'} } %>
-          <% end %>
+          <%= editors_select(f, lecture) %>
         </div>
       </div>
 

From 6c6a7c835557a85b2a9398388ae5ce3ca49e851f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 20:14:16 +0100
Subject: [PATCH 182/191] Remove with_seminar trait

(since we use the association field now, introduced
a few commits beforehand)
---
 spec/factories/talks.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/factories/talks.rb b/spec/factories/talks.rb
index 9cd4624b6..906efdafa 100644
--- a/spec/factories/talks.rb
+++ b/spec/factories/talks.rb
@@ -37,8 +37,8 @@
       end
     end
 
-    factory :valid_talk, traits: [:with_seminar]
+    factory :valid_talk
 
-    factory :valid_talk_with_speaker, traits: [:with_seminar, :with_speaker]
+    factory :valid_talk_with_speaker, traits: [:with_speaker]
   end
 end

From 34b5b727f6084b588496220212de3d5b47ce43a0 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 20:21:14 +0100
Subject: [PATCH 183/191] Make cypress input selecting more reliable

---
 .../e2e/lectures_people_select_specs.cy.js        | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index a7e223e53..5e9576d45 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -50,8 +50,7 @@ describe("Lecture people edit page: teacher & editor", () => {
 
     it("prohibits searching for arbitrary users in the editor dropdown", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("editor-select").click();
-      cy.getBySelector("editor-select").type("cy");
+      cy.getBySelector("editor-select").find("input:not([type='hidden'])").type("cy");
       shouldContainUsers("editor-select", this, false, false);
     });
 
@@ -78,16 +77,14 @@ describe("Lecture people edit page: teacher & editor", () => {
 
     it("allows searching for arbitrary users to assign them as editors", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("editor-select").click();
-      cy.getBySelector("editor-select").type("cy");
+      cy.getBySelector("editor-select").find("input:not([type='hidden'])").type("cy");
       shouldContainUsers("editor-select", this, true, true);
     });
 
     it("allows to search for arbitrary users to assign them as tutors", function () {
       cy.visit(this.lecturePeopleUrl);
       cy.getBySelector("new-tutorial-btn").click();
-      cy.getBySelector("tutor-select-div").click();
-      cy.getBySelector("tutor-select-div").type("cy");
+      cy.getBySelector("tutor-select-div").find("input:not([type='hidden'])").type("cy");
       shouldContainUsers("tutor-select-div", this, true, true);
     });
   });
@@ -120,8 +117,7 @@ describe("Seminar speakers (new talk)", () => {
       cy.getBySelector("new-talk-btn").click();
       cy.getBySelector("talk-form").should("be.visible");
       shouldNotContainUserInOptions("speaker-select", this.user);
-      cy.getBySelector("speaker-select-div").click();
-      cy.getBySelector("speaker-select-div").type("cy");
+      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
       shouldContainUsers("speaker-select-div", this, false, true);
     });
   });
@@ -136,8 +132,7 @@ describe("Seminar speakers (new talk)", () => {
       cy.visit(this.seminarUrl);
       cy.getBySelector("new-talk-btn").click();
       cy.getBySelector("talk-form").should("be.visible");
-      cy.getBySelector("speaker-select-div").click();
-      cy.getBySelector("speaker-select-div").type("cy");
+      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
       shouldContainUsers("speaker-select-div", this, true, true);
     });
   });

From 7c898fdf7bd69f004e38e7fed076443630801e5c Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 20:28:03 +0100
Subject: [PATCH 184/191] Remove unnecessary div wrap

---
 app/helpers/talks_helper.rb | 49 +++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/app/helpers/talks_helper.rb b/app/helpers/talks_helper.rb
index 4edd2c23e..3783bb400 100644
--- a/app/helpers/talks_helper.rb
+++ b/app/helpers/talks_helper.rb
@@ -50,34 +50,31 @@ def speakers_preselection(talk)
   end
 
   def speaker_select(form, talk, with_preselection)
-    content_tag(:div, class: "mb-3") do
-      label = form.label(:speaker_ids, t("admin.talk.speakers"),
-                         class: "form-label")
-      help_desk = helpdesk(t("admin.talk.info.speakers"), false)
+    label = form.label(:speaker_ids, t("admin.talk.speakers"), class: "form-label")
+    help_desk = helpdesk(t("admin.talk.info.speakers"), false)
 
-      select = if current_user.admin?
-        preselection = with_preselection ? speakers_preselection(talk) : [[]]
-        form.select(:speaker_ids, preselection, {}, {
-                      class: "selectize",
-                      multiple: true,
-                      data: {
-                        ajax: true,
-                        filled: false,
-                        model: "user",
-                        placeholder: t("basics.enter_two_letters"),
-                        no_results: t("basics.no_results"),
-                        modal: true,
-                        cy: "speaker-select"
-                      }
-                    })
-      else
-        form.select(:speaker_ids, speakers_preselection(talk), {},
+    select = if current_user.admin?
+      preselection = with_preselection ? speakers_preselection(talk) : [[]]
+      form.select(:speaker_ids, preselection, {}, {
                     class: "selectize",
-                    data: { cy: "speaker-select" },
-                    multiple: true)
-      end
-
-      label + help_desk + select
+                    multiple: true,
+                    data: {
+                      ajax: true,
+                      filled: false,
+                      model: "user",
+                      placeholder: t("basics.enter_two_letters"),
+                      no_results: t("basics.no_results"),
+                      modal: true,
+                      cy: "speaker-select"
+                    }
+                  })
+    else
+      form.select(:speaker_ids, speakers_preselection(talk), {},
+                  class: "selectize",
+                  data: { cy: "speaker-select" },
+                  multiple: true)
     end
+
+    label + help_desk + select
   end
 end

From 43ac12fae41467fdfa827b8775de47ede1f603e5 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 20:50:20 +0100
Subject: [PATCH 185/191] Avoid flaky test by intercepting user fill request

---
 .../e2e/lectures_people_select_specs.cy.js    | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index 5e9576d45..579b74bcc 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -14,6 +14,20 @@ describe("Lecture edit page", () => {
   });
 });
 
+function typeCyInInput(selector, waitForUserFill = true) {
+  if (waitForUserFill) {
+    cy.intercept("GET", "/users/fill_user_select*").as("userFill");
+  }
+
+  cy.getBySelector(selector).find("input:not([type='hidden'])").as("input");
+  cy.get("@input").click();
+  cy.get("@input").type("cy");
+
+  if (waitForUserFill) {
+    cy.wait("@userFill");
+  }
+}
+
 function shouldContainUsers(selector, context, shouldContainUser, shouldContainTeacher) {
   const containUser = shouldContainUser ? "contain" : "not.contain";
   const containTeacher = shouldContainTeacher ? "contain" : "not.contain";
@@ -50,15 +64,14 @@ describe("Lecture people edit page: teacher & editor", () => {
 
     it("prohibits searching for arbitrary users in the editor dropdown", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("editor-select").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("editor-select", false);
       shouldContainUsers("editor-select", this, false, false);
     });
 
     it("prohibits searching for arbitrary users in the tutor dropdown", function () {
       cy.visit(this.lecturePeopleUrl);
       cy.getBySelector("new-tutorial-btn").click();
-      cy.getBySelector("tutor-select-div").click();
-      cy.getBySelector("tutor-select-div").type("cy");
+      typeCyInInput("tutor-select-div", false);
       shouldContainUsers("tutor-select-div", this, false, true);
     });
   });
@@ -71,20 +84,20 @@ describe("Lecture people edit page: teacher & editor", () => {
 
     it("allows searching for arbitrary users to assign them as teachers", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("teacher-select").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("teacher-select");
       shouldContainUsers("teacher-select", this, true, true);
     });
 
     it("allows searching for arbitrary users to assign them as editors", function () {
       cy.visit(this.lecturePeopleUrl);
-      cy.getBySelector("editor-select").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("editor-select");
       shouldContainUsers("editor-select", this, true, true);
     });
 
     it("allows to search for arbitrary users to assign them as tutors", function () {
       cy.visit(this.lecturePeopleUrl);
       cy.getBySelector("new-tutorial-btn").click();
-      cy.getBySelector("tutor-select-div").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("tutor-select-div");
       shouldContainUsers("tutor-select-div", this, true, true);
     });
   });
@@ -117,7 +130,7 @@ describe("Seminar speakers (new talk)", () => {
       cy.getBySelector("new-talk-btn").click();
       cy.getBySelector("talk-form").should("be.visible");
       shouldNotContainUserInOptions("speaker-select", this.user);
-      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("speaker-select-div", false);
       shouldContainUsers("speaker-select-div", this, false, true);
     });
   });
@@ -132,7 +145,7 @@ describe("Seminar speakers (new talk)", () => {
       cy.visit(this.seminarUrl);
       cy.getBySelector("new-talk-btn").click();
       cy.getBySelector("talk-form").should("be.visible");
-      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("speaker-select-div");
       shouldContainUsers("speaker-select-div", this, true, true);
     });
   });
@@ -159,7 +172,7 @@ describe("Seminar speakers (existing talk)", () => {
     it("prohibits searching for arbitrary users in the speakers dropdown", function () {
       cy.visit(this.talkUrl);
       shouldNotContainUserInOptions("speaker-select", this.user);
-      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("speaker-select-div", false);
       shouldContainUsers("speaker-select-div", this, false, true);
     });
   });
@@ -172,7 +185,7 @@ describe("Seminar speakers (existing talk)", () => {
 
     it("allows searching for arbitrary users to assign them as speakers", function () {
       cy.visit(this.talkUrl);
-      cy.getBySelector("speaker-select-div").find("input:not([type='hidden'])").type("cy");
+      typeCyInInput("speaker-select-div");
       shouldContainUsers("speaker-select-div", this, true, true);
     });
   });

From f1366b02ffc8ee874d0bfd6bde9f1f3c7831bcb9 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 23:03:10 +0100
Subject: [PATCH 186/191] Fix cypress not typing "cy" in input box

---
 spec/cypress/e2e/lectures_people_select_specs.cy.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index 579b74bcc..d1f3f91d1 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -19,9 +19,13 @@ function typeCyInInput(selector, waitForUserFill = true) {
     cy.intercept("GET", "/users/fill_user_select*").as("userFill");
   }
 
-  cy.getBySelector(selector).find("input:not([type='hidden'])").as("input");
+  cy.getBySelector(selector).find("input:not([type='hidden'])")
+    .should("have.length", 1).first().as("input");
+  cy.get("@input").clear(); // without clearing first, tests are flaky (!)
   cy.get("@input").click();
-  cy.get("@input").type("cy");
+
+  // eslint-disable-next-line cypress/unsafe-to-chain-command
+  cy.get("@input").type("cy", { timeout: 5000 }).should("have.value", "cy");
 
   if (waitForUserFill) {
     cy.wait("@userFill");

From cc82b9447fbdcb1a85aaeea620f13c9cd26fbf6f Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 23:11:52 +0100
Subject: [PATCH 187/191] Remove current_user= test as method was removed

---
 spec/models/current_spec.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/spec/models/current_spec.rb b/spec/models/current_spec.rb
index b4fc44d71..be3059a20 100644
--- a/spec/models/current_spec.rb
+++ b/spec/models/current_spec.rb
@@ -9,11 +9,4 @@
       expect(Current.user).to eq(:user)
     end
   end
-
-  describe "current_user= via ApplicationController" do
-    it "sets the current user" do
-      ApplicationController.current_user = :user
-      expect(Current.user).to eq(:user)
-    end
-  end
 end

From 68e161d657628b17c9b6b4655b79aae9e009e306 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 23:39:35 +0100
Subject: [PATCH 188/191] Intercept /talks/new route to avoid flaky test

This is due to the form not being completely loaded while we
already go on.
---
 spec/cypress/e2e/lectures_people_select_specs.cy.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index d1f3f91d1..c45245016 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -117,6 +117,13 @@ function shouldNotContainUserInOptions(selector, user) {
 }
 
 describe("Seminar speakers (new talk)", () => {
+  function openTalkForm() {
+    cy.intercept("GET", "/talks/new*").as("newTalk");
+    cy.getBySelector("new-talk-btn").click();
+    cy.getBySelector("talk-form").should("be.visible");
+    cy.wait("@newTalk");
+  }
+
   beforeEach(function () {
     cy.createUser("generic").as("user");
     cy.createUserAndLogin("teacher").as("teacher");
@@ -131,8 +138,7 @@ describe("Seminar speakers (new talk)", () => {
   context("when logged in as teacher", () => {
     it("prohibits searching for arbitrary users in the speakers dropdown", function () {
       cy.visit(this.seminarUrl);
-      cy.getBySelector("new-talk-btn").click();
-      cy.getBySelector("talk-form").should("be.visible");
+      openTalkForm();
       shouldNotContainUserInOptions("speaker-select", this.user);
       typeCyInInput("speaker-select-div", false);
       shouldContainUsers("speaker-select-div", this, false, true);
@@ -147,8 +153,7 @@ describe("Seminar speakers (new talk)", () => {
 
     it("allows searching for arbitrary users to assign them as speakers", function () {
       cy.visit(this.seminarUrl);
-      cy.getBySelector("new-talk-btn").click();
-      cy.getBySelector("talk-form").should("be.visible");
+      openTalkForm();
       typeCyInInput("speaker-select-div");
       shouldContainUsers("speaker-select-div", this, true, true);
     });

From c4969596efe7eb1a534b9af3309655953e322599 Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sat, 9 Nov 2024 23:52:43 +0100
Subject: [PATCH 189/191] Add cy.wait as last resort

---
 spec/cypress/e2e/lectures_people_select_specs.cy.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index c45245016..77f54ec18 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -116,12 +116,22 @@ function shouldNotContainUserInOptions(selector, user) {
   });
 }
 
-describe("Seminar speakers (new talk)", () => {
+describe.only("Seminar speakers (new talk)", () => {
   function openTalkForm() {
     cy.intercept("GET", "/talks/new*").as("newTalk");
     cy.getBySelector("new-talk-btn").click();
     cy.getBySelector("talk-form").should("be.visible");
     cy.wait("@newTalk");
+    // I've tried many things to get it to work, but still had a failing test
+    // here in the CI/CD pipeline. Cypress seems to not be able to type in
+    // "cy" into the input field, see `typeCyInInput()`. It's probably because
+    // the /talks/new request sends back JS with `fillOptionsByAjax` after
+    // populating the modal. This might result in the input being reset after
+    // cypress has already typed in "cy" (very quickly). So this is a workaround
+    // to wait a bit before typing in the input field. In general, such waits
+    // should only be used as a last resort.
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(1000);
   }
 
   beforeEach(function () {

From c864be8f6396079e490006f031463c024ff23c4e Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 10 Nov 2024 00:20:38 +0100
Subject: [PATCH 190/191] Visit #people page directly

---
 spec/cypress/e2e/vouchers_redemptions_spec_helpers.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
index c7c0e7312..09f51dec4 100644
--- a/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
+++ b/spec/cypress/e2e/vouchers_redemptions_spec_helpers.js
@@ -223,10 +223,11 @@ export function verifyAlreadyTeacherMessage(context) {
 }
 
 export function visitEditPage(context, type) {
-  cy.visit(`/lectures/${context.lecture.id}/edit`);
+  let url = `/lectures/${context.lecture.id}/edit`;
   if (type !== "talk") {
-    cy.getBySelector("people-tab-btn").click();
+    url += "#people";
   }
+  cy.visit(url);
 }
 
 export function verifyNoTalksYetButUserEligibleAsSpeaker(context) {

From f7a71ca9c22ce5978bb2a590124ea1211e91cfcd Mon Sep 17 00:00:00 2001
From: Splines <dominic-plein@gmx.de>
Date: Sun, 10 Nov 2024 00:20:48 +0100
Subject: [PATCH 191/191] Remove unwanted `only` in Cypress test

---
 spec/cypress/e2e/lectures_people_select_specs.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/cypress/e2e/lectures_people_select_specs.cy.js b/spec/cypress/e2e/lectures_people_select_specs.cy.js
index 77f54ec18..886b368c5 100644
--- a/spec/cypress/e2e/lectures_people_select_specs.cy.js
+++ b/spec/cypress/e2e/lectures_people_select_specs.cy.js
@@ -116,7 +116,7 @@ function shouldNotContainUserInOptions(selector, user) {
   });
 }
 
-describe.only("Seminar speakers (new talk)", () => {
+describe("Seminar speakers (new talk)", () => {
   function openTalkForm() {
     cy.intercept("GET", "/talks/new*").as("newTalk");
     cy.getBySelector("new-talk-btn").click();