Add remark to product & series & snapshot

lib/shotengai/controller/customer/carts_controller.rb

@@ -24,7 +24,7 @@ module Shotengai
 
           def snapshot_params
             params.require(:snapshot).permit(
-              :shotengai_series_id, :count
+              :shotengai_series_id, :count, remark_input: [:key, :val]
             )
           end
 

lib/shotengai/controller/customer/product_snapshots_controller.rb

@@ -31,7 +31,7 @@ module Shotengai
         private
           def resource_params
             params.require(resource_key).permit(
-              :count, :shotengai_series_id
+              :count, :shotengai_series_id, remark_input: [:key, :val]
             )
           end
 

lib/shotengai/controller/customer/products_controller.rb

@@ -9,7 +9,7 @@ module Shotengai
         skip_before_action :buyer_auth
 
         def default_query resources
-          resources.alive  
+          resources.on_sale  
         end
 
         def index_query resources

lib/shotengai/series.rb

@@ -85,12 +85,6 @@ module Shotengai
       end
     end
 
-    def initialize *arg
-      super(*arg)
-      self.remark = Hash[product.remark.map { |k, v| [k, true] }]
-      self
-    end
-
     def cut_stock count
       self.stock.eql?(-1) || self.update!(stock: self.stock - count)
     end
@@ -102,15 +96,6 @@ module Shotengai
     def meta
       super || {}
     end
-
-    def spec_output
-      spec.map { |key, val|
-        {
-          key: key,
-          val: val,
-        }
-      }
-    end
     
     private 
       # spec 字段
@@ -127,8 +112,6 @@ module Shotengai
         # product.remark.keys 包含 remark.keys
         illegal_key = (remark.keys - product.remark.keys)
         errors.add(:remark, "非法的关键字, #{illegal_key}") unless illegal_key.empty?        
-        # illegal_values = remark.reject { |k, v| !!v == v }.keys
-        # errors.add(:spec, "非法的值，仅允许布尔值。#{illegal_values}") unless illegal_values.empty?        
       end
 
       def uniq_spec

lib/shotengai/snapshot.rb

@@ -156,9 +156,10 @@ module Shotengai
 
       def check_remark
         errors.add(:remark, 'remark 必须是个 Hash') unless remark.is_a?(Hash) 
-        required_key = series.series.remark.select{ |k, v| v }.keys
+        nullable_key = series.remark.select{ |k, v| v }.keys
+        required_key = product.remark.keys - nullable_key
         # remark 可添加多余字段
-        errors.add(:remark, '非法的关键字，或关键字缺失') unless (required_key - remark.keys).empty?        
+        errors.add(:remark, '非法的关键字，或关键字缺失') unless (required_key - remark.keys).empty?
       end
 
       # NOTE: Shotengai::Snapshot.find_by_id(self.id) to get the self before changed