OFBiz › OFBiz - Commits

svn commit: r1821114 - in /ofbiz/ofbiz-framework/trunk/applications/workeffort: minilang/workeffort/WorkEffortSimpleServices.xml servicedef/services.xml

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1821114 - in /ofbiz/ofbiz-framework/trunk/applications/workeffort: minilang/workeffort/WorkEffortSimpleServices.xml servicedef/services.xml

jleroux@apache.org
Author: jleroux
Date: Sun Jan 14 18:33:23 2018
New Revision: 1821114

URL: http://svn.apache.org/viewvc?rev=1821114&view=rev
Log:
Improved: Create missing services definitions in WorkEffortSimpleServices.xml
(OFBIZ-9708)

In WorkEffortSimpleServices.xml the service implementations from
updateWorkEffortContactMech to updateWorkEffortEmailAddress are missing service
definitions.

This was discussed at http://markmail.org/message/kgbpolz2daxfa5zx.
Thanks to Pawan Verma for reporting and patching, everyone for the discussion
and Scott for the detailed argumentation which makes totally sense.

jleroux:I wanted to provide proper tests, but this has already stayed too long
in my working copy

Modified:
    ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml?rev=1821114&r1=1821113&r2=1821114&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml Sun Jan 14 18:33:23 2018
@@ -453,10 +453,8 @@ under the License.
         <!-- If we already have a new contactMechId don't update ContactMech -->
         <if-empty field="parameters.newContactMechId">
             <log level="info" message="Calling map procs"/>
-            <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml"
-                processor-name="updateContactMech" in-map-name="parameters" out-map-name="context"/>
-            <to-string field="context.contactMechId"/>
             <log level="info" message="Calling generic updateContactMech method"/>
+            <set-service-fields service-name="updateContactMech" map="parameters" to-map="context"/>
             <call-service service-name="updateContactMech" in-map-name="context">
                 <default-message property="PartyContactMechanismSuccessfullyUpdated" resource="PartyUiLabels"/>
                 <result-to-field result-name="contactMechId" field="newWorkEffortContactMech.contactMechId"/>
@@ -481,7 +479,7 @@ under the License.
     <simple-method method-name="createWorkEffortPostalAddress" short-description="Create a PostalAddress for WorkEffort">
         <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
         <log level="info" message="Creating postal address"/>
-        <if-not-empty field="parameters.addToParty">
+        <if-not-empty field="parameters.partyId">
             <call-map-processor xml-resource="component://party/minilang/contact/PartyContactMechMapProcs.xml"
                 processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
             <call-service service-name="createPartyPostalAddress" in-map-name="context">
@@ -490,8 +488,7 @@ under the License.
             </call-service>
             <log level="info" message="Party ContactMech created"/>
             <else>
-                <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml"
-                    processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
+                <set-service-fields service-name="createPostalAddress" map="parameters" to-map="context"/>
                 <call-service in-map-name="context" service-name="createPostalAddress">
                     <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyCreated"/>
                     <result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
@@ -512,28 +509,30 @@ under the License.
 
     <simple-method method-name="updateWorkEffortPostalAddress" short-description="Update a PostalAddress for WorkEffort">
         <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
-        <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml"
-                processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
+        <set-service-fields service-name="updatePostalAddress" map="parameters" to-map="context"/>
         <call-service in-map-name="context" service-name="updatePostalAddress">
             <default-message resource="PartyUiLabels" property="PartyPostalAddressSuccessfullyUpdated"/>
             <result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
+            <result-to-field result-name="oldContactMechId" field="oldContactMechId"/>
         </call-service>
         <call-map-processor xml-resource="component://workeffort/minilang/workeffort/WorkflowMapProcessors.xml"
                 processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/>
         <set from-field="newValue.contactMechId"  field="context2.newContactMechId"/>
         <set field="context2.contactMechTypeId" value="POSTAL_ADDRESS"/>
+        <set field="context2.fromDate" from-field="parameters.fromDate"/>
         <log level="info" message="Copied id to context2: ${context2.newContactMechId}"/>
         <call-service in-map-name="context2" service-name="updateWorkEffortContactMech">
             <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
         </call-service>
         <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
         <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
+        <field-to-result field="oldContactMechId" result-name="oldContactMechId"/>
     </simple-method>
 
     <simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
         <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
         <log level="info" message="Creating telecom number"/>
-        <if-not-empty field="parameters.addToParty">
+        <if-not-empty field="parameters.partyId">
             <call-map-processor xml-resource="component://party/minilang/contact/PartyContactMechMapProcs.xml"
                 processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
             <call-service service-name="createPartyTelecomNumber" in-map-name="context">
@@ -542,8 +541,7 @@ under the License.
             </call-service>
             <log level="info" message="Party ContactMech created"/>
             <else>
-                <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml"
-                    processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
+                <set-service-fields service-name="createTelecomNumber" map="parameters" to-map="context"/>
                 <call-service in-map-name="context" service-name="createTelecomNumber">
                     <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyCreated"/>
                     <result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
@@ -563,17 +561,18 @@ under the License.
 
     <simple-method method-name="updateWorkEffortTelecomNumber" short-description="Update a TelecomNumber for WorkEffort">
         <make-value entity-name="WorkEffortContactMech" value-field="newValue"/>
-        <call-map-processor xml-resource="component://party/minilang/contact/ContactMechMapProcs.xml"
-                processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
+        <set-service-fields service-name="updateTelecomNumber" map="parameters" to-map="context"/>
         <call-service in-map-name="context" service-name="updateTelecomNumber">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>
             <result-to-field result-name="contactMechId" field="newValue.contactMechId"/>
+            <result-to-field result-name="oldContactMechId" field="oldContactMechId"/>
         </call-service>
 
         <call-map-processor xml-resource="component://workeffort/minilang/workeffort/WorkflowMapProcessors.xml"
                 processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/>
         <set from-field="newValue.contactMechId"  field="context2.newContactMechId"/>
         <set field="context2.contactMechTypeId" value="TELECOM_NUMBER"/>
+        <set field="context2.fromDate" from-field="parameters.fromDate"/>
         <log level="info" message="Copied id to context2: ${context2.newContactMechId}"/>
         <call-service in-map-name="context2" service-name="updateWorkEffortContactMech">
             <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyUpdated"/>
@@ -581,12 +580,11 @@ under the License.
         <log level="info" message="Setting result id: ${newValue.contactMechId}"/>
         <field-to-request field="newValue.contactMechId" request-name="contactMechId"/>
         <field-to-result field="newValue.contactMechId" result-name="contactMechId"/>
+        <field-to-result field="oldContactMechId" result-name="oldContactMechId"/>
     </simple-method>
 
     <simple-method method-name="createWorkEffortEmailAddress" short-description="Create an email address for WorkEffort">
-        <call-map-processor xml-resource="component://workeffort/minilang/workeffort/WorkflowMapProcessors.xml"
-            processor-name="emailAddress" in-map-name="parameters" out-map-name="cwecmMap"/>
-        <check-errors/>
+        <set-service-fields service-name="createWorkEffortContactMech" map="parameters" to-map="cwecmMap"/>
         <set field="cwecmMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
         <call-service service-name="createWorkEffortContactMech" in-map-name="cwecmMap">
             <default-message resource="PartyUiLabels" property="PartyContactMechanismSuccessfullyCreated"/>
@@ -595,9 +593,7 @@ under the License.
         </call-service>
     </simple-method>
     <simple-method method-name="updateWorkEffortEmailAddress" short-description="Update an email address for WorkEffort">
-        <call-map-processor xml-resource="component://workeffort/minilang/workeffort/WorkflowMapProcessors.xml"
-            processor-name="emailAddress" in-map-name="parameters" out-map-name="uwecmMap"/>
-        <check-errors/>
+        <set-service-fields service-name="createWorkEffortContactMech" map="parameters" to-map="uwecmMap"/>
         <set field="uwecmMap.contactMechTypeId" value="EMAIL_ADDRESS"/>
         <call-service service-name="updateWorkEffortContactMech" in-map-name="uwecmMap">
             <default-message resource="PartyUiLabels" property="PartyTelecomNumberSuccessfullyUpdated"/>

Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml?rev=1821114&r1=1821113&r2=1821114&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/ofbiz-framework/trunk/applications/workeffort/servicedef/services.xml Sun Jan 14 18:33:23 2018
@@ -767,11 +767,66 @@ under the License.
         <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
         <attribute name="contactMechId" type="String" mode="INOUT" optional="true"/>
     </service>
+    <service name="updateWorkEffortContactMech" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortContactMech" auth="true">
+        <description>Update WorkEffortContactMech</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
+        <auto-attributes entity-name="WorkEffortContactMech" mode="IN" include="nonpk" optional="true"/>
+        <auto-attributes entity-name="PartyContactMech" include="all" mode="IN" optional="true"/>
+        <attribute name="workEffortId" mode="IN" type="String" optional="false"></attribute>
+        <attribute name="contactMechTypeId" mode="IN" type="String" optional="true"></attribute>
+        <attribute name="infoString" mode="IN" type="String" optional="true"></attribute>
+        <attribute name="contactMechPurposeTypeId" type="String" mode="IN" optional="true"/>
+        <attribute name="newContactMechId" type="String" mode="IN" optional="true"/>
+        <attribute name="contactMechId" type="String" mode="INOUT" optional="true"/>
+    </service>
     <service name="deleteWorkEffortContactMech" engine="entity-auto" default-entity-name="WorkEffortContactMech" invoke="delete" auth="true">
         <description>Delete WorkEffortContactMech</description>
         <permission-service service-name="workEffortGenericPermission" main-action="DELETE"/>
         <auto-attributes mode="IN" include="pk" optional="false"/>
     </service>
+    <service name="createWorkEffortPostalAddress" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortPostalAddress">
+        <description>Create WorkEffort PostalAddress</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="CREATE"/>
+        <implements service="createPostalAddress"/>
+        <implements service="createPartyPostalAddress"/>
+        <implements service="createWorkEffortContactMech"/>
+    </service>
+    <service name="updateWorkEffortPostalAddress" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortPostalAddress">
+        <description>Update WorkEffort PostalAddress</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
+        <implements service="updatePostalAddress"/>
+        <implements service="updateWorkEffortContactMech"/>
+    </service>
+    <service name="createWorkEffortTelecomNumber" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortTelecomNumber">
+        <description>Create WorkEffort TelecomNumber</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="CREATE"/>
+        <implements service="createTelecomNumber"/>
+        <implements service="createPartyTelecomNumber"/>
+        <implements service="createWorkEffortContactMech"/>
+    </service>
+    <service name="updateWorkEffortTelecomNumber" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortTelecomNumber">
+        <description>Update WorkEffort TelecomNumber</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
+        <implements service="updateTelecomNumber"/>
+        <implements service="updateWorkEffortContactMech"/>
+    </service>
+    <service name="createWorkEffortEmailAddress" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="createWorkEffortEmailAddress">
+        <description>Create WorkEffort Email Address</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="CREATE"/>
+        <implements service="createWorkEffortContactMech"/>
+    </service>
+    <service name="updateWorkEffortEmailAddress" engine="simple"
+             location="component://workeffort/minilang/workeffort/WorkEffortSimpleServices.xml" invoke="updateWorkEffortEmailAddress">
+        <description>Update WorkEffort Email Address</description>
+        <permission-service service-name="workEffortGenericPermission" main-action="UPDATE"/>
+        <implements service="updateWorkEffortContactMech"/>
+    </service>
 
     <!--WorkEffortInventoryProduced Services   -->
     <service name="createWorkEffortInventoryProduced" engine="entity-auto" default-entity-name="WorkEffortInventoryProduced" invoke="create" auth="true">


Free forum by Nabble Edit this page