Support for conversion of vector of integers to a vector of Enums

Author: tencnivel

Project.toml

@@ -1,7 +1,7 @@
 name = "PostgresORM"
 uuid = "748b5efa-ed57-4836-b183-a38105a77fdd"
 authors = ["Vincent Laugier <vincent.laugier@gmail.com>"]
-version = "0.2.0"
+version = "0.3.0"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

src/Controller/coreORM.utils.part1.jl

@@ -368,6 +368,7 @@ function util_dict2entity(props_dict::Dict{Symbol,T},
       # If attribute is already of the right type do nothing
       if isa(props_dict[fsymbol],ftype)
           continue
+
       # Override some properties
       elseif ftype <: UUID
           if ismissing(props_dict[fsymbol])
@@ -407,6 +408,7 @@ function util_dict2entity(props_dict::Dict{Symbol,T},
             match(r"^([0-9]{4}-[0-9]{2}-[0-9]{2})",
                   props_dict[fsymbol])
           props_dict[fsymbol] = Date(date_match.match)
+
       elseif ftype <: Time
           if (ismissing(props_dict[fsymbol]))
               continue
@@ -416,15 +418,23 @@ function util_dict2entity(props_dict::Dict{Symbol,T},
             match(r"([0-9]{2}:[0-9]{2}:[0-9]{2})",
                   props_dict[fsymbol])
           props_dict[fsymbol] = Time(time_match.match)
+
       elseif ftype <: Vector{String}
           if (ismissing(props_dict[fsymbol]))
               continue
           end
           # @info props_dict[fsymbol]
           props_dict[fsymbol] =
             PostgresORMUtil.postgresql_string_array_2_string_vector(props_dict[fsymbol])
+
       elseif ftype <: Vector{T} where T <: Base.Enums.Enum
-          props_dict[fsymbol] = string2vector_of_enums(ftype,props_dict[fsymbol])
+
+          if isa(props_dict[fsymbol],Union{Vector{T},Vector{Union{T,Missing}}} where T <: Integer)
+              props_dict[fsymbol] = vector_of_integers2vector_of_enums(ftype,props_dict[fsymbol])
+          else
+              props_dict[fsymbol] = string2vector_of_enums(ftype,props_dict[fsymbol])
+          end
+
       elseif ftype <: Enum
 
           if ismissing(props_dict[fsymbol])

src/PostgresORM.jl

@@ -49,7 +49,7 @@ module PostgresORM
             get_nonmissing_typeof_uniontype, dataframe2vector_of_namedtuples,
             dataframerow2namedtuple, getdictvalues, getpropertiesvalues,
             setpropertiesvalues!, remove_spaces_and_split, diff_dict,
-            string2enum, string2vector_of_enums,
+            string2enum, string2vector_of_enums, vector_of_integers2vector_of_enums,
             int2enum, enum2int, dictstringkeys2symbol, dictnothingvalues2missing,
             getproperties_asdict, string2zoneddatetime
 

src/PostgresORMUtil/utils.jl

@@ -158,6 +158,16 @@ function string2vector_of_enums(vectorOfEnumsTypes::Type{Vector{T}},
 
 end
 
+function vector_of_integers2vector_of_enums(
+    vectorOfEnumsTypes::Type{Vector{T}} where T <: Base.Enums.Enum,
+    vectorOfInts::Union{Vector{W},Vector{Union{W,Missing}}} where W <: Integer)
+
+    enumType = eltype(vectorOfEnumsTypes)
+
+    return int2enum.(enumType,vectorOfInts)
+
+end
+
 function string2zoneddatetime(str)
     # eg. "2019-09-03T11:00:00.000Z"
     date_match_GMT =