update VerRule validation

Author: Mr-Leshiy

rust/signed_doc/src/validator/rules/mod.rs

@@ -63,7 +63,7 @@ impl Rules {
     {
         let rules = [
             self.id.check(doc, provider).boxed(),
-            self.ver.check(doc).boxed(),
+            self.ver.check(doc, provider).boxed(),
             self.content_type.check(doc).boxed(),
             self.content_encoding.check(doc).boxed(),
             self.content.check(doc, provider).boxed(),

rust/signed_doc/src/validator/rules/ver.rs

@@ -1,6 +1,8 @@
 //! Validator for Signed Document Version
 
-use crate::CatalystSignedDocument;
+use crate::{
+    providers::CatalystSignedDocumentProvider, CatalystSignedDocument, DocLocator, DocumentRef,
+};
 
 /// Signed Document `ver` field validation rule
 pub(crate) struct VerRule;
@@ -9,10 +11,14 @@ impl VerRule {
     /// Validates document `ver` field on the timestamps:
     /// 1. document `ver` cannot be smaller than document `id` field
     #[allow(clippy::unused_async)]
-    pub(crate) async fn check(
+    pub(crate) async fn check<Provider>(
         &self,
         doc: &CatalystSignedDocument,
-    ) -> anyhow::Result<bool> {
+        provider: &Provider,
+    ) -> anyhow::Result<bool>
+    where
+        Provider: CatalystSignedDocumentProvider,
+    {
         let Ok(id) = doc.doc_id() else {
             doc.report().missing_field(
                 "id",
@@ -28,17 +34,30 @@ impl VerRule {
             return Ok(false);
         };
 
+        let mut is_valid = true;
+
         if ver < id {
             doc.report().invalid_value(
                 "ver",
                 &ver.to_string(),
                 "ver < id",
                 &format!("Document Version {ver} cannot be smaller than Document ID {id}"),
             );
-            return Ok(false);
+            is_valid = false;
+        }
+
+        if ver != id {
+            let first_submited_doc = DocumentRef::new(id, id, DocLocator::default());
+            if provider.try_get_doc(&first_submited_doc).await?.is_none() {
+                doc.report().functional_validation(
+                    &format!("`ver` and `id` are not equal, ver: {ver}, id: {id}. Document with `id` and `ver` being equal MUST exist"),
+                    "Cannot get a first version document from the provider, document for which `id` and `ver` are equal.",
+                );
+                is_valid = false;
+            }
         }
 
-        Ok(true)
+        Ok(is_valid)
     }
 }
 
@@ -50,10 +69,13 @@ mod tests {
     use uuid::{Timestamp, Uuid};
 
     use super::*;
-    use crate::{builder::tests::Builder, metadata::SupportedField, UuidV7};
+    use crate::{
+        builder::tests::Builder, metadata::SupportedField,
+        providers::tests::TestCatalystSignedDocumentProvider, UuidV7,
+    };
 
     #[test_case(
-        || {
+        |_| {
             let uuid_v7 = UuidV7::new();
             Builder::new()
                 .with_metadata_field(SupportedField::Id(uuid_v7))
@@ -64,15 +86,21 @@ mod tests {
         "`ver` and `id` are equal"
     )]
     #[test_case(
-        || {
+        |provider| {
             let now = SystemTime::now()
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap()
                 .as_secs();
-            let ver = Uuid::new_v7(Timestamp::from_unix_time(now + 1, 0, 0, 0))
+            let id = Uuid::new_v7(Timestamp::from_unix_time(now - 1, 0, 0, 0))
                 .try_into()
                 .unwrap();
-            let id = Uuid::new_v7(Timestamp::from_unix_time(now - 1, 0, 0, 0))
+            let first_doc = Builder::new()
+                .with_metadata_field(SupportedField::Id(id))
+                .with_metadata_field(SupportedField::Ver(id))
+                .build();
+            provider.add_document(None, &first_doc).unwrap();
+
+            let ver = Uuid::new_v7(Timestamp::from_unix_time(now + 1, 0, 0, 0))
                 .try_into()
                 .unwrap();
             Builder::new()
@@ -84,15 +112,41 @@ mod tests {
         "`ver` greater than `id` are equal"
     )]
     #[test_case(
-        || {
+        |provider| {
+            let now = SystemTime::now()
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap()
+            .as_secs();
+            let id = Uuid::new_v7(Timestamp::from_unix_time(now - 1, 0, 0, 0))
+                .try_into()
+                .unwrap();
+            let first_doc = Builder::new()
+                .with_metadata_field(SupportedField::Id(id))
+                .with_metadata_field(SupportedField::Ver(id))
+                .build();
+            provider.add_document(None, &first_doc).unwrap();
+
+            let ver = Uuid::new_v7(Timestamp::from_unix_time(now - 1, 0, 0, 0))
+                .try_into()
+                .unwrap();
+            Builder::new()
+                .with_metadata_field(SupportedField::Id(id))
+                .with_metadata_field(SupportedField::Ver(ver))
+                .build()
+        }
+        => false;
+        "`ver` less than `id` are equal"
+    )]
+    #[test_case(
+        |_| {
             let now = SystemTime::now()
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap()
                 .as_secs();
-            let ver = Uuid::new_v7(Timestamp::from_unix_time(now - 1, 0, 0, 0))
+            let id = Uuid::new_v7(Timestamp::from_unix_time(now - 1, 0, 0, 0))
                 .try_into()
                 .unwrap();
-            let id = Uuid::new_v7(Timestamp::from_unix_time(now + 1, 0, 0, 0))
+            let ver = Uuid::new_v7(Timestamp::from_unix_time(now + 1, 0, 0, 0))
                 .try_into()
                 .unwrap();
             Builder::new()
@@ -101,10 +155,10 @@ mod tests {
                 .build()
         }
         => false;
-        "`ver` less than `id` are equal"
+        "missing first version document"
     )]
     #[test_case(
-        || {
+        |_| {
             Builder::new()
                 .with_metadata_field(SupportedField::Id(UuidV7::new()))
                 .build()
@@ -113,7 +167,7 @@ mod tests {
         "missing `ver` field"
     )]
     #[test_case(
-        || {
+        |_| {
             Builder::new()
                 .with_metadata_field(SupportedField::Ver(UuidV7::new()))
                 .build()
@@ -122,9 +176,12 @@ mod tests {
         "missing `id` field"
     )]
     #[tokio::test]
-    async fn ver_test(doc_gen: impl FnOnce() -> CatalystSignedDocument) -> bool {
-        let doc = doc_gen();
+    async fn ver_test(
+        doc_gen: impl FnOnce(&mut TestCatalystSignedDocumentProvider) -> CatalystSignedDocument
+    ) -> bool {
+        let mut provider = TestCatalystSignedDocumentProvider::default();
+        let doc = doc_gen(&mut provider);
 
-        VerRule.check(&doc).await.unwrap()
+        VerRule.check(&doc, &provider).await.unwrap()
     }
 }