[slapos_crm] Set Destination Decision on Monitoring Support Requests

Set Computer/Software Instance owner on the support requests, so owner can take a decision.

master/bt5/slapos_crm/SkinTemplateItem/portal_skins/slapos_crm/Base_generateSupportRequestForSlapOS.xml

@@ -60,6 +60,13 @@ if portal.ERP5Site_isSupportRequestCreationClosed():\n
 \n
 source_project_value = portal.restrictedTraverse(source_relative_url)\n
 \n
+if source_project_value.getPortalType() == "Computer":\n
+  destination_decision = source_project_value.getSourceAdministration()\n
+elif source_project_value.getPortalType() == "Software Instance":\n
+  destination_decision = source_project_value.getSpecialiseValue().getDestinationSection()\n
+else:\n
+  destination_decision = None\n
+\n
 support_request_in_progress = portal.portal_catalog.getResultValue(\n
   portal_type = \'Support Request\',\n
   title = title,\n
@@ -76,6 +83,7 @@ if support_request_in_progress is None:\n
     title = title,\n
     description = description,\n
     start_date = DateTime(),\n
+    destination_decision=destination_decision,\n
     source_project_value = source_relative_url\n
   )\n
   support_request.validate()\n

master/bt5/slapos_crm/TestTemplateItem/testSlapOSCRMSupportRequestGeneration.py

@@ -50,11 +50,14 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
 
   def _makeComputer(self,new_id):
     # Clone computer document
+    person = self.portal.person_module.template_member\
+         .Base_createCloneDocument(batch_mode=1)
     computer = self.portal.computer_module\
       .template_computer.Base_createCloneDocument(batch_mode=1)
     computer.edit(
       title="computer ticket %s" % (new_id, ),
-      reference="TESTCOMPT-%s" % (new_id, )
+      reference="TESTCOMPT-%s" % (new_id, ),
+      source_administration_value=person
     )
     computer.validate()
 
@@ -100,6 +103,8 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
      return software_installation
 
   def _makeHostingSubscription(self, new_id):
+    person = self.portal.person_module.template_member\
+         .Base_createCloneDocument(batch_mode=1)
     hosting_subscription = self.portal\
       .hosting_subscription_module.template_hosting_subscription\
       .Base_createCloneDocument(batch_mode=1)
@@ -107,6 +112,7 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
     hosting_subscription.edit(
         title= "Test hosting sub ticket %s" % new_id,
         reference="TESTHST-%s" % new_id,
+        destination_section_value=person
     )
 
     return hosting_subscription
@@ -125,7 +131,8 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
     hosting_subscription.requestStart(**kw)
     hosting_subscription.requestInstance(**kw)
 
-  def test_Base_generateSupportRequestForSlapOS(self):
+  def test_computer_Base_generateSupportRequestForSlapOS(self):
+    self._dropBase_generateSupportRequestForSlapOS()
     title = "Test Support Request %s" % self.new_id
     computer = self._makeComputer(self.new_id)
     support_request = computer.Base_generateSupportRequestForSlapOS(
@@ -133,7 +140,32 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
     )
     self.tic()
 
-    self.assertNotEqual(support_request,None)
+    self.assertNotEqual(support_request, None)
+
+    support_request = self.portal.restrictedTraverse(support_request)
+
+    # The support request is added to computer owner.
+    self.assertEquals(support_request.getDestinationDecision(),
+                      computer.getSourceAdministration())
+
+  def test_software_instance_Base_generateSupportRequestForSlapOS(self):
+    host_sub = self._makeHostingSubscription(self.new_id)
+    self._makeSoftwareInstance(host_sub,self.generateNewSoftwareReleaseUrl())
+    instance = host_sub.getPredecessorValue()
+
+    title = "Test Support Request %s" % self.new_id
+    support_request = instance.Base_generateSupportRequestForSlapOS(
+      title, title, instance.getRelativeUrl()
+    )
+    self.tic()
+
+    self.assertNotEqual(support_request, None)
+
+    support_request = self.portal.restrictedTraverse(support_request)
+ 
+    # The support request is added to computer owner.
+    self.assertEquals(support_request.getDestinationDecision(),
+                      host_sub.getDestinationSection())
 
   def test_Base_generateSupportRequestForSlapOS_do_not_recreate_if_open(self):
     title = "Test Support Request %s" % self.new_id
@@ -150,6 +182,23 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
 
     self.assertEqual(support_request, None)
 
+  def test_ERP5Site_isSupportRequestCreationClosed(self):
+
+    self.assertFalse(self.portal.ERP5Site_isSupportRequestCreationClosed())
+
+    def newSupportRequest():
+      sr = self.portal.support_request_module.newContent(\
+                                 title="Test Support Request POIUY")
+      sr.validate()
+      sr.immediateReindexObject()
+
+    newSupportRequest()
+    self.assertFalse(self.portal.ERP5Site_isSupportRequestCreationClosed())
+    newSupportRequest()
+    self.assertFalse(self.portal.ERP5Site_isSupportRequestCreationClosed())
+    newSupportRequest()
+    self.assertTrue(self.portal.ERP5Site_isSupportRequestCreationClosed())
+
   def test_Base_generateSupportRequestForSlapOS_recreate_if_closed(self):
     title = "Test Support Request %s" % self.new_id
     computer = self._makeComputer(self.new_id)
@@ -184,6 +233,7 @@ class TestSlapOSCloudSupportRequestGeneration(testSlapOSMixin):
     if script_name in self.portal.portal_skins.custom.objectIds():
       self.portal.portal_skins.custom.manage_delObjects(script_name)
     transaction.commit()
+    self.assertFalse(script_name in self.portal.portal_skins.custom.objectIds())
 
   def test_Computer_checkState(self):
     computer = self._makeComputer(self.new_id)

master/bt5/slapos_crm/bt/revision

-31
\ No newline at end of file
+32
\ No newline at end of file