From d7612d825ffefe5f96aa29f9184afdc6611e94b0 Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Wed, 22 Jun 2022 12:51:28 -0700 Subject: [PATCH 1/5] Add created_before and created_after filters to observations endpoint This is useful for scheduler research, since we are trying to bound our queries to a single scheduler run --- observation_portal/observations/filters.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/observation_portal/observations/filters.py b/observation_portal/observations/filters.py index 390874b0..33876a0f 100644 --- a/observation_portal/observations/filters.py +++ b/observation_portal/observations/filters.py @@ -45,6 +45,18 @@ class ObservationFilter(mixins.CustomIsoDateTimeFilterMixin, django_filters.Filt label='Modified After (Inclusive)', widget=forms.TextInput(attrs={'class': 'input', 'type': 'date'}) ) + created_after = django_filters.IsoDateTimeFilter( + field_name='created', + lookup_expr='gte', + label='Created After (Inclusive)', + widget=forms.TextInput(attrs={'class': 'input', 'type': 'date'}) + ) + created_before = django_filters.IsoDateTimeFilter( + field_name='created', + lookup_expr='lt', + label='Created Before', + widget=forms.TextInput(attrs={'class': 'input', 'type': 'date'}) + ) request_id = django_filters.NumberFilter(field_name='request__id') request_group_id = django_filters.NumberFilter(field_name='request__request_group__id', label='Request Group ID') state = django_filters.MultipleChoiceFilter(choices=Observation.STATE_CHOICES, field_name='state') From ee5408e5d6b0c2353127939b46e281be86ab90a8 Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Thu, 23 Jun 2022 09:29:09 -0700 Subject: [PATCH 2/5] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15a0ab76..1aad3d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ This project adheres to semantic versioning. ### Removed +## [4.3.4] - 2022-06-23 + +### Added +- Added range filters for /api/observations `created_time` field + ## [4.3.3] - 2022-05-31 ### Added From 2ca8e8045d441dcafb52c5c909e465c1bcf3daf5 Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Thu, 23 Jun 2022 09:33:00 -0700 Subject: [PATCH 3/5] Fix changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aad3d83..b082954d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ This project adheres to semantic versioning. ### Removed -## [4.3.4] - 2022-06-23 +## [4.4.1] - 2022-06-23 ### Added - Added range filters for /api/observations `created_time` field From 086168e02f1773dfd806f63ed6eb22cdd92378aa Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Thu, 23 Jun 2022 09:38:49 -0700 Subject: [PATCH 4/5] Add missing changelog entry for 4.4.0 --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b082954d..53c4ee8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,12 @@ This project adheres to semantic versioning. ## [4.4.1] - 2022-06-23 ### Added -- Added range filters for /api/observations `created_time` field +- Added range filters for /api/observations `created` datetime field + +## [4.4.0] - 2022-05-14 + +### Changed +- Fix: accept pending proposal invites on bulk user creation ## [4.3.3] - 2022-05-31 From ebb4b9101e2048640cbe9655ad881abfbd38c508 Mon Sep 17 00:00:00 2001 From: Matt Daily Date: Thu, 23 Jun 2022 09:42:35 -0700 Subject: [PATCH 5/5] Fix date in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53c4ee8e..f994eb20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ This project adheres to semantic versioning. ### Added - Added range filters for /api/observations `created` datetime field -## [4.4.0] - 2022-05-14 +## [4.4.0] - 2022-06-14 ### Changed - Fix: accept pending proposal invites on bulk user creation