[ofbiz-framework] branch trunk updated: Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (#129)

[surajk]

This is an automated email from the ASF dual-hosted git repository.

surajk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2b01664  Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (#129)
2b01664 is described below

commit 2b0166410dcb7165ba4493400db690810e540554
Author: Suraj Khurana <[hidden email]>
AuthorDate: Wed May 13 17:17:20 2020 +0530

    Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto (#129)
   
    * Improved: Converted all GlReconciliationEntry related CRUD services from simple to entity-auto
    (OFBIZ-11662)
---
 .../minilang/ledger/GeneralLedgerServices.xml          | 16 ----------------
 applications/accounting/servicedef/secas_ledger.xml    | 10 ++++++++--
 applications/accounting/servicedef/services_ledger.xml | 18 +++++++++++-------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/applications/accounting/minilang/ledger/GeneralLedgerServices.xml b/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
index 87e6b00..a192a87 100644
--- a/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
+++ b/applications/accounting/minilang/ledger/GeneralLedgerServices.xml
@@ -156,22 +156,6 @@ under the License.
         <!-- when changing entries, also update the last modified info for the GlReconciliation -->
         <call-simple-method method-name="updateGlReconciliationLastModified"/>
     </simple-method>
-    <simple-method method-name="updateGlReconciliationEntry" short-description="Update Entry To GlReconciliation">
-        <entity-one entity-name="GlReconciliationEntry" value-field="lookedUpValue"/>
-        <set-nonpk-fields map="parameters" value-field="lookedUpValue"/>
-        <store-value value-field="lookedUpValue"/>
-
-        <!-- when changing entries, also update the last modified info for the GlReconciliation -->
-        <call-simple-method method-name="updateGlReconciliationLastModified"/>
-    </simple-method>
-    <simple-method method-name="deleteGlReconciliationEntry" short-description="Remove Entry From GlReconciliation">
-        <entity-one entity-name="GlReconciliationEntry" value-field="lookedUpValue"/>
-        <remove-value value-field="lookedUpValue"/>
-
-        <!-- when changing entries, also update the last modified info for the GlReconciliation -->
-        <call-simple-method method-name="updateGlReconciliationLastModified"/>
-    </simple-method>
-
     <!-- ========== GL Posting Services ========== -->
     <simple-method method-name="completeAcctgTransEntries" short-description="Completes, if possible, the AcctgTransEntries using the mappings defined in the gl setup">
         <entity-one entity-name="AcctgTrans" value-field="acctgTrans"/>
diff --git a/applications/accounting/servicedef/secas_ledger.xml b/applications/accounting/servicedef/secas_ledger.xml
index 1ecccc9..5916574 100644
--- a/applications/accounting/servicedef/secas_ledger.xml
+++ b/applications/accounting/servicedef/secas_ledger.xml
@@ -157,9 +157,15 @@ under the License.
         <condition field-name="verifyOnly" operator="not-equals" value="true"/>
         <action service="checkUpdateFixedAssetDepreciation" mode="sync"/>
     </eca>
-
+    <!-- GlReconciliation secas -->
     <eca service="updateGlReconciliation" event="invoke">
         <action service="setGlReconciliationStatus" mode="sync"/>
     </eca>
-
+    <!-- GlReconciliationEntry secas -->
+    <eca service="updateGlReconciliationEntry" event="commit">
+        <action service="updateGlReconciliationLastModified" mode="sync"/>
+    </eca>
+    <eca service="deleteGlReconciliationEntry" event="commit">
+        <action service="updateGlReconciliationLastModified" mode="sync"/>
+    </eca>
 </service-eca>
diff --git a/applications/accounting/servicedef/services_ledger.xml b/applications/accounting/servicedef/services_ledger.xml
index 6d68e2a..e0bd432 100644
--- a/applications/accounting/servicedef/services_ledger.xml
+++ b/applications/accounting/servicedef/services_ledger.xml
@@ -147,7 +147,14 @@ under the License.
         <permission-service service-name="basicGeneralLedgerPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-
+    <service name="updateGlReconciliationLastModified" default-entity-name="GlReconciliation" engine="simple"
+             location="component://accounting/minilang/ledger/GeneralLedgerServices.xml"
+             invoke="updateGlReconciliationLastModified" auth="true">
+        <description>Update Gl Reconciliation Last Modified</description>
+        <auto-attributes include="pk" mode="IN" optional="false"/>
+        <auto-attributes include="nonpk" mode="IN" optional="true"/>
+    </service>
+    <!-- GlReconciliationEntry services -->
     <service name="createGlReconciliationEntry" default-entity-name="GlReconciliationEntry" engine="simple"
             location="component://accounting/minilang/ledger/GeneralLedgerServices.xml" invoke="createGlReconciliationEntry" auth="true">
         <description>Add an Entry to a GlReconciliation</description>
@@ -156,21 +163,18 @@ under the License.
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
         <attribute name="statusId" type="String" mode="OUT" optional="true"/>
     </service>
-    <service name="updateGlReconciliationEntry" default-entity-name="GlReconciliationEntry" engine="simple"
-            location="component://accounting/minilang/ledger/GeneralLedgerServices.xml" invoke="updateGlReconciliationEntry" auth="true">
+    <service name="updateGlReconciliationEntry" default-entity-name="GlReconciliationEntry" engine="entity-auto" invoke="update" auth="true">
         <description>Update an Entry to a GlReconciliation record</description>
         <permission-service service-name="basicGeneralLedgerPermissionCheck" main-action="UPDATE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
         <auto-attributes include="nonpk" mode="IN" optional="false"/>
     </service>
-    <service name="deleteGlReconciliationEntry" default-entity-name="GlReconciliationEntry" engine="simple"
-            location="component://accounting/minilang/ledger/GeneralLedgerServices.xml" invoke="deleteGlReconciliationEntry" auth="true">
+    <service name="deleteGlReconciliationEntry" default-entity-name="GlReconciliationEntry" engine="entity-auto" invoke="delete" auth="true">
         <description>Remove an Entry from a GlReconciliation</description>
         <permission-service service-name="basicGeneralLedgerPermissionCheck" main-action="DELETE"/>
         <auto-attributes include="pk" mode="IN" optional="false"/>
     </service>
-
-        <!-- AcctgTrans & Related -->
+    <!-- AcctgTrans & Related services -->
     <service name="completeAcctgTransEntries" default-entity-name="AcctgTrans" engine="simple"
             location="component://accounting/minilang/ledger/GeneralLedgerServices.xml" invoke="completeAcctgTransEntries" auth="true">
         <description>Completes, if possible, the AcctgTransEntries using the mappings defined in the gl setup</description>