Merge pull request #20 from EBISPOT/goci-262_apply_cc0

apply cc0

Author: ala-ebi

pom.xml

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

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

@@ -34,7 +34,8 @@ public static StudyDto assemble(Study study) {
                 study.getCohortId(),
                 null,
                 null,
-                null);
+                null,
+                study.isAgreedToCc0());
     }
 
     public static StudyDto assemble(Study study, List<AssociationDto> associationDtos,
@@ -62,7 +63,8 @@ public static StudyDto assemble(Study study, List<AssociationDto> associationDto
                 study.getCohortId(),
                 associationDtos,
                 sampleDtos,
-                noteDtos);
+                noteDtos,
+                study.isAgreedToCc0());
     }
 
     public static Study disassemble(StudyDto studyDto) {

src/main/java/uk/ac/ebi/spot/gwas/deposition/ingest/service/impl/SubmissionAssemblyServiceImpl.java

@@ -173,6 +173,7 @@ public SubmissionDto assemble(Submission submission) {
                         submission.getAssociations().size(),
                         submission.getSamples().size(),
                         submission.getNotes().size()),
-                ProvenanceDtoAssembler.assemble(submission.getCreated(), userOpt.get()));
+                ProvenanceDtoAssembler.assemble(submission.getCreated(), userOpt.get()),
+                submission.isAgreedToCc0());
     }
 }

src/main/java/uk/ac/ebi/spot/gwas/deposition/ingest/service/impl/SubmissionAssemblyServiceImplV2.java

@@ -100,7 +100,8 @@ public SubmissionDto assemble(Submission submission) {
                         submission.getAssociations().size(),
                         submission.getSamples().size(),
                         submission.getNotes().size()),
-                ProvenanceDtoAssembler.assemble(submission.getCreated(), userOpt.get()));
+                ProvenanceDtoAssembler.assemble(submission.getCreated(), userOpt.get()),
+                submission.isAgreedToCc0());
     }
 
     @Override

src/test/java/uk/ac/ebi/spot/gwas/deposition/ingest/rest/SubmissionsControllerTest.java

@@ -271,7 +271,8 @@ public void shouldUpdateSubmissionStatus() throws Exception {
                 actual.getNotes(),
                 actual.getDateSubmitted(),
                 actual.getMetadata(),
-                actual.getCreated());
+                actual.getCreated(),
+                actual.isAgreedToCc0());
 
         response = mockMvc.perform(put(endpoint)
                 .contentType(MediaType.APPLICATION_JSON).content(mapper.writeValueAsString(updated)))