cats_core 1.0.5 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6ff0706b8636cf94fea0714f73ed8fead005d08a2647f5365f43ac7ba6a53b6
-  data.tar.gz: ab055e9fc942f99eed1e28ab7a755e0c5f54098a854705cf46c6c9bc880d0cff
+  metadata.gz: 90bb7ac6c5367ab8fd22ede292563557c104607222408c8ed5ed94a32b8a82e2
+  data.tar.gz: b4fb9a29a7a65ce4036b361102bde71f756247b0ff37762543fe94e8fc94a06c
 SHA512:
-  metadata.gz: 82950facfa04e42a6aa4e934bfe9f950c158db65dbf55e61c6aff04ad2c9041354e2560a61222817864c5cd8288649282e099f362e7014f7abf65d3ba628a441
-  data.tar.gz: 8e951eebc249a57a1868dbc9155c1818bfc791ef6a0c987aaccf203c34e2d9fab7a3598b138c70de6e6c5f910cd8d2970e838c9719198f9ccd1d6380b9989143
+  metadata.gz: c8c6c949827ee51f1465507caa6301a49af21d47ed2acbf478cb20902733079d1fb630438a9dad3b04df4a1002d1bb9b1e07c5af6c299d250e7d4b11775e045e
+  data.tar.gz: abdb8edd5e5bc49d7b954bd37ad23c22081b8d68d4d71fb9def9af20e45bff3ee094e355bc95a17f6ce91676c6fa0832f3d2a9a8767d17e1fdd04f5e5c942a34

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

@@ -0,0 +1,37 @@
+module Cats
+  module Core
+    class AccessController < ApplicationController
+      skip_before_action :authenticate, only: [:login]
+
+      def login
+        user = Cats::Core::User.find_by(email: auth_params[:email])
+        if user
+          if user.authenticate(auth_params[:password])
+            roles = user.roles.map(&:name)
+
+            unless roles.count.positive?
+              render json: { error: 'User has no roles.' }, status: :unprocessable_entity
+              return
+            end
+
+            payload = {
+              id: user.id, email: user.email, first_name: user.first_name, last_name: user.last_name, roles: roles
+            }
+            jwt = Cats::Core::TokenAuthService.issue(payload)
+            render json: { token: jwt, user: payload }
+          else
+            rener 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/cats/core/notifications_controller.rb

@@ -1,14 +1,36 @@
 module Cats
   module Core
     class NotificationsController < ApplicationController
+      before_action :set_notification, only: %i[mark_as_read mark_as_unread]
       def index
-        data = { success: true, data: current_user.notifications.newest_first }
-        render json: data
+        data = Notification.messages(current_user.notifications.newest_first)
+        render json: { success: true, data: data }
+      end
+
+      def read
+        data = Notification.messages(current_user.notifications.read.newest_first)
+        render json: { success: true, data: data }
       end
 
       def unread
-        data = { success: true, data: current_user.notifications.unread.newest_first }
-        render json: data
+        data = Notification.messages(current_user.notifications.unread.newest_first)
+        render json: { success: true, data: data }
+      end
+
+      def mark_as_read
+        @notification.mark_as_read!
+        render json: { success: true, data: @notification.message }
+      end
+
+      def mark_as_unread
+        @notification.mark_as_unread!
+        render json: { success: true, data: @notification.message }
+      end
+
+      private
+
+      def set_notification
+        @notification = Notification.find(params[:id])
       end
     end
   end

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

@@ -0,0 +1,18 @@
+module Cats
+  module Core
+    class RolesController < ApplicationController
+      before_action :set_role, only: [:users]
+
+      def users
+        data = ActiveModelSerializers::SerializableResource.new(@role.users)
+        render json: { success: true, data: data }
+      end
+
+      private
+
+      def set_role
+        @role = Role.find(params[:id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Cats
+  module Core
+    class UsersController < ApplicationController
+      before_action :set_user, only: %i[stores warehouses]
+
+      def stores
+        data = ActiveModelSerializers::SerializableResource.new(@user.stores)
+        render json: { success: true, data: data }
+      end
+
+      def warehouses
+        data = ActiveModelSerializers::SerializableResource.new(@user.warehouses)
+        render json: { success: true, data: data }
+      end
+
+      private
+
+      def set_user
+        @user = User.find(params[:id])
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Cats
       belongs_to :unit_of_measure
 
       validates :quantity, presence: true, numericality: { greater_than: 0 }
+      validates :volume_per_metric_ton, numericality: { greater_than: 0, allow_nil: true }
     end
   end
 end

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

@@ -4,6 +4,14 @@ module Cats
       include Noticed::Model
 
       belongs_to :recipient, polymorphic: true
+
+      def message
+        { id: id, read: !read_at.nil? }.merge(to_notification.message)
+      end
+
+      def self.messages(notifications)
+        notifications.map(&:message)
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Cats
   module Core
     class Role < ApplicationRecord
       belongs_to :application_module
+      has_and_belongs_to_many :users, join_table: :cats_core_users_cats_core_roles
       has_many :role_menus
 
       validates :name, presence: true

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

@@ -37,7 +37,18 @@ module Cats
       end
 
       def stacking_rules
-        rule ||= Cats::Core::StackingRule.first
+        rule = Cats::Core::StackingRule.first
+
+        # If no rule is defined, then define a default rule
+        rule ||= Cats::Core::StackingRule.new(
+          space_between_stack: 1,
+          distance_from_gangway: 2,
+          distance_from_ceiling: 1,
+          maximum_height: 5,
+          maximum_length: 5,
+          maximum_width: 5,
+          distance_from_wall: 1
+        )
         rule
       end
 

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

@@ -11,6 +11,18 @@ module Cats
       validates :first_name, :last_name, :email, presence: true
       validates :password, length: { minimum: 6 }
       validates :email, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+
+      def warehouses
+        return unless details.key?('warehouses')
+
+        Cats::Core::Location.where(id: details['warehouses'], location_type: Cats::Core::Location::WAREHOUSE)
+      end
+
+      def stores
+        return unless details.key?('stores')
+
+        Cats::Core::Store.where(id: details['stores'])
+      end
     end
   end
 end

data/app/services/cats/core/notification_service.rb

@@ -25,16 +25,20 @@ module Cats
         NOTIFICATION_RULES
       end
 
+      def create_notifier(rule)
+        clazz = rule[:notification].constantize
+        clazz.with(**@params)
+      end
+
       def notify
-        rules = notification_rules
-        clazz = rules[@code][:notification].constantize
-        app_code = rules[@code][:application]
-        roles = rules[@code][:recipients]
+        rule = notification_rules[@code]
+        notifier = create_notifier(rule)
+        app_code = rule[:application]
+        roles = rule[:recipients]
 
-        notification = clazz.with(**@params)
         users = Cats::Core::User.joins(:application_module)
                                 .where(application_module: { prefix: app_code }).with_all_roles(*roles)
-        notification.deliver(users)
+        notifier.deliver(users)
       end
     end
   end

data/config/routes.rb

@@ -1,5 +1,23 @@
 Cats::Core::Engine.routes.draw do
+  post '/login', controller: :access, action: :login
   get '/notifications/unread', controller: :notifications, action: :unread
+  get '/notifications/read', controller: :notifications, action: :read
 
-  resources :notifications, only: [:index]
+  resources :notifications, only: [:index] do
+    member do
+      post 'mark_as_read', controller: :notifications, action: :mark_as_read
+      post 'mark_as_unread', controller: :notifications, action: :mark_as_unread
+    end
+  end
+  resources :roles do
+    member do
+      get 'users', controller: :roles, action: :users
+    end
+  end
+  resources :users do
+    member do
+      get 'stores', controller: :users, action: :stores
+      get 'warehouses', controller: :users, action: :warehouses
+    end
+  end
 end

data/db/migrate/20210717033223_create_cats_core_commodities.rb

@@ -21,6 +21,7 @@ class CreateCatsCoreCommodities < ActiveRecord::Migration[6.1]
       t.string :description
       t.boolean :hazardous, null: false, default: false
       t.date :best_use_before
+      t.float :volume_per_metric_ton
 
       t.timestamps
     end

data/lib/cats/core/version.rb

@@ -1,5 +1,5 @@
 module Cats
   module Core
-    VERSION = '1.0.5'.freeze
+    VERSION = '1.0.9'.freeze
   end
 end

data/lib/cats_core.rb

@@ -4,3 +4,4 @@ require 'ancestry'
 require 'rolify'
 require 'jwt'
 require 'noticed'
+require 'active_model_serializers'

data/spec/factories/cats/core/commodities.rb

@@ -8,5 +8,6 @@ FactoryBot.define do
     quantity { 100 }
     hazardous { false }
     best_use_before { Date.today + 2.month }
+    volume_per_metric_ton { 10 }
   end
 end

data/spec/factories/cats/core/notifications.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :notification, class: 'Cats::Core::Notification' do
     recipient factory: :user
-    type { nil }
+    type { 'ExampleNotification' }
     params { {} }
     read_at { Date.today }
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cats_core
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.9
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: active_model_serializers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
@@ -202,8 +216,11 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/cats/core/access_controller.rb
 - app/controllers/cats/core/application_controller.rb
 - app/controllers/cats/core/notifications_controller.rb
+- app/controllers/cats/core/roles_controller.rb
+- app/controllers/cats/core/users_controller.rb
 - app/jobs/cats/core/application_job.rb
 - app/models/cats/core/application_module.rb
 - app/models/cats/core/application_record.rb