ecom_core 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f15cdff1527a5033ba32892a8a9455198666e4ed2939b696dcfeb336f0c02388
-  data.tar.gz: 2ccc62d0759644c52dc80a63b4d0b940aae6e69a7a077502fd708592e5b99cc4
+  metadata.gz: 2895033d80d7daf5caff3007574dafa35e35ef0ecbbf079c1754c57fb04aee68
+  data.tar.gz: 1e4ae04cf7665c57c4e0fb71bdb662072a6880a493086a7351d43ca4c20fdf7d
 SHA512:
-  metadata.gz: 5f3951c2c91370b336a38c0adf0e372230ca7ae7125bbf11dcb4b6fc548921d41d7d356ad1aea7dd72074adfd1e1747086f3587c50c784db28e766c5ec9e33bc
-  data.tar.gz: 5ae92530a31d4bab42850f5cccc70a14a07bd3b720317616c964eceae719ae6e355394f2225cf353c08373d3808435fc6bdb81423483f615350ecc27b61b6559
+  metadata.gz: 900f2aa8b6328d872591822ab4999ef84a755304d3c4f422ae97f8d88973d1cf9b611b914e5732623a242dfc09e3fafea5c2cb627882f292131cd828efe36222
+  data.tar.gz: 13be6b214efa63bd715b111dc66f94249502c63d8a2011036e3f90dc24330b9f749b742b04c76927b5d6d158181f8f38ecbbdbc8f68445190e8c22196257d141

data/app/controllers/concerns/ecom/core/resource_typeable.rb

@@ -8,13 +8,13 @@ module Ecom
       end
 
       def index
-        render json: ResourceTypeSerializer.new(@clazz.all)
+        render json: ResourceTypeSerializer.new(@clazz.all).serializable_hash
       end
 
       def create
         resource_type = @clazz.new(resource_type_params)
         if resource_type.save
-          render json: ResourceTypeSerializer.new(resource_type), status: :created
+          render json: ResourceTypeSerializer.new(resource_type).serializable_hash, status: :created
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end
@@ -23,7 +23,7 @@ module Ecom
       def update
         resource_type = @clazz.find(params[:id])
         if resource_type.update(resource_type_params)
-          render json: ResourceTypeSerializer.new(resource_type)
+          render json: ResourceTypeSerializer.new(resource_type).serializable_hash
         else
           render json: { success: false, errors: resource_type.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/application_modules_controller.rb

@@ -2,13 +2,13 @@ module Ecom
   module Core
     class ApplicationModulesController < ApplicationController
       def index
-        render json: ApplicationModuleSerializer.new(ApplicationModule.all)
+        render json: ApplicationModuleSerializer.new(ApplicationModule.all).serializable_hash
       end
 
       def create
         application_module = ApplicationModule.new(application_module_params)
         if application_module.save
-          render json: ApplicationModuleSerializer.new(application_module), status: :created
+          render json: ApplicationModuleSerializer.new(application_module).serializable_hash, status: :created
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end
@@ -17,7 +17,7 @@ module Ecom
       def update
         application_module = ApplicationModule.find(params[:id])
         if application_module.update(application_module_params)
-          render json: ApplicationModuleSerializer.new(application_module)
+          render json: ApplicationModuleSerializer.new(application_module).serializable_hash
         else
           render json: { success: false, errors: application_module.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/user_roles_controller.rb

@@ -4,14 +4,14 @@ module Ecom
       before_action :set_user_role, only: [:update]
 
       def index
-        render json: UserRoleSerializer.new(UserRole.all)
+        render json: UserRoleSerializer.new(UserRole.all).serializable_hash
       end
 
       def create
         user_role = UserRole.new(user_role_params)
 
         if user_role.save
-          render json: UserRoleSerializer.new(user_role), status: :created
+          render json: UserRoleSerializer.new(user_role).serializable_hash, status: :created
         else
           render json: { success: false, errors: user_role.errors }, status: :unprocessable_entity
         end
@@ -19,7 +19,7 @@ module Ecom
 
       def update
         if @user_role.update(user_role_params)
-          render json: UserRoleSerializer.new(@user_role)
+          render json: UserRoleSerializer.new(@user_role).serializable_hash
         else
           render json: { success: false, errors: @user_role.errors }, status: :unprocessable_entity
         end

data/app/controllers/ecom/core/users_controller.rb

@@ -4,17 +4,17 @@ module Ecom
       before_action :set_user, only: [:update]
 
       def index
-        render json: UserSerializer.new(User.all)
+        render json: UserSerializer.new(User.all).serializable_hash
       end
 
       def active
-        render json: UserSerializer.new(User.active)
+        render json: UserSerializer.new(User.active).serializable_hash
       end
 
       def create
         user = User.new(user_params)
         if user.save
-          render json: UserSerializer.new(user), status: :created
+          render json: UserSerializer.new(user).serializable_hash, status: :created
         else
           render json: { success: false, errors: user.errors }, status: :unprocessable_entity
         end
@@ -22,7 +22,7 @@ module Ecom
 
       def update
         if @user.update(user_params)
-          render json: UserSerializer.new(@user)
+          render json: UserSerializer.new(@user).serializable_hash
         else
           render json: { success: false, errors: @user.errors }, status: :unprocessable_entity
         end

data/app/serializers/ecom/core/application_module_serializer.rb

@@ -1,8 +1,6 @@
 module Ecom
   module Core
-    class ApplicationModuleSerializer
-      include FastJsonapi::ObjectSerializer
-
+    class ApplicationModuleSerializer < ApplicationSerializer
       attributes :code, :name
     end
   end

data/app/serializers/ecom/core/application_serializer.rb

@@ -0,0 +1,20 @@
+module Ecom
+  module Core
+    class ApplicationSerializer
+      include FastJsonapi::ObjectSerializer
+
+      def serializable_hash
+        data = super[:data]
+        if data.is_a? Hash
+          data[:attributes]
+        elsif data.is_a? Array
+          data.map { |d| d[:attributes] }
+        elsif data.nil?
+          nil
+        else
+          data
+        end
+      end
+    end
+  end
+end

data/app/serializers/ecom/core/lookup_serializer.rb

@@ -1,7 +1,6 @@
 module Ecom
   module Core
-    class LookupSerializer
-      include FastJsonapi::ObjectSerializer
+    class LookupSerializer < ApplicationSerializer
       attributes :name, :type
     end
   end

data/app/serializers/ecom/core/resource_type_serializer.rb

@@ -1,7 +1,6 @@
 module Ecom
   module Core
-    class ResourceTypeSerializer
-      include FastJsonapi::ObjectSerializer
+    class ResourceTypeSerializer < ApplicationSerializer
       attributes :code, :name, :base_unit, :type
     end
   end

data/app/serializers/ecom/core/user_role_serializer.rb

@@ -1,8 +1,6 @@
 module Ecom
   module Core
-    class UserRoleSerializer
-      include FastJsonapi::ObjectSerializer
-
+    class UserRoleSerializer < ApplicationSerializer
       attributes :name
     end
   end

data/app/serializers/ecom/core/user_serializer.rb

@@ -1,8 +1,6 @@
 module Ecom
   module Core
-    class UserSerializer
-      include FastJsonapi::ObjectSerializer
-
+    class UserSerializer < ApplicationSerializer
       attributes :first_name, :last_name, :email, :active
     end
   end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.1.2'.freeze
+    VERSION = '1.1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -251,6 +251,7 @@ files:
 - app/models/ecom/core/work_product.rb
 - app/models/ecom/core/work_product_template.rb
 - app/serializers/ecom/core/application_module_serializer.rb
+- app/serializers/ecom/core/application_serializer.rb
 - app/serializers/ecom/core/lookup_serializer.rb
 - app/serializers/ecom/core/resource_type_serializer.rb
 - app/serializers/ecom/core/user_role_serializer.rb