From cf67d37e85692e7f043d9aaa5ad80bd3b8e8496f Mon Sep 17 00:00:00 2001
From: phoenix <kundeng00@pm.me>
Date: Mon, 20 Oct 2025 11:40:32 -0400
Subject: [PATCH] Tidying up changes

---
 src/callers/register.rs | 9 +++------
 src/repo/mod.rs         | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/callers/register.rs b/src/callers/register.rs
index 565234b..195e507 100644
--- a/src/callers/register.rs
+++ b/src/callers/register.rs
@@ -52,9 +52,7 @@ pub async fn register_user(
     axum::Extension(pool): axum::Extension<sqlx::PgPool>,
     Json(payload): Json<request::Request>,
 ) -> (StatusCode, Json<response::Response>) {
-    // TODO: Some cleanup here
     let mut user = icarus_models::user::User {
-        id: uuid::Uuid::nil(),
         username: payload.username.clone(),
         password: payload.password.clone(),
         email: payload.email.clone(),
@@ -63,9 +61,7 @@ pub async fn register_user(
         lastname: payload.lastname.clone(),
         status: String::from("Active"),
         email_verified: true,
-        date_created: Some(time::OffsetDateTime::now_utc()),
-        last_login: None,
-        salt_id: uuid::Uuid::nil(),
+        ..Default::default()
     };
 
     match repo::user::exists(&pool, &user.username).await {
@@ -90,8 +86,9 @@ pub async fn register_user(
                 user.password = hashed_password;
 
                 match repo::user::insert(&pool, &user).await {
-                    Ok(id) => {
+                    Ok((id, date_created)) => {
                         user.id = id;
+                        user.date_created = date_created;
                         (
                             StatusCode::CREATED,
                             Json(response::Response {
diff --git a/src/repo/mod.rs b/src/repo/mod.rs
index 037ee0f..53fe607 100644
--- a/src/repo/mod.rs
+++ b/src/repo/mod.rs
@@ -94,7 +94,7 @@ pub mod user {
     pub async fn insert(
         pool: &sqlx::PgPool,
         user: &icarus_models::user::User,
-    ) -> Result<uuid::Uuid, sqlx::Error> {
+    ) -> Result<(uuid::Uuid, std::option::Option<time::OffsetDateTime>), sqlx::Error> {
         let row = sqlx::query(
             r#"
                 INSERT INTO "user" (username, password, email, phone, firstname, lastname, email_verified, status, salt_id) 
@@ -124,8 +124,8 @@ pub mod user {
                 .map_err(|_e| sqlx::Error::RowNotFound)?,
         };
 
-        if !result.id.is_nil() {
-            Ok(result.id)
+        if !result.id.is_nil() && !result.date_created.is_none() {
+            Ok((result.id, result.date_created))
         } else {
             Err(sqlx::Error::RowNotFound)
         }