Commit Graph

290 Commits

Author SHA1 Message Date
evgeniy-st
9fecbfe98f EstablishmentViewSet default ordering and filtration 2019-10-29 19:17:44 +03:00
evgeniy-st
3f233fd246 update establishment document index & establishment documentview 2019-10-29 18:13:21 +03:00
evgeniy-st
251edda2ea update Document ViewSet's pagination class 2019-10-29 15:19:07 +03:00
evgeniy-st
174e580c20 Merge branch 'feature/search-by-type' into develop 2019-10-25 16:07:38 +03:00
evgeniy-st
d4fe5ebd2d search by type & subtype 2019-10-25 16:06:52 +03:00
Kuroshini
7f23f0e891 Establishment each hour reindexing 2019-10-25 14:13:19 +03:00
Anatoly
81cdaa5c89 added image_url & preview_image_url to NewsDocument 2019-10-24 19:53:09 +03:00
evgeniy-st
128488b5ee some bugfixes 2019-10-24 16:17:37 +03:00
evgeniy-st
636bc43a35 remove playlist from news model 2019-10-24 12:38:44 +03:00
Kuroshini
d5609e4cb8 Works now filter first part 2019-10-23 17:29:00 +03:00
Kuroshini
47da9929cb Some fixes 2019-10-23 17:28:06 +03:00
evgeniy-st
d8c99062ca fix singals 2019-10-23 16:28:42 +03:00
evgeniy-st
6c195bc185 Merge branch 'develop' into feature/gm-148 2019-10-21 20:26:31 +03:00
evgeniy-st
4ceb0e4d86 fix establishment migration 2019-10-21 20:22:47 +03:00
evgeniy-st
2dbe65a169 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-21 10:31:06 +03:00
Kuroshini
3bc9dd7347 Open now filter (typo fix) 2019-10-18 02:56:49 +03:00
Kuroshini
b77c654c6c Open now filter 2019-10-18 02:38:59 +03:00
Kuroshini
4b5b34de20 add preview image url (fix typo) 2019-10-17 23:28:13 +03:00
Kuroshini
5f2501c712 add preview image url 2019-10-17 23:25:49 +03:00
evgeniy-st
9661de4810 Establishment types 2019-10-17 15:17:29 +03:00
Kuroshini
d2e34e5d49 Timetable search results 2019-10-17 15:10:26 +03:00
Kuroshini
1998e3dc57 Change establishment schedule ES fields type 2019-10-17 14:59:35 +03:00
Kuroshini
2c5c067b53 try to remove weekday_display 2019-10-17 14:56:31 +03:00
Kuroshini
97fc8dce15 add schedule to search results 2019-10-17 14:45:33 +03:00
Kuroshini
c59811e037 Revert "Revert "add schedule to search results""
This reverts commit acea297
2019-10-17 14:34:49 +03:00
Kuroshini
acea297c94 Revert "add schedule to search results"
This reverts commit c8c66e7
2019-10-17 14:33:20 +03:00
Kuroshini
c8c66e7d1b add schedule to search results 2019-10-17 14:32:10 +03:00
Kuroshini
6a85e52abc Rename variable 2019-10-17 12:30:40 +03:00
Kuroshini
40f1cc1e22 Add lookup for categories 2019-10-16 20:56:56 +03:00
Kuroshini
9fc4a8703c Search establishment by working time (added lookup) 2019-10-16 19:13:33 +03:00
Kuroshini
2f656c459d Search establishment by working time (added fields to serializer) 2019-10-16 19:09:38 +03:00
Kuroshini
ed03f0f40f Search establishment by working time 2019-10-16 19:05:16 +03:00
evgeniy-st
a0e24a26a0 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 18:53:25 +03:00
evgeniy-st
ccf6e12e3f remove tag category from establishment type 2019-10-15 18:52:32 +03:00
evgeniy-st
c09b1eb295 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 18:44:24 +03:00
evgeniy-st
3a54b70093 update tag on document index 2019-10-15 18:43:08 +03:00
evgeniy-st
c268575a04 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 18:33:44 +03:00
evgeniy-st
bde81b3700 update ES documents 2019-10-15 18:32:16 +03:00
evgeniy-st
f7eb534570 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 17:48:40 +03:00
evgeniy-st
c94ad3f017 comment some code 2019-10-15 17:48:01 +03:00
evgeniy-st
92529f4c5b Merge branch 'feature/gm-192' into feature/gm-148 2019-10-15 17:17:35 +03:00
evgeniy-st
60cdec99e0 refactor tags 2019-10-15 17:17:03 +03:00
Anatoly
2d830b2821 Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
2019-10-15 12:08:23 +03:00
Anatoly
ca5f588466 fix elastic document, fix prefetch and select related 2019-10-09 12:53:35 +03:00
Anatoly
33d2446c5c Merge branch 'develop' into feature/gm-192 2019-10-08 15:39:31 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +03:00
evgeniy-st
e2e5faa3f9 Merge branch 'develop' into feature/gm-148 2019-10-08 14:41:52 +03:00
evgeniy-st
861daf8871 update search fields 2019-10-08 14:39:42 +03:00
evgeniy-st
97dc881200 Merge branch 'develop' into feature/gm-148 2019-10-07 18:03:07 +03:00
evgeniy-st
3bf65472d9 Auto fuzziness with match query 2019-10-07 16:31:50 +03:00
Anatoly
c365711c05 Merge branch 'develop' into feature/gm-148 2019-10-04 14:31:03 +03:00
Anatoly
91790bbc39 refactored 2019-10-04 14:30:34 +03:00
evgeniy-st
175bd4f7b5 update establishment document 2019-10-04 14:07:50 +03:00
evgeniy-st
a73cba4dcf Merge branch 'develop' into feature/es 2019-10-04 12:06:53 +03:00
evgeniy-st
50a9622f78 News search 2019-10-04 12:05:13 +03:00
evgeniy-st
24f84ae8be update tag filter 2019-10-04 11:16:01 +03:00
evgeniy-st
729a77866d update elasticsearch index 2019-10-03 17:19:30 +03:00
Kuroshini
310928d95c Fix import package issue 2019-09-30 12:46:58 +03:00
d.kuzmenko
8745c57f84 Merge branch 'bugfix/bunch-of-fixes' into 'develop'
Bugfix/bunch of fixes

See merge request gm/gm-backend!38
2019-09-30 07:57:12 +00:00
Виктор Гладких
5ef33c0d19 News search url 2019-09-30 10:19:09 +03:00
Виктор Гладких
78e1e448d9 News search 2019-09-30 10:09:46 +03:00
Kuroshini
1957ab6300 Pagination for ES results 2019-09-27 20:54:55 +03:00
Виктор Гладких
aa037d27f5 Double api 2019-09-27 10:43:24 +03:00
Kuroshini
87999830d1 Remove description from search results 2019-09-26 17:53:21 +03:00
Kuroshini
fec3a2f6bc Reformat establishment elastic location for api 2019-09-26 17:46:07 +03:00
Kuroshini
e0d09486c2 Revert "address coordinates in get api queries"
This reverts commit f21b400
2019-09-26 17:40:35 +03:00
Kuroshini
2fe0ce86d3 Refactor elastic serializer 2019-09-26 17:40:09 +03:00
Kuroshini
441c16281d format api elastic results 2019-09-26 17:23:55 +03:00
Kuroshini
f21b4005aa address coordinates in get api queries 2019-09-26 16:39:30 +03:00
Kuroshini
c2bd4b7da8 add slug && preview_image_url to search results 2019-09-25 19:58:25 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
evgeniy-st
009533d764 Tags & disable elasticsearch indexing 2019-09-23 16:06:40 +03:00
Dmitriy Kuzmenko
1e1b09660d fix news_type 2019-09-20 15:55:37 +03:00
Anatoly
413c93bead fixed problem with image, refactored favorites, collection 2019-09-20 13:35:59 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
evgeniy-st
8e0b19b8b0 ES. Establishment type & subtypes 2019-09-18 16:40:07 +03:00
evgeniy-st
4be007aade ES: geo spatial filter 2019-09-18 16:05:42 +03:00
evgeniy-st
3f55e001cc ES. Establishment. filter by collection_type 2019-09-18 15:05:28 +03:00
evgeniy-st
39b2fc49b5 ES Establishment tags. indexing & search 2019-09-18 11:46:53 +03:00
evgeniy-st
2908286e6c price_level & toque_number settings 2019-09-18 10:50:00 +03:00
evgeniy-st
e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code 2019-09-17 17:33:07 +03:00
evgeniy-st
7a021a1435 update establishment search view 2019-09-16 17:56:51 +03:00
evgeniy-st
db5ff7afcd update settings, update establishment document 2019-09-16 11:21:14 +03:00
evgeniy-st
c58d3bae36 Tags indexing and search (by id) 2019-09-10 12:58:39 +03:00
evgeniy-st
9fab4454a0 Establishment index 2019-09-09 15:39:31 +03:00
evgeniy-st
87efc50d94 translated field into serializer 2019-09-09 14:55:44 +03:00
evgeniy-st
b326d7b8fd Overrided searchfilterbackend 2019-09-09 12:00:53 +03:00
evgeniy-st
43804ae5ab some fixes 2019-09-06 17:34:21 +03:00
evgeniy-st
99011ba15a Initial search indexes app 2019-09-06 14:52:52 +03:00