ecom_core 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d027263661773bc60c6bdc7d7c9670677e71cac3d2712d9bc27fffffcc642da5
-  data.tar.gz: 9a7ae3f3ef1cb7e44d433d88af9590d46769744618b8caef78fcbda76543ad72
+  metadata.gz: f45781b38a120c782949fe3133566f994e81fe5723ce77f4e535b61b7d2ef3ad
+  data.tar.gz: 66f86d09d7b065950b202b2c5ffce8943da5168d8f96cc80b1763a312afe2aa9
 SHA512:
-  metadata.gz: fb5a60fba164169fe9cc1cd0d30b3e50461b5d7bb22c421d7a2c751de77f474dad4e17be02564e5b2aefc237aaa65d70597d2287984a29802fc1cf05bfdf3547
-  data.tar.gz: 53a72197660a7ad6ffb5f0b84976f90515f61b4cb840fc80f8498325e7956f96f36ae7a500d712f4d07787d43adae2681f699f05dda502f2335f69b24562f8d5
+  metadata.gz: bc70b7327aa2af6160cdb074430fa6ddc744c80df67a264c40cb20a577f7d248733c07d32894b714a28f9dd1c6f49ffabbdb25beae6174da7f9e0c662bdf8686
+  data.tar.gz: 4cc556044dc408bfec968a8e9f04c44c9a373fb02ed0a6af49ad2206d84fabc985cbeb404fae691740dbf1d209e5e6680c14f5499fd3c1494a9327b65fcd64cf

data/app/controllers/ecom/core/access_controller.rb

@@ -0,0 +1,33 @@
+module Ecom
+  module Core
+    class AccessController < ApplicationController
+      skip_before_action :authenticate, only: [:login]
+
+      def login
+        user = User.find_by(email: auth_params[:email])
+        if user
+          if user.authenticate(auth_params[:password])
+            roles = user.user_roles.each_with_object([]) do |role, result|
+              result << role.name
+            end
+
+            payload = { id: user.id, email: user.email, name: user.full_name, roles: roles }
+            jwt = TokenAuthService.issue(payload)
+            render json: { token: jwt, user: payload, error: nil }
+          else
+            render json: { error: 'Invalid username or password' }, status: 400
+          end
+        else
+          render json: { error: 'User does not exist' }, status: 400
+        end
+      end
+
+      private
+
+      def auth_params
+        params.require(:auth).permit(:email, :password)
+      end
+
+    end
+  end
+end

data/app/controllers/ecom/core/application_controller.rb

@@ -1,7 +1,46 @@
 module Ecom
   module Core
     class ApplicationController < ActionController::API
-      # protect_from_forgery with: :exception
+      before_action :authenticate
+
+      def logged_in?
+        !current_user.nil?
+      end
+
+      def current_user
+        return unless auth_present?
+
+        user = User.find(auth['id'])
+        @current_user ||= user if user
+      end
+
+      private
+
+      def authenticate
+        render json: { error: 'Unauthorized' }, status: 401 unless logged_in?
+      end
+
+      def token
+        return nil if request.env['HTTP_AUTHORIZATION'].nil?
+
+        request.env['HTTP_AUTHORIZATION'].scan(/Bearer (.*)$/).flatten.last
+      end
+
+      def auth
+        TokenAuthService.decode(token)
+      end
+
+      def auth_present?
+        !token.nil?
+      end
+
+      def generate_error_message(entity)
+        value = entity.errors.details.first[1][0][:value]
+        field = entity.errors.keys[0]
+        message = entity.errors.values[0][0]
+
+        entity.errors.full_message(field, "'#{value}' #{message}")
+      end
     end
   end
 end

data/app/controllers/ecom/core/application_modules_controller.rb

@@ -0,0 +1,33 @@
+module Ecom
+  module Core
+    class ApplicationModulesController < ApplicationController
+      def index
+        render json: ApplicationModuleSerializer.new(ApplicationModule.all)
+      end
+
+      def create
+        application_module = ApplicationModule.new(application_module_params)
+        if application_module.save
+          render json: ApplicationModuleSerializer.new(application_module), status: :created
+        else
+          render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        application_module = ApplicationModule.find(params[:id])
+        if application_module.update(application_module_params)
+          render json: ApplicationModuleSerializer.new(application_module)
+        else
+          render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def application_module_params
+        params.require(:application_module).permit(:code, :name)
+      end
+    end
+  end
+end

data/app/controllers/ecom/core/menus_controller.rb

@@ -0,0 +1,26 @@
+module Ecom
+  module Core
+    class MenusController < ApplicationController
+      def index
+        user = current_user
+        roles = user.user_roles
+        app_module = roles[0].application_module
+        menus = []
+        roles.each do |role|
+          menu_list = role.menus.where(parent: nil, application_module: app_module)
+          menu_list.each do |menu|
+            children = []
+            menu.children.order(:label).each do |child|
+              if role.menus.include? child
+                children << { label: child.label, icon: child.icon, route: child.route }
+              end
+            end
+            menus << { label: menu.label, icon: menu.icon, children: children }
+          end
+        end
+
+        render json: menus
+      end
+    end
+  end
+end

data/app/controllers/ecom/core/user_roles_controller.rb

@@ -0,0 +1,40 @@
+module Ecom
+  module Core
+    class UserRolesController < ApplicationController
+      before_action :set_user_role, only: [:update]
+
+      def index
+        render json: UserRoleSerializer.new(UserRole.all)
+      end
+
+      def create
+        user_role = UserRole.new(user_role_params)
+
+        if user_role.save
+          render json: UserRoleSerializer.new(user_role), status: :created
+        else
+          render json: { success: false, errors: user_role.errors }, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        if @user_role.update(user_role_params)
+          render json: UserRoleSerializer.new(@user_role)
+        else
+          render json: { success: false, errors: @user_role.errors }, status: :unprocessable_entity
+        end
+      end
+
+
+      private
+
+      def set_user_role
+        @user_role = UserRole.find(params[:id])
+      end
+
+      def user_role_params
+        params.require(:user_role).permit(:name, :application_module_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Ecom
+  module Core
+    class UsersController < ApplicationController
+      before_action :set_user, only: [:update]
+
+      def index
+        render json: UserSerializer.new(User.all)
+      end
+
+      def active
+        render json: UserSerializer.new(User.active)
+      end
+
+      def create
+        user = User.new(user_params)
+        if user.save
+          render json: UserSerializer.new(user), status: :created
+        else
+          render json: { success: false, errors: user.errors }, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        if @user.update(user_params)
+          render json: UserSerializer.new(@user)
+        else
+          render json: { success: false, errors: @user.errors }, status: :unprocessable_entity
+        end
+      end
+
+
+      private
+
+      def set_user
+        @user = User.find(params[:id])
+      end
+
+      def user_params
+        params.require(:user).permit(:first_name, :last_name, :email, :password, :active)
+      end
+    end
+  end
+end

data/app/models/ecom/core/application_module.rb

@@ -1,7 +1,7 @@
 module Ecom
   module Core
     class ApplicationModule < ApplicationRecord
-      validates :code, :name, uniqueness: true
+      validates :code, :name, presence: true, uniqueness: true
     end
   end
 end

data/app/models/ecom/core/custom_payment_detail.rb

@@ -0,0 +1,10 @@
+module Ecom
+  module Core
+    class CustomPaymentDetail < ApplicationRecord
+      belongs_to :payment, class_name: 'Ecom::Core::Payment'
+
+      validates :name, :hours, :ot_hours, :base_salary, :overtime, :gross_salary, :tax, :pension, :net_salary, :net_pay,
+                :advance, :wage, presence: true
+    end
+  end
+end

data/app/models/ecom/core/menu.rb

@@ -3,6 +3,7 @@ module Ecom
     class Menu < ApplicationRecord
       belongs_to :parent, class_name: 'Ecom::Core::Menu', optional: true
       belongs_to :application_module
+      has_many :children, class_name: 'Ecom::Core::Menu', foreign_key: 'parent_id'
 
       validates :label, :route, presence: true
     end

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

@@ -8,7 +8,9 @@ module Ecom
       VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i.freeze
       validates :first_name, :last_name, :active, presence: true
       validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
-      validates :password, length: { minimum: 6 }
+      validates :password, presence: true, length: { minimum: 6 }, confirmation: true, if: :password
+
+      scope :active, -> { where(active: true) }
 
       def full_name
         "#{first_name} #{last_name}"

data/app/serializers/ecom/core/application_module_serializer.rb

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class ApplicationModuleSerializer
+      include FastJsonapi::ObjectSerializer
+
+      attributes :code, :name
+    end
+  end
+end

data/app/serializers/ecom/core/user_role_serializer.rb

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class UserRoleSerializer
+      include FastJsonapi::ObjectSerializer
+
+      attributes :name
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class UserSerializer
+      include FastJsonapi::ObjectSerializer
+
+      attributes :first_name, :last_name, :email, :active
+    end
+  end
+end

data/app/services/ecom/core/token_auth_service.rb

@@ -0,0 +1,21 @@
+require 'jwt'
+
+module Ecom
+  module Core
+    class TokenAuthService
+      AUTH_SECRET = '31a70abfaa57e5e77a3fc9f27aeaaf59b9a9f5355b5e16c842ee172035a8ed40bf82c1c971ecc176e4f0b4c9e6141db07fd4a5af3f7db9265e719fbe340b105a'
+
+      def self.issue(payload)
+        JWT.encode(payload, auth_secret, 'HS256')
+      end
+
+      def self.decode(token)
+        JWT.decode(token, auth_secret, true, algorithm: 'HS256').first
+      end
+
+      def self.auth_secret
+        AUTH_SECRET
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -1,5 +1,15 @@
 Ecom::Core::Engine.routes.draw do
+  post '/login', controller: :access, action: :login
+
+  resources :application_modules, only: %i[index create update]
+  resources :user_roles, only: %i[index create update]
+  resources :menus, only: %i[index]
+  resources :users, only: %i[index create update]
+  get '/users/active', controller: :users, action: :active
+
+
   resources :crew_types
   resources :equipment_types
   resources :material_types
+  resources :menus, only: %i[index]
 end

data/db/migrate/20200307112519_create_ecom_core_custom_payment_details.rb

@@ -0,0 +1,24 @@
+class CreateEcomCoreCustomPaymentDetails < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_custom_payment_details do |t|
+      t.string :name, null: false
+      t.float :hours, null: false
+      t.float :ot_hours, null: false, default: 0
+      t.float :base_salary, null: false
+      t.float :overtime, null: false
+      t.float :gross_salary, null: false
+      t.float :tax, null: false, default: 0
+      t.float :pension, null: false, default: 0
+      t.float :net_salary, null: false
+      t.float :net_pay, null: false
+      t.float :advance, null: false
+      t.float :wage, null: false
+      t.string :qualification
+      t.references :payment, null: false, index: { name: 'cpd_on_payment_indx' }
+
+      t.timestamps
+    end
+
+    add_foreign_key :ecom_core_custom_payment_details, :ecom_core_payments, column: :payment_id
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.21'.freeze
+    VERSION = '1.0.22'.freeze
   end
 end

data/spec/factories/ecom/core/custom_payment_details.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :custom_payment_detail, class: 'Ecom::Core::CustomPaymentDetail' do
+    name { FFaker::Name.name }
+    hours { 1.5 }
+    ot_hours { 1.5 }
+    base_salary { 1.5 }
+    overtime { 1.5 }
+    gross_salary { 100 }
+    tax { 15 }
+    pension { 5 }
+    net_salary { 80 }
+    net_pay { 80 }
+    advance { 0 }
+    wage { 1.5 }
+    qualification { FFaker::Name.name }
+    association :payment
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: fast_jsonapi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: fast_jsonapi
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -191,16 +205,22 @@ files:
 - Rakefile
 - app/controllers/concerns/ecom/core/lookupable.rb
 - app/controllers/concerns/ecom/core/resource_typeable.rb
+- app/controllers/ecom/core/access_controller.rb
 - app/controllers/ecom/core/application_controller.rb
+- app/controllers/ecom/core/application_modules_controller.rb
 - app/controllers/ecom/core/crew_types_controller.rb
 - app/controllers/ecom/core/equipment_types_controller.rb
 - app/controllers/ecom/core/material_types_controller.rb
+- app/controllers/ecom/core/menus_controller.rb
+- app/controllers/ecom/core/user_roles_controller.rb
+- app/controllers/ecom/core/users_controller.rb
 - app/models/ecom/core/application_module.rb
 - app/models/ecom/core/application_record.rb
 - app/models/ecom/core/crew.rb
 - app/models/ecom/core/crew_time.rb
 - app/models/ecom/core/crew_type.rb
 - app/models/ecom/core/currency.rb
+- app/models/ecom/core/custom_payment_detail.rb
 - app/models/ecom/core/equipment_type.rb
 - app/models/ecom/core/lookup.rb
 - app/models/ecom/core/material_type.rb
@@ -223,8 +243,12 @@ files:
 - app/models/ecom/core/work_component_template.rb
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
+- app/serializers/ecom/core/application_module_serializer.rb
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
+- app/serializers/ecom/core/user_role_serializer.rb
+- app/serializers/ecom/core/user_serializer.rb
+- app/services/ecom/core/token_auth_service.rb
 - config/database.ci.yml
 - config/routes.rb
 - db/migrate/20190101112620_create_ecom_core_lookups.rb
@@ -256,6 +280,7 @@ files:
 - db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb
 - db/migrate/20200210095535_add_advance_column_to_payment_details.rb
 - db/migrate/20200221123207_add_employee_id_to_crew.rb
+- db/migrate/20200307112519_create_ecom_core_custom_payment_details.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -266,6 +291,7 @@ files:
 - spec/factories/ecom/core/crew_types.rb
 - spec/factories/ecom/core/crews.rb
 - spec/factories/ecom/core/currencies.rb
+- spec/factories/ecom/core/custom_payment_details.rb
 - spec/factories/ecom/core/equipment_types.rb
 - spec/factories/ecom/core/lookups.rb
 - spec/factories/ecom/core/material_types.rb