slapos_crm: Set customer as source of notification

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMSkins.py

@@ -675,7 +675,9 @@ class TestSlapOSComputeNode_notifyWrongAllocationScope(TestCRMSkinsMixin):
     self.assertEqual(event.getTitle(),
       'Allocation scope of %s changed to %s' % (compute_node.getReference(), 'open/personal'))
     self.assertIn(compute_node.getReference(), event.getTextContent())
-    self.assertEqual(event.getDestination(), person.getRelativeUrl())
+    self.assertEqual(event.getSource(), person.getRelativeUrl())
+    self.assertEqual(event.getDestination(), ticket.getSourceSection())
+
 
   @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
   @simulate('NotificationTool_getDocumentValue',
@@ -705,7 +707,9 @@ class TestSlapOSComputeNode_notifyWrongAllocationScope(TestCRMSkinsMixin):
     self.assertEqual(event.getTitle(),
       'Allocation scope of %s changed to %s' % (compute_node.getReference(), 'open/personal'))
     self.assertIn(compute_node.getReference(), event.getTextContent())
-    self.assertEqual(event.getDestination(), person.getRelativeUrl())
+    self.assertEqual(event.getSource(), person.getRelativeUrl())
+    self.assertEqual(event.getDestination(), ticket.getSourceSection())
+
 
   @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
   @simulate('ComputeNode_hasContactedRecently', '*args, **kwargs','return False')
@@ -737,7 +741,9 @@ class TestSlapOSComputeNode_notifyWrongAllocationScope(TestCRMSkinsMixin):
       'Allocation scope of %s changed to %s' % \
         (compute_node.getReference(), target_allocation_scope))
     self.assertIn(compute_node.getReference(), event.getTextContent())
-    self.assertEqual(event.getDestination(), person.getRelativeUrl())
+    self.assertEqual(event.getSource(), person.getRelativeUrl())
+    self.assertEqual(event.getDestination(), support_request.getSourceSection())
+    
 
   def test_ComputeNodeNormalAllocationScope_OpenPersonal(self):
     compute_node = self._makeComputeNode(owner=self.makePerson(user=0))[0]
@@ -1065,7 +1071,9 @@ class TestSlapOSComputeNode_CheckState(TestCRMSkinsMixin):
 
     self.assertEqual(event.getTitle(), ticket.getTitle())
     self.assertIn(compute_node.getReference(), event.getTextContent())
-    self.assertEqual(event.getDestination(), person.getRelativeUrl())
+    self.assertEqual(event.getSource(), person.getRelativeUrl())
+    self.assertEqual(event.getDestination(), ticket.getSourceSection())
+
 
   @simulate('ERP5Site_isSupportRequestCreationClosed', '*args, **kwargs','return 0')
   @simulate('NotificationTool_getDocumentValue',
@@ -1092,7 +1100,8 @@ class TestSlapOSComputeNode_CheckState(TestCRMSkinsMixin):
 
     self.assertEqual(event.getTitle(), ticket.getTitle())
     self.assertIn(compute_node.getReference(), event.getTextContent())
-    self.assertEqual(event.getDestination(), person.getRelativeUrl())
+    self.assertEqual(event.getDestination(), ticket.getSourceSection())
+    self.assertEqual(event.getSource(), person.getRelativeUrl())
 
 class TestSlapOSInstanceTree_createSupportRequestEvent(SlapOSTestCaseMixin):
 
@@ -1158,7 +1167,8 @@ class TestSlapOSInstanceTree_createSupportRequestEvent(SlapOSTestCaseMixin):
 
     self.assertEqual(event.getTitle(), ticket_title)
     self.assertIn(instance_tree.getReference(), event.getTextContent())
-    self.assertEqual(event.getDestination(), person.getRelativeUrl())
+    self.assertEqual(event.getSource(), person.getRelativeUrl())
+    self.assertEqual(event.getDestination(), ticket.getSourceSection())
 
     ticket.suspend()
     self.tic()
@@ -1576,7 +1586,8 @@ class TestSupportRequestUpdateMonitoringState(SlapOSTestCaseMixin):
     event = event_list[0]
 
     self.assertEqual(event.getTitle(), 'Instance Tree was destroyed was destroyed by the user')
-    self.assertEqual(event.getDestination(), support_request.getDestinationDecision())
+    self.assertEqual(event.getSource(), support_request.getDestinationDecision())
+    self.assertEqual(event.getDestination(), support_request.getSourceSection())
 
     self.assertEqual("invalidated",
       support_request.getSimulationState())

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCRMSkins.xml

@@ -6,12 +6,6 @@
     </pickle>
     <pickle>
       <dictionary>
-        <item>
-            <key> <string>_recorded_property_dict</string> </key>
-            <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
-            </value>
-        </item>
         <item>
             <key> <string>default_reference</string> </key>
             <value> <string>testSlapOSCRMSkins</string> </value>
@@ -55,28 +49,13 @@
         <item>
             <key> <string>workflow_history</string> </key>
             <value>
-              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
             </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
-    <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>data</string> </key>
-            <value>
-              <dictionary/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="PersistentMapping" module="Persistence.mapping"/>
     </pickle>
@@ -89,7 +68,7 @@
                 <item>
                     <key> <string>component_validation_workflow</string> </key>
                     <value>
-                      <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
                     </value>
                 </item>
               </dictionary>
@@ -98,7 +77,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="4" aka="AAAAAAAAAAQ=">
+  <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

master/bt5/slapos_crm/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudTicketSlapInterfaceWorkflow.py

@@ -162,9 +162,9 @@ class TestSlapOSCoreTicketSlapInterfaceWorkflow(SlapOSTestCaseMixin):
     self.assertEqual(self.support_request.getSimulationState(),
       'validated')
     
-    self.assertEqual(self.support_request.getDestinationDecision(),
+    self.assertEqual(self.support_request.getSourceSection(),
       event.getDestination())
-    self.assertEqual(person, event.getDestinationValue())
+    self.assertEqual(person, event.getSourceValue())
 
     self.assertEqual("service_module/slapos_crm_information",
       event.getResource())
@@ -176,7 +176,9 @@ class TestSlapOSCoreTicketSlapInterfaceWorkflow(SlapOSTestCaseMixin):
     self.assertEqual(event.getContentType(), "text/html")
     self.assertEqual(event.getPortalType(), "Web Message")
     self.assertEqual(event.getSource(),
-      self.support_request.getSource())
+      self.support_request.getDestinationDecision())
+    self.assertEqual(event.getDestination(),
+      self.support_request.getSourceSection())
 
     # Retry now to see if doesn't create a new message
     self.support_request.notify(

master/bt5/slapos_crm/WorkflowTemplateItem/portal_workflow/ticket_slap_interface_workflow/script_Ticket_notify.py

@@ -43,8 +43,8 @@ event.edit(
   text_content=message,
   start_date = DateTime(),
   resource = resource,
-  source=ticket.getSource(),
-  destination=ticket.getDestinationDecision(),
+  source=ticket.getDestinationDecision(),
+  destination=ticket.getSource(),
   follow_up=ticket.getRelativeUrl(),
 )
 event.stop()