fix: dont do rename municipality check on nulls

Informatievlaanderen · Jan 17, 2024 · 8f4eedd · 8f4eedd
1 parent 59aa7e3
commit 8f4eedd
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/StreetNameRegistry.Api.BackOffice/Validators/RenameStreetNameRequestValidator.cs b/src/StreetNameRegistry.Api.BackOffice/Validators/RenameStreetNameRequestValidator.cs
@@ -44,10 +44,12 @@ public RenameStreetNameRequestValidator(BackOfficeContext backOfficeContext)
                                         .MunicipalityIdByPersistentLocalId
                                         .FindAsync(new object?[] { request.StreetNamePersistentLocalId }, cancellationToken: ct);
 
+                                    // Allow nulls to go through, because otherwise the error message would be incorrect
+                                    // It will fail in the next rule / domain anyway
                                     return
-                                        municipalityIdBySourcePersistentLocalId != null
-                                        && municipalityIdByDestinationPersistentLocalId != null
-                                        && municipalityIdByDestinationPersistentLocalId.MunicipalityId == municipalityIdBySourcePersistentLocalId.MunicipalityId;
+                                        municipalityIdBySourcePersistentLocalId is null
+                                        || municipalityIdByDestinationPersistentLocalId is null
+                                        || municipalityIdByDestinationPersistentLocalId.MunicipalityId == municipalityIdBySourcePersistentLocalId.MunicipalityId;
                                 })
                                 .WithMessage(ValidationErrors.RenameStreetName.SourceAndDestinationStreetNameAreNotInSameMunicipality.Message)
                                 .WithErrorCode(ValidationErrors.RenameStreetName.SourceAndDestinationStreetNameAreNotInSameMunicipality.Code)