update ExtraField

Author: Mr-Leshiy

rust/signed_doc/src/lib.rs

@@ -222,10 +222,10 @@ mod tests {
             "template": {"id": uuid_v7.to_string()},
             "section": section,
             "collabs": collabs,
-            "campaign_id": uuid_v4.to_string(),
-            "election_id":  uuid_v4.to_string(),
-            "brand_id":  uuid_v4.to_string(),
-            "category_id": uuid_v4.to_string(),
+            "campaign_id": {"id": uuid_v7.to_string()},
+            "election_id":  {"id": uuid_v7.to_string()},
+            "brand_id":  {"id": uuid_v7.to_string()},
+            "category_id": {"id": uuid_v7.to_string()},
         }))
         .unwrap();
         let content = vec![1, 2, 4, 5, 6, 7, 8, 9];

rust/signed_doc/src/metadata/extra_fields.rs

@@ -3,7 +3,7 @@
 use anyhow::anyhow;
 use coset::{cbor::Value, Label, ProtectedHeader};
 
-use super::{cose_protected_header_find, decode_cbor_uuid, encode_cbor_uuid, DocumentRef, UuidV4};
+use super::{cose_protected_header_find, DocumentRef};
 
 /// `ref` field COSE key value
 const REF_KEY: &str = "ref";
@@ -46,16 +46,16 @@ pub struct ExtraFields {
     collabs: Vec<String>,
     /// Unique identifier for the brand that is running the voting.
     #[serde(skip_serializing_if = "Option::is_none")]
-    brand_id: Option<UuidV4>,
+    brand_id: Option<DocumentRef>,
     /// Unique identifier for the campaign of voting.
     #[serde(skip_serializing_if = "Option::is_none")]
-    campaign_id: Option<UuidV4>,
+    campaign_id: Option<DocumentRef>,
     /// Unique identifier for the election.
     #[serde(skip_serializing_if = "Option::is_none")]
-    election_id: Option<UuidV4>,
+    election_id: Option<DocumentRef>,
     /// Unique identifier for the voting category as a collection of proposals.
     #[serde(skip_serializing_if = "Option::is_none")]
-    category_id: Option<UuidV4>,
+    category_id: Option<DocumentRef>,
 }
 
 impl ExtraFields {
@@ -91,25 +91,25 @@ impl ExtraFields {
 
     /// Return `brand_id` field.
     #[must_use]
-    pub fn brand_id(&self) -> Option<UuidV4> {
+    pub fn brand_id(&self) -> Option<DocumentRef> {
         self.brand_id
     }
 
     /// Return `campaign_id` field.
     #[must_use]
-    pub fn campaign_id(&self) -> Option<UuidV4> {
+    pub fn campaign_id(&self) -> Option<DocumentRef> {
         self.campaign_id
     }
 
     /// Return `election_id` field.
     #[must_use]
-    pub fn election_id(&self) -> Option<UuidV4> {
+    pub fn election_id(&self) -> Option<DocumentRef> {
         self.election_id
     }
 
     /// Return `category_id` field.
     #[must_use]
-    pub fn category_id(&self) -> Option<UuidV4> {
+    pub fn category_id(&self) -> Option<DocumentRef> {
         self.category_id
     }
 
@@ -138,22 +138,22 @@ impl ExtraFields {
             );
         }
         if let Some(brand_id) = &self.brand_id {
-            builder = builder.text_value(BRAND_ID_KEY.to_string(), encode_cbor_uuid(brand_id)?);
+            builder = builder.text_value(BRAND_ID_KEY.to_string(), Value::try_from(*brand_id)?);
         }
 
         if let Some(campaign_id) = &self.campaign_id {
             builder =
-                builder.text_value(CAMPAIGN_ID_KEY.to_string(), encode_cbor_uuid(campaign_id)?);
+                builder.text_value(CAMPAIGN_ID_KEY.to_string(), Value::try_from(*campaign_id)?);
         }
 
         if let Some(election_id) = &self.election_id {
             builder =
-                builder.text_value(ELECTION_ID_KEY.to_string(), encode_cbor_uuid(election_id)?);
+                builder.text_value(ELECTION_ID_KEY.to_string(), Value::try_from(*election_id)?);
         }
 
         if let Some(category_id) = &self.category_id {
             builder =
-                builder.text_value(CATEGORY_ID_KEY.to_string(), encode_cbor_uuid(*category_id)?);
+                builder.text_value(CATEGORY_ID_KEY.to_string(), Value::try_from(*category_id)?);
         }
         Ok(builder)
     }
@@ -258,7 +258,7 @@ impl TryFrom<&ProtectedHeader> for ExtraFields {
         if let Some(cbor_doc_brand_id) = cose_protected_header_find(protected, |key| {
             key == &Label::Text(BRAND_ID_KEY.to_string())
         }) {
-            match decode_cbor_uuid(cbor_doc_brand_id.clone()) {
+            match DocumentRef::try_from(cbor_doc_brand_id) {
                 Ok(brand_id) => {
                     extra.brand_id = Some(brand_id);
                 },
@@ -273,7 +273,7 @@ impl TryFrom<&ProtectedHeader> for ExtraFields {
         if let Some(cbor_doc_campaign_id) = cose_protected_header_find(protected, |key| {
             key == &Label::Text(CAMPAIGN_ID_KEY.to_string())
         }) {
-            match decode_cbor_uuid(cbor_doc_campaign_id.clone()) {
+            match DocumentRef::try_from(cbor_doc_campaign_id) {
                 Ok(campaign_id) => {
                     extra.campaign_id = Some(campaign_id);
                 },
@@ -288,7 +288,7 @@ impl TryFrom<&ProtectedHeader> for ExtraFields {
         if let Some(cbor_doc_election_id) = cose_protected_header_find(protected, |key| {
             key == &Label::Text(ELECTION_ID_KEY.to_string())
         }) {
-            match decode_cbor_uuid(cbor_doc_election_id.clone()) {
+            match DocumentRef::try_from(cbor_doc_election_id) {
                 Ok(election_id) => {
                     extra.election_id = Some(election_id);
                 },
@@ -303,7 +303,7 @@ impl TryFrom<&ProtectedHeader> for ExtraFields {
         if let Some(cbor_doc_category_id) = cose_protected_header_find(protected, |key| {
             key == &Label::Text(CATEGORY_ID_KEY.to_string())
         }) {
-            match decode_cbor_uuid(cbor_doc_category_id.clone()) {
+            match DocumentRef::try_from(cbor_doc_category_id) {
                 Ok(category_id) => {
                     extra.category_id = Some(category_id);
                 },