changes after code review

Kentico · Feb 13, 2024 · 75d08f0 · 75d08f0
1 parent 739267d
commit 75d08f0
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 18 deletions.
diff --git a/src/Kentico.Xperience.CRM.Common/Configuration/ContactMappingBuilder.cs b/src/Kentico.Xperience.CRM.Common/Configuration/ContactMappingBuilder.cs
@@ -1,6 +1,5 @@
 using CMS.ContactManagement;
 using Kentico.Xperience.CRM.Common.Mapping;
-using Kentico.Xperience.CRM.Common.Mapping.Implementations;
 using Kentico.Xperience.CRM.Common.Services;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -11,8 +10,7 @@ public abstract class ContactMappingBuilder<TBuilder>
 {
     private readonly IServiceCollection serviceCollection;
     protected readonly List<ContactFieldToCRMMapping> fieldMappings = new();
-    protected readonly List<Type> converters = new();
-
+
     protected ContactMappingBuilder(IServiceCollection serviceCollection)
     {
         this.serviceCollection = serviceCollection;

diff --git a/src/Kentico.Xperience.CRM.Common/Configuration/ContactMappingConfiguration.cs b/src/Kentico.Xperience.CRM.Common/Configuration/ContactMappingConfiguration.cs
@@ -1,4 +1,4 @@
-using Kentico.Xperience.CRM.Common.Mapping.Implementations;
+using Kentico.Xperience.CRM.Common.Mapping;
 
 namespace Kentico.Xperience.CRM.Common.Configuration;
 

diff --git a/src/Kentico.Xperience.CRM.Common/Mapping/ContactFieldMappingFunction.cs b/src/Kentico.Xperience.CRM.Common/Mapping/ContactFieldMappingFunction.cs
@@ -1,6 +1,6 @@
 using CMS.ContactManagement;
 
-namespace Kentico.Xperience.CRM.Common.Mapping.Implementations;
+namespace Kentico.Xperience.CRM.Common.Mapping;
 
 public class ContactFieldMappingFunction : IContactFieldMapping
 {

diff --git a/src/Kentico.Xperience.CRM.Common/Mapping/ContactFieldNameMapping.cs b/src/Kentico.Xperience.CRM.Common/Mapping/ContactFieldNameMapping.cs
@@ -1,6 +1,6 @@
 using CMS.ContactManagement;
 
-namespace Kentico.Xperience.CRM.Common.Mapping.Implementations;
+namespace Kentico.Xperience.CRM.Common.Mapping;
 
 /// <summary>
 /// Contact Info item field mapping based on form field name

diff --git a/src/Kentico.Xperience.CRM.Common/Mapping/ContactFieldToCRMMapping.cs b/src/Kentico.Xperience.CRM.Common/Mapping/ContactFieldToCRMMapping.cs
@@ -1,4 +1,4 @@
-namespace Kentico.Xperience.CRM.Common.Mapping.Implementations;
+namespace Kentico.Xperience.CRM.Common.Mapping;
 
 /// <summary>
 /// Mapping wrapper for BizForm field mapping and Crm entity field mapping

diff --git a/src/Kentico.Xperience.CRM.Dynamics/DynamicsIntegrationGlobalEvents.cs b/src/Kentico.Xperience.CRM.Dynamics/DynamicsIntegrationGlobalEvents.cs
@@ -42,8 +42,6 @@ protected override void OnInit(ModuleInitParameters parameters)
         ContactInfo.TYPEINFO.Events.Insert.After += ContactSync;
         ContactInfo.TYPEINFO.Events.Update.After += ContactSync;
 
-        Service.Resolve<ICRMModuleInstaller>().Install(CRMType.Dynamics);
-
         RequestEvents.RunEndRequestTasks.Execute += (_, _) =>
         {
             DynamicsSyncQueueWorker.Current.EnsureRunningThread();

diff --git a/src/Kentico.Xperience.CRM.Dynamics/Synchronization/DynamicsContactsIntegrationService.cs b/src/Kentico.Xperience.CRM.Dynamics/Synchronization/DynamicsContactsIntegrationService.cs
@@ -3,7 +3,6 @@
 using Kentico.Xperience.CRM.Common.Constants;
 using Kentico.Xperience.CRM.Common.Converters;
 using Kentico.Xperience.CRM.Common.Mapping;
-using Kentico.Xperience.CRM.Common.Mapping.Implementations;
 using Kentico.Xperience.CRM.Common.Services;
 using Kentico.Xperience.CRM.Common.Synchronization;
 using Kentico.Xperience.CRM.Dynamics.Configuration;
@@ -17,7 +16,7 @@
 
 namespace Kentico.Xperience.CRM.Dynamics.Synchronization;
 
-public class DynamicsContactsIntegrationService : IDynamicsContactsIntegrationService
+internal class DynamicsContactsIntegrationService : IDynamicsContactsIntegrationService
 {
     private readonly DynamicsContactMappingConfiguration contactMapping;
     private readonly IContactsIntegrationValidationService validationService;

diff --git a/src/Kentico.Xperience.CRM.Salesforce/Configuration/SalesforceContactMappingBuilder.cs b/src/Kentico.Xperience.CRM.Salesforce/Configuration/SalesforceContactMappingBuilder.cs
@@ -3,7 +3,6 @@
 using Kentico.Xperience.CRM.Common.Configuration;
 using Kentico.Xperience.CRM.Common.Converters;
 using Kentico.Xperience.CRM.Common.Mapping;
-using Kentico.Xperience.CRM.Common.Mapping.Implementations;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Salesforce.OpenApi;

diff --git a/src/Kentico.Xperience.CRM.Salesforce/Synchronization/SalesforceApiService.cs b/src/Kentico.Xperience.CRM.Salesforce/Synchronization/SalesforceApiService.cs
@@ -17,7 +17,7 @@ internal class SalesforceApiService : ISalesforceApiService
     private readonly IOptionsSnapshot<SalesforceIntegrationSettings> integrationSettings;
     private readonly SalesforceApiClient apiClient;
 
-    private static JsonSerializerOptions SerializerOptions = new(JsonSerializerDefaults.General)
+    private static readonly JsonSerializerOptions SerializerOptions = new(JsonSerializerDefaults.General)
     {
         Converters = { new DateTimeOffsetConverter() }
     };

diff --git a/src/Kentico.Xperience.CRM.Salesforce/Synchronization/SalesforceContactsIntegrationService.cs b/src/Kentico.Xperience.CRM.Salesforce/Synchronization/SalesforceContactsIntegrationService.cs
@@ -3,7 +3,6 @@
 using Kentico.Xperience.CRM.Common.Constants;
 using Kentico.Xperience.CRM.Common.Converters;
 using Kentico.Xperience.CRM.Common.Mapping;
-using Kentico.Xperience.CRM.Common.Mapping.Implementations;
 using Kentico.Xperience.CRM.Common.Services;
 using Kentico.Xperience.CRM.Common.Synchronization;
 using Kentico.Xperience.CRM.Salesforce.Configuration;
@@ -142,9 +141,9 @@ public async Task SynchronizeContactToContactsAsync(ContactInfo contactInfo)
                     existingContact =
                         await apiService.GetContactById(syncItem.CRMSyncItemCRMID, nameof(ContactSObject.Id));
                 }
-                catch (Exception)
+                catch (ApiException e) when (e.StatusCode == 404)
                 {
-                    //exception means de-facto 404-NotFound status
+                    //supress exception on 404-NotFound status
                 }
 
                 if (existingContact is null)

diff --git a/src/Kentico.Xperience.CRM.Salesforce/Synchronization/SalesforceLeadsIntegrationService.cs b/src/Kentico.Xperience.CRM.Salesforce/Synchronization/SalesforceLeadsIntegrationService.cs
@@ -96,9 +96,9 @@ private async Task SynchronizeLeadAsync(BizFormItem bizFormItem,
                 {
                     existingLead = await apiService.GetLeadById(syncItem.CRMSyncItemCRMID, nameof(LeadSObject.Id));
                 }
-                catch (Exception)
+                catch (ApiException e) when (e.StatusCode == 404)
                 {
-                    //exception means de-facto 404-NotFound status
+                    //suppress exception on 404-NotFound status
                 }
                 if (existingLead is null)
                 {