tolliver 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e7ab72e7ba150c2828de6e3f3defebf06f50bbf09495b9f3bafcc32d4858cf0
-  data.tar.gz: 4dd7b0a65c105f2f11fcf336675a515d41cac6cc278580fd24951891073b60dc
+  metadata.gz: bca32cfa7b51b8e6ba8b5869fc08861ddd0baed7391e37896e9790034bf0320b
+  data.tar.gz: 5f5962eaea832be5c87576b930f9d687e3ab7a4ec691eb08b9b5a57cb8e8f5a2
 SHA512:
-  metadata.gz: 4c538087c0161c0968e4f2f4fa31c8ce6ad1a54ea1ee0b924b851f81aa537ed631c839cadb0e258b86a5ba24dee3affa2b5b6dc46983c1f5d16960b91cf562a4
-  data.tar.gz: 05fa597679610a2694f6397992040c4463b9bb9d9458e7f1193431e302c7e2446c67c096838273b5c4fcc42e714f0d53a61d0612abc3a114e6f1ab1b6af06eab
+  metadata.gz: 47ec923a9b374213a31889efd74ccb5c55928e79aa474b6ebe2243705fd59d8466657e79df765cfe590f7b823177b64bf9ba53a9ea38020a6eca4412ec138bf4
+  data.tar.gz: 23476701f1f3cf159d2c7b30cc28a76007e9d4908caca6d5c94b258a40962ac7df8b94b66eaf12b395dae4c9c428bed50a405ef04386272dfb513ce292a76802

data/lib/tolliver.rb

@@ -20,8 +20,8 @@ require "tolliver/models/notification_receiver"
 require "tolliver/models/notification_template"
 
 # Services
-require "tolliver/services/notification"
-require "tolliver/services/delivery"
+require "tolliver/services/notification_service"
+require "tolliver/services/delivery_service"
 require "tolliver/services/policies/batch"
 require "tolliver/services/policies/instantly"
 require "tolliver/services/methods/email"
@@ -30,6 +30,10 @@ require "tolliver/services/methods/email/mailgun"
 require "tolliver/services/methods/sms"
 require "tolliver/services/methods/sms/plivo"
 
+# Jobs
+require "tolliver/jobs/delivery_job"
+require "tolliver/jobs/batch_policy_job"
+
 # Mailers
 require "tolliver/mailers/notification_mailer"
 
@@ -52,19 +56,19 @@ module Tolliver
   # *************************************************************************
 
   def self.notify(options)
-    Tolliver::Services::Notification.instance.notify(options)
+    Tolliver::Services::NotificationService.instance.notify(options)
   end
 
   def self.deliver(notification)
-    Tolliver::Services::Delivery.instance.deliver(notification)
+    Tolliver::Services::DeliveryService.instance.deliver(notification)
   end
 
   def self.enqueue_for_delivery(notification)
-    Tolliver::Services::Delivery.instance.enqueue_for_delivery(notification)
+    Tolliver::Services::DeliveryService.instance.enqueue_for_delivery(notification)
   end
 
   def self.reset_delivery(notification)
-    Tolliver::Services::Delivery.instance.reset_delivery(notification)
+    Tolliver::Services::DeliveryService.instance.reset_delivery(notification)
   end
 
   # *************************************************************************

data/lib/tolliver/jobs/batch_policy_job.rb

@@ -0,0 +1,19 @@
+module Tolliver
+  module Jobs
+    class BatchPolicyJob < ActiveJob::Base
+      queue_as :default
+
+      def perform(notification_delivery_id, batch_size)
+
+        # Instantiate notification delivery object
+        notification_delivery = Tolliver.notification_delivery_model.find_by_id(notification_delivery_id)
+        return nil if notification_delivery.nil? || notification_delivery.policy != :batch
+
+        # Call policy logic
+        policy_service = Tolliver::Services::Policies::Batch.new
+        policy_service.deliver_batch_and_enqueue(notification_delivery, batch_size)
+
+      end
+    end
+  end
+end

data/lib/tolliver/jobs/delivery_job.rb

@@ -0,0 +1,18 @@
+module Tolliver
+  module Jobs
+    class DeliveryJob < ActiveJob::Base
+      queue_as :default
+
+      def perform(notification_id)
+
+        # Instantiate notification object
+        notification = Tolliver.notification_model.find_by_id(notification_id)
+        return nil if notification.nil?
+
+        # Call standard API
+        Tolliver::Services::DeliveryService.instance.deliver(notification)
+
+      end
+    end
+  end
+end

data/lib/tolliver/models/notification.rb

@@ -52,15 +52,15 @@ module Tolliver
       # ***********************************************************************
 
       def deliver
-        Tolliver::Services::Delivery.instance.deliver(self)
+        Tolliver::Services::DeliveryService.instance.deliver(self)
       end
 
       def enqueue_for_delivery
-        Tolliver::Services::Delivery.instance.enqueue_for_delivery(self)
+        Tolliver::Services::DeliveryService.instance.enqueue_for_delivery(self)
       end
 
       def reset_delivery
-        Tolliver::Services::Delivery.instance.reset_delivery(self)
+        Tolliver::Services::DeliveryService.instance.reset_delivery(self)
       end
 
     end

data/lib/tolliver/services/{delivery.rb → delivery_service.rb}

@@ -13,23 +13,12 @@ require 'singleton'
 
 module Tolliver
   module Services
-    class Delivery
+    class DeliveryService
       include Singleton
 
       def enqueue_for_delivery(notification)
         return nil if notification.nil?
-        QC.enqueue("#{self.class.to_s}.deliver", notification.id)
-      end
-
-      # Entry point for QC
-      def self.deliver(notification_id)
-
-        # Instantiate notification object
-        notification = Tolliver.notification_model.find_by_id(notification_id)
-        return nil if notification.nil?
-
-        # Call standard API
-        self.instance.deliver(notification)
+        Tolliver::Jobs::DeliveryJob.perform_later(notification.id)
       end
 
       # Deliver notification to receivers by all configured methods

data/lib/tolliver/services/{notification.rb → notification_service.rb}

@@ -13,7 +13,7 @@ require 'singleton'
 
 module Tolliver
   module Services
-    class Notification
+    class NotificationService
       include Singleton
 
       def notify(options)
@@ -98,8 +98,8 @@ module Tolliver
 
                 # Save to DB
                 filtered_receivers.each do |receiver|
-                  raise Tolliver::Errors::BadRequest.new('Missing sender ref.') if receiver[:ref].blank?
-                  raise Tolliver::Errors::BadRequest.new('Missing sender contact.') if receiver[:contact].blank?
+                  raise Tolliver::Errors::BadRequest.new('Missing receiver ref.') if receiver[:ref].blank?
+                  raise Tolliver::Errors::BadRequest.new('Missing receiver contact.') if receiver[:contact].blank?
                   notification_delivery.notification_receivers.create(receiver_ref: receiver[:ref], receiver_contact: receiver[:contact])
                 end
                 notification_delivery.sent_count = 0

data/lib/tolliver/services/policies/batch.rb

@@ -19,26 +19,15 @@ module Tolliver
           # Input validation
           return nil if notification_delivery.nil? || notification_delivery.policy != :batch
 
-          # Enqueue in QC
-          QC.enqueue("#{self.class.to_s}.deliver", notification_delivery.id, batch_size)
+          # Enqueue
+          Tolliver::Jobs::BatchPolicyJob.perform_later(notification_delivery.id, batch_size)
         end
 
-        # Entry point for QC
-        def self.deliver(notification_delivery_id, batch_size = 10)
+        def deliver_batch_and_enqueue(notification_delivery, batch_size = 10)
 
-          # Instantiate notification delivery object
-          notification_delivery = Tolliver.notification_delivery_model.find_by_id(notification_delivery_id)
+          # Input validation
           return nil if notification_delivery.nil? || notification_delivery.policy != :batch
 
-          # Call internal logic
-          policy_service = self.new
-          policy_service.send(:deliver_batch_and_enqueue, notification_delivery, batch_size)
-        end
-
-        protected
-
-        def deliver_batch_and_enqueue(notification_delivery, batch_size = 10)
-
           # Send single batch
           remaining = deliver_batch(notification_delivery, batch_size)
 
@@ -59,6 +48,9 @@ module Tolliver
 
         def deliver_batch(notification_delivery, batch_size = 10)
 
+          # Input validation
+          return nil if notification_delivery.nil? || notification_delivery.policy != :batch
+
           # Nothing to do
           return 0 if notification_delivery.sent_count == notification_delivery.receivers_count
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tolliver
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Matěj Outlý
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -55,19 +55,21 @@ files:
 - lib/tolliver/errors/bad_request.rb
 - lib/tolliver/errors/not_found.rb
 - lib/tolliver/errors/standard_error.rb
+- lib/tolliver/jobs/batch_policy_job.rb
+- lib/tolliver/jobs/delivery_job.rb
 - lib/tolliver/mailers/notification_mailer.rb
 - lib/tolliver/models/notification.rb
 - lib/tolliver/models/notification_attachment.rb
 - lib/tolliver/models/notification_delivery.rb
 - lib/tolliver/models/notification_receiver.rb
 - lib/tolliver/models/notification_template.rb
-- lib/tolliver/services/delivery.rb
+- lib/tolliver/services/delivery_service.rb
 - lib/tolliver/services/methods/email.rb
 - lib/tolliver/services/methods/email/mailgun.rb
 - lib/tolliver/services/methods/email/smtp.rb
 - lib/tolliver/services/methods/sms.rb
 - lib/tolliver/services/methods/sms/plivo.rb
-- lib/tolliver/services/notification.rb
+- lib/tolliver/services/notification_service.rb
 - lib/tolliver/services/policies/batch.rb
 - lib/tolliver/services/policies/instantly.rb
 - lib/tolliver/utils/enum.rb