cleanup

Author: Mr-Leshiy

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

@@ -77,45 +77,21 @@ impl DocumentOwnershipRule {
         }
 
         let mut allowed_authors = HashSet::new();
-        if let DocumentOwnershipRule::RefFieldBased = self {
-            let Some(doc_ref) = doc.doc_meta().doc_ref() else {
-                doc.report().missing_field("ref", REPORT_CONTEXT);
-                return Ok(false);
-            };
-            let &[ref doc_ref] = doc_ref.as_slice() else {
-                doc.report()
-                    .other("'ref' field cannot have multiple values", REPORT_CONTEXT);
-                return Ok(false);
-            };
-            let Some(first_ref_doc) = provider.try_get_first_doc(*doc_ref.id()).await? else {
-                doc.report().other(
-                    "Cannot find a first version of the referenced document",
-                    REPORT_CONTEXT,
-                );
-                return Ok(false);
-            };
-            allowed_authors.extend(first_ref_doc.authors());
-
-            let last_doc =
-                provider
-                    .try_get_last_doc(*doc_ref.id())
+        match self {
+            Self::OriginalAuthor => {
+                let first_doc = provider
+                    .try_get_first_doc(doc_id)
                     .await?
-                    .ok_or(anyhow::anyhow!(
-                        "A latest version of the document must exist if a first version exists"
-                    ))?;
-
-            allowed_authors.extend(
-                last_doc
-                    .doc_meta()
-                    .collaborators()
-                    .iter()
-                    .map(CatalystId::as_short_id),
-            );
-        } else if let Some(first_doc) = provider.try_get_first_doc(doc_id).await? {
-            allowed_authors.extend(first_doc.authors());
+                    .ok_or(anyhow::anyhow!("cannot get a first version document"))?;
+                allowed_authors.extend(first_doc.authors());
+            },
+            Self::CollaboratorsFieldBased => {
+                let first_doc = provider
+                    .try_get_first_doc(doc_id)
+                    .await?
+                    .ok_or(anyhow::anyhow!("cannot get a first version document"))?;
+                allowed_authors.extend(first_doc.authors());
 
-            if let DocumentOwnershipRule::CollaboratorsFieldBased = self {
-                // This a new version of an existing `doc_id`
                 let last_doc = provider
                     .try_get_last_doc(doc_id)
                     .await?
@@ -130,7 +106,42 @@ impl DocumentOwnershipRule {
                         .iter()
                         .map(CatalystId::as_short_id),
                 );
-            }
+            },
+            Self::RefFieldBased => {
+                let Some(doc_ref) = doc.doc_meta().doc_ref() else {
+                    doc.report().missing_field("ref", REPORT_CONTEXT);
+                    return Ok(false);
+                };
+                let &[ref doc_ref] = doc_ref.as_slice() else {
+                    doc.report()
+                        .other("'ref' field cannot have multiple values", REPORT_CONTEXT);
+                    return Ok(false);
+                };
+                let Some(first_ref_doc) = provider.try_get_first_doc(*doc_ref.id()).await? else {
+                    doc.report().other(
+                        "Cannot find a first version of the referenced document",
+                        REPORT_CONTEXT,
+                    );
+                    return Ok(false);
+                };
+                allowed_authors.extend(first_ref_doc.authors());
+
+                let last_doc =
+                    provider
+                        .try_get_last_doc(*doc_ref.id())
+                        .await?
+                        .ok_or(anyhow::anyhow!(
+                            "A latest version of the document must exist if a first version exists"
+                        ))?;
+
+                allowed_authors.extend(
+                    last_doc
+                        .doc_meta()
+                        .collaborators()
+                        .iter()
+                        .map(CatalystId::as_short_id),
+                );
+            },
         }
 
         let doc_authors = doc.authors().into_iter().collect::<HashSet<_>>();