cats_core 1.1.21 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106712bfb38bd512ae9d06d20301aa81a5a199bb6522728cddcf6c1d688fe444
-  data.tar.gz: 80cf7130c7cbbb47bcf4120c021e54aa2e9eb7bf5578260664339a6cbca18e78
+  metadata.gz: 3babdd4703726f7863d05d4b939af06ede31f1b6a0a5a715ad0f13286ea8343a
+  data.tar.gz: 44ed3f59a6099ba17094b8d81232c9e8cf72c6ac95118da99e1e8a23286bebf7
 SHA512:
-  metadata.gz: 1741bedb659f842852f836dd020c79f45d4ec901f8e076be97007c06fec9a69cb5793ac7612a46b08e9fd06b92b6892bebb2baa39cb0d49b1a48bffba9c93f48
-  data.tar.gz: 7fb859382f5faf676437e39cdb7f64c0201a47bb7b9409dd4d41a8ec5e30d13713415f21a04a2b8e2c7fd40c0315c800d1dd64d5277ea846ff279357486a9a4f
+  metadata.gz: 82195965fd9917d53ff286e1d2822302f87c9ecf836b292dc8d647eef5f307a9f84d692b4dd5ff4d6a16dc1c21e9c52109966c39d459052f918cd9ad73c6914b
+  data.tar.gz: f7c58b63d4e6f66b9ba3011a7066175052b5e6aa92c13339d5d975cf3567108c405e5bfb571bd527c8d12f3b24b6d8ba8924f67134c2f28d5941958a9ba2fb89

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

@@ -8,6 +8,27 @@ module Cats
         render json: { success: true, data: serialize(transactions) }
       end
 
+      def create
+        p = model_params
+
+        # Look for a transaction with the same destination as incoming
+        transaction = Cats::Core::ReceiptTransaction.find_by(
+          source_id: p[:source_id],
+          destination_id: p[:destination_id]
+        )
+        if transaction
+          transaction.quantity += p[:quantity]
+        else
+          transaction = Cats::Core::ReceiptTransaction.new(p)
+        end
+
+        if transaction.save
+          render json: { success: true, data: serialize(transaction) }, status: :created
+        else
+          render json: { success: false, error: transaction.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       private
 
       def model_params

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

@@ -5,6 +5,19 @@ module Cats
 
       before_action :set_role, only: [:users]
 
+      def index
+        roles = Cats::Core::Role.joins(:application_module)
+                                .where(cats_core_application_modules: { prefix: params[:prefix] })
+        render json: { success: true, data: serialize(roles) }
+      end
+
+      def unassigned_roles
+        user = Cats::Core::User.find(params[:id])
+        roles = Cats::Core::Role.where(application_module_id: user.application_module_id)
+        unassigned = roles - user.roles
+        render json: { success: true, data: serialize(unassigned) }
+      end
+
       def users
         data = ActiveModelSerializers::SerializableResource.new(@role.users)
         render json: { success: true, data: data }

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

@@ -3,7 +3,7 @@ module Cats
     class UsersController < ApplicationController
       include Common
 
-      before_action :set_user, only: %i[update roles assign_role stores warehouse hub]
+      before_action :set_user, only: %i[update roles assign_role revoke_role stores warehouse hub]
 
       def index
         users = Cats::Core::User.joins(:application_module)
@@ -49,7 +49,23 @@ module Cats
       def assign_role
         role = Cats::Core::Role.find(params[:role_id])
         @user.roles << role
-        data = ActiveModelSerializers::SerializableResource.new(@user)
+
+        case role.name
+        when 'warehouse_manager'
+          @user.add_detail(:warehouse, params[:warehouse_id])
+        when 'hub_manager'
+          @user.add_detail(:hub, params[:hub_id])
+        end
+
+        data = ActiveModelSerializers::SerializableResource.new(role)
+        render json: { success: true, data: data }
+      end
+
+      def revoke_role
+        role = Cats::Core::Role.find(params[:role_id])
+        @user.roles.delete(role)
+        @user.remove_detail(role.name) if %w[warehouse_manager hub_manager].include?(role.name)
+        data = ActiveModelSerializers::SerializableResource.new(role)
         render json: { success: true, data: data }
       end
 

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

@@ -18,6 +18,9 @@ module Cats
         return unless quantity.present? && source.present?
 
         total = self.class.where(source: source).sum(:quantity)
+
+        total -= quantity_was if id
+
         diff = source.quantity - total
         errors.add(:quantity, "total is higher than source quantity (Max = #{diff}).") if quantity > diff
       end

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

@@ -31,6 +31,16 @@ module Cats
         Cats::Core::Location.find_by(id: details['hub'], location_type: Cats::Core::Location::HUB)
       end
 
+      def add_detail(key, value)
+        details[key] = value
+        save!
+      end
+
+      def remove_detail(key)
+        details.delete(key)
+        save!
+      end
+
       def validate_phone_number
         return unless phone_number.present?
 

data/config/routes.rb

@@ -7,6 +7,7 @@ Cats::Core::Engine.routes.draw do
   
   resources :application_modules, param: :prefix do
     member do
+      get 'roles', controller: :roles, action: :index
       get 'users', controller: :users, action: :index
     end
   end
@@ -28,10 +29,12 @@ Cats::Core::Engine.routes.draw do
   resources :users do
     member do
       get 'roles'
+      get 'unassigned_roles', controller: :roles, action: :unassigned_roles
       get 'stores', controller: :users, action: :stores
       get 'warehouse', controller: :users, action: :warehouse
       get 'hub', controller: :users, action: :hub
       post 'assign_role'
+      post 'revoke_role'
     end
   end
 

data/db/migrate/20210715120018_create_cats_core_roles.rb

@@ -23,6 +23,6 @@ class CreateCatsCoreRoles < ActiveRecord::Migration[6.1]
     end
     
     add_index(:cats_core_roles, [ :name, :resource_type, :resource_id ])
-    add_index(:cats_core_users_cats_core_roles, [ :user_id, :role_id ])
+    add_index(:cats_core_users_cats_core_roles, [ :user_id, :role_id ], unique: true)
   end
 end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.1.21'.freeze
+    VERSION = '1.1.25'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.25
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers