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

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

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

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/otrs_somconnexio/client.py

@@ -125,7 +125,7 @@ class OTRSClient:
             SessionNotCreated,
             ArgumentMissingError,
         ) as error:
-            raise TicketNotCreated(error.message, dynamic_fields)
+            raise TicketNotCreated(error.message, ticket, dynamic_fields)
         return OTRSCreationTicketResponse(client_response)
 
     def get_otrs_process_ticket(self, ticket_id):

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/otrs_somconnexio/exceptions.py

@@ -21,12 +21,24 @@ class TicketNotCreated(OTRSClientException):
             df_msg = df_msg + "{}: {}\n".format(df.name, df.value)
         return df_msg
 
-    def __init__(self, error_msg, dynamic_fields=None):
-
+    def _ticket_to_string(self, ticket):
+        if not ticket:
+            return ""
+        ticket_msg = ""
+        for field_key in ticket.fields.keys():
+            ticket_msg = ticket_msg + "{}: {}\n".format(
+                field_key, ticket.fields[field_key]
+            )
+        return ticket_msg
+
+    def __init__(self, error_msg, ticket=None, dynamic_fields=None):
         title_message = "Error creating the ticket with the next error message:"
         df_message = self._DF_to_string(dynamic_fields)
+        ticket_message = self._ticket_to_string(ticket)
 
-        message = "{}\n\t{}\n{}".format(title_message, error_msg, df_message)
+        message = "{}\n\t{}\n{}{}".format(
+            title_message, error_msg, ticket_message, df_message
+        )
 
         super(OTRSClientException, self).__init__(message)
 

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/otrs_somconnexio/otrs_models/internet_data.py

@@ -21,8 +21,6 @@ class InternetData(object):
         previous_owner_vat,
         previous_owner_name,
         previous_owner_surname,
-        notes,
-        activation_notes,
         product,
         adsl_coverage,
         mm_fiber_coverage,
@@ -35,6 +33,8 @@ class InternetData(object):
         previous_contract_address="",
         previous_contract_phone="",
         mobile_pack_contracts="",
+        notes="",
+        activation_notes="",
         confirmed_documentation=False,
     ):
         # Common all the Tickets

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

@@ -6,7 +6,6 @@ from otrs_somconnexio.otrs_models.provision_dynamic_fields import ProvisionDynam
 class MobileDynamicFields(ProvisionDynamicFields):
     def _build_specific_dynamic_fields(self):
         return [
-            self._order_id(),
             self._line(),
             self._icc_sc(),
             self._icc_donor(),
@@ -30,9 +29,6 @@ class MobileDynamicFields(ProvisionDynamicFields):
             self._confirm_doc(),
         ]
 
-    def _order_id(self):
-        return DynamicField("IDpeticio", self.service_data.order_id)
-
     def _line(self):
         return DynamicField("liniaMobil", self.service_data.phone_number)
 

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

@@ -31,6 +31,7 @@ class ProvisionDynamicFields:
             self._lang(),
             self._order_id(),
             self._confirmed_documentation(),
+            self._notes(),
         ]
         dynamic_fields += self._build_specific_dynamic_fields()
 
@@ -116,3 +117,8 @@ class ProvisionDynamicFields:
             "1" if self.service_data.confirmed_documentation else "0"
         )
         return DynamicField(name="confirmarDocumentacio", value=confirmed_documentation)
+
+    def _notes(self):
+        return DynamicField(
+            name="consideracionsGenerals", value=self.service_data.notes
+        )

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

@@ -49,7 +49,6 @@ class ProvisionTicket:
             self.service_data.technology,
             self.service_data.order_id,
             self.service_type(),
-            self.service_data.notes,
         )
         return provision_article.call()
 
@@ -87,4 +86,7 @@ class ProvisionTicket:
         return self.customer_data.id
 
     def _responsible_email(self):
-        return self.responsible_data.email
+        if hasattr(self.responsible_data, "email"):
+            return self.responsible_data.email
+        else:
+            return False

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/otrs_somconnexio/otrs_models/ticket_factory.py

@@ -14,7 +14,7 @@ class TicketFactory(object):
     the service of the EticomContract.
     """
 
-    def __init__(self, service_data, customer_data, responsible_data):
+    def __init__(self, service_data, customer_data, responsible_data=None):
         self.service_data = service_data
         self.customer_data = customer_data
         self.responsible_data = responsible_data

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

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

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

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

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

@@ -9,8 +9,6 @@ from otrs_somconnexio.otrs_models.configurations.provision.adsl_ticket import (
 
 
 class ADSLTicketTestCase(unittest.TestCase):
-    def setUp(self):
-        self.responsible_data = Mock(spec=["email"])
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.Ticket")
     def test_build_ticket(self, MockTicket):
@@ -26,23 +24,23 @@ class ADSLTicketTestCase(unittest.TestCase):
             "Priority": ADSLTicketConfiguration.priority,
             "CustomerUser": customer_data.id,
             "CustomerID": customer_data.id,
-            "Responsible": self.responsible_data.email,
+            "Responsible": False,
         }
 
-        ADSLTicket(service_data, customer_data, self.responsible_data)._build_ticket()
+        ADSLTicket(service_data, customer_data, None)._build_ticket()
         MockTicket.assert_called_with(expected_ticket_arguments)
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockInternetArticle):
         customer_data = Mock(spec=[])
-        service_data = Mock(spec=["order_id", "notes", "technology"])
+        service_data = Mock(spec=["order_id", "technology"])
 
         mock_mobile_article = MockInternetArticle.return_value
 
-        ADSLTicket(service_data, customer_data, self.responsible_data)._build_article()
+        ADSLTicket(service_data, customer_data, None)._build_article()
 
         MockInternetArticle.assert_called_with(
-            service_data.technology, service_data.order_id, "adsl", service_data.notes
+            service_data.technology, service_data.order_id, "adsl"
         )
         mock_mobile_article.call.assert_called_once()
 
@@ -53,9 +51,7 @@ class ADSLTicketTestCase(unittest.TestCase):
 
         mock_adsl_dynamic_fields = MockADSLDynamicFields.return_value
 
-        ADSLTicket(
-            service_data, customer_data, self.responsible_data
-        )._build_dynamic_fields()
+        ADSLTicket(service_data, customer_data, None)._build_dynamic_fields()
 
         MockADSLDynamicFields.assert_called_with(
             service_data,
@@ -115,14 +111,13 @@ class ADSLTicketTestCase(unittest.TestCase):
                 "confirmed_documentation",
             ]
         )
-        self.responsible_data = Mock(spec=["email"])
 
         mock_otrs_client = Mock(spec=["create_otrs_process_ticket"])
         mock_otrs_client.create_otrs_process_ticket.return_value.id = 123
         mock_otrs_client.create_otrs_process_ticket.return_value.number = "#123"
         MockOTRSClient.return_value = mock_otrs_client
 
-        ticket = ADSLTicket(service_data, customer_data, self.responsible_data)
+        ticket = ADSLTicket(service_data, customer_data, None)
         ticket.create()
 
         mock_otrs_client.create_otrs_process_ticket.assert_called_once()

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

@@ -773,3 +773,18 @@ class FiberDynamicFieldsTestCase(unittest.TestCase):
         self.assertEqual(
             dynamic_fields_dct["productBAMM"], self.service_data.product_ba_mm
         )
+
+    def test_consideracions_generals_field(self):
+        self.service_data.notes = "General notes"
+        dynamic_fields = FiberDynamicFields(
+            self.service_data,
+            self.customer_data,
+            self.fiber_otrs_process_id,
+            self.fiber_otrs_activity_id,
+        ).all()
+
+        dynamic_fields_dct = dynamic_fields_to_dct(dynamic_fields)
+        self.assertEqual(
+            dynamic_fields_dct["consideracionsGenerals"],
+            self.service_data.notes,
+        )

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/tests/otrs_models/test_fiber_ticket.py

@@ -57,14 +57,14 @@ class FiberTicketTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockInternetArticle):
         customer_data = Mock(spec=[])
-        service_data = Mock(spec=["order_id", "notes", "technology"])
+        service_data = Mock(spec=["order_id", "technology"])
 
         mock_mobile_article = MockInternetArticle.return_value
 
         FiberTicket(service_data, customer_data, self.responsible_data)._build_article()
 
         MockInternetArticle.assert_called_with(
-            service_data.technology, service_data.order_id, "fiber", service_data.notes
+            service_data.technology, service_data.order_id, "fiber"
         )
         mock_mobile_article.call.assert_called_once()
 

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/tests/otrs_models/test_mobile_dynamic_fields.py

@@ -44,6 +44,7 @@ class MobileDynamicFieldsTestCase(unittest.TestCase):
                 "delivery_city",
                 "delivery_zip_code",
                 "delivery_state",
+                "notes",
                 "activation_notes",
                 "technology",
                 "sales_team",
@@ -576,3 +577,18 @@ class MobileDynamicFieldsTestCase(unittest.TestCase):
 
         dynamic_fields_dct = dynamic_fields_to_dct(dynamic_fields)
         self.assertEqual(dynamic_fields_dct["confirmDoc"], "no")
+
+    def test_consideracions_generals_field(self):
+        self.mobile_data.notes = "General notes"
+        dynamic_fields = MobileDynamicFields(
+            self.mobile_data,
+            self.customer_data,
+            self.mobile_otrs_process_id,
+            self.mobile_otrs_activity_id,
+        ).all()
+
+        dynamic_fields_dct = dynamic_fields_to_dct(dynamic_fields)
+        self.assertEqual(
+            dynamic_fields_dct["consideracionsGenerals"],
+            self.mobile_data.notes,
+        )

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/tests/otrs_models/test_mobile_ticket.py

@@ -38,9 +38,8 @@ class MobileTicketTestCase(unittest.TestCase):
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockProvisionArticle):
-        mobile_data = Mock(spec=["order_id", "notes", "technology"])
+        mobile_data = Mock(spec=["order_id", "technology"])
         mobile_data.order_id = 123
-        mobile_data.notes = "Hola mundo"
 
         customer_data = Mock(spec=["order_id"])
 
@@ -49,7 +48,7 @@ class MobileTicketTestCase(unittest.TestCase):
         MobileTicket(mobile_data, customer_data, self.responsible_data)._build_article()
 
         MockProvisionArticle.assert_called_with(
-            mobile_data.technology, mobile_data.order_id, "mobile", mobile_data.notes
+            mobile_data.technology, mobile_data.order_id, "mobile"
         )
         mock_mobile_article.call.assert_called_once()
 

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

@@ -38,7 +38,7 @@ class Router4GTicketTestCase(unittest.TestCase):
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockInternetArticle):
         customer_data = Mock(spec=[])
-        service_data = Mock(spec=["order_id", "notes", "technology"])
+        service_data = Mock(spec=["order_id", "technology"])
 
         mock_internet_article = MockInternetArticle.return_value
 
@@ -47,7 +47,7 @@ class Router4GTicketTestCase(unittest.TestCase):
         )._build_article()
 
         MockInternetArticle.assert_called_with(
-            service_data.technology, service_data.order_id, "4G", service_data.notes
+            service_data.technology, service_data.order_id, "4G"
         )
         mock_internet_article.call.assert_called_once()
 

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

@@ -45,6 +45,7 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             shipment_subdivision=faker.state(),
             additional_products="A,B,C",
             confirmed_documentation=faker.boolean(),
+            notes=faker.word(),
         )
 
         self.switchboard_otrs_process_id = faker.uuid4()
@@ -181,3 +182,9 @@ class SwitchboardDynamicFieldsTestCase(unittest.TestCase):
             self.dynamic_fields_dct["confirmarDocumentacio"],
             "1" if self.service_data.confirmed_documentation else "0",
         )
+
+    def test_consideracions_generals_field(self):
+        self.assertEqual(
+            self.dynamic_fields_dct["consideracionsGenerals"],
+            self.service_data.notes,
+        )

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

@@ -42,9 +42,8 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockProvisionArticle):
-        service_data = Mock(spec=["order_id", "notes", "technology"])
+        service_data = Mock(spec=["order_id", "technology"])
         service_data.order_id = 123
-        service_data.notes = "Notes test"
         customer_data = Mock(spec=["order_id"])
 
         mock_article = MockProvisionArticle.return_value
@@ -57,7 +56,6 @@ class SwitchboardHeaderTicketTestCase(unittest.TestCase):
             service_data.technology,
             service_data.order_id,
             "switchboard_header",
-            service_data.notes,
         )
         mock_article.call.assert_called_once()
 

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

@@ -40,9 +40,8 @@ class SwitchboardTicketTestCase(unittest.TestCase):
 
     @patch("otrs_somconnexio.otrs_models.provision_ticket.ProvisionArticle")
     def test_build_article(self, MockProvisionArticle):
-        service_data = Mock(spec=["order_id", "notes", "technology"])
+        service_data = Mock(spec=["order_id", "technology"])
         service_data.order_id = 123
-        service_data.notes = "Notes test"
         customer_data = Mock(spec=["order_id"])
 
         mock_article = MockProvisionArticle.return_value
@@ -54,7 +53,6 @@ class SwitchboardTicketTestCase(unittest.TestCase):
             service_data.technology,
             service_data.order_id,
             "switchboard",
-            service_data.notes,
         )
         mock_article.call.assert_called_once()
 

{otrs_somconnexio-0.7.0 → otrs_somconnexio-0.7.2}/tests/otrs_models/test_ticket_factory.py

@@ -88,6 +88,18 @@ class TicketFactoryTestCase(unittest.TestCase):
             responsible_data=self.responsible_data,
         )
 
+    @patch("otrs_somconnexio.otrs_models.ticket_factory.FiberTicket")
+    def test_build_fibre_ticket_without_responsible(self, MockFiberTicket):
+        self.service_data.service_type = "fiber"
+
+        TicketFactory(self.service_data, self.customer_data).build()
+
+        MockFiberTicket.assert_called_once_with(
+            service_data=self.service_data,
+            customer_data=self.customer_data,
+            responsible_data=None,
+        )
+
     def test_build_service_not_allowed_error(self):
         self.service_data.service_type = ""