Import Desc1 to D1

This commit is contained in:
Michał Zieliński
2025-06-10 16:59:06 +02:00
parent adb53fb36c
commit 23279d55af
4 changed files with 17 additions and 77 deletions

View File

@@ -46,8 +46,7 @@ public class MorskaD1Importer : MorskaBaseImporter
{
_logger.LogInformation("{ImporterType}: Starting import for {ImportWorkerName} ({ImportWorkerId})",
ImporterType, importWorker.Name, importWorker.Id);
// ✅ Clear cache at start
_cachedSheetData = null;
_cachedDataKey = null;
@@ -75,13 +74,11 @@ public class MorskaD1Importer : MorskaBaseImporter
}
finally
{
// ✅ Clear cache after import
_cachedSheetData = null;
_cachedDataKey = null;
}
}
// ✅ Dodaj metodę cache
private IList<IList<object>>? GetSheetData()
{
var currentDataKey = $"{SheetId}#{SheetTabName}#{DataRange}";
@@ -212,7 +209,6 @@ public class MorskaD1Importer : MorskaBaseImporter
try
{
// ✅ Użyj cache zamiast bezpośredniego API
var data = GetSheetData();
if (data == null || data.Count < 2)
@@ -252,6 +248,18 @@ public class MorskaD1Importer : MorskaBaseImporter
isUpToDate = false;
}
}
// check also Desc1 from records (Value18 in GSheet)
if (row.Count <= 18) continue;
var sheetDesc1 = row[18]?.ToString();
var recordDesc1 = record.Desc1;
var normalizedSheetDesc1 = string.IsNullOrEmpty(sheetDesc1) ? null : sheetDesc1;
var normalizedRecordDesc1 = string.IsNullOrEmpty(recordDesc1) ? null : recordDesc1;
if (normalizedSheetDesc1 == normalizedRecordDesc1) continue;
_logger.LogDebug("{ImporterType}: Desc1 mismatch for code {Code}: DB={DbValue}, Sheet={SheetValue}",
ImporterType, code, normalizedRecordDesc1, normalizedSheetDesc1);
isUpToDate = false;
}
_logger.LogDebug("{ImporterType}: Layer {ImportWorkerName} is {Status}",
@@ -287,7 +295,6 @@ public class MorskaD1Importer : MorskaBaseImporter
try
{
// ✅ Użyj cache zamiast bezpośredniego API
var data = GetSheetData();
_logger.LogDebug("{ImporterType}: Using data with {RowCount} rows from cache",
@@ -314,6 +321,7 @@ public class MorskaD1Importer : MorskaBaseImporter
Value13 = IndexExists(t, 15) ? ParseValue(t[15]?.ToString()) : null,
Value14 = IndexExists(t, 16) ? ParseValue(t[16]?.ToString()) : null,
Value15 = IndexExists(t, 17) ? ParseValue(t[17]?.ToString()) : null,
Desc1 = IndexExists(t, 18) ? t[18]?.ToString() : null,
CreatedAt = DateTime.UtcNow,
ModifiedAt = DateTime.UtcNow
}).ToList();