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

feat: include time for from timestamp #356

Merged
merged 2 commits into from
Dec 19, 2024
Merged

feat: include time for from timestamp #356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc80480
feat: include time for from timestamp
speed2exe Dec 19, 2024
64fb057
feat: new function from timestamp include time
speed2exe Dec 19, 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
29 changes: 24 additions & 5 deletions collab-database/src/fields/type_option/date_type_option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ impl TypeOptionCellReader for DateTypeOption {
impl TypeOptionCellWriter for DateTypeOption {
fn convert_json_to_cell(&self, json_value: Value) -> Cell {
let date_cell_data: DateCellData = match json_value {
Value::Number(number) => DateCellData::from_timestamp(number.as_i64().unwrap_or_default()),
Value::Number(number) => {
DateCellData::from_timestamp_include_time(number.as_i64().unwrap_or_default())
},
Value::String(s) => {
// try rfc3339 format
if let Ok(date) = chrono::DateTime::parse_from_rfc3339(&s) {
DateCellData::from_timestamp(date.timestamp())
DateCellData::from_timestamp_include_time(date.timestamp())
} else {
// try naive time
if let Ok(Some(date)) = self.naive_time_from_time_string(true, Some(&s)) {
Expand All @@ -173,7 +175,9 @@ impl TypeOptionCellWriter for DateTypeOption {
.unwrap();
start_of_day.timestamp()
};
DateCellData::from_timestamp(start_of_day_ts + seconds_since_midnight as i64)
DateCellData::from_timestamp_include_time(
start_of_day_ts + seconds_since_midnight as i64,
)
} else {
// try to parse as json
if let Ok(date_cell_data_obj) = serde_json::from_str::<Value>(&s) {
Expand Down Expand Up @@ -450,6 +454,10 @@ impl DateCellData {
reminder_id: String::new(),
}
}

pub fn from_timestamp_include_time(timestamp: i64) -> Self {
Self::new(timestamp, true, false, String::new())
}
}

impl From<&Cell> for DateCellData {
Expand Down Expand Up @@ -788,17 +796,28 @@ mod tests {
}
{
// enconded json
let str = serde_json::to_string(&DateCellData::from_timestamp(1570864850)).unwrap();
let str =
serde_json::to_string(&DateCellData::from_timestamp_include_time(1570864850)).unwrap();
let cell: Cell = cell_writer.convert_json_to_cell(Value::String(str));
let data = cell.get_as::<String>(CELL_DATA).unwrap();
assert_eq!(data, "1570864850");
}
{
// json
let js_val = serde_json::to_value(DateCellData::from_timestamp(1570864850)).unwrap();
let js_val =
serde_json::to_value(DateCellData::from_timestamp_include_time(1570864850)).unwrap();
let cell: Cell = cell_writer.convert_json_to_cell(js_val);
let data = cell.get_as::<String>(CELL_DATA).unwrap();
assert_eq!(data, "1570864850");
}
}

#[test]
fn date_from_timestamp_include_time() {
let date_type_option = DateTypeOption::default_utc();
let date_cell = DateCellData::from_timestamp_include_time(1570864850);
assert!(date_cell.include_time);
let str = date_type_option.stringify_cell(&Cell::from(&date_cell));
assert_eq!(str, "Oct 12, 2019 07:20");
}
}
Loading