Merge pull request #131 from psqlpy-python/refactor_value_converter

Refactor value converter

Author: chandr-andr

src/driver/inner_connection.rs

@@ -8,7 +8,11 @@ use tokio_postgres::{Client, CopyInSink, Row, Statement, ToStatement};
 use crate::{
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     query_result::{PSQLDriverPyQueryResult, PSQLDriverSinglePyQueryResult},
-    value_converter::{convert_parameters_and_qs, postgres_to_py, PythonDTO, QueryParameter},
+    value_converter::{
+        consts::QueryParameter,
+        funcs::{from_python::convert_parameters_and_qs, to_python::postgres_to_py},
+        models::dto::PythonDTO,
+    },
 };
 
 #[allow(clippy::module_name_repetitions)]

src/extra_types.rs

@@ -10,11 +10,13 @@ use pyo3::{
 use serde_json::Value;
 
 use crate::{
-    additional_types::{Circle as RustCircle, Line as RustLine},
     exceptions::rust_errors::{RustPSQLDriverError, RustPSQLDriverPyResult},
     value_converter::{
-        build_flat_geo_coords, build_geo_coords, build_serde_value,
-        py_sequence_into_postgres_array, PythonDTO,
+        additional_types::{Circle as RustCircle, Line as RustLine},
+        funcs::from_python::{
+            build_flat_geo_coords, build_geo_coords, py_sequence_into_postgres_array,
+        },
+        models::{dto::PythonDTO, serde_value::build_serde_value},
     },
 };
 

src/lib.rs

@@ -1,4 +1,3 @@
-pub mod additional_types;
 pub mod common;
 pub mod driver;
 pub mod exceptions;

src/query_result.rs

@@ -1,7 +1,10 @@
 use pyo3::{prelude::*, pyclass, pymethods, types::PyDict, Py, PyAny, Python, ToPyObject};
 use tokio_postgres::Row;
 
-use crate::{exceptions::rust_errors::RustPSQLDriverPyResult, value_converter::postgres_to_py};
+use crate::{
+    exceptions::rust_errors::RustPSQLDriverPyResult,
+    value_converter::funcs::to_python::postgres_to_py,
+};
 
 /// Convert postgres `Row` into Python Dict.
 ///