From fb7f3dbe3a77c78c93a769ca85139889334960f9 Mon Sep 17 00:00:00 2001
From: iamvigneshwars <iamvigneshwars@gmail.com>
Date: Fri, 17 May 2024 13:47:41 +0000
Subject: [PATCH] Add additional fields : flux, axis, resolution, transmission,
 experiment_type

---
 datasets/src/graphql/entity.rs | 24 ++++++++++++++++++++++++
 models/build.rs                |  9 +++++++++
 2 files changed, 33 insertions(+)

diff --git a/datasets/src/graphql/entity.rs b/datasets/src/graphql/entity.rs
index 5410526..c3c14e3 100644
--- a/datasets/src/graphql/entity.rs
+++ b/datasets/src/graphql/entity.rs
@@ -41,6 +41,22 @@ pub struct DataCollection {
     pub image_suffix: Option<String>,
     /// Image file extension
     pub image_prefix: Option<String>,
+    /// Axis overlap
+    pub overlap: Option<f32>,
+    /// Axis start
+    pub axis_start: Option<f32>,
+    /// Axis end
+    pub axis_end: Option<f32>,
+    /// Axis range
+    pub axis_range: Option<f32>,
+    /// Resolution
+    pub resolution: Option<f32>,
+    /// Flux
+    pub flux: Option<f64>,
+    /// Transmission
+    pub transmission: Option<f32>,
+    /// Type of experiment
+    pub experiment_type: Option<String>,
 }
 
 /// Extended subraph from session service/subgraph
@@ -71,6 +87,14 @@ impl From<data_collection::Model> for DataCollection {
             image_directory: values.image_directory,
             image_suffix: values.image_suffix,
             image_prefix: values.image_prefix,
+            overlap: values.overlap,
+            axis_start: values.axis_start,
+            axis_end: values.axis_end,
+            axis_range: values.axis_range, 
+            resolution: values.resolution,
+            flux: values.flux, 
+            transmission: values.transmission,
+            experiment_type: values.experimenttype,
         }
     }
 }
diff --git a/models/build.rs b/models/build.rs
index 2f702bc..1c8800f 100644
--- a/models/build.rs
+++ b/models/build.rs
@@ -18,11 +18,15 @@ struct Table<'a> {
 const TABLES_SPECS: &[&Table] = &[&Table {
     name: "DataCollection",
     columns: &[
+        "axisStart",
+        "axisEnd",
+        "axisRange",
         "dataCollectionId",
         "SESSIONID",
         "dataCollectionGroupId",
         "wavelength",
         "exposureTime",
+        "flux",
         "imageDirectory",
         "imageSuffix",
         "imagePrefix",
@@ -32,12 +36,17 @@ const TABLES_SPECS: &[&Table] = &[&Table {
         "processedDataFile",
         "xBeam",
         "yBeam",
+        "resolution",
+        "resolution",
+        "experimenttype",
+        "overlap",
         "detectorDistance",
         "beamSizeAtSampleX",
         "beamSizeAtSampleY",
         "detectorId",
         "startTime",
         "endTime",
+        "transmission",
     ],
 }];