Merge lp:~halvdanhg/dhis2/test-email into lp:dhis2
Status: | Merged |
---|---|
Merged at revision: | 15774 |
Proposed branch: | lp:~halvdanhg/dhis2/test-email |
Merge into: | lp:dhis2 |
Diff against target: |
386 lines (+303/-6) 6 files modified
dhis-2/dhis-api/src/main/java/org/hisp/dhis/email/EmailService.java (+73/-0) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/email/DefaultEmailService.java (+111/-0) dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java (+3/-4) dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml (+6/-0) dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/EmailController.java (+94/-0) dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemEmailSettings.vm (+16/-2) |
To merge this branch: | bzr merge lp:~halvdanhg/dhis2/test-email |
Related bugs: | |
Related blueprints: |
(Email) Test email
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lars Helge Øverland | Pending | ||
Review via email: mp+223380@code.launchpad.net |
Commit message
Implemented blueprint test-email. Added barebones EmailService and new api endpoint email/sendTestEmail
Description of the change
Implements blueprint 'test-email': https:/
Notable:
- The existing email API is abstracted as a MessageService wherein the mode of delivery (i.e. internal message, email, sms) for the message is not directly selectable. Using the MessageService was therefore not a very good solution.
- An EmailService has been implemented instead on top of EmailMessageSender. For now it only implements sendEmail(~) and sendTestEmail(), but could be extended to provide more general email related features (configuration etc.) if need be.
- A new API endpoint has been created at api/email/
Small remark:
Implementation and testing took a loot more time than it should have due to the default spring async executor (SimpleAsyncTas
Test by going to /dhis-web-