Merge pull request #1580 from alliance-genome/SCRUM-4137_cleanup_fix

SCRUM-4137 Fix cleanup error
alliance-genome · Jun 24, 2024 · a25ef92 · a25ef92
2 parents c16e264 + 5da6cb8
commit a25ef92
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/org/alliancegenome/curation_api/services/base/BaseEntityCrudService.java b/src/main/java/org/alliancegenome/curation_api/services/base/BaseEntityCrudService.java
@@ -5,6 +5,7 @@
 import java.util.Map;
 
 import org.alliancegenome.curation_api.auth.AuthenticatedUser;
+import org.alliancegenome.curation_api.dao.PersonDAO;
 import org.alliancegenome.curation_api.dao.base.BaseEntityDAO;
 import org.alliancegenome.curation_api.dao.base.BaseSQLDAO;
 import org.alliancegenome.curation_api.exceptions.ApiErrorException;
@@ -31,7 +32,8 @@ protected void setSQLDao(BaseSQLDAO<E> dao) {
 	@Inject
 	@AuthenticatedUser protected Person authenticatedPerson;
 	@Inject PersonService personService;
-
+	@Inject PersonDAO personDAO;
+
 	protected abstract void init();
 
 	@Transactional
@@ -156,11 +158,11 @@ public E deprecateOrDelete(Long id, Boolean throwApiError, String requestSource,
 		if (deprecate) {
 			if (!object.getObsolete()) {
 				object.setObsolete(true);
-				if (authenticatedPerson.getId() != null) {
-					object.setUpdatedBy(authenticatedPerson);
-				} else {
-					object.setUpdatedBy(personService.fetchByUniqueIdOrCreate(requestSource));
+				if (authenticatedPerson.getUniqueId() != null) {
+					requestSource = authenticatedPerson.getUniqueId();
 				}
+				Person updatedBy = personService.fetchByUniqueIdOrCreate(requestSource);
+				object.setUpdatedBy(updatedBy);
 				object.setDateUpdated(OffsetDateTime.now());
 				return dao.persist(object);
 			} else {