summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2019-01-18 14:38:08 -0800
committerBryan Newbold <bnewbold@robocracy.org>2019-01-18 14:38:08 -0800
commit2366e0fd8d3a69ec0b01557c3588d70c62967726 (patch)
tree499f251c10a38981a88b29797436595d5dadf201
parent0ba79827d71d33b542ec71e4542c2be3ebbb66e7 (diff)
downloadfatcat-2366e0fd8d3a69ec0b01557c3588d70c62967726.tar.gz
fatcat-2366e0fd8d3a69ec0b01557c3588d70c62967726.zip
impl cdx timestamps as datetime
-rw-r--r--rust/src/database_models.rs6
-rw-r--r--rust/src/database_schema.rs2
-rw-r--r--rust/tests/test_api_server_http.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/rust/src/database_models.rs b/rust/src/database_models.rs
index ce804c50..7f574893 100644
--- a/rust/src/database_models.rs
+++ b/rust/src/database_models.rs
@@ -3,7 +3,7 @@
use crate::database_schema::*;
use crate::errors::*;
use crate::identifiers::uuid2fcid;
-use chrono;
+use chrono::Utc;
use fatcat_api_spec::models::{
ChangelogEntry, Editgroup, EditgroupAnnotation, Editor, EntityEdit, ReleaseRef,
};
@@ -307,7 +307,7 @@ pub struct WebcaptureRevCdxRow {
pub id: i64,
pub webcapture_rev: Uuid,
pub surt: String,
- pub timestamp: String,
+ pub timestamp: chrono::DateTime<Utc>,
pub url: String,
pub mimetype: Option<String>,
pub status_code: Option<i64>,
@@ -320,7 +320,7 @@ pub struct WebcaptureRevCdxRow {
pub struct WebcaptureRevCdxNewRow {
pub webcapture_rev: Uuid,
pub surt: String,
- pub timestamp: String,
+ pub timestamp: chrono::DateTime<Utc>,
pub url: String,
pub mimetype: Option<String>,
pub status_code: Option<i64>,
diff --git a/rust/src/database_schema.rs b/rust/src/database_schema.rs
index 0a067a10..69b8c342 100644
--- a/rust/src/database_schema.rs
+++ b/rust/src/database_schema.rs
@@ -359,7 +359,7 @@ table! {
id -> Int8,
webcapture_rev -> Uuid,
surt -> Text,
- timestamp -> Text,
+ timestamp -> Timestamptz,
url -> Text,
mimetype -> Nullable<Text>,
status_code -> Nullable<Int8>,
diff --git a/rust/tests/test_api_server_http.rs b/rust/tests/test_api_server_http.rs
index b2f72f4a..66f36a14 100644
--- a/rust/tests/test_api_server_http.rs
+++ b/rust/tests/test_api_server_http.rs
@@ -694,7 +694,7 @@ fn test_post_webcapture() {
"timestamp": "2018-12-28T05:06:07Z",
"cdx": [
{"surt": "org,asheesh,)/robots.txt",
- "timestamp": "20181228050607",
+ "timestamp": "2018-12-28T05:06:07Z",
"url": "https://asheesh.org/robots.txt",
"status_code": 200,
"mimetype": "text/html",