Skip to content

LEGLINK-907: Fix validation bug in tenant create/update #1790

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
johnbritton merged 4 commits into from
Aug 6, 2026
Merged

LEGLINK-907: Fix validation bug in tenant create/update #1790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1c88bd
Fix validation bug in tenant create/update
johnbritton Aug 5, 2026
b3a0575
Remove vendor requirement for facility config
johnbritton Aug 5, 2026
1345b4b
Remove 'no vendor' negative tests and names
johnbritton Aug 6, 2026
aaa2267
Merge branch 'dev' into users/jbritton/LEGLINK-907
johnbritton Aug 6, 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
2 changes: 0 additions & 2 deletions DotNet/Automation.UI/Services/ApiHealth/TestSuites/ApiEndPointLibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ public static class TenantSteps
{
public const string Create201 = "Create → 201";
public const string Create400Duplicate = "Create → 400 (duplicate)";
public const string Create400NoVendor = "Create → 400 (no vendor)";
public const string Create400NoName = "Create → 400 (no name)";
public const string Search200 = "Search → 200";
public const string Search204NoResults = "Search → 204 (no results)";
Expand All @@ -416,7 +415,6 @@ public static class TenantSteps
public const string Get404 = "Get → 404";
public const string Update200 = "Update → 200";
public const string Update404NonExistent = "Update → 404 (non-existent)";
public const string Update400NoVendor = "Update → 400 (no vendor)";
public const string CheckExists200 = "CheckExists → 200";
public const string CheckExists404 = "CheckExists → 404";
public const string SoftDelete204 = "SoftDelete → 204";
Expand Down
8 changes: 0 additions & 8 deletions DotNet/Automation.UI/Services/ApiHealth/TestSuites/TenantServiceTestSuite.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ AdHocReportRequest BuildAdhoc(
results.Add(await RunStepAsync(StepNames.Create400Duplicate, 400, async () =>
await _client.CreateAsync(BuildFacility(facilityId, vendor: testVendor), ct), ct: ct));

// Create → 400 (no vendor)
results.Add(await RunStepAsync(StepNames.Create400NoVendor, 400, async () =>
await _client.CreateAsync(BuildFacility($"ApiHealth-NoVendor-{Guid.NewGuid():N}", "NoVendor", null), ct), ct: ct));

// Create → 400 (no name)
results.Add(await RunStepAsync(StepNames.Create400NoName, 400, async () =>
await _client.CreateAsync(BuildFacility($"ApiHealth-NoName-{Guid.NewGuid():N}", name: null, allowNullName: true, vendor: testVendor), ct), ct: ct));
Expand Down Expand Up @@ -187,10 +183,6 @@ AdHocReportRequest BuildAdhoc(
results.Add(await RunStepAsync(StepNames.Update404NonExistent, 404, async () =>
await _client.UpdateAsync(fakeFacilityId, BuildFacility(fakeFacilityId), ct), ct: ct));

// Update → 400 (no vendor)
results.Add(await RunStepAsync(StepNames.Update400NoVendor, 400, async () =>
await _client.UpdateAsync(facilityId, BuildFacility(facilityId, vendor: null), ct), ct: ct));

// === GET /api/Facility/{id} (exists check) ===

// CheckExists → 200
Expand Down
10 changes: 0 additions & 10 deletions DotNet/Tenant/Controllers/FacilityController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,6 @@ public async Task<IActionResult> StoreFacility(FacilityModel newFacility, Cancel
return BadRequest();
}

if (newFacility.Vendor == null)
{
return BadRequest("Vendor must be provided.");
}

try
{
await _facilityManager.CreateAsync(facilityEntity, cancellationToken);
Expand Down Expand Up @@ -324,11 +319,6 @@ public async Task<ActionResult<FacilityModel>> PutFacility(string facilityId, Fa
return NotFound();
}

if (facilityConfig.Vendor == null)
{
return BadRequest("Vendor must be provided.");
}

var oldFacility = _mapperDtoToModel.Map<FacilityModel, Facility>(existingModel);
var newFacility = _mapperDtoToModel.Map<FacilityModel, Facility>(facilityConfig);

Expand Down
2 changes: 1 addition & 1 deletion ...Admin.UI/src/app/components/tenant/facility-config-form/facility-config-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export class FacilityConfigFormComponent implements OnInit, OnChanges {
facilityId: new FormControl('', [Validators.required, facilityIdConditionalValidator(this.appConfig?.allowAlphaNumericFacilityId ?? true)]),
facilityName: new FormControl('', Validators.required),
timeZone: new FormControl('', Validators.required),
vendor: new FormControl<IVendorVersion | null>(null, Validators.required),
vendor: new FormControl<IVendorVersion | null>(null),
monthlyReports: new FormControl([]),
dailyReports: new FormControl([]),
weeklyReports: new FormControl([]),
Expand Down
Loading