cats_core 1.1.19 → 1.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ac17edba232672ae0f11dc2042dbb8c58f7a3bbe6f5f032e3407a23292b1db8
-  data.tar.gz: d35a4ea6ab6e34d1a3ea13b784056916a22dc60d9da2ab9e015d34863dd7173d
+  metadata.gz: 4af6924e969566f74cdb292747651afd308688bc78b8ae4a1f984c9899bc17c8
+  data.tar.gz: 78efc6656b32a0455345b69e35d11d0a599707b61da25c68177e77c1184c3598
 SHA512:
-  metadata.gz: c46e405c2735c8a73c814c71429c2bfeebf2a39f8130aa574e750f996006722fed3bc7a90508fab437359c9530f50578060b3c619b5cc2a029f617515df92529
-  data.tar.gz: c53c84bc2f39768f72eaeab44bcee50e70d621028a72bace55aa263a618b4eaf69249ca5969defad1060bbe5428bb1d60ae15926de4028eabed76a4b7a7d8ad8
+  metadata.gz: 48502a731da0f5ebf90a0497b86a8585a3af825b3905936e4701bb2ec991766028630be363c9ec6d79d585f3156753b77736e4fb53b14c9f78231b1242c69ba3
+  data.tar.gz: 306057c32ef4f4a6636aaf6321a5b80f682465de990cad4c10977928b6dde075b02923bdb4d14195e3bb4774d08843772cb7978cee6b4f1427480ae84c001cd0

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,13 +3,44 @@ module Cats
     class UsersController < ApplicationController
       include Common
 
-      before_action :set_user, only: %i[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.where(application_module_id: params[:id])
+        users = Cats::Core::User.joins(:application_module)
+                                .where(cats_core_application_modules: { prefix: params[:prefix] })
         render json: { success: true, data: serialize(users) }
       end
 
+      def create
+        prefix = model_params[:application_prefix]
+        application_module = Cats::Core::ApplicationModule.find_by(prefix: prefix)
+
+        obj = Cats::Core::User.new(model_params.except(:application_prefix))
+        obj.application_module = application_module
+        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
+
+      def update
+        if model_params[:application_prefix]
+          prefix = model_params[:application_prefix]
+          application_module = Cats::Core::ApplicationModule.find_by(prefix: prefix)
+          @user.assign_attributes(model_params.except(:application_prefix))
+          @user.application_module = application_module
+        else
+          @user.assign_attributes(model_params)
+        end
+
+        if @user.save
+          render json: { success: true, data: serialize(@user) }
+        else
+          render json: { success: false, error: @user.errors.full_messages[0] }, status: :unprocessable_entity
+        end
+      end
+
       def roles
         data = ActiveModelSerializers::SerializableResource.new(@user.roles)
         render json: { success: true, data: data }
@@ -18,7 +49,20 @@ module Cats
       def assign_role
         role = Cats::Core::Role.find(params[:role_id])
         @user.roles << role
-        data = ActiveModelSerializers::SerializableResource.new(@user)
+        if role.name == 'warehouse_manager'
+          @user.add_detail(:warehouse, params[:warehouse_id])
+        elsif role.name =='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)
+        data = ActiveModelSerializers::SerializableResource.new(role)
         render json: { success: true, data: data }
       end
 
@@ -46,7 +90,7 @@ module Cats
       def model_params
         params.require(:payload).permit(
           :first_name, :last_name, :email, :phone_number, :active, :password, :password_confirmation, :details,
-          :application_module_id
+          :application_prefix
         )
       end
     end

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

@@ -31,6 +31,11 @@ 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 validate_phone_number
         return unless phone_number.present?
 

data/config/routes.rb

@@ -5,7 +5,12 @@ Cats::Core::Engine.routes.draw do
   get '/notifications/unread', controller: :notifications, action: :unread
   get '/notifications/read', controller: :notifications, action: :read
   
-  get '/application_modules/:id/users', controller: :users, action: :index, as: :application_users
+  resources :application_modules, param: :prefix do
+    member do
+      get 'roles', controller: :roles, action: :index
+      get 'users', controller: :users, action: :index
+    end
+  end
 
   resources :menus, only: [:index]
   resources :notifications, only: [:index] do
@@ -24,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.19'.freeze
+    VERSION = '1.1.23'.freeze
   end
 end

metadata

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