Closes #2

OpenMAVN · May 14, 2020 · d0191dc · d0191dc
1 parent 5e92661
commit d0191dc
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 5 deletions.
diff --git a/...Service.PayrexxIntegration.Domain/Services/IPartnerIntegrationPropertiesFetcherService.cs b/...Service.PayrexxIntegration.Domain/Services/IPartnerIntegrationPropertiesFetcherService.cs
@@ -9,5 +9,7 @@ public interface IPartnerIntegrationPropertiesService
         List<IntegrationProperty> GetIntegrationProperties();
 
         Task<PayrexxIntegrationProperties> FetchPropertiesAsync(Guid partnerId);
+
+        PayrexxIntegrationProperties DeserializePayrexxIntegrationProperties(string paymentIntegrationProperties);
     }
 }
diff --git a/...e.PayrexxIntegration.DomainServices/MAVN.Service.PayrexxIntegration.DomainServices.csproj b/...e.PayrexxIntegration.DomainServices/MAVN.Service.PayrexxIntegration.DomainServices.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="9.0.0" />
-    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.2.0" />
+    <PackageReference Include="MAVN.Service.CustomerProfile.Client" Version="1.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MAVN.Service.PayrexxIntegration.Domain\MAVN.Service.PayrexxIntegration.Domain.csproj" />

diff --git a/src/MAVN.Service.PayrexxIntegration.DomainServices/PartnerIntegrationPropertiesService.cs b/src/MAVN.Service.PayrexxIntegration.DomainServices/PartnerIntegrationPropertiesService.cs
@@ -52,11 +52,34 @@ public async Task<PayrexxIntegrationProperties> FetchPropertiesAsync(Guid partne
             if (partnerIntegrationProperties.ErrorCode != PaymentProviderDetailsErrorCodes.None)
                 return new PayrexxIntegrationProperties { ErrorCode = IntegrationPropertiesErrorCode.PartnerConfigurationNotFound };
 
-            var jobj = (JObject)JsonConvert.DeserializeObject(partnerIntegrationProperties.PaymentProviderDetails.PaymentIntegrationProperties);
+            return DeserializePayrexxIntegrationProperties(partnerIntegrationProperties.PaymentProviderDetails.PaymentIntegrationProperties);
+        }
+
+        public PayrexxIntegrationProperties DeserializePayrexxIntegrationProperties(string paymentIntegrationProperties)
+        {
+            JObject jobj;
+            try
+            {
+                jobj = (JObject)JsonConvert.DeserializeObject(paymentIntegrationProperties);
+            }
+            catch
+            {
+                return new PayrexxIntegrationProperties
+                {
+                    ErrorCode = IntegrationPropertiesErrorCode.Fail
+                };
+            }
 
             var instance = jobj[Constants.InstanceJsonProperty]?.ToString();
+
             if (string.IsNullOrWhiteSpace(instance))
-                return new PayrexxIntegrationProperties { ErrorCode = IntegrationPropertiesErrorCode.PartnerConfigurationPropertyIsMissing };
+            {
+                return new PayrexxIntegrationProperties
+                {
+                    ErrorCode = IntegrationPropertiesErrorCode.PartnerConfigurationPropertyIsMissing
+                };
+            }
+
             var apiKey = jobj[Constants.ApiKeyJsonProperty]?.ToString();
 
             return new PayrexxIntegrationProperties

diff --git a/src/MAVN.Service.PayrexxIntegration/Controllers/PayrexxIntegrationController.cs b/src/MAVN.Service.PayrexxIntegration/Controllers/PayrexxIntegrationController.cs
@@ -71,7 +71,11 @@ public Task<List<string>> GetPaymentIntegrationSupportedCurrenciesAsync()
         [ProducesResponseType(typeof(CheckIntegrationErrorCode), (int)HttpStatusCode.OK)]
         public async Task<CheckIntegrationErrorCode> CheckPaymentIntegrationAsync([FromBody] CheckPaymentIntegrationRequest request)
         {
-            var integrationProperties = await _partnerIntegrationPropertiesFetcherService.FetchPropertiesAsync(request.PartnerId);
+            var integrationProperties = string.IsNullOrEmpty(request.PaymentIntegrationProperties)
+                ? await _partnerIntegrationPropertiesFetcherService.FetchPropertiesAsync(request.PartnerId)
+                :  _partnerIntegrationPropertiesFetcherService.DeserializePayrexxIntegrationProperties(
+                    request.PaymentIntegrationProperties);
+
             if (integrationProperties.ErrorCode != IntegrationPropertiesErrorCode.None)
                 return _mapper.Map<CheckIntegrationErrorCode>(integrationProperties.ErrorCode);
 

diff --git a/src/MAVN.Service.PayrexxIntegration/MAVN.Service.PayrexxIntegration.csproj b/src/MAVN.Service.PayrexxIntegration/MAVN.Service.PayrexxIntegration.csproj
@@ -24,7 +24,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="7.0.0" />
     <PackageReference Include="LykkeBiz.Sdk" Version="1.0.0" />
-    <PackageReference Include="MAVN.Service.PaymentIntegrationPlugin.Client" Version="1.11.0" />
+    <PackageReference Include="MAVN.Service.PaymentIntegrationPlugin.Client" Version="1.14.0" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
   </ItemGroup>
   <ItemGroup>