Remove ShopWorker entity and migrate worker identity to ApplicationUser
Removes the ShopWorker and ShopWorkerRoleCost entities, all related DTOs, mappings, controllers, views, and import/export paths. Worker identity is now handled entirely through ApplicationUser with per-user LaborCostPerHour. ShopWorkerRoleCosts table remains in production pending manual data migration. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
using System.Globalization;
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
using CsvHelper;
|
||||
using CsvHelper.Configuration;
|
||||
@@ -2164,168 +2164,6 @@ public class CsvImportService : ICsvImportService
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Shop Worker Import
|
||||
|
||||
/// <summary>
|
||||
/// Generates a downloadable CSV template with two example shop worker rows covering different roles.
|
||||
/// Two rows help users see how Role values (Coater, Sandblaster, etc.) are expressed and remind
|
||||
/// them that Role is optional — the importer will default to GeneralLabor when it is omitted.
|
||||
/// </summary>
|
||||
public byte[] GenerateShopWorkerTemplate()
|
||||
{
|
||||
using var memoryStream = new MemoryStream();
|
||||
using var writer = new StreamWriter(memoryStream);
|
||||
using var csv = new CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture));
|
||||
|
||||
csv.WriteHeader<ShopWorkerImportDto>();
|
||||
csv.NextRecord();
|
||||
|
||||
csv.WriteRecord(new ShopWorkerImportDto
|
||||
{
|
||||
Name = "John Doe",
|
||||
Role = "Coater",
|
||||
Phone = "555-1234",
|
||||
Email = "johndoe@example.com",
|
||||
IsActive = true,
|
||||
Notes = "Experienced powder coater"
|
||||
});
|
||||
csv.NextRecord();
|
||||
|
||||
csv.WriteRecord(new ShopWorkerImportDto
|
||||
{
|
||||
Name = "Jane Smith",
|
||||
Role = "Sandblaster",
|
||||
Phone = "555-5678",
|
||||
Email = "janesmith@example.com",
|
||||
IsActive = true,
|
||||
Notes = ""
|
||||
});
|
||||
csv.NextRecord();
|
||||
|
||||
writer.Flush();
|
||||
return memoryStream.ToArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Imports shop workers from a CSV stream using an upsert strategy keyed on worker Name.
|
||||
/// Like vendor import, this is intentionally an upsert rather than insert-only so that a
|
||||
/// company can re-import their HR list to update phone/email/role details without worrying
|
||||
/// about creating duplicates. Role is parsed case-insensitively with spaces stripped so that
|
||||
/// "General Labor" and "GeneralLabor" are both accepted; an unrecognised role falls back to
|
||||
/// GeneralLabor with a warning rather than failing the row.
|
||||
/// </summary>
|
||||
/// <param name="csvStream">Readable stream of CSV data (header row required).</param>
|
||||
/// <param name="companyId">Tenant company that will own newly inserted worker records.</param>
|
||||
public async Task<CsvImportResultDto> ImportShopWorkersAsync(Stream csvStream, int companyId)
|
||||
{
|
||||
var result = new CsvImportResultDto();
|
||||
var rowNumber = 0;
|
||||
|
||||
try
|
||||
{
|
||||
using var reader = new StreamReader(csvStream);
|
||||
using var csv = new CsvReader(reader, new CsvConfiguration(CultureInfo.InvariantCulture)
|
||||
{
|
||||
HeaderValidated = null,
|
||||
MissingFieldFound = null
|
||||
});
|
||||
|
||||
var records = csv.GetRecords<ShopWorkerImportDto>().ToList();
|
||||
result.TotalRows = records.Count;
|
||||
|
||||
_logger.LogInformation("Starting import of {Count} shop workers for company {CompanyId}", records.Count, companyId);
|
||||
|
||||
// Load existing workers for upsert matching by name
|
||||
var existingWorkers = await _unitOfWork.ShopWorkers.GetAllAsync();
|
||||
var workerDict = existingWorkers
|
||||
.Where(w => !string.IsNullOrEmpty(w.Name))
|
||||
.GroupBy(w => w.Name.Trim().ToUpperInvariant())
|
||||
.ToDictionary(g => g.Key, g => g.First());
|
||||
|
||||
foreach (var record in records)
|
||||
{
|
||||
rowNumber++;
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(record.Name))
|
||||
{
|
||||
result.Errors.Add($"Row {rowNumber}: Name is required.");
|
||||
result.ErrorCount++;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Parse role
|
||||
ShopWorkerRole role = ShopWorkerRole.GeneralLabor;
|
||||
if (!string.IsNullOrEmpty(record.Role))
|
||||
{
|
||||
if (!Enum.TryParse<ShopWorkerRole>(record.Role.Replace(" ", ""), true, out role))
|
||||
{
|
||||
result.Warnings.Add($"Row {rowNumber}: Role '{record.Role}' not recognized. Valid values: GeneralLabor, Sandblaster, Coater, Masker, QualityControl, OvenOperator, Supervisor, Maintenance. Using 'GeneralLabor'.");
|
||||
role = ShopWorkerRole.GeneralLabor;
|
||||
}
|
||||
}
|
||||
|
||||
var key = record.Name.Trim().ToUpperInvariant();
|
||||
var now = DateTime.UtcNow;
|
||||
|
||||
if (workerDict.TryGetValue(key, out var existing))
|
||||
{
|
||||
// Update
|
||||
existing.Role = role;
|
||||
existing.Phone = record.Phone ?? existing.Phone;
|
||||
existing.Email = record.Email ?? existing.Email;
|
||||
if (record.IsActive.HasValue) existing.IsActive = record.IsActive.Value;
|
||||
existing.Notes = record.Notes ?? existing.Notes;
|
||||
existing.UpdatedAt = now;
|
||||
|
||||
await _unitOfWork.CompleteAsync();
|
||||
result.Warnings.Add($"Row {rowNumber}: Updated existing shop worker '{record.Name}'.");
|
||||
result.SuccessCount++;
|
||||
}
|
||||
else
|
||||
{
|
||||
var worker = new Core.Entities.ShopWorker
|
||||
{
|
||||
CompanyId = companyId,
|
||||
Name = record.Name.Trim(),
|
||||
Role = role,
|
||||
Phone = record.Phone,
|
||||
Email = record.Email,
|
||||
IsActive = record.IsActive ?? true,
|
||||
Notes = record.Notes,
|
||||
CreatedAt = now,
|
||||
UpdatedAt = now
|
||||
};
|
||||
|
||||
await _unitOfWork.ShopWorkers.AddAsync(worker);
|
||||
await _unitOfWork.CompleteAsync();
|
||||
result.SuccessCount++;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Errors.Add($"Row {rowNumber}: Database error - {ex.Message}");
|
||||
result.ErrorCount++;
|
||||
_logger.LogError(ex, "Error saving shop worker at row {RowNumber}", rowNumber);
|
||||
}
|
||||
}
|
||||
|
||||
_logger.LogInformation("Shop worker import completed: {SuccessCount} succeeded, {ErrorCount} failed", result.SuccessCount, result.ErrorCount);
|
||||
result.Success = result.SuccessCount > 0;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Errors.Add($"Fatal error: {ex.Message}");
|
||||
result.Success = false;
|
||||
_logger.LogError(ex, "Fatal error importing shop workers");
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Prep Service Import
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user