jera_push 1.2.4 → 2.1.0

data/lib/jera_push/models/message.rb

@@ -2,152 +2,12 @@ require 'enumerize'
 
 class JeraPush::Message < ActiveRecord::Base
   extend Enumerize
+
   self.table_name = "jera_push_messages"
 
   has_many :message_devices
   has_many :devices, through: :message_devices
 
-  serialize :broadcast_result
-
-  enumerize :kind, in: [:broadcast, :specific], predicate: true, default: :specific
-
-  def self.send_to(target, content: {})
-    return nil if target.blank? || content.blank?
-
-    push_message = JeraPush::Message.create content: content
-    push_message.devices << target
-
-    if push_message && target.is_a?(JeraPush::Device)
-      push_message.send_to_device device: target
-    else
-      push_message.send_to_devices devices: target
-    end
-    push_message
-  end
-
-  def self.send_broadcast(content:)
-    return nil if content.blank?
-
-    push_message = JeraPush::Message.create content: content, kind: :broadcast
-    @@client ||= JeraPush::Firebase::Client.instance
-
-    results = []
-    results << push_message.to_android_topic
-    results << push_message.to_ios_topic
-    results << push_message.to_chrome_topic
-
-    JeraPush::Firebase::ApiResult.broadcast_result(message: push_message, results: results)
-    push_message
-  end
-
-  def self.send_to_topic(topic: , content: {})
-    return nil if topic.blank? || content.blank?
-
-    push_message = JeraPush::Message.create content: content, topic: topic
-    client = JeraPush::Firebase::Client.instance
-    response = client.send_message_to_topic(message: { data: content }, topic: topic)
-    response.topic_result(message: push_message)
-    push_message
-  end
-
-  def self.format_hash(messages = [])
-    return false if messages.blank?
-    messages.collect do |obj|
-      hash = { obj[:key].to_sym => obj[:value] }
-      hash.delete_if { |key, value| key.blank? || value.blank? }
-    end.reduce(:merge)
-  end
-
-  def content=(content)
-    raise 'Invalid message format. Hash format expected' unless content.is_a? Hash
-
-    super(content.to_json)
-  end
-
-  def content
-    if super()
-      JSON.parse(super())
-    else
-      return {}
-    end
-  end
-
-  def send_to_devices(devices: [])
-    return nil if devices.empty?
-    platform_devices = devices.group_by { |device| device.platform }
-    client = JeraPush::Firebase::Client.instance
-
-    platform_devices.keys.each do |platform|
-      payload = self.send("body_#{platform.to_s}", self.content)
-      response = client.send_message(message: payload, devices: platform_devices[platform])
-      if response
-        response.result_to(message: self)
-      end
-    end
-  end
-
-  def send_to_device(device: nil)
-    return nil if device.nil?
-
-    payload = {}
-    if device.platform.ios?
-      payload = body_ios(self.content)
-    elsif device.platform.android?
-      payload = body_android(self.content)
-    elsif device.platform.chrome?
-      payload = body_chrome(self.content)
-    end
-    client = JeraPush::Firebase::Client.instance
-    response = client.send_message(message: payload, devices: [device])
-    if response
-      response.result_to(message: self)
-    end
-  end
-
-  def to_android_topic
-    @@client.send_message_to_topic(
-      message: body_android(content),
-      topic: JeraPush.topic_android
-    )
-  end
-
-  def to_ios_topic
-    @@client.send_message_to_topic(
-      message: body_ios(content),
-      topic: JeraPush.topic_ios
-    )
-  end
-
-  def to_chrome_topic
-    @@client.send_message_to_topic(
-      message: body_chrome(content),
-      topic: JeraPush.topic_chrome
-    )
-  end
-
-  private
-
-    def body_ios(content)
-      params = [:title, :body, :'content-available', :sound, :badge, :click_action, :body_loc_key, :body_loc_args, :title_loc_key, :title_loc_args]
-
-      content.symbolize_keys!
-      content[:sound] = 'default' unless content.has_key?(:sound)
-
-      return {
-        notification: content.select { |key, value| params.include?(key) },
-        data: content.reject { |key, value| params.include?(key) }
-      }
-    end
-
-    def body_android(content)
-      return {
-        data: content
-      }
-    end
+  enumerize :kind, in: [:specific, :everyone, :topic], predicate: true, default: :specific
 
-    def body_chrome(content)
-      return {
-        data: content
-      }
-    end
 end

data/lib/jera_push/models/message_device.rb

@@ -1,6 +1,7 @@
 require 'enumerize'
 class JeraPush::MessageDevice < ActiveRecord::Base
   extend Enumerize
+
   self.table_name = "jera_push_messages_devices"
 
   belongs_to :device

data/lib/jera_push/models/notification.rb

@@ -0,0 +1,25 @@
+module JeraPush
+  class Notification
+    attr_accessor :title
+    attr_accessor :body
+    attr_accessor :image
+
+    def initialize(
+      title: '',
+      body: '',
+      image: ''
+    )
+      self.title = title
+      self.body = body
+      self.image = image
+    end
+
+    def to_json
+      {
+        title: title,
+        body: body,
+        image: image
+      }
+    end
+  end
+end

data/lib/jera_push/models/push_body.rb

@@ -0,0 +1,90 @@
+module JeraPush
+  class PushBody
+    attr_accessor :device
+    attr_accessor :devices
+    attr_accessor :notification
+    attr_accessor :data
+    attr_accessor :android
+    attr_accessor :ios
+    attr_accessor :analytics_label
+    attr_accessor :validate_only
+
+    def initialize(
+      data: {},
+      device: nil,
+      devices: [],
+      validate_only: false,
+      analytics_label: '',
+      ios_config: AppleConfig.new,
+      title: '',
+      body: '',
+      image: '',
+      notification: nil,
+      android_config: AndroidConfig.new
+    )
+      self.data = data
+      self.device = device
+      self.devices = devices
+      self.validate_only = validate_only
+      self.analytics_label = analytics_label
+      self.ios = ios_config
+      self.notification = notification.nil? ? Notification.new(title: title, body: body, image: image) : notification
+      self.android = android_config
+    end
+
+    def to_json
+      base_body
+    end
+
+    private
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#resource:-message
+    def base_body
+      {
+        message: build_message_body,
+        validate_only: validate_only
+      }
+    end
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#resource:-message
+    def build_message_body
+      {
+        token: device.token,
+        notification: notification_body,
+        data: data_body,
+        apns: apns_body,
+        android: android_body,
+        fcm_options: fcm_body
+      }
+    end
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#Notification
+    def notification_body
+      notification.to_json
+    end
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#resource:-message
+    def data_body
+      data.merge(notification.to_json)
+    end
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#ApnsConfig
+    def apns_body
+      ios.analytics_label = analytics_label
+      ios.to_json
+    end
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#AndroidConfig
+    def android_body
+      android.analytics_label = analytics_label
+      android.to_json
+    end
+
+    # REF: https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?hl=pt-br#FcmOptions
+    def fcm_body
+      {
+        analytics_label: analytics_label
+      }
+    end
+  end
+end

data/lib/jera_push/services/base_service.rb

@@ -0,0 +1,23 @@
+module JeraPush::Services
+  class BaseService
+    extend ActiveModel::Naming
+
+    def initialize(*)
+      @errors = ActiveModel::Errors.new(self)
+      @firebase = JeraPush::Firebase::Client.new
+    end
+
+    def read_attribute_for_validation(attr)
+      send(attr)
+    end
+  
+    def self.human_attribute_name(attr, options = {})
+      attr
+    end
+  
+    def self.lookup_ancestors
+      [self]
+    end
+
+  end
+end

data/lib/jera_push/services/send_message.rb

@@ -1,5 +1,5 @@
 module JeraPush
-  module Service
+  module Services
     class SendMessage
 
       def initialize(*args)
@@ -11,13 +11,21 @@ module JeraPush
       def call
         return false unless valid?
 
-        message_content = JeraPush::Message.format_hash @message
+        message_content = format_hash(@message)
         case @type
         when :broadcast
-          JeraPush::Message.send_broadcast(content: message_content)
+          # Topicos não estão funcionando.
+          # JeraPush::Message.send_broadcast(content: message_content)
         when :specific
           target_devices = JeraPush::Device.where(id: @devices.uniq.map(&:to_i))
-          JeraPush::Message.send_to(target_devices, content: message_content)
+          push = JeraPush::PushBody.new(
+            title: message_content[:title],
+            body: message_content[:body],
+            data: message_content,
+            devices: target_devices
+          )
+          result = JeraPush::Services::SendToDevicesService.new(push: push).call
+          result
         end
       end
 
@@ -26,6 +34,14 @@ module JeraPush
         @type.to_sym == :broadcast ? valid : valid && @devices.present?
       end
 
+      def format_hash(messages = [])
+        return false if messages.blank?
+        messages.collect do |obj|
+          hash = { obj[:key].to_sym => obj[:value] }
+          hash.delete_if { |key, value| key.blank? || value.blank? }
+        end.reduce(:merge)
+      end
+
     end
   end
 end

data/lib/jera_push/services/send_push_service.rb

@@ -0,0 +1,42 @@
+module JeraPush::Services
+  class SendPushService < JeraPush::Services::BaseService
+    def initialize(push:, message:, message_device:)
+      super
+      @push = push
+      @message = message
+      @message_device = message_device
+    end
+
+    def call
+      return @errors if @errors.present?
+
+      send_push
+
+      @message
+    end
+
+    private
+
+    def send_push
+      @response = @firebase.send_to_device(push: @push)
+      save_success
+    rescue Google::Apis::AuthorizationError => e
+      message = JSON.parse(e.body)
+      save_error(message)
+    rescue Google::Apis::ClientError => e
+      response = JSON.parse(e.body, symbolize_names: true)
+      error_code = response[:error][:details][0][:errorCode]
+      save_error(response)
+    end
+
+    def save_success
+      @message_device.update(status: :success)
+      @message.update(success_count: @message.success_count + 1)
+    end
+
+    def save_error(error)
+      @message_device.update(status: :error, error_message: error.to_json)
+      @message.update(failure_count: @message.failure_count + 1)
+    end
+  end
+end

data/lib/jera_push/services/send_to_device_service.rb

@@ -0,0 +1,42 @@
+module JeraPush::Services
+  class SendToDeviceService < JeraPush::Services::BaseService
+    def initialize(push:)
+      super
+      @push = push
+      @device = @push.device
+    end
+
+    def call
+      validate_device
+
+      return @errors if @errors.present?
+
+      create_message
+      add_devices_to_message
+      send_push
+
+      @message
+    end
+
+    private
+
+    def validate_device
+      @errors.add(:base, message: I18n.t('jera_push.services.errors.not_found.device')) if @device.blank?
+    end
+
+    def create_message
+      @message = JeraPush::Message.create(title: @push.notification.title, body: @push.notification.body, data: @push.data)
+    end
+
+    def add_devices_to_message
+      @message_device = @message.message_devices.create(device: @device)
+    end
+
+    def send_push
+      JeraPush::Services::SendPushService.new(push: @push,
+        message: @message,
+        message_device: @message_device
+      ).call
+    end
+  end
+end

data/lib/jera_push/services/send_to_devices_service.rb

@@ -0,0 +1,45 @@
+module JeraPush::Services
+  class SendToDevicesService < JeraPush::Services::BaseService
+    def initialize(push:)
+      super
+      @push = push
+      @device = @push.devices
+    end
+
+    def call
+      validate_device
+
+      return @errors if @errors.present?
+
+      create_message
+      send_push_to_devices
+
+      @message
+    end
+
+    private
+
+    def validate_device
+      @errors.add(:base, message: I18n.t('jera_push.services.errors.not_found.device')) if @devices.empty?
+    end
+
+    def create_message
+      @message = JeraPush::Message.create(title: @push.notification.title, body: @push.notification.body, data: @push.data)
+    end
+
+    def send_push_to_devices
+      @devices.each do |device|
+        message_device = @message.message_devices.create(device: device)
+        @push.device = device
+        send_push(device, message_device)
+      end
+    end
+
+    def send_push
+      JeraPush::Services::SendPushService.new(push: @push,
+        message: @message,
+        message_device: @message_device
+      ).call
+    end
+  end
+end

data/lib/jera_push/services/send_to_everyone_service.rb

@@ -0,0 +1,40 @@
+module JeraPush::Services
+  class SendToEveryoneService < JeraPush::Services::BaseService
+    def initialize(title:, body:)
+      super
+      @title = title
+      @body = body
+    end
+
+    def call
+      create_message
+      send_android
+      send_ios
+      update_message
+
+      @message
+    end
+
+    private
+
+    def create_message
+      @message = JeraPush::Message.create(title: @title, body: @body, kind: :everyone)
+    end
+
+    def send_android
+      @response_android = @firebase.send_message_to_topic(message: @message, topic: JeraPush.send('topic_android'))
+    end
+
+    def send_ios
+      @response_ios = @firebase.send_message_to_topic(message: @message, topic: JeraPush.send('topic_ios'))
+    end
+
+    def update_message
+      @message.update(
+        success_count: @response_android["success"] + @response_ios["success"],
+        failure_count: @response_android["failure"] + @response_ios["failure"]
+      )
+    end
+
+  end
+end

data/lib/jera_push/services/send_to_topic_service.rb

@@ -0,0 +1,37 @@
+module JeraPush::Services
+  class SendToTopicService < JeraPush::Services::BaseService
+    def initialize(title:, body:, topic:)
+      super
+      @title = title
+      @body = body
+      @topic = topic
+    end
+
+    def call
+      create_message
+      send_topic
+      update_message
+
+      @message
+    end
+
+    private
+
+    def create_message
+      @message = JeraPush::Message.create(title: @title, body: @body, kind: :topic)
+    end
+
+    def send_topic
+      @response = @firebase.send_message_to_topic(message: @message, topic: @topic)
+    end
+
+    def update_message
+      @message.update(
+        multicast_id: @response["multicast_id"],
+        success_count: @response["success"],
+        failure_count: @response["failure"]
+      )
+    end
+
+  end
+end

data/lib/jera_push/services/topic_service.rb

@@ -0,0 +1,18 @@
+module JeraPush::Services
+  class TopicService < JeraPush::Services::BaseService
+    DEFAULT_TOPIC = 'general'
+
+    def initialize(*)
+      super
+    end
+
+    def subscribe(device:, topic: DEFAULT_TOPIC)
+      @firebase.add_device_to_topic(device: device, topic: topic)
+    end
+
+    def unsubscribe(device:, topic: DEFAULT_TOPIC)
+      @firebase.remove_device_from_topic(devices: [device], topic: topic)
+    end
+
+  end
+end

data/lib/jera_push/version.rb

@@ -1,3 +1,3 @@
 module JeraPush
-  VERSION = "1.2.4"
+  VERSION = "2.1.0"
 end

data/lib/jera_push.rb

@@ -5,31 +5,52 @@ require 'kaminari'
 require 'jera_push/engine'
 require 'jera_push/firebase/client'
 require 'jera_push/firebase/api_result'
+require 'googleauth'
+require 'google/apis/fcm_v1'
+
+require 'jera_push/services/base_service'
 require 'jera_push/services/send_message'
+require 'jera_push/services/send_push_service'
+require 'jera_push/services/send_to_device_service'
+require 'jera_push/services/send_to_devices_service'
+require 'jera_push/services/send_to_everyone_service'
+require 'jera_push/services/send_to_topic_service'
+require 'jera_push/services/topic_service'
 
 module JeraPush
-
   autoload :Device, 'jera_push/models/device.rb'
   autoload :Message, 'jera_push/models/message.rb'
   autoload :MessageDevice, 'jera_push/models/message_device.rb'
   autoload :DeviceFilter, 'jera_push/models/device_filter.rb'
+  autoload :PushBody, 'jera_push/models/push_body.rb'
+  autoload :AppleConfig, 'jera_push/models/apple_config.rb'
+  autoload :AndroidConfig, 'jera_push/models/android_config.rb'
+  autoload :Notification, 'jera_push/models/notification.rb'
 
   mattr_accessor :firebase_api_key
   @@firebase_api_key = nil
 
+  mattr_accessor :project_name
+  @@project_name = nil
+
+  mattr_accessor :project_id
+  @@project_id = nil
+
   mattr_accessor :default_topic
   @@default_topic = 'jera_push_development'
 
   mattr_accessor :resources_name
   @@resources_name = nil
 
+  mattr_accessor :credentials_path
+  @@credentials_path = nil
+
   mattr_accessor :resource_attributes
   @@resource_attributes = []
 
   mattr_accessor :admin_login
   @@resources_name =  { username: 'jera_push', password: 'JeraPushAdmin' }
 
-
   def self.setup
     yield self
   end
@@ -42,7 +63,4 @@ module JeraPush
     @@ios_topic ||= "#{@@default_topic}_ios"
   end
 
-  def self.topic_chrome
-    @@chrome_topic ||= "#{@@default_topic}_chrome"
-  end
 end