diff --git a/src/main/java/uk/ac/ebi/spot/gwas/deposition/config/BackendMailConfig.java b/src/main/java/uk/ac/ebi/spot/gwas/deposition/config/BackendMailConfig.java index 209a8ab..abea73d 100644 --- a/src/main/java/uk/ac/ebi/spot/gwas/deposition/config/BackendMailConfig.java +++ b/src/main/java/uk/ac/ebi/spot/gwas/deposition/config/BackendMailConfig.java @@ -21,6 +21,9 @@ public class BackendMailConfig { @Value("${gwas-deposition.email-config.base-url}") private String submissionsBaseURL; + @Value("${gwas-deposition.email-config.docs-url}") + private String submissionsDocsURL; + @Value("${gwas-deposition.email-config.errors.subject}") private String errorsSubject; @@ -61,6 +64,8 @@ public String getErrorsSubject() { return errorsSubject; } + public String getSubmissionsDocsURL() { return submissionsDocsURL; } + public List getErrorsReceiver() { List result = new ArrayList<>(); String[] parts = errorsReceiver.split(","); diff --git a/src/main/java/uk/ac/ebi/spot/gwas/deposition/constants/MailConstants.java b/src/main/java/uk/ac/ebi/spot/gwas/deposition/constants/MailConstants.java index 2557f71..a745d19 100644 --- a/src/main/java/uk/ac/ebi/spot/gwas/deposition/constants/MailConstants.java +++ b/src/main/java/uk/ac/ebi/spot/gwas/deposition/constants/MailConstants.java @@ -8,6 +8,8 @@ public class MailConstants { public static final String SUBMISSION_STUDIES = "SUBMISSION_STUDIES"; + public static final String SUBMISSION_DOCS_URL = "SUBMISSION_DOCS_URL"; + public static final String PMID = "PMID"; public static final String FIRST_AUTHOR = "FIRST_AUTHOR"; diff --git a/src/main/java/uk/ac/ebi/spot/gwas/deposition/scheduler/tasks/SSCallbackTask.java b/src/main/java/uk/ac/ebi/spot/gwas/deposition/scheduler/tasks/SSCallbackTask.java index 7bcee5a..88b0724 100644 --- a/src/main/java/uk/ac/ebi/spot/gwas/deposition/scheduler/tasks/SSCallbackTask.java +++ b/src/main/java/uk/ac/ebi/spot/gwas/deposition/scheduler/tasks/SSCallbackTask.java @@ -109,6 +109,7 @@ public void checkCallbackIds() { metadata.put(MailConstants.SUBMISSION_ID, backendMailConfig.getSubmissionsBaseURL() + submission.getId()); metadata.put(MailConstants.SUBMISSION_STUDIES, backendMailConfig.getSubmissionsBaseURL() + submission.getId()); + metadata.put(MailConstants.SUBMISSION_DOCS_URL, backendMailConfig.getSubmissionsDocsURL()); String userId = submission.getCreated().getUserId(); log.info("Callback ID completed: {}", callbackId.getCallbackId()); diff --git a/src/main/java/uk/ac/ebi/spot/gwas/deposition/service/impl/SummaryStatsProcessingServiceImpl.java b/src/main/java/uk/ac/ebi/spot/gwas/deposition/service/impl/SummaryStatsProcessingServiceImpl.java index e6b0b79..5d28870 100644 --- a/src/main/java/uk/ac/ebi/spot/gwas/deposition/service/impl/SummaryStatsProcessingServiceImpl.java +++ b/src/main/java/uk/ac/ebi/spot/gwas/deposition/service/impl/SummaryStatsProcessingServiceImpl.java @@ -109,6 +109,7 @@ public void processSummaryStats(Submission submission, String fileUploadId, List metadata.put(MailConstants.SUBMISSION_ID, backendMailConfig.getSubmissionsBaseURL() + submission.getId()); metadata.put(MailConstants.SUBMISSION_STUDIES, backendMailConfig.getSubmissionsBaseURL() + submission.getId()); + metadata.put(MailConstants.SUBMISSION_DOCS_URL, backendMailConfig.getSubmissionsDocsURL()); if (workId != null) { backendEmailService.sendSuccessEmail(submission.getCreated().getUserId(), workId, metadata); diff --git a/src/main/resources/application-sandbox.yml b/src/main/resources/application-sandbox.yml index cbb17ef..6e9778b 100644 --- a/src/main/resources/application-sandbox.yml +++ b/src/main/resources/application-sandbox.yml @@ -39,6 +39,7 @@ gwas-deposition: enabled: true email-config: base-url: http://193.62.54.159/gwas/deposition/submission/ + docs-url: http://snoopy.ebi.ac.uk:9680/gwas/docs/submission#link-15 email: enabled: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d43822b..ec8fb6c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -52,6 +52,7 @@ gwas-deposition: email-config: subject: GWAS Catalog submission for %PMID% base-url: https://www.ebi.ac.uk/gwas/deposition/submission/ + docs-url: https://www.ebi.ac.uk/gwas/docs/submission#link-15 emails: success: emails/success.email fail: emails/fail.email diff --git a/src/main/resources/emails/success.email b/src/main/resources/emails/success.email index b1de9a2..d08cdf6 100644 --- a/src/main/resources/emails/success.email +++ b/src/main/resources/emails/success.email @@ -355,6 +355,8 @@

Following submission the accession ID(s) for your submission will be available to download by pressing on the 'Download Study Accessions' button on the studies page.

+

For more information about how and when your data will become publicly accessible, please see our documentation pages: Documentation page.

+

Thanks for sharing your data with us.

Best wishes,