otrs-somconnexio 0.6.7__tar.gz → 0.6.9__tar.gz

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/PKG-INFO

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

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio/otrs_models/internet_data.py

@@ -51,7 +51,7 @@ class InternetData(object):
         self.contact_phone = contact_phone
         self.sales_team = sales_team
         self.notes = notes
-        self.activation_notes = notes
+        self.activation_notes = activation_notes
 
         # Common Internet the Tickets
         self.service_address = service_address

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio/otrs_models/provision_dynamic_fields.py

@@ -29,6 +29,7 @@ class ProvisionDynamicFields:
             self._has_active_contracts(),
             self._has_documentation(),
             self._lang(),
+            self._order_id(),
         ]
         dynamic_fields += self._build_specific_dynamic_fields()
 
@@ -105,3 +106,6 @@ class ProvisionDynamicFields:
 
     def _has_documentation(self):
         return DynamicField(name="flagDocumentacio", value="0")
+
+    def _order_id(self):
+        return DynamicField(name="IDpeticio", value=self.service_data.order_id)

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio/otrs_models/switchboard_data.py

@@ -12,7 +12,7 @@ class SwitchboardData:
         sales_team,
         type,
         landline,
-        landline_2,
+        mobile_phone_number,
         icc,
         has_sim,
         extension,
@@ -25,6 +25,7 @@ class SwitchboardData:
         shipment_city,
         shipment_zip,
         shipment_subdivision,
+        additional_products,
         activation_notes="",
         notes="",
     ):
@@ -37,7 +38,7 @@ class SwitchboardData:
         self.sales_team = sales_team
         self.type = type
         self.landline = landline
-        self.landline_2 = landline_2
+        self.mobile_phone_number = mobile_phone_number
         self.icc = icc
         self.has_sim = has_sim
         self.extension = extension
@@ -50,5 +51,6 @@ class SwitchboardData:
         self.shipment_city = shipment_city
         self.shipment_zip = shipment_zip
         self.shipment_subdivision = shipment_subdivision
+        self.additional_products = additional_products
         self.activation_notes = activation_notes
         self.notes = notes

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio/otrs_models/switchboard_dynamic_fields.py

@@ -6,11 +6,13 @@ from otrs_somconnexio.otrs_models.provision_dynamic_fields import ProvisionDynam
 class SwitchboardDynamicFields(ProvisionDynamicFields):
     def _build_specific_dynamic_fields(self):
         dynamic_fields = [
-            self._type(),
+            self._service_type(),
+            self._is_header(),
+            self._phone_number(),
             self._landline(),
-            self._landline_2(),
             self._icc(),
             self._sim_received(),
+            self._send_sim_type(),
             self._extension(),
             self._agent_name(),
             self._agent_email(),
@@ -18,11 +20,18 @@ class SwitchboardDynamicFields(ProvisionDynamicFields):
             self._shipment_city(),
             self._shipment_zip(),
             self._shipment_subdivision(),
+            self._additional_products(),
         ]
         return dynamic_fields
 
-    def _type(self):
-        return DynamicField(name="tipusServeiCV", value=self.service_data.type)
+    def _service_type(self):
+        if self.service_data.type == "portability":
+            return DynamicField("tipusServeiCV", "portabilitat")
+        else:
+            return DynamicField("tipusServeiCV", "altaNova")
+
+    def _is_header(self):
+        return DynamicField(name="CVHeader", value="0")
 
     def _product(self):
         return DynamicField(name="productCV", value=self.service_data.product)
@@ -30,8 +39,10 @@ class SwitchboardDynamicFields(ProvisionDynamicFields):
     def _landline(self):
         return DynamicField(name="portaFixCV1", value=self.service_data.landline)
 
-    def _landline_2(self):
-        return DynamicField(name="portaFixCV2", value=self.service_data.landline_2)
+    def _phone_number(self):
+        return DynamicField(
+            name="liniaMobil", value=self.service_data.mobile_phone_number
+        )
 
     def _icc(self):
         return DynamicField(name="ICCSC", value=self.service_data.icc)
@@ -40,6 +51,10 @@ class SwitchboardDynamicFields(ProvisionDynamicFields):
         sim_recieved = "1" if self.service_data.has_sim else "0"
         return DynamicField("SIMrebuda", sim_recieved)
 
+    def _send_sim_type(self):
+        result = "None" if self.service_data.mobile_phone_number else False
+        return DynamicField(name="tipusEnviamentSIM", value=result)
+
     def _extension(self):
         return DynamicField(name="extensio", value=self.service_data.extension)
 
@@ -66,3 +81,14 @@ class SwitchboardDynamicFields(ProvisionDynamicFields):
         return DynamicField(
             name="provinciaEnviament", value=self.service_data.shipment_subdivision
         )
+
+    def _additional_products(self):
+        additional_products_list = (
+            self.service_data.additional_products.split(",")
+            if self.service_data.additional_products
+            else []
+        )
+        return DynamicField(
+            name="productCVAddicional",
+            value=additional_products_list,
+        )

otrs_somconnexio-0.6.9/otrs_somconnexio/otrs_models/switchboard_header_data.py

@@ -0,0 +1,18 @@
+class SwitchboardHeaderData:
+    service_type = "header_switchboard"
+
+    def __init__(
+        self,
+        order_id,
+        email,
+        contact_phone,
+        sales_team,
+        technology,
+        notes="",
+    ):
+        self.order_id = order_id
+        self.email = email
+        self.contact_phone = contact_phone
+        self.sales_team = sales_team
+        self.technology = technology
+        self.notes = notes

otrs_somconnexio-0.6.9/otrs_somconnexio/otrs_models/switchboard_header_dynamic_fields.py

@@ -0,0 +1,80 @@
+# coding: utf-8
+from pyotrs.lib import DynamicField
+
+
+class SwitchboardHeaderDynamicFields:
+    def __init__(self, service_data, customer_data, otrs_process_id, otrs_activity_id):
+        self.service_data = service_data
+        self.customer_data = customer_data
+        self.otrs_process_id = otrs_process_id
+        self.otrs_activity_id = otrs_activity_id
+
+    def all(self):
+        dynamic_fields = [
+            self._process_id(),
+            self._activity_id(),
+            self._is_header(),
+            self._first_name(),
+            self._name(),
+            self._vat_number(),
+            self._lang(),
+            self._phone(),
+            self._mail(),
+            self._service_technology(),
+            self._sales_team(),
+            self._order_id(),
+            self._notes(),
+        ]
+
+        return [field for field in dynamic_fields if field.value]
+
+    def _process_id(self):
+        return DynamicField(
+            name="ProcessManagementProcessID", value=self.otrs_process_id
+        )
+
+    def _activity_id(self):
+        return DynamicField(
+            name="ProcessManagementActivityID", value=self.otrs_activity_id
+        )
+
+    def _is_header(self):
+        return DynamicField(name="CVHeader", value="1")
+
+    def _first_name(self):
+        return DynamicField("nomSoci", self.customer_data.first_name)
+
+    def _name(self):
+        return DynamicField("cognom1", self.customer_data.name)
+
+    def _vat_number(self):
+        return DynamicField(name="NIFNIESoci", value=self.customer_data.vat_number)
+
+    def _lang(self):
+        return DynamicField(name="idioma", value=self.customer_data.language)
+
+    def _phone(self):
+        return DynamicField(
+            name="telefonContacte", value=self.service_data.contact_phone
+        )
+
+    def _mail(self):
+        return DynamicField(name="correuElectronic", value=self.service_data.email)
+
+    def _service_technology(self):
+        return DynamicField(name="TecDelServei", value=self.service_data.technology)
+
+    def _sales_team(self):
+        sales_team_dct = {"Residential": "residencial", "Business": "empreses"}
+        return DynamicField(
+            name="equipVendes",
+            value=sales_team_dct.get(self.service_data.sales_team, ""),
+        )
+
+    def _order_id(self):
+        return DynamicField(name="IDpeticio", value=self.service_data.order_id)
+
+    def _notes(self):
+        return DynamicField(
+            name="consideracionsActivacio3", value=self.service_data.notes
+        )

otrs_somconnexio-0.6.9/otrs_somconnexio/otrs_models/switchboard_header_ticket.py

@@ -0,0 +1,26 @@
+# coding: utf-8
+from otrs_somconnexio.otrs_models.provision_ticket import ProvisionTicket
+from otrs_somconnexio.otrs_models.switchboard_header_dynamic_fields import (
+    SwitchboardHeaderDynamicFields,
+)
+from otrs_somconnexio.otrs_models.configurations.provision.switchboard_ticket import (
+    SwitchboardTicketConfiguration,
+)
+
+
+class SwitchboardHeaderTicket(ProvisionTicket):
+    def __init__(self, service_data, customer_data):
+        self.service_data = service_data
+        self.customer_data = customer_data
+        self.otrs_configuration = SwitchboardTicketConfiguration()
+
+    def service_type(self):
+        return "switchboard_header"
+
+    def _build_dynamic_fields(self):
+        return SwitchboardHeaderDynamicFields(
+            self.service_data,
+            self.customer_data,
+            self._ticket_process_id(),
+            self._ticket_activity_id(),
+        ).all()

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio/otrs_models/ticket_factory.py

@@ -3,6 +3,9 @@ from otrs_somconnexio.otrs_models.fiber_ticket import FiberTicket
 from otrs_somconnexio.otrs_models.mobile_ticket import MobileTicket, MobilePausedTicket
 from otrs_somconnexio.otrs_models.router_4G_ticket import Router4GTicket
 from otrs_somconnexio.otrs_models.switchboard_ticket import SwitchboardTicket
+from otrs_somconnexio.otrs_models.switchboard_header_ticket import (
+    SwitchboardHeaderTicket,
+)
 from otrs_somconnexio.exceptions import ServiceTypeNotAllowedError
 
 
@@ -32,6 +35,8 @@ class TicketFactory(object):
                 TicketClass = MobileTicket
         elif self.service_data.service_type == "4G":
             TicketClass = Router4GTicket
+        elif self.service_data.service_type == "header_switchboard":
+            TicketClass = SwitchboardHeaderTicket
         elif self.service_data.service_type == "switchboard":
             TicketClass = SwitchboardTicket
         else:

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio/services/get_ticket_title.py

@@ -5,6 +5,7 @@ class GetTicketTitle:
         "adsl": "ADSL",
         "4G": "4G",
         "switchboard": "Centraleta Virtual",
+        "switchboard_header": "Centraleta Virtual Capçalera",
     }
 
     def __init__(self, technology, order_id, service_type):

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio.egg-info/PKG-INFO

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

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/otrs_somconnexio.egg-info/SOURCES.txt

@@ -36,6 +36,9 @@ otrs_somconnexio/otrs_models/router_4G_ticket.py
 otrs_somconnexio/otrs_models/service.py
 otrs_somconnexio/otrs_models/switchboard_data.py
 otrs_somconnexio/otrs_models/switchboard_dynamic_fields.py
+otrs_somconnexio/otrs_models/switchboard_header_data.py
+otrs_somconnexio/otrs_models/switchboard_header_dynamic_fields.py
+otrs_somconnexio/otrs_models/switchboard_header_ticket.py
 otrs_somconnexio/otrs_models/switchboard_ticket.py
 otrs_somconnexio/otrs_models/telecom_company.py
 otrs_somconnexio/otrs_models/ticket_factory.py
@@ -145,6 +148,10 @@ tests/otrs_models/test_router_4G_ticket.py
 tests/otrs_models/test_service.py
 tests/otrs_models/test_switchboard_data.py
 tests/otrs_models/test_switchboard_dynamic_fields.py
+tests/otrs_models/test_switchboard_header_data.py
+tests/otrs_models/test_switchboard_header_dynamic_fields.py
+tests/otrs_models/test_switchboard_header_ticket.py
+tests/otrs_models/test_switchboard_ticket.py
 tests/otrs_models/test_telecom_company.py
 tests/otrs_models/test_ticket_factory.py
 tests/otrs_models/test_vf_provisioning_article.py

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/setup.py

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

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/tests/integration/test_ticket_factory.py

@@ -376,7 +376,7 @@ class TicketFactoryIntegrationTestCase(unittest.TestCase):
                 "contact_phone",
                 "product",
                 "landline",
-                "landline_2",
+                "mobile_phone_number",
                 "agent_name",
                 "agent_email",
                 "previous_owner_name",
@@ -388,6 +388,7 @@ class TicketFactoryIntegrationTestCase(unittest.TestCase):
                 "shipment_city",
                 "shipment_zip",
                 "shipment_subdivision",
+                "additional_products",
                 "notes",
                 "activation_notes",
             ]

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/tests/otrs_models/test_switchboard_data.py

@@ -16,7 +16,7 @@ class SwitchboardDataTestCase(unittest.TestCase):
             sales_team="Business",
             type="new",
             landline="999888777",
-            landline_2="999888778",
+            mobile_phone_number="766887778",
             extension="123",
             agent_name="agent1",
             agent_email="agent1@company.org",
@@ -29,6 +29,7 @@ class SwitchboardDataTestCase(unittest.TestCase):
             shipment_city="city",
             shipment_zip="08001",
             shipment_subdivision="ES-B",
+            additional_products="product1, product2",
             notes="Notes",
             activation_notes="More notes",
         )

{otrs_somconnexio-0.6.7 → otrs_somconnexio-0.6.9}/tests/otrs_models/test_switchboard_dynamic_fields.py

@@ -30,7 +30,7 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             sales_team=faker.word(),
             type=faker.word(),
             landline=faker.phone_number(),
-            landline_2=faker.phone_number(),
+            mobile_phone_number=faker.phone_number(),
             icc=faker.bban(),
             has_sim=faker.boolean(),
             extension=faker.phone_number(),
@@ -43,6 +43,7 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             shipment_city=faker.city(),
             shipment_zip=faker.zipcode(),
             shipment_subdivision=faker.state(),
+            additional_products="A,B,C",
         )
 
         self.switchboard_otrs_process_id = faker.uuid4()
@@ -57,6 +58,12 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
 
         self.dynamic_fields_dct = dynamic_fields_to_dct(self.dynamic_fields)
 
+    def test_service_type_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["tipusServeiCV"],
+            "portabilitat" if self.service_data.type == "portability" else "altaNova",
+        )
+
     def test_process_id_field(self):
         self.assertEqual(
             self.dynamic_fields_dct["ProcessManagementProcessID"],
@@ -69,6 +76,9 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             self.switchboard_otrs_activity_id,
         )
 
+    def test_CV_header_field(self):
+        self.assertEqual(self.dynamic_fields_dct["CVHeader"], "0")
+
     def test_product_field(self):
         self.assertEqual(
             self.dynamic_fields_dct["productCV"],
@@ -87,10 +97,10 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             self.service_data.landline,
         )
 
-    def test_landline_2_field(self):
+    def test_phone_number_field(self):
         self.assertEqual(
-            self.dynamic_fields_dct["portaFixCV2"],
-            self.service_data.landline_2,
+            self.dynamic_fields_dct["liniaMobil"],
+            self.service_data.mobile_phone_number,
         )
 
     def test_ICC_field(self):
@@ -105,6 +115,12 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             "1" if self.service_data.has_sim else "0",
         )
 
+    def test_send_sim_type_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["tipusEnviamentSIM"],
+            "None",
+        )
+
     def test_agent_name_field(self):
         self.assertEqual(
             self.dynamic_fields_dct["nomAgentCV"],
@@ -146,3 +162,15 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             self.dynamic_fields_dct["flagDocumentacio"],
             "0",
         )
+
+    def test_additional_products_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["productCVAddicional"],
+            self.service_data.additional_products.split(","),
+        )
+
+    def test_order_id_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["IDpeticio"],
+            self.service_data.order_id,
+        )

otrs_somconnexio-0.6.9/tests/otrs_models/test_switchboard_header_data.py

@@ -0,0 +1,18 @@
+# coding: utf-8
+import unittest
+
+from otrs_somconnexio.otrs_models.switchboard_header_data import SwitchboardHeaderData
+
+
+class SwitchboardHeaderDataTestCase(unittest.TestCase):
+    def test_init(self):
+        sb_header_data = SwitchboardHeaderData(
+            order_id=123,
+            contact_phone="666666661",
+            email="test@test.com",
+            sales_team="residential",
+            technology="switchboard",
+            notes="Notes",
+        )
+
+        self.assertIsInstance(sb_header_data, SwitchboardHeaderData)

otrs_somconnexio-0.6.9/tests/otrs_models/test_switchboard_header_dynamic_fields.py

@@ -0,0 +1,119 @@
+import unittest
+from mock import Mock
+from faker import Faker
+
+from otrs_somconnexio.otrs_models.switchboard_header_dynamic_fields import (
+    SwitchboardHeaderDynamicFields,
+)
+from .common_helper import dynamic_fields_to_dct
+
+
+class SwitchboardHeaderDynamicFieldsTestCase(unittest.TestCase):
+    def setUp(self):
+        faker = Faker("es_CA")
+
+        customer_data = Mock(
+            first_name=faker.first_name(),
+            name=faker.last_name(),
+            vat_number=faker.ssn(),
+            has_active_contracts=faker.boolean(),
+            language=faker.language_code(),
+        )
+
+        self.service_data = Mock(
+            notes=faker.text(),
+            contact_phone=faker.phone_number(),
+            email=faker.email(),
+            technology=faker.word(),
+            sales_team="Business",
+            order_id=faker.uuid4(),
+        )
+
+        self.switchboard_otrs_process_id = faker.uuid4()
+        self.switchboard_otrs_activity_id = faker.uuid4()
+
+        self.customer_data = customer_data  # Guardem per als tests
+
+        self.dynamic_fields = SwitchboardHeaderDynamicFields(
+            self.service_data,
+            customer_data,
+            self.switchboard_otrs_process_id,
+            self.switchboard_otrs_activity_id,
+        ).all()
+
+        self.dynamic_fields_dct = dynamic_fields_to_dct(self.dynamic_fields)
+
+    def test_customer_first_name_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["nomSoci"],
+            self.customer_data.first_name,
+        )
+
+    def test_CV_header_field(self):
+        self.assertEqual(self.dynamic_fields_dct["CVHeader"], "1")
+
+    def test_customer_last_name_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["cognom1"],
+            self.customer_data.name,
+        )
+
+    def test_customer_vat_number_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["NIFNIESoci"],
+            self.customer_data.vat_number,
+        )
+
+    def test_customer_language_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["idioma"],
+            self.customer_data.language,
+        )
+
+    def test_customer_phone_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["telefonContacte"],
+            self.service_data.contact_phone,
+        )
+
+    def test_mail_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["correuElectronic"],
+            self.service_data.email,
+        )
+
+    def test_service_technology_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["TecDelServei"],
+            self.service_data.technology,
+        )
+
+    def test_sales_team_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["equipVendes"],
+            "empreses",
+        )
+
+    def test_order_id_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["IDpeticio"],
+            self.service_data.order_id,
+        )
+
+    def test_switchboard_otrs_process_id_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["ProcessManagementProcessID"],
+            self.switchboard_otrs_process_id,
+        )
+
+    def test_switchboard_otrs_activity_id_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["ProcessManagementActivityID"],
+            self.switchboard_otrs_activity_id,
+        )
+
+    def test_notes_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["consideracionsActivacio3"],
+            self.service_data.notes,
+        )