Change/improvements (#16)

* Now works when there is a 'top' attribute in FetchXml.

Author: AshotHambardzumyan

DataMigrationUsingFetchXml/Services/ConfigReader.cs

@@ -5,6 +5,10 @@ namespace DataMigrationUsingFetchXml.Services
 {
     internal sealed class ConfigReader
     {
+        public static bool ContainsTopAttribute { get; set; }
+        public static int PageNumber { get; set; }
+        public static int PageCount { get; set; }
+
         public static List<string> GetPrimaryFields(string fetchXml, out bool idExists)
         {
             idExists = false;
@@ -29,7 +33,30 @@ public static List<string> GetPrimaryFields(string fetchXml, out bool idExists)
             return searchAttrs;
         }
 
-        public static string CreateXml(string xml, string cookie, int page, int count)
+        public static void SetPaginationAttributes(string fetchXml)
+        {
+            PageNumber = 1;
+            PageCount = 5000;
+            ContainsTopAttribute = false;
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(fetchXml);
+            XmlNodeList fetchNodes = xmlDoc.DocumentElement.SelectNodes("/fetch");
+
+            if (fetchNodes[0].Attributes["top"] != null)
+            {
+                ContainsTopAttribute = true;
+            }
+            if (fetchNodes[0].Attributes["count"] != null)
+            {
+                PageCount = System.Convert.ToInt32(fetchNodes[0].Attributes["count"].Value);
+            }
+            if (fetchNodes[0].Attributes["page"] != null)
+            {
+                PageNumber = System.Convert.ToInt32(fetchNodes[0].Attributes["page"].Value);
+            }
+        }
+
+        public static string CreateXml(string xml, string cookie)
         {
             // Load document
             XmlDocument doc = new XmlDocument();
@@ -45,11 +72,11 @@ public static string CreateXml(string xml, string cookie, int page, int count)
             }
 
             XmlAttribute pageAttr = doc.CreateAttribute("page");
-            pageAttr.Value = System.Convert.ToString(page);
+            pageAttr.Value = System.Convert.ToString(PageNumber);
             attrs.Append(pageAttr);
 
             XmlAttribute countAttr = doc.CreateAttribute("count");
-            countAttr.Value = System.Convert.ToString(count);
+            countAttr.Value = System.Convert.ToString(PageCount);
             attrs.Append(countAttr);
 
             return doc.OuterXml;

DataMigrationUsingFetchXml/Services/Implementations/DataverseService.cs

@@ -14,9 +14,7 @@ internal sealed class DataverseService : IDataverseService
         private readonly IOrganizationService _sourceService;
         private readonly IOrganizationService _targetService;
         private readonly ILogger _logger;
-        private int pageNumber = 1;
         private string pagingCookie = null;
-        private readonly int fetchCount = 5000;
 
         public DataverseService(IOrganizationService sourceService, IOrganizationService targetService, ILogger logger)
         {
@@ -32,12 +30,19 @@ public DataverseService(IOrganizationService service)
 
         public EntityCollection GetAllRecords(string fetchQuery)
         {
-            string xml = ConfigReader.CreateXml(fetchQuery, pagingCookie, pageNumber, fetchCount);
+            string xml;
+            if (ConfigReader.ContainsTopAttribute)
+            {
+                xml = fetchQuery;
+            }
+            else
+            {
+                xml = ConfigReader.CreateXml(fetchQuery, pagingCookie);
+            }
             EntityCollection returnCollection = _sourceService.RetrieveMultiple(new FetchExpression(xml));
-            
             if (returnCollection.MoreRecords)
             {
-                ++pageNumber;
+                ++ConfigReader.PageNumber;
                 pagingCookie = returnCollection.PagingCookie;
             }
             return returnCollection;
@@ -114,7 +119,10 @@ private Entity GetRecord(string entitySchemaName, string attributeSchemaName, st
         public (string logicalName, string displayName) GetEntityName(string fetchXml)
         {
             EntityCollection returnCollection = _sourceService.RetrieveMultiple(new FetchExpression(fetchXml));
-
+            if (returnCollection.Entities.Count == 0)
+            {
+                throw new Exception($"Records not found: '{returnCollection.EntityName}'");
+            }
             RetrieveEntityRequest retrieveEntityRequest = new RetrieveEntityRequest
             {
                 EntityFilters = EntityFilters.All,

DataMigrationUsingFetchXml/Services/Implementations/TransferOperation.cs

@@ -61,14 +61,15 @@ public void Transfer(List<string> fetchXmls, List<int> tableIndexesForTransfer,
 
             foreach (string fetchXml in fetchXmls)
             {
+                ConfigReader.SetPaginationAttributes(fetchXml);
                 _resultItem = new ResultItem();
                 _lblTitle.Text = $"Migrating {DisplayNames[tableIndexesForTransfer[index]]} records";
                 List<string> searchAttrs = ConfigReader.GetPrimaryFields(fetchXml, out bool idExists);
                 EntityCollection records = _dataverseService.GetAllRecords(fetchXml);
-
-                _logger.LogInfo("Getting data of '" + records.Entities[0].LogicalName + "' from source instance");
-                _resultItem.EntityName = records.Entities[0].LogicalName;
+                _logger.LogInfo("Getting data of '" + records.EntityName + "' from source instance");
+                _resultItem.EntityName = records.EntityName;
                 _logger.LogInfo("Transfering data to: " + _organizationDataServiceUrl);
+
                 do
                 {
                     _resultItem.SourceRecordCount += records.Entities.Count;
@@ -112,7 +113,6 @@ public void Transfer(List<string> fetchXmls, List<int> tableIndexesForTransfer,
                         _logger.LogError("Process Stopped. Aborting! ");
                         break;
                     }
-
                     if (!records.MoreRecords)
                     {
                         ResultItems.Add(_resultItem);
@@ -129,6 +129,10 @@ public void Transfer(List<string> fetchXmls, List<int> tableIndexesForTransfer,
                     }
                     _lblInfo.Text = $"{_resultItem.SuccessfullyGeneratedRecordCount} of { _resultItem.SourceRecordCountWithSign} {DisplayNames[tableIndexesForTransfer[index]]} is imported";
                 }
+                else
+                {
+                    _lblError.Text = string.Empty;
+                }
                 index++;
             }
         }