Merge pull request #338 from minnestar/mdecuir/participant-coc-cleanup

experimatt · web-flow · commit c3c447980b56 · 2025-03-12T21:25:37.000-05:00
Participant required fields + CoC checkbox cleanup
diff --git a/app/assets/stylesheets/formtastic.css b/app/assets/stylesheets/formtastic.css
@@ -84,6 +84,7 @@ form.formtastic fieldset ol li ul.errors li { padding:0; border:none; display:li
 /* STRING & NUMERIC OVERRIDES
 --------------------------------------------------------------------------------------------------*/
 form.formtastic fieldset ol li.string input { width:74%; }
+form.formtastic fieldset ol li.email input { width: 74%; }
 form.formtastic fieldset ol li.password input { width:74%; }
 form.formtastic fieldset ol li.numeric input { width:74%; }
 
diff --git a/app/controllers/admin/legacy/sessions_controller.rb b/app/controllers/admin/legacy/sessions_controller.rb
@@ -11,10 +11,6 @@ def edit
     respond_with(@session)
   end
 
-  def new
-    respond_with(@session)
-  end
-
   def update
     if @session.update(session_params)
       redirect_to admin_legacy_sessions_path
@@ -23,29 +19,6 @@ def update
     end
   end
 
-  def build_presenter
-    name = params[:session].delete(:name)
-    # find exact match by name
-    Participant.where(name: name).first_or_initialize do |p|
-      p.save(validate: false) if p.new_record?
-    end
-  end
-
-  def create
-    @session.participant = build_presenter
-    @session.attributes = session_params
-    @session.event = Event.current_event
-    @session.timeslot_id = params[:session][:timeslot_id]
-    @session.room_id = params[:session][:room_id]
-
-    if @session.save
-      flash[:notice] = "Presentation added"
-      redirect_to admin_legacy_sessions_path
-    else
-      render :new
-    end
-  end
-
   def destroy
     @session.destroy!
     flash[:notice] = "Session has been deleted"
diff --git a/app/controllers/participants_controller.rb b/app/controllers/participants_controller.rb
@@ -79,7 +79,7 @@ def send_confirmation_email
 
   def confirm_email
     @participant = Participant.find_using_perishable_token(params[:token])
-    if @participant.update!(email_confirmed_at: Time.now)
+    if @participant.update!(email_confirmed_at: Time.current)
       flash[:notice] = "Email confirmed. Thank you!"
       redirect_to root_path
     else
diff --git a/app/models/event.rb b/app/models/event.rb
@@ -4,6 +4,7 @@ class Event < ActiveRecord::Base
   has_many :rooms, dependent: :destroy
 
   has_many :presenter_timeslot_restrictions, :through => :timeslots
+  has_many :code_of_conduct_agreements, dependent: :destroy
 
   # Careful! Large joins here; use with caution:
   has_many :attendances, through: :sessions
diff --git a/app/models/participant.rb b/app/models/participant.rb
@@ -5,9 +5,12 @@ class Participant < ActiveRecord::Base
   has_many :presentations
   has_many :sessions_presenting, :through => :presentations, :source => :session
   has_many :presenter_timeslot_restrictions, dependent: :destroy
+  has_many :code_of_conduct_agreements, dependent: :destroy
 
-  validates_presence_of :name
-  validates_uniqueness_of :email, :case_sensitive => false, :allow_blank => true
+  validates :name, presence: true
+  validates :email, presence: true
+  validates_uniqueness_of :email, :case_sensitive => false
+  validates :password, presence: true, on: :create
   validate :bio_does_not_include_example_links
 
   # used for formtastic form to allow sending a field related to a separate model
diff --git a/app/views/admin/legacy/sessions/index.html.erb b/app/views/admin/legacy/sessions/index.html.erb
@@ -1,7 +1,5 @@
 <% title('Admin: All sessions') %>
 
-<h2><%= link_to 'Add a session', new_admin_legacy_session_path %></h2>
-
 <div class="row">
   <div class="column grid_6" style="margin-left:0px">
    <ul class="sessionsList">
diff --git a/app/views/participants/new.html.erb b/app/views/participants/new.html.erb
@@ -14,6 +14,7 @@
     <%=
       f.input :code_of_conduct_agreement,
         as: :boolean,
+        required: true, # this only adds an asterisk to the label, it doesn't make the field required
         label: ("I agree to the #{link_to 'Code of Conduct', 'https://minnestar.org/code-of-conduct'} governing this event.").html_safe,
         input_html: {
           checked: @participant.signed_code_of_conduct_for_current_event?,
diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb
@@ -16,7 +16,10 @@
         as: :boolean,
         required: true,
         label: ("I agree to the #{link_to 'Code of Conduct', 'https://minnestar.org/code-of-conduct'} governing this event.").html_safe,
-        input_html: { checked: current_participant.signed_code_of_conduct_for_current_event? }
+        input_html: {
+          checked: current_participant.signed_code_of_conduct_for_current_event?,
+          disabled: current_participant.signed_code_of_conduct_for_current_event?
+        }
     %>
   <% end %>
 
diff --git a/config/routes.rb b/config/routes.rb
@@ -45,7 +45,7 @@
     get '/legacy', to: 'legacy/admin#show', as: :legacy
     namespace :legacy do
       resource :config, only: [:show, :create]
-      resources :sessions
+      resources :sessions, except: [:new, :create]
       resources :markdown_contents, path: 'markdown-contents'
       resources :events do
         resources :timeslots, only: [:index, :new, :create]
diff --git a/db/migrate/20250313020004_add_not_null_constraints_to_participants.rb b/db/migrate/20250313020004_add_not_null_constraints_to_participants.rb
@@ -0,0 +1,15 @@
+class AddNotNullConstraintsToParticipants < ActiveRecord::Migration[7.1]
+  def change
+    # update any existing NULL values, just in case
+    Participant.where(email: nil).update_all(email: 'INVALID')
+    Participant.where(crypted_password: nil).update_all(crypted_password: 'INVALID')
+
+    change_column_null :participants, :email, false
+    change_column_null :participants, :crypted_password, false
+  end
+
+  def down
+    change_column_null :participants, :email, true
+    change_column_null :participants, :crypted_password, true
+  end
+end
diff --git 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: 2025_03_09_183552) do
+ActiveRecord::Schema[7.1].define(version: 2025_03_13_020004) do
   create_schema "heroku_ext"
 
   # These are extensions that must be enabled in order to support this database
@@ -69,11 +69,11 @@
 
   create_table "participants", id: :serial, force: :cascade do |t|
     t.string "name", limit: 255
-    t.string "email", limit: 255
+    t.string "email", limit: 255, null: false
     t.text "bio"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
-    t.string "crypted_password", limit: 255
+    t.string "crypted_password", limit: 255, null: false
     t.string "persistence_token", limit: 255
     t.string "perishable_token", limit: 255, default: "", null: false
     t.datetime "email_confirmed_at", precision: nil
diff --git a/spec/controllers/admin/legacy/sessions_controller_spec.rb b/spec/controllers/admin/legacy/sessions_controller_spec.rb
@@ -43,48 +43,4 @@
       end
     end
   end
-
-  describe "create" do
-    let!(:event) { create(:event) }
-    let(:category) { Category.last }
-    before do
-      Participant.destroy_all
-      create(:participant, name: "Joe Schmoe")
-    end
-
-    context "with valid values" do
-      it "creates a new session " do
-
-        expect {
-          expect {
-            post :create, params: { session: { title: 'new title', description: 'new description', category_ids: [category.id], level_id: '2', name: "Ada Lovelace"} }
-          }.to change { Session.count }.by(1)
-        }.to change { Participant.count }.by(1)
-        expect(response).to redirect_to admin_legacy_sessions_path
-        expect(assigns[:session].title).to eq 'new title'
-        expect(assigns[:session].participant.name).to eq 'Ada Lovelace'
-        expect(assigns[:session].event).to eq event
-        expect(assigns[:session].category_ids).to include category.id
-        expect(flash[:notice]).to eq "Presentation added"
-      end
-    end
-
-    context "with invalid values" do
-      it "shows the errors" do
-
-        expect {
-          post :create, params: { session: { title: ''} }
-        }.not_to change { Session.count }
-        expect(response).to render_template('new')
-      end
-    end
-  end
-
-  describe "new" do
-    it "should be successful" do
-      get :new
-      expect(response).to be_successful
-      expect(assigns[:session]).to be_kind_of Session
-    end
-  end
 end
diff --git a/spec/features/sign_in_and_out_spec.rb b/spec/features/sign_in_and_out_spec.rb
@@ -85,5 +85,28 @@
         expect(page).to have_content "has already been taken"
       end
     end
+
+    scenario "As a user I cannot register without entering required fields" do
+      visit root_path
+
+      click_link "Log in"
+      click_link 'Register here'
+
+      click_button "Create My Account"
+
+      expect(page).to have_content "There was a problem creating your account."
+      within("#participant_name_input") { expect(page).to have_content "can't be blank" }
+      within("#participant_email_input") { expect(page).to have_content "can't be blank" }
+      within("#participant_password_input") { expect(page).to have_content "can't be blank" }
+
+      name = FFaker::Name.name
+      fill_in 'Your name*', with: name
+      fill_in 'Your email', with: FFaker::Internet.safe_email
+      fill_in 'Password', with: "anything, it doesnt matter"
+      click_button "Create My Account"
+
+      expect(page).to have_content "Thanks for registering an account. Please check your email to confirm your account."
+      expect(page).to have_content "Welcome #{name}"
+    end
   end
 end
