Merge pull request #552 from OHDSI/Release-1.12.3

Release 1.12.3
OHDSI · Sep 3, 2018 · 977bf5f · 977bf5f
2 parents 8864349 + 7826932
commit 977bf5f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>portal</artifactId>
     <groupId>com.odysseusinc.arachne</groupId>
-    <version>1.12.2</version>
+    <version>1.12.3</version>
     <packaging>jar</packaging>
 
     <parent>

diff --git a/...pi/v1/dto/converters/datasource/DataSourceToCommonDataSourceHealthStatusDTOConverter.java b/...pi/v1/dto/converters/datasource/DataSourceToCommonDataSourceHealthStatusDTOConverter.java
@@ -24,15 +24,15 @@
 
 import com.odysseusinc.arachne.commons.api.v1.dto.CommonDataSourceHealthStatusDTO;
 import com.odysseusinc.arachne.portal.api.v1.dto.converters.BaseConversionServiceAwareConverter;
-import com.odysseusinc.arachne.portal.model.DataSource;
+import com.odysseusinc.arachne.portal.model.IDataSource;
 import org.springframework.stereotype.Component;
 
 @Component
 public class DataSourceToCommonDataSourceHealthStatusDTOConverter
-        extends BaseConversionServiceAwareConverter<DataSource, CommonDataSourceHealthStatusDTO> {
+        extends BaseConversionServiceAwareConverter<IDataSource, CommonDataSourceHealthStatusDTO> {
 
     @Override
-    public CommonDataSourceHealthStatusDTO convert(DataSource source) {
+    public CommonDataSourceHealthStatusDTO convert(IDataSource source) {
 
         final CommonDataSourceHealthStatusDTO dataSourceHealthStatusDTO = new CommonDataSourceHealthStatusDTO();
         dataSourceHealthStatusDTO.setCentralId(source.getId());

diff --git a/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawDataSourceRepository.java b/src/main/java/com/odysseusinc/arachne/portal/repository/BaseRawDataSourceRepository.java
@@ -36,4 +36,6 @@ public interface BaseRawDataSourceRepository<T extends IDataSource> extends JpaR
     Optional<T> findById(Long id);
 
     List<T> findByIdInAndDeletedIsNull(List<Long> ids);
+
+    List<T> findByDataNodeIdAndDeletedIsNull(Long dataNodeId);
 }
diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/BaseDataSourceService.java b/src/main/java/com/odysseusinc/arachne/portal/service/BaseDataSourceService.java
@@ -76,6 +76,8 @@ void indexBySolr(DS dataSource)
 
     List<DS> findByIdsAndNotDeleted(List<Long> dataSourceIds);
 
+    List<DS> getNotDeletedByDataNodeId(Long dataNodeId);
+
     Page<DS> suggestDataSource(String query, Long studyId, Long userId,
                                        PageRequest pageRequest);
 

diff --git a/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseDataSourceServiceImpl.java b/src/main/java/com/odysseusinc/arachne/portal/service/impl/BaseDataSourceServiceImpl.java
@@ -517,4 +517,10 @@ public List<DS> findByIdsAndNotDeleted(List<Long> dataSourceIds) {
 
         return rawDataSourceRepository.findByIdInAndDeletedIsNull(dataSourceIds);
     }
+
+    @Override
+    public List<DS> getNotDeletedByDataNodeId(Long dataNodeId) {
+
+        return rawDataSourceRepository.findByDataNodeIdAndDeletedIsNull(dataNodeId);
+    }
 }