14873: Fixes JSON custom types.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/services/api/app/models/jsonb_type.rb b/services/api/app/models/jsonb_type.rb
index 2011dcec8672438d6b52ef810677e7d18c5ef921..3f296be55003328f0aa2f81a396256bf89e72297 100644 (file)
--- a/services/api/app/models/jsonb_type.rb
+++ b/services/api/app/models/jsonb_type.rb
@@ -7,13 +7,16 @@ class JsonbType
   # some other default value.
   class WithDefault < ActiveModel::Type::Value
     include ActiveModel::Type::Helpers::Mutable
   # some other default value.
   class WithDefault < ActiveModel::Type::Value
     include ActiveModel::Type::Helpers::Mutable

-    @@default_value = nil
+
+    def default_value
+      nil
+    end

 
     def deserialize(value)
       if value.nil?
 
     def deserialize(value)
       if value.nil?

-        @@default_value
+        self.default_value

       elsif value.is_a?(::String)
       elsif value.is_a?(::String)

-        SafeJSON.load(value) rescue @@default_value
+        SafeJSON.load(value) rescue self.default_value

       else
         value
       end
       else
         value
       end


@@ -21,7 +24,7 @@ class JsonbType
 
     def serialize(value)
       if value.nil?
 
     def serialize(value)
       if value.nil?

-        @@default_value
+        self.default_value

       else
         SafeJSON.dump(value)
       end
       else
         SafeJSON.dump(value)
       end


@@ -29,10 +32,14 @@ class JsonbType
   end
 
   class Hash < JsonbType::WithDefault
   end
 
   class Hash < JsonbType::WithDefault

-    @@default_value = {}
+    def default_value
+      {}
+    end

   end
 
   class Array < JsonbType::WithDefault
   end
 
   class Array < JsonbType::WithDefault

-    @@default_value = []
+    def default_value
+      []
+    end

   end
 end
\ No newline at end of file
   end
 end
\ No newline at end of file