comee_core 0.2.54 → 0.2.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3a703914e5326d261f0c943c3b75d53ff8c4b87f1b25cddb5ea874206ffc04d
-  data.tar.gz: 15b4815aca29b0d972da7dc05b56bca36853397d1b9f418a36e6b5b1f47f3318
+  metadata.gz: 153d3be4849a2a61ea05ee49995fdaf2c246263a2c579e9f9754f199fa4eb591
+  data.tar.gz: 988d4d60cc82d4f0d31331105f593457bd64f78f169d1d9ed0c8964eca4e358e
 SHA512:
-  metadata.gz: 8f0819b6d18e43ed9a5c3935ad4ff0ea4ca2c98188240b21c678b53903a27610cf6613dff8499b0c2cfbd878c57c08f85baf189763f6bfcc756257291cc9e191
-  data.tar.gz: f69e7f88ac237fa4788f0e161647b9046eeba570f22a451baf054348d326c410e54fa3d8e1125c5cf7bdf2fb52766c996b1a1199691e812ed5489fce5e70877c
+  metadata.gz: 0b14faed0811d25bdf08880f30bc753295b7250c1c1d7aaabc529de8c5387484d8c28e2c79dc5449b8c50925ca8bacdaff0c34b925180ae7df2bf69e3900ef59
+  data.tar.gz: 7845a9cddf77861a89b3b7fc4dd50e7449fc768d0cc6b6a92bf3675360bde9b4041a203219d4a18f227a2e44e1b6990f05c1d4ed078b70a81cfe162474d41a1b

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

@@ -13,15 +13,16 @@ module Comee
           result[:page] = params[:page].to_i
           result[:total] = total
         end
-        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
+        # 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
+        result[:data] = serialize(data, options)
         render json: result
       end
 

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

@@ -7,7 +7,7 @@ module Comee
         super do
           [
             CustomerOrderItem.includes(:product, :unit).all,
-            fields: ["unit"]
+            include: ["unit"]
           ]
         end
       end
@@ -19,7 +19,7 @@ module Comee
 
       def filter
         data = CustomerOrderItem.includes(:product, :unit).ransack(params[:q]).result
-        render_content(data, {fields: ["unit"]})
+        render_content(data, {include: ["unit"]})
       end
 
       def destroy

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

@@ -9,7 +9,7 @@ module Comee
         super do
           [
             CustomerOrder.includes(:client, customer_order_items: :unit).order(:created_at),
-            fields: ["client", "customer_order_items.unit"]
+            include: ["client", "customer_order_items.unit"]
           ]
         end
       end
@@ -18,7 +18,7 @@ module Comee
         super do
           [
             CustomerOrder.includes(:client, customer_order_items: :unit).find(params[:id]),
-            fields: ["client", "customer_order_items.unit"]
+            include: ["client", "customer_order_items.unit"]
           ]
         end
       end
@@ -58,7 +58,7 @@ module Comee
 
       def filter
         orders = CustomerOrder.includes(:client, :customer_order_items).ransack(params[:q]).result
-        render_content(orders, fields: ["client", "customer_order_items.unit"])
+        render_content(orders, include: ["client", "customer_order_items.unit"])
       end
 
       private

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

@@ -21,7 +21,7 @@ module Comee
         render_content(
           details,
           {
-            fields: ["shipment_items.item_statuses", "purchase_order_item.purchase_order"],
+            include: ["shipment_items.item_statuses", "purchase_order_item.purchase_order"],
             serializer: SalesOrderItemDetailSerializer
           }
         )

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

@@ -14,7 +14,7 @@ module Comee
           ).order(created_at: :desc)
           [
             data,
-            fields: [
+            include: [
               "client",
               "customer_order",
               "sales_order_items",
@@ -30,7 +30,7 @@ module Comee
         super do
           [
             SalesOrder.includes(:customer_order, :client, :customs_detail, sales_order_items: :unit).find(params[:id]),
-            fields: [
+            include: [
               "client",
               "customer_order",
               "sales_order_items",
@@ -44,7 +44,7 @@ module Comee
 
       def update
         super do
-          {fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]}
+          {include: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]}
         end
       end
 
@@ -57,7 +57,7 @@ module Comee
         ).ransack(params[:q]).result
         render_content(
           data,
-          fields: ["client", "customer_order", "sales_order_items.product", "sales_order_items.unit", "customs_detail"]
+          include: ["client", "customer_order", "sales_order_items.product", "sales_order_items.unit", "customs_detail"]
         )
       end
 

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

@@ -7,14 +7,14 @@ module Comee
         super do
           [
             ShipmentItem.includes(sales_order_item: [sales_order: :client]).all,
-            fields: ["sales_order_item.sales_order.client"]
+            include: ["sales_order_item.sales_order.client"]
           ]
         end
       end
 
       def filter
         shipment_item = ShipmentItem.includes(:sales_order_item).ransack(params[:q]).result
-        options = {fields: ["sales_order_item.sales_order.client", "sales_order_item.product", "sales_order_item.unit"]}
+        options = {include: ["sales_order_item.sales_order.client", "sales_order_item.product", "sales_order_item.unit"]}
         render_content(shipment_item, options)
       end
 

data/app/controllers/concerns/comee/core/common.rb

@@ -28,7 +28,7 @@ module Comee
         data = data.then(&paginate) if params[:page]
         result = {
           success: true,
-          data: options.key?(:fields) ? serialize(data, include: options[:fields]) : serialize(data)
+          data: serialize(data, options)
         }
         if params[:page]
           result[:page] = params[:page]
@@ -56,7 +56,7 @@ module Comee
         end
         result = {
           success: true,
-          data: options.key?(:fields) ? serialize(data, include: options[:fields]) : serialize(data)
+          data: serialize(data, options)
         }
         render json: result
       end
@@ -81,7 +81,7 @@ module Comee
         if obj.save
           result = {
             success: true,
-            data: options.key?(:fields) ? serialize(obj, include: options[:fields]) : serialize(obj)
+            data: serialize(obj, options)
           }
           render json: result, status: :created
         else
@@ -111,7 +111,7 @@ module Comee
         if obj.update(model_params)
           result = {
             success: true,
-            data: options.key?(:fields) ? serialize(obj, include: options[:fields]) : serialize(obj)
+            data: serialize(obj, options)
           }
           render json: result
         else

data/lib/comee/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.54
+  version: 0.2.55
 platform: ruby
 authors:
 - Henock L.