5 files changed, 120 insertions, 35 deletions
diff --git a/dichroism/src/repo/entities/mod.rs b/dichroism/src/repo/entities/mod.rs
index 2cff899..288f1e3 100644
--- a/dichroism/src/repo/entities/mod.rs
+++ b/dichroism/src/repo/entities/mod.rs
@@ -1,36 +1,9 @@
-use crate::models;
-use crate::schema::products;
+mod photo_set;
+mod photo_set_form;
+mod product;
+mod product_form;
 
-#[derive(Debug, Clone, Identifiable, Queryable, Serialize)]
-pub struct Product {
-    pub id: i32,
-    pub name: String,
-    pub description: String,
-    pub quantity: i32,
-    pub cents: i32,
-    pub featured: i32,
-    pub original: String,
-    pub fullsize: String,
-    pub base: String,
-    pub thumbnail: String,
-}
-
-impl Into<models::Product> for Product {
-    fn into(self) -> models::Product {
-        models::Product {
-            id: self.id as u32,
-            name: self.name,
-            description: self.description,
-            quantity: self.quantity as u32,
-            cents: self.cents as u32,
-            featured: self.featured != 0, // TODO: is this safe?
-            category: String::new(),      // TODO: real category
-            photo_set: models::PhotoSet::from_photos(
-                models::Photo::from_filename(self.original),
-                models::Photo::from_filename(self.fullsize),
-                models::Photo::from_filename(self.base),
-                models::Photo::from_filename(self.thumbnail),
-            ),
-        }
-    }
-}
+pub use photo_set::*;
+pub use photo_set_form::*;
+pub use product::*;
+pub use product_form::*;
diff --git a/dichroism/src/repo/entities/photo_set.rs b/dichroism/src/repo/entities/photo_set.rs
new file mode 100644
index 0000000..6e48e12
--- /dev/null
+++ b/dichroism/src/repo/entities/photo_set.rs
@@ -0,0 +1,22 @@
+use crate::models;
+
+#[derive(Debug, Clone, Queryable)]
+pub struct PhotoSet {
+    pub id: i32,
+    pub original: String,
+    pub fullsize: String,
+    pub base: String,
+    pub thumbnail: String,
+}
+
+impl Into<models::PhotoSet> for PhotoSet {
+    fn into(self) -> models::PhotoSet {
+        models::PhotoSet {
+            id: Some(self.id),
+            original: models::Photo::new(self.original),
+            fullsize: models::Photo::new(self.fullsize),
+            base: models::Photo::new(self.base),
+            thumbnail: models::Photo::new(self.thumbnail),
+        }
+    }
+}
diff --git a/dichroism/src/repo/entities/photo_set_form.rs b/dichroism/src/repo/entities/photo_set_form.rs
new file mode 100644
index 0000000..611c8f0
--- /dev/null
+++ b/dichroism/src/repo/entities/photo_set_form.rs
@@ -0,0 +1,24 @@
+use crate::models::PhotoSet;
+use crate::schema::photo_sets;
+
+#[derive(Insertable, AsChangeset)]
+#[table_name = "photo_sets"]
+pub struct PhotoSetForm {
+    pub id: i32,
+    pub original: String,
+    pub fullsize: String,
+    pub base: String,
+    pub thumbnail: String,
+}
+
+impl From<PhotoSet> for PhotoSetForm {
+    fn from(p: PhotoSet) -> Self {
+        Self {
+            id: p.id.unwrap_or(-1),
+            original: p.original.id,
+            fullsize: p.fullsize.id,
+            base: p.base.id,
+            thumbnail: p.thumbnail.id,
+        }
+    }
+}
diff --git a/dichroism/src/repo/entities/product.rs b/dichroism/src/repo/entities/product.rs
new file mode 100644
index 0000000..e6ba223
--- /dev/null
+++ b/dichroism/src/repo/entities/product.rs
@@ -0,0 +1,38 @@
+use crate::models;
+use crate::schema::products;
+
+#[derive(Debug, Clone, Identifiable, Queryable)]
+pub struct Product {
+    pub id: i32,
+    pub name: String,
+    pub description: String,
+    pub quantity: i32,
+    pub cents: i32,
+    pub featured: i32,
+    pub photo_set_id: i32,
+    pub original: String,
+    pub fullsize: String,
+    pub base: String,
+    pub thumbnail: String,
+}
+
+impl Into<models::Product> for Product {
+    fn into(self) -> models::Product {
+        models::Product {
+            id: Some(self.id),
+            name: self.name,
+            description: self.description,
+            quantity: self.quantity,
+            cents: self.cents,
+            featured: self.featured != 0, // TODO: is this safe?
+            category: String::new(),      // TODO: real category
+            photo_set: models::PhotoSet {
+                id: Some(self.photo_set_id),
+                original: models::Photo::new(self.original),
+                fullsize: models::Photo::new(self.fullsize),
+                base: models::Photo::new(self.base),
+                thumbnail: models::Photo::new(self.thumbnail),
+            },
+        }
+    }
+}
diff --git a/dichroism/src/repo/entities/product_form.rs b/dichroism/src/repo/entities/product_form.rs
new file mode 100644
index 0000000..0d6e452
--- /dev/null
+++ b/dichroism/src/repo/entities/product_form.rs
@@ -0,0 +1,28 @@
+use crate::models::*;
+use crate::schema::products;
+
+#[derive(Insertable, AsChangeset)]
+#[table_name = "products"]
+pub struct ProductForm {
+    pub id: i32,
+    pub name: String,
+    pub description: String,
+    pub quantity: i32,
+    pub cents: i32,
+    pub featured: i32,
+    pub photo_set: i32,
+}
+
+impl From<Product> for ProductForm {
+    fn from(p: Product) -> Self {
+        Self {
+            id: p.id.unwrap_or(-1),
+            name: p.name,
+            description: p.description,
+            quantity: p.quantity,
+            cents: p.cents,
+            featured: p.featured as i32,
+            photo_set: p.photo_set.id.unwrap_or(-1), // TODO: ?
+        }
+    }
+}