Merge branch 'release/v1.0.5'

Author: ja573

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[1.0.5]](https://github.com/thoth-pub/thoth/releases/tag/v1.0.5) - 2026-04-15
+### Added
+  - Add `workStatuses` filtering to `subjects` and `subjectCount` queries
+
 ## [[1.0.4]](https://github.com/thoth-pub/thoth/releases/tag/v1.0.4) - 2026-04-13
 ### Fixed
   - Aggregate Crossref Crossmark updates into a single `<updates>` block

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -15,10 +15,10 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "=1.0.4", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "=1.0.4", path = "thoth-api-server" }
-thoth-errors = { version = "=1.0.4", path = "thoth-errors" }
-thoth-export-server = { version = "=1.0.4", path = "thoth-export-server" }
+thoth-api = { version = "=1.0.5", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "=1.0.5", path = "thoth-api-server" }
+thoth-errors = { version = "=1.0.5", path = "thoth-errors" }
+thoth-export-server = { version = "=1.0.5", path = "thoth-export-server" }
 base64 = "0.22.1"
 clap = { version = "4.5.32", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "=1.0.4", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "=1.0.4", path = "../thoth-errors" }
+thoth-api = { version = "=1.0.5", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "=1.0.5", path = "../thoth-errors" }
 actix-web = "4.10"
 actix-cors = "0.7.1"
 actix-http = "3.10.0"

thoth-api-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -31,7 +31,7 @@ backend = [
 ]
 
 [dependencies]
-thoth-errors = { version = "=1.0.4", path = "../thoth-errors" }
+thoth-errors = { version = "=1.0.5", path = "../thoth-errors" }
 actix-web = { version = "4.10", optional = true }
 isbn = "0.6.0"
 chrono = { version = "0.4.40", features = ["serde"] }

thoth-api/Cargo.toml

@@ -1138,6 +1138,7 @@ impl QueryRoot {
         .map_err(Into::into)
     }
 
+    #[allow(clippy::too_many_arguments)]
     #[graphql(description = "Query the full list of subjects")]
     fn subjects(
         context: &Context,
@@ -1163,6 +1164,11 @@ impl QueryRoot {
             description = "Specific types to filter by",
         )]
         subject_types: Option<Vec<SubjectType>>,
+        #[graphql(
+            default = vec![],
+            description = "Specific statuses to filter by"
+        )]
+        work_statuses: Option<Vec<WorkStatus>>,
     ) -> FieldResult<Vec<Subject>> {
         Subject::all(
             &context.db,
@@ -1174,7 +1180,7 @@ impl QueryRoot {
             None,
             None,
             subject_types.unwrap_or_default(),
-            vec![],
+            work_statuses.unwrap_or_default(),
             None,
             None,
         )
@@ -1202,13 +1208,18 @@ impl QueryRoot {
             description = "Specific types to filter by",
         )]
         subject_types: Option<Vec<SubjectType>>,
+        #[graphql(
+            default = vec![],
+            description = "Specific statuses to filter by"
+        )]
+        work_statuses: Option<Vec<WorkStatus>>,
     ) -> FieldResult<i32> {
         Subject::count(
             &context.db,
             filter,
             vec![],
             subject_types.unwrap_or_default(),
-            vec![],
+            work_statuses.unwrap_or_default(),
             None,
             None,
         )

thoth-api/src/graphql/query.rs

@@ -2007,6 +2007,136 @@ query Root(
     assert_title_resolvers(&title, &context);
 }
 
+#[test]
+fn graphql_subjects_and_subject_count_support_work_status_filters() {
+    let (_guard, pool) = test_db::setup_test_db();
+    let schema = create_schema();
+    let superuser = test_db::test_superuser("user-subject-status-filters");
+    let context = test_db::test_context_with_user(pool.clone(), superuser);
+
+    let publisher = create_with_data(
+        &schema,
+        &context,
+        "createPublisher",
+        "NewPublisher",
+        "publisherId",
+        make_new_publisher("org-subject-status-filters"),
+    );
+    let publisher_id = json_uuid(&publisher["publisherId"]);
+
+    let imprint = create_with_data(
+        &schema,
+        &context,
+        "createImprint",
+        "NewImprint",
+        "imprintId",
+        make_new_imprint(publisher_id),
+    );
+    let imprint_id = json_uuid(&imprint["imprintId"]);
+
+    let active_work = create_with_data(
+        &schema,
+        &context,
+        "createWork",
+        "NewWork",
+        "workId",
+        make_new_work(
+            imprint_id,
+            WorkType::Monograph,
+            Doi::from_str("10.1234/subjects-status-active").unwrap(),
+        ),
+    );
+    let active_work_id = json_uuid(&active_work["workId"]);
+
+    let mut forthcoming_work_input = make_new_work(
+        imprint_id,
+        WorkType::Monograph,
+        Doi::from_str("10.1234/subjects-status-forthcoming").unwrap(),
+    );
+    forthcoming_work_input.work_status = WorkStatus::Forthcoming;
+    forthcoming_work_input.publication_date = None;
+    let forthcoming_work = create_with_data(
+        &schema,
+        &context,
+        "createWork",
+        "NewWork",
+        "workId",
+        forthcoming_work_input,
+    );
+    let forthcoming_work_id = json_uuid(&forthcoming_work["workId"]);
+
+    let active_subject = create_with_data(
+        &schema,
+        &context,
+        "createSubject",
+        "NewSubject",
+        "subjectId",
+        make_new_subject(active_work_id, 1),
+    );
+    let active_subject_id = json_uuid(&active_subject["subjectId"]);
+
+    let forthcoming_subject = create_with_data(
+        &schema,
+        &context,
+        "createSubject",
+        "NewSubject",
+        "subjectId",
+        make_new_subject(forthcoming_work_id, 1),
+    );
+    let forthcoming_subject_id = json_uuid(&forthcoming_subject["subjectId"]);
+
+    let query_plural = r#"
+query SubjectsByStatuses($statuses: [WorkStatus!]) {
+  subjects(limit: 10, workStatuses: $statuses) { subjectId }
+  subjectCount(workStatuses: $statuses)
+}
+"#;
+    let mut plural_vars = Variables::new();
+    insert_var(&mut plural_vars, "statuses", vec![WorkStatus::Forthcoming]);
+    let plural_data = execute_graphql(&schema, &context, query_plural, Some(plural_vars));
+
+    let plural_subjects = plural_data["subjects"]
+        .as_array()
+        .expect("Expected subjects array");
+    assert_eq!(plural_subjects.len(), 1);
+    assert_eq!(
+        json_uuid(&plural_subjects[0]["subjectId"]),
+        forthcoming_subject_id
+    );
+    assert_eq!(plural_data["subjectCount"].as_i64(), Some(1));
+
+    let query_multiple_statuses = r#"
+query SubjectsByMultipleStatuses($statuses: [WorkStatus!]) {
+  subjects(limit: 10, workStatuses: $statuses) { subjectId }
+  subjectCount(workStatuses: $statuses)
+}
+"#;
+    let mut multiple_statuses_vars = Variables::new();
+    insert_var(
+        &mut multiple_statuses_vars,
+        "statuses",
+        vec![WorkStatus::Active, WorkStatus::Forthcoming],
+    );
+    let multiple_statuses_data = execute_graphql(
+        &schema,
+        &context,
+        query_multiple_statuses,
+        Some(multiple_statuses_vars),
+    );
+
+    let multiple_statuses_subjects = multiple_statuses_data["subjects"]
+        .as_array()
+        .expect("Expected subjects array");
+    let multiple_statuses_ids: Vec<Uuid> = multiple_statuses_subjects
+        .iter()
+        .map(|subject| json_uuid(&subject["subjectId"]))
+        .collect();
+    assert_eq!(multiple_statuses_ids.len(), 2);
+    assert!(multiple_statuses_ids.contains(&active_subject_id));
+    assert!(multiple_statuses_ids.contains(&forthcoming_subject_id));
+    assert_eq!(multiple_statuses_data["subjectCount"].as_i64(), Some(2));
+}
+
 #[test]
 fn graphql_books_order_respects_field_and_direction() {
     let (_guard, pool) = test_db::setup_test_db();

thoth-api/src/graphql/tests.rs

@@ -2,6 +2,7 @@ use super::{
     NewSubject, NewSubjectHistory, PatchSubject, Subject, SubjectField, SubjectHistory, SubjectType,
 };
 use crate::graphql::types::inputs::SubjectOrderBy;
+use crate::model::work::WorkStatus;
 use crate::model::{Crud, DbInsert, HistoryEntry, Reorder};
 use crate::schema::{subject, subject_history};
 use diesel::{
@@ -16,7 +17,7 @@ impl Crud for Subject {
     type PatchEntity = PatchSubject;
     type OrderByEntity = SubjectOrderBy;
     type FilterParameter1 = SubjectType;
-    type FilterParameter2 = ();
+    type FilterParameter2 = WorkStatus;
     type FilterParameter3 = ();
     type FilterParameter4 = ();
 
@@ -34,7 +35,7 @@ impl Crud for Subject {
         parent_id_1: Option<Uuid>,
         _: Option<Uuid>,
         subject_types: Vec<Self::FilterParameter1>,
-        _: Vec<Self::FilterParameter2>,
+        work_statuses: Vec<Self::FilterParameter2>,
         _: Option<Self::FilterParameter3>,
         _: Option<Self::FilterParameter4>,
     ) -> ThothResult<Vec<Subject>> {
@@ -77,6 +78,9 @@ impl Crud for Subject {
         if !subject_types.is_empty() {
             query = query.filter(subject_type.eq_any(subject_types));
         }
+        if !work_statuses.is_empty() {
+            query = query.filter(crate::schema::work::work_status.eq_any(work_statuses));
+        }
         if let Some(filter) = filter {
             query = query.filter(subject_code.ilike(format!("%{filter}%")));
         }
@@ -93,16 +97,19 @@ impl Crud for Subject {
         filter: Option<String>,
         _: Vec<Uuid>,
         subject_types: Vec<Self::FilterParameter1>,
-        _: Vec<Self::FilterParameter2>,
+        work_statuses: Vec<Self::FilterParameter2>,
         _: Option<Self::FilterParameter3>,
         _: Option<Self::FilterParameter4>,
     ) -> ThothResult<i32> {
         use crate::schema::subject::dsl::*;
         let mut connection = db.get()?;
-        let mut query = subject.into_boxed();
+        let mut query = subject.inner_join(crate::schema::work::table).into_boxed();
         if !subject_types.is_empty() {
             query = query.filter(subject_type.eq_any(subject_types));
         }
+        if !work_statuses.is_empty() {
+            query = query.filter(crate::schema::work::work_status.eq_any(work_statuses));
+        }
         if let Some(filter) = filter {
             query = query.filter(subject_code.ilike(format!("%{filter}%")));
         }