meta_notification 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb5e04a46b4432cbeea71d776128cd0fd984665
-  data.tar.gz: bb152517635df8dd99395bc2eaa13d7f9dff0096
+  metadata.gz: 947202e0d0156a9405175275a20bca47515634d1
+  data.tar.gz: 6b7bb55641e4cc1cff355e62912a87f11ca7a317
 SHA512:
-  metadata.gz: af1c48d7e73c22ac1a257eb873572ad42e3d4d17cb5e7abf19b16f978d567287426ab6cb7f5e6dd4993527168c526a63d4394a31e36d7db7fc0f376f587bc2e9
-  data.tar.gz: e5648b1fec230466146184af05262ee0608b8e292f0cf5f29aceffb85c3f143e0f5c1a0724e1055d873fadf007e63270f5ba9af8ce5032967a2821fb7340fa08
+  metadata.gz: 8df0666e6e64102e5a4bebd689a424ef069f536f7ccdb89aee09e2fd0dfa06d807a3aef87d9cb364e189942a5b4521545456c305049e161857114443d3c81d75
+  data.tar.gz: 4bd5015840bfd5eae39e8a34b5868485c9bef2f5a7b9018632a68d1fff1f6ef96b1ab06b25b68c65b54c7630f7b5a15b778bbd529e60ceb3eebc7b58bd50e1f0

data/app/controllers/meta_notification/api/v1/notifications_controller.rb

@@ -11,6 +11,7 @@ module MetaNotification
         .joins('JOIN mn_notification_types on mn_notification_types.id = mn_notification_templates.notification_type_id')
         .where(resource_type: params[:resource_type], resource_id: params[:resource_id])
         .includes(:users)
+        .page(params[:current_page]) if params[:current_page].present?
         @created_by_users = User.where(id: @notifications.map(&:created_by_id).uniq)
 
       end

data/app/controllers/meta_notification/api/v1/user_notifications_controller.rb

@@ -8,7 +8,7 @@ module MetaNotification
         before_action :init_authorizer
 
         before_action :set_user_notification, only: [:update, :show]
-        before_action :set_notification_type_ids_for_filter, only: [:notifications, :mark_all_read, :mark_all_read]
+        before_action :set_notification_type_ids_for_filter, only: [:notifications, :mark_all_read, :mark_all_read, :unread_count]
 
         def show
         end
@@ -53,7 +53,7 @@ module MetaNotification
 
         def unread_count
           mobile_or_in_app = (params[:platform] == 'mobile') ? 'mobile'.to_sym : 'in_app'.to_sym
-          unread_count = MetaNotification::Notification.select(:id, 'mn_notifications.*', 'mn_user_notifications.id as mn_user_notification_id', 'mn_user_notifications.user_id', mobile_or_in_app, 'mn_user_notifications.is_read', 'mn_notification_types.name', 'mn_notification_types.icon', 'mn_notification_types.label', 'mn_notifications.created_by_id', 'mn_notifications.created_at')
+          unread_count = MetaNotification::Notification.select(:id, 'mn_notifications.*', 'mn_user_notifications.id as mn_user_notification_id', 'mn_user_notifications.user_id', mobile_or_in_app, 'mn_user_notifications.is_read', 'mn_notification_types.name')
                                                          .joins('JOIN mn_user_notifications on mn_user_notifications.notification_id = mn_notifications.id')
                                                          .joins('JOIN mn_notification_types on mn_notification_types.id = mn_user_notifications.notification_type_id')
                                                          .where('mn_user_notifications.user_id' => params[:user_id], 'mn_user_notifications.notification_type_id' => @notification_type_in_ids, 'mn_user_notifications.is_read' => false)

data/app/views/meta_notification/api/v1/notifications/resource_notification.rabl

@@ -2,8 +2,8 @@ collection @notifications
 attributes :id, :in_app, :mobile, :label, :icon, :created_at
 node :template_name, &:name
 node :created_by do |notification|
-  user = @created_by_users.map { |user| user if notification.created_by_id == user.id }.first
-  { id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name }
+  user = @created_by_users.map { |user| user if notification.created_by_id == user.id }.compact.first
+  { id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name } if user.present?
 end
 child :users do
   attributes :id, :email, :first_name, :last_name

data/config/routes.rb

@@ -15,6 +15,7 @@ MetaNotification::Engine.routes.draw do
                   collection do
                     get 'notifications'
                     get 'mark_all_read'
+                    get 'unread_count'
                   end
                 end
             end

data/lib/meta_notification/version.rb

@@ -1,3 +1,3 @@
 module MetaNotification
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meta_notification
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Shobhit Dixit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-02 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails