From afb28158835940d4120fef30beecce5d20e938e2 Mon Sep 17 00:00:00 2001 From: Xavier Bustamante Talavera Date: Wed, 31 Oct 2018 12:27:16 +0100 Subject: [PATCH] Add regenerate-search --- ereuse_devicehub/devicehub.py | 7 +++++++ ereuse_devicehub/resources/device/search.py | 12 +++++++++--- tests/test_device_find.py | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/devicehub.py b/ereuse_devicehub/devicehub.py index 10205103..aa6ee8be 100644 --- a/ereuse_devicehub/devicehub.py +++ b/ereuse_devicehub/devicehub.py @@ -35,6 +35,7 @@ class Devicehub(Teal): instance_relative_config, root_path, Auth) self.dummy = Dummy(self) self.before_request(self.register_db_events_listeners) + self.cli.command('regenerate-search')(self.regenerate_search) def register_db_events_listeners(self): """Registers the SQLAlchemy event listeners.""" @@ -44,3 +45,9 @@ class Devicehub(Teal): def _init_db(self): super()._init_db() DeviceSearch.set_all_devices_tokens_if_empty(self.db.session) + + def regenerate_search(self): + """Re-creates from 0 all the search tables.""" + DeviceSearch.regenerate_search_table(self.db.session) + db.session.commit() + print('Done.') diff --git a/ereuse_devicehub/resources/device/search.py b/ereuse_devicehub/resources/device/search.py index ff7203a5..ac76c41d 100644 --- a/ereuse_devicehub/resources/device/search.py +++ b/ereuse_devicehub/resources/device/search.py @@ -73,9 +73,15 @@ class DeviceSearch(db.Model): it deletes unlogged tables as ours. """ if not DeviceSearch.query.first(): - for device in Device.query: - if not isinstance(device, Component): - cls.set_device_tokens(session, device) + cls.regenerate_search_table(session) + + @classmethod + def regenerate_search_table(cls, session: db.Session): + """Deletes and re-computes all the search table.""" + DeviceSearch.query.delete() + for device in Device.query: + if not isinstance(device, Component): + cls.set_device_tokens(session, device) @classmethod def set_device_tokens(cls, session: db.Session, device: Device): diff --git a/tests/test_device_find.py b/tests/test_device_find.py index 0b8fdb6a..638bec08 100644 --- a/tests/test_device_find.py +++ b/tests/test_device_find.py @@ -190,6 +190,21 @@ def test_device_search_all_devices_token_if_empty(app: Devicehub, user: UserClie assert i['items'] +def test_device_search_regenerate_table(app: DeviceSearch, user: UserClient): + user.post(file('basic.snapshot'), res=Snapshot) + i, _ = user.get(res=Device, query=[('search', 'Desktop')]) + assert i['items'], 'Normal search works' + with app.app_context(): + app.db.session.execute('TRUNCATE TABLE {}'.format(DeviceSearch.__table__.name)) + app.db.session.commit() + i, _ = user.get(res=Device, query=[('search', 'Desktop')]) + assert not i['items'], 'Truncate deleted all items' + runner = app.test_cli_runner() + runner.invoke(args=['regenerate-search'], catch_exceptions=False) + i, _ = user.get(res=Device, query=[('search', 'Desktop')]) + assert i['items'], 'Regenerated re-made the table' + + def test_device_query_search(user: UserClient): # todo improve user.post(file('basic.snapshot'), res=Snapshot)