#75 Added serialization support for RelationshipDetails

linvi · Aug 15, 2016 · d46bda1 · d46bda1
1 parent c478e84
commit d46bda1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/Tweetinvi.Core/Core/Factories/IFriendshipFactory.cs b/Tweetinvi.Core/Core/Factories/IFriendshipFactory.cs
@@ -12,5 +12,6 @@ public interface IFriendshipFactory
 
         // Generate RelationshipAuthorizations
         IFriendshipAuthorizations GenerateFriendshipAuthorizations(bool retweetsEnabled, bool deviceNotificationEnabled);
+        IRelationshipDetails GenerateFriendshipDetailsFromJson(string json);
     }
 }
diff --git a/Tweetinvi.Core/Public/Models/Interfaces/IRelationshipDetails.cs b/Tweetinvi.Core/Public/Models/Interfaces/IRelationshipDetails.cs
@@ -1,4 +1,6 @@
-namespace Tweetinvi.Models
+using Tweetinvi.Models.DTO;
+
+namespace Tweetinvi.Models
 {
     public interface IRelationshipDetails
     {
@@ -88,5 +90,7 @@ public interface IRelationshipDetails
         /// Informs if the source has marked the user as being a spammer.
         /// </summary>
         bool MarkedSpam { get; }
+
+        IRelationshipDetailsDTO RelationshipDetailsDTO { get; set; }
     }
 }
diff --git a/Tweetinvi.Core/Tweetinvi.Core.csproj b/Tweetinvi.Core/Tweetinvi.Core.csproj
@@ -365,9 +365,7 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Core\Controllers\Transactions\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/Tweetinvi.Factories/Friendship/FriendshipFactory.cs b/Tweetinvi.Factories/Friendship/FriendshipFactory.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Tweetinvi.Core.Factories;
+using Tweetinvi.Core.Helpers;
 using Tweetinvi.Core.Injectinvi;
 using Tweetinvi.Models;
 using Tweetinvi.Models.DTO;
@@ -12,16 +13,19 @@ public class FriendshipFactory : IFriendshipFactory
         private readonly IFactory<IRelationshipDetails> _unityRelationshipFactory;
         private readonly IFactory<IRelationshipState> _unityRelationshipStateFactory;
         private readonly IFactory<IFriendshipAuthorizations> _friendshipAuthorizationUnityFactory;
+        private readonly IJsonObjectConverter _jsonObjectConverter;
 
 
         public FriendshipFactory(
             IFactory<IRelationshipDetails> unityRelationshipFactory,
             IFactory<IRelationshipState> unityRelationshipStateFactory,
-            IFactory<IFriendshipAuthorizations> friendshipAuthorizationUnityFactory)
+            IFactory<IFriendshipAuthorizations> friendshipAuthorizationUnityFactory,
+            IJsonObjectConverter jsonObjectConverter)
         {
             _unityRelationshipFactory = unityRelationshipFactory;
             _unityRelationshipStateFactory = unityRelationshipStateFactory;
             _friendshipAuthorizationUnityFactory = friendshipAuthorizationUnityFactory;
+            _jsonObjectConverter = jsonObjectConverter;
         }
 
         // Generate From DTO
@@ -37,6 +41,12 @@ public IRelationshipDetails GenerateRelationshipFromRelationshipDTO(IRelationshi
             return _unityRelationshipFactory.Create(relationshipParameter);
         }
 
+        public IRelationshipDetails GenerateFriendshipDetailsFromJson(string json)
+        {
+            var dto = _jsonObjectConverter.DeserializeObject<IRelationshipDetailsDTO>(json);
+            return GenerateRelationshipFromRelationshipDTO(dto);
+        }
+
         public IEnumerable<IRelationshipDetails> GenerateRelationshipsFromRelationshipsDTO(IEnumerable<IRelationshipDetailsDTO> relationshipDTOs)
         {
             if (relationshipDTOs == null)

diff --git a/Tweetinvi/JsonExtensions.cs b/Tweetinvi/JsonExtensions.cs
@@ -72,6 +72,7 @@ static JsonExtensions()
             var twitterListFactory = TweetinviContainer.Resolve<ITwitterListFactory>();
             var savedSearchFactory = TweetinviContainer.Resolve<ISavedSearchFactory>();
             var accountSettingsFactory = TweetinviContainer.Resolve<IAccountController>();
+            var friendshipFactory = TweetinviContainer.Resolve<IFriendshipFactory>();
 
             _getSerializableObject = new Dictionary<Type, IJsonSerializer>();
 
@@ -83,6 +84,7 @@ static JsonExtensions()
             Map<ISavedSearch, ISavedSearchDTO>(s => s.SavedSearchDTO, savedSearchFactory.GenerateSavedSearchFromJson);
             Map<IAccountSettings, IAccountSettingsDTO>(s => s.AccountSettingsDTO, accountSettingsFactory.GenerateAccountSettingsFromJson);
             Map<IOEmbedTweet, IOEmbedTweetDTO>(t => t.OembedTweetDTO, tweetFactory.GenerateOEmbedTweetFromJson);
+            Map<IRelationshipDetails, IRelationshipDetailsDTO>(r => r.RelationshipDetailsDTO, friendshipFactory.GenerateFriendshipDetailsFromJson);
             // ReSharper restore RedundantTypeArgumentsOfMethod
         }