Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle dates before 1900 during indexing (py2 only) #2256

Merged
merged 1 commit into from Jul 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -8,6 +8,7 @@
- Ensures that date ranges are always positive (ie. `start` < `end`) [#2253](https://github.com/opendatateam/udata/pull/2253)
- Enable completion on the "`MIME type`" resource form field (needs reindexing) [#2238](https://github.com/opendatateam/udata/pull/2238)
- Ensure oembed rendering errors are not hidden by default error handlers and have cors headers [#2254](https://github.com/opendatateam/udata/pull/2254)
- Handle dates before 1900 during indexing [#2256](https://github.com/opendatateam/udata/pull/2256)

## 1.6.13 (2019-07-11)

Expand Down
17 changes: 8 additions & 9 deletions udata/core/dataset/search.py
Expand Up @@ -5,23 +5,23 @@
Boolean, Completion, Date, Long, Object, String, Nested
)

from udata.i18n import lazy_gettext as _
from udata.core.site.models import current_site
from udata.core.spatial.models import (
admin_levels, spatial_granularities, ADMIN_LEVEL_MAX
)
from udata.i18n import lazy_gettext as _
from udata.models import (
Dataset, Organization, License, User, GeoZone, RESOURCE_TYPES
)
from udata.search import (
ModelSearchAdapter, i18n_analyzer, metrics_mapping_for, register,
)
from udata.search.analysis import simple
from udata.search.fields import (
TermsFacet, ModelTermsFacet, RangeFacet, TemporalCoverageFacet,
BoolBooster, GaussDecay, BoolFacet, ValueFactor
)
from udata.search.analysis import simple

from udata.core.spatial.models import (
admin_levels, spatial_granularities, ADMIN_LEVEL_MAX
)
from udata.utils import to_iso_datetime

# Metrics are require for dataset search
from . import metrics # noqa
Expand Down Expand Up @@ -234,9 +234,8 @@ def serialize(cls, dataset):
'image_url': image_url,
},
},
'created': dataset.created_at.strftime('%Y-%m-%dT%H:%M:%S'),
'last_modified': dataset.last_modified.strftime(
'%Y-%m-%dT%H:%M:%S'),
'created': to_iso_datetime(dataset.created_at),
'last_modified': to_iso_datetime(dataset.last_modified),
'metrics': dataset.metrics,
'featured': dataset.featured,
'from_certified': certified,
Expand Down
9 changes: 5 additions & 4 deletions udata/core/organization/search.py
Expand Up @@ -3,12 +3,13 @@

from elasticsearch_dsl import Completion, Date, String

from udata.i18n import lazy_gettext as _
from udata import search
from udata.search.fields import TermsFacet, RangeFacet
from udata.models import Organization
from udata.core.site.models import current_site
from udata.i18n import lazy_gettext as _
from udata.models import Organization
from udata.search.analysis import simple
from udata.search.fields import TermsFacet, RangeFacet
from udata.utils import to_iso_datetime

from . import metrics # noqa: Metrics are need for the mapping

Expand Down Expand Up @@ -120,7 +121,7 @@ def serialize(cls, organization):
'url': organization.url,
'metrics': organization.metrics,
'badges': [badge.kind for badge in organization.badges],
'created': organization.created_at.strftime('%Y-%m-%dT%H:%M:%S'),
'created': to_iso_datetime(organization.created_at),
'org_suggest': {
'input': completions,
'output': str(organization.id),
Expand Down
5 changes: 3 additions & 2 deletions udata/core/reuse/search.py
Expand Up @@ -14,6 +14,7 @@
RangeFacet, TermsFacet, ModelTermsFacet, BoolFacet
)
from udata.search.analysis import simple
from udata.utils import to_iso_datetime

from . import metrics # noqa: Metrics are require for reuse search

Expand Down Expand Up @@ -152,8 +153,8 @@ def serialize(cls, reuse):
'tags': reuse.tags,
'tag_suggest': reuse.tags,
'badges': [badge.kind for badge in reuse.badges],
'created': reuse.created_at.strftime('%Y-%m-%dT%H:%M:%S'),
'last_modified': reuse.last_modified.strftime('%Y-%m-%dT%H:%M:%S'),
'created': to_iso_datetime(reuse.created_at),
'last_modified': to_iso_datetime(reuse.last_modified),
'dataset': [{
'id': str(d.id),
'title': d.title
Expand Down
3 changes: 2 additions & 1 deletion udata/core/user/search.py
Expand Up @@ -10,6 +10,7 @@
from udata.search.fields import ModelTermsFacet, RangeFacet
from udata.search.fields import GaussDecay
from udata.search.analysis import simple
from udata.utils import to_iso_datetime

# Metrics are required for user search
from . import metrics # noqa
Expand Down Expand Up @@ -86,7 +87,7 @@ def serialize(cls, user):
'about': user.about,
'organizations': [str(o.id) for o in user.organizations],
'metrics': user.metrics,
'created': user.created_at.strftime('%Y-%m-%dT%H:%M:%S'),
'created': to_iso_datetime(user.created_at),
'user_suggest': {
'input': cls.completer_tokenize(user.fullname) + [user.id],
'output': str(user.id),
Expand Down