details: https://code.openbravo.com/erp/devel/pi/rev/dc0e10831b4e changeset: 30380:dc0e10831b4e user: Alvaro Ferraz <alvaro.ferraz <at> openbravo.com> date: Mon Oct 10 11:09:34 2016 +0200 summary: Related to issue 34038: Code review improvements
Remove FINPaymentEventHandler event handler and include the logic in existing FIN_PaymentEventListener event handler. Remove unneeded payment parameter in setDocumentNoToPayment method. Call payment.isProcessed() instead of event.getCurrentState(processedProperty). diffstat: modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FINPaymentEventHandler.java | 118 ---------- modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java | 68 ++++- 2 files changed, 58 insertions(+), 128 deletions(-) diffs (247 lines): diff -r 5da1fa7fdb5c -r dc0e10831b4e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FINPaymentEventHandler.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FINPaymentEventHandler.java Wed Oct 05 17:32:05 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,118 +0,0 @@ -/* - ************************************************************************* - * The contents of this file are subject to the Openbravo Public License - * Version 1.0 (the "License"), being the Mozilla Public License - * Version 1.1 with a permitted attribution clause; you may not use this - * file except in compliance with the License. You may obtain a copy of - * the License at http://www.openbravo.com/legal/license.html - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. - * The Original Code is Openbravo ERP. - * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2016 Openbravo SLU - * All Rights Reserved. - * Contributor(s): ______________________________________. - ************************************************************************* - */ - -package org.openbravo.advpaymentmngt.event; - -import java.math.BigDecimal; - -import javax.enterprise.event.Observes; - -import org.apache.log4j.Logger; -import org.openbravo.base.model.Entity; -import org.openbravo.base.model.ModelProvider; -import org.openbravo.base.model.Property; -import org.openbravo.client.kernel.event.EntityDeleteEvent; -import org.openbravo.client.kernel.event.EntityNewEvent; -import org.openbravo.client.kernel.event.EntityPersistenceEvent; -import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; -import org.openbravo.client.kernel.event.EntityUpdateEvent; -import org.openbravo.erpCommon.businessUtility.CancelAndReplaceUtils; -import org.openbravo.model.financialmgmt.payment.FIN_Payment; - -public class FINPaymentEventHandler extends EntityPersistenceEventObserver { - private static Entity[] entities = { ModelProvider.getInstance().getEntity( - FIN_Payment.ENTITY_NAME) }; - protected Logger logger = Logger.getLogger(this.getClass()); - - @Override - protected Entity[] getObservedEntities() { - return entities; - } - - public void onUpdate(@Observes - EntityUpdateEvent event) { - if (!isValidEvent(event)) { - return; - } - FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); - final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); - final Property paymentAmountProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_AMOUNT); - BigDecimal oldPaymentAmount = (BigDecimal) event.getPreviousState(paymentAmountProperty); - String documentNo = payment.getDocumentNo(); - int documentNoLength = payment.getDocumentNo().length(); - if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) { - // Payment has no already an *Z* at the end of the document number - if (!CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo - .substring(documentNoLength - 3))) { - String newDocumentNo = documentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX; - setDocumentNoToPayment(payment, event, newDocumentNo); - } - } else if (oldPaymentAmount.compareTo(BigDecimal.ZERO) == 0) { - if (CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo - .substring(documentNoLength - 3))) { - String newDocumentNo = documentNo.substring(0, documentNoLength - 3); - setDocumentNoToPayment(payment, event, newDocumentNo); - } - } - } - - public void onSave(@Observes - EntityNewEvent event) { - if (!isValidEvent(event)) { - return; - } - FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); - final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); - final Property processedProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_PROCESSED); - if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) { - String newDocumentNo = payment.getDocumentNo(); - boolean processed = false; - Object oProcessed = (processedProperty == null ? false : event - .getCurrentState(processedProperty)); - if (oProcessed instanceof String) { - processed = "Y".equals(oProcessed.toString()); - } else if (oProcessed instanceof Boolean) { - processed = (Boolean) oProcessed; - } - if (newDocumentNo.startsWith("<") && newDocumentNo.endsWith(">") && !processed) { - // Remove "<" and ">" characters from documentNo if payment is not processed - newDocumentNo = newDocumentNo.substring(1, newDocumentNo.length() - 1); - } - newDocumentNo = newDocumentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX; - setDocumentNoToPayment(payment, event, newDocumentNo); - } - } - - public void onDelete(@Observes - EntityDeleteEvent event) { - if (!isValidEvent(event)) { - return; - } - } - - private void setDocumentNoToPayment(FIN_Payment payment, EntityPersistenceEvent event, - String newDocumentNo) { - String truncatedDocumentNo = (newDocumentNo.length() > 30) ? newDocumentNo.substring(0, 30) - : newDocumentNo.toString(); - final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); - final Property paymentDocumentNoProperty = paymentEntity - .getProperty(FIN_Payment.PROPERTY_DOCUMENTNO); - event.setCurrentState(paymentDocumentNoProperty, truncatedDocumentNo); - } -} \ No newline at end of file diff -r 5da1fa7fdb5c -r dc0e10831b4e modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java --- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java Wed Oct 05 17:32:05 2016 +0000 +++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/event/FIN_PaymentEventListener.java Mon Oct 10 11:09:34 2016 +0200 @@ -11,13 +11,14 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2012-2015 Openbravo SLU + * All portions are Copyright (C) 2012-2016 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************* */ package org.openbravo.advpaymentmngt.event; +import java.math.BigDecimal; import java.util.List; import javax.enterprise.event.Observes; @@ -30,11 +31,14 @@ import org.openbravo.base.model.ModelProvider; import org.openbravo.base.model.Property; import org.openbravo.client.kernel.event.EntityDeleteEvent; +import org.openbravo.client.kernel.event.EntityNewEvent; +import org.openbravo.client.kernel.event.EntityPersistenceEvent; import org.openbravo.client.kernel.event.EntityPersistenceEventObserver; import org.openbravo.client.kernel.event.EntityUpdateEvent; import org.openbravo.dal.core.OBContext; import org.openbravo.dal.service.OBDal; import org.openbravo.database.ConnectionProvider; +import org.openbravo.erpCommon.businessUtility.CancelAndReplaceUtils; import org.openbravo.erpCommon.utility.Utility; import org.openbravo.model.financialmgmt.payment.FIN_Payment; import org.openbravo.model.financialmgmt.payment.FIN_PaymentDetail; @@ -50,12 +54,53 @@ return entities; } + public void onSave(@Observes EntityNewEvent event) { + if (!isValidEvent(event)) { + return; + } + FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); + if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) { + String newDocumentNo = payment.getDocumentNo(); + if (newDocumentNo.startsWith("<") && newDocumentNo.endsWith(">") && !payment.isProcessed()) { + // Remove "<" and ">" characters from documentNo if payment is not processed + newDocumentNo = newDocumentNo.substring(1, newDocumentNo.length() - 1); + } + newDocumentNo = newDocumentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX; + setDocumentNoToPayment(event, newDocumentNo); + } + } + public void onUpdate(@Observes EntityUpdateEvent event) { if (!isValidEvent(event)) { return; } - manageAPRMPendingPaymentFromInvoiceRecord(event); + final FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); + final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); + final Property paymentAmountProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_AMOUNT); + BigDecimal oldPaymentAmount = (BigDecimal) event.getPreviousState(paymentAmountProperty); + final Property paymentStatusProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_STATUS); + final String currentPaymentStatus = (String) event.getCurrentState(paymentStatusProperty); + final String oldPaymentStatus = (String) event.getPreviousState(paymentStatusProperty); + + String documentNo = payment.getDocumentNo(); + int documentNoLength = payment.getDocumentNo().length(); + if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) { + // Payment has no already an *Z* at the end of the document number + if (!CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo + .substring(documentNoLength - 3))) { + String newDocumentNo = documentNo + CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX; + setDocumentNoToPayment(event, newDocumentNo); + } + } else if (oldPaymentAmount.compareTo(BigDecimal.ZERO) == 0) { + if (CancelAndReplaceUtils.ZERO_PAYMENT_SUFIX.equals(documentNo + .substring(documentNoLength - 3))) { + String newDocumentNo = documentNo.substring(0, documentNoLength - 3); + setDocumentNoToPayment(event, newDocumentNo); + } + } + + manageAPRMPendingPaymentFromInvoiceRecord(payment, currentPaymentStatus, oldPaymentStatus); } public void onDelete(@Observes EntityDeleteEvent event) { @@ -88,18 +133,12 @@ * Returns the number of records updated or deleted (0 or 1) * */ - private int manageAPRMPendingPaymentFromInvoiceRecord(final EntityUpdateEvent event) { + private int manageAPRMPendingPaymentFromInvoiceRecord(FIN_Payment payment, + String currentPaymentStatus, String oldPaymentStatus) { try { OBContext.setAdminMode(true); - int rowCount = 0; - final FIN_Payment payment = (FIN_Payment) event.getTargetInstance(); - final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); - final Property paymentStatusProperty = paymentEntity.getProperty(FIN_Payment.PROPERTY_STATUS); - final String currentPaymentStatus = (String) event.getCurrentState(paymentStatusProperty); - final String oldPaymentStatus = (String) event.getPreviousState(paymentStatusProperty); - if (StringUtils.equals("RPAE", currentPaymentStatus)) { final PaymentExecutionProcess executionProcess = new AdvPaymentMngtDao() .getExecutionProcess(payment); @@ -165,4 +204,13 @@ rowCount = updateQry.executeUpdate(); return rowCount; } + + private void setDocumentNoToPayment(EntityPersistenceEvent event, String newDocumentNo) { + String truncatedDocumentNo = (newDocumentNo.length() > 30) ? newDocumentNo.substring(0, 30) + : newDocumentNo.toString(); + final Entity paymentEntity = ModelProvider.getInstance().getEntity(FIN_Payment.ENTITY_NAME); + final Property paymentDocumentNoProperty = paymentEntity + .getProperty(FIN_Payment.PROPERTY_DOCUMENTNO); + event.setCurrentState(paymentDocumentNoProperty, truncatedDocumentNo); + } } ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
