otrs-somconnexio 0.7.2__tar.gz → 0.7.3__tar.gz

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otrs_somconnexio
-Version: 0.7.2
+Version: 0.7.3
 Summary: Python package for Somconnexio data syncing in OTRS
 Home-page: https://gitlab.com/coopdevs/otrs_somconnexio
 Author: Coopdevs

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/fiber_dynamic_fields.py

@@ -11,7 +11,6 @@ class FiberDynamicFields(InternetDynamicFields):
         return [
             self._df_previous_contract_pon(),
             self._df_previous_contract_fiber_speed(),
-            self._activation_notes(),
             self._df_mobile_pack_contracts(),
             self._df_all_grouped_SIMS_recieved(),
             self._df_has_previous_owner_with_mobile_pack_contracts(),
@@ -19,11 +18,6 @@ class FiberDynamicFields(InternetDynamicFields):
             self._keep_landline_number(),
         ]
 
-    def _activation_notes(self):
-        return DynamicField(
-            name="consideracionsActivacio2", value=self.service_data.activation_notes
-        )
-
     def _df_previous_contract_pon(self):
         return DynamicField(
             name="ponAntic", value=self.service_data.previous_contract_pon

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/mobile_dynamic_fields.py

@@ -19,7 +19,6 @@ class MobileDynamicFields(ProvisionDynamicFields):
             self._sim_received(),
             self._sim_delivery_tracking_code(),
             self._send_sim_type(),
-            self._activation_notes(),
             self._delivery_street(),
             self._delivery_zip_code(),
             self._delivery_city(),
@@ -54,11 +53,6 @@ class MobileDynamicFields(ProvisionDynamicFields):
             name="dniTitularAnterior", value=self.service_data.previous_owner_vat
         )
 
-    def _activation_notes(self):
-        return DynamicField(
-            name="consideracionsActivacio", value=self.service_data.activation_notes
-        )
-
     def _sim_received(self):
         sim_recieved = "1" if self.service_data.has_sim else "0"
         return DynamicField("SIMrebuda", sim_recieved)

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/provision_dynamic_fields.py

@@ -32,6 +32,7 @@ class ProvisionDynamicFields:
             self._order_id(),
             self._confirmed_documentation(),
             self._notes(),
+            self._activation_notes(),
         ]
         dynamic_fields += self._build_specific_dynamic_fields()
 
@@ -122,3 +123,8 @@ class ProvisionDynamicFields:
         return DynamicField(
             name="consideracionsGenerals", value=self.service_data.notes
         )
+
+    def _activation_notes(self):
+        return DynamicField(
+            name="consideracionsActivacio", value=self.service_data.activation_notes
+        )

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/provision_ticket.py

@@ -24,11 +24,7 @@ class ProvisionTicket:
         return self.otrs_ticket.number
 
     def _build_ticket(self):
-        title = GetTicketTitle(
-            self.service_data.technology,
-            self.service_data.order_id,
-            self.service_type(),
-        ).build()
+        title = self._ticket_title()
         return Ticket(
             {
                 "Title": title,
@@ -52,6 +48,13 @@ class ProvisionTicket:
         )
         return provision_article.call()
 
+    def _ticket_title(self):
+        return GetTicketTitle(
+            self.service_data.technology,
+            self.service_data.order_id,
+            self.service_type(),
+        ).build()
+
     def _ticket_type(self):
         return self.otrs_configuration.type
 

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/switchboard_header_dynamic_fields.py

@@ -76,5 +76,5 @@ class SwitchboardHeaderDynamicFields:
 
     def _notes(self):
         return DynamicField(
-            name="consideracionsActivacio3", value=self.service_data.notes
+            name="consideracionsActivacio", value=self.service_data.notes
         )

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/switchboard_header_ticket.py

@@ -25,3 +25,6 @@ class SwitchboardHeaderTicket(ProvisionTicket):
             self._ticket_process_id(),
             self._ticket_activity_id(),
         ).all()
+
+    def _ticket_title(self):
+        return "Provisió centraleta virtual (CV) → Capçalera"

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio/otrs_models/switchboard_ticket.py

@@ -25,3 +25,11 @@ class SwitchboardTicket(ProvisionTicket):
             self._ticket_process_id(),
             self._ticket_activity_id(),
         ).all()
+
+    def _ticket_title(self):
+        if self.service_data.landline:
+            return "Alta número de fix (CV)"
+        elif self.service_data.mobile_phone_number:
+            return "Alta mòbil agent (CV)"
+        else:
+            return "Provisió centraleta virtual (CV)"

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/otrs_somconnexio.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: otrs-somconnexio
-Version: 0.7.2
+Version: 0.7.3
 Summary: Python package for Somconnexio data syncing in OTRS
 Home-page: https://gitlab.com/coopdevs/otrs_somconnexio
 Author: Coopdevs

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md") as f:
     README = f.read()
 
 
-VERSION = "0.7.2"
+VERSION = "0.7.3"
 
 setup(
     name="otrs_somconnexio",

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_adsl_dynamic_fields.py

@@ -41,6 +41,7 @@ class ADSLDynamicFieldsTestCase(unittest.TestCase):
                 "previous_contract_address",
                 "previous_contract_phone",
                 "notes",
+                "activation_notes",
                 "adsl_coverage",
                 "mm_fiber_coverage",
                 "asociatel_fiber_coverage",

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_adsl_ticket.py

@@ -9,7 +9,6 @@ from otrs_somconnexio.otrs_models.configurations.provision.adsl_ticket import (
 
 
 class ADSLTicketTestCase(unittest.TestCase):
-
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket(self, MockTicket):
         customer_data = Mock(spec=["id"])
@@ -97,6 +96,7 @@ class ADSLTicketTestCase(unittest.TestCase):
                 "shipment_zip",
                 "shipment_subdivision",
                 "notes",
+                "activation_notes",
                 "adsl_coverage",
                 "mm_fiber_coverage",
                 "asociatel_fiber_coverage",

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_fiber_dynamic_fields.py

@@ -652,7 +652,8 @@ class FiberDynamicFieldsTestCase(unittest.TestCase):
 
         dynamic_fields_dct = dynamic_fields_to_dct(dynamic_fields)
         self.assertEqual(
-            dynamic_fields_dct["consideracionsActivacio2"], "text text text"
+            dynamic_fields_dct["consideracionsActivacio"],
+            self.service_data.activation_notes,
         )
 
     def test_mobile_pack_contracts_field(self):

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_router_4G_dynamic_fields.py

@@ -40,6 +40,7 @@ class Router4GDynamicFieldsTestCase(unittest.TestCase):
                 "previous_owner_name",
                 "previous_owner_surname",
                 "notes",
+                "activation_notes",
                 "adsl_coverage",
                 "mm_fiber_coverage",
                 "asociatel_fiber_coverage",
@@ -400,6 +401,22 @@ class Router4GDynamicFieldsTestCase(unittest.TestCase):
         dynamic_fields_dct = dynamic_fields_to_dct(dynamic_fields)
         self.assertEqual(dynamic_fields_dct["provinciaEnviament"], "Subdivision")
 
+    def test_activation_notes_field(self):
+        self.service_data.activation_notes = "text text text"
+
+        dynamic_fields = Router4GDynamicFields(
+            self.service_data,
+            self.customer_data,
+            self.router_4G_otrs_process_id,
+            self.router_4G_otrs_activity_id,
+        ).all()
+
+        dynamic_fields_dct = dynamic_fields_to_dct(dynamic_fields)
+        self.assertEqual(
+            dynamic_fields_dct["consideracionsActivacio"],
+            self.service_data.activation_notes,
+        )
+
     def test_owner_vat_field(self):
         self.service_data.previous_owner_vat = "12345M"
 

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_router_4G_ticket.py

@@ -106,6 +106,7 @@ class Router4GTicketTestCase(unittest.TestCase):
                 "shipment_zip",
                 "shipment_subdivision",
                 "notes",
+                "activation_notes",
                 "adsl_coverage",
                 "mm_fiber_coverage",
                 "asociatel_fiber_coverage",

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_switchboard_dynamic_fields.py

@@ -45,7 +45,8 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             shipment_subdivision=faker.state(),
             additional_products="A,B,C",
             confirmed_documentation=faker.boolean(),
-            notes=faker.word(),
+            notes=faker.text(),
+            activation_notes=faker.text(),
         )
 
         self.switchboard_otrs_process_id = faker.uuid4()
@@ -188,3 +189,9 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             self.dynamic_fields_dct["consideracionsGenerals"],
             self.service_data.notes,
         )
+
+    def test_activation_notes_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["consideracionsActivacio"],
+            self.service_data.activation_notes,
+        )

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_switchboard_header_dynamic_fields.py

@@ -114,6 +114,6 @@ class SwitchboardHeaderDynamicFieldsTestCase(unittest.TestCase):
 
     def test_notes_field(self):
         self.assertEqual(
-            self.dynamic_fields_dct["consideracionsActivacio3"],
+            self.dynamic_fields_dct["consideracionsActivacio"],
             self.service_data.notes,
         )

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_switchboard_header_ticket.py

@@ -21,9 +21,7 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
         customer_data = Mock(spec=["id"])
 
         expected_ticket_arguments = {
-            "Title": "Ticket#{} - Només Centraleta Virtual Capçalera".format(
-                service_data.order_id
-            ),
+            "Title": "Provisió centraleta virtual (CV) → Capçalera",
             "Type": SwitchboardTicketConfiguration.type,
             "QueueID": SwitchboardTicketConfiguration.queue_id,
             "State": SwitchboardTicketConfiguration.state,

{otrs_somconnexio-0.7.2 → otrs_somconnexio-0.7.3}/tests/otrs_models/test_switchboard_ticket.py

@@ -11,63 +11,74 @@ from otrs_somconnexio.otrs_models.configurations.provision.switchboard_ticket im
 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"]
+        )
+        self.service_data.order_id = 123
+        self.customer_data = Mock(spec=["id"])
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket(self, MockTicket):
-        service_data = Mock(spec=["order_id", "notes", "technology"])
-        service_data.order_id = 123
-        customer_data = Mock(spec=["id"])
+        self.service_data.landline = False
+        self.service_data.mobile_phone_number = False
 
         expected_ticket_arguments = {
-            "Title": "Ticket#{} - Només Centraleta Virtual".format(
-                service_data.order_id
-            ),
+            "Title": "Provisió centraleta virtual (CV)",
             "Type": SwitchboardTicketConfiguration.type,
             "QueueID": SwitchboardTicketConfiguration.queue_id,
             "State": SwitchboardTicketConfiguration.state,
             "SLA": "No pendent resposta",
             "Service": "Centraleta Virtual",
             "Priority": SwitchboardTicketConfiguration.priority,
-            "CustomerUser": customer_data.id,
-            "CustomerID": customer_data.id,
+            "CustomerUser": self.customer_data.id,
+            "CustomerID": self.customer_data.id,
             "Responsible": self.responsible_data.email,
         }
 
         SwitchboardTicket(
-            service_data, customer_data, self.responsible_data
+            self.service_data, self.customer_data, self.responsible_data
         )._build_ticket()
         MockTicket.assert_called_with(expected_ticket_arguments)
 
+    def test_title_with_landline(self):
+        self.service_data.landline = "999999999"
+        ticket = SwitchboardTicket(
+            self.service_data, self.customer_data, self.responsible_data
+        )
+        self.assertEqual(ticket._ticket_title(), "Alta número de fix (CV)")
+
+    def test_title_with_mobile_phone_number(self):
+        self.service_data.landline = None
+        self.service_data.mobile_phone_number = "699999999"
+        ticket = SwitchboardTicket(
+            self.service_data, self.customer_data, self.responsible_data
+        )
+        self.assertEqual(ticket._ticket_title(), "Alta mòbil agent (CV)")
+
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockProvisionArticle):
-        service_data = Mock(spec=["order_id", "technology"])
-        service_data.order_id = 123
-        customer_data = Mock(spec=["order_id"])
-
         mock_article = MockProvisionArticle.return_value
 
         SwitchboardTicket(
-            service_data, customer_data, self.responsible_data
+            self.service_data, self.customer_data, self.responsible_data
         )._build_article()
         MockProvisionArticle.assert_called_with(
-            service_data.technology,
-            service_data.order_id,
+            self.service_data.technology,
+            self.service_data.order_id,
             "switchboard",
         )
         mock_article.call.assert_called_once()
 
     @patch("otrs_somconnexio.otrs_models.switchboard_ticket.SwitchboardDynamicFields")
     def test_build_dynamic_fields(self, MockSwitchboardDynamicFields):
-        service_data = Mock()
-        customer_data = Mock()
         mock_dyn_fields = MockSwitchboardDynamicFields.return_value
 
         SwitchboardTicket(
-            service_data, customer_data, self.responsible_data
+            self.service_data, self.customer_data, self.responsible_data
         )._build_dynamic_fields()
         MockSwitchboardDynamicFields.assert_called_with(
-            service_data,
-            customer_data,
+            self.service_data,
+            self.customer_data,
             SwitchboardTicketConfiguration.process_id,
             SwitchboardTicketConfiguration.activity_id,
         )