honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Call EntityManager to remove resource links. Rename getter.

This commit is contained in:
Luke deGruchy 2024-02-06 11:20:33 -05:00
parent 8283e46da1
commit 1b5b281ee3
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/BaseHapiFhirDao.java
View File

@ -1245,6 +1245,7 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> extends BaseStora
*/
if (thePerformIndexing) {
if (newParams == null) {
// myExpungeService.deleteAllSearchParams(JpaPid.fromId(entity.getId()));
removeSearchParams(entity);
entity.clearAllParamsPopulated();
} else {
@ -1296,8 +1297,16 @@ public abstract class BaseHapiFhirDao<T extends IBaseResource> extends BaseStora
theEntity.getParamsQuantity().forEach(myEntityManager::remove);
theEntity.getParamsQuantityNormalized().forEach(myEntityManager::remove);
theEntity.getParamsString().forEach(myEntityManager::remove);
theEntity.getParamsComboStringUnique().forEach(myEntityManager::remove);
theEntity.getParamsToken().forEach(myEntityManager::remove);
theEntity.getParamsUri().forEach(myEntityManager::remove);
theEntity.getParamsComboTokensNonUnique().forEach(myEntityManager::remove);
theEntity.getResourceLinks().forEach(myEntityManager::remove);
// LUKETODO:
// if (myStorageSettings.getIndexMissingFields() == JpaStorageSettings.IndexEnabledEnum.ENABLED) {
// mySearchParamPresentDao.deleteByResourceId(theResourceLongId);
// }
}
/**

2
hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceTable.java
View File

@ -519,7 +519,7 @@ public class ResourceTable extends BaseHasResource implements Serializable, IBas
return myParamsComboStringUnique;
}
public Collection<ResourceIndexedComboTokenNonUnique> getmyParamsComboTokensNonUnique() {
public Collection<ResourceIndexedComboTokenNonUnique> getParamsComboTokensNonUnique() {
if (myParamsComboTokensNonUnique == null) {
myParamsComboTokensNonUnique = new ArrayList<>();
}

2
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParams.java
View File

@ -137,7 +137,7 @@ public final class ResourceIndexedSearchParams {
myComboStringUniques.addAll(theEntity.getParamsComboStringUnique());
}
if (theEntity.isParamsComboTokensNonUniquePresent()) {
myComboTokenNonUnique.addAll(theEntity.getmyParamsComboTokensNonUnique());
myComboTokenNonUnique.addAll(theEntity.getParamsComboTokensNonUnique());
}
}

4
hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/DuplicateIndexR5Test.java
View File

@ -158,8 +158,8 @@ public class DuplicateIndexR5Test extends BaseJpaR5Test {
runInTransaction(()->{
assertEquals(5, myResourceTableDao.count());
ResourceTable table = myResourceTableDao.findAll().stream().filter(t1 -> t1.getResourceType().equals("Patient")).findFirst().orElseThrow();
assertEquals(1, table.getmyParamsComboTokensNonUnique().size());
ResourceIndexedComboTokenNonUnique param = table.getmyParamsComboTokensNonUnique().iterator().next();
assertEquals(1, table.getParamsComboTokensNonUnique().size());
ResourceIndexedComboTokenNonUnique param = table.getParamsComboTokensNonUnique().iterator().next();
// Create a dupe
ResourceIndexedComboTokenNonUnique dupe0 = new ResourceIndexedComboTokenNonUnique();