Remove dependencies of Migration.Tool.Core.K11 on Migration.Tool.KXP

Refactor: Remove dependencies of Migration.Tool.Core.K11 on Migration.Tool.KXP
Kentico · Nov 15, 2024 · 0deb203 · 0deb203
1 parent 3324963
commit 0deb203
Show file tree

Hide file tree

Showing 17 changed files with 228 additions and 459 deletions.
diff --git a/Migration.Tool.Core.K11/Handlers/MigrateContactManagementCommandHandler.cs b/Migration.Tool.Core.K11/Handlers/MigrateContactManagementCommandHandler.cs
@@ -178,7 +178,7 @@ private ValueInterceptorResult ContactValueInterceptor(int ordinal, string colum
                             s => s.UserGuid,
                             sourceUserId,
                             t => t.MemberID,
-                            guid => MemberInfo.Provider.Get(guid)
+                            MemberInfo.Provider.Get
                         ) is { Success: true, Mapped: { } memberId })
                     {
                         return ValueInterceptorResult.ReplaceValue(memberId);

diff --git a/Migration.Tool.Core.KX13/Contexts/KeyMappingContext.cs b/Migration.Tool.Core.KX13/Contexts/KeyMappingContext.cs
@@ -11,15 +11,15 @@ public class KeyMappingContext(PrimaryKeyMappingContext primaryKeyMappingContext
     public MapSourceKeyResult<TTargetKey> MapSourceKey<TSource, TTarget, TTargetKey>(Expression<Func<TSource, object>> sourceKeySelector,
         Expression<Func<TSource, Guid>> sourceGuidSelector,
         object? sourceKey,
-        Expression<Func<TTarget, TTargetKey>> targetKeySelector,
-        Expression<Func<TTarget, Guid>> targetGuidSelector) where TSource : class where TTarget : class
+        Func<TTarget, TTargetKey> targetKeySelector,
+        Func<Guid, TTarget?> targetByGuidProvider) where TSource : class where TTarget : class
     {
         if (sourceKey is int id && primaryKeyMappingContext.MapSourceId(sourceKeySelector, id) is { Success: true, MappedId: TTargetKey targetKey })
         {
             return new MapSourceKeyResult<TTargetKey>(true, targetKey);
         }
 
-        if (keyLocatorService.TryLocate(sourceKeySelector, targetKeySelector, sourceGuidSelector, targetGuidSelector, sourceKey, out var located))
+        if (keyLocatorService.TryLocate(sourceKeySelector, targetKeySelector, sourceGuidSelector, targetByGuidProvider, sourceKey, out var located))
         {
             return new MapSourceKeyResult<TTargetKey>(true, located);
         }

diff --git a/Migration.Tool.Core.KX13/DependencyInjectionExtensions.cs b/Migration.Tool.Core.KX13/DependencyInjectionExtensions.cs
@@ -1,4 +1,6 @@
+using CMS.ContactManagement;
 using CMS.DataEngine;
+using CMS.DataProtection;
 using CMS.FormEngine;
 using CMS.Globalization;
 using CMS.MediaLibrary;
@@ -18,7 +20,6 @@
 using Migration.Tool.Core.KX13.Helpers;
 using Migration.Tool.Core.KX13.Mappers;
 using Migration.Tool.Core.KX13.Services;
-using Migration.Tool.KXP.Models;
 
 namespace Migration.Tool.Core.KX13;
 
@@ -47,18 +48,17 @@ public static IServiceCollection UseKx13ToolCore(this IServiceCollection service
 
         // mappers
         services.AddTransient<IEntityMapper<CmsAttachmentMapperSource, MediaFileInfo>, CmsAttachmentMapper>();
-        services.AddTransient<IEntityMapper<KX13M.CmsConsent, CmsConsent>, CmsConsentMapper>();
-        services.AddTransient<IEntityMapper<KX13M.CmsConsentAgreement, CmsConsentAgreement>, CmsConsentAgreementMapper>();
-        services.AddTransient<IEntityMapper<KX13M.CmsConsentArchive, CmsConsentArchive>, CmsConsentArchiveMapper>();
+        services.AddTransient<IEntityMapper<KX13M.CmsConsent, ConsentInfo>, CmsConsentMapper>();
+        services.AddTransient<IEntityMapper<KX13M.CmsConsentAgreement, ConsentAgreementInfo>, CmsConsentAgreementMapper>();
+        services.AddTransient<IEntityMapper<KX13M.CmsConsentArchive, ConsentArchiveInfo>, CmsConsentArchiveMapper>();
         services.AddTransient<IEntityMapper<AlternativeFormMapperSource, AlternativeFormInfo>, AlternativeFormMapper>();
         services.AddTransient<IEntityMapper<KX13M.CmsRole, RoleInfo>, RoleInfoMapper>();
-        services.AddTransient<IEntityMapper<KX13M.CmsSettingsCategory, CmsSettingsCategory>, CmsSettingsCategoryMapper>();
         services.AddTransient<IEntityMapper<KX13M.CmsSettingsKey, SettingsKeyInfo>, CmsSettingsKeyMapper>();
         services.AddTransient<IEntityMapper<KX13M.CmsUser, UserInfo>, UserInfoMapper>();
         services.AddTransient<IEntityMapper<MemberInfoMapperSource, MemberInfo>, MemberInfoMapper>();
         services.AddTransient<IEntityMapper<KX13M.CmsUserRole, UserRoleInfo>, UserRoleInfoMapper>();
-        services.AddTransient<IEntityMapper<KX13M.OmContactGroup, OmContactGroup>, OmContactGroupMapper>();
-        services.AddTransient<IEntityMapper<KX13M.OmContactStatus, OmContactStatus>, OmContactStatusMapper>();
+        services.AddTransient<IEntityMapper<KX13M.OmContactGroup, ContactGroupInfo>, OmContactGroupMapper>();
+        services.AddTransient<IEntityMapper<KX13M.OmContactStatus, ContactStatusInfo>, OmContactStatusMapper>();
         services.AddTransient<IEntityMapper<KX13M.CmsCountry, CountryInfo>, CountryInfoMapper>();
         services.AddTransient<IEntityMapper<KX13M.CmsState, StateInfo>, StateInfoMapper>();