comee_core 0.2.52 → 0.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d65a7b04edc641f78ca618e99b2012c6af5bad03f540ebf3e9792f8ba9e4f8
-  data.tar.gz: a29faf7e98063e8cdf085edda635e59b5e93656ea65f88c82da658cbba79f9d4
+  metadata.gz: e3a703914e5326d261f0c943c3b75d53ff8c4b87f1b25cddb5ea874206ffc04d
+  data.tar.gz: 15b4815aca29b0d972da7dc05b56bca36853397d1b9f418a36e6b5b1f47f3318
 SHA512:
-  metadata.gz: cd1e0cd56613288784e43ea0fbf439ed27164035413d0147466b683e8d7d4be92242b2bf77388317df78e94ece7d34a0865f760399885c1478c5b50225c7d7ed
-  data.tar.gz: e6724f1710e3c5cf6197b89f5aa31c44039ab9b50a50a0568ef8fc13dcba5a22c66b9fb167f6e6475290f89b6f625cc17a1b70e98717a6a6d7ef9bdc0ce0ae8b
+  metadata.gz: 8f0819b6d18e43ed9a5c3935ad4ff0ea4ca2c98188240b21c678b53903a27610cf6613dff8499b0c2cfbd878c57c08f85baf189763f6bfcc756257291cc9e191
+  data.tar.gz: f69e7f88ac237fa4788f0e161647b9046eeba570f22a451baf054348d326c410e54fa3d8e1125c5cf7bdf2fb52766c996b1a1199691e812ed5489fce5e70877c

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

@@ -6,12 +6,17 @@ module Comee
       def login
         user = User.find_by(email: auth_params[:email])
         if user
+          unless user.application_roles?(current_application)
+            render(json: {error: "User does not have access to this application."}, status: 400) and return
+          end
+
+          roles = user.application_roles(current_application).map(&:code)
           if user.authenticate(auth_params[:password])
             payload = {
               id: user.id,
               name: user.name,
               email: user.email,
-              user_type: user.user_type
+              roles: roles
             }
             jwt = TokenService.issue(payload)
             render json: {token: jwt, user: payload}

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

@@ -13,8 +13,15 @@ module Comee
           result[:page] = params[:page].to_i
           result[:total] = total
         end
-        result[:data] = options.key?(:fields) ? serialize(data, include: options[:fields]) : serialize(data)
-
+        result[:data] = if options.key?(:fields) && options.key?(:serializer)
+                          serialize(data, {include: options[:fields], serializer: options[:serializer]})
+                        elsif options.key?(:fields) && options.key?(:each_serializer)
+                          serialize(data, {include: options[:fields], each_serializer: options[:each_serializer]})
+                        elsif options.key?(:fields)
+                          serialize(data, {include: options[:fields]})
+                        else
+                          serialize(data)
+                        end
         render json: result
       end
 
@@ -29,6 +36,20 @@ module Comee
         @current_user ||= user
       end
 
+      def application_code
+        code = Rails.application.config.application_code
+        raise(StandardError, "Code is not set for the current application.") unless code
+
+        code
+      end
+
+      def current_application
+        app_code = application_code
+        return ApplicationModule.find_by(code: app_code) if app_code
+
+        nil
+      end
+
       def authenticate
         render json: {error: "Unauthorized"}, status: 401 if current_user.nil?
       end

data/app/controllers/comee/core/notifications_controller.rb

@@ -28,11 +28,28 @@ module Comee
         render json: {success: true, data: @notification.message}
       end
 
+      def notify
+        NotificationMailer.with(
+          user: current_user,
+          recipients: notify_params[:recipients],
+          subject: notify_params[:subject],
+          email_body: notify_params[:body],
+          files: notify_params[:files]
+        ).notify.deliver_now
+        render json: {success: true}
+      rescue StandardError => e
+        render_error(e)
+      end
+
       private
 
       def set_notification
         @notification = Notification.find(params[:id])
       end
+
+      def notify_params
+        params.require(:payload).permit(:subject, :body, recipients: [], files: {filename: :file})
+      end
     end
   end
 end

data/app/controllers/comee/core/sales_order_items_controller.rb

@@ -15,6 +15,18 @@ module Comee
         end
       end
 
+      def shipment_details
+        details = SalesOrderItem.includes(shipment_items: :item_statuses, purchase_order_item: :purchase_order)
+                                .find(params[:id])
+        render_content(
+          details,
+          {
+            fields: ["shipment_items.item_statuses", "purchase_order_item.purchase_order"],
+            serializer: SalesOrderItemDetailSerializer
+          }
+        )
+      end
+
       def suggest_values
         service = CustomerOrderService.new
         result = service.suggest_values(params[:id], suggest_params[:unit_id])

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

@@ -6,7 +6,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:name, :email, :active, :password, :password_confirmation, :user_type)
+        params.require(:payload).permit(:name, :email, :active, :password, :password_confirmation)
       end
     end
   end

data/app/mailers/comee/core/notification_mailer.rb

@@ -3,15 +3,17 @@ module Comee
     class NotificationMailer < ApplicationMailer
       def notify
         user = params[:user]
+        files = params[:files]
+        files&.each { |k, v| attachments[k] = v }
 
         mail(
           from: email_address_with_name(user.email, user.name),
           to: params[:recipients],
           subject: params[:subject],
-          body: params[:email_body],
-          content_type: "text/html",
           delivery_method_options: user.delivery_options
-        )
+        ) do |format|
+          format.html { render(html: params[:email_body].html_safe) }
+        end
       end
     end
   end

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

@@ -0,0 +1,8 @@
+module Comee
+  module Core
+    class ApplicationModule < ApplicationRecord
+      validates :code, :name, presence: true
+      validates :code, uniqueness: true
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Comee
+  module Core
+    class Role < ApplicationRecord
+      belongs_to :application_module
+
+      validates :code, :name, presence: true
+      validates :code, uniqueness: true
+    end
+  end
+end

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

@@ -1,13 +1,14 @@
 module Comee
   module Core
     class User < ApplicationRecord
-      enum :user_type, {supplier: 0, admin: 1, client: 2, clerk: 3, order_manager: 4}
       has_one :email_setting
 
       has_secure_password
       has_many :notifications, as: :recipient, dependent: :destroy
+      has_many :user_application_roles
+      has_many :roles, through: :user_application_roles
 
-      validates :name, :email, :user_type, presence: true
+      validates :name, :email, presence: true
       validates :email, uniqueness: true
 
       def delivery_options
@@ -23,6 +24,18 @@ module Comee
           read_timeout: setting.read_timeout
         }
       end
+
+      def application_roles?(application)
+        roles.references(:user_application_roles)
+             .where(comee_core_user_application_roles: {application_module_id: application.id})
+             .count
+             .positive?
+      end
+
+      def application_roles(application)
+        roles.references(:user_application_roles)
+             .where(comee_core_user_application_roles: {application_module_id: application.id})
+      end
     end
   end
 end

data/app/models/comee/core/user_application_role.rb

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class UserApplicationRole < ApplicationRecord
+      belongs_to :user
+      belongs_to :application_module
+      belongs_to :role
+    end
+  end
+end

data/app/serializers/comee/core/purchase_order_item_serializer.rb

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class PurchaseOrderItemSerializer < ActiveModel::Serializer
+      attributes :id, :quantity, :confirmed_quantity, :price
+
+      belongs_to :purchase_order
+    end
+  end
+end

data/app/serializers/comee/core/sales_order_item_detail_serializer.rb

@@ -0,0 +1,10 @@
+module Comee
+  module Core
+    class SalesOrderItemDetailSerializer < ActiveModel::Serializer
+      attributes :id, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled
+
+      has_many :shipment_items
+      belongs_to :purchase_order_item
+    end
+  end
+end

data/app/serializers/comee/core/shipment_item_serializer.rb

@@ -4,6 +4,7 @@ module Comee
       attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no, :consignee,
                  :order_number
       belongs_to :sales_order_item
+      has_many :item_statuses
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class UserSerializer < ActiveModel::Serializer
-      attributes :id, :name, :email, :user_type
+      attributes :id, :name, :email, :active
     end
   end
 end

data/config/routes.rb

@@ -108,6 +108,7 @@ Comee::Core::Engine.routes.draw do
   end
   resources :sales_order_items, except: [:index] do
     member do
+      get "shipment_details"
       post "suggest", controller: :sales_order_items, action: :suggest_values
       post "cancel"
       post "activate"

data/db/migrate/20230411123525_create_comee_core_application_modules.rb

@@ -0,0 +1,10 @@
+class CreateComeeCoreApplicationModules < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_application_modules do |t|
+      t.string :code
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230411132211_create_comee_core_roles.rb

@@ -0,0 +1,14 @@
+class CreateComeeCoreRoles < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_roles do |t|
+      t.string :code
+      t.string :name
+      t.references :application_module,
+                   null: false,
+                   index: {name: "am_on_ccr_indx"},
+                   foreign_key: {to_table: :comee_core_application_modules}
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/{20230728014330_create_comee_core_users.rb → 20230428014330_create_comee_core_users.rb}

@@ -5,7 +5,6 @@ class CreateComeeCoreUsers < ActiveRecord::Migration[7.0]
       t.string :email, null: false
       t.boolean :active, null: false, default: true
       t.string :password_digest
-      t.integer :user_type, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/20230428140341_create_comee_core_user_application_roles.rb

@@ -0,0 +1,20 @@
+class CreateComeeCoreUserApplicationRoles < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_user_application_roles do |t|
+      t.references :user,
+                   index: {name: "user_on_ccuar_indx"},
+                   null: false,
+                   foreign_key: {to_table: :comee_core_users}
+      t.references :application_module,
+                   index: {name: "am_on_ccuar_indx"},
+                   null: false,
+                   foreign_key: {to_table: :comee_core_application_modules}
+      t.references :role,
+                   null: false,
+                   index: {name: "role_on_ccuar_indx"},
+                   foreign_key: {to_table: :comee_core_roles}
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.52".freeze
+    VERSION = "0.2.54".freeze
   end
 end

data/spec/factories/comee/core/application_modules.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :application_module, class: "Comee::Core::ApplicationModule" do
+    code { Faker::Alphanumeric.alpha(number: 10) }
+    name { Faker::Name.name }
+  end
+end

data/spec/factories/comee/core/roles.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :role, class: "Comee::Core::Role" do
+    code { Faker::Alphanumeric.alpha(number: 10) }
+    name { Faker::Name.name }
+    application_module
+  end
+end

data/spec/factories/comee/core/user_application_roles.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :user_application_role, class: "Comee::Core::UserApplicationRole" do
+    user
+    application_module
+    role
+  end
+end

data/spec/factories/comee/core/users.rb

@@ -4,6 +4,5 @@ FactoryBot.define do
     email { Faker::Internet.email }
     active { true }
     password { Faker::Internet.password }
-    user_type { Comee::Core::User.user_types[:supplier] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.52
+  version: 0.2.54
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-10 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -300,6 +300,7 @@ files:
 - app/mailers/comee/core/supplier_mailer.rb
 - app/models/comee/core/additional_item.rb
 - app/models/comee/core/agent.rb
+- app/models/comee/core/application_module.rb
 - app/models/comee/core/application_record.rb
 - app/models/comee/core/back_order.rb
 - app/models/comee/core/back_order_item.rb
@@ -340,6 +341,7 @@ files:
 - app/models/comee/core/purchase_requisition_item.rb
 - app/models/comee/core/quotation_request.rb
 - app/models/comee/core/quotation_request_item.rb
+- app/models/comee/core/role.rb
 - app/models/comee/core/sales_order.rb
 - app/models/comee/core/sales_order_item.rb
 - app/models/comee/core/shipment_instruction.rb
@@ -353,6 +355,7 @@ files:
 - app/models/comee/core/unit.rb
 - app/models/comee/core/unit_conversion.rb
 - app/models/comee/core/user.rb
+- app/models/comee/core/user_application_role.rb
 - app/notifications/comee/core/back_order_notification.rb
 - app/serializers/comee/core/agent_serializer.rb
 - app/serializers/comee/core/client_price_serializer.rb
@@ -371,8 +374,10 @@ files:
 - app/serializers/comee/core/product_lookup_serializer.rb
 - app/serializers/comee/core/product_serializer.rb
 - app/serializers/comee/core/product_type_serializer.rb
+- app/serializers/comee/core/purchase_order_item_serializer.rb
 - app/serializers/comee/core/quotation_request_item_serializer.rb
 - app/serializers/comee/core/quotation_request_serializer.rb
+- app/serializers/comee/core/sales_order_item_detail_serializer.rb
 - app/serializers/comee/core/sales_order_item_serializer.rb
 - app/serializers/comee/core/sales_order_serializer.rb
 - app/serializers/comee/core/shipment_item_serializer.rb
@@ -394,11 +399,14 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - config/spring.rb
+- db/migrate/20230411123525_create_comee_core_application_modules.rb
+- db/migrate/20230411132211_create_comee_core_roles.rb
+- db/migrate/20230428014330_create_comee_core_users.rb
+- db/migrate/20230428140341_create_comee_core_user_application_roles.rb
 - db/migrate/20230727091518_create_comee_core_fulfillment_centers.rb
 - db/migrate/20230727153013_create_comee_core_units.rb
 - db/migrate/20230728011037_create_comee_core_currencies.rb
 - db/migrate/20230728014322_create_comee_core_products.rb
-- db/migrate/20230728014330_create_comee_core_users.rb
 - db/migrate/20230728122618_create_comee_core_suppliers.rb
 - db/migrate/20230728123039_create_comee_core_clients.rb
 - db/migrate/20230728123458_create_comee_core_agents.rb
@@ -455,6 +463,7 @@ files:
 - lib/tasks/comee_core_tasks.rake
 - spec/factories/comee/core/additional_items.rb
 - spec/factories/comee/core/agents.rb
+- spec/factories/comee/core/application_modules.rb
 - spec/factories/comee/core/back_order_items.rb
 - spec/factories/comee/core/back_orders.rb
 - spec/factories/comee/core/client_orders.rb
@@ -493,6 +502,7 @@ files:
 - spec/factories/comee/core/purchase_requisitions.rb
 - spec/factories/comee/core/quotation_request_items.rb
 - spec/factories/comee/core/quotation_requests.rb
+- spec/factories/comee/core/roles.rb
 - spec/factories/comee/core/sales_order_items.rb
 - spec/factories/comee/core/sales_orders.rb
 - spec/factories/comee/core/shipment_instruction_items.rb
@@ -505,6 +515,7 @@ files:
 - spec/factories/comee/core/transport_availabilities.rb
 - spec/factories/comee/core/unit_conversions.rb
 - spec/factories/comee/core/units.rb
+- spec/factories/comee/core/user_application_roles.rb
 - spec/factories/comee/core/users.rb
 homepage: https://www.mks.com
 licenses: