Rewrite embed()

profile/src/v100/entity/persona/persona_data/collection_of_identified_entries.rs

@@ -1,12 +1,11 @@
+use super::identified_entry::IdentifiedEntry;
 use identified_vec::{Error, Identifiable, IdentifiedVec, IdentifiedVecOf};
 use serde::{Deserialize, Serialize};
 use std::{
     fmt::{Debug, Display},
     ops::Add,
 };
 
-use super::identified_entry::IdentifiedEntry;
-
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Hash)]
 pub struct CollectionOfIdentifiedEntries<T>
 where

profile/src/v100/entity/persona/persona_data/entry.rs

@@ -6,7 +6,7 @@ use super::entry_kinds::{
 use serde::{Deserialize, Serialize};
 
 pub trait BasePersonaDataEntry {
-    fn embed(&self) -> Self;
+    fn embed(&self) -> Entry;
     fn description(&self) -> String;
 }
 
@@ -26,14 +26,14 @@ pub enum Entry {
 impl BasePersonaDataEntry for Entry {
     fn embed(&self) -> Self {
         match self {
-            Self::Name(name) => Self::Name(name.embed()),
-            Self::CompanyName(company) => Self::CompanyName(company.embed()),
-            Self::CreditCard(credit_card) => Self::CreditCard(credit_card.embed()),
-            Self::DateOfBirth(date_of_birth) => Self::DateOfBirth(date_of_birth.embed()),
-            Self::EmailAddress(email_address) => Self::EmailAddress(email_address.embed()),
-            Self::PhoneNumber(phone_number) => Self::PhoneNumber(phone_number.embed()),
-            Self::PostalAddress(postal_address) => Self::PostalAddress(postal_address.embed()),
-            Self::Url(url) => Self::Url(url.embed()),
+            Self::Name(name) => name.embed(),
+            Self::CompanyName(company) => company.embed(),
+            Self::CreditCard(credit_card) => credit_card.embed(),
+            Self::DateOfBirth(date_of_birth) => date_of_birth.embed(),
+            Self::EmailAddress(email_address) => email_address.embed(),
+            Self::PhoneNumber(phone_number) => phone_number.embed(),
+            Self::PostalAddress(postal_address) => postal_address.embed(),
+            Self::Url(url) => url.embed(),
         }
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/associated_url.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct AssociatedURL {}
 
 impl BasePersonaDataEntry for AssociatedURL {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/company_name.rs

@@ -1,11 +1,13 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
-pub struct CompanyName {}
+pub struct CompanyName {
+    name: String,
+}
 
 impl BasePersonaDataEntry for CompanyName {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/credit_card.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct CreditCard {}
 
 impl BasePersonaDataEntry for CreditCard {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/date_of_birth.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct DateOfBirth {}
 
 impl BasePersonaDataEntry for DateOfBirth {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/email_address.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct EmailAddress {}
 
 impl BasePersonaDataEntry for EmailAddress {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/name.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct Name {}
 
 impl BasePersonaDataEntry for Name {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/phone_number.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct PhoneNumber {}
 
 impl BasePersonaDataEntry for PhoneNumber {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/entry_kinds/postal_address.rs

@@ -1,11 +1,11 @@
-use crate::v100::entity::persona::persona_data::entry::BasePersonaDataEntry;
+use crate::v100::entity::persona::persona_data::entry::{BasePersonaDataEntry, Entry};
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 pub struct PostalAddress {}
 
 impl BasePersonaDataEntry for PostalAddress {
-    fn embed(&self) -> Self {
+    fn embed(&self) -> Entry {
         self.embed()
     }
 

profile/src/v100/entity/persona/persona_data/identified_entry.rs

@@ -33,15 +33,6 @@ impl<T> IdentifiedEntry<T> {
     }
 }
 
-// impl<T: Identifiable> IdentifiedEntry<T> {
-//     pub fn placeholder_with_values(value: T) -> Self {
-//         Self {
-//             id: Uuid::from(T::id(&T)),
-//             value,
-//         }
-//     }
-// }
-
 #[cfg(test)]
 struct User {
     id: Uuid,

profile/src/v100/entity/persona/persona_data/persona_data.rs

@@ -9,7 +9,6 @@ use super::{
     identified_entry::IdentifiedEntry,
 };
 
-//Need to implement https://github.com/radixdlt/babylon-wallet-ios/blob/main/RadixWallet/Profile/Entity/PersonaData/PersonaData.swift
 #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, Eq, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct PersonaData {