cats_core 1.0.9 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90bb7ac6c5367ab8fd22ede292563557c104607222408c8ed5ed94a32b8a82e2
-  data.tar.gz: b4fb9a29a7a65ce4036b361102bde71f756247b0ff37762543fe94e8fc94a06c
+  metadata.gz: c166b58630fc770c2447694d5d57f59edd26ab7bee0caf07f762fc16d21f4069
+  data.tar.gz: 7cc6aead85c41426225eb4d306e92cf85ac7024b4690324a62985b7c6b163756
 SHA512:
-  metadata.gz: c8c6c949827ee51f1465507caa6301a49af21d47ed2acbf478cb20902733079d1fb630438a9dad3b04df4a1002d1bb9b1e07c5af6c299d250e7d4b11775e045e
-  data.tar.gz: abdb8edd5e5bc49d7b954bd37ad23c22081b8d68d4d71fb9def9af20e45bff3ee094e355bc95a17f6ce91676c6fa0832f3d2a9a8767d17e1fdd04f5e5c942a34
+  metadata.gz: 8a6c48372747e4c159c7fae9d51af746740fe7d556fc9b0cee36d9ba814ccd33aa25be298681729ad474b63c7c30881b79dcdb5da2a2da47d9962f6b3df325a2
+  data.tar.gz: 30805a86c89f24e1472a177c7cedf1c18a5ccbc18756bf316eca62138d63247a05ee42c18004b06a1ce898ac4343341045eff7f59921d16ea70a22ac2c33d4d9

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

@@ -1,6 +1,6 @@
 module Cats
   module Core
-    class ApplicationController < ActionController::Base
+    class ApplicationController < ActionController::API
       before_action :authenticate
 
       def current_user

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

@@ -0,0 +1,19 @@
+module Cats
+  module Core
+    class MenusController < ApplicationController
+      before_action :set_service
+
+      def index
+        menu = @service.fetch_menu(current_user)
+        data = ActiveModelSerializers::SerializableResource.new(menu, each_serializer: RoleMenuSerializer)
+        render json: { success: true, data: data }
+      end
+
+      private
+
+      def set_service
+        @service = MenuService.new
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Cats
       private
 
       def set_role
-        @role = Role.find(params[:id])
+        @role = Role.find_by(name: params[:name])
       end
     end
   end

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

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

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

@@ -14,6 +14,9 @@ module Cats
 
         errors.add(:base, 'Application module does not match for role and menu')
       end
+
+      delegate(:label, to: :menu, prefix: false)
+      delegate(:icon, to: :menu, prefix: false)
     end
   end
 end

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

@@ -2,10 +2,10 @@ module Cats
   module Core
     class Store < ApplicationRecord
       belongs_to :warehouse, class_name: 'Cats::Core::Location'
+      belongs_to :store_keeper, class_name: 'Cats::Core::User'
       has_many :stacks
-      has_many :receipt_plans, as: :receivable
 
-      validates :name, :store_keeper_name, :length, :width, :height, presence: true
+      validates :name, :length, :width, :height, presence: true
       validates :length, :width, :height, numericality: { greater_than: 0 }
       validates :gangway_length, :gangway_width, :gangway_corner_dist, presence: true, if: :has_gangway?
       validates :gangway_length,
@@ -20,6 +20,12 @@ module Cats
 
         errors.add(:warehouse, 'must be a valid warehouse') unless warehouse.location_type == Location::WAREHOUSE
       end
+
+      def store_keeper_name
+        "#{store_keeper.first_name} #{store_keeper.last_name}"
+      end
+
+      delegate(:phone_number, to: :store_keeper, prefix: true)
     end
   end
 end

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

@@ -8,9 +8,11 @@ module Cats
       has_and_belongs_to_many :roles, join_table: :cats_core_users_cats_core_roles
       has_many :notifications, as: :recipient
 
+      validates :password, length: { minimum: 6 }, if: proc { |u| u.password.present? }, on: :update
       validates :first_name, :last_name, :email, presence: true
-      validates :password, length: { minimum: 6 }
+      validates :password, presence: true, length: { minimum: 6 }, on: :create
       validates :email, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+      validate :validate_phone_number
 
       def warehouses
         return unless details.key?('warehouses')
@@ -23,6 +25,16 @@ module Cats
 
         Cats::Core::Store.where(id: details['stores'])
       end
+
+      def validate_phone_number
+        return unless phone_number.present?
+
+        return if phone_number.length == 10 && /0\d{9}/.match(phone_number)
+
+        return if phone_number.length == 12 && /251\d{9}/.match(phone_number)
+
+        errors.add(:phone_number, 'must be 10 or 12 digits and should match with local phone pattern')
+      end
     end
   end
 end

data/app/notifications/cats/core/simple_notification.rb

@@ -1,9 +1,20 @@
 # This is a simple notification class which delivers a
 # message via database delivery method. It requires a
-# +msg+ parameter to instantiate, which represents the
+# +body+ and +title+ parameter to instantiate, which represents the
 # text message to deliver.
-class SimpleNotification < Noticed::Base
-  deliver_by :database
+module Cats
+  module Core
+    class SimpleNotification < Noticed::Base
+      deliver_by :database
 
-  param :msg
+      param :body
+      param :title
+
+      def message
+        title = params[:title]
+        body = params[:body]
+        { title: title, body: body }
+      end
+    end
+  end
 end

data/app/serializers/cats/core/role_menu_serializer.rb

@@ -0,0 +1,11 @@
+module Cats
+  module Core
+    class RoleMenuSerializer < ActiveModel::Serializer
+      attributes :id, :label, :icon, :description, :menu_items
+
+      def menu_items
+        object.menu.menu_items
+      end
+    end
+  end
+end

data/app/services/cats/core/menu_service.rb

@@ -0,0 +1,9 @@
+module Cats
+  module Core
+    class MenuService
+      def fetch_menu(user)
+        user.roles.map(&:role_menus).flatten
+      end
+    end
+  end
+end

data/app/services/cats/core/notification_service.rb

@@ -16,22 +16,19 @@ module Cats
         }
       }.freeze
 
-      def initialize(code, params)
+      def initialize(rules, code, params)
+        @rules = rules
         @code = code
         @params = params
       end
 
-      def notification_rules
-        NOTIFICATION_RULES
-      end
-
       def create_notifier(rule)
         clazz = rule[:notification].constantize
         clazz.with(**@params)
       end
 
       def notify
-        rule = notification_rules[@code]
+        rule = @rules[@code]
         notifier = create_notifier(rule)
         app_code = rule[:application]
         roles = rule[:recipients]

data/config/routes.rb

@@ -2,14 +2,15 @@ Cats::Core::Engine.routes.draw do
   post '/login', controller: :access, action: :login
   get '/notifications/unread', controller: :notifications, action: :unread
   get '/notifications/read', controller: :notifications, action: :read
-
+  
+  resources :menus, 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
+  resources :roles, param: :name do
     member do
       get 'users', controller: :roles, action: :users
     end

data/db/migrate/20210715114910_create_cats_core_users.rb

@@ -7,6 +7,7 @@ class CreateCatsCoreUsers < ActiveRecord::Migration[6.1]
       t.boolean :active, null: false, default: true
       t.string :password_digest
       t.jsonb :details
+      t.string :phone_number
       t.references :application_module,
                    null: false,
                    index: { name: 'am_on_users_indx' },

data/db/migrate/20210717140855_create_cats_core_stores.rb

@@ -2,8 +2,6 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
   def change
     create_table :cats_core_stores do |t|
       t.string :name, null: false
-      t.string :store_keeper_name, null: false
-      t.string :store_keeper_phone
       t.float :length, null: false
       t.float :width, null: false
       t.float :height, null: false
@@ -16,7 +14,10 @@ class CreateCatsCoreStores < ActiveRecord::Migration[6.1]
                    null: false,
                    index: { name: 'warehouse_on_stores_indx' },
                    foreign_key: { to_table: :cats_core_locations }
-
+      t.references :store_keeper,
+                   null: false,
+                   index: { name: 'store_keeper_on_store_indx' },
+                   foreign_key: { to_table: :cats_core_users }
       t.timestamps
     end
   end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.9'.freeze
+    VERSION = '1.0.13'.freeze
   end
 end

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

@@ -1,8 +1,6 @@
 FactoryBot.define do
   factory :store, class: 'Cats::Core::Store' do
     name { FFaker::Name.name }
-    store_keeper_name { FFaker::Name.name }
-    store_keeper_phone { FFaker::Name.name }
     length { 50 }
     width { 40 }
     height { 10 }
@@ -12,5 +10,7 @@ FactoryBot.define do
     gangway_width { 4 }
     gangway_corner_dist { 18 }
     warehouse
+    store_keeper factory: :user
+    store_keeper_id { create(:user).id }
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     email { FFaker::Internet.email }
+    phone_number { '0913345678' }
     active { true }
     password { FFaker::Internet.password }
     details { {} }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.13
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -218,6 +218,7 @@ files:
 - Rakefile
 - app/controllers/cats/core/access_controller.rb
 - app/controllers/cats/core/application_controller.rb
+- app/controllers/cats/core/menus_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
 - app/controllers/cats/core/roles_controller.rb
 - app/controllers/cats/core/users_controller.rb
@@ -245,6 +246,8 @@ files:
 - app/models/cats/core/way_bill.rb
 - app/models/cats/core/way_bill_item.rb
 - app/notifications/cats/core/simple_notification.rb
+- app/serializers/cats/core/role_menu_serializer.rb
+- app/services/cats/core/menu_service.rb
 - app/services/cats/core/notification_service.rb
 - app/services/cats/core/token_auth_service.rb
 - config/routes.rb