cats_core 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f63ca1ecd41f30f836b69ec7fe22516bfaa33bf2a11ee4ec5e6caed08e03e9bf
-  data.tar.gz: fa4684f9b135314f7a4ffd8a9f193d999075b01ee5dbdbd2468069bedac98453
+  metadata.gz: 45dbf26292f9ebc98fb50e4195e44773184d3f460c0d5aadb3c45afcffffa752
+  data.tar.gz: 7cab2b31272ec765c42d8cd8724f1d8f3daff1481fd82057edf08ed40ce389b3
 SHA512:
-  metadata.gz: 6155d6dde44af9a51af349e9528c1e139cfadb333f90324095a608f95aee7d2c5335f35965839d4f273083530d966188736047d9a9c451fa842cf028eb6cfbda
-  data.tar.gz: e015635c7c13d4418ecaec59c7d103831f362896732a6386369a22e12c7aa71fdf8e0654a149e8b7926491a6a771f0c5717e7a82e3666a6f9aa8abfb66e446a3
+  metadata.gz: 6017835a41ce450bb778aea397234083ac257ec74b1f995a5087811dfae0db693172468ceed14c11ef8433dd26eca298436256ff8fc876a7482e8ce2610d46bb
+  data.tar.gz: 87ff5af9c3533a23b57ede84a3547818b7f54e51cfb629dbd8f3c26c6de73900f974c2ecb0bc38c999b01bdd29a0b7260daf4ec03510407fae8511d85ae372d3

data/app/controllers/cats/core/notifications_controller.rb

@@ -1,14 +1,36 @@
 module Cats
   module Core
     class NotificationsController < ApplicationController
+      before_action :set_notification, only: %i[mark_as_read mark_as_unread]
       def index
-        data = { success: true, data: current_user.notifications.newest_first }
-        render json: data
+        data = Notification.messages(current_user.notifications.newest_first)
+        render json: { success: true, data: data }
+      end
+
+      def read
+        data = Notification.messages(current_user.notifications.read.newest_first)
+        render json: { success: true, data: data }
       end
 
       def unread
-        data = { success: true, data: current_user.notifications.unread.newest_first }
-        render json: data
+        data = Notification.messages(current_user.notifications.unread.newest_first)
+        render json: { success: true, data: data }
+      end
+
+      def mark_as_read
+        @notification.mark_as_read!
+        render json: { success: true, data: @notification.message }
+      end
+
+      def mark_as_unread
+        @notification.mark_as_unread!
+        render json: { success: true, data: @notification.message }
+      end
+
+      private
+
+      def set_notification
+        @notification = Notification.find(params[:id])
       end
     end
   end

data/app/controllers/cats/core/roles_controller.rb

@@ -0,0 +1,18 @@
+module Cats
+  module Core
+    class RolesController < ApplicationController
+      before_action :set_role, only: [:users]
+
+      def users
+        data = ActiveModelSerializers::SerializableResource.new(@role.users)
+        render json: { success: true, data: data }
+      end
+
+      private
+
+      def set_role
+        @role = Role.find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/cats/core/users_controller.rb

@@ -0,0 +1,23 @@
+module Cats
+  module Core
+    class UsersController < ApplicationController
+      before_action :set_user, only: %i[stores warehouses]
+
+      def stores
+        data = ActiveModelSerializers::SerializableResource.new(@user.stores)
+        render json: { success: true, data: data }
+      end
+
+      def warehouses
+        data = ActiveModelSerializers::SerializableResource.new(@user.warehouses)
+        render json: { success: true, data: data }
+      end
+
+      private
+
+      def set_user
+        @user = User.find(params[:id])
+      end
+    end
+  end
+end

data/app/models/cats/core/notification.rb

@@ -6,7 +6,11 @@ module Cats
       belongs_to :recipient, polymorphic: true
 
       def message
-        to_notification.message
+        { id: id, read: !read_at.nil? }.merge(to_notification.message)
+      end
+
+      def self.messages(notifications)
+        notifications.map(&:message)
       end
     end
   end

data/app/models/cats/core/role.rb

@@ -2,6 +2,7 @@ module Cats
   module Core
     class Role < ApplicationRecord
       belongs_to :application_module
+      has_and_belongs_to_many :users, join_table: :cats_core_users_cats_core_roles
       has_many :role_menus
 
       validates :name, presence: true

data/app/models/cats/core/user.rb

@@ -11,6 +11,18 @@ module Cats
       validates :first_name, :last_name, :email, presence: true
       validates :password, length: { minimum: 6 }
       validates :email, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+
+      def warehouses
+        return unless details.key?('warehouses')
+
+        Cats::Core::Location.where(id: details['warehouses'], location_type: Cats::Core::Location::WAREHOUSE)
+      end
+
+      def stores
+        return unless details.key?('stores')
+
+        Cats::Core::Store.where(id: details['stores'])
+      end
     end
   end
 end

data/config/routes.rb

@@ -1,5 +1,22 @@
 Cats::Core::Engine.routes.draw do
   get '/notifications/unread', controller: :notifications, action: :unread
+  get '/notifications/read', controller: :notifications, action: :read
 
-  resources :notifications, only: [:index]
+  resources :notifications, only: [:index] do
+    member do
+      post 'mark_as_read', controller: :notifications, action: :mark_as_read
+      post 'mark_as_unread', controller: :notifications, action: :mark_as_unread
+    end
+  end
+  resources :roles do
+    member do
+      get 'users', controller: :roles, action: :users
+    end
+  end
+  resources :users do
+    member do
+      get 'stores', controller: :users, action: :stores
+      get 'warehouses', controller: :users, action: :warehouses
+    end
+  end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.7'.freeze
+    VERSION = '1.0.8'.freeze
   end
 end

data/lib/cats_core.rb

@@ -4,3 +4,4 @@ require 'ancestry'
 require 'rolify'
 require 'jwt'
 require 'noticed'
+require 'active_model_serializers'

data/spec/factories/cats/core/notifications.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :notification, class: 'Cats::Core::Notification' do
     recipient factory: :user
-    type { nil }
+    type { 'ExampleNotification' }
     params { {} }
     read_at { Date.today }
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: active_model_serializers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +218,8 @@ files:
 - Rakefile
 - app/controllers/cats/core/application_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
+- app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/users_controller.rb
 - app/jobs/cats/core/application_job.rb
 - app/models/cats/core/application_module.rb
 - app/models/cats/core/application_record.rb