From 4054521a4de550730f4be7fe968f1016478f0737 Mon Sep 17 00:00:00 2001 From: Jens Reimann Date: Fri, 6 Dec 2024 15:41:59 +0100 Subject: [PATCH] chore: change name of the field Co-authored-by: Jim Crossley --- entity/src/source_document.rs | 2 +- migration/src/m0000780_alter_source_document_time.rs | 6 +++--- modules/fundamental/src/source_document/model/mod.rs | 4 ++-- modules/ingestor/src/graph/advisory/mod.rs | 2 +- modules/ingestor/src/graph/sbom/mod.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/entity/src/source_document.rs b/entity/src/source_document.rs index b3dff159b..b9953686d 100644 --- a/entity/src/source_document.rs +++ b/entity/src/source_document.rs @@ -9,7 +9,7 @@ pub struct Model { pub sha384: String, pub sha512: String, pub size: i64, - pub ingestion_time: time::OffsetDateTime, + pub ingested: time::OffsetDateTime, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] diff --git a/migration/src/m0000780_alter_source_document_time.rs b/migration/src/m0000780_alter_source_document_time.rs index 8695280d3..69ae3596a 100644 --- a/migration/src/m0000780_alter_source_document_time.rs +++ b/migration/src/m0000780_alter_source_document_time.rs @@ -12,7 +12,7 @@ impl MigrationTrait for Migration { Table::alter() .table(SourceDocument::Table) .add_column( - ColumnDef::new(SourceDocument::IngestionTime) + ColumnDef::new(SourceDocument::Ingested) .timestamp_with_time_zone() .default(Func::cust(Now)) .not_null() @@ -30,7 +30,7 @@ impl MigrationTrait for Migration { .alter_table( Table::alter() .table(SourceDocument::Table) - .drop_column(SourceDocument::IngestionTime) + .drop_column(SourceDocument::Ingested) .to_owned(), ) .await?; @@ -42,5 +42,5 @@ impl MigrationTrait for Migration { #[derive(DeriveIden)] enum SourceDocument { Table, - IngestionTime, + Ingested, } diff --git a/modules/fundamental/src/source_document/model/mod.rs b/modules/fundamental/src/source_document/model/mod.rs index 322e098dc..64d0236a8 100644 --- a/modules/fundamental/src/source_document/model/mod.rs +++ b/modules/fundamental/src/source_document/model/mod.rs @@ -15,7 +15,7 @@ pub struct SourceDocument { pub size: u64, /// The timestamp the document was ingested #[serde(with = "time::serde::rfc3339")] - pub ingestion_time: OffsetDateTime, + pub ingested: OffsetDateTime, } impl SourceDocument { @@ -25,7 +25,7 @@ impl SourceDocument { sha384: format!("sha384:{}", source_document.sha384), sha512: format!("sha512:{}", source_document.sha512), size: source_document.size as u64, - ingestion_time: source_document.ingestion_time, + ingested: source_document.ingested, }) } } diff --git a/modules/ingestor/src/graph/advisory/mod.rs b/modules/ingestor/src/graph/advisory/mod.rs index 452ee7b6c..b00f47046 100644 --- a/modules/ingestor/src/graph/advisory/mod.rs +++ b/modules/ingestor/src/graph/advisory/mod.rs @@ -142,7 +142,7 @@ impl Graph { sha384: Set(digests.sha384.encode_hex()), sha512: Set(digests.sha512.encode_hex()), size: Set(digests.size as i64), - ingestion_time: sea_orm::Set(OffsetDateTime::now_utc()), + ingested: sea_orm::Set(OffsetDateTime::now_utc()), }; let doc = doc_model.insert(connection).await?; diff --git a/modules/ingestor/src/graph/sbom/mod.rs b/modules/ingestor/src/graph/sbom/mod.rs index 22a8eed6b..63ba1d846 100644 --- a/modules/ingestor/src/graph/sbom/mod.rs +++ b/modules/ingestor/src/graph/sbom/mod.rs @@ -124,7 +124,7 @@ impl Graph { sha384: Set(digests.sha384.encode_hex()), sha512: Set(digests.sha512.encode_hex()), size: Set(digests.size as i64), - ingestion_time: Set(OffsetDateTime::now_utc()), + ingested: Set(OffsetDateTime::now_utc()), }; let doc = doc_model.insert(connection).await?;