Skip to content

Update file details mapping in FileImportHandler #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartFerguson merged 2 commits into from
May 20, 2026
Merged

Update file details mapping in FileImportHandler #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7211c
Update file details mapping in FileImportHandler
StuartFerguson May 20, 2026
a37a5da
fix failing unit test
StuartFerguson May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,6 +1489,9 @@ join fl in context.FileLines on f.FileId equals fl.FileId
return ResultHelpers.CreateFailure(flatResult);

var flatItems = flatResult.Data;

if (flatItems.Count == 0)
return Result.NotFound();

var fileImportLogs = flatItems
.GroupBy(x => new { x.FileImportLogId, x.ImportLogDateTime })
Expand Down
13 changes: 6 additions & 7 deletions EstateReportingAPI/Handlers/FileImportHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ public static async Task<IResult> GetFileImportLog([FromHeader] Guid estateId,
FileImportLogQueries.GetFileImportLogQuery query = new(estateId, merchantId, fileImportLogId);
Result<FileImportLog> result = await mediator.Send(query, cancellationToken);

if (result.IsSuccess && result.Data == null)
{
return Results.NotFound();
}

return ResponseFactory.FromResult(result, r => new DataTransferObjects.FileImportLog
{
FileImportLogId = r.FileImportLogId,
Expand All @@ -63,8 +58,12 @@ public static async Task<IResult> GetFileImportLog([FromHeader] Guid estateId,
{
DateTimeUploaded = fd.DateTimeUploaded,
FileId = fd.FileId,
FileName = fd.FileName,
FileProfile = fd.FileProfile,
FileName = Path.GetFileName(fd.FileName),
FileProfile = fd.FileProfile.ToUpper() switch {
"B2A59ABF-293D-4A6B-B81B-7007503C3476" => "Safaricom Topup",
"8806EDBC-3ED6-406B-9E5F-A9078356BE99" => "Voucher Issue",
_ => "Unknown"
},
MerchantId = fd.MerchantId,
MerchantName = fd.MerchantName,
UploadedBy = fd.UploadedBy,
Expand Down
Loading