Merge pull request #54 from EBISPOT/develop

Develop

Author: ala-ebi

pom.xml

@@ -103,7 +103,7 @@
         <dependency>
             <groupId>uk.ac.ebi.spot.gwasdepo</groupId>
             <artifactId>gwasdepo-commons</artifactId>
-            <version>1.0.31-SNAPSHOT</version>
+            <version>1.0.37-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/uk/ac/ebi/spot/gwas/deposition/ingest/rest/dto/StudyDtoAssembler.java

@@ -90,7 +90,8 @@ public Resource<StudyDto> toResource(Study study) {
                 study.getAdjustedCovariates(),
                 study.getEffect_allele_frequency_lower_limit(),
                 study.getSex(),
-                study.getCoordinateSystem());
+                study.getCoordinateSystem(),
+                study.getAnalysisSoftware());
 
         return new Resource<>(studyDto);
     }
@@ -155,7 +156,8 @@ public  StudyDto assemble(Study study) {
                 study.getAdjustedCovariates(),
                 study.getEffect_allele_frequency_lower_limit(),
                 study.getSex(),
-                study.getCoordinateSystem());
+                study.getCoordinateSystem(),
+                study.getAnalysisSoftware());
     }
 
     public static StudyDto assemble(Study study, List<AssociationDto> associationDtos,
@@ -200,7 +202,8 @@ public static StudyDto assemble(Study study, List<AssociationDto> associationDto
                 study.getAdjustedCovariates(),
                 study.getEffect_allele_frequency_lower_limit(),
                 study.getSex(),
-                study.getCoordinateSystem());
+                study.getCoordinateSystem(),
+                study.getAnalysisSoftware());
     }
 
     public static Study disassemble(StudyDto studyDto) {

src/main/resources/application-local.yml

@@ -21,3 +21,13 @@ quartz:
   scheduler:
     #dbName: gwas-deposition-dev
     dbName: gwasdepo
+
+
+rabbitmq:
+  queue-name: study_change_sandbox
+  exchange-name: study_change_exchange_sandbox
+  routing-key: study-ingest_sandbox
+  sumstats:
+    queue-name: metadata-yml-update-sandbox
+    exchange-name: metadata-yml-update-exchange-sandbox
+    routing-key: metadata-yml-update-route-sandbox

src/main/resources/application-prod.yml

@@ -16,3 +16,13 @@ gwas-ingest-service:
 quartz:
   scheduler:
     dbName: gwasdepo
+
+
+rabbitmq:
+  queue-name: study_change_sandbox
+  exchange-name: study_change_exchange_sandbox
+  routing-key: study-ingest_sandbox
+  sumstats:
+    queue-name: metadata-yml-update
+    exchange-name: metadata-yml-update-exchange
+    routing-key: metadata-yml-update-route

src/main/resources/application-sandbox-migration.yml

@@ -18,3 +18,13 @@ quartz:
   scheduler:
     #dbName: deposition-backend-sandbox
     dbName: gwasdepo
+
+
+rabbitmq:
+  queue-name: study_change_sandbox
+  exchange-name: study_change_exchange_sandbox
+  routing-key: study-ingest_sandbox
+  sumstats:
+    queue-name: metadata-yml-update-sandbox
+    exchange-name: metadata-yml-update-exchange-sandbox
+    routing-key: metadata-yml-update-route-sandbox