process images after creating cons

Author: alextford11

tcsocket/app/processing.py

@@ -112,6 +112,7 @@ async def contractor_set(
     conn,
     company,
     contractor: ContractorModel,
+    process_profile_pic=True,
     skip_deleted=False,
     redis=None,
     ctx=None,
@@ -125,6 +126,7 @@ async def contractor_set(
     :param company: dict with company info, including id and public_key
     :param contractor: data about contractor
     :param skip_deleted: whether or not to skip deleted contractors (or delete them in the db.)
+    :param process_profile_pic: whether or not to run process_image
     :return: Action: created, updated or deleted
     """
     from .worker import process_image
@@ -186,7 +188,7 @@ async def contractor_set(
         )
     await _set_skills(conn, contractor.id, contractor.skills)
     await _set_labels(conn, company['id'], contractor.labels)
-    if contractor.photo:
+    if process_profile_pic and contractor.photo:
         # Sometimes creating the contractor is already done on a job, so don't need another one.
         job_kwargs = dict(company_key=company['public_key'], contractor_id=contractor.id, url=contractor.photo)
         if redis:

tcsocket/app/views/contractor.py

@@ -47,14 +47,18 @@ async def contractor_set_mass(request):
     """
     data = await request.json()
     conn = await request['conn_manager'].get_connection()
-    for con_data in data['contractors']:
-        contractor = ContractorModel(**con_data)
-        await _contractor_set(
-            conn=conn,
-            redis=request.app['redis'],
-            company=request['company'],
-            contractor=contractor,
-        )
+    company = request['company']
+    contractors = [ContractorModel(**con_data) for con_data in data['contractors']]
+    for contractor in contractors:
+        await _contractor_set(conn=conn, company=company, contractor=contractor, process_profile_pic=False)
+
+    # starting image processing here due to conflicting db connections on tests
+    redis = request.app['redis']
+    for contractor in contractors:
+        if contractor.photo:
+            await redis.enqueue_job(
+                'process_image', company_key=company['public_key'], contractor_id=contractor.id, url=contractor.photo
+            )
     return json_response(request, status='success')
 
 

tests/test_set_contractor.py

@@ -710,11 +710,21 @@ async def test_mass_contractor_create(cli, db_conn, company, image_download_url,
     await worker.run_check()
 
     curr = await db_conn.execute(sa_contractors.select())
+    all_cons = await curr.fetchall()
+    assert all(con_id in tuple(c.id for c in all_cons) for con_id in (123, 246))
+
+    curr = await db_conn.execute(sa_contractors.select().where(sa_contractors.c.id == 123))
     result = await curr.first()
     assert result.id == 123
     assert result.first_name == 'Fred'
     assert not result.last_name
 
+    curr = await db_conn.execute(sa_contractors.select().where(sa_contractors.c.id == 246))
+    result = await curr.first()
+    assert result.id == 246
+    assert result.first_name == 'Fred'
+    assert not result.last_name
+
     for con in data['contractors']:
         con['last_name'] = 'Bob'
     data['contractors'].append(
@@ -758,7 +768,23 @@ async def test_mass_contractor_create(cli, db_conn, company, image_download_url,
     await worker.run_check()
 
     curr = await db_conn.execute(sa_contractors.select())
+    all_cons = await curr.fetchall()
+    assert all(con_id in tuple(c.id for c in all_cons) for con_id in (123, 246, 369))
+
+    curr = await db_conn.execute(sa_contractors.select().where(sa_contractors.c.id == 123))
     result = await curr.first()
     assert result.id == 123
     assert result.first_name == 'Fred'
     assert result.last_name == 'Bob'
+
+    curr = await db_conn.execute(sa_contractors.select().where(sa_contractors.c.id == 246))
+    result = await curr.first()
+    assert result.id == 246
+    assert result.first_name == 'Fred'
+    assert result.last_name == 'Bob'
+
+    curr = await db_conn.execute(sa_contractors.select().where(sa_contractors.c.id == 369))
+    result = await curr.first()
+    assert result.id == 369
+    assert result.first_name == 'Jim'
+    assert result.last_name == 'Bell'