#667 add project deliveries

app/assets/javascripts/web/admin/delivery/campaigns.js.coffee

@@ -14,11 +14,12 @@ $ ->
 
   $audience_type_input.change ->
     value = $(this).val()
-    if value == 'event_registrations' || value == 'team'
+    if value == 'event_registrations' || value == 'team' || value == 'project'
       $audience_select2.show()
       $submit_button.prop 'disabled', true
       url = Routes.api_admin_events_path() if value == 'event_registrations'
       url = Routes.api_admin_teams_path() if value == 'team'
+      url = Routes.api_admin_projects_path() if value == 'project'
       $audience_select2.select2
         ajax:
           url: url

app/controllers/api/admin/projects_controller.rb

@@ -0,0 +1,10 @@
+class Api::Admin::ProjectsController < Api::Admin::ApplicationController
+  def index
+    projects = if params[:q].present?
+                 ::Project.search_everywhere params[:q][:term]
+               else
+                 ::Project.all
+               end
+    render json: projects.to_json(only: [:id, :title])
+  end
+end

app/controllers/web/admin/delivery/campaigns_controller.rb

@@ -26,7 +26,7 @@ def create
     @campaign_form = ::Delivery::CampaignForm.new_with_model
     @campaign_form.submit params[:delivery_campaign]
     if @campaign_form.save
-      ::Admin::FillReceiversJob.perform_later @campaign_form.model
+      ::Admin::FillReceiversJob.perform_now @campaign_form.model
       redirect_to admin_delivery_campaign_path(@campaign_form.model)
     else
       render action: :new

app/helpers/web/admin/delivery/audiences_helper.rb

@@ -1,14 +1,16 @@
 module Web::Admin::Delivery::AudiencesHelper
   def audience_path(audience)
     case audience.audience_type
-      when 'users', 'contacts_emails'
-        ''
-      when 'event_registrations'
-        # FIXME query from helper :(
-        link_to Event.find(audience.audience_id).title, admin_event_path(audience.audience_id)
-      when 'team'
-        link_to Team.find(audience.audience_id).title, admin_team_path(audience.audience_id)
-      end
+    when 'users', 'contacts_emails'
+      ''
+    when 'event_registrations'
+      # FIXME query from helper :(
+      link_to Event.find(audience.audience_id).title, admin_event_path(audience.audience_id)
+    when 'team'
+      link_to Team.find(audience.audience_id).title, admin_team_path(audience.audience_id)
+    when 'project'
+      link_to Project.find(audience.audience_id).title, admin_project_path(audience.audience_id)
+    end
   end
 
   def audience_types_collection(campaign)

app/models/delivery/audience.rb

@@ -1,10 +1,11 @@
 class Delivery::Audience < ActiveRecord::Base
   extend Enumerize
   belongs_to :campaign, class_name: 'Delivery::Campaign'
+  belongs_to :project
 
   validates :audience_type, presence: true
 
-  enumerize :audience_type, in: [ :team, :users, :contact_emails, :event_registrations, :members ], default: :users
+  enumerize :audience_type, in: [ :team, :users, :contact_emails, :event_registrations, :members, :project ], default: :users
 
   def contacts
     @contacts ||= case audience_type
@@ -30,6 +31,8 @@ def contacts
       when 'event_registrations'
         event = Event.find audience_id
         User.presented.subscribed_to_deliveries.with_email.where id: event.registrations.map(&:user_id)
+      when 'project'
+        User.with_email.presented.where id: Subscription.project(audience_id).map(&:user_id)
       end
   end
 end

app/models/subscription.rb

@@ -1,10 +1,11 @@
 class Subscription < ActiveRecord::Base
   belongs_to :receiver, polymorphic: true
+  belongs_to :project
 
   has_one :token, as: :record, dependent: :destroy
 
   extend Enumerize
-  enumerize :subscription_type, in: [ :deliveries ]
+  enumerize :subscription_type, in: [ :deliveries, :project ]
   enumerize :receiver_type, in: [ 'User', 'Delivery::ContactEmail' ]
 
   include StateMachine::Scopes
@@ -17,6 +18,7 @@ class Subscription < ActiveRecord::Base
   scope :news, -> { where record_type: 'News' }
   scope :articles, -> { where record_type: 'Article' }
   scope :empty, -> { active.where tag_type: :link, target_id: nil }
+  scope :project, -> (project_id) { where subscription_type: :project, project_id: project_id }
 
   validates :subscription_type, uniqueness: { scope: [:receiver_id, :receiver_type] }
 end

config/locales/ru/enumerize.yml

@@ -70,6 +70,7 @@ ru:
         team: На команду
         event_registrations: Участников мероприятия
         members: Члены организации
+        project: По проекту
     logged_action:
       action_type:
         update: Обновил

config/routes.rb

@@ -192,6 +192,7 @@
       resources :teams, only: :index
       resources :tags, only: [ :create, :destroy, :index ]
       resources :documents, only: :create
+      resources :projects, only: :index
       namespace :event do
         resources :registrations, only: :create
       end

db/migrate/20170613070246_add_project_id_to_subscriptions.rb

@@ -0,0 +1,5 @@
+class AddProjectIdToSubscriptions < ActiveRecord::Migration
+  def change
+    add_column :subscriptions, :project_id, :integer
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170611202422) do
+ActiveRecord::Schema.define(version: 20170613070246) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -122,9 +122,9 @@
   create_table "activity_lines_lider_ya_lider_participations", force: :cascade do |t|
     t.integer  "participant_id"
     t.integer  "stage_id"
+    t.text     "state"
     t.datetime "created_at",     null: false
     t.datetime "updated_at",     null: false
-    t.text     "state"
   end
 
   create_table "activity_lines_lider_ya_lider_stages", force: :cascade do |t|
@@ -283,9 +283,9 @@
   create_table "delivery_receivers", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "campaign_id"
-    t.text     "state"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.text     "state",       default: "ready"
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
     t.text     "user_type"
   end
 
@@ -609,6 +609,9 @@
     t.integer "user_id"
   end
 
+  add_index "teams_users", ["team_id"], name: "index_teams_users_on_team_id", using: :btree
+  add_index "teams_users", ["user_id"], name: "index_teams_users_on_user_id", using: :btree
+
   create_table "test_paper_questions", force: :cascade do |t|
     t.text     "text"
     t.integer  "test_paper_id"

test/controllers/api/admin/projects_controller_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+
+class Api::Admin::ProjectsControllerTest < ActionController::TestCase
+  setup do
+    admin = create :admin
+    sign_in admin
+    create :place
+  end
+
+  test 'should get index' do
+    get :index
+    assert_response :success
+  end
+end