Implement RawResultItem

Author: AlexSatsukevich

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

@@ -0,0 +1,98 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using RestSharp;
+
+namespace Regula.DocumentReader.WebClient.Model
+{
+    public class RawResultItem : ResultItem, IDictionary<string, object>
+	{
+		private readonly Dictionary<string, object> _members;
+		
+		public RawResultItem()
+		{
+			_members = new Dictionary<string, object>();
+		}
+
+		public void Add(string key, object value)
+		{
+			_members.Add(key, value);
+		}
+		
+		public bool ContainsKey(string key)
+		{
+			return _members.ContainsKey(key);
+		}
+
+		public ICollection<string> Keys => _members.Keys;
+
+		public bool Remove(string key)
+		{
+			return _members.Remove(key);
+		}
+
+		public bool TryGetValue(string key, out object value)
+		{
+			return _members.TryGetValue(key, out value);
+		}
+
+		public ICollection<object> Values => _members.Values;
+
+		public object this[string key]
+		{
+			get => _members[key];
+			set => _members[key] = value;
+		}
+
+		public void Add(KeyValuePair<string, object> item)
+		{
+			_members.Add(item.Key, item.Value);
+		}
+
+		public void Clear()
+		{
+			_members.Clear();
+		}
+
+		public bool Contains(KeyValuePair<string, object> item)
+		{
+			return _members.TryGetValue(item.Key, out object value) && value == item.Value;
+		}
+
+		public void CopyTo(KeyValuePair<string, object>[] array, int arrayIndex)
+		{
+			if (array == null) throw new ArgumentNullException(nameof(array));
+			
+			int num = Count;
+			foreach (var kvp in this)
+			{
+				array[arrayIndex++] = kvp;
+				if (--num <= 0) return;
+			}
+		}
+		
+		public int Count => _members.Count;
+		
+		public bool IsReadOnly => false;
+
+		public bool Remove(KeyValuePair<string, object> item)
+		{
+			return _members.Remove(item.Key);
+		}
+
+		public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
+		{
+			return _members.GetEnumerator();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator()
+		{
+			return _members.GetEnumerator();
+		}
+
+		public override string ToString()
+		{
+			return SimpleJson.SerializeObject(this);
+		}
+	}
+}

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

@@ -32,7 +32,8 @@ namespace Regula.DocumentReader.WebClient.Model
     [JsonSubtypes.KnownSubType(typeof(ChosenDocumentTypeResult), Result.DOCUMENT_TYPE)]
     [JsonSubtypes.KnownSubType(typeof(TextResult), Result.TEXT)]
     [JsonSubtypes.KnownSubType(typeof(GraphicsResult), Result.VISUAL_GRAPHICS)]
-    public partial class ResultItem :  IEquatable<ResultItem>, IValidatableObject
+    [JsonSubtypes.FallBackSubType(typeof(RawResultItem))]
+    public partial class ResultItem : IEquatable<ResultItem>, IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ResultItem" /> class.

src/Regula.DocumentReader.WebClient/Regula.DocumentReader.WebClient.csproj

@@ -6,8 +6,8 @@
     <Product>DocumentReader WebClient</Product>
     <PackageTags>regula document processing id card rfid ocr barcode ipi</PackageTags>
     <PackageId>Regula.DocumentReader.WebClient</PackageId>
-    <PackageVersion>5.2.0</PackageVersion>
-    <Version>1.0.1</Version>
+    <PackageVersion>5.2.1</PackageVersion>
+    <Version>5.2.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JsonSubTypes" Version="1.7.0" />

src/Regula.DocumentReader.WebClientTest/Regula.DocumentReader.WebClientTest.csproj

@@ -17,6 +17,9 @@
       <None Update="response.json">
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </None>
+      <None Update="raw_response.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
     </ItemGroup>
 
     <ItemGroup>

src/Regula.DocumentReader.WebClientTest/ResponseTest.cs

@@ -1,5 +1,7 @@
+using System.Collections.Generic;
 using System.IO;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using Regula.DocumentReader.WebClient.Model;
 using Regula.DocumentReader.WebClient.Model.Ext;
@@ -28,7 +30,15 @@ public void ShouldProcessValidResponse()
         [Test]
         public void ShouldProcessRawResultType()
         {
-            Assert.Fail();
+            var response = GetResponseFromFile("raw_response.json");
+            var rawResultItem = response.OriginalResponse.ContainerList.List[0] as IDictionary<string, object>;
+            
+            Assert.IsNotNull(rawResultItem);
+            Assert.AreEqual(6, rawResultItem.Count);
+
+            var jsonObj = rawResultItem["Raw"] as JObject;
+            Assert.IsNotNull(jsonObj);
+            Assert.AreEqual(0, (int)jsonObj["overallStatus"]);
         }
 
         private static RecognitionResponse GetResponseFromFile(string fileName)

src/Regula.DocumentReader.WebClientTest/raw_response.json

@@ -0,0 +1,50 @@
+{
+    "ChipPage": 2,
+    "ContainerList": {
+        "Count": 4,
+        "List": [
+            {
+                "Raw": {
+                    "detailsOptical": {
+                        "docType": 1,
+                        "expiry": 0,
+                        "imageQA": 1,
+                        "mrz": 0,
+                        "overallStatus": 0,
+                        "pagesCount": 2,
+                        "security": 2,
+                        "text": 0
+                    },
+                    "detailsRFID": {
+                        "AA": 2,
+                        "BAC": 2,
+                        "CA": 2,
+                        "PA": 2,
+                        "PACE": 2,
+                        "TA": 2,
+                        "overallStatus": 2
+                    },
+                    "optical": 0,
+                    "overallStatus": 0,
+                    "portrait": 2,
+                    "rfid": 2,
+                    "stopList": 2
+                },
+                "buf_length": 80,
+                "light": 0,
+                "list_idx": 0,
+                "page_idx": 0,
+                "result_type": 0
+            }    
+        ]
+    },
+    "ProcessingFinished": 1,
+    "TransactionInfo": {
+        "ComputerName": "SATSUKEVICH877",
+        "DateTime": "2020-09-17T13:27:46.296Z",
+        "TransactionID": "c08681b6-80b1-4070-b6b8-efb80ec38f9c",
+        "UserName": "SYSTEM"
+    },
+    "elapsedTime": 391,
+    "morePagesAvailable": 0
+}