cats_core 1.1.18 → 1.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eced600b25c5d8bf5d8a0b55ba7a5d116879c5ee3f346f9e5128144066c14d8c
-  data.tar.gz: e88b60c25cd88cba88f0cce8ca83fe4acf6873b99b757c791a9806f3b22569c4
+  metadata.gz: f7535241fdd71214b07a61f4bde93042bf22673e3cddf8819686da1a7ac2b277
+  data.tar.gz: 5b7b01689834652de56c72f5bf836cf2b8e1b476d432beb72f691c634b38ce8f
 SHA512:
-  metadata.gz: fb400975341e0ee1361e41f9cf93fdd1473af06f0bed0f06d75d36b0622766556110b3a3f75ab8b283776ff2c23a3263b5d493dd0035b27b965d2c31141eca78
-  data.tar.gz: edc3f5744ff0f9b4dde1f0b8d07649927b720540004fc891e357bcba30c9561963e4f3ece3238707496f23eb1fdf0d141fad44adbcf5c4ede25a59129c3e8717
+  metadata.gz: 12fb00d72b5c265e1ea938fed3ec613ead395a7f34cdc78e0bf814159167eafa04d4343f1a02b3b8ffbcd840fcbb8524dcdb0bae29804a832cb0345ae61304e4
+  data.tar.gz: 9460758729591b77bc7108fe3f891f23ac4fed319c3c78a47dd9bb11a9fc349059cadb17ae6b511e2aa36ffc241c2a077042b6e8bfead949f12156dc199bb9dc

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

@@ -1,8 +1,23 @@
 module Cats
   module Core
     class RolesController < ApplicationController
+      include Common
+
       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 }
@@ -13,6 +28,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,64 @@
 module Cats
   module Core
     class UsersController < ApplicationController
-      before_action :set_user, only: %i[stores warehouse hub]
+      include Common
+
+      before_action :set_user, only: %i[update roles assign_role revoke_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 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 }
+      end
+
+      def assign_role
+        role = Cats::Core::Role.find(params[:role_id])
+        @user.roles << role
+        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
 
       def stores
         data = ActiveModelSerializers::SerializableResource.new(@user.stores)
@@ -21,7 +78,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_prefix
+        )
       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/config/routes.rb

@@ -5,6 +5,13 @@ 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 'roles', controller: :roles, action: :index
+      get 'users', controller: :users, action: :index
+    end
+  end
+
   resources :menus, only: [:index]
   resources :notifications, only: [:index] do
     member do
@@ -12,6 +19,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 +28,13 @@ Cats::Core::Engine.routes.draw do
   end
   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.18'.freeze
+    VERSION = '1.1.22'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.1.18
+  version: 1.1.22
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-02 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -297,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