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.

Sign up for GitHub

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

Clean date function for TargetExtra #30

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Clean date function for TargetExtra #30

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48d0d45
added clean date function
brendanrmills Jun 24, 2022
d067dfd
targetExtra timezone support
brendanrmills Jul 1, 2022
2cc4a52
added testing for _clean_date
brendanrmills Jul 1, 2022
1bb1572
Update tests.py
jchate6 Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions tom_fink/fink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,8 @@ def fetch_alerts(self, parameters: dict) -> iter:

r.raise_for_status()
data = r.json()
for d in data:
d = self._clean_date(d)

return iter(data)

Expand All @@ -332,8 +334,14 @@ def fetch_alert(self, id: str):
)
r.raise_for_status()
data = r.json()
data = self._clean_date(data)
return data

def _clean_date(self, parameters):
parameters['v:firstdate'] += ' UTC'
parameters['v:lastdate'] += ' UTC'
return parameters

def process_reduced_data(self, target, alert=None):
pass

Expand Down
36 changes: 34 additions & 2 deletions tom_fink/tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,28 @@
from django.test import TestCase

from tom_fink.fink import FinkBroker
# from tom_fink.fink import FinkQueryForm, FinkBroker

test_alert1 = {,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: there should not be comma here

"i:candid": 1333145050315015017,
"i:dec": 36.89327,
"i:objectId": "ZTF18aaavxvj",
"i:publisher": "Fink",
"i:ra": 273.8834457,
"v:classification": "RRLyr",
"v:lastdate": "2020-08-26 03:28:53.003",
"v:firstdate": "2018-02-07 12:46:49.996",
}

test_alert2 = {
"i:candid": 1333145050315015017,
"i:dec": 36.89327,
"i:objectId": "ZTF18aaavxvj",
"i:publisher": "Fink",
"i:ra": 273.8834457,
"v:classification": "RRLyr",
"v:lastdate": "2020-08-26 03:28:53.003 UTC",
"v:firstdate": "2018-02-07 12:46:49.996 UTC",
}

class TestFinkQueryForm(TestCase):
"""
Expand All @@ -15,8 +36,19 @@ def test_boilerplate(self):
self.assertTrue(True)




class TestFinkBrokerClass(TestCase):
"""NOTE: To run these tests in your venv: python ./tom_fink/tests/run_tests.py"""

def setUp(self):
pass
self.test_data = test_alert1
self.expected_alert = test_alert2

def test_clean_date(self):
test_alert = self.test_data
new_alert = FinkBroker()._clean_date(self, test_alert)
self.assertEqual(test_alert, new_alert)