Merge pull request #217 from regulaforensics/fix/41669

41669 - rollback fieldType type

Author: KirylKovaliov

src/Regula.DocumentReader.WebClient/Model/EncryptedRCLItem.cs

@@ -56,7 +56,7 @@ protected EncryptedRCLItem() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@3e7785cf</example>
+        <example>[B@638eef98</example>
         */
         [DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)]
         public byte[] EncryptedRCL { get; set; }

src/Regula.DocumentReader.WebClient/Model/EncryptedRCLResult.cs

@@ -62,7 +62,7 @@ protected EncryptedRCLResult() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@3e7785cf</example>
+        <example>[B@638eef98</example>
         */
         [DataMember(Name = "EncryptedRCL", IsRequired = true, EmitDefaultValue = true)]
         public byte[] EncryptedRCL { get; set; }

src/Regula.DocumentReader.WebClient/Model/Ext/ImagesExtensions.cs

@@ -8,7 +8,7 @@ public static ImagesField GetField(this Images imgs, GraphicFieldType fieldType)
         {
             foreach (var field in imgs.FieldList) 
             {
-                if (field.FieldType == (int)fieldType) return field;
+                if (field.FieldType == fieldType) return field;
             }
 
             return null;
@@ -20,7 +20,7 @@ public static List<ImagesField> GetFields(this Images imgs, GraphicFieldType fie
 
             foreach (var field in imgs.FieldList) 
             {
-                if (field.FieldType == (int)fieldType)
+                if (field.FieldType == fieldType)
                     fields.Add(field);
             }
 

src/Regula.DocumentReader.WebClient/Model/ImagesField.cs

@@ -32,6 +32,12 @@ namespace Regula.DocumentReader.WebClient.Model
     [DataContract(Name = "ImagesField")]
     public partial class ImagesField : IValidatableObject
     {
+
+        /// <summary>
+        /// Gets or Sets FieldType
+        /// </summary>
+        [DataMember(Name = "fieldType", IsRequired = true, EmitDefaultValue = true)]
+        public GraphicFieldType FieldType { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="ImagesField" /> class.
         /// </summary>
@@ -41,10 +47,10 @@ protected ImagesField() { }
         /// Initializes a new instance of the <see cref="ImagesField" /> class.
         /// </summary>
         /// <param name="fieldName">Human readable field name. Do not bind to this name - use GraphicFieldType instead. (required).</param>
-        /// <param name="fieldType">The value can be from GraphicFieldType or TextFieldType enum. (required).</param>
+        /// <param name="fieldType">fieldType (required).</param>
         /// <param name="valueList">valueList (required).</param>
         /// <param name="valueCount">Field value count.</param>
-        public ImagesField(string fieldName = default(string), int fieldType = default(int), List<ImagesFieldValue> valueList = default(List<ImagesFieldValue>), decimal valueCount = default(decimal))
+        public ImagesField(string fieldName = default(string), GraphicFieldType fieldType = default(GraphicFieldType), List<ImagesFieldValue> valueList = default(List<ImagesFieldValue>), decimal valueCount = default(decimal))
         {
             // to ensure "fieldName" is required (not null)
             if (fieldName == null)
@@ -69,13 +75,6 @@ protected ImagesField() { }
         [DataMember(Name = "fieldName", IsRequired = true, EmitDefaultValue = true)]
         public string FieldName { get; set; }
 
-        /// <summary>
-        /// The value can be from GraphicFieldType or TextFieldType enum.
-        /// </summary>
-        /// <value>The value can be from GraphicFieldType or TextFieldType enum.</value>
-        [DataMember(Name = "fieldType", IsRequired = true, EmitDefaultValue = true)]
-        public int FieldType { get; set; }
-
         /// <summary>
         /// Gets or Sets ValueList
         /// </summary>

src/Regula.DocumentReader.WebClient/Model/LicenseItem.cs

@@ -56,7 +56,7 @@ protected LicenseItem() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@62d85d39</example>
+        <example>[B@19a26868</example>
         */
         [DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)]
         public byte[] License { get; set; }

src/Regula.DocumentReader.WebClient/Model/LicenseResult.cs

@@ -62,7 +62,7 @@ protected LicenseResult() { }
         /// </summary>
         /// <value>Base64 encoded data</value>
         /*
-        <example>[B@62d85d39</example>
+        <example>[B@19a26868</example>
         */
         [DataMember(Name = "License", IsRequired = true, EmitDefaultValue = true)]
         public byte[] License { get; set; }