Add fileExtension to configuration query

src/db_service.rs

@@ -66,7 +66,7 @@ pub struct BeamlineConfiguration {
     visit: RawPathTemplate<VisitTemplate>,
     scan: RawPathTemplate<ScanTemplate>,
     detector: RawPathTemplate<DetectorTemplate>,
-    tracker_file_extension: Option<String>,
+    pub(crate) tracker_file_extension: Option<String>,
 }
 
 impl BeamlineConfiguration {
@@ -78,10 +78,6 @@ impl BeamlineConfiguration {
         self.scan_number
     }
 
-    pub fn tracker_file_extension(&self) -> Option<&str> {
-        self.tracker_file_extension.as_deref()
-    }
-
     pub fn visit(&self) -> SqliteTemplateResult<BeamlineField> {
         self.visit.as_template()
     }
@@ -565,7 +561,7 @@ mod db_tests {
             conf.detector().unwrap().to_string(),
             "{subdirectory}/{instrument}-{scan_number}-{detector}"
         );
-        let Some(ext) = conf.tracker_file_extension() else {
+        let Some(ext) = conf.tracker_file_extension else {
             panic!("Missing extension");
         };
         assert_eq!(ext, "ext");
@@ -588,7 +584,7 @@ mod db_tests {
             |u: BeamlineConfiguration| assert_eq!(u.scan_number(), 42))]
     #[case::extension(
             |u: &mut Update| u.tracker_file_extension = Some("new".into()),
-            |u: BeamlineConfiguration| assert_eq!(u.tracker_file_extension().unwrap(), "new"))]
+            |u: BeamlineConfiguration| assert_eq!(u.tracker_file_extension.unwrap(), "new"))]
     #[tokio::test]
     async fn update_existing(
         #[future(awt)] db: SqliteScanPathService,

src/graphql.rs

@@ -256,6 +256,9 @@ impl BeamlineConfiguration {
     pub async fn latest_scan_number(&self) -> async_graphql::Result<u32> {
         Ok(self.scan_number())
     }
+    pub async fn tracker_file_extension(&self) -> async_graphql::Result<Option<&str>> {
+        Ok(self.tracker_file_extension.as_deref())
+    }
 }
 
 impl FieldSource<ScanField> for ScanPaths {
@@ -326,7 +329,7 @@ impl Mutation {
         // isn't much we can do from here.
         let current = db.current_configuration(&beamline).await?;
         let dir = nt
-            .for_beamline(&beamline, current.tracker_file_extension())
+            .for_beamline(&beamline, current.tracker_file_extension.as_deref())
             .await?;
 
         let next_scan = db
@@ -741,20 +744,35 @@ mod tests {
     async fn configuration(#[future(awt)] env: TestEnv) {
         let query = r#"{
         configuration(beamline: "i22") {
-            visitTemplate scanTemplate detectorTemplate latestScanNumber
+            visitTemplate scanTemplate detectorTemplate latestScanNumber trackerFileExtension
         }}"#;
         let result = env.schema.execute(query).await;
         let exp = value!({
         "configuration": {
             "visitTemplate": "/tmp/{instrument}/data/{visit}",
             "scanTemplate": "{subdirectory}/{instrument}-{scan_number}",
             "detectorTemplate": "{subdirectory}/{instrument}-{scan_number}-{detector}",
-            "latestScanNumber": 122
+            "latestScanNumber": 122,
+            "trackerFileExtension": Value::Null
         }});
         assert!(result.errors.is_empty());
         assert_eq!(result.data, exp);
     }
 
+    #[rstest]
+    #[tokio::test]
+    async fn custom_tracker_file_extension(#[future(awt)] env: TestEnv) {
+        let result = env
+            .schema
+            .execute(r#"{configuration(beamline: "b21") { trackerFileExtension }}"#)
+            .await;
+        assert!(result.errors.is_empty());
+        assert_eq!(
+            result.data,
+            value!({ "configuration": { "trackerFileExtension": "b21_ext" } })
+        );
+    }
+
     #[rstest]
     #[tokio::test]
     async fn empty_configure_for_existing(#[future(awt)] env: TestEnv) {

static/service_schema

@@ -3,6 +3,7 @@ type BeamlineConfiguration {
 	scanTemplate: String!
 	detectorTemplate: String!
 	latestScanNumber: Int!
+	trackerFileExtension: String
 }