Merge pull request #338 from tutorcruncher/contractor-mass

Mass Create Contractors

Author: alextford11

tcsocket/app/main.py

@@ -20,15 +20,17 @@
     service_list,
 )
 from .views.company import company_create, company_list, company_options, company_update
-from .views.contractor import contractor_get, contractor_list, contractor_set
+from .views.contractor import contractor_get, contractor_list, contractor_set, contractor_set_mass
 from .views.enquiry import clear_enquiry, enquiry
 
 
 async def startup(app: web.Application):
     settings: Settings = app['settings']
     redis = await create_pool(settings.redis_settings)
     app.update(
-        pg_engine=await create_engine(settings.pg_dsn), redis=redis, session=ClientSession(),
+        pg_engine=await create_engine(settings.pg_dsn),
+        redis=redis,
+        session=ClientSession(),
     )
 
 
@@ -52,6 +54,7 @@ def setup_routes(app):
     # to work with tutorcruncher websockets
     app.router.add_post(r'/{company}/webhook/options', company_update, name='company-update')
     app.router.add_post(r'/{company}/webhook/contractor', contractor_set, name='webhook-contractor')
+    app.router.add_post(r'/{company}/webhook/contractor/mass', contractor_set_mass, name='webhook-contractor-mass')
     app.router.add_post(r'/{company}/webhook/clear-enquiry', clear_enquiry, name='webhook-clear-enquiry')
     app.router.add_post(r'/{company}/webhook/appointments/{id:\d+}', appointment_webhook, name='webhook-appointment')
     app.router.add_post(

tcsocket/app/middleware.py

@@ -164,7 +164,8 @@ async def company_middleware(request, handler):
                 request['company'] = company
             else:
                 raise HTTPNotFoundJson(
-                    status='company not found', details=f'No company found for key {public_key}',
+                    status='company not found',
+                    details=f'No company found for key {public_key}',
                 )
         return await handler(request)
     except CancelledError:
@@ -190,7 +191,8 @@ async def json_request_middleware(request, handler):
 
         if error_details:
             raise HTTPBadRequestJson(
-                status='invalid request data', details=error_details,
+                status='invalid request data',
+                details=error_details,
             )
     return await handler(request)
 
@@ -202,7 +204,8 @@ def _check_timestamp(ts: str, now):
             raise ValueError()
     except (TypeError, ValueError):
         raise HTTPForbiddenJson(
-            status='invalid request time', details=f"request time '{ts}' not in the last 10 seconds",
+            status='invalid request time',
+            details=f"request time '{ts}' not in the last 10 seconds",
         )
 
 
@@ -221,7 +224,8 @@ async def authenticate(request, api_key=None):
         if _api_key and signature == hmac.new(_api_key, body, hashlib.sha256).hexdigest():
             return
     raise HTTPUnauthorizedJson(
-        status='invalid signature', details=f'Signature header "{signature}" does not match computed signature',
+        status='invalid signature',
+        details=f'Signature header "{signature}" does not match computed signature',
     )
 
 

tcsocket/app/models.py

@@ -44,8 +44,8 @@ class Contractor(Base):
     id = Column(Integer, primary_key=True, autoincrement=False, nullable=False)
     company = Column(Integer, ForeignKey('companies.id'), nullable=False)
 
-    first_name = Column(String(63), index=True)
-    last_name = Column(String(63))
+    first_name = Column(String(255), index=True)
+    last_name = Column(String(255))
 
     town = Column(String(63))
     country = Column(String(63))

tcsocket/app/processing.py

@@ -108,7 +108,14 @@ def _get_special_extra_attr(extra_attributes: List[ExtraAttributeModel], machine
 
 
 async def contractor_set(
-    *, conn, company, contractor: ContractorModel, skip_deleted=False, redis=None, ctx=None,
+    *,
+    conn,
+    company,
+    contractor: ContractorModel,
+    process_profile_pic=True,
+    skip_deleted=False,
+    redis=None,
+    ctx=None,
 ) -> Action:
     """
     Create or update a contractor.
@@ -119,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
@@ -132,7 +140,8 @@ async def contractor_set(
             )
             if not await curr.first():
                 raise HTTPNotFoundJson(
-                    status='not found', details=f'contractor with id {contractor.id} not found',
+                    status='not found',
+                    details=f'contractor with id {contractor.id} not found',
                 )
         return Action.deleted
 
@@ -174,11 +183,12 @@ async def contractor_set(
     if r is None:
         # the contractor already exists but on another company
         raise HTTPForbiddenJson(
-            status='permission denied', details=f'you do not have permission to update contractor {contractor.id}',
+            status='permission denied',
+            details=f'you do not have permission to update contractor {contractor.id}',
         )
     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/settings.py

@@ -33,7 +33,10 @@ class Settings(BaseSettings):
     def parse_redis_settings(cls, v):
         conf = urlparse(v)
         return RedisSettings(
-            host=conf.hostname, port=conf.port, password=conf.password, database=int((conf.path or '0').strip('/')),
+            host=conf.hostname,
+            port=conf.port,
+            password=conf.password,
+            database=int((conf.path or '0').strip('/')),
         )
 
     @property

tcsocket/app/utils.py

@@ -51,7 +51,9 @@ def pretty_lenient_json(data):
 class HTTPClientErrorJson(web.HTTPClientError):
     def __init__(self, **data):
         super().__init__(
-            text=pretty_lenient_json(data), content_type=JSON_CONTENT_TYPE, headers=ACCESS_CONTROL_HEADERS,
+            text=pretty_lenient_json(data),
+            content_type=JSON_CONTENT_TYPE,
+            headers=ACCESS_CONTROL_HEADERS,
         )
 
 
@@ -109,7 +111,8 @@ def get_arg(request, field, *, decoder: Callable[[str], Any] = int, default: Any
         return None if v is None else decoder(v)
     except ValueError:
         raise HTTPBadRequestJson(
-            status='invalid_argument', details=f'"{field}" had an invalid value "{v}"',
+            status='invalid_argument',
+            details=f'"{field}" had an invalid value "{v}"',
         )
 
 

tcsocket/app/validation.py

@@ -132,8 +132,8 @@ class EATypeEnum(str, Enum):
 class ContractorModel(BaseModel):
     id: int
     deleted: bool = False
-    first_name: constr(max_length=63) = None
-    last_name: constr(max_length=63) = None
+    first_name: constr(max_length=255) = None
+    last_name: constr(max_length=255) = None
     town: constr(max_length=63) = None
     country: constr(max_length=63) = None
     last_updated: datetime = None
@@ -189,6 +189,7 @@ def val_upstream_http_referrer(cls, v):
 
 
 class AppointmentModel(BaseModel):
+    id: int
     service_id: int
     service_name: str
     extra_attributes: List[ExtraAttributeModel]

tcsocket/app/views/appointments.py

@@ -55,7 +55,9 @@ async def appointment_webhook(request):
         pg_insert(sa_services)
         .values(id=appointment.service_id, company=request['company'].id, **service_insert_update)
         .on_conflict_do_update(
-            index_elements=[ser_c.id], where=ser_c.id == appointment.service_id, set_=service_insert_update,
+            index_elements=[ser_c.id],
+            where=ser_c.id == appointment.service_id,
+            set_=service_insert_update,
         )
     )
     apt_insert_update = appointment.dict(
@@ -66,17 +68,19 @@ async def appointment_webhook(request):
     await conn.execute(
         pg_insert(sa_appointments)
         .values(id=apt_id, service=appointment.service_id, **apt_insert_update)
-        .on_conflict_do_update(index_elements=[apt_c.id], where=apt_c.id == apt_id, set_=apt_insert_update,)
+        .on_conflict_do_update(
+            index_elements=[apt_c.id],
+            where=apt_c.id == apt_id,
+            set_=apt_insert_update,
+        )
     )
     return json_response(request, status='success')
 
 
 async def appointment_webhook_mass(request):
     conn = await request['conn_manager'].get_connection()
     data = await request.json()
-    if data['_request_time']:
-        del data['_request_time']
-    for apt_id, apt in data.items():
+    for apt in data['appointments']:
         if apt['ss_method'] == 'POST':
             appointment = AppointmentModel(**apt)
 
@@ -86,7 +90,7 @@ async def appointment_webhook_mass(request):
                 raise HTTPConflictJson(
                     status='service conflict',
                     details=f'service {appointment.service_id} already exists'
-                            ' and is associated with another company',
+                    ' and is associated with another company',
                 )
 
             service_insert_update = dict(
@@ -102,7 +106,9 @@ async def appointment_webhook_mass(request):
                 pg_insert(sa_services)
                 .values(id=appointment.service_id, company=request['company'].id, **service_insert_update)
                 .on_conflict_do_update(
-                    index_elements=[ser_c.id], where=ser_c.id == appointment.service_id, set_=service_insert_update,
+                    index_elements=[ser_c.id],
+                    where=ser_c.id == appointment.service_id,
+                    set_=service_insert_update,
                 )
             )
             apt_insert_keys = [
@@ -120,12 +126,16 @@ async def appointment_webhook_mass(request):
 
             await conn.execute(
                 pg_insert(sa_appointments)
-                .values(id=apt_id, service=appointment.service_id, **apt_insert_update)
-                .on_conflict_do_update(index_elements=[apt_c.id], where=apt_c.id == apt_id, set_=apt_insert_update,)
+                .values(id=appointment.id, service=appointment.service_id, **apt_insert_update)
+                .on_conflict_do_update(
+                    index_elements=[apt_c.id],
+                    where=apt_c.id == appointment.id,
+                    set_=apt_insert_update,
+                )
             )
         elif apt['ss_method'] == 'DELETE':
             await conn.execute(
-                sa_appointments.delete().where(and_(apt_c.id == apt_id, ser_c.company == request['company'].id))
+                sa_appointments.delete().where(and_(apt_c.id == apt['id'], ser_c.company == request['company'].id))
             )
         else:
             return
@@ -208,7 +218,11 @@ async def appointment_list(request):
     q_count = select([sql_f.count()]).select_from(sa_appointments.join(sa_services)).where(and_(*where))
     cur_count = await conn.execute(q_count)
 
-    return json_response(request, results=results, count=(await cur_count.first())[0],)
+    return json_response(
+        request,
+        results=results,
+        count=(await cur_count.first())[0],
+    )
 
 
 async def service_list(request):
@@ -240,7 +254,11 @@ async def service_list(request):
         select([sql_f.count(distinct(ser_c.id))]).select_from(sa_appointments.join(sa_services)).where(and_(*where))
     )
 
-    return json_response(request, results=results, count=(await cur_count.first())[0],)
+    return json_response(
+        request,
+        results=results,
+        count=(await cur_count.first())[0],
+    )
 
 
 class SSOData(BaseModel):
@@ -273,7 +291,8 @@ def _get_sso_data(request, company) -> SSOData:
         sso_data: SSOData = SSOData.parse_raw(sso_data_, proto=Protocol.json)
     except ValidationError as e:
         raise HTTPBadRequestJson(
-            status='invalid request data', details=e.errors(),
+            status='invalid request data',
+            details=e.errors(),
         )
     else:
         if sso_data.expires < datetime.astimezone(datetime.now(), timezone.utc):
@@ -318,7 +337,13 @@ async def book_appointment(request):
     v = await conn.execute(
         select([apt_c.attendees_current_ids])
         .select_from(sa_appointments.join(sa_services))
-        .where(and_(ser_c.company == company.id, apt_c.start > datetime.utcnow(), apt_c.id == booking.appointment,))
+        .where(
+            and_(
+                ser_c.company == company.id,
+                apt_c.start > datetime.utcnow(),
+                apt_c.id == booking.appointment,
+            )
+        )
     )
     r = await v.first()
     if not r:

tcsocket/app/views/company.py

@@ -16,6 +16,8 @@ async def company_create(request):
 
     Authentication and json parsing are done by middleware.
     """
+    data = await request.json()
+    update_contractors = data.pop('update_contractors', True)
     company: CompanyCreateModal = request['model']
     existing_company = bool(company.private_key)
     data = company.dict()
@@ -30,7 +32,8 @@ async def company_create(request):
     new_company = await v.first()
     if new_company is None:
         raise HTTPConflictJson(
-            status='duplicate', details='the supplied data conflicts with an existing company',
+            status='duplicate',
+            details='the supplied data conflicts with an existing company',
         )
     else:
         logger.info(
@@ -40,7 +43,7 @@ async def company_create(request):
             new_company.public_key,
             new_company.private_key,
         )
-        if existing_company:
+        if update_contractors and existing_company:
             await request.app['redis'].enqueue_job('update_contractors', company=dict(new_company))
         return json_response(
             request,
@@ -74,6 +77,8 @@ async def company_update(request):
     """
     Modify a company.
     """
+    data = await request.json()
+    update_contractors = data.pop('update_contractors', True)
     company: CompanyUpdateModel = request['model']
     data = company.dict(include={'name', 'public_key', 'private_key', 'name_display'})
     data = {k: v for k, v in data.items() if v is not None}
@@ -97,10 +102,17 @@ async def company_update(request):
     select_fields = c.id, c.public_key, c.private_key, c.name_display, c.domains
     q = select(select_fields).where(c.public_key == public_key)
     result = await conn.execute(q)
-    company = dict(await result.first())
-
-    await request.app['redis'].enqueue_job('update_contractors', company=company)
-    return json_response(request, status_=200, status='success', details=data, company_domains=company['domains'],)
+    company: dict = dict(await result.first())
+
+    if update_contractors:
+        await request.app['redis'].enqueue_job('update_contractors', company=company)
+    return json_response(
+        request,
+        status_=200,
+        status='success',
+        details=data,
+        company_domains=company['domains'],
+    )
 
 
 async def company_list(request):