Skip to content

Commit 8ad02b7

Browse files
author
SergiuPacurariu
committed
#13192 - Add upload of Document and email template for Survey
1 parent 33c8f5c commit 8ad02b7

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

sormas-api/src/main/java/de/symeda/sormas/api/audit/Constants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ public class Constants {
2727
"load",
2828
"check",
2929
"uses",
30-
"fetch")));
30+
"fetch",
31+
"upload")));
3132
public static final Set<String> updatePrefix = Collections.unmodifiableSet(
3233
new HashSet<>(
3334
Arrays.asList(

sormas-api/src/main/java/de/symeda/sormas/api/survey/SurveyFacade.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface SurveyFacade {
2929

3030
SurveyDto save(@Valid SurveyDto dto);
3131

32-
void importDocumentTemplate(SurveyReferenceDto surveyRef, DocumentTemplateDto uploadedDocumentTemplate, byte[] fileContent)
32+
void uploadDocumentTemplate(SurveyReferenceDto surveyRef, DocumentTemplateDto uploadedDocumentTemplate, byte[] fileContent)
3333
throws DocumentTemplateException;
3434

3535
SurveyDto getByUuid(String uuid);
@@ -46,6 +46,6 @@ void importDocumentTemplate(SurveyReferenceDto surveyRef, DocumentTemplateDto up
4646

4747
Boolean isEditAllowed(String uuid);
4848

49-
void importEmailTemplate(SurveyReferenceDto surveyReference, DocumentTemplateDto uploadedDocumentTemplateDto, byte[] fileContent)
49+
void uploadEmailTemplate(SurveyReferenceDto surveyReference, DocumentTemplateDto uploadedDocumentTemplateDto, byte[] fileContent)
5050
throws DocumentTemplateException;
5151
}

sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyFacadeEjb.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public SurveyDto save(@Valid SurveyDto dto) {
9494

9595
@Override
9696
@RightsAllowed(UserRight._SURVEY_EDIT)
97-
public void importDocumentTemplate(SurveyReferenceDto surveyRef, DocumentTemplateDto uploadedDocumentTemplate, byte[] fileContent)
97+
public void uploadDocumentTemplate(SurveyReferenceDto surveyRef, DocumentTemplateDto uploadedDocumentTemplate, byte[] fileContent)
9898
throws DocumentTemplateException {
9999
Survey existingSurvey = surveyRef.getUuid() != null ? surveyService.getByUuid(surveyRef.getUuid()) : null;
100100

@@ -117,7 +117,7 @@ public void importDocumentTemplate(SurveyReferenceDto surveyRef, DocumentTemplat
117117

118118
@Override
119119
@RightsAllowed(UserRight._SURVEY_EDIT)
120-
public void importEmailTemplate(SurveyReferenceDto surveyReference, DocumentTemplateDto uploadedEmailTemplateDto, byte[] fileContent)
120+
public void uploadEmailTemplate(SurveyReferenceDto surveyReference, DocumentTemplateDto uploadedEmailTemplateDto, byte[] fileContent)
121121
throws DocumentTemplateException {
122122

123123
Survey existingSurvey = surveyReference.getUuid() != null ? surveyService.getByUuid(surveyReference.getUuid()) : null;

sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyDocumentTemplateReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public SurveyDocumentTemplateReceiver(DocumentWorkflow documentWorkflow, SurveyR
2424

2525
@Override
2626
protected void writeDocumentTemplate(DocumentTemplateDto documentTemplateDto, byte[] fileContent) throws DocumentTemplateException {
27-
FacadeProvider.getSurveyFacade().importDocumentTemplate(surveyReference, documentTemplateDto, fileContent);
27+
FacadeProvider.getSurveyFacade().uploadDocumentTemplate(surveyReference, documentTemplateDto, fileContent);
2828
}
2929

3030
@Override

sormas-ui/src/main/java/de/symeda/sormas/ui/survey/SurveyEmailTemplateReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public SurveyEmailTemplateReceiver(DocumentWorkflow documentWorkflow, SurveyRefe
2424

2525
@Override
2626
protected void writeDocumentTemplate(DocumentTemplateDto documentTemplateDto, byte[] fileContent) throws DocumentTemplateException {
27-
FacadeProvider.getSurveyFacade().importEmailTemplate(surveyReference, documentTemplateDto, fileContent);
27+
FacadeProvider.getSurveyFacade().uploadEmailTemplate(surveyReference, documentTemplateDto, fileContent);
2828
}
2929

3030
@Override

0 commit comments

Comments
 (0)