Skip to content
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

Add tvd and custom ids #1769

Merged
merged 14 commits into from
Dec 19, 2024
Merged

Add tvd and custom ids #1769

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
55e2b4a
Use export controller with csvConfig
MiraGeowerkstatt Dec 16, 2024
51170e3
Fix endpoint path
MiraGeowerkstatt Dec 17, 2024
f1816e8
Add LV03 to export
MiraGeowerkstatt Dec 17, 2024
21bcb31
Fix warning
MiraGeowerkstatt Dec 17, 2024
797f161
Fix export controller test
MiraGeowerkstatt Dec 17, 2024
9304498
Fix csv indexes
MiraGeowerkstatt Dec 17, 2024
3e371cc
Merge branch 'main' into add-tvd-and-custom-ids
MiraGeowerkstatt Dec 17, 2024
452b939
Fix some sonar cloud issues
MiraGeowerkstatt Dec 17, 2024
3b77068
Reuse csv config
MiraGeowerkstatt Dec 17, 2024
f2f9c74
Remove unused fields
MiraGeowerkstatt Dec 17, 2024
6850af3
Add missing imports
MiraGeowerkstatt Dec 17, 2024
e295724
Add export statements to test
MiraGeowerkstatt Dec 17, 2024
5efda6f
Improve ExportController
MiraGeowerkstatt Dec 17, 2024
ff824f2
Make GetBoreholeCodelists static
MiraGeowerkstatt Dec 17, 2024
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
12 changes: 8 additions & 4 deletions src/api/Controllers/ExportController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ public async Task<IActionResult> ExportCsvAsync([FromQuery][MaxLength(MaxPageSiz
if (idList.Count < 1) return BadRequest("The list of IDs must not be empty.");

var boreholes = await context.Boreholes
.Include(b => b.BoreholeCodelists)
.ThenInclude(bc => bc.Codelist)
.Include(b => b.BoreholeCodelists).ThenInclude(bc => bc.Codelist)
.Where(borehole => idList.Contains(borehole.Id))
.OrderBy(b => idList.IndexOf(b.Id))
.ToListAsync()
Expand Down Expand Up @@ -85,7 +84,7 @@ public async Task<IActionResult> ExportCsvAsync([FromQuery][MaxLength(MaxPageSiz

// Write dynamic headers for each distinct custom Id
var customIdHeaders = boreholes
.SelectMany(b => b.BoreholeCodelists ?? Enumerable.Empty<BoreholeCodelist>())
.SelectMany(b => GetBoreholeCodelists(b))
MiraGeowerkstatt marked this conversation as resolved.
Show resolved Hide resolved
.Select(bc => new { bc.CodelistId, bc.Codelist?.En })
.Distinct()
.OrderBy(x => x.CodelistId)
Expand Down Expand Up @@ -149,7 +148,7 @@ public async Task<IActionResult> ExportCsvAsync([FromQuery][MaxLength(MaxPageSiz
// Write dynamic fields for custom Ids
foreach (var header in customIdHeaders)
{
var codelistValue = (b.BoreholeCodelists ?? Enumerable.Empty<BoreholeCodelist>()).FirstOrDefault(bc => bc.CodelistId == header.CodelistId)?.Value;
var codelistValue = GetBoreholeCodelists(b).FirstOrDefault(bc => bc.CodelistId == header.CodelistId)?.Value;
csvWriter.WriteField(codelistValue ?? "");
}

Expand All @@ -160,4 +159,9 @@ public async Task<IActionResult> ExportCsvAsync([FromQuery][MaxLength(MaxPageSiz
await csvWriter.FlushAsync().ConfigureAwait(false);
return File(Encoding.UTF8.GetBytes(stringWriter.ToString()), "text/csv", "boreholes_export.csv");
}

private IEnumerable<BoreholeCodelist> GetBoreholeCodelists(Borehole borehole)
{
return borehole.BoreholeCodelists ?? Enumerable.Empty<BoreholeCodelist>();
}
}
Loading