Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nhsn/delphi_nhsn/pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def check_last_updated(socrata_token, dataset_id, logger):
client = Socrata("data.cdc.gov", socrata_token)
response = client.get_metadata(dataset_id)

updated_timestamp = datetime.utcfromtimestamp(int(response["rowsUpdatedAt"]))
updated_timestamp = datetime.utcfromtimestamp(int(response["viewLastModified"]))
now = datetime.utcnow()
recently_updated_source = (now - updated_timestamp) < timedelta(days=1)

Expand Down
2 changes: 1 addition & 1 deletion nhsn/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ def side_effect(*args, **kwargs):
else:
return []
mock_get.side_effect = side_effect
mock_get_metadata.return_value = {"rowsUpdatedAt": time.time()}
mock_get_metadata.return_value = {"viewLastModified": time.time()}
run_module(params)

6 changes: 3 additions & 3 deletions nhsn/tests/test_pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def test_pull_nhsn_data_output(self, mock_create_backup, mock_socrata, dataset,
mock_client = MagicMock()
mock_socrata.return_value = mock_client
mock_client.get.side_effect = [dataset["test_data"],[]]
mock_client.get_metadata.return_value = {"rowsUpdatedAt": now}
mock_client.get_metadata.return_value = {"viewLastModified": now}

backup_dir = params["common"]["backup_dir"]
test_token = params["indicator"]["socrata_token"]
Expand Down Expand Up @@ -123,7 +123,7 @@ def test_pull_nhsn_data_backup(self, mock_socrata, dataset, caplog, params):
mock_socrata.return_value = mock_client
mock_client.get.side_effect = [dataset["test_data"], []]

mock_client.get_metadata.return_value = {"rowsUpdatedAt": now}
mock_client.get_metadata.return_value = {"viewLastModified": now}

today = pd.Timestamp.today().strftime("%Y%m%d")
backup_dir = params["common"]["backup_dir"]
Expand Down Expand Up @@ -163,7 +163,7 @@ def test_pull_nhsn_data_backup(self, mock_socrata, dataset, caplog, params):
def test_check_last_updated(self, mock_socrata, dataset, updatedAt, caplog):
mock_client = MagicMock()
mock_socrata.return_value = mock_client
mock_client.get_metadata.return_value = {"rowsUpdatedAt": updatedAt }
mock_client.get_metadata.return_value = {"viewLastModified": updatedAt }
logger = get_structured_logger()

check_last_updated(mock_client, dataset["id"], logger)
Expand Down