cats_core 1.1.21 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 106712bfb38bd512ae9d06d20301aa81a5a199bb6522728cddcf6c1d688fe444
-  data.tar.gz: 80cf7130c7cbbb47bcf4120c021e54aa2e9eb7bf5578260664339a6cbca18e78
+  metadata.gz: f7535241fdd71214b07a61f4bde93042bf22673e3cddf8819686da1a7ac2b277
+  data.tar.gz: 5b7b01689834652de56c72f5bf836cf2b8e1b476d432beb72f691c634b38ce8f
 SHA512:
-  metadata.gz: 1741bedb659f842852f836dd020c79f45d4ec901f8e076be97007c06fec9a69cb5793ac7612a46b08e9fd06b92b6892bebb2baa39cb0d49b1a48bffba9c93f48
-  data.tar.gz: 7fb859382f5faf676437e39cdb7f64c0201a47bb7b9409dd4d41a8ec5e30d13713415f21a04a2b8e2c7fd40c0315c800d1dd64d5277ea846ff279357486a9a4f
+  metadata.gz: 12fb00d72b5c265e1ea938fed3ec613ead395a7f34cdc78e0bf814159167eafa04d4343f1a02b3b8ffbcd840fcbb8524dcdb0bae29804a832cb0345ae61304e4
+  data.tar.gz: 9460758729591b77bc7108fe3f891f23ac4fed319c3c78a47dd9bb11a9fc349059cadb17ae6b511e2aa36ffc241c2a077042b6e8bfead949f12156dc199bb9dc

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,14 @@ module Cats
       def assign_role
         role = Cats::Core::Role.find(params[:role_id])
         @user.roles << role
-        data = ActiveModelSerializers::SerializableResource.new(@user)
+        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
 

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.22'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.21
+  version: 1.1.22
 platform: ruby
 authors:
 - Henock L.