comee_core 0.1.66 → 0.1.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47cf5679d2c9d6fbc6d6f0c4f7eb3a6a25c402ec3e4aabf667de41c01b3e2f82
-  data.tar.gz: 3fc087959c16abb7bc68c36a0e8f126c21922545a6118d19203f8cb3d95e6e2d
+  metadata.gz: 2b8fdd8831c1aff501ec1d4628b22c24f647260b5fe16c0e1ef74b2d96c216c0
+  data.tar.gz: 47cd51809f26b8a4403ed05901d133b62ce7588bb436f5fac988d11e92c485c2
 SHA512:
-  metadata.gz: f42d06b36fa70926e8cd3e0003522aecdad89a5c6a291fe39158beb29b9a769b03d35aa096e40db2bfdb7ff0d79e25538ee8b835e528bcf1b703f33af93fbff5
-  data.tar.gz: 33719ed3f0a29dd2f68e3c3192158c03a9f361ee62bc640264d385e7233642c4b376347656d71aa838b9aca1535fc1bf18d1f66280878f5efc0195b24e8c28ae
+  metadata.gz: ebe4ec1df9d2eb6ada3b572b6c592f4592cf5d0d03f1877b428cea2f02e5abc7821de4968af7670a7f81d65f26944172410ae4a028457d5a06dc68db8d6038ae
+  data.tar.gz: e0515f1d51e41f26a7cd0f3d786d53b4fd6bc095430be347e491a3c7a1482cd5bfd24bc56b81e9901490fea714ff60fc5498dbc5422184154ad80c51da7249f5

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

@@ -11,7 +11,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :user_id)
+        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id)
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:hash_code, :status, :status_date, :remark, :sales_order_item_id, :details)
+        params.require(:payload).permit(:hash_code, :status, :status_date, :remark, :shipment_item_id, :details)
       end
     end
   end

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

@@ -25,32 +25,32 @@ module Comee
         render json: {success: true}
       end
 
-      def filter_with_status
-        items = SalesOrderItem.includes(:sales_order, :product, :unit)
-                              .ransack(params[:q]).result
-        statuses = ItemStatus.where(sales_order_item_id: items.map(&:id))
-                             .select("MAX(id) AS max_id, sales_order_item_id")
-                             .group(:sales_order_item_id)
-                             .all
-        ids = statuses.map(&:max_id)
-        statuses = ItemStatus.where(id: ids).each_with_object({}) { |status, res| res[status.sales_order_item_id] = status }
-        result = items.each_with_object([]) do |item, res|
-          status = statuses[item.id]
-          data = {
-            sales_order_no: item.sales_order.order_number,
-            customer_item_no: item.customer_item_no,
-            product_code: item.product.code,
-            unit: item.unit.code,
-            quantity: item.quantity,
-            delivery_date: item.delivery_date,
-            handover_date: item.sales_order.handover_date,
-            po_reference: item.po_reference,
-            status: status&.status
-          }
-          res << data.merge(status&.details)
-        end
-        render json: {success: true, data: result}
-      end
+      # def filter_with_status
+      #   items = SalesOrderItem.includes(:sales_order, :product, :unit)
+      #                         .ransack(params[:q]).result
+      #   statuses = ItemStatus.where(sales_order_item_id: items.map(&:id))
+      #                        .select("MAX(id) AS max_id, sales_order_item_id")
+      #                        .group(:sales_order_item_id)
+      #                        .all
+      #   ids = statuses.map(&:max_id)
+      #   statuses = ItemStatus.where(id: ids).each_with_object({}) { |status, res| res[status.sales_order_item_id] = status }
+      #   result = items.each_with_object([]) do |item, res|
+      #     status = statuses[item.id]
+      #     data = {
+      #       sales_order_no: item.sales_order.order_number,
+      #       customer_item_no: item.customer_item_no,
+      #       product_code: item.product.code,
+      #       unit: item.unit.code,
+      #       quantity: item.quantity,
+      #       delivery_date: item.delivery_date,
+      #       handover_date: item.sales_order.handover_date,
+      #       po_reference: item.po_reference,
+      #       status: status&.status
+      #     }
+      #     res << data.merge(status&.details)
+      #   end
+      #   render json: {success: true, data: result}
+      # end
 
       private
 

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

@@ -0,0 +1,41 @@
+module Comee
+  module Core
+    class ShipmentItemsController < ApplicationController
+      include Common
+
+      def filter_with_status
+        items = ShipmentItem.includes(sales_order_item: %i[sales_order product unit])
+                            .ransack(params[:q]).result
+        statuses = ItemStatus.where(shipment_item_id: items.map(&:id))
+                             .select("MAX(id) AS max_id, shipment_item_id")
+                             .group(:shipment_item_id)
+                             .all
+        ids = statuses.map(&:max_id)
+        statuses = ItemStatus.where(id: ids).each_with_object({}) { |status, res| res[status.shipment_item_id] = status }
+        result = items.each_with_object([]) do |item, res|
+          status = statuses[item.id]
+          data = {
+            sales_order_no: item.sales_order_item.sales_order.order_number,
+            customer_item_no: item.sales_order_item.customer_item_no,
+            product_code: item.sales_order_item.product.code,
+            unit: item.sales_order_item.unit.code,
+            quantity: item.sales_order_item.quantity,
+            delivery_date: item.sales_order_item.delivery_date,
+            handover_date: item.sales_order_item.sales_order.handover_date,
+            po_reference: item.sales_order_item.po_reference,
+            status: status&.status
+          }
+          res << data.merge(status&.details)
+        end
+        render json: {success: true, data: result}
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:sales_order_item_id, :quantity, :shipment_status, :status, :handover_date, :delivery_date,
+                                        :pallet_no)
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class Client < ApplicationRecord
       belongs_to :user, optional: true
+      belongs_to :parent, class_name: "Comee::Core::Client", optional: true
       has_many :warehouse_shipments
 
       validates :code, :name, :address, :locale, presence: true

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

@@ -1,17 +1,22 @@
 module Comee
   module Core
     class ItemStatus < ApplicationRecord
+      INITIALIZED = "Initialized".freeze
       DELIVERY_NOTE_CREATED = "Delivery note created".freeze
       COMPLETELY_PICKED_AND_PACKED = "Completely Picked & Packed".freeze
       PARTIALLY_PICKED_AND_PACKED = "Partially Picked & Packed".freeze
 
-      belongs_to :sales_order_item
+      belongs_to :shipment_item
 
       validates :hash_code, :status, :status_date, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[hash_code status status_date sales_order_item_id]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        ["shipment_item"]
+      end
     end
   end
 end

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

@@ -6,8 +6,8 @@ module Comee
       belongs_to :product
       belongs_to :unit
       belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
-      has_many :warehouse_shipment_items
-      has_many :item_statuses
+      # has_many :warehouse_shipment_items
+      has_many :shipment_items
 
       validates :customer_item_no, :delivery_date, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}

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

@@ -0,0 +1,20 @@
+module Comee
+  module Core
+    class ShipmentItem < ApplicationRecord
+      enum :status, {active: 0, completed: 1}
+
+      belongs_to :sales_order_item
+
+      validates :handover_date, :delivery_date, :shipment_status, :status, presence: true
+      validates :quantity, presence: true, numericality: {greater_than: 0}
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[delivery_date handover_date pallet_no quantity sales_order_item_id shipment_status]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        ["sales_order_item"]
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ClientSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale, :user_id, :user_name
+      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :parent_id
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ItemStatusSerializer < ActiveModel::Serializer
-      attributes :id, :status, :status_date, :details, :remark, :sales_order_item_id
+      attributes :id, :status, :status_date, :details, :remark, :shipment_item_id
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :lead_time, :comment,
-                 :action_note, :po_reference, :pallet_no
+                 :action_note, :po_reference
 
       belongs_to :sales_order
       belongs_to :customer_order_item

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

@@ -0,0 +1,8 @@
+module Comee
+  module Core
+    class ShipmentItemSerializer < ActiveModel::Serializer
+      attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no
+      belongs_to :sales_order_item
+    end
+  end
+end

data/config/routes.rb

@@ -83,7 +83,9 @@ Comee::Core::Engine.routes.draw do
     member do
       get "suggest", controller: :sales_order_items, action: :suggest_values
     end
+  end
 
+  resources :shipment_items do
     collection do
       post "filter_with_status"
     end

data/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -9,6 +9,10 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
       t.string :name, null: false
       t.string :address, null: false
       t.string :locale, null: false, default: "en"
+      t.references :parent,
+                   null: true,
+                   index: {name: "so_on_ccc_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
 
       t.timestamps
     end

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -33,7 +33,6 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :comment
       t.string :action_note
       t.string :po_reference
-      t.string :pallet_no
 
       t.timestamps
     end

data/db/migrate/20231207153420_create_comee_core_shipment_items.rb

@@ -0,0 +1,18 @@
+class CreateComeeCoreShipmentItems < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_shipment_items do |t|
+      t.references :sales_order_item,
+                   index: {name: "soi_on_ccsi_indx"},
+                   null: false,
+                   foreign_key: {to_table: :comee_core_sales_order_items}
+      t.float :quantity, null: false
+      t.string :shipment_status, null: false
+      t.integer :status, null: false, default: 0
+      t.date :handover_date, null: false
+      t.date :delivery_date, null: false
+      t.string :pallet_no
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20231207235542_create_comee_core_item_statuses.rb

@@ -2,10 +2,10 @@ class CreateComeeCoreItemStatuses < ActiveRecord::Migration[7.1]
   def change
     create_table :comee_core_item_statuses do |t|
       t.bigint :hash_code, null: false
-      t.references :sales_order_item,
+      t.references :shipment_item,
                    null: false,
                    index: {name: "so_on_ccis_indx"},
-                   foreign_key: {to_table: :comee_core_sales_order_items}
+                   foreign_key: {to_table: :comee_core_shipment_items}
       t.string :status, null: false
       t.date :status_date, null: false
       t.jsonb :details

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.66".freeze
+    VERSION = "0.1.68".freeze
   end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }
+    parent { nil }
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :item_status, class: "Comee::Core::ItemStatus" do
     hash_code { "abcdefg".hash }
-    sales_order_item
+    shipment_item
     status { Faker::Lorem.word }
     status_date { Date.current }
     details { {} }

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

@@ -16,6 +16,5 @@ FactoryBot.define do
     comment { Faker::Lorem.sentence }
     action_note { Faker::Lorem.sentence }
     po_reference { Faker::Alphanumeric.alpha(number: 10) }
-    pallet_no { Faker::Alphanumeric.alpha(number: 10) }
   end
 end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :shipment_item, class: "Comee::Core::ShipmentItem" do
+    sales_order_item
+    quantity { 50 }
+    shipment_status { Faker::Lorem.word }
+    status { Comee::Core::ShipmentItem.statuses[:active] }
+    handover_date { Date.current.advance(days: 3) }
+    delivery_date { Date.current.advance(days: 6) }
+    pallet_no { Faker::Alphanumeric.alpha(number: 10) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.66
+  version: 0.1.68
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-25 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -299,6 +299,7 @@ files:
 - app/controllers/comee/core/quotation_requests_controller.rb
 - app/controllers/comee/core/sales_order_items_controller.rb
 - app/controllers/comee/core/sales_orders_controller.rb
+- app/controllers/comee/core/shipment_items_controller.rb
 - app/controllers/comee/core/suppliers_controller.rb
 - app/controllers/comee/core/unit_conversions_controller.rb
 - app/controllers/comee/core/units_controller.rb
@@ -338,6 +339,7 @@ files:
 - app/models/comee/core/quotation_request_item.rb
 - app/models/comee/core/sales_order.rb
 - app/models/comee/core/sales_order_item.rb
+- app/models/comee/core/shipment_item.rb
 - app/models/comee/core/supplier.rb
 - app/models/comee/core/unit.rb
 - app/models/comee/core/unit_conversion.rb
@@ -364,6 +366,7 @@ files:
 - app/serializers/comee/core/quotation_request_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
 - app/serializers/comee/core/supplier_serializer.rb
 - app/serializers/comee/core/unit_conversion_serializer.rb
 - app/serializers/comee/core/unit_serializer.rb
@@ -416,6 +419,7 @@ files:
 - db/migrate/20231125122723_create_comee_core_purchase_orders.rb
 - db/migrate/20231126082907_create_comee_core_purchase_order_items.rb
 - db/migrate/20231206082503_create_comee_core_unit_conversions.rb
+- db/migrate/20231207153420_create_comee_core_shipment_items.rb
 - db/migrate/20231207235542_create_comee_core_item_statuses.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
@@ -450,6 +454,7 @@ files:
 - spec/factories/comee/core/quotation_requests.rb
 - spec/factories/comee/core/sales_order_items.rb
 - spec/factories/comee/core/sales_orders.rb
+- spec/factories/comee/core/shipment_items.rb
 - spec/factories/comee/core/suppliers.rb
 - spec/factories/comee/core/unit_conversions.rb
 - spec/factories/comee/core/units.rb