Merge branch 'master' of github.com:tutorcruncher/socket-server into heroku-ready

Author: alextford11

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: socket_test
         ports:
-        - 5432:5432
+          - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
       redis:
         image: redis
@@ -29,7 +29,7 @@ jobs:
         options: --entrypoint redis-server
 
     env:
-      DATABASE_URL: 'postgres://postgres:postgres@localhost:5432/socket_test'
+      DATABASE_URL: 'postgres://postgres:postgres@127.0.0.1:5432/socket_test'
 
     steps:
     - uses: actions/checkout@v2

README.md

@@ -1,7 +1,7 @@
 socket-server
 =============
 
-[![Build Status](https://github.com/tutorcruncher/socket-server/workflows/CI/badge.svg)
+![Build Status](https://github.com/tutorcruncher/socket-server/workflows/CI/badge.svg)
 [![codecov](https://codecov.io/gh/tutorcruncher/socket-server/branch/master/graph/badge.svg)](https://codecov.io/gh/tutorcruncher/socket-server)
 
 Backend application for [TutorCruncher's](https://tutorcruncher.com) web integration.

runtime.txt

@@ -1 +1 @@
-python-3.8.3
+python-3.8.8

tcsocket/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.8.8-alpine
 
 RUN apk --update --no-cache add gcc g++ musl-dev zlib-dev libuv libffi-dev make postgresql-dev jpeg-dev tiff-dev \
  && rm -rf /var/cache/apk/*

tcsocket/app/main.py

@@ -12,21 +12,25 @@
 from .views.appointments import (
     appointment_list,
     appointment_webhook,
+    appointment_webhook_clear,
     appointment_webhook_delete,
+    appointment_webhook_mass,
     book_appointment,
     check_client,
     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(),
     )
 
 
@@ -50,11 +54,18 @@ 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(
+        r'/{company}/webhook/appointments/mass', appointment_webhook_mass, name='webhook-appointment-mass'
+    )
     app.router.add_delete(
         r'/{company}/webhook/appointments/{id:\d+}', appointment_webhook_delete, name='webhook-appointment-delete'
     )
+    app.router.add_delete(
+        r'/{company}/webhook/appointments/clear', appointment_webhook_clear, name='webhook-appointment-clear'
+    )
 
     app.router.add_get(r'/{company}/contractors', contractor_list, name='contractor-list')
     app.router.add_get(r'/{company}/contractors/{id:\d+}', contractor_get, name='contractor-get')

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}"',
         )