Tag line fixes (#273)

Author: tomhamiltonstubber

tcsocket/app/processing.py

@@ -96,7 +96,8 @@ async def _set_labels(conn, company_id, labels):
 
 def _get_special_extra_attr(extra_attributes: List[ExtraAttributeModel], machine_name, attr_type):
     """
-    Find special extra attributes suitable for tag_line and primary_description.
+    Find special extra attributes suitable for tag_line and primary_description. Uses the first attr of type attr_type
+    if that machine_name is not found.
     """
     eas = [ea for ea in extra_attributes if ea.type == attr_type]
     if eas:
@@ -159,7 +160,7 @@ async def contractor_set(
     primary_description, ex_attrs = _get_special_extra_attr(ex_attrs, 'primary_description', 'text_extended')
     data.update(
         extra_attributes=[ea_.dict(exclude={'sort_index'}) for ea_ in sorted(ex_attrs, key=attrgetter('sort_index'))],
-        tag_line=tag_line,
+        tag_line=tag_line and tag_line[:255],  # Field limit; TC should only send through the first 100 chars.
         primary_description=primary_description,
     )
     v = await conn.execute(

tests/test_set_contractor.py

@@ -201,6 +201,58 @@ async def test_extra_attributes(cli, db_conn, company):
     assert obj['extra_attributes'][2]['value'] == '2032-06-01'
 
 
+async def test_tag_line_from_short_text(cli, db_conn, company):
+    eas = [
+        {
+            'machine_name': 'whatever',
+            'type': 'text_short',
+            'name': 'Should be tag line?',
+            'value': 'Should be tag line.',
+            'sort_index': 0
+        },
+    ]
+    r = await signed_request(
+        cli,
+        f'/{company.public_key}/webhook/contractor',
+        id=123,
+        deleted=False,
+        first_name='Fred',
+        extra_attributes=eas
+    )
+    assert r.status == 201, await r.text()
+    curr = await db_conn.execute(sa_contractors.select())
+    result = await curr.first()
+    assert result.id == 123
+    assert result.first_name == 'Fred'
+    assert result.tag_line == 'Should be tag line.'
+
+
+async def test_shorten_tag_line(cli, db_conn, company):
+    eas = [
+        {
+            'machine_name': 'whatever',
+            'type': 'text_short',
+            'name': 'Should be tag line?',
+            'value': 'Should be tag line.' * 50,
+            'sort_index': 0
+        },
+    ]
+    r = await signed_request(
+        cli,
+        f'/{company.public_key}/webhook/contractor',
+        id=123,
+        deleted=False,
+        first_name='Fred',
+        extra_attributes=eas
+    )
+    assert r.status == 201, await r.text()
+    curr = await db_conn.execute(sa_contractors.select())
+    result = await curr.first()
+    assert result.id == 123
+    assert result.first_name == 'Fred'
+    assert len(result.tag_line) == 255
+
+
 async def test_extra_attributes_special(cli, db_conn, company):
     eas = [
         {