Adding utoipa to models

src/contact/mod.rs

@@ -2,19 +2,14 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Contact {
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub id: uuid::Uuid,
-    pub id: Option<uuid::Uuid>,
     // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub firstname: String,
-    pub firstname: Option<String>,
     // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub lastname: String,
-    pub lastname: Option<String>,
     // empty?
-    #[serde(skip_serializing_if = "Option::is_none")]
+    pub nickname: String,
-    pub nickname: Option<String>,
     pub phone_number: String,
     // empty
-    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub user_id: uuid::Uuid,
-    pub user_id: Option<uuid::Uuid>,
 }

src/lib.rs

@@ -6,10 +6,7 @@ pub mod token;
 pub mod user;
 
 pub mod init {
-    pub fn is_uuid_nil(uuid: &Option<uuid::Uuid>) -> bool {
+    pub fn is_uuid_nil(uuid: &uuid::Uuid) -> bool {
-        match uuid {
+        uuid.is_nil()
-            Some(id) => id.is_nil(),
-            None => true,
-        }
     }
 }

src/user/mod.rs

@@ -71,7 +71,7 @@ pub struct UserProfile {
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Salt {
-    // #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
     pub id: uuid::Uuid,
     #[serde(skip_serializing_if = "String::is_empty")]
     pub salt: String,