otrs-somconnexio 0.7.3__py2.py3-none-any.whl → 0.8.0__py2.py3-none-any.whl

otrs_somconnexio/otrs_models/provision_article.py

@@ -1,12 +1,9 @@
 # coding: utf-8
 from otrs_somconnexio.otrs_models.abstract_article import AbstractArticle
-from otrs_somconnexio.services.get_ticket_title import GetTicketTitle
 
 
 class ProvisionArticle(AbstractArticle):
-    def __init__(self, technology, order_id, service_type, notes=""):
-        subject = GetTicketTitle(technology, order_id, service_type).build()
+    def __init__(self, subject, notes=""):
         self.subject = subject
-        if notes:
-            self.isVisibleForCustomer = "0"
+        self.isVisibleForCustomer = "0" if notes else "1"
         self.body = notes

otrs_somconnexio/otrs_models/provision_ticket.py

@@ -1,6 +1,6 @@
 # coding: utf-8
-from pyotrs.lib import Ticket
-
+import base64
+from pyotrs.lib import Attachment, Ticket
 from otrs_somconnexio.client import OTRSClient
 from otrs_somconnexio.otrs_models.provision_article import ProvisionArticle
 from otrs_somconnexio.services.get_ticket_title import GetTicketTitle
@@ -11,8 +11,12 @@ class ProvisionTicket:
         self.responsible_data = responsible_data
 
     def create(self):
+        new_ticket = self._build_ticket()
         self.otrs_ticket = OTRSClient().create_otrs_process_ticket(
-            self._build_ticket(), self._build_article(), self._build_dynamic_fields()
+            new_ticket,
+            article=self._build_article(),
+            dynamic_fields=self._build_dynamic_fields(),
+            attachments=self._build_attachments(),
         )
 
     @property
@@ -40,11 +44,16 @@ class ProvisionTicket:
             }
         )
 
+    def _get_article_subject(self):
+        return self._ticket_title()
+
+    def _get_article_notes(self):
+        return self.service_data.notes
+
     def _build_article(self):
         provision_article = ProvisionArticle(
-            self.service_data.technology,
-            self.service_data.order_id,
-            self.service_type(),
+            self._get_article_subject(),
+            self._get_article_notes(),
         )
         return provision_article.call()
 
@@ -55,6 +64,21 @@ class ProvisionTicket:
             self.service_type(),
         ).build()
 
+    def _build_attachments(self):
+        docs = self._files_to_attach()
+        if not docs:
+            return []
+        return [
+            Attachment.create_basic(
+                Content=base64.b64encode(bytes(doc["Content"], "utf-8")).decode(
+                    "utf-8"
+                ),
+                Filename=doc["Filename"],
+                ContentType=doc.get("ContentType", "text/plain"),
+            )
+            for doc in docs
+        ]
+
     def _ticket_type(self):
         return self.otrs_configuration.type
 
@@ -93,3 +117,9 @@ class ProvisionTicket:
             return self.responsible_data.email
         else:
             return False
+
+    def _files_to_attach(self):
+        """Override to attach files to the ticket.
+        Format: [{"Filename": "file.txt", "Content": "file content", "ContentType": "text/plain"}, ...]
+        """
+        return []

otrs_somconnexio/otrs_models/switchboard_header_data.py

@@ -8,6 +8,8 @@ class SwitchboardHeaderData:
         contact_phone,
         sales_team,
         technology,
+        lead_line_data,
+        agent_data,
         notes="",
     ):
         self.order_id = order_id
@@ -15,4 +17,6 @@ class SwitchboardHeaderData:
         self.contact_phone = contact_phone
         self.sales_team = sales_team
         self.technology = technology
+        self.lead_line_data = lead_line_data
+        self.agent_data = agent_data
         self.notes = notes

otrs_somconnexio/otrs_models/switchboard_header_ticket.py

@@ -1,4 +1,6 @@
 # coding: utf-8
+from tabulate import tabulate
+from itertools import groupby
 from otrs_somconnexio.otrs_models.provision_ticket import ProvisionTicket
 from otrs_somconnexio.otrs_models.switchboard_header_dynamic_fields import (
     SwitchboardHeaderDynamicFields,
@@ -28,3 +30,59 @@ class SwitchboardHeaderTicket(ProvisionTicket):
 
     def _ticket_title(self):
         return "Provisió centraleta virtual (CV) → Capçalera"
+
+    def _files_to_attach(self):
+        formatted_agent_data = self._format_agent_data()
+
+        attachments = []
+
+        if formatted_agent_data:
+            attachments.append(
+                {
+                    "Filename": "importació_agents_operator_{}.txt".format(
+                        self.service_data.order_id
+                    ),
+                    "Content": formatted_agent_data,
+                }
+            )
+
+        return attachments
+
+    def _get_article_notes(self):
+        return self._format_lead_line_data()
+
+    def _format_lead_line_data(self):
+        """Format lead line data for tsv table attachment."""
+        lead_line_data = self.service_data.lead_line_data
+        if not lead_line_data:
+            return ""
+
+        lead_table_data = list(zip(*lead_line_data.values()))
+        headers = lead_line_data.keys()
+        lead_lines_table = tabulate(lead_table_data, headers, tablefmt="csv")
+
+        return lead_lines_table
+
+    def _format_agent_data(self):
+        """Format agent data for operator import attachment.
+        Sorted by product, grouped by product.
+        """
+        agent_data = self.service_data.agent_data
+        if not agent_data:
+            return ""
+
+        sorted_agents = sorted(agent_data, key=lambda d: d["product"])
+
+        pin = "2424"
+        agents_info = []
+        for product, agents in groupby(sorted_agents, key=lambda ag: ag["product"]):
+            agents_info.append(f"{product}:")
+
+            for agent in agents:
+                agents_info.append(
+                    f"{agent['extension']}\t{agent['agent_name']}\t{pin}\t{agent['agent_name']}\t{agent['agent_email']}"  # noqa E501
+                )
+
+            agents_info.append("")
+
+        return "\n".join(agents_info)

{otrs_somconnexio-0.7.3.dist-info → otrs_somconnexio-0.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otrs-somconnexio
-Version: 0.7.3
+Version: 0.8.0
 Summary: Python package for Somconnexio data syncing in OTRS
 Home-page: https://gitlab.com/coopdevs/otrs_somconnexio
 Author: Coopdevs
@@ -14,6 +14,8 @@ Classifier: Programming Language :: Python :: 2.7
 Description-Content-Type: text/markdown
 Requires-Dist: pyotrs==0.12.7
 Requires-Dist: future==0.18.2
+Requires-Dist: tabulate==0.9.0
+Requires-Dist: more-itertools==10.0.0
 
 # Python 2.7/3.8 module to manage the SomConnexio's ERP integration with OTRS
 

{otrs_somconnexio-0.7.3.dist-info → otrs_somconnexio-0.8.0.dist-info}/RECORD

@@ -19,9 +19,9 @@ otrs_somconnexio/otrs_models/mobile_data.py,sha256=Zl5AlbrtfxT4i6z83sAth_dZcOn0y
 otrs_somconnexio/otrs_models/mobile_dynamic_fields.py,sha256=cDTG310YUxtOlw8hjKTRrhOiZmC3I1nEvBncaHMhb3Q,3563
 otrs_somconnexio/otrs_models/mobile_ticket.py,sha256=aNtGteRzD-dOtPqqs3KoqggZaeLy_Za1KEBM5aHGCYI,1336
 otrs_somconnexio/otrs_models/providers.py,sha256=Jy5lm_gCuwy_BhpNE5JJ5-TrE8aFQpZvMiYZ-PTlgqs,181
-otrs_somconnexio/otrs_models/provision_article.py,sha256=jONH4lHzjg2jyx_mxjghw503oUT9VI9QwZrJ25HdOS0,469
+otrs_somconnexio/otrs_models/provision_article.py,sha256=Zs7V9Y8Tag7B8Y_BnEWjIetMO3cSyu397TrItX1jxNI,291
 otrs_somconnexio/otrs_models/provision_dynamic_fields.py,sha256=LdYbmj2RSiGpKzFt4Ws9gUrZdRWec9jVC0lsy2BK7j0,4347
-otrs_somconnexio/otrs_models/provision_ticket.py,sha256=J-gFMjFuAfFe6dwaszQH_A-te4yC9Mt-IhixZT4OLRw,2801
+otrs_somconnexio/otrs_models/provision_ticket.py,sha256=6Nz11-sG_0YARNqaxbJ0XQsZsXsw7XH3L_ENGIo-hFg,3746
 otrs_somconnexio/otrs_models/responsible_data.py,sha256=KCXkCNe_NLRpVLzeK8iNlbuH-tYag4YOL-MqnCFXn0g,104
 otrs_somconnexio/otrs_models/router_4G_data.py,sha256=EQIVxVstFswmEcOHzzV1ZyDYaadiU7lbunb5CJg6xAM,194
 otrs_somconnexio/otrs_models/router_4G_dynamic_fields.py,sha256=NVrfwD2Mj1TTzOC8NYna1XQYXEN6ffAfovlP9VAIHh4,403
@@ -29,9 +29,9 @@ otrs_somconnexio/otrs_models/router_4G_ticket.py,sha256=Z02DL-hgnqB_imVIB0nxZCU_
 otrs_somconnexio/otrs_models/service.py,sha256=EwxTSe6hPS33KbbPGNYzofhEhB4O4d71P9KkpOEjakA,2121
 otrs_somconnexio/otrs_models/switchboard_data.py,sha256=TQLv8Kfcz9TXJZY2yXUKD2nm1QVaMZyysYMttumH44k,1743
 otrs_somconnexio/otrs_models/switchboard_dynamic_fields.py,sha256=K1cRkn7WCxXCsvWLIblSCr30vTtynyCkDA_PVupnLDo,3149
-otrs_somconnexio/otrs_models/switchboard_header_data.py,sha256=8LwfLlcTAY9c9iJNOX2n8foOVuUGt7WyLA2XMpy5VuA,427
+otrs_somconnexio/otrs_models/switchboard_header_data.py,sha256=Q3upfUY-alMO26b4D2uKKo531PibcZsVCCCLc35DNjQ,553
 otrs_somconnexio/otrs_models/switchboard_header_dynamic_fields.py,sha256=ODX1fa_KV6Rp_Jvnv_HMvE79VmfxX7Gs-GflMo3__54,2498
-otrs_somconnexio/otrs_models/switchboard_header_ticket.py,sha256=6jjC913q6n9C39eOtPx2nHY9aOEpH3wWM6lym7-xLjs,1078
+otrs_somconnexio/otrs_models/switchboard_header_ticket.py,sha256=b9YwV17Kgc_gaslCIzzpSN7RZTWVr3IMBlH62WZ1WmI,2909
 otrs_somconnexio/otrs_models/switchboard_ticket.py,sha256=h1PtSnLLGlTWbE091qm2vXjia989JkpBnY0yzvn9OxA,1224
 otrs_somconnexio/otrs_models/telecom_company.py,sha256=yh8wIE7-AjWESdFsE479WWZ-3uFz_ljUBKF8GK44oow,3077
 otrs_somconnexio/otrs_models/ticket_factory.py,sha256=QL2u-51EuXy1aJWZxUZMo4JisDoKBAQM83GViXJAPx8,2215
@@ -123,28 +123,28 @@ tests/otrs_models/common_helper.py,sha256=WAd7aenHTfHvxjZMlwFfr32ajaF285Y75eifMj
 tests/otrs_models/test_abstract_article.py,sha256=udzIihoP0h8Ien20JFz1jLm5Sv2b3wO6f2JZK6zRTKQ,861
 tests/otrs_models/test_adsl_data.py,sha256=_NGpe5mStNyKPhZ5xFVS62jMdMr5vkzp9SusHmFh4r4,1484
 tests/otrs_models/test_adsl_dynamic_fields.py,sha256=KfR8RO2EoJC6YRauSBf1ktrS2cgLindyLOu3KTkI_W8,19946
-tests/otrs_models/test_adsl_ticket.py,sha256=t_pif_WWhUOLp-8JLbDvqIUiXW035fq386iJzb57ViY,4553
+tests/otrs_models/test_adsl_ticket.py,sha256=iebdC-HDzSZEj-m_hbEsyfjkhhNeHT6FrnET9iDswJc,4587
 tests/otrs_models/test_coverage_article.py,sha256=O_wm0l75m6sBWEcMdLOvBWDNSVXJ89IkL4IijIgiuPk,1519
 tests/otrs_models/test_coverage_ticket.py,sha256=0W4f28BMhtZDvPm71d7YPJuiVi9jUI6WJBbjh3xs0mg,1019
 tests/otrs_models/test_customer_user.py,sha256=9TDojrOsQBqd4kdC8SxvG5Ub18AXkJ_tsYuUeHALZnc,2227
 tests/otrs_models/test_fiber_data.py,sha256=rdFbcqzI49PV2m30vqnBOmZr2rn_MBqC0bJd0K0dcbI,1833
 tests/otrs_models/test_fiber_dynamic_fields.py,sha256=taaR8fU8Gh0RppxfKrltDQDz4YnHaBvOOz5_qXhyWoc,27127
-tests/otrs_models/test_fiber_ticket.py,sha256=9CeW1x2lZRIF40sD6iPqTGtMlvnKMRvD_uPJx9c5KgU,6361
+tests/otrs_models/test_fiber_ticket.py,sha256=DgbNN5oPJgMp-0o-QebzkZUOdWV4TcmFSd4t3umwxfk,6689
 tests/otrs_models/test_mobile_data.py,sha256=EBtwJL9kUaThhnKuqpUk6GFv0KS7RhyCF6dJNgr1-m8,1110
 tests/otrs_models/test_mobile_dynamic_fields.py,sha256=Xi8lj7PCJunwij-VQxqPYnafY2inEqeqQmQfSRFAmOM,19861
 tests/otrs_models/test_mobile_paused_ticket.py,sha256=T7Gyy7hoG994KHXkTWbJVQC_sC1sgZl4C1_sgpx3hwk,1418
-tests/otrs_models/test_mobile_ticket.py,sha256=hFWKdqUpfFOTKAitx9cUPdoIEQu_Hy_tAVOGMuQkgCc,4859
-tests/otrs_models/test_provision_article.py,sha256=SwTA96si0tundnu6lGCJGQcaOpnkRnKUYRKO9NcsflI,1773
+tests/otrs_models/test_mobile_ticket.py,sha256=y6gqz7YY-Uo-p5xx5_TNA_-g-MJENpO2OvLofLTm6PA,5167
+tests/otrs_models/test_provision_article.py,sha256=7M6fgw_CCV4ZydDapbnoCQYE0LrPyHlpqeBysp7aMYk,1188
 tests/otrs_models/test_router_4G_data.py,sha256=3zKZzWd21j8q4oXFG-Pl1Ugtkp4J0_RZx8HtHRzpfKM,1443
 tests/otrs_models/test_router_4G_dynamic_fields.py,sha256=hjUgmZHmAa5MFpaqtcRVbvaIeTZH5Xzmw6U6xbTSZxM,21577
-tests/otrs_models/test_router_4G_ticket.py,sha256=82KhmpV9i9tRql2cjCpouejjOwjggUAeeyJYTUFlBHY,4835
+tests/otrs_models/test_router_4G_ticket.py,sha256=v5PRz3z9dK12_hmYtM7FAS3X681h7BdLumg4ag9x65I,5140
 tests/otrs_models/test_service.py,sha256=fLFyJ5wE8jszrD9sZlSOebjioR8dv8z2SeGZVcA3r5U,6833
 tests/otrs_models/test_switchboard_data.py,sha256=QlO_vupDFeavLFH1EIXVzRf4qIJ5AtuyvgCg_v4sXTE,1233
 tests/otrs_models/test_switchboard_dynamic_fields.py,sha256=JPPz5j0ArtS_RYaGQqkI7h7SupI6Vj7FfcpxnzLPYN0,6138
-tests/otrs_models/test_switchboard_header_data.py,sha256=kXkicBHpIaBgVSDDhEIqVgDEu1rpQG0TQLUGL0Jr_3s,534
+tests/otrs_models/test_switchboard_header_data.py,sha256=k9ZZ3fnEIIrbca0572PaGLrWm6snjr94grICot3rLcs,592
 tests/otrs_models/test_switchboard_header_dynamic_fields.py,sha256=8jCN7AF3ciUHDU5olA9axJHrSvA8xrWaqtJ8cvPqXsk,3557
-tests/otrs_models/test_switchboard_header_ticket.py,sha256=L2ucF3I-siiA_J0Q0hwU4DR32A4Zv-LTSfuTs1y8bkg,4508
-tests/otrs_models/test_switchboard_ticket.py,sha256=ri1YmKGo0BS572Ma7c-oh-2x1PzwMYbqMxIoExHBsMk,5473
+tests/otrs_models/test_switchboard_header_ticket.py,sha256=kxFXrjhBsYWHxAjlAJXXhIwslZ_JbDsStXN_YCu_NEs,7415
+tests/otrs_models/test_switchboard_ticket.py,sha256=dQYHIyNEM_MPAzNsTljh-4qFaxyvy6HVYoHTMhnqJ64,5471
 tests/otrs_models/test_telecom_company.py,sha256=nC4uBleU2Lr3qHr5VDo-6kbcTVwKgguC85TcbhTOn1c,1450
 tests/otrs_models/test_ticket_factory.py,sha256=nvye2LK3vfYv3xRNqsBO9M0zYWRWAPWjEFgdDpY1whQ,4048
 tests/otrs_models/test_vf_provisioning_article.py,sha256=Yj8vtaowhxP12K_-FMcJNW-5re3yyCCfGLRHCPYgrVA,897
@@ -196,7 +196,7 @@ tests/services/test_update_ticket_with_provider_info.py,sha256=cZUg-hNV4BoMwafbp
 tests/user_management_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/user_management_client/test_client.py,sha256=088q9H1yf8Hii7zUF17KULqOO-JCxJLsR7vQ8lGHiqg,4410
 tests/user_management_client/test_user_management_response.py,sha256=HCCG7i2f6-ytrRpTzYZHODKCdW-X5GJn-BMVegd5FXg,1539
-otrs_somconnexio-0.7.3.dist-info/METADATA,sha256=NEhwBJ7zXznXiE8D7zJ27rvuHwBjEBkcqNjiLfK-QQw,3458
-otrs_somconnexio-0.7.3.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
-otrs_somconnexio-0.7.3.dist-info/top_level.txt,sha256=gvMaHGNwusWpSIy-PVyb0CKDIA4-4fXmEVER_2a-OnE,23
-otrs_somconnexio-0.7.3.dist-info/RECORD,,
+otrs_somconnexio-0.8.0.dist-info/METADATA,sha256=8kmIb1rsU7THFSbI9ltja8v7HPAS9J7PLIgfQdCLpw0,3527
+otrs_somconnexio-0.8.0.dist-info/WHEEL,sha256=fS9sRbCBHs7VFcwJLnLXN1MZRR0_TVTxvXKzOnaSFs8,110
+otrs_somconnexio-0.8.0.dist-info/top_level.txt,sha256=gvMaHGNwusWpSIy-PVyb0CKDIA4-4fXmEVER_2a-OnE,23
+otrs_somconnexio-0.8.0.dist-info/RECORD,,

tests/otrs_models/test_adsl_ticket.py

@@ -12,7 +12,7 @@ class ADSLTicketTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket(self, MockTicket):
         customer_data = Mock(spec=["id"])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
         expected_ticket_arguments = {
             "Title": "Ticket#{} - Només ADSL".format(service_data.order_id),
             "Type": ADSLTicketConfiguration.type,
@@ -30,18 +30,19 @@ class ADSLTicketTestCase(unittest.TestCase):
         MockTicket.assert_called_with(expected_ticket_arguments)
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
-    def test_build_article(self, MockInternetArticle):
+    def test_build_article(self, MockProvisionArticle):
         customer_data = Mock(spec=[])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
 
-        mock_mobile_article = MockInternetArticle.return_value
+        mock_adsl_article = MockProvisionArticle.return_value
 
-        ADSLTicket(service_data, customer_data, None)._build_article()
+        ticket = ADSLTicket(service_data, customer_data, None)
+        ticket._build_article()
 
-        MockInternetArticle.assert_called_with(
-            service_data.technology, service_data.order_id, "adsl"
+        MockProvisionArticle.assert_called_once_with(
+            ticket._ticket_title(), service_data.notes
         )
-        mock_mobile_article.call.assert_called_once()
+        mock_adsl_article.call.assert_called_once()
 
     @patch("otrs_somconnexio.otrs_models.adsl_ticket.ADSLDynamicFields")
     def test_build_dynamic_fields(self, MockADSLDynamicFields):

tests/otrs_models/test_fiber_ticket.py

@@ -15,7 +15,7 @@ class FiberTicketTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket(self, MockTicket):
         customer_data = Mock(spec=["id"])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
 
         expected_ticket_arguments = {
             "Title": "Ticket#{} - Només fibra".format(service_data.order_id),
@@ -36,7 +36,7 @@ class FiberTicketTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket_mixed(self, MockTicket):
         customer_data = Mock(spec=["id"])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
         service_data.technology = "Mixta"
         expected_ticket_arguments = {
             "Title": "Ticket#{} - Fibra mixta".format(service_data.order_id),
@@ -55,16 +55,17 @@ class FiberTicketTestCase(unittest.TestCase):
         MockTicket.assert_called_with(expected_ticket_arguments)
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
-    def test_build_article(self, MockInternetArticle):
+    def test_build_article(self, MockProvisionArticle):
         customer_data = Mock(spec=[])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
 
-        mock_mobile_article = MockInternetArticle.return_value
+        mock_mobile_article = MockProvisionArticle.return_value
 
-        FiberTicket(service_data, customer_data, self.responsible_data)._build_article()
+        ticket = FiberTicket(service_data, customer_data, self.responsible_data)
+        ticket._build_article()
 
-        MockInternetArticle.assert_called_with(
-            service_data.technology, service_data.order_id, "fiber"
+        MockProvisionArticle.assert_called_once_with(
+            ticket._ticket_title(), service_data.notes
         )
         mock_mobile_article.call.assert_called_once()
 
@@ -162,3 +163,12 @@ class FiberTicketTestCase(unittest.TestCase):
         self.assertEqual(
             ticket.otrs_configuration.service, "Banda Ancha::Fibra::Provisió Fibra"
         )
+
+    def test_files_to_attach_no_attachments(self):
+        customer_data = Mock()
+        service_data = Mock()
+
+        ticket = FiberTicket(service_data, customer_data, self.responsible_data)
+        attachments = ticket._files_to_attach()
+
+        self.assertFalse(attachments)

tests/otrs_models/test_mobile_ticket.py

@@ -38,17 +38,18 @@ class MobileTicketTestCase(unittest.TestCase):
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockProvisionArticle):
-        mobile_data = Mock(spec=["order_id", "technology"])
+        mobile_data = Mock(spec=["order_id", "technology", "notes"])
         mobile_data.order_id = 123
 
         customer_data = Mock(spec=["order_id"])
 
         mock_mobile_article = MockProvisionArticle.return_value
 
-        MobileTicket(mobile_data, customer_data, self.responsible_data)._build_article()
+        ticket = MobileTicket(mobile_data, customer_data, self.responsible_data)
+        ticket._build_article()
 
-        MockProvisionArticle.assert_called_with(
-            mobile_data.technology, mobile_data.order_id, "mobile"
+        MockProvisionArticle.assert_called_once_with(
+            ticket._ticket_title(), mobile_data.notes
         )
         mock_mobile_article.call.assert_called_once()
 
@@ -138,3 +139,12 @@ class MobileTicketTestCase(unittest.TestCase):
 
         self.assertEqual(ticket.id, 123)
         self.assertEqual(ticket.number, "#123")
+
+    def test_files_to_attach_no_attachments(self):
+        customer_data = Mock()
+        service_data = Mock()
+
+        ticket = MobileTicket(service_data, customer_data, self.responsible_data)
+        attachments = ticket._files_to_attach()
+
+        self.assertFalse(attachments)

tests/otrs_models/test_provision_article.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 import unittest
-from mock import Mock, patch
+from mock import patch
 
 from otrs_somconnexio.otrs_models.provision_article import ProvisionArticle
 
@@ -8,42 +8,25 @@ from otrs_somconnexio.otrs_models.provision_article import ProvisionArticle
 class ProvisionArticleTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.abstract_article.Article")
     def test_call_with_notes(self, MockArticle):
-
+        subject = "test subject"
+        notes = "test notes"
         expected_article_arguments = {
-            "Subject": "Ticket#b - Només ADSL",
-            "Body": "c",
+            "Subject": subject,
+            "Body": notes,
             "ContentType": "text/plain; charset=utf8",
             "IsVisibleForCustomer": "0",
         }
-        ProvisionArticle(
-            service_type="adsl", technology="a", order_id="b", notes="c"
-        ).call()
+        ProvisionArticle(subject=subject, notes=notes).call()
         MockArticle.assert_called_once_with(expected_article_arguments)
 
     @patch("otrs_somconnexio.otrs_models.abstract_article.Article")
     def test_call_without_notes(self, MockArticle):
-
+        subject = "test subject"
         expected_article_arguments = {
-            "Subject": "Ticket#b - Només fibra",
+            "Subject": subject,
             "Body": "",
             "ContentType": "text/plain; charset=utf8",
             "IsVisibleForCustomer": "1",
         }
-        ProvisionArticle(
-            service_type="fiber", technology="a", order_id="b", notes=""
-        ).call()
-        MockArticle.assert_called_once_with(expected_article_arguments)
-
-    @patch("otrs_somconnexio.otrs_models.abstract_article.Article")
-    def test_call_mixed(self, MockArticle):
-
-        expected_article_arguments = {
-            "Subject": "Ticket#b - Mòbil mixta",
-            "Body": "c",
-            "ContentType": "text/plain; charset=utf8",
-            "IsVisibleForCustomer": "0",
-        }
-        ProvisionArticle(
-            service_type="mobile", technology="Mixta", order_id="b", notes="c"
-        ).call()
+        ProvisionArticle(subject=subject, notes="").call()
         MockArticle.assert_called_once_with(expected_article_arguments)

tests/otrs_models/test_router_4G_ticket.py

@@ -15,7 +15,7 @@ class Router4GTicketTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket(self, MockTicket):
         customer_data = Mock(spec=["id"])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
 
         expected_ticket_arguments = {
             "Title": "Ticket#{} - Només 4G".format(service_data.order_id),
@@ -36,20 +36,19 @@ class Router4GTicketTestCase(unittest.TestCase):
         MockTicket.assert_called_with(expected_ticket_arguments)
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
-    def test_build_article(self, MockInternetArticle):
+    def test_build_article(self, MockProvisionArticle):
         customer_data = Mock(spec=[])
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "notes"])
 
-        mock_internet_article = MockInternetArticle.return_value
+        mock_provision_article = MockProvisionArticle.return_value
 
-        Router4GTicket(
-            service_data, customer_data, self.responsible_data
-        )._build_article()
+        ticket = Router4GTicket(service_data, customer_data, self.responsible_data)
+        ticket._build_article()
 
-        MockInternetArticle.assert_called_with(
-            service_data.technology, service_data.order_id, "4G"
+        MockProvisionArticle.assert_called_once_with(
+            ticket._ticket_title(), service_data.notes
         )
-        mock_internet_article.call.assert_called_once()
+        mock_provision_article.call.assert_called_once()
 
     @patch("otrs_somconnexio.otrs_models.router_4G_ticket.Router4GDynamicFields")
     def test_build_dynamic_fields(self, MockRouter4GDynamicFields):
@@ -133,3 +132,12 @@ class Router4GTicketTestCase(unittest.TestCase):
 
         self.assertEqual(ticket.id, 123)
         self.assertEqual(ticket.number, "#123")
+
+    def test_files_to_attach_no_attachments(self):
+        customer_data = Mock()
+        service_data = Mock()
+
+        ticket = Router4GTicket(service_data, customer_data, self.responsible_data)
+        attachments = ticket._files_to_attach()
+
+        self.assertFalse(attachments)

tests/otrs_models/test_switchboard_header_data.py

@@ -10,6 +10,8 @@ class SwitchboardHeaderDataTestCase(unittest.TestCase):
             order_id=123,
             contact_phone="666666661",
             email="test@test.com",
+            agent_data=[],
+            lead_line_data={},
             sales_team="residential",
             technology="switchboard",
             notes="Notes",

tests/otrs_models/test_switchboard_header_ticket.py

@@ -40,20 +40,21 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockProvisionArticle):
-        service_data = Mock(spec=["order_id", "technology"])
+        service_data = Mock(spec=["order_id", "technology", "lead_line_data"])
         service_data.order_id = 123
+        service_data.lead_line_data = {}
         customer_data = Mock(spec=["order_id"])
 
         mock_article = MockProvisionArticle.return_value
 
-        SwitchboardHeaderTicket(
+        ticket = SwitchboardHeaderTicket(
             service_data, customer_data, self.responsible_data
-        )._build_article()
+        )
+        ticket._build_article()
 
         MockProvisionArticle.assert_called_with(
-            service_data.technology,
-            service_data.order_id,
-            "switchboard_header",
+            ticket._ticket_title(),
+            ticket._format_lead_line_data(),
         )
         mock_article.call.assert_called_once()
 
@@ -90,6 +91,8 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
                 "previous_owner_name",
                 "previous_owner_surname",
                 "sales_team",
+                "agent_data",
+                "lead_line_data",
                 "type",
                 "notes",
             ]
@@ -108,6 +111,8 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
                 "language",
             ]
         )
+        service_data.agent_data = []
+        service_data.lead_line_data = {}
 
         mock_otrs_client = Mock(spec=["create_otrs_process_ticket"])
         mock_otrs_client.create_otrs_process_ticket.return_value = Mock(
@@ -125,3 +130,76 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
         mock_otrs_client.create_otrs_process_ticket.assert_called_once()
         self.assertEqual(ticket.id, 123)
         self.assertEqual(ticket.number, "#123")
+
+    def test_files_to_attach(self):
+        service_data = Mock(spec=["order_id", "agent_data"])
+        customer_data = Mock()
+        service_data.order_id = 123
+        service_data.agent_data = [
+            {
+                "product": "product1",
+                "extension": "ext1",
+                "agent_name": "agent1",
+                "agent_email": "agent1@test.com",
+            },
+            {
+                "product": "product2",
+                "extension": "ext2",
+                "agent_name": "agent2",
+                "agent_email": "agent2@test.com",
+            },
+            {
+                "product": "product3",
+                "extension": "ext3",
+                "agent_name": "agent3",
+                "agent_email": "agent3@test.com",
+            },
+        ]
+
+        sb_header_ticket = SwitchboardHeaderTicket(
+            service_data, customer_data, self.responsible_data
+        )
+        files = sb_header_ticket._files_to_attach()
+
+        self.assertEqual(len(files), 1)
+        agent_data_file = files[0]
+        self.assertEqual(
+            agent_data_file["Filename"],
+            "importació_agents_operator_{}.txt".format(service_data.order_id),
+        )
+        self.assertIn("product1:\n", agent_data_file["Content"])
+        self.assertIn(
+            "ext1\tagent1\t2424\tagent1\tagent1@test.com\n", agent_data_file["Content"]
+        )
+        self.assertIn("product2:\n", agent_data_file["Content"])
+        self.assertIn(
+            "ext2\tagent2\t2424\tagent2\tagent2@test.com\n", agent_data_file["Content"]
+        )
+        self.assertIn("product3:\n", agent_data_file["Content"])
+        self.assertIn(
+            "ext3\tagent3\t2424\tagent3\tagent3@test.com\n", agent_data_file["Content"]
+        )
+
+    def test_format_lead_line_data(self):
+        service_data = Mock(spec=["order_id", "lead_line_data"])
+        customer_data = Mock()
+        service_data.order_id = 123
+        service_data.lead_line_data = {
+            "Prod": ["product1", "product2", "product3"],
+            "Ext": ["ext1", "ext2", "ext3"],
+            "Nom": ["agent1", "agent2", "agent3"],
+            "Telf": ["111", "222", "333"],
+            "Tipus": ["tipus1", "tipus2", "tipus3"],
+        }
+
+        sb_header_ticket = SwitchboardHeaderTicket(
+            service_data, customer_data, self.responsible_data
+        )
+        lead_line_table = sb_header_ticket._format_lead_line_data()
+
+        for header in service_data.lead_line_data.keys():
+            self.assertIn(header, lead_line_table)
+        self.assertEqual(
+            lead_line_table.count("\n"),
+            len(service_data.lead_line_data["Prod"]) + 1,
+        )  # headers + number of rows

tests/otrs_models/test_switchboard_ticket.py

@@ -12,7 +12,7 @@ class SwitchboardTicketTestCase(unittest.TestCase):
     def setUp(self):
         self.responsible_data = Mock(spec=["email"])
         self.service_data = Mock(
-            spec=["order_id", "technology", "landline", "mobile_phone_number"]
+            spec=["order_id", "technology", "landline", "mobile_phone_number", "notes"]
         )
         self.service_data.order_id = 123
         self.customer_data = Mock(spec=["id"])
@@ -59,13 +59,14 @@ class SwitchboardTicketTestCase(unittest.TestCase):
     def test_build_article(self, MockProvisionArticle):
         mock_article = MockProvisionArticle.return_value
 
-        SwitchboardTicket(
+        ticket = SwitchboardTicket(
             self.service_data, self.customer_data, self.responsible_data
-        )._build_article()
+        )
+        ticket._build_article()
+
         MockProvisionArticle.assert_called_with(
-            self.service_data.technology,
-            self.service_data.order_id,
-            "switchboard",
+            ticket._ticket_title(),
+            self.service_data.notes,
         )
         mock_article.call.assert_called_once()