Pull Team Code Into master (#243)

* updated the gemfile to include single test gem * Changed participant test for a current student in integration, added relationship to document test * Created Units tests for Charge model * Unit tests- shifts, events, documents (#228) * Created intial files for event and event type tests, modified documents relationships test * Document unit tests done, besides one clarification issue with search scope * Event unit tests done, added event and event type in factories.rb * Finished unit tests for FAQ * Fixed last error in document, have shift, shift type, and shift participant test passing * Unit Test - Tools (#229) * Created intial files for event and event type tests, modified documents relationships test * Document unit tests done, besides one clarification issue with search scope * Event unit tests done, added event and event type in factories.rb * Finished unit tests for FAQ * Fixed last error in document, have shift, shift type, and shift participant test passing * Made time to now instad of local in shift formatted_name test, finished toop type unit test and scope for tool test. Need to finish tool methods and tool_waitlist unit tests * FInished all unit test assigned to me besides tool and tool waitlist. Once tool waitlist is done, finish tool waitlist method in the tool unit test * Finished tool_waitlist test and finished the last method test in tool_test (now complete) * Test Cases for several models (#231) * created unit test for organization model. almost done * switching to goat branch to checkout akshay's commit * begining to modify test class for organization_alias_class. trying to merge rumby's modification on factories into my test branch * finished creating test class for organization_alias model. Everything functions properly * updated test for organization_category model. Everything functions properly * created new factory for organization_status_type. created a new test class for orgniazation_status but have been getting error message: factory not registered. Will come back to this later * fixed error! added organization_status to the factory file. test for organization_status now passed! * checking Rumby's PR. commiting before switching to goat * fixed previous file name error. Test for organization_status_type passed * finished up organization_timeline_entry test. removed duplicate schema comment in the status_type * updated organization test to include dependency testing * did some refactoring on organization_alias model and test * created test function for downtime methods * fixed syntax for org_category test. added test case for dependency * fixed minor syntax in test case for org_status and org_status_type * added test case for membership * added test case for judge, judgement, judgement_category * Added authorization checks - Home Controller & fixed Event okay/un-okay button (#234) * Added authorization checks so that anyone who isnt logged in cannot see downtime, charges overview, or hardhats * Changed the okay button to correct type of HTTP request so that the events ok/unokay works * Cleaned code (moved authorization from views to controllers) for charges (now participants can't read charges pages from views) * Commented shift test out, opened it up as a bug though so we know to go back and figure out the CI error on it * Added Dependency Tests for Participant, Coverage for Other Models & Bugfix (#237) * Added tests for charge_type model * Added tests for role model * Added tests for StoreItem model * Added tests for StorePurchase model * Added tests for Checkout model * Fixed charge model coverage * Added tests to charge_type, checkout, and partly participant * Added full test coverage for Task model * Added fixes to participant model tests * Added dependency tests for participant * Fixed duplicate cart items bug * Edited factory file to get rid of merge conflict * Added schema.rb file * Added Placeholder value for receiving participant when updating charges (#239) * created unit test for organization model. almost done * switching to goat branch to checkout akshay's commit * begining to modify test class for organization_alias_class. trying to merge rumby's modification on factories into my test branch * finished creating test class for organization_alias model. Everything functions properly * updated test for organization_category model. Everything functions properly * created new factory for organization_status_type. created a new test class for orgniazation_status but have been getting error message: factory not registered. Will come back to this later * fixed error! added organization_status to the factory file. test for organization_status now passed! * checking Rumby's PR. commiting before switching to goat * fixed previous file name error. Test for organization_status_type passed * finished up organization_timeline_entry test. removed duplicate schema comment in the status_type * updated organization test to include dependency testing * did some refactoring on organization_alias model and test * created test function for downtime methods * fixed syntax for org_category test. added test case for dependency * fixed minor syntax in test case for org_status and org_status_type * added test case for membership * added test case for judge, judgement, judgement_category * somehow event_type_test got updated with a new schema entry. Saving change before checking out akshay's unit tests * updated TravisCI's timezone to US Eastern time, which should match with the built in timezone indicated in application.rb * changed TRAVIS CI Setting to eastern time * trying to see if this fix for time works * travis yml syntax incorrect in the previous commit. just fixed it now. Hopefully this works * travis could not load timezone data. trying a different method * both attempts failed. reverted back to master branch version of travis configuration. Will create an issue * added redirect back to organization as a temporary solution for bug #201 * made modification to the charge param and fixed odd behavior, described in issue #202 * added placeholder value so that the receiving_participant does not seem to disappear * Update .travis.yml * Update event_type_test.rb * Cleaned Code for charge, charge_type, checkouts, and documents (#242) * Cleaned code for charges and charge type * Cleaned code for checkout * Cleaned code for documents besides the new * Cleaned views for events and event types * cleaned code for faqs * Added timezone on CI server config to correct CI server shift error (#245) * Reproducing issue #235 * Changing CI timezone to fix issue #235 * Ak/twilio notifications2 (#253) * added twilio messenger module, also tweaked the application config to autoload the module * Added 2 scenarios for notifications * Fixed organization timeline entry twilio notification * Fixed bugs for watch shift twilio notifications * Added assigned field to events and notifications for assignees when note is assigned to them * Switched notification delays to production times * Bl/waitlist notify (#254) * added twilio messenger module, also tweaked the application config to autoload the module * tried to modified messenger with text processing but failed * added code to send out text alert to the next person on the wait list after a tool is checked back in * added a safeguard for phone number in case someone has not put their phonenumber in the system yet * updated messenger module with try-rescue block * commented out code for reply forwarding. There is an issue for the forwarding and it seems to be security related. Need to discuss it with people more knowledgable before implemeting this feature * removed commented code. Will probably add it to a seperate branch. Just trying to merge this code to goat branch * modified messenger to keep track of error code * New features branch (#252) * Prevent participants from skipping saftey video * Added user certifications * Add certification check to tools checkout * Only show certifications required by tool type if they exist * Added cancan checks around certification creation and deletion * Added wristband field to participant view to help with wristband distribution #220 * Added digital signature to waiver #173 * Cleaned waiver code * Changed store items price datatype to support fractional prices #168 * Added rake db:migrate to travis script so it can build with migrations * Added rake db:migrate to travis script so it can build with migrations * Fixing style on PR #248 * Removing nil check for PR #248 * Changed error message after skipping the saftey video * Using migration technique from http://stackoverflow.com/questions/17150529 * Reverting to previous 9V battery price * Fixing spelling of 'safety' * Define wristband colors as constants * Added load_and_authorize_resource to CertificationsController * Changed building_status to is_building in db seeds file * Fixed waiver playing in bg for admin and allow admin to skip video * Added scissor lift wristband color * Updated safety video * Cleaned up waiver code and let user skip waiver on error from previous error * Fixed ForbiddenAttribute error on certification creation * Fixed messed up sidebar on SCC member new waiver * Removed duplicate gems in Gemfile * Added delayed_job bin to git (platanus/capistrano3-delayed-job#21) * Fixed db migration for is_building field in organization_category * Added requested legal clauses to waiver * Fixed scissor lift wristband color * Bl/waitlist notify (#259) * added twilio messenger module, also tweaked the application config to autoload the module * tried to modified messenger with text processing but failed * added code to send out text alert to the next person on the wait list after a tool is checked back in * added a safeguard for phone number in case someone has not put their phonenumber in the system yet * updated messenger module with try-rescue block * commented out code for reply forwarding. There is an issue for the forwarding and it seems to be security related. Need to discuss it with people more knowledgable before implemeting this feature * removed commented code. Will probably add it to a seperate branch. Just trying to merge this code to goat branch * modified messenger to keep track of error code * made change to charges controller as requested * Ak/twilio notifications2 (#258) * added twilio messenger module, also tweaked the application config to autoload the module * Added 2 scenarios for notifications * Fixed organization timeline entry twilio notification * Fixed bugs for watch shift twilio notifications * Added assigned field to events and notifications for assignees when note is assigned to them * Switched notification delays to production times * Added tweaks stephen requested, including showing preview of the event in text, fixing the scc exec member drop down, and sending a text when everyone is confirmed for a watch shift * Added production times for shift notifications * Added proper messenger code * Fixed up gemfile for merge * Fixed delayed_job mis-spelling * Update participant_test.rb * Updated safety video
sc0v · Apr 11, 2017 · 962671e · 962671e
1 parent 3477026
commit 962671e
Show file tree

Hide file tree

Showing 127 changed files with 2,657 additions and 650 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,4 +4,6 @@ rvm:
 bundler_args: --without development staging production
 sudo: false
 before_script:
-  - bundle exec rake db:test:prepare
+  - bundle exec rake test:prepare
+  - bundle exec rake db:migrate
+  - export TZ='America/New_York'
diff --git a/Gemfile b/Gemfile
@@ -26,6 +26,11 @@ gem 'activeldap', :require => 'active_ldap/railtie'
 # For Card-lookup requests
 gem 'savon'
 
+# For delayed jobs
+gem 'daemons'
+gem 'delayed_job'
+gem 'delayed_job_active_record'
+
 # For Capistrano deployment
 group :development do
   gem 'capistrano-rbenv', require: false
@@ -44,6 +49,7 @@ group :development do
 
   # sudo commands in capistrano
   gem 'sshkit-sudo'
+
 end
 
 # Document attachments
@@ -65,6 +71,9 @@ gem 'twilio-ruby'
 # Dossier for reports
 gem 'dossier'
 
+# Single test gem for unit testing
+gem 'single_test'
+
 group :development do
   # Automatically generate comments in models and such based on schema
   gem 'annotate'
@@ -84,6 +93,7 @@ end
 group :development, :staging, :production do
   gem 'newrelic_rpm'
   gem 'mysql2'
+  gem 'capistrano3-delayed-job'
 end
 
 group :test do
@@ -113,4 +123,5 @@ end
 
 group :staging, :production do
   gem 'passenger'
-end
+
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -78,6 +78,8 @@ GEM
     capistrano-rbenv (2.0.4)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
+    capistrano3-delayed-job (1.7.2)
+      capistrano (~> 3.0, >= 3.0.0)
     carrierwave (0.11.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
@@ -103,6 +105,11 @@ GEM
       safe_yaml (~> 1.0.0)
     daemons (1.2.3)
     debug_inspector (0.0.2)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    delayed_job_active_record (4.1.1)
+      activerecord (>= 3.0, < 5.1)
+      delayed_job (>= 3.0, < 5)
     devise (3.5.6)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -269,6 +276,8 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    single_test (0.6.0)
+      rake
     spring (1.6.4)
     sprockets (3.5.2)
       concurrent-ruby (~> 1.0)
@@ -337,9 +346,13 @@ DEPENDENCIES
   capistrano-passenger
   capistrano-rails
   capistrano-rbenv
+  capistrano3-delayed-job
   carrierwave
   coffee-rails
   coveralls
+  daemons
+  delayed_job
+  delayed_job_active_record
   devise
   dossier
   factory_girl_rails
@@ -366,6 +379,7 @@ DEPENDENCIES
   shoulda
   shoulda-matchers
   simple_form
+  single_test
   spring
   sqlite3
   sshkit-sudo
@@ -378,5 +392,8 @@ DEPENDENCIES
   will_paginate
   will_paginate-bootstrap
 
+RUBY VERSION
+   ruby 2.3.0p0
+
 BUNDLED WITH
-   1.11.2
+   1.14.5
diff --git a/Rakefile b/Rakefile
@@ -2,5 +2,6 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
+require 'single_test/tasks'
 
 Trailerapp::Application.load_tasks
diff --git a/app/controllers/certifications_controller.rb b/app/controllers/certifications_controller.rb
@@ -0,0 +1,44 @@
+class CertificationsController < ApplicationController
+  load_and_authorize_resource
+
+  before_action :set_participant, only: [:new, :create]
+  before_action :set_certification, only: [:destroy]
+  before_action :check_all_certifications, except: [:destroy]
+
+  def new
+    @certification = Certification.new(:participant => @participant)
+    respond_with @certification
+  end
+
+  def create
+    @certification = Certification.new(certification_params)
+    @certification.participant = @participant
+    @certification.save
+    respond_with @certification, location: -> { @certification.participant }
+  end
+
+  def destroy
+    @certification.destroy
+    respond_with @certification, location: -> { @certification.participant }
+  end
+
+  private
+  def set_participant
+    @participant = Participant.find(params[:participant_id])
+  end
+
+  def set_certification
+    @certification = Certification.find(params[:id])
+  end
+
+  def check_all_certifications
+    if @participant.certifications.size == CertificationType.all.size
+      redirect_to (participant_path @participant), :flash => { :error => @participant.name + " has already gotten all certifications." }
+    end
+  end
+
+  def certification_params
+    params.require(:certification).permit(:participant_id, :certification_type_id)
+  end
+
+end
diff --git a/app/controllers/charge_types_controller.rb b/app/controllers/charge_types_controller.rb
@@ -1,3 +1,20 @@
+# ## Schema Information
+#
+# Table name: `charge_types`
+#
+# ### Columns
+#
+# Name                                 | Type               | Attributes
+# ------------------------------------ | ------------------ | ---------------------------
+# **`created_at`**                     | `datetime`         |
+# **`default_amount`**                 | `decimal(8, 2)`    |
+# **`description`**                    | `text(65535)`      |
+# **`id`**                             | `integer`          | `not null, primary key`
+# **`name`**                           | `string(255)`      |
+# **`requires_booth_chair_approval`**  | `boolean`          |
+# **`updated_at`**                     | `datetime`         |
+#
+
 class ChargeTypesController < ApplicationController
   load_and_authorize_resource
 

diff --git a/app/controllers/charges_controller.rb b/app/controllers/charges_controller.rb
@@ -1,5 +1,32 @@
+# ## Schema Information
+#
+# Table name: `charges`
+#
+# ### Columns
+#
+# Name                            | Type               | Attributes
+# ------------------------------- | ------------------ | ---------------------------
+# **`amount`**                    | `decimal(8, 2)`    |
+# **`charge_type_id`**            | `integer`          |
+# **`charged_at`**                | `datetime`         |
+# **`created_at`**                | `datetime`         |
+# **`creating_participant_id`**   | `integer`          |
+# **`description`**               | `text(65535)`      |
+# **`id`**                        | `integer`          | `not null, primary key`
+# **`is_approved`**               | `boolean`          |
+# **`issuing_participant_id`**    | `integer`          |
+# **`organization_id`**           | `integer`          |
+# **`receiving_participant_id`**  | `integer`          |
+# **`updated_at`**                | `datetime`         |
+#
+# ### Indexes
+#
+# * `index_charges_on_organization_id`:
+#     * **`organization_id`**
+#
+
 class ChargesController < ApplicationController
-  load_and_authorize_resource skip_load_resource only: [:create] 
+  load_and_authorize_resource 
   before_action :set_charge, only: [:show, :edit, :update, :destroy, :approve]
 
   # GET /charges
@@ -32,6 +59,7 @@ def new
 
   # GET /charges/1/edit
   def edit
+    @current_receiving_participant = @charge.receiving_participant? ? "" : @charge.receiving_participant.formatted_name
   end
 
   # POST /charges
@@ -49,7 +77,7 @@ def create
   # PUT /charges/1.json
   def update
     @charge.is_approved = false
-    @charge.update(charge_params)
+    @charge.update_attributes(charge_params)
     respond_with(@charge)
   end
 
@@ -69,7 +97,8 @@ def destroy
   def approve
     @charge.is_approved = !@charge.is_approved
     @charge.save
-    respond_with @charge, location: -> {charges_path}
+
+    respond_with(@charge, location: @charge.organization)
   end
 
   private

diff --git a/app/controllers/checkouts_controller.rb b/app/controllers/checkouts_controller.rb
@@ -1,3 +1,26 @@
+# ## Schema Information
+#
+# Table name: `checkouts`
+#
+# ### Columns
+#
+# Name                   | Type               | Attributes
+# ---------------------- | ------------------ | ---------------------------
+# **`checked_in_at`**    | `datetime`         |
+# **`checked_out_at`**   | `datetime`         |
+# **`created_at`**       | `datetime`         |
+# **`id`**               | `integer`          | `not null, primary key`
+# **`organization_id`**  | `integer`          |
+# **`participant_id`**   | `integer`          |
+# **`tool_id`**          | `integer`          |
+# **`updated_at`**       | `datetime`         |
+#
+# ### Indexes
+#
+# * `index_checkouts_on_tool_id`:
+#     * **`tool_id`**
+#
+
 class CheckoutsController < ApplicationController
   # permissions error - when enabled, this tries to find a Checkout with the current related model id on creation
   # load_and_authorize_resource
@@ -7,6 +30,7 @@ class CheckoutsController < ApplicationController
   def index
     @tool = Tool.find(params[:tool_id])
     @checkouts = @tool.checkouts
+    authorize! :read, @checkouts
 
     respond_to do |format|
       format.html # index.html.erb
@@ -136,8 +160,6 @@ def uncheckin
         format.html { redirect_to tool_path(checkout.tool), notice: "Error" }
       end
     end
-
-
   end
 
 
@@ -181,5 +203,6 @@ def checkin_bak
       end
     end
   end
+
 end
 
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
@@ -1,3 +1,21 @@
+# ## Schema Information
+#
+# Table name: `documents`
+#
+# ### Columns
+#
+# Name                   | Type               | Attributes
+# ---------------------- | ------------------ | ---------------------------
+# **`created_at`**       | `datetime`         |
+# **`document_id`**      | `integer`          |
+# **`id`**               | `integer`          | `not null, primary key`
+# **`name`**             | `string(255)`      |
+# **`organization_id`**  | `integer`          |
+# **`public`**           | `boolean`          |
+# **`updated_at`**       | `datetime`         |
+# **`url`**              | `string(255)`      |
+#
+
 class DocumentsController < ApplicationController
   load_and_authorize_resource skip_load_resource only: [:create] 
 

diff --git a/app/controllers/event_types_controller.rb b/app/controllers/event_types_controller.rb
@@ -1,3 +1,16 @@
+# ## Schema Information
+#
+# Table name: `event_types`
+#
+# ### Columns
+#
+# Name           | Type               | Attributes
+# -------------- | ------------------ | ---------------------------
+# **`display`**  | `boolean`          |
+# **`id`**       | `integer`          | `not null, primary key`
+# **`name`**     | `string(255)`      |
+#
+
 class EventTypesController < ApplicationController
   load_and_authorize_resource
   before_action :set_event_type, only: [:show, :edit, :update, :destroy]
@@ -78,4 +91,4 @@ def set_event_type
     def event_type_params
       params.require(:event_type).permit(:display, :name)
     end
-end
+end
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
@@ -1,3 +1,20 @@
+# ## Schema Information
+#
+# Table name: `events`
+#
+# ### Columns
+#
+# Name                  | Type               | Attributes
+# --------------------- | ------------------ | ---------------------------
+# **`created_at`**      | `datetime`         |
+# **`description`**     | `text(65535)`      |
+# **`event_type_id`**   | `integer`          |
+# **`id`**              | `integer`          | `not null, primary key`
+# **`is_done`**         | `boolean`          |
+# **`participant_id`**  | `integer`          |
+# **`updated_at`**      | `datetime`         |
+#
+
 class EventsController < ApplicationController
   load_and_authorize_resource
   before_action :set_event, only: [:show, :edit, :update, :destroy,:approve]
@@ -16,6 +33,7 @@ def show
   # GET /events/new
   def new
     @event = Event.new
+    @scc_members = Participant.all.scc
   end
 
   # PUT
@@ -27,6 +45,7 @@ def approve
 
   # GET /events/1/edit
   def edit
+    @scc_members = Participant.all.scc
     @event.updated_at = DateTime.now
     @event.save
   end
@@ -81,6 +100,6 @@ def set_event
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def event_params
-      params.require(:event).permit(:is_done, :title, :created_at, :description, :updated_at, :display, :event_type_id)
+      params.require(:event).permit(:is_done, :title, :created_at, :description, :updated_at, :display, :event_type_id, :participant_id)
     end
-end
+end