Merge branch 'release/0.15.0.9'

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

@@ -1,9 +1,8 @@
 class Web::Admin::Delivery::SessionsController < Web::Admin::Delivery::ApplicationController
   def create
     campaign = ::Delivery::Campaign.find(params[:id]).decorate
-    campaign.contacts.each_slice(100) do |combination|
-      ::DeliveryJob.perform_later combination, campaign.title, campaign.body, campaign.link, campaign.image.url
-    end
+    contacts = campaign.receivers.includes(user: :subscriptions).where(state: :ready).to_a
+    ::DeliveryJob.perform_later contacts, campaign.title, campaign.body, campaign.link, campaign.image.url
     #campaign.start_mailing
     redirect_to sidekiq_web_path
   end

app/jobs/delivery_job.rb

@@ -2,8 +2,11 @@ class DeliveryJob < ActiveJob::Base
   queue_as :default
 
   def perform(contacts, title, text, link, image)
-    contacts.each do |contact|
-      UserMailer.delay.send :just_message, contact, title, text, link, image, contact.subscribe_token.content
+    contacts.each_slice(100) do |combination|
+      combination.each do |contact|
+        UserMailer.delay.send :just_message, contact, title, text, link, image, contact.user.subscribe_token.content
+        contact.send_email
+      end
     end
   end
 end

app/models/delivery/receiver.rb

@@ -1,2 +1,13 @@
 class Delivery::Receiver < ActiveRecord::Base
+  belongs_to :campaign
+  belongs_to :user
+
+  state_machine :state, initial: :ready do
+    state :ready
+    state :sent
+
+    event :send_email do
+      transition all => :sent
+    end
+  end
 end

db/migrate/20170323204740_create_delivery_receivers.rb

@@ -3,7 +3,7 @@ def change
     create_table :delivery_receivers do |t|
       t.integer :user_id
       t.integer :campaign_id
-      t.text :state
+      t.text :state, default: :ready
 
       t.timestamps null: false
     end

db/schema.rb

@@ -250,9 +250,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
   end
 
   create_table "documents", force: :cascade do |t|