added urls to contacts

icann · Sep 5, 2024 · 9d2820f · 9d2820f
1 parent 59d690e
commit 9d2820f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/icann-rdap-client/src/md/entity.rs b/icann-rdap-client/src/md/entity.rs
@@ -51,7 +51,8 @@ impl ToMd for Entity {
                 .and_data_ul(&"Languages", contact.langs)
                 .and_data_ul(&"Phones", contact.phones)
                 .and_data_ul(&"Emails", contact.emails)
-                .and_data_ul(&"Web Contact", contact.contact_uris);
+                .and_data_ul(&"Web Contact", contact.contact_uris)
+                .and_data_ul(&"URLs", contact.urls);
             table = contact.postal_addresses.add_to_mptable(table, params);
             table = contact.name_parts.add_to_mptable(table, params)
         }

diff --git a/icann-rdap-common/src/contact/from_vcard.rs b/icann-rdap-common/src/contact/from_vcard.rs
@@ -73,6 +73,7 @@ impl Contact {
             .and_postal_addresses(vcard.find_properties("adr").get_postal_addresses())
             .and_name_parts(vcard.find_property("n").get_name_parts())
             .and_contact_uris(vcard.find_properties("contact-uri").get_texts())
+            .and_urls(vcard.find_properties("url").get_texts())
             .build();
 
         contact.is_non_empty().then_some(contact)
@@ -526,11 +527,13 @@ mod tests {
               ],
               ["tz", {},
                 "utc-offset", "-05:00"],
-              ["url", { "type":"home" },
-                "uri", "https://example.org"],
               ["contact-uri", {},
                 "uri",
                 "https://example.com/contact-form"
+              ],
+              ["url", {},
+                "uri",
+                "https://example.com/some-url"
               ]
             ]
           ]
@@ -697,5 +700,15 @@ mod tests {
                 .expect("contact-uris empty"),
             "https://example.com/contact-form"
         );
+
+        // urls
+        assert_eq!(
+            actual
+                .urls
+                .expect("no urls")
+                .first()
+                .expect("urls are empty"),
+            "https://example.com/some-url"
+        );
     }
 }
diff --git a/icann-rdap-common/src/contact/mod.rs b/icann-rdap-common/src/contact/mod.rs
@@ -137,6 +137,9 @@ pub struct Contact {
 
     /// Contact URIs.
     pub contact_uris: Option<Vec<String>>,
+
+    /// URLs
+    pub urls: Option<Vec<String>>,
 }
 
 impl Contact {
@@ -154,6 +157,7 @@ impl Contact {
             || self.emails.is_some()
             || self.phones.is_some()
             || self.contact_uris.is_some()
+            || self.urls.is_some()
     }
 
     /// Set the set of emails.

diff --git a/icann-rdap-common/src/contact/to_vcard.rs b/icann-rdap-common/src/contact/to_vcard.rs
@@ -177,6 +177,12 @@ impl Contact {
             }
         }
 
+        if let Some(urls) = &self.urls {
+            for url in urls {
+                vcard.push(json!(["url", {}, "uri", url]));
+            }
+        }
+
         // return the vcard array
         vec![Value::String("vcard".to_string()), Value::from(vcard)]
     }
@@ -275,6 +281,7 @@ mod tests {
                 .contexts(vec!["work".to_string()])
                 .email("[email protected]")
                 .build()])
+            .urls(vec!["https://example.com/some-url".to_string()])
             .build();
 
         // WHEN
@@ -292,5 +299,6 @@ mod tests {
         assert_eq!(contact.phones, actual.phones);
         assert_eq!(contact.emails, actual.emails);
         assert_eq!(contact.contact_uris, actual.contact_uris);
+        assert_eq!(contact.urls, actual.urls);
     }
 }