This is an automated email from the ASF dual-hosted git repository. myrle pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git
commit 4bf46aa995ba4708f651da141b62ac672e2457da Author: Ebenezer Graham <egraha...@alustudent.com> AuthorDate: Fri Jun 15 18:27:21 2018 +0400 added dependencies to shared gradle file --- service/build.gradle | 15 ++++++++-- .../service/internal/service/SMSSender.java | 2 +- .../service/listener/CustomerEventListener.java | 34 ++++++++++++++++++++-- .../service/listener/OfficeEventListener.java | 1 + .../service/listener/PortfolioEventListener.java | 16 +++------- 5 files changed, 51 insertions(+), 17 deletions(-) diff --git a/service/build.gradle b/service/build.gradle index 57f507d..42b1c6f 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -46,12 +46,23 @@ springBoot { dependencies { compile( [group: 'com.twilio.sdk', name: 'twilio', version: '7.17.+'], + [group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '1.4.3.RELEASE'], + [group: 'org.apache.fineract.cn.customer', name: 'api', version: versions.fineractcncustomer], + [group: 'org.apache.fineract.cn.office', name: 'api', version: versions.fineractcnoffice], + [group: 'org.apache.fineract.cn.portfolio', name: 'api', version: versions.fineractcnportfolio], + [group: 'org.apache.fineract.cn.group', name: 'api', version: versions.fineractcngroup], + + //[group: 'org.apache.fineract.cn.deposit-account-management', name: 'api', version: versions.fineractcndeposit], + //[group: 'org.apache.fineract.cn.teller', name: 'api', version: versions.fineractcnteller], + //[group: 'org.apache.fineract.cn.reporting', name: 'api', version: versions.fineractcnreporting], + //[group: 'org.apache.fineract.cn.cheques', name: 'api', version: versions.kuelapcheques], + //[group: 'org.apache.fineract.cn.payroll', name: 'api', version: versions.fineractcnpayroll], + //[group: 'org.apache.fineract.cn.notification', name: 'api', version: versions.fineractcnnotification], + [group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'], [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka'], [group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'], - //check this dependency - [group: 'org.springframework.boot', name: 'spring-boot-starter-mail', version: '1.4.3.RELEASE'], [group: 'org.apache.fineract.cn.notification', name: 'api', version: project.version], [group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis], [group: 'com.google.code.gson', name: 'gson'], diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSSender.java b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSSender.java index 48a7ac9..ed98bea 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSSender.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSSender.java @@ -54,4 +54,4 @@ public class SMSSender { System.out.println(message.getSid()); System.out.println(message.getStatus()); } - } \ No newline at end of file +} \ No newline at end of file diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/CustomerEventListener.java b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/CustomerEventListener.java index 3f4c771..7db634a 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/CustomerEventListener.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/CustomerEventListener.java @@ -26,6 +26,7 @@ import org.apache.fineract.cn.customer.api.v1.domain.ContactDetail; import org.apache.fineract.cn.customer.api.v1.domain.Customer; import org.apache.fineract.cn.notification.service.internal.service.EmailSender; import org.apache.fineract.cn.notification.service.internal.service.SMSSender; +import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; import org.springframework.messaging.handler.annotation.Header; @@ -38,12 +39,15 @@ public class CustomerEventListener { private CustomerManager customerManager; private SMSSender smsSender; private EmailSender emailSender; + private final Logger logger; @Autowired - public CustomerEventListener( final CustomerManager customerManager, SMSSender smsSender, EmailSender emailSender ) { + public CustomerEventListener( final CustomerManager customerManager, + SMSSender smsSender, EmailSender emailSender, @Autowired Logger logger ) { this.customerManager = customerManager; this.smsSender = smsSender; this.emailSender = emailSender; + this.logger = logger; smsSender.sendSMS("+23058409206","just to be sure listen has been instantiated"); } @@ -55,7 +59,10 @@ public class CustomerEventListener { final String payload) { System.out.println(payload); Customer customer = customerManager.findCustomer(payload); - System.out.println("This is the customer created: " + customer.getGivenName()); + System.out.println("This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + this.logger.info("Logger --- This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); if (customer.getContactDetails().size() > 0) { customer.getContactDetails().forEach(contactDetail -> { if (contactDetail.getType().equals(ContactDetail.Type.PHONE)) { @@ -77,7 +84,12 @@ public class CustomerEventListener { ) public void customerActivatedEvent(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { + Customer customer = customerManager.findCustomer(payload); + System.out.println("This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + this.logger.info("Logger --- This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); if(customer.getCurrentState().equalsIgnoreCase("ACTIVE")){ customer.getContactDetails().forEach(contact-> { if (contact.getType().equals(ContactDetail.Type.PHONE)) { @@ -99,6 +111,10 @@ public class CustomerEventListener { public void customerLockedEvent(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { Customer customer = customerManager.findCustomer(payload); + System.out.println("This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + this.logger.info("Logger --- This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); if(customer.getCurrentState().equalsIgnoreCase("LOCKED")){ customer.getContactDetails().forEach(contact-> { if (contact.getType().equals(ContactDetail.Type.PHONE)) { @@ -120,6 +136,11 @@ public class CustomerEventListener { public void customerUnlockedEvent(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { Customer customer = customerManager.findCustomer(payload); + + System.out.println("This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + this.logger.info("Logger --- This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); if(customer.getCurrentState().equalsIgnoreCase("LOCKED")){ customer.getContactDetails().forEach(contact-> { if (contact.getType().equals(ContactDetail.Type.PHONE)) { @@ -141,6 +162,11 @@ public class CustomerEventListener { public void customerClosedEvent(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { Customer customer = customerManager.findCustomer(payload); + System.out.println("This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + this.logger.info("Logger --- This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + if(customer.getCurrentState().equalsIgnoreCase("CLOSED")){ customer.getContactDetails().forEach(contact-> { if (contact.getType().equals(ContactDetail.Type.PHONE)) { @@ -162,6 +188,10 @@ public class CustomerEventListener { public void customerReopenedEvent(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { Customer customer = customerManager.findCustomer(payload); + System.out.println("This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); + this.logger.info("Logger --- This is the customer created: " + + customer.getGivenName() +"--payload" + payload +"--tenant"+ tenant); if(customer.getCurrentState().equalsIgnoreCase("LOCKED")){ customer.getContactDetails().forEach(contact-> { if (contact.getType().equals(ContactDetail.Type.PHONE)) { diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java index 9f083c5..219c830 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java @@ -30,6 +30,7 @@ import org.springframework.messaging.handler.annotation.Header; import org.springframework.stereotype.Component; @Component +@SuppressWarnings("unused") public class OfficeEventListener { private OrganizationManager organizationManager; diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/PortfolioEventListener.java b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/PortfolioEventListener.java index 4f8f9d0..50697b2 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/PortfolioEventListener.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/PortfolioEventListener.java @@ -50,7 +50,8 @@ public class PortfolioEventListener { destination = IndividualLoanEventConstants.DESTINATION, selector = IndividualLoanEventConstants.SELECTOR_DENY_INDIVIDUALLOAN_CASE ) - public void onDeny(final String payload) { + public void onDeny(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, + final String payload) { } @@ -99,7 +100,7 @@ public class PortfolioEventListener { destination = IndividualLoanEventConstants.DESTINATION, selector = IndividualLoanEventConstants.SELECTOR_OPEN_INDIVIDUALLOAN_CASE ) - public void onOpen(//@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, + public void onOpen(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { } @@ -128,7 +129,7 @@ public class PortfolioEventListener { destination = EventConstants.DESTINATION, selector = EventConstants.SELECTOR_POST_GROUP ) - public void onGroupCreated(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, + public void onGroupCreated(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, final String payload) { } @@ -142,13 +143,4 @@ public class PortfolioEventListener { final String payload) { } - @JmsListener( - subscription = EventConstants.DESTINATION, - destination = EventConstants.DESTINATION, - selector = EventConstants.SELECTOR_PUT_GROUP - ) - public void onGroupUpdated(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, - final String payload) { - } - }