#000 | Avoid NoSuchElementException when address is not specified dur…

…ing subject create
avniproject · Apr 3, 2023 · e56ef4d · e56ef4d
1 parent 12251b1
commit e56ef4d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/web/api/SubjectApiController.java b/avni-server-api/src/main/java/org/avni/server/web/api/SubjectApiController.java
@@ -161,8 +161,9 @@ private Individual updateSubject(Individual subject, ApiSubjectRequest request)
         }
         subject.setRegistrationDate(request.getRegistrationDate());
         ObservationCollection observations = RequestUtils.createObservations(request.getObservations(), conceptRepository);
-        subjectMigrationService.markSubjectMigrationIfRequired(subject.getUuid(), addressLevel.get(), observations);
-        subject.setAddressLevel(addressLevel.get());
+        AddressLevel newAddressLevel = addressLevel.isPresent() ? addressLevel.get() : null;
+        subjectMigrationService.markSubjectMigrationIfRequired(subject.getUuid(), newAddressLevel, observations);
+        subject.setAddressLevel(newAddressLevel);
         if (subjectType.isPerson()) {
             subject.setDateOfBirth(request.getDateOfBirth());
             subject.setGender(genderRepository.findByName(request.getGender()));