Additional web hook for clearing existing appointments (#322)

* Heroku ready (#276)

* Get heroku ready

* Add yml file

* Remove unneeded files

* Remove deploy files

* Remove check for services being ready

* Update logs

* Update logging

* Updating tc root

* Logging for photos

* Logging for setting an image

* More logging

* Images to aws

* Remove hash test

* Storing images in s3 and tests

* Adding secrets

* Tests

* Add runtime

* Fix deploy

* Install boto3

* Fix images

* Remove end2end

* Created method to clear all appointments

* linting

* socket side ability to take many apts in a single webhook

* Can delete apts in mass_apt_webhook

* Single endpoint

Co-authored-by: Tom Hamilton Stubber <tomhamiltonstubber@gmail.com>

Author: HenryTraill

tcsocket/app/main.py

@@ -12,7 +12,9 @@
 from .views.appointments import (
     appointment_list,
     appointment_webhook,
+    appointment_webhook_clear,
     appointment_webhook_delete,
+    appointment_webhook_mass,
     book_appointment,
     check_client,
     service_list,
@@ -52,9 +54,15 @@ def setup_routes(app):
     app.router.add_post(r'/{company}/webhook/contractor', contractor_set, name='webhook-contractor')
     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/views/appointments.py

@@ -71,6 +71,67 @@ async def appointment_webhook(request):
     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():
+        if apt['ss_method'] == 'POST':
+            appointment: AppointmentModel = apt
+
+            v = await conn.execute(select([ser_c.company]).where(ser_c.id == appointment['service_id']))
+            r = await v.first()
+            if r and r.company != request['company'].id:
+                raise HTTPConflictJson(
+                    status='service conflict',
+                    details=f'service {appointment["service_id"]} already exists'
+                            ' and is associated with another company',
+                )
+
+            service_insert_update = dict(
+                name=appointment['service_name'],
+                colour=appointment['colour'],
+                extra_attributes=[
+                    ea.dict(exclude={'sort_index'})
+                    for ea in sorted(appointment['extra_attributes'], key=attrgetter('sort_index'))
+                ],
+            )
+
+            await conn.execute(
+                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,
+                )
+            )
+            apt_insert_keys = [
+                'attendees_max',
+                'attendees_count',
+                'attendees_current_ids',
+                'start',
+                'finish',
+                'price',
+                'location',
+            ]
+
+            apt_insert_update = {key: value for key, value in apt.items() if key in apt_insert_keys}
+            apt_insert_update['topic'] = appointment['appointment_topic']
+
+            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,)
+            )
+        elif apt['ss_method'] == 'DELETE':
+            await conn.execute(
+                sa_appointments.delete().where(and_(apt_c.id == apt_id, ser_c.company == request['company'].id))
+            )
+        else:
+            return
+    return json_response(request, status='success')
+
+
 async def appointment_webhook_delete(request):
     apt_id = request.match_info['id']
     conn = await request['conn_manager'].get_connection()
@@ -80,6 +141,13 @@ async def appointment_webhook_delete(request):
     return json_response(request, status='success' if v.rowcount else 'appointment not found')
 
 
+async def appointment_webhook_clear(request):
+    conn = await request['conn_manager'].get_connection()
+    v = await conn.execute(sa_appointments.delete().where(ser_c.company == request['company'].id))
+    r = await conn.execute(sa_services.delete().where(ser_c.company == request['company'].id))
+    return json_response(request, status='success' if r.rowcount or v.rowcount else 'appointments not found')
+
+
 APT_LIST_FIELDS = (
     apt_c.id,
     apt_c.topic,

tests/test_appointments_set.py

@@ -170,3 +170,126 @@ async def test_delete_old_appointments(db_conn, company, settings):
 
     assert {(1, 1), (3, 3)} == await select_set(db_conn, sa_appointments.c.id, sa_appointments.c.service)
     assert {(1,), (3,)} == await select_set(db_conn, sa_services.c.id)
+
+
+async def test_clear_apts(cli, db_conn, company):
+    await create_appointment(db_conn, company, appointment_extra={'id': 1})
+    for i in range(10):
+        await create_appointment(
+            db_conn,
+            company,
+            create_service=False,
+            appointment_extra=dict(
+                id=i + 2,
+                start=datetime(2032, 1, 1, 12, 0, 0) + timedelta(days=i + 1),
+                finish=datetime(2032, 1, 1, 13, 0, 0) + timedelta(days=i + 1),
+            ),
+        )
+
+    assert 11 == await count(db_conn, sa_appointments)
+    assert 1 == await count(db_conn, sa_services)
+
+    url = cli.server.app.router['webhook-appointment-clear'].url_for(company='thepublickey')
+    r = await signed_request(cli, url, method_='DELETE')
+    assert r.status == 200
+    assert {'status': 'success'} == await r.json()
+
+    assert 0 == await count(db_conn, sa_appointments)
+    assert 0 == await count(db_conn, sa_services)
+
+
+async def test_mass_apts(cli, db_conn, company):
+    await create_appointment(db_conn, company, appointment_extra={'id': 1})
+    assert 1 == await count(db_conn, sa_appointments)
+    assert 1 == await count(db_conn, sa_services)
+
+    data = dict()
+    for i in range(10):
+        data[str(i + 2)] = dict(
+            service_id=1,
+            service_name='test service',
+            extra_attributes=[],
+            colour='#000000',
+            appointment_topic='testing appointment',
+            attendees_max=42,
+            attendees_count=4,
+            attendees_current_ids=[1, 2, 3],
+            start=str(datetime(2032, 1, 1, 12, 0, 0) + timedelta(days=i + 1)),
+            finish=str(datetime(2032, 1, 1, 13, 0, 0) + timedelta(days=i + 1)),
+            price=123.45,
+            location='Whatever',
+            ss_method='POST'
+        )
+    url = cli.server.app.router['webhook-appointment-mass'].url_for(company='thepublickey')
+    r = await signed_request(cli, url, **data)
+    assert r.status == 200
+    assert {'status': 'success'} == await r.json()
+
+    assert 11 == await count(db_conn, sa_appointments)
+    assert 1 == await count(db_conn, sa_services)
+
+    data = dict()
+    for i in range(9):
+        data[str(i + 2)] = dict(
+            service_id=1,
+            service_name='test service',
+            extra_attributes=[],
+            colour='#000000',
+            appointment_topic='testing appointment',
+            attendees_max=42,
+            attendees_count=4,
+            attendees_current_ids=[1, 2, 3],
+            start=str(datetime(2032, 1, 1, 12, 0, 0) + timedelta(days=i + 1)),
+            finish=str(datetime(2032, 1, 1, 13, 0, 0) + timedelta(days=i + 1)),
+            price=123.45,
+            location='Whatever',
+            ss_method='POST'
+        )
+    data['10'] = {'ss_method': 'DELETE'}
+    data['11'] = {'ss_method': 'DELETE'}
+    url = cli.server.app.router['webhook-appointment-mass'].url_for(company='thepublickey')
+    r = await signed_request(cli, url, **data)
+    assert r.status == 200
+    assert {'status': 'success'} == await r.json()
+
+    assert 9 == await count(db_conn, sa_appointments)
+    assert 1 == await count(db_conn, sa_services)
+
+
+async def test_mass_apts_and_services(cli, db_conn, company):
+    await create_appointment(db_conn, company, appointment_extra={'id': 1})
+    assert 1 == await count(db_conn, sa_appointments)
+    assert 1 == await count(db_conn, sa_services)
+
+    data = dict()
+    for i in range(10):
+        data[str(i + 2)] = dict(
+            service_id=i + 2,
+            service_name='test service',
+            extra_attributes=[],
+            colour='#000000',
+            appointment_topic='testing appointment',
+            attendees_max=42,
+            attendees_count=4,
+            attendees_current_ids=[1, 2, 3],
+            start=str(datetime(2032, 1, 1, 12, 0, 0) + timedelta(days=i + 1)),
+            finish=str(datetime(2032, 1, 1, 13, 0, 0) + timedelta(days=i + 1)),
+            price=123.45,
+            location='Whatever',
+            ss_method='POST'
+        )
+    url = cli.server.app.router['webhook-appointment-mass'].url_for(company='thepublickey')
+    r = await signed_request(cli, url, **data)
+    assert r.status == 200
+    assert {'status': 'success'} == await r.json()
+
+    assert 11 == await count(db_conn, sa_appointments)
+    assert 11 == await count(db_conn, sa_services)
+
+    url = cli.server.app.router['webhook-appointment-clear'].url_for(company='thepublickey')
+    r = await signed_request(cli, url, method_='DELETE')
+    assert r.status == 200
+    assert {'status': 'success'} == await r.json()
+
+    assert 0 == await count(db_conn, sa_appointments)
+    assert 0 == await count(db_conn, sa_services)