Merge pull request #73 from rmd6502/volunteerings_state

Volunteerings state

Author: sdklos

.gitignore

@@ -27,6 +27,7 @@ pickle-email-*.html
 ## Environment normalization:
 /.bundle
 /vendor/bundle
+/vendor/cache
 
 # these should all be checked in to normalize the environment:
 # Gemfile.lock, .ruby-version, .ruby-gemset

Gemfile

@@ -21,6 +21,7 @@ gem 'cancan' # or cancancan
 gem 'draper'
 gem 'pundit'
 gem 'audited', '~> 4.7'
+gem 'aasm'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'

Gemfile.lock

@@ -1,6 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    aasm (5.0.2)
+      concurrent-ruby (~> 1.0)
     actioncable (5.1.6)
       actionpack (= 5.1.6)
       nio4r (~> 2.0)
@@ -323,6 +325,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aasm
   activeadmin
   activeadmin-select2
   airrecord

app/admin/projects.rb

@@ -29,8 +29,8 @@
       project.website.try(:truncate, 20)
     end
     column :slack_channel
-    column :skills do |project|
-      span project.skills.map(&:name).to_sentence
+    column :stacks do |project|
+      span project.stacks.map(&:name).to_sentence
     end
     column :volunteers do |project|
       c = project.volunteers.count

app/admin/volunteerings.rb

@@ -0,0 +1,15 @@
+ActiveAdmin.register Volunteering do
+# See permitted parameters documentation:
+# https://github.com/activeadmin/activeadmin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
+#
+# permit_params :list, :of, :attributes, :on, :model
+#
+# or
+#
+# permit_params do
+#   permitted = [:permitted, :attributes]
+#   permitted << :other if params[:action] == 'create' && current_user.admin?
+#   permitted
+# end
+
+end

app/controllers/application_controller.rb

@@ -10,7 +10,7 @@ def new_session_path(scope)
   def set_skills
     @tech_skills = Skill.tech_skills
     @non_tech_skills = Skill.non_tech_skills
-    @skills = Skill.all
+    @all_skills = Skill.all
   end
 
   def after_sign_in_path_for(resource)

app/controllers/dashboard/projects_controller.rb

@@ -11,21 +11,29 @@ def create
     @project.needs_categories = Skill.where(:name => needs_category_names)
     if @project.valid?
       @project.save
-      redirect_to dashboard_project_path(@project)
+      redirect_to edit_dashboard_project_path(@project)
     else
-      render :new_edit
+      render :edit
     end
   end
 
   def edit
     if resource.mission_aligned
       render :aligned_edit
     else
-      render :new_edit
+      render :edit
     end
 
   end
 
+  def update
+    if resource.save
+      redirect_to edit_dashboard_project_path(@project)
+    else
+      render :edit
+    end
+  end
+
   private
 
   def begin_of_association_chain

app/models/project.rb

@@ -10,18 +10,16 @@ class Project < ApplicationRecord
   has_and_belongs_to_many :tech_stack, -> { where tech: true }, class_name: "Skill", join_table: "projects_skills"
   has_and_belongs_to_many :non_tech_stack, -> { where tech: !true }, class_name: "Skill", join_table: "projects_skills"
 
-  has_and_belongs_to_many :volunteers, class_name: "User", join_table: "projects_volunteers"
+  has_many :volunteerings
+  has_many :active_volunteerings,  -> { where state: 'active' }, class_name: 'Volunteering'
+  has_many :volunteers, through: :active_volunteerings, source: 'user'
 
   validates_presence_of :name, :description, :tech_stack, :tech_stack_names
 
   validates :legal_structures, :presence => true,:allow_blank => false
 
   after_save :remove_blank_values
-
   audited
-
-  audited associated_with: :user
-  audited associated_with: :skills
   has_associated_audits
 
   def leads

app/models/skill.rb

@@ -13,8 +13,4 @@ class Skill < ApplicationRecord
 
   audited
 
-  audited associated_with: :project
-  audited associated_with: :user
-  has_associated_audits
-
 end

app/models/user.rb

@@ -8,16 +8,15 @@ class User < ApplicationRecord
   validates_presence_of :name, :email, :slack_username, :location, :hear_about_us, :join_reason
   validates_acceptance_of :read_code_of_conduct
 
-  has_and_belongs_to_many :volunteerings, class_name: "Project", join_table: "projects_volunteers"
+  has_many :volunteerings
+  has_many :active_volunteerings, -> { where state: 'active' }, class_name: 'Volunteering'
+  has_many :projects, through: :active_volunteerings, source: 'user'
 
   # after_create :send_slack_notification
 
   devise :omniauthable, omniauth_providers: [:slack]
 
   audited
-
-  audited associated_with: :user
-  audited associated_with: :skill
   has_associated_audits
 
   def self.from_omniauth(auth)

app/models/volunteering.rb

@@ -0,0 +1,43 @@
+class Volunteering < ApplicationRecord
+  include AASM
+
+  belongs_to :user
+  belongs_to :project
+
+  audited associated_with: :project
+  audited associated_with: :user
+
+  aasm :column => 'state' do
+    state :potential, initial: true
+    state :signed_up
+    state :invited
+    state :active
+    state :resigned
+    state :removed
+    state :former
+    
+    event :apply do
+        transitions from: [:potential, :former], to: :signed_up
+    end
+    
+    event :recruit do
+        transitions from: [:potential, :former], to: :invited
+    end
+
+    event :confirm do
+        transitions from: [:signed_up, :invited], to: :active
+
+        transitions from: [:resigned, :removed], to: :former
+    end
+
+    event :leave do
+      transitions from: :active, to: :resigned
+    end
+
+    event :remove do
+      transitions from: :active, to: :removed
+    end
+
+  end
+
+end

app/views/dashboard/projects/_aligned_form.html.erb

@@ -13,7 +13,7 @@
 
   <%= f.input :non_tech_stack_names, label: 'Non-Tech Stack', :hint => 'What non-tech attributes does your project have?', :placeholder => "Type something...", :input_html => {:data => {:tokens => format_skills(resource.non_tech_stack), :typeahead_source => format_skills(@non_tech_skills) }} %>
 
-  <%= f.input :needs_category_names, :label => 'Needs Categories', :hint => 'What skills are needed for your project? Choose as many as are relevant!', :placeholder => "Type something...", :input_html => {:data => {:tokens => format_skills(resource.needs_categories), :typeahead_source => format_skills(@skills)}} %>
+  <%= f.input :needs_category_names, :label => 'Needs Categories', :hint => 'What skills are needed for your project? Choose as many as are relevant!', :placeholder => "Type something...", :input_html => {:data => {:tokens => format_skills(resource.needs_categories), :typeahead_source => format_skills(@all_skills)}} %>
 
   <%= f.input :status, :label => 'Project Status',:hint => 'You may select more than one', :collection => Project::STATUSES, :input_html => { :multiple => true }, :include_blank  => true, :include_hidden => false %>
 

app/views/dashboard/projects/_new_form.html.erb

@@ -15,7 +15,7 @@
 
   <%= f.input :non_tech_stack_names, label: 'Non-Tech Stack', :hint => 'What non-tech attributes does your project have?', :placeholder => "Type something...", :input_html => {:data => {:tokens => format_skills(resource.non_tech_stack), :typeahead_source => format_skills(@non_tech_skills) }} %>
 
-  <%= f.input :needs_category_names, :label => 'Needs Categories', :hint => 'What skills are needed for your project? Choose as many as are relevant!', :placeholder => "Type something...", :input_html => {:data => {:tokens => format_skills(resource.needs_categories), :typeahead_source => format_skills(@skills)}} %>
+  <%= f.input :needs_category_names, :label => 'Needs Categories', :hint => 'What skills are needed for your project? Choose as many as are relevant!', :placeholder => "Type something...", :input_html => {:data => {:tokens => format_skills(resource.needs_categories), :typeahead_source => format_skills(@all_skills)}} %>
 
   <%= f.input :status, :label => 'Project Status',:hint => 'You may select more than one', :collection => Project::STATUSES, :input_html => { :multiple => true }, :include_blank  => true, :include_hidden => false %>
 

app/views/dashboard/projects/aligned_edit.html.erb

@@ -0,0 +1,11 @@
+<h1>Edit Project</h1>
+
+<%= render 'shared/invalid_skill_modal'%>
+
+<% if resource.mission_aligned%>
+  <%= render 'aligned_form'%>
+<% else %>
+  <%= render 'new_form', dashboard_project: @dashboard_project %>
+<% end %>
+
+<%= link_to 'Back', dashboard_projects_path %>

app/views/dashboard/projects/edit.html.erb

@@ -3,6 +3,6 @@
 <%= render 'shared/invalid_skill_modal'%>
 
 
-<%= render 'form' %>
+<%= render 'new_form' %>
 
 <%= link_to 'Back', dashboard_projects_path %>

app/views/dashboard/projects/new.html.erb

@@ -19,8 +19,6 @@
     <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0">
       <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">ProgBot Dashboard</a>
       <input class="form-control form-control-dark w-100" type="text" placeholder="Search" aria-label="Search">
-      <a class="nav-link" href="/skills">Browse Projects by Skills</a>
-       <a class="nav-link" href="/projects">Browse Projects Alphabetically</a>
 
       <ul class="navbar-nav px-3">
         <li class="nav-item text-nowrap">
@@ -58,7 +56,14 @@
                   Volunteerings
                 </a>
               </li>
-              
+              <li class="nav-item">
+                <a class="nav-link" href="/skills">
+                  Browse Projects by Skills
+                </a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="/projects">Browse Projects Alphabetically</a>
+              </li>   
             </ul>
           </div>
         </nav>

app/views/dashboard/projects/new_edit.html.erb

@@ -0,0 +1,5 @@
+class ChangeProjectsVolunteersToVolunteerings < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :projects_volunteers, :volunteerings
+  end
+end

app/views/layouts/dashboard.html.erb

@@ -0,0 +1,5 @@
+class AddStateToVolunteerings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :volunteerings, :state, :string
+  end
+end

db/migrate/20190322005533_change_projects_volunteers_to_volunteerings.rb

@@ -0,0 +1,5 @@
+class AddIdToVolunterings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :volunteerings, :id, :primary_key
+  end
+end

db/migrate/20190322011858_add_state_to_volunteerings.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181231183949) do
+ActiveRecord::Schema.define(version: 20190329025330) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -114,13 +114,6 @@
     t.index ["skill_id"], name: "index_projects_skills_on_skill_id"
   end
 
-  create_table "projects_volunteers", id: false, force: :cascade do |t|
-    t.bigint "project_id"
-    t.bigint "user_id"
-    t.index ["project_id"], name: "index_projects_volunteers_on_project_id"
-    t.index ["user_id"], name: "index_projects_volunteers_on_user_id"
-  end
-
   create_table "skills", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false
@@ -172,4 +165,12 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  create_table "volunteerings", force: :cascade do |t|
+    t.bigint "project_id"
+    t.bigint "user_id"
+    t.string "state"
+    t.index ["project_id"], name: "index_volunteerings_on_project_id"
+    t.index ["user_id"], name: "index_volunteerings_on_user_id"
+  end
+
 end