cats_core 1.1.16 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5e9151667e330955db4a89a8bf0bdd3d00c297859866ed57aeb763cbcbc48d4
-  data.tar.gz: 903b632addec26d908e48b14b06773fc9757b247c50ea8598dd0932a0714ad8f
+  metadata.gz: a82354115851db50157d1387858c1b10b65c84fcbf4b78b80f7cbc51e308b6c1
+  data.tar.gz: 9810991a8731b4850e3950f1ba0245c49101b65adbb7f5ffc7ec8e7db6fb7cf4
 SHA512:
-  metadata.gz: aab3a1d980859f6660fa0dc49c8d13cf41beb586ea0a74599e2ff94a3ec7be22fe21c65b039c706b37bd79b8b9c0827abe723f59d978a10628e03ad7b26f5d9a
-  data.tar.gz: 6ddf1fbdccd9781098d4ac2f9d3bb42b89d2129bd620c194da91c6508302a19da84aafe3ed2036adee6df36259914cb7e3fa3773c7383cc63fd953436ade2497
+  metadata.gz: 75344722c714a1ab8d5b2c82ba808977f88aa141fe83e03520e92d4ccde316819932110693ac78d0523ce78e2f69417e9cb44e54b12045fc4f66870b6ccfa281
+  data.tar.gz: 855c87c77fa0c3517e72dc87930c959f86204ef52c46a800d53d67e2adcdd0bdd9a62251355a334707f9e0bd9f26910cde0fe895a75e69d0d7bd910fc345c77a

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

@@ -8,6 +8,29 @@ module Cats
         render json: { success: true, data: serialize(receipts) }
       end
 
+      def create
+        p = model_params
+        receipt = Cats::Core::Receipt.find_by(
+          dispatch_id: p[:dispatch_id],
+          commodity_status: p[:commodity_status]
+        )
+        if receipt
+          receipt.quantity += p[:quantity]
+          if receipt.save
+            render json: { success: true, data: serialize(receipt) }
+          else
+            render json: { success: false, error: receipt.errors.full_messages[0] }, status: :unprocessable_entity
+          end
+        else
+          obj = Cats::Core::Receipt.new(model_params)
+          if obj.save
+            render json: { success: true, data: serialize(obj) }, status: :created
+          else
+            render json: { success: false, error: obj.errors.full_messages[0] }, status: :unprocessable_entity
+          end
+        end
+      end
+
       def start_stacking
         receipt = Cats::Core::Receipt.find(params[:id])
         service = ReceiptService.new

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

@@ -1,6 +1,8 @@
 module Cats
   module Core
     class RolesController < ApplicationController
+      include Common
+
       before_action :set_role, only: [:users]
 
       def users
@@ -13,6 +15,10 @@ module Cats
       def set_role
         @role = Role.find_by(name: params[:name])
       end
+
+      def model_params
+        params.require(:payload).permit(:name, :application_module_id)
+      end
     end
   end
 end

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

@@ -1,7 +1,27 @@
 module Cats
   module Core
     class UsersController < ApplicationController
-      before_action :set_user, only: %i[stores warehouse hub]
+      include Common
+
+      before_action :set_user, only: %i[roles assign_role stores warehouse hub]
+
+      def index
+        users = Cats::Core::User.joins(:application_module)
+                                .where(cats_core_application_modules: { prefix: params[:prefix] })
+        render json: { success: true, data: serialize(users) }
+      end
+
+      def roles
+        data = ActiveModelSerializers::SerializableResource.new(@user.roles)
+        render json: { success: true, data: data }
+      end
+
+      def assign_role
+        role = Cats::Core::Role.find(params[:role_id])
+        @user.roles << role
+        data = ActiveModelSerializers::SerializableResource.new(@user)
+        render json: { success: true, data: data }
+      end
 
       def stores
         data = ActiveModelSerializers::SerializableResource.new(@user.stores)
@@ -21,7 +41,14 @@ module Cats
       private
 
       def set_user
-        @user = User.find(params[:id])
+        @user = Cats::Core::User.find(params[:id])
+      end
+
+      def model_params
+        params.require(:payload).permit(
+          :first_name, :last_name, :email, :phone_number, :active, :password, :password_confirmation, :details,
+          :application_module_id
+        )
       end
     end
   end

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

@@ -12,7 +12,7 @@ module Cats
       delegate(:name, to: :commodity_category, prefix: true)
       delegate(:abbreviation, to: :unit_of_measure, prefix: true)
 
-      before_save :set_commodity_category
+      before_validation :set_commodity_category
       after_create :update_donation
 
       def update_donation

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

@@ -0,0 +1,27 @@
+module Cats
+  module Core
+    class DispatchNotification < Noticed::Base
+      deliver_by :database
+
+      param :dispatch
+
+      def message
+        dispatch = params[:dispatch]
+        title = 'Dispatch Notification'
+        date = Date.today
+        body = <<~BODY
+          Commodity with the following details has been dispatched to you:
+              Dispatch Ref. = #{dispatch.reference_no}
+              Batch No. = #{dispatch.allocation_item.allocation.commodity.batch_no}
+              Commodity = #{dispatch.allocation_item.allocation.commodity.name}
+              Allocated Quantity = #{dispatch.allocation_item.quantity}
+              Quantity = #{dispatch.quantity}
+              Truck Plate No. = #{dispatch.plate_no}
+              Driver Name = #{dispatch.driver_name}
+              Driver Phone = #{dispatch.driver_phone}
+        BODY
+        { title: title, date: date, body: body }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,3 @@
+class RoleSerializer < ActiveModel::Serializer
+  attributes :id, :name, :application_module_id
+end

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

@@ -0,0 +1,3 @@
+class UserSerializer < ActiveModel::Serializer
+  attributes :id, :first_name, :last_name, :email, :phone_number, :active, :details, :application_module_id
+end

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

@@ -109,6 +109,7 @@ module Cats
         dispatch.save
         transactions = Cats::Core::DispatchTransaction.where(destination: dispatch)
         transactions.each(&:commit)
+        send_notification(dispatch)
         dispatch
       end
 
@@ -131,6 +132,25 @@ module Cats
 
         dispatch
       end
+
+      def send_notification(dispatch)
+        notification_rule = Cats::Core::NotificationRule.find_by(code: 'dispatch')
+        raise(StandardError, 'Notification rule not found for dispatch notification.') unless notification_rule
+
+        users = Cats::Core::User.joins(:roles).where(cats_core_roles: { name: notification_rule.roles })
+        location_id = dispatch.allocation_item.destination_id
+        recipients = users.map do |user|
+          details = user.details
+          if (details.key?('warehouse') && details['warehouse'] == location_id) ||
+             (details.key?('hub') && details['hub'] == location_id)
+            user
+          end
+        end.compact
+        return if recipients.empty?
+
+        notification = DispatchNotification.with(dispatch: dispatch)
+        notification.deliver(recipients)
+      end
     end
   end
 end

data/config/routes.rb

@@ -5,6 +5,12 @@ Cats::Core::Engine.routes.draw do
   get '/notifications/unread', controller: :notifications, action: :unread
   get '/notifications/read', controller: :notifications, action: :read
   
+  resources :application_modules, param: :prefix do
+    member do
+      get 'users', controller: :users, action: :index
+    end
+  end
+
   resources :menus, only: [:index]
   resources :notifications, only: [:index] do
     member do
@@ -12,6 +18,8 @@ Cats::Core::Engine.routes.draw do
       post 'mark_as_unread', controller: :notifications, action: :mark_as_unread
     end
   end
+
+  get '/roles/:id/', controller: :roles, action: :show
   resources :roles, param: :name do
     member do
       get 'users', controller: :roles, action: :users
@@ -19,9 +27,11 @@ Cats::Core::Engine.routes.draw do
   end
   resources :users do
     member do
+      get 'roles'
       get 'stores', controller: :users, action: :stores
       get 'warehouse', controller: :users, action: :warehouse
       get 'hub', controller: :users, action: :hub
+      post 'assign_role'
     end
   end
 

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.16'.freeze
+    VERSION = '1.1.20'.freeze
   end
 end

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

@@ -20,4 +20,9 @@ FactoryBot.define do
     location_type { Cats::Core::Location::WOREDA }
     parent
   end
+
+  factory :zone, parent: :location, class: 'Cats::Core::Location' do
+    location_type { Cats::Core::Location::ZONE }
+    parent
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.16
+  version: 1.1.20
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -286,6 +286,7 @@ files:
 - app/models/cats/core/transporter.rb
 - app/models/cats/core/unit_of_measure.rb
 - app/models/cats/core/user.rb
+- app/notifications/cats/core/dispatch_notification.rb
 - app/notifications/cats/core/simple_notification.rb
 - app/serializers/cats/core/commodity_category_serializer.rb
 - app/serializers/cats/core/commodity_serializer.rb
@@ -296,7 +297,9 @@ files:
 - app/serializers/cats/core/receipt_serializer.rb
 - app/serializers/cats/core/receipt_transaction_serializer.rb
 - app/serializers/cats/core/role_menu_serializer.rb
+- app/serializers/cats/core/role_serializer.rb
 - app/serializers/cats/core/unit_of_measure_serializer.rb
+- app/serializers/cats/core/user_serializer.rb
 - app/services/cats/core/dispatch_service.rb
 - app/services/cats/core/menu_service.rb
 - app/services/cats/core/notification_service.rb