From 95b3508d2397b64c7c63bd3586e524998f194e36 Mon Sep 17 00:00:00 2001
From: tom barrett <spalf0@gmail.com>
Date: Fri, 29 Mar 2019 11:21:02 -0500
Subject: just moved serde value to a string

---
 src/mass.rs   | 27 ++++-----------------------
 src/schema.rs |  8 +-------
 2 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/mass.rs b/src/mass.rs
index cbac721..aaf788f 100644
--- a/src/mass.rs
+++ b/src/mass.rs
@@ -31,24 +31,12 @@ pub struct Mass {
 pub struct MassEntry {
     pub id: Option<i32>,
     pub name: String,
-    pub pos_x: f64,
-    pub pos_y: f64,
-    pub pos_z: f64,
-    pub vel_x: f64,
-    pub vel_y: f64,
-    pub vel_z: f64,
-    pub type_data: serde_json::Value,
+    pub mass: String,
 }
 
 impl MassEntry {
-    pub fn to_mass(&self) -> Mass {
-        Mass {
-            position: Vector::new(self.pos_x, self.pos_y, self.pos_z),
-            velocity: Vector::new(self.vel_x, self.vel_y, self.vel_z),
-            mass_type: serde_json::from_str(&serde_json::to_string(&self.type_data).unwrap())
-                .unwrap(),
-            effects: Effects::new(),
-        }
+    pub fn to_mass(&self) -> (String, Mass) {
+        (self.name.clone(), serde_json::from_str(&self.mass).unwrap())
     }
 }
 
@@ -331,14 +319,7 @@ impl Mass {
         MassEntry {
             id: None,
             name,
-            pos_x: self.position.x,
-            pos_y: self.position.y,
-            pos_z: self.position.z,
-            vel_x: self.velocity.x,
-            vel_y: self.velocity.y,
-            vel_z: self.velocity.z,
-            type_data: serde_json::from_str(&serde_json::to_string(&self.mass_type).unwrap())
-                .unwrap(),
+            mass: serde_json::to_string(&self).unwrap(),
         }
     }
 }
diff --git a/src/schema.rs b/src/schema.rs
index 71abe49..c258603 100644
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -2,12 +2,6 @@ table! {
     masses (id) {
         id -> Nullable<Integer>,
         name -> Varchar,
-        pos_x -> Double,
-        pos_y -> Double,
-        pos_z -> Double,
-        vel_x -> Double,
-        vel_y -> Double,
-        vel_z -> Double,
-        type_data -> Jsonb,
+        mass -> Varchar,
     }
 }
-- 
cgit v1.2.3