Added dotnet core 2.2 as Targeting framework (#25)

Co-authored-by: Prashant Choudhary <[email protected]>

Author: prashantchoudhary

src/stream-net-tests/IntegrationTests.cs

@@ -2299,12 +2299,49 @@ public async Task TestEnrich_OwnReaction()
 
             var enrichedAct = enriched.Results.First();
 
-            Assert.True(enrichedAct.OwnReactions.ContainsKey(reaction.Kind));
+            Assert.True(enrichedAct.OwnReactions.ContainsKey(reaction.Kind));
+            
             Assert.AreEqual(reaction.ID, enrichedAct.OwnReactions[reaction.Kind].FirstOrDefault().ID);
             Assert.AreEqual(reaction.Kind, enrichedAct.OwnReactions[reaction.Kind].FirstOrDefault().Kind);
-            Assert.AreEqual(reaction.UserID, enrichedAct.OwnReactions[reaction.Kind].FirstOrDefault().UserID);
+            Assert.AreEqual(reaction.UserID, enrichedAct.OwnReactions[reaction.Kind].FirstOrDefault().UserID);
         }
 
+        [Test]
+        public async Task TestEnrich_User_InReaction()
+        {
+            var userData = new Dictionary<string, object>()
+            {
+                {"is_admin", true},
+                {"nickname","bobby"}
+            };
+            var u = await this._client.Users.Add(Guid.NewGuid().ToString(), userData);
+            var uRef = u.Ref();
+
+            var a = new Stream.Activity(uRef, "add", "post");
+            var act = await this._user1.AddActivity(a);
+
+            var reaction = await this._client.Reactions.Add("like", act.Id, u.ID);
+
+            var enriched = await this._user1.GetEnrichedFlatActivities(GetOptions.Default.WithReaction(ReactionOption.With().Own()));
+
+            Assert.AreEqual(1, enriched.Results.Count());
+
+            var enrichedAct = enriched.Results.First();
+
+            Assert.True(enrichedAct.OwnReactions.ContainsKey(reaction.Kind));
+            var ownReaction = enrichedAct.OwnReactions[reaction.Kind].FirstOrDefault();
+
+            Assert.AreEqual(reaction.ID, ownReaction.ID);
+            Assert.AreEqual(reaction.Kind, ownReaction.Kind);
+            Assert.AreEqual(reaction.UserID, ownReaction.UserID);
+            Assert.AreEqual(reaction.UserID, ownReaction.User.Enriched?.GetData<string>("id"));
+            Assert.AreEqual("bobby", ownReaction.User.Enriched?.GetData<Dictionary<string, object>>("data")["nickname"] as string);
+            Assert.AreEqual(true, (bool)ownReaction.User.Enriched?.GetData<Dictionary<string, object>>("data")["is_admin"]);
+        }
+
+
+
+
         [Test]
         public async Task TestEnrich_LatestReactions()
         {
@@ -2383,7 +2420,8 @@ public async Task TestEnrich()
 
             var enrichedAct = enriched.Results.First();
 
-            Assert.True(enrichedAct.LatestReactions.ContainsKey(reaction.Kind));
+            Assert.True(enrichedAct.LatestReactions.ContainsKey(reaction.Kind));
+
             Assert.AreEqual(reaction.ID, enrichedAct.LatestReactions[reaction.Kind].FirstOrDefault().ID);
             Assert.AreEqual(reaction.Kind, enrichedAct.LatestReactions[reaction.Kind].FirstOrDefault().Kind);
             Assert.AreEqual(reaction.UserID, enrichedAct.LatestReactions[reaction.Kind].FirstOrDefault().UserID);

src/stream-net-tests/stream-net-tests.csproj

@@ -9,12 +9,12 @@
   <ItemGroup>
     <PackageReference Include="coveralls.io" Version="1.4.2" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens.JWT" Version="0.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="NUnit" Version="3.9.0" />
-    <PackageReference Include="NUnit.Console" Version="3.7.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
-    <PackageReference Include="OpenCover" Version="4.6.519" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit.Console" Version="3.10.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="OpenCover" Version="4.7.922" />
     <ProjectReference Include="..\stream-net\stream-net.csproj">
       <Name>stream-net</Name>
     </ProjectReference>

src/stream-net/EnrichableField.cs

@@ -23,8 +23,7 @@ public bool IsEnriched
         {
             get
             {
-                var tst = _data as GenericData;
-                return tst != null;
+                return _data is GenericData;
             }
             set { }
         }
@@ -56,4 +55,19 @@ internal static EnrichableField FromJSON(JToken token)
 
 
     };
+
+
+    public class EnrichableFieldConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType) => false;
+        public override bool CanWrite => false;
+        public override bool CanRead => true;
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotImplementedException();
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            return EnrichableField.FromJSON(JToken.Load(reader));
+        }
+    }
 }

src/stream-net/Reactions.cs

@@ -3,6 +3,7 @@
 using Stream.Rest;
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 using System.Threading.Tasks;
 
 namespace Stream
@@ -37,6 +38,9 @@ public class Reaction
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "user_id")]
         public string UserID { get; internal set; }
 
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "user"), JsonConverter(typeof(EnrichableFieldConverter))]
+        public EnrichableField User { get; internal set; }
+
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore, PropertyName = "data")]
         public IDictionary<string, object> Data { get; internal set; }
 

src/stream-net/stream-net.csproj

@@ -3,7 +3,7 @@
     <DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net45;net461;netcoreapp1.0;netstandard1.6;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netcoreapp1.0;netcoreapp2.2;netstandard1.6;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>stream-net</PackageId>
@@ -21,7 +21,7 @@
     <DefineConstants>NET45</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45'">
     <Reference Include="System" />