unidom-order 2.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83451a7dcf3e3329871441ea24ea9bc19df5c3538eed12ad850ce516fd6a1ad3
-  data.tar.gz: 8ef71758b26cfea5ffcf7bc1f18d76c14ea2786766d875dca6e1d58935163f0b
+  metadata.gz: 65be3c651c2b77bfef5f74d06723a94f8b36c060a3418be80c8c92322ebe4c4c
+  data.tar.gz: 662944e10031a663cda34bec754b4ad465021f286b5ab9efd3a126dd81e2ab7a
 SHA512:
-  metadata.gz: 5049bc94db8ed584b77caa3e29d46184a641b7b0bb403080ab6e558509476b3f1141f1a901af35ee0dcd12410ad2a1c932487ce5e75e45d5336b5f55b4daf198
-  data.tar.gz: 4f2344fc4d42f8e93505d3ec5aff97edfbe6d58a728544e2486953f7accb8e1693fcb9ed982351f715a910697aeb030521967305ee2289264a5f78657fc442c0
+  metadata.gz: f6b87ba705f596f32aa92e97e5e228fbecebc64da2bbae6b9de470abcb11e71ac3d0ff132e4c00d3411697b2907e8ea2bf0677ddd67e16d7fe818a5e3058ce9c
+  data.tar.gz: f2e5a93ece0a2de244afbe19783ec093c4cfe99e7b55a3c5cc781a3737243553e1600f4f12f8894d0b0dce4d123038b181a310de118159a175ac9c084e38d06d

data/app/controllers/unidom/order/application_controller.rb

@@ -1,6 +1,12 @@
 ##
 # Application controller 是模块内所有控制器的基类。
 
-class Unidom::Order::ApplicationController < ActionController::Base
-  protect_from_forgery with: :exception
+module Unidom
+  module Order
+
+    class ApplicationController < ActionController::Base
+      protect_from_forgery with: :exception
+    end
+
+  end
 end

data/app/helpers/unidom/order/application_helper.rb

@@ -1,2 +1,8 @@
-module Unidom::Order::ApplicationHelper
+module Unidom
+  module Order
+
+    module ApplicationHelper
+    end
+
+  end
 end

data/app/jobs/unidom/order/application_job.rb

@@ -1,5 +1,11 @@
 ##
 # Application job 是模块内所有异步任务的基类。
 
-class Unidom::Order::ApplicationJob < ActiveJob::Base
+module Unidom
+  module Order
+
+    class ApplicationJob < ActiveJob::Base
+    end
+
+  end
 end

data/app/mailers/unidom/order/application_mailer.rb

@@ -1,7 +1,13 @@
 ##
 # Application mailer 是模块内所有电子邮件发送类的基类。
 
-class Unidom::Order::ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
-  layout 'mailer'
+module Unidom
+  module Order
+
+    class ApplicationMailer < ActionMailer::Base
+      default from: 'from@example.com'
+      layout 'mailer'
+    end
+
+  end
 end

data/app/models/unidom/order/application_record.rb

@@ -1,6 +1,12 @@
 ##
 # Application record 是模块内所有模型的抽象基类。
 
-class Unidom::Order::ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
+module Unidom
+  module Order
+
+    class ApplicationRecord < ActiveRecord::Base
+      self.abstract_class = true
+    end
+
+  end
 end

data/app/models/unidom/order/concerns/as_adjusted.rb

@@ -1,34 +1,42 @@
-module Unidom::Order::Concerns::AsAdjusted
+module Unidom
+  module Order
+    module Concerns
+
+      module AsAdjusted
+
+        extend ActiveSupport::Concern
+
+        included do |includer|
+
+          has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted
+
+          def is_adjusted!(amount, due_to: 'FRGT', at: Time.now)
+            query      = adjustments.adjustment_factor_coded_as(due_to).valid_at(now: at).alive
+            adjustment = query.first
+            if adjustment.present?
+              if 0==amount
+                adjustment.soft_destroy
+              else
+                adjustment.amount = amount
+                adjustment.save!
+              end
+            else
+              adjustment = query.create! amount: amount, opened_at: at
+            end
+            adjustment
+          end
+
+          def is_adjusted?(due_to: 'FRGT', at: Time.now)
+            adjustments.adjustment_factor_coded_as(due_to).valid_at(now: at).alive.exists?
+          end
 
-  extend ActiveSupport::Concern
-
-  included do |includer|
-
-    has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted
+        end
 
-    def is_adjusted!(amount, due_to: 'FRGT', at: Time.now)
-      query      = adjustments.adjustment_factor_coded_as(due_to).valid_at(now: at).alive
-      adjustment = query.first
-      if adjustment.present?
-        if 0==amount
-          adjustment.soft_destroy
-        else
-          adjustment.amount = amount
-          adjustment.save!
+        module ClassMethods
         end
-      else
-        adjustment = query.create! amount: amount, opened_at: at
+
       end
-      adjustment
-    end
 
-    def is_adjusted?(due_to: 'FRGT', at: Time.now)
-      adjustments.adjustment_factor_coded_as(due_to).valid_at(now: at).alive.exists?
     end
-
-  end
-
-  module ClassMethods
   end
-
 end

data/app/models/unidom/order/concerns/as_order_placer.rb

@@ -1,14 +1,22 @@
-module Unidom::Order::Concerns::AsOrderPlacer
+module Unidom
+  module Order
+    module Concerns
 
-  extend ActiveSupport::Concern
+      module AsOrderPlacer
 
-  included do |includer|
+        extend ActiveSupport::Concern
 
-    has_many :placed_orders, class_name: 'Unidom::Order::Order', as: :placer
+        included do |includer|
 
-  end
+          has_many :placed_orders, class_name: 'Unidom::Order::Order', as: :placer
 
-  module ClassMethods
-  end
+        end
+
+        module ClassMethods
+        end
 
+      end
+
+    end
+  end
 end

data/app/models/unidom/order/concerns/as_order_taker.rb

@@ -1,14 +1,22 @@
-module Unidom::Order::Concerns::AsOrderTaker
+module Unidom
+  module Order
+    module Concerns
 
-  extend ActiveSupport::Concern
+      module AsOrderTaker
 
-  included do |includer|
+        extend ActiveSupport::Concern
 
-    has_many :taken_orders, class_name: 'Unidom::Order::Order', as: :taker
+        included do |includer|
 
-  end
+          has_many :taken_orders, class_name: 'Unidom::Order::Order', as: :taker
 
-  module ClassMethods
-  end
+        end
+
+        module ClassMethods
+        end
 
+      end
+
+    end
+  end
 end

data/app/models/unidom/order/order.rb

@@ -1,23 +1,29 @@
 ##
 # Order 是订单。
 
-class Unidom::Order::Order < Unidom::Order::ApplicationRecord
+module Unidom
+  module Order
 
-  self.table_name = 'unidom_orders'
+    class Order < ApplicationRecord
 
-  include Unidom::Common::Concerns::ModelExtension
-  include Unidom::Order::Concerns::AsAdjusted
+      self.table_name = 'unidom_orders'
 
-  validates :number,           presence: true, length:       { is: self.columns_hash['number'].limit }
-  validates :purchase_amount,  presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
-  validates :aggregate_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+      include Unidom::Common::Concerns::ModelExtension
+      include Unidom::Order::Concerns::AsAdjusted
 
-  belongs_to :placer, polymorphic: true
-  belongs_to :taker,  polymorphic: true
+      validates :number,           presence: true, length:       { is: self.columns_hash['number'].limit }
+      validates :purchase_amount,  presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+      validates :aggregate_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
 
-  has_many :items, class_name: 'Unidom::Order::OrderItem'
+      belongs_to :placer, polymorphic: true
+      belongs_to :taker,  polymorphic: true
 
-  scope :placed_by, ->(placer) { where placer: placer }
-  scope :taken_by,  ->(taker)  { where taker:  taker  }
+      has_many :items, class_name: 'Unidom::Order::OrderItem'
 
-end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Order::Order'
+      scope :placed_by, ->(placer) { where placer: placer }
+      scope :taken_by,  ->(taker)  { where taker:  taker  }
+
+    end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Order::Order'
+
+  end
+end

data/app/models/unidom/order/order_adjustment.rb

@@ -1,44 +1,50 @@
 ##
 # Order Adjustment 是订单调整项。
 
-class Unidom::Order::OrderAdjustment < Unidom::Order::ApplicationRecord
+module Unidom
+  module Order
 
-  self.table_name = 'unidom_order_adjustments'
+    class OrderAdjustment < ApplicationRecord
 
-  include Unidom::Common::Concerns::ModelExtension
-  include ProgneTapera::EnumCode
+      self.table_name = 'unidom_order_adjustments'
 
-  validates :amount, presence: true, numericality: { greater_than_or_equal_to: -1_000_000_000, less_than_or_equal_to: 1_000_000_000 }
+      include Unidom::Common::Concerns::ModelExtension
+      include ProgneTapera::EnumCode
 
-  belongs_to :adjusted, polymorphic: true
+      validates :amount, presence: true, numericality: { greater_than_or_equal_to: -1_000_000_000, less_than_or_equal_to: 1_000_000_000 }
 
-  scope :adjusted_is, ->(adjusted) { where adjusted: adjusted }
+      belongs_to :adjusted, polymorphic: true
 
-  code :adjustment_factor, Unidom::Order::AdjustmentFactor
+      scope :adjusted_is, ->(adjusted) { where adjusted: adjusted }
 
-  ##
-  # 对订单或者订单项 adjusted 进行调整。调整金额为 amount ，缺省为 0 。调整原因是 due_to ，缺省是 FRGT 。调整时间是 opened_at ，缺省为当前时间。如：
-  # Unidom::Order::OrderAdjustment.adjust! order, amount: 7.90, due_to: 'LTAX'
-  def self.adjust!(adjusted, amount: 0, due_to: 'FRGT', opened_at: Time.now)
+      code :adjustment_factor, Unidom::Order::AdjustmentFactor
 
-    assert_present! :adjusted,  adjusted
-    assert_present! :amount,    amount
-    assert_present! :due_to,    due_to
-    assert_present! :opened_at, opened_at
+      ##
+      # 对订单或者订单项 adjusted 进行调整。调整金额为 amount ，缺省为 0 。调整原因是 due_to ，缺省是 FRGT 。调整时间是 opened_at ，缺省为当前时间。如：
+      # Unidom::Order::OrderAdjustment.adjust! order, amount: 7.90, due_to: 'LTAX'
+      def self.adjust!(adjusted, amount: 0, due_to: 'FRGT', opened_at: Time.now)
 
-    query      = adjusted_is(adjusted).adjustment_factor_coded_as(due_to).valid_at(now: opened_at).alive
-    adjustment = query.first
-    if adjustment.present?
-      if 0==amount
-        adjustment.soft_destroy
-      else
-        adjustment.amount = amount
-        adjustment.save!
+        assert_present! :adjusted,  adjusted
+        assert_present! :amount,    amount
+        assert_present! :due_to,    due_to
+        assert_present! :opened_at, opened_at
+
+        query      = adjusted_is(adjusted).adjustment_factor_coded_as(due_to).valid_at(now: opened_at).alive
+        adjustment = query.first
+        if adjustment.present?
+          if 0==amount
+            adjustment.soft_destroy
+          else
+            adjustment.amount = amount
+            adjustment.save!
+          end
+        else
+          adjustment = query.create! amount: amount, opened_at: opened_at
+        end
+        adjustment
       end
-    else
-      adjustment = query.create! amount: amount, opened_at: opened_at
-    end
-    adjustment
-  end
 
-end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Order::OrderAdjustment'
+    end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Order::OrderAdjustment'
+
+  end
+end

data/app/models/unidom/order/order_item.rb

@@ -1,42 +1,48 @@
 ##
 # Order Item 是订单项。
 
-class Unidom::Order::OrderItem < Unidom::Order::ApplicationRecord
-
-  self.table_name = 'unidom_order_items'
-
-  include Unidom::Common::Concerns::ModelExtension
-  include Unidom::Order::Concerns::AsAdjusted
-
-  #validates :ordinal,         presence: true, numericality: { only_integer: true, greater_than: 0, less_than: 1_000_000_000 }
-  validates :unit_price,      presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
-  validates :quantity,        presence: true, numericality: { greater_than:             0, less_than_or_equal_to: 1_000_000_000 }
-  validates :purchase_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
-  validates :subtotal_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
-
-  belongs_to :order,   class_name:  'Unidom::Order::Order'
-  belongs_to :ordered, polymorphic: true
-  belongs_to :placer,  polymorphic: true
-
-  scope :order_is,   ->(order)   { where order:   order   }
-  scope :ordered_is, ->(ordered) { where ordered: ordered }
-  scope :placed_by,  ->(placer)  { where placer:  placer  }
-
-  ##
-  # 订购商品 ordered ，放入订单 of 。订购者为 by ，缺省为订单的下单者。单价为 unit_price ，缺省值为 0 。数量为 quantity ，缺省值为 1。如：
-  # Unidom::Order::OrderItem.order! coca_cola, of: order, by: current_person, unit_price: 3.50, quantity: 2
-  def self.order!(ordered, of: nil, by: of.placer, unit_price: 0, quantity: 1)
-    item = of.items.ordered_is(ordered).placed_by(by).valid_at.alive.first
-    if item.present?
-      item.quantity        += quantity
-      item.unit_price      =  unit_price
-      item.purchase_amount =  item.unit_price*item.quantity
-      item.subtotal_amount =  item.purchase_amount+item.adjustments.valid_at.alive.sum(:amount).to_f
-      item.save!
-    else
-      ordinal = 1+of.items.valid_at.alive.maximum(:ordinal).to_i
-      of.items.create! ordered: ordered, placer: by, ordinal: ordinal, quantity: quantity, unit_price: unit_price, purchase_amount: unit_price*quantity, subtotal_amount: unit_price*quantity, opened_at: Time.now
-    end
-  end
+module Unidom
+  module Order
+
+    class OrderItem < ApplicationRecord
+
+      self.table_name = 'unidom_order_items'
+
+      include Unidom::Common::Concerns::ModelExtension
+      include Unidom::Order::Concerns::AsAdjusted
+
+      #validates :ordinal,         presence: true, numericality: { only_integer: true, greater_than: 0, less_than: 1_000_000_000 }
+      validates :unit_price,      presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+      validates :quantity,        presence: true, numericality: { greater_than:             0, less_than_or_equal_to: 1_000_000_000 }
+      validates :purchase_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+      validates :subtotal_amount, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 1_000_000_000 }
+
+      belongs_to :order,   class_name:  'Unidom::Order::Order'
+      belongs_to :ordered, polymorphic: true
+      belongs_to :placer,  polymorphic: true
+
+      scope :order_is,   ->(order)   { where order:   order   }
+      scope :ordered_is, ->(ordered) { where ordered: ordered }
+      scope :placed_by,  ->(placer)  { where placer:  placer  }
+
+      ##
+      # 订购商品 ordered ，放入订单 of 。订购者为 by ，缺省为订单的下单者。单价为 unit_price ，缺省值为 0 。数量为 quantity ，缺省值为 1。如：
+      # Unidom::Order::OrderItem.order! coca_cola, of: order, by: current_person, unit_price: 3.50, quantity: 2
+      def self.order!(ordered, of: nil, by: of.placer, unit_price: 0, quantity: 1)
+        item = of.items.ordered_is(ordered).placed_by(by).valid_at.alive.first
+        if item.present?
+          item.quantity        += quantity
+          item.unit_price      =  unit_price
+          item.purchase_amount =  item.unit_price*item.quantity
+          item.subtotal_amount =  item.purchase_amount+item.adjustments.valid_at.alive.sum(:amount).to_f
+          item.save!
+        else
+          ordinal = 1+of.items.valid_at.alive.maximum(:ordinal).to_i
+          of.items.create! ordered: ordered, placer: by, ordinal: ordinal, quantity: quantity, unit_price: unit_price, purchase_amount: unit_price*quantity, subtotal_amount: unit_price*quantity, opened_at: Time.now
+        end
+      end
+
+    end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Order::OrderItem'
 
-end unless Unidom::Common::Neglection.namespace_neglected? 'Unidom::Order::OrderItem'
+  end
+end

data/app/types/unidom/order/adjustment_factor.rb

@@ -1,9 +1,15 @@
 # Adjustment Factor 是调整因素。
 
-class Unidom::Order::AdjustmentFactor < ActiveRecord::Type::Value
+module Unidom
+  module Order
 
-  include ProgneTapera::EnumConfig
+    class AdjustmentFactor < ActiveRecord::Type::Value
 
-  enum :unidom_adjustment_factor
+      include ProgneTapera::EnumConfig
 
+      enum :unidom_adjustment_factor
+
+    end
+
+  end
 end

data/app/views/layouts/unidom/order/application.html.erb

@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>Unidom Order</title>
-  <%= stylesheet_link_tag 'unidom/order/application', media: "all" %>
+  <%= stylesheet_link_tag 'unidom/order/application', media: 'all' %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/db/migrate/20020601000000_create_unidom_orders.rb

@@ -1,4 +1,4 @@
-class CreateUnidomOrders < ActiveRecord::Migration
+class CreateUnidomOrders < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -18,7 +18,7 @@ class CreateUnidomOrders < ActiveRecord::Migration
       t.text :description
 
       t.string   :slug,             null: false, default: nil, limit: 200
-      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
       t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
       t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false

data/db/migrate/20020602000000_create_unidom_order_items.rb

@@ -1,6 +1,6 @@
 # Order Item 是订单项。
 
-class CreateUnidomOrderItems < ActiveRecord::Migration
+class CreateUnidomOrderItems < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -22,7 +22,7 @@ class CreateUnidomOrderItems < ActiveRecord::Migration
       t.text :instruction
       t.text :description
 
-      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
       t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
       t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false
@@ -32,7 +32,7 @@ class CreateUnidomOrderItems < ActiveRecord::Migration
 
     end
 
-    add_index :unidom_order_items, :order_id
+    #add_index :unidom_order_items, :order_id
     add_index :unidom_order_items, :ordered_id
     add_index :unidom_order_items, :placer_id
 

data/db/migrate/20020603000000_create_unidom_order_adjustments.rb

@@ -1,4 +1,4 @@
-class CreateUnidomOrderAdjustments < ActiveRecord::Migration
+class CreateUnidomOrderAdjustments < ActiveRecord::Migration[6.0]
 
   def change
 
@@ -15,7 +15,7 @@ class CreateUnidomOrderAdjustments < ActiveRecord::Migration
       t.text :instruction
       t.text :description
 
-      t.column   :state, 'char(1)', null: false, default: 'C'
+      t.column   :state, 'char(1)', null: false, default: Unidom::Common::STATE
       t.datetime :opened_at,        null: false, default: Unidom::Common::OPENED_AT
       t.datetime :closed_at,        null: false, default: Unidom::Common::CLOSED_AT
       t.boolean  :defunct,          null: false, default: false

data/lib/unidom/order/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Order
-    VERSION = '2.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -72,11 +72,11 @@ files:
 - lib/unidom/order/types_rspec.rb
 - lib/unidom/order/validators_rspec.rb
 - lib/unidom/order/version.rb
-homepage: https://github.com/topbitdu/unidom-order
+homepage: https://gitee.com/Unidom/unidom-order
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Unidom Order Domain Model Engine 订单领域模型引擎
 test_files: []