v0.1.7

suninthesky · web-flow · commit ed5c0ce9cb54 · 2020-01-30T15:21:35.000Z
Merge pull request #22 from TechforgoodCAST/dev
diff --git a/app/assets/stylesheets/modules/button.sass b/app/assets/stylesheets/modules/button.sass
@@ -1,4 +1,4 @@
-.btn, .btn-wide
+.btn:not(.no-style), .btn-wide
   font-size: 22px
   font-weight: bold
   text-decoration: none
diff --git a/app/assets/stylesheets/modules/form.sass b/app/assets/stylesheets/modules/form.sass
@@ -1,10 +1,10 @@
-input, textarea
+input:not(.no-style), textarea
   background: $off-white
   width: 100%
   padding: 15px
   font-size: 14px
 
-input
+input:not(.no-style)
   border: 1px solid $grey
 
 textarea
diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
@@ -0,0 +1,38 @@
+class AssignmentsController < ApplicationController
+  before_action :load_referral, except: :new
+  before_action :parse_date, only: :index
+
+  def index
+    @referrals = Referral.joins(:assignees).order(created_at: :desc)
+                         .by_month(@date, col: 'referrals.created_at')
+                         .select('referrals.*', 'users.first_name', 'users.last_name')
+  end
+
+  def create
+    @assignment = Assignment.new(form_params)
+    @assignment.referral = @referral
+
+    if @assignment.save!
+      redirect_to referral_path(@referral.partner, @referral)
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    @assignment = Assignment.find_by(referral: @referral, user_id: params[:user_id])
+    @assignment.destroy
+
+    redirect_to referral_path(@referral.partner, @referral)
+  end
+
+  private
+
+  def form_params
+    params.require(:assignment).permit(:user_id)
+  end
+
+  def load_referral
+    @referral = Referral.find_by(sequential_id: params[:id])
+  end
+end
diff --git a/app/controllers/referrals_controller.rb b/app/controllers/referrals_controller.rb
@@ -19,6 +19,7 @@ def index
 
   def show
     @referral = @partner.referrals.find_by(sequential_id: params[:id])
+    @users = User.all - User.joins(:assignments).where('referral_id = ?', @referral)
     render_status(404) if @referral.nil?
   end
 
diff --git a/app/models/assignment.rb b/app/models/assignment.rb
@@ -0,0 +1,4 @@
+class Assignment < ApplicationRecord
+  belongs_to :referral
+  belongs_to :user
+end
diff --git a/app/models/referral.rb b/app/models/referral.rb
@@ -4,6 +4,9 @@ class Referral < ApplicationRecord
   belongs_to :partner
   acts_as_sequenced scope: :partner_id
 
+  has_many :assignments
+  has_many :assignees, through: :assignments, source: :user
+
   has_many :reviews, dependent: :destroy
 
   validates :last_state, inclusion: { in: STATES }
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -2,7 +2,12 @@ class User < ApplicationRecord
   devise :database_authenticatable,
          :recoverable, :rememberable, :validatable, :trackable
 
+  has_many :assignments
   has_many :reviews
 
   validates :first_name, :last_name, presence: true
+
+  def full_name
+    "#{first_name} #{last_name}"
+  end
 end
diff --git a/app/views/assignments/index.html.erb b/app/views/assignments/index.html.erb
@@ -0,0 +1,45 @@
+<div class="mt50 mb40">
+
+  <% if @referrals.any? %>
+
+    <div class="row bold h2">
+      <div class="sm f1 truncate">Identifier</div>
+      <div class="sm f1 truncate">Partner</div>
+      <div class="sm f1 truncate">Status</div>
+      <div class="sm f1 truncate">Date</div>
+    </div>
+
+    <% @referrals.group_by { |o| "#{o.first_name} #{o.last_name}" }.each do |g| %>
+
+      <div class="mb10">Assigned to <%= g[0] %> (<%= g[1].size %>)</div>
+
+      <% g[1].each.each do |r| %>
+
+        <%= link_to(
+          referral_path(r.partner, r),
+          class: "row h3 mb10 #{requires_review(r.last_state)}"
+        ) do %>
+          <span class="sm f1 truncate bold">
+            <%= r.response_identifier %>
+          </span>
+          <span class="sm f1 truncate">
+            <%= r.partner.name %>
+          </span>
+          <%= status_text(r.last_state) %>
+          <span class="sm f1 truncate">
+            <%= r.created_at.strftime('%d / %m / %y') %>
+          </span>
+        <% end %>
+      <% end %>
+
+    <% end %>
+
+  <% else %>
+
+    <div class="center">No assignees this month.</div>
+
+  <% end %>
+
+</div>
+
+<%= render(partial: 'layouts/month_picker', locals: { date: @date, path: :advisors_path }) %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -16,7 +16,8 @@
         <div class="mw-767 mx-auto flex justify-between">
           <div>
             <%= link_to('Slots', root_path, class: "nav-item h2 bold black mr40 #{current_page?(root_path) ? 'active' : ''}") %>
-            <%= link_to('Referrals', referrals_path, class: "nav-item h2 bold black #{current_page?(referrals_path) ? 'active' : ''}") %>
+            <%= link_to('Referrals', referrals_path, class: "nav-item h2 bold black mr40 #{current_page?(referrals_path) ? 'active' : ''}") %>
+            <%= link_to('Advisors', advisors_path, class: "nav-item h2 bold black #{current_page?(advisors_path) ? 'active' : ''}") %>
           </div>
           <%= link_to('Log Out', destroy_user_session_path, method: :delete, class: 'nav-item h2 bold black underline') %>
         </div>
diff --git a/app/views/referrals/show.html.erb b/app/views/referrals/show.html.erb
@@ -1,5 +1,5 @@
 <div class="mt50 mb20">
-  <%= link_to("❮ Go back", referrals_path, class: "h1 bold underline") %>
+  <%= link_to("❮ Back to referrals", referrals_path, class: "bold underline") %>
 </div>
 
 <div class="row bold h2">
@@ -49,7 +49,7 @@
   </div>
 <% end %>
 
-<div class="p15 bg-white rounded">
+<div class="p15 bg-white rounded mb20">
   <h3 class="bold mb20">Change status</h3>
 
   <%= simple_form_for @referral.reviews.new, url: new_referral_review_path(@partner, @referral) do |f| %>
@@ -72,3 +72,23 @@
     </div>
   <% end %>
 </div>
+
+<div class="p15 bg-white rounded">
+  <h3 class="bold mb20">Assignees</h3>
+  <%- if @referral.assignees.any? %>
+    <ul class="mb20">
+      <%- @referral.assignees.each do |user| %>
+        <li><%= user.full_name %> <%= link_to '(Unassign)', assignment_path(@referral.partner, @referral, user), method: :delete, data: { confirm: 'Are you sure?' } %></li>
+      <% end %>
+    </ul>
+  <% else %>
+    <p class="mb20"><em>None</em></p>
+  <% end %>
+
+  <p><strong>Assign advisor</strong></p>
+
+  <%= simple_form_for Assignment.new, url: new_assignment_path(@partner, @referral) do |f| %>
+    <%= f.input :user_id, collection: @users, label_method: :full_name, label: false, wrapper_html: { style: "display: inline-block" } %>
+    <%= f.button :submit, "Assign", class: "no-style", data: { disable_with: "Assigning..." } %>
+  <% end %>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -5,12 +5,18 @@
 
   root 'partners#index'
 
+  get '/advisors', to: 'assignments#index', as: 'advisors'
+
   get '/:slug/referrals/new', to: 'referrals#new', as: 'new_partner_referral'
   get '/referrals', to: 'referrals#index', as: 'referrals'
   get '/:slug/referrals/:id', to: 'referrals#show', as: 'referral'
 
   get  '/:slug/referral/:id/reviews/new', to: 'reviews#new', as: 'new_referral_review'
   post '/:slug/referral/:id/reviews/new', to: 'reviews#create'
 
+  get    '/:slug/referrals/:id/assignments/new', to: 'assignments#new', as: 'new_assignment'
+  post   '/:slug/referrals/:id/assignments/new', to: 'assignments#create'
+  delete '/:slug/referrals/:id/assignments/:user_id/', to: 'assignments#destroy', as: 'assignment'
+
   post '/webhooks/new-response/:token', to: 'webhooks#new_response', as: 'webhooks_new_response'
 end
diff --git a/db/migrate/20200123160154_create_assignments.rb b/db/migrate/20200123160154_create_assignments.rb
@@ -0,0 +1,10 @@
+class CreateAssignments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :assignments do |t|
+      t.references :user, foreign_key: true
+      t.references :referral, foreign_key: true
+
+      t.timestamps
+    end
+  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.define(version: 2018_10_02_130404) do
+ActiveRecord::Schema.define(version: 2020_01_23_160154) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -41,10 +41,19 @@
     t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
   end
 
+  create_table "assignments", force: :cascade do |t|
+    t.bigint "user_id"
+    t.bigint "referral_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["referral_id"], name: "index_assignments_on_referral_id"
+    t.index ["user_id"], name: "index_assignments_on_user_id"
+  end
+
   create_table "partners", force: :cascade do |t|
     t.boolean "accepting_referrals", default: true, null: false
-    t.string "form_url", null: false
     t.string "form_identifier"
+    t.string "form_url", null: false
     t.string "name", null: false
     t.integer "max_monthly_referrals", null: false
     t.string "slug", null: false
@@ -99,6 +108,8 @@
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  add_foreign_key "assignments", "referrals"
+  add_foreign_key "assignments", "users"
   add_foreign_key "referrals", "partners"
   add_foreign_key "reviews", "referrals"
   add_foreign_key "reviews", "users"
diff --git a/test/factories/assignments.rb b/test/factories/assignments.rb
@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :assignment do
+    referral
+    user
+  end
+end
diff --git a/test/factories/referrals.rb b/test/factories/referrals.rb
@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :referral do
+    partner
     original_response do
       {
         form_response: {
diff --git a/test/factories/users.rb b/test/factories/users.rb
@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :user do
     first_name { 'John' }
-    last_name { 'Doe' }
-    email { 'email@example.com' }
+    sequence(:last_name) { |n| "Doe#{n}" }
+    sequence(:email) { |n| "email#{n}@example.com" }
     password { 'passw0rd' }
     password_confirmation { 'passw0rd' }
   end
diff --git a/test/models/assignment_test.rb b/test/models/assignment_test.rb
@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class AssignmentTest < ActiveSupport::TestCase
+  setup do
+    @subject = build(:assignment)
+  end
+
+  test 'belongs_to Referral' do
+    assert_instance_of(Referral, @subject.referral)
+  end
+
+  test 'belongs_to User' do
+    assert_instance_of(User, @subject.user)
+  end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -7,6 +7,11 @@ class UserTest < ActiveSupport::TestCase
 
   test('valid') { assert(@subject.valid?) }
 
+  test 'has_many Assignments' do
+    create_list(:assignment, 2, user: @subject)
+    assert_equal(2, @subject.assignments.size)
+  end
+
   test 'has_many Reviews' do
     create_list(:review, 2, user: @subject)
     assert_equal(2, @subject.reviews.size)
@@ -19,4 +24,9 @@ class UserTest < ActiveSupport::TestCase
   test '#last_name present' do
     assert_present(:last_name)
   end
+
+  test '#full_name' do
+    expected = "#{@subject.first_name} #{@subject.last_name}"
+    assert_equal(expected, @subject.full_name)
+  end
 end
diff --git a/test/system/referral_assignment_test.rb b/test/system/referral_assignment_test.rb
@@ -0,0 +1,39 @@
+require 'application_system_test_case'
+
+class ReferralAssignmentTest < ApplicationSystemTestCase
+  setup do
+    @user = create(:user)
+    @partner = create(:partner)
+    @referral = create(:referral, partner: @partner)
+    visit root_path
+    sign_in
+    click_link('Referrals')
+    find('a.row', match: :first).click
+  end
+
+  test 'can assign user to refferal' do
+    select(@user.full_name)
+    click_on('Assign')
+
+    assert_link('Unassign', count: 1)
+  end
+
+  test 'cannot assign same user twice' do
+    user2 = create(:user)
+    select(@user.full_name)
+    click_on('Assign')
+    select(user2.full_name)
+    click_on('Assign')
+
+    assert_link('Unassign', count: 2)
+  end
+
+  test 'can unassign user to refferal' do
+    select(@user.full_name)
+    click_on('Assign')
+    click_on('Unassign')
+    page.accept_confirm
+
+    assert_no_link('(Unassign)', count: 1)
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-.btn, .btn-wide`
	`1`	`+.btn:not(.no-style), .btn-wide`
`2`	`2`	`font-size: 22px`
`3`	`3`	`font-weight: bold`
`4`	`4`	`text-decoration: none`