comee_core 0.1.41 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5af8bf8f2c1f9cf058e249237279cb6ae6019d0189c549c8bd5c6f421d4774a
-  data.tar.gz: 711689393088d435d720d49497d9e52e5db34cf15e4889fd4a020deb180fa0ae
+  metadata.gz: 4614aa569251964bb6f680e1aaaf6cba4f2ce8a64f45d54751e18ad62378b871
+  data.tar.gz: 0f8f41bf2828f2292ee6e65906bb47c8888ebae8ed79e8e978bd7e6cdc432878
 SHA512:
-  metadata.gz: ce2b456011d92074efffb23b2a1ba2df3f6818bd8d487b888fa5c4a9353ae4cea90af41a7b4fb0e4567070b1583c1f4a11eb308bce465a01fd8666d05eb574b4
-  data.tar.gz: ba7e824700d03d946fa3a1e30d4d0189dd0ac0b96a792482d10c611c70823eb345dfd75d8114e3905ffe48435cb231ba140cccbc180f524f92498af8ac2b84f9
+  metadata.gz: 743afdd1aac35780b96ace42f00eb9cf14fd29cfb4cff61412121288846f8574ce1f7c61b955038b0cb6a31a900267e90bb29d11cf880403d107bca0d45e06ba
+  data.tar.gz: 1d3d427ef671fa0cf13bdb50424c6f4bd93edbc2822090dcc0dcb428e710a84547a14e5231815f892b05b2aa2886446053dd455ff5a36a11d3842488b41e8f6e

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

@@ -17,8 +17,8 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :unit_id, :quantity, :quantity_delivered, :price,
-                                        :delivery_date, :eb_number)
+        params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
+                                        :price, :delivery_date, :eb_number)
       end
     end
   end

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

@@ -2,21 +2,7 @@ module Comee
   module Core
     class SalesOrdersController < ApplicationController
       include Common
-      before_action :set_object, only: %i[show update confirm cancel]
-
-      def confirm
-        @obj.confirm
-        render json: {success: true, data: serialize(@obj.reload)}
-      rescue StandardError => e
-        render json: {success: false, error: e.message}
-      end
-
-      def cancel
-        @obj.cancel
-        render json: {success: true, data: serialize(@obj.reload)}
-      rescue StandardError => e
-        render json: {success: false, error: e.message}
-      end
+      before_action :set_service, only: %i[submit confirm cancel]
 
       def index
         super do
@@ -29,6 +15,27 @@ module Comee
         render json: {success: true, data: serialize(@sales_order)}
       end
 
+      def submit
+        order = @service.submit(params[:id])
+        render json: {success: true, data: serialize(order)}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
+      def confirm
+        order = @service.confirm(params[:id])
+        render json: {success: true, data: serialize(order)}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
+      def cancel
+        order = @service.cancel(params[:id])
+        render json: {success: true, data: serialize(order)}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       private
 
       def model_params
@@ -40,6 +47,10 @@ module Comee
         params.permit(payload: [:supplier_id, :order_number, :order_date, :delivery_date, :delivery_address, :invoice_address,
                                 back_order_items: %i[product_id requested_quantity requested_price supplier_quantity delivery_date]])
       end
+
+      def set_service
+        @service = SalesOrderService.new
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Comee
       belongs_to :customer_order
       has_many :sales_order_items
 
-      enum :status, {draft: 0, validated: 1, authorized: 2, approved: 3, cancelled: 4, confirmed: 5, finalized: 6}
+      enum :status, {draft: 0, submitted: 1, confirmed: 2, canceled: 3}
 
       validates :order_number, presence: true, uniqueness: true
       validates :status, presence: true
@@ -25,20 +25,6 @@ module Comee
         self.total_price = total_price
       end
 
-      def confirm
-        raise(StandardError, "Sales order is already confirmed.") if SalesOrder.statuses[status] == SalesOrder.statuses[:confirmed]
-
-        self.status = SalesOrder.statuses[:confirmed]
-        save
-      end
-
-      def cancel
-        raise(StandardError, "Sales order is already cancelled.") if SalesOrder.statuses[status] == SalesOrder.statuses[:cancelled]
-
-        self.status = SalesOrder.statuses[:cancelled]
-        save
-      end
-
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           order_number

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

@@ -3,6 +3,7 @@ module Comee
     class SalesOrderItem < ApplicationRecord
       belongs_to :sales_order
       belongs_to :customer_order_item
+      belongs_to :product
       belongs_to :unit
       has_many :warehouse_shipment_items
 

data/app/services/comee/core/customer_order_service.rb

@@ -52,6 +52,7 @@ module Comee
             res << {
               sales_order_id: sales_order.id,
               customer_order_item_id: item.id,
+              product_id: item.product_id,
               unit_id: item.unit_id,
               quantity: item.quantity,
               price: item.price,

data/app/services/comee/core/sales_order_service.rb

@@ -136,6 +136,48 @@ module Comee
       rescue StandardError => e
         {success: false, error: e.message}
       end
+
+      def submit(id)
+        order = SalesOrder.find_by(id: id)
+        raise(StandardError, "Sales order with id `#{id}` not found.") unless order
+
+        unless SalesOrder.statuses[order.status] == SalesOrder.statuses[:draft]
+          raise(StandardError, "Sales order should be in draft state.")
+        end
+
+        raise(StandardError, "Sales order should have at least one item.") unless order.sales_order_items.count.positive?
+
+        raise(StandardError, "All items are canceled for sales order.") if order.sales_order_items.all?(&:canceled?)
+
+        order.update!(status: SalesOrder.statuses[:submitted])
+        order
+      end
+
+      def confirm(id)
+        order = SalesOrder.find_by(id: id)
+        raise(StandardError, "Sales order with id `#{id}` not found.") unless order
+
+        unless SalesOrder.statuses[order.status] == SalesOrder.statuses[:submitted]
+          raise(StandardError, "Sales order should be in submitted state.")
+        end
+
+        raise(StandardError, "Sales order should have at least one item.") unless order.sales_order_items.count.positive?
+
+        raise(StandardError, "All items are canceled for sales order.") if order.sales_order_items.all?(&:canceled?)
+
+        order.update!(status: SalesOrder.statuses[:confirmed])
+        order
+      end
+
+      def cancel(id)
+        order = SalesOrder.find_by(id: id)
+        raise(StandardError, "Sales order with id `#{id}` not found.") unless order
+
+        raise(StandardError, "Sales order is already canceled.") if SalesOrder.statuses[order.status] == SalesOrder.statuses[:canceled]
+
+        order.update!(status: SalesOrder.statuses[:canceled])
+        order
+      end
     end
   end
 end

data/config/routes.rb

@@ -76,7 +76,7 @@ Comee::Core::Engine.routes.draw do
     end
     member do
       get "items", controller: :sales_order_items, action: :index
-      get "/sales_order/filter/", controller: :sales_orders, action: :filter
+      post "submit"
       post "confirm"
       post "cancel"
     end

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -5,6 +5,10 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "so_on_ccsoi_indx"},
                    foreign_key: {to_table: :comee_core_sales_orders}
+      t.references :product,
+                   null: false,
+                   index: {name: "product_on_ccsoi_indx"},
+                   foreign_key: {to_table: :comee_core_products}
       t.references :unit,
                    null: false,
                    index: {name: "unit_on_ccsoi_indx"},
@@ -17,6 +21,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.float :quantity_delivered, null: false, default: 0
       t.float :price, null: false
       t.date :delivery_date, null: false
+      t.boolean :canceled, default: false
       t.date :handover_date
       t.string :eb_number
 

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.41".freeze
+    VERSION = "0.1.43".freeze
   end
 end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :sales_order_item, class: "Comee::Core::SalesOrderItem" do
     sales_order
     association :customer_order_item, :with_inventory
+    product
     unit
     quantity { 100 }
     quantity_delivered { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.43
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers