notifiable-core 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5fccd800a04500a363939b090a2a9f88faa45c84a6d43af689e0036efe1191
-  data.tar.gz: a7bf3297962dda646bc268d9ee07a09008f89a917e0450f4c896e85ed57c6ad2
+  metadata.gz: 425bb33e77f7b1321f9df9f3dd7f0cfc59804f3bfbd3e156b19f25f464a2a640
+  data.tar.gz: fa9dd36fd58bb92a5f751d015ded197823bb5cd7481d0a662f8da9e6b40498f6
 SHA512:
-  metadata.gz: f3816a57d151d68f66dce06cdf8210a773a03e965b08cb91955a6baa788ce8c04d3c7d9e5b0ba0f1495814986cf9deeee91a9a85a27f25c78691cf1bbdcbabee
-  data.tar.gz: 119f7f22adc594d0af15b16b5f7c2811cf256184138623c0f788573690eb8a8600f0b18f8aae952f082068116ee84d1d03d49c481d1ae09b2a2c853e5ab593bf
+  metadata.gz: f06b405186be419fffbfc69af22cb287406714e480e072aa227fe8a5ff12d3fc451c45f8ff0aa1e653f74a6b3d32f6d0396ea8439e3aeb4212df0ead0e855317
+  data.tar.gz: 9980a92f754834eca0e6bdf408bfcd794860c653c6f9335655e3015fc940336e341100c9031087ead98cf4ba9ffe72effb1702ec8991537a586b41be21da28b9

data/db/migrate/201809032135000_add_error_code_to_notification_statuses.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddErrorCodeToNotificationStatuses < ActiveRecord::Migration[4.2]
+  def change
+    rename_column :notifiable_statuses, :status, :error_code
+    add_column :notifiable_statuses, :status, :integer
+  end
+end

data/db/migrate/201809032235000_add_delivered_count_to_notifications.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDeliveredCountToNotifications < ActiveRecord::Migration[4.2]
+  def change
+    add_column :notifiable_notifications, :delivered_count, :integer, default: 0
+  end
+end

data/lib/notifiable/notification.rb

@@ -46,6 +46,16 @@ module Notifiable
     def send_params
       @send_params ||= (parameters || {}).merge(n_id: id)
     end
+    
+    def delivered!(device_token)
+      increment!(:delivered_count)
+      notification_statuses.find_by(device_token: device_token).delivered! if notification_statuses.exists?(device_token: device_token)
+    end
+    
+    def opened!(device_token)
+      increment!(:opened_count)
+      notification_statuses.find_by(device_token: device_token).opened! if notification_statuses.exists?(device_token: device_token)
+    end
 
     private
 

data/lib/notifiable/notification_status.rb

@@ -2,7 +2,12 @@
 
 module Notifiable
   class NotificationStatus < ActiveRecord::Base
-    self.table_name_prefix = 'notifiable_'
+    self.table_name = 'notifiable_statuses'
+    
+    REJECTED_STATUS = 1
+    SENT_STATUS = 2
+    DELIVERED_STATUS = 3
+    OPENED_STATUS = 4
 
     belongs_to :notification, class_name: 'Notifiable::Notification'
     validates :notification, presence: true
@@ -10,15 +15,20 @@ module Notifiable
     belongs_to :device_token, class_name: 'Notifiable::DeviceToken'
     validates :device_token, presence: true
 
-    self.table_name = 'notifiable_statuses'
-
-    def opened!
-      update_attribute(:status, -1)
-      notification.increment!(:opened_count)
+    def rejected!
+      update_attributes(status: REJECTED_STATUS)
     end
 
-    def opened?
-      status == -1
+    def sent!
+      update_attributes(status: SENT_STATUS)
+    end
+    
+    def delivered!
+      update_attributes(status: DELIVERED_STATUS)
+    end
+    
+    def opened!
+      update_attributes(status: OPENED_STATUS)
     end
   end
 end

data/lib/notifiable/notifier_base.rb

@@ -2,9 +2,7 @@
 require 'logger'
 
 module Notifiable
-  class NotifierBase
-    OK_STATUS = 0
-    
+  class NotifierBase    
     attr_reader :env, :notification
 
     def self.notifier_attribute(*vars)
@@ -43,14 +41,14 @@ module Notifiable
 
     def flush; end
 
-    def processed(device_token, status = OK_STATUS, error_message = nil)
+    def processed(device_token, status = NotificationStatus::SENT_STATUS, error_code = nil, error_message = nil)
       if @notification.app.save_notification_statuses
-        receipts << { notification_id: notification.id, device_token_id: device_token.id, status: status, created_at: DateTime.now, error_message: error_message }
+        receipts << { notification_id: notification.id, device_token_id: device_token.id, status: status, created_at: DateTime.now, error_code: error_code, error_message: error_message }
         save_receipts if receipts.count >= Notifiable.notification_status_batch_size
       end
 
       @notification.sent_count += 1
-      @notification.gateway_accepted_count += 1 if status == 0
+      @notification.gateway_accepted_count += 1 if status == NotificationStatus::SENT_STATUS
       @notification.save if @notification.sent_count % Notifiable.notification_status_batch_size == 0
     end
 

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-core
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - matt@futureworkshops.com
@@ -202,6 +216,8 @@ files:
 - db/migrate/201806242135000_add_category_to_notifications.rb
 - db/migrate/201808242135000_add_error_message_to_notification_statuses.rb
 - db/migrate/201808272135000_add_status_to_notifications.rb
+- db/migrate/201809032135000_add_error_code_to_notification_statuses.rb
+- db/migrate/201809032235000_add_delivered_count_to_notifications.rb
 - lib/notifiable.rb
 - lib/notifiable/app.rb
 - lib/notifiable/device_token.rb