Improve OCPI import, fix country code mapping

Author: webprofusion-chrisc

API/OCM.Net/OCM.API.Model/OCPI/OCPIDataAdapter.cs

@@ -60,17 +60,20 @@ private string GetCountryCodeFromISO3(string srcISO)
             foreach (var i in source)
             {
 
-                var iso2Code = i.Country_code;
+                // Country_Code is the CPO owner country code, not the location country code
+                // Country is the specified country code for the location but we fall back to the CPO owner country code if not specified
 
-                if (string.IsNullOrEmpty(iso2Code) && i.Country != null)
+                var iso2Code = GetCountryCodeFromISO3(i.Country);
+
+                if (string.IsNullOrEmpty(iso2Code) && i.Country_code != null)
                 {
-                    if (i.Country.Length == 2)
+                    if (i.Country_code.Length == 2)
                     {
-                        iso2Code = i.Country.ToUpper();
+                        iso2Code = i.Country_code.ToUpper();
                     }
                     else
                     {
-                        iso2Code = GetCountryCodeFromISO3(i.Country);
+                        iso2Code = GetCountryCodeFromISO3(i.Country_code);
                     }
                 }
 

Import/OCM.Import.Common/ImportManager.cs

@@ -287,7 +287,7 @@ public async Task<List<ChargePoint>> DeDuplicateList(List<ChargePoint> cpList, b
                 var allPOIs = new List<ChargePoint>();
                 int? greaterThanId = null;
                 bool moreData = true;
-                const int pageSize = 1000; // adjust as needed for API limits
+                const int pageSize = 10000; // adjust as needed for API limits
 
                 do
                 {

Import/OCM.Import.Worker/Worker.cs

@@ -46,7 +46,7 @@ private async void PerformTasks(object? state)
                 _logger.LogInformation("Checking import status..");
 
                 var tempPath = Path.GetTempPath();
-         
+
                 try
                 {
                     var status = new ImportStatus { DateLastImport = DateTime.UtcNow, LastImportedProvider = "", LastImportStatus = "Started" };
@@ -89,7 +89,7 @@ private async void PerformTasks(object? state)
 
                         var apiKeys = _config.AsEnumerable().Where(k => k.Key.StartsWith("OCPI-") || k.Key.StartsWith("IMPORT-")).ToDictionary(k => k.Key, v => v.Value);
 
-                      
+
                         var importManager = new ImportManager(_settings, apiKeys["IMPORT-ocm-system"], _logger);
 
                         var importedOK = await importManager.PerformImportProcessing(

Tests/OCM.API.Tests/ImportTests/TestOCPIConversions.cs

@@ -258,9 +258,6 @@ async Task CanConvertFromOCPI_MobiePt()
             // ensure power KW does not exceed a reasonable value
             Assert.Empty(poiResults.Where(p => p.Connections.Any(c => c.PowerKW > 2000)));
 
-            var output = JsonConvert.SerializeObject(poiResults, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
-
-            System.IO.File.WriteAllText("C:\\temp\\ocm\\ocpi.json", output);
         }
 
         [Fact]
@@ -379,6 +376,13 @@ async Task CanConvertFromOCPI_PowerGO()
 
             Assert.Equal(489, poiResults.Count());
 
+
+            // check that we have POIs in both Norway and Netherlands
+            var countries = poiResults.Select(p => p.AddressInfo.CountryID).Distinct().ToList();
+
+            Assert.Contains(159, countries); // Netherlands
+            Assert.Contains(168, countries); // Norway
+
             var unmappedOperators = adapter.GetPostProcessingUnmappedOperators();
 
             foreach (var o in unmappedOperators.OrderByDescending(i => i.Value))
@@ -407,7 +411,7 @@ async Task CanConvertFromOCPI_PUnkt()
 
             var poiResults = adapter.Process(coreRefData).ToList();
 
-            Assert.Equal(100, poiResults.Count());
+            Assert.Equal(489, poiResults.Count());
 
             var unmappedOperators = adapter.GetPostProcessingUnmappedOperators();