refactor: Don't nest complex types

Signed-off-by: Anush008 <[email protected]>

Author: Anush008

src/ops/storages/qdrant.rs

@@ -128,11 +128,11 @@ fn values_to_payload(
                     BasicValue::Float32(v) => (*v as f64).into(),
                     BasicValue::Float64(v) => (*v).into(),
                     BasicValue::Range(v) => json!({ "start": v.start, "end": v.end }),
-                    BasicValue::Uuid(v) => json!({ "uuid": v.to_string() }),
-                    BasicValue::Date(v) => json!({ "date": v.to_string() }),
-                    BasicValue::LocalDateTime(v) => json!({ "local_datetime": v.to_string() }),
-                    BasicValue::Time(v) => json!({ "time": v.to_string() }),
-                    BasicValue::OffsetDateTime(v) => json!({ "offset_datetime": v.to_string() }),
+                    BasicValue::Uuid(v) => v.to_string().into(),
+                    BasicValue::Date(v) => v.to_string().into(),
+                    BasicValue::LocalDateTime(v) => v.to_string().into(),
+                    BasicValue::Time(v) => v.to_string().into(),
+                    BasicValue::OffsetDateTime(v) => v.to_string().into(),
                     BasicValue::Json(v) => (**v).clone(),
                     BasicValue::Vector(v) => {
                         let vector = convert_to_vector(v.to_vec());
@@ -223,60 +223,31 @@ fn into_value(point: &ScoredPoint, schema: &FieldSchema) -> Result<Value> {
                         }
                     }),
 
-                BasicValueType::Uuid => point.payload.get(field_name).and_then(|v| {
-                    v.as_struct().and_then(|s| {
-                        s.fields
-                            .get("uuid")?
-                            .as_str()?
-                            .parse()
-                            .ok()
-                            .map(BasicValue::Uuid)
-                    })
-                }),
+                BasicValueType::Uuid => point
+                    .payload
+                    .get(field_name)
+                    .and_then(|v| v.as_str()?.parse().ok().map(BasicValue::Uuid)),
 
-                BasicValueType::Date => point.payload.get(field_name).and_then(|v| {
-                    v.as_struct().and_then(|s| {
-                        s.fields
-                            .get("date")?
-                            .as_str()?
-                            .parse()
-                            .ok()
-                            .map(BasicValue::Date)
-                    })
-                }),
+                BasicValueType::Date => point
+                    .payload
+                    .get(field_name)
+                    .and_then(|v| v.as_str()?.parse().ok().map(BasicValue::Date)),
 
-                BasicValueType::Time => point.payload.get(field_name).and_then(|v| {
-                    v.as_struct().and_then(|s| {
-                        s.fields
-                            .get("time")?
-                            .as_str()?
-                            .parse()
-                            .ok()
-                            .map(BasicValue::Time)
-                    })
-                }),
+                BasicValueType::Time => point
+                    .payload
+                    .get(field_name)
+                    .and_then(|v| v.as_str()?.parse().ok().map(BasicValue::Time)),
 
-                BasicValueType::LocalDateTime => point.payload.get(field_name).and_then(|v| {
-                    v.as_struct().and_then(|s| {
-                        s.fields
-                            .get("local_datetime")?
-                            .as_str()?
-                            .parse()
-                            .ok()
-                            .map(BasicValue::LocalDateTime)
-                    })
-                }),
+                BasicValueType::LocalDateTime => point
+                    .payload
+                    .get(field_name)
+                    .and_then(|v| v.as_str()?.parse().ok().map(BasicValue::LocalDateTime)),
+
+                BasicValueType::OffsetDateTime => point
+                    .payload
+                    .get(field_name)
+                    .and_then(|v| v.as_str()?.parse().ok().map(BasicValue::OffsetDateTime)),
 
-                BasicValueType::OffsetDateTime => point.payload.get(field_name).and_then(|v| {
-                    v.as_struct().and_then(|s| {
-                        s.fields
-                            .get("offset_datetime")?
-                            .as_str()?
-                            .parse()
-                            .ok()
-                            .map(BasicValue::OffsetDateTime)
-                    })
-                }),
                 BasicValueType::Range => point.payload.get(field_name).and_then(|v| {
                     v.as_struct().and_then(|s| {
                         let start = s.fields.get("start").and_then(|f| f.as_integer());