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

wip

This commit is contained in:
Tadgh 2020-07-13 12:00:19 -07:00
parent c3b89b4ad5
commit 677bc5577b
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/job/BulkExportJobConfig.java
View File

@ -78,13 +78,11 @@ public class BulkExportJobConfig {
return new CreateBulkExportEntityTasklet(); return new CreateBulkExportEntityTasklet();
} }
@Bean @Bean
public JobParametersValidator bulkJobParameterValidator() { public JobParametersValidator bulkJobParameterValidator() {
return new BulkExportJobParameterValidator(); return new BulkExportJobParameterValidator();
} }
@Bean @Bean
public Step bulkExportGenerateResourceFilesStep() { public Step bulkExportGenerateResourceFilesStep() {
return myStepBuilderFactory.get("bulkExportGenerateResourceFilesStep") return myStepBuilderFactory.get("bulkExportGenerateResourceFilesStep")
@ -95,8 +93,6 @@ public class BulkExportJobConfig {
.build(); .build();
} }
@Bean @Bean
@JobScope @JobScope
public BulkExportJobCloser bulkExportJobCloser() { public BulkExportJobCloser bulkExportJobCloser() {

1
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/interceptor/EmpiStorageInterceptor.java
View File

@ -60,6 +60,7 @@ public class EmpiStorageInterceptor implements IEmpiStorageInterceptor {
@Autowired @Autowired
private PersonHelper myPersonHelper; private PersonHelper myPersonHelper;
@Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_CREATED) @Hook(Pointcut.STORAGE_PRESTORAGE_RESOURCE_CREATED)
public void blockManualPersonManipulationOnCreate(IBaseResource theBaseResource, RequestDetails theRequestDetails, ServletRequestDetails theServletRequestDetails) { public void blockManualPersonManipulationOnCreate(IBaseResource theBaseResource, RequestDetails theRequestDetails, ServletRequestDetails theServletRequestDetails) {

6
hapi-fhir-jpaserver-empi/src/main/java/ca/uhn/fhir/jpa/empi/svc/EmpiBatchSvcImpl.java
View File

@ -28,9 +28,6 @@ public class EmpiBatchSvcImpl implements IEmpiBatchService {
@Autowired @Autowired
private DaoRegistry myDaoRegistry; private DaoRegistry myDaoRegistry;
@Autowired
private EmpiMatchLinkSvc myEmpiMatchLinkSvc;
@Autowired @Autowired
private IChannelNamer myChannelNamer; private IChannelNamer myChannelNamer;
@ -38,6 +35,7 @@ public class EmpiBatchSvcImpl implements IEmpiBatchService {
@Autowired @Autowired
private FhirContext myFhirContext; private FhirContext myFhirContext;
@Autowired @Autowired
private IChannelFactory myChannelFactory; private IChannelFactory myChannelFactory;
@ -55,6 +53,7 @@ public class EmpiBatchSvcImpl implements IEmpiBatchService {
IBundleProvider search = patientDao.search(new SearchParameterMap().setLoadSynchronous(true)); IBundleProvider search = patientDao.search(new SearchParameterMap().setLoadSynchronous(true));
List<IBaseResource> resources = search.getResources(0, search.size()); List<IBaseResource> resources = search.getResources(0, search.size());
for (IBaseResource resource : resources) { for (IBaseResource resource : resources) {
ResourceModifiedJsonMessage rmjm = new ResourceModifiedJsonMessage(); ResourceModifiedJsonMessage rmjm = new ResourceModifiedJsonMessage();
ResourceModifiedMessage resourceModifiedMessage = new ResourceModifiedMessage(myFhirContext, resource, ResourceModifiedMessage.OperationTypeEnum.MANUALLY_TRIGGERED); ResourceModifiedMessage resourceModifiedMessage = new ResourceModifiedMessage(myFhirContext, resource, ResourceModifiedMessage.OperationTypeEnum.MANUALLY_TRIGGERED);
@ -62,6 +61,7 @@ public class EmpiBatchSvcImpl implements IEmpiBatchService {
rmjm.setPayload(resourceModifiedMessage); rmjm.setPayload(resourceModifiedMessage);
myEmpiChannelProducer.send(rmjm); myEmpiChannelProducer.send(rmjm);
} }
} }
private EmpiTargetType getTargetTypeOrThrowException(String theResourceType) { private EmpiTargetType getTargetTypeOrThrowException(String theResourceType) {

1
hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/provider/EmpiProviderR4.java
View File

@ -166,6 +166,7 @@ public class EmpiProviderR4 extends BaseEmpiProvider {
return (Parameters) myEmpiLinkUpdaterSvc.notDuplicatePerson(person, target, createEmpiContext(theRequestDetails)); return (Parameters) myEmpiLinkUpdaterSvc.notDuplicatePerson(person, target, createEmpiContext(theRequestDetails));
} }
//TODO accept a search string, parse it to make search parameters, and then submit those as the search.
@Operation(name = ProviderConstants.EMPI_BATCH_RUN, idempotent = true) @Operation(name = ProviderConstants.EMPI_BATCH_RUN, idempotent = true)
public void batchRunEmpi(@OperationParam(name= ProviderConstants.EMPI_BATCH_RUN_TARGET_TYPE, max=1) StringType theTargetType, ServletRequestDetails theRequestDetails) { public void batchRunEmpi(@OperationParam(name= ProviderConstants.EMPI_BATCH_RUN_TARGET_TYPE, max=1) StringType theTargetType, ServletRequestDetails theRequestDetails) {
if (theTargetType == null) { if (theTargetType == null) {