From de94f4d11ba320f8a6be0e544e5c7b979a51ed19 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Mon, 8 Apr 2024 13:12:09 +0200
Subject: [PATCH 01/12] Added change to changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a87f499..cde1a646 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+  - [583](https://github.com/thoth-pub/thoth/issues/583) - Add new field, Permanently Withdrawn Date, to Work for Out-of-print or Withdrawn from Sale Works.
 
 ## [[0.12.0]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.0) - 2024-03-14
 ### Removed

From 0d57c3b52e66d900a6df7c2dfa39c5cb96eaac89 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Thu, 11 Apr 2024 11:14:50 +0200
Subject: [PATCH 02/12] Added up and down migrations, added validation error
 logic, added error messages to database_errors.rs and lib.rs, updated schema,
 updated model

---
 thoth-api/migrations/v0.11.20/down.sql |  4 ++
 thoth-api/migrations/v0.11.20/up.sql   | 13 +++++
 thoth-api/src/graphql/model.rs         |  7 +++
 thoth-api/src/model/work/crud.rs       | 20 +++++++-
 thoth-api/src/model/work/mod.rs        | 70 ++++++++++++++++++++++++++
 thoth-api/src/schema.rs                |  1 +
 thoth-errors/src/database_errors.rs    |  1 +
 thoth-errors/src/lib.rs                |  4 ++
 8 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 thoth-api/migrations/v0.11.20/down.sql
 create mode 100644 thoth-api/migrations/v0.11.20/up.sql

diff --git a/thoth-api/migrations/v0.11.20/down.sql b/thoth-api/migrations/v0.11.20/down.sql
new file mode 100644
index 00000000..e9b5c49a
--- /dev/null
+++ b/thoth-api/migrations/v0.11.20/down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE work
+    DROP CONSTRAINT work_withdrawn_date_check,
+    DROP COLUMN withdrawn_date;
+    
\ No newline at end of file
diff --git a/thoth-api/migrations/v0.11.20/up.sql b/thoth-api/migrations/v0.11.20/up.sql
new file mode 100644
index 00000000..4257e211
--- /dev/null
+++ b/thoth-api/migrations/v0.11.20/up.sql
@@ -0,0 +1,13 @@
+ALTER TABLE work
+    ADD COLUMN withdrawn_date DATE;
+
+UPDATE work                              
+    SET withdrawn_date = updated_at    
+    WHERE (work_status = 'withdrawn-from-sale' 
+    OR work_status = 'out-of-print');
+
+ALTER TABLE work
+    ADD CONSTRAINT work_withdrawn_date_check CHECK
+        (((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print')
+        AND withdrawn_date IS NOT NULL)
+        OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print') AND withdrawn_date IS NULL));
\ No newline at end of file
diff --git a/thoth-api/src/graphql/model.rs b/thoth-api/src/graphql/model.rs
index 6f608b9c..0ca0defc 100644
--- a/thoth-api/src/graphql/model.rs
+++ b/thoth-api/src/graphql/model.rs
@@ -2279,6 +2279,13 @@ impl Work {
         self.publication_date
     }
 
+    #[graphql(
+        description = "Date a work was withdrawn from publication. Only applies to out of print and withdrawn from sale works."
+    )]
+    pub fn withdrawn_date(&self) -> Option<NaiveDate> {
+        self.withdrawn_date
+    }
+
     pub fn place(&self) -> Option<&String> {
         self.place.as_ref()
     }
diff --git a/thoth-api/src/model/work/crud.rs b/thoth-api/src/model/work/crud.rs
index 160272ab..6d587577 100644
--- a/thoth-api/src/model/work/crud.rs
+++ b/thoth-api/src/model/work/crud.rs
@@ -1,6 +1,5 @@
 use super::{
-    NewWork, NewWorkHistory, PatchWork, Work, WorkField, WorkHistory, WorkOrderBy, WorkStatus,
-    WorkType,
+    NewWork, NewWorkHistory, PatchWork, WorkProperties, Work, WorkField, WorkHistory, WorkOrderBy, WorkStatus, WorkType
 };
 use crate::graphql::model::TimeExpression;
 use crate::graphql::utils::{Direction, Expression};
@@ -176,6 +175,10 @@ impl Crud for Work {
                 Direction::Asc => query.order(dsl::publication_date.asc()),
                 Direction::Desc => query.order(dsl::publication_date.desc()),
             },
+            WorkField::WithdrawnDate => match order.direction {
+                Direction::Asc => query.order(dsl::withdrawn_date.asc()),
+                Direction::Desc => query.order(dsl::withdrawn_date.desc()),
+            },
             WorkField::Place => match order.direction {
                 Direction::Asc => query.order(dsl::place.asc()),
                 Direction::Desc => query.order(dsl::place.desc()),
@@ -399,6 +402,19 @@ impl DbInsert for NewWorkHistory {
     db_insert!(work_history::table);
 }
 
+pub trait WorkValidation
+where
+    Self: WorkProperties,
+{
+    fn validate(&self) -> ThothResult<()> {
+        self.withdrawn_date_error()
+    }
+}
+
+impl WorkValidation for NewWork {}
+
+impl WorkValidation for PatchWork {}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/thoth-api/src/model/work/mod.rs b/thoth-api/src/model/work/mod.rs
index 2fc57d54..51ea4ec3 100644
--- a/thoth-api/src/model/work/mod.rs
+++ b/thoth-api/src/model/work/mod.rs
@@ -1,5 +1,6 @@
 use chrono::naive::NaiveDate;
 use serde::{Deserialize, Serialize};
+use thoth_errors::{ThothError, ThothResult};
 use std::fmt;
 use strum::Display;
 use strum::EnumString;
@@ -98,6 +99,7 @@ pub enum WorkField {
     #[strum(serialize = "DOI")]
     Doi,
     PublicationDate,
+    WithdrawnDate,
     Place,
     PageCount,
     PageBreakdown,
@@ -144,6 +146,7 @@ pub struct Work {
     pub imprint_id: Uuid,
     pub doi: Option<Doi>,
     pub publication_date: Option<NaiveDate>,
+    pub withdrawn_date: Option<NaiveDate>,
     pub place: Option<String>,
     pub page_count: Option<i32>,
     pub page_breakdown: Option<String>,
@@ -184,6 +187,7 @@ pub struct WorkWithRelations {
     pub edition: Option<i32>,
     pub doi: Option<Doi>,
     pub publication_date: Option<String>,
+    pub withdrawn_date: Option<String>,
     pub place: Option<String>,
     pub page_count: Option<i32>,
     pub page_breakdown: Option<String>,
@@ -234,6 +238,7 @@ pub struct NewWork {
     pub imprint_id: Uuid,
     pub doi: Option<Doi>,
     pub publication_date: Option<NaiveDate>,
+    pub withdrawn_date: Option<NaiveDate>,
     pub place: Option<String>,
     pub page_count: Option<i32>,
     pub page_breakdown: Option<String>,
@@ -275,6 +280,7 @@ pub struct PatchWork {
     pub imprint_id: Uuid,
     pub doi: Option<Doi>,
     pub publication_date: Option<NaiveDate>,
+    pub withdrawn_date: Option<NaiveDate>,
     pub place: Option<String>,
     pub page_count: Option<i32>,
     pub page_breakdown: Option<String>,
@@ -326,6 +332,67 @@ pub struct WorkOrderBy {
     pub direction: Direction,
 }
 
+impl WorkStatus {
+    fn is_withdrawn_out_of_print(&self) -> bool {
+        matches!(self, WorkStatus::OutOfPrint | WorkStatus::WithdrawnFromSale)
+    }
+
+    fn is_not_withdrawn_out_of_print(&self) -> bool {
+        !self.is_withdrawn_out_of_print()
+    }
+}
+
+pub trait WorkProperties {
+    fn work_status(&self) -> &WorkStatus;
+    fn withdrawn_date(&self) -> &Option<NaiveDate>;
+
+    fn is_not_withdrawn_out_of_print(&self) -> bool {
+        self.work_status().is_not_withdrawn_out_of_print()
+    }
+
+    fn has_withdrawn_date(&self) -> bool {
+        self.withdrawn_date().is_some()
+    }
+
+    fn withdrawn_date_error(&self) -> ThothResult<()> {
+        if self.is_not_withdrawn_out_of_print() {
+            if self.has_withdrawn_date() {
+                return Err(ThothError::WithdrawnDateError)
+            }
+        }
+        Ok(())
+    }
+}
+
+impl WorkProperties for Work {
+    fn work_status(&self) -> &WorkStatus {
+        &self.work_status
+    }
+
+    fn withdrawn_date(&self) -> &Option<NaiveDate> {
+        &self.withdrawn_date
+    }
+}
+impl WorkProperties for NewWork {
+    fn work_status(&self) -> &WorkStatus {
+        &self.work_status
+    }
+
+    fn withdrawn_date(&self) -> &Option<NaiveDate> {
+        &self.withdrawn_date
+    }
+}
+
+impl WorkProperties for PatchWork {
+    fn work_status(&self) -> &WorkStatus {
+        &self.work_status
+    }
+
+    fn withdrawn_date(&self) -> &Option<NaiveDate> {
+        &self.withdrawn_date
+    }
+}
+
 impl Work {
     pub fn compile_fulltitle(&self) -> String {
         if let Some(subtitle) = &self.subtitle.clone() {
@@ -376,6 +443,7 @@ impl From<Work> for PatchWork {
             imprint_id: w.imprint_id,
             doi: w.doi,
             publication_date: w.publication_date,
+            withdrawn_date: w.withdrawn_date,
             place: w.place,
             page_count: w.page_count,
             page_breakdown: w.page_breakdown,
@@ -727,6 +795,7 @@ fn test_work_into_patchwork() {
         imprint_id: Uuid::parse_str("00000000-0000-0000-BBBB-000000000002").unwrap(),
         doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
         publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+        withdrawn_date: chrono::NaiveDate::from_ymd_opt(2000, 12, 31),
         place: Some("León, Spain".to_string()),
         page_count: Some(123),
         page_breakdown: None,
@@ -766,6 +835,7 @@ fn test_work_into_patchwork() {
     assert_eq!(work.imprint_id, patch_work.imprint_id);
     assert_eq!(work.doi, patch_work.doi);
     assert_eq!(work.publication_date, patch_work.publication_date);
+    assert_eq!(work.withdrawn_date, patch_work.withdrawn_date);
     assert_eq!(work.place, patch_work.place);
     assert_eq!(work.page_count, patch_work.page_count);
     assert_eq!(work.page_breakdown, patch_work.page_breakdown);
diff --git a/thoth-api/src/schema.rs b/thoth-api/src/schema.rs
index cada1078..8e393a8b 100644
--- a/thoth-api/src/schema.rs
+++ b/thoth-api/src/schema.rs
@@ -530,6 +530,7 @@ table! {
         imprint_id -> Uuid,
         doi -> Nullable<Text>,
         publication_date -> Nullable<Date>,
+        withdrawn_date -> Nullable<Date>,
         place -> Nullable<Text>,
         page_count -> Nullable<Int4>,
         page_breakdown -> Nullable<Text>,
diff --git a/thoth-errors/src/database_errors.rs b/thoth-errors/src/database_errors.rs
index c220c096..73837988 100644
--- a/thoth-errors/src/database_errors.rs
+++ b/thoth-errors/src/database_errors.rs
@@ -160,6 +160,7 @@ static DATABASE_CONSTRAINT_ERRORS: Map<&'static str, &'static str> = phf_map! {
     "work_title_check" => "Title must not be an empty string.",
     "work_toc_check" => "Table of content must not be an empty string.",
     "work_video_count_check" => "A video count must be greater than 0.",
+    "work_withdrawn_date_check" => "Withdrawn Date can only be added to out of print or withdrawn from sale Works.",
 };
 
 impl From<diesel::result::Error> for ThothError {
diff --git a/thoth-errors/src/lib.rs b/thoth-errors/src/lib.rs
index cdf5970c..8175cacc 100644
--- a/thoth-errors/src/lib.rs
+++ b/thoth-errors/src/lib.rs
@@ -84,6 +84,10 @@ pub enum ThothError {
     #[error(
         "Price values must be greater than zero. To indicate an unpriced Publication, omit all Prices."
     )]
+    WithdrawnDateError,
+    #[error(
+        "Withdrawn Date can only be added to out of print or withdrawn from sale Works."
+    )]
     PriceZeroError,
     #[error("{0}")]
     RequestError(String),

From 6b16b62782de5b4a8d72e347a22093879cc10471 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Fri, 12 Apr 2024 10:53:32 +0200
Subject: [PATCH 03/12] Added withdrawn_date to mutations and queries, added to
 component

---
 thoth-api/src/model/work/mod.rs               |  8 +++++++-
 thoth-app/src/component/new_work.rs           | 18 ++++++++++++++++++
 thoth-app/src/component/work.rs               | 19 +++++++++++++++++++
 .../src/models/work/create_work_mutation.rs   |  3 +++
 .../src/models/work/update_work_mutation.rs   |  3 +++
 thoth-app/src/models/work/work_query.rs       |  1 +
 thoth-app/src/models/work/works_query.rs      |  1 +
 thoth-client/assets/queries.graphql           |  2 ++
 8 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/thoth-api/src/model/work/mod.rs b/thoth-api/src/model/work/mod.rs
index 51ea4ec3..05eb6081 100644
--- a/thoth-api/src/model/work/mod.rs
+++ b/thoth-api/src/model/work/mod.rs
@@ -373,6 +373,7 @@ impl WorkProperties for Work {
         &self.withdrawn_date
     }
 }
+
 impl WorkProperties for NewWork {
     fn work_status(&self) -> &WorkStatus {
         &self.work_status
@@ -548,6 +549,7 @@ fn test_workfield_display() {
     assert_eq!(format!("{}", WorkField::Edition), "Edition");
     assert_eq!(format!("{}", WorkField::Doi), "DOI");
     assert_eq!(format!("{}", WorkField::PublicationDate), "PublicationDate");
+    assert_eq!(format!("{}", WorkField::WithdrawnDate), "WithdrawnDate");
     assert_eq!(format!("{}", WorkField::Place), "Place");
     assert_eq!(format!("{}", WorkField::PageCount), "PageCount");
     assert_eq!(format!("{}", WorkField::PageBreakdown), "PageBreakdown");
@@ -689,6 +691,10 @@ fn test_workfield_fromstr() {
         WorkField::from_str("PublicationDate").unwrap(),
         WorkField::PublicationDate
     );
+    assert_eq!(
+        WorkField::from_str("WithdrawnDate").unwrap(),
+        WorkField::WithdrawnDate
+    );
     assert_eq!(WorkField::from_str("Place").unwrap(), WorkField::Place);
     assert_eq!(
         WorkField::from_str("PageCount").unwrap(),
@@ -795,7 +801,7 @@ fn test_work_into_patchwork() {
         imprint_id: Uuid::parse_str("00000000-0000-0000-BBBB-000000000002").unwrap(),
         doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
         publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
-        withdrawn_date: chrono::NaiveDate::from_ymd_opt(2000, 12, 31),
+        withdrawn_date: None,
         place: Some("León, Spain".to_string()),
         page_count: Some(123),
         page_breakdown: None,
diff --git a/thoth-app/src/component/new_work.rs b/thoth-app/src/component/new_work.rs
index 8978f82b..7b4d1625 100644
--- a/thoth-app/src/component/new_work.rs
+++ b/thoth-app/src/component/new_work.rs
@@ -97,6 +97,7 @@ pub enum Msg {
     ChangeEdition(String),
     ChangeDoi(String),
     ChangeDate(String),
+    ChangeWithdrawnDate(String),
     ChangePlace(String),
     ChangePageCount(String),
     ChangePageBreakdown(String),
@@ -299,6 +300,7 @@ impl Component for NewWorkComponent {
                         edition: self.work.edition,
                         doi: self.work.doi.clone(),
                         publication_date: self.work.publication_date.clone(),
+                        withdrawn_date: self.work.withdrawn_date.clone(),
                         place: self.work.place.clone(),
                         page_count: self.work.page_count,
                         page_breakdown: self.work.page_breakdown.clone(),
@@ -376,6 +378,7 @@ impl Component for NewWorkComponent {
                 }
             }
             Msg::ChangeDate(value) => self.work.publication_date.neq_assign(value.to_opt_string()),
+            Msg::ChangeWithdrawnDate(value) => self.work.withdrawn_date.neq_assign(value.to_opt_string()),
             Msg::ChangePlace(value) => self.work.place.neq_assign(value.to_opt_string()),
             Msg::ChangePageCount(value) => self.work.page_count.neq_assign(value.to_opt_int()),
             Msg::ChangePageBreakdown(value) => {
@@ -515,6 +518,21 @@ impl Component for NewWorkComponent {
                         value={ self.work.publication_date.clone() }
                         oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeDate(e.to_value())) }
                     />
+                    {
+                        if self.work.work_status == WorkStatus::WithdrawnFromSale || self.work.work_status == WorkStatus::OutOfPrint {
+                            html! {
+                                <>
+                                <FormDateInput
+                                label = "Withdrawn Date"
+                                value={ self.work.withdrawn_date.clone() }
+                                oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
+                                />
+                                </>
+                            }
+                        } else {
+                            html!{}
+                        }
+                    }
                     <FormTextInput
                         label = "Place of Publication"
                         value={ self.work.place.clone() }
diff --git a/thoth-app/src/component/work.rs b/thoth-app/src/component/work.rs
index 65a6bf9e..aa9af694 100644
--- a/thoth-app/src/component/work.rs
+++ b/thoth-app/src/component/work.rs
@@ -117,6 +117,7 @@ pub enum Msg {
     ChangeEdition(String),
     ChangeDoi(String),
     ChangeDate(String),
+    ChangeWithdrawnDate(String),
     ChangePlace(String),
     ChangePageCount(String),
     ChangePageBreakdown(String),
@@ -311,6 +312,7 @@ impl Component for WorkComponent {
                         imprint_id: self.work.imprint.imprint_id,
                         doi: self.work.doi.clone(),
                         publication_date: self.work.publication_date.clone(),
+                        withdrawn_date: self.work.withdrawn_date.clone(),
                         place: self.work.place.clone(),
                         page_count: self.work.page_count,
                         page_breakdown: self.work.page_breakdown.clone(),
@@ -452,6 +454,7 @@ impl Component for WorkComponent {
                 }
             }
             Msg::ChangeDate(value) => self.work.publication_date.neq_assign(value.to_opt_string()),
+            Msg::ChangeWithdrawnDate(value) => self.work.withdrawn_date.neq_assign(value.to_opt_string()),
             Msg::ChangePlace(value) => self.work.place.neq_assign(value.to_opt_string()),
             Msg::ChangePageCount(value) => self.work.page_count.neq_assign(value.to_opt_int()),
             Msg::ChangePageBreakdown(value) => {
@@ -637,6 +640,22 @@ impl Component for WorkComponent {
                                 value={ self.work.publication_date.clone() }
                                 oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeDate(e.to_value())) }
                             />
+                            {
+                                if self.work.work_status == WorkStatus::WithdrawnFromSale || self.work.work_status == WorkStatus::OutOfPrint {
+                                    html! {
+                                        <>
+                                        <FormDateInput
+                                        label = "Withdrawn Date"
+                                        value={ self.work.withdrawn_date.clone() }
+                                        oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
+                                        />
+                                        </>
+                                    }
+                                } else {
+                                    html!{}
+                                }
+                            }
+                            
                             <FormTextInput
                                 label = "Place of Publication"
                                 value={ self.work.place.clone() }
diff --git a/thoth-app/src/models/work/create_work_mutation.rs b/thoth-app/src/models/work/create_work_mutation.rs
index d2eae04a..fa446176 100644
--- a/thoth-app/src/models/work/create_work_mutation.rs
+++ b/thoth-app/src/models/work/create_work_mutation.rs
@@ -18,6 +18,7 @@ const CREATE_WORK_MUTATION: &str = "
         $imprintId: Uuid!,
         $doi: Doi,
         $publicationDate: NaiveDate,
+        $withdrawnDate: NaiveDate,
         $place: String,
         $pageCount: Int,
         $pageBreakdown: String,
@@ -53,6 +54,7 @@ const CREATE_WORK_MUTATION: &str = "
             imprintId: $imprintId
             doi: $doi
             publicationDate: $publicationDate
+            withdrawnDate: $withdrawnDate
             place: $place
             pageCount: $pageCount
             pageBreakdown: $pageBreakdown
@@ -112,6 +114,7 @@ pub struct Variables {
     pub edition: Option<i32>,
     pub doi: Option<Doi>,
     pub publication_date: Option<String>,
+    pub withdrawn_date: Option<String>,
     pub place: Option<String>,
     pub page_count: Option<i32>,
     pub page_breakdown: Option<String>,
diff --git a/thoth-app/src/models/work/update_work_mutation.rs b/thoth-app/src/models/work/update_work_mutation.rs
index 46acabe0..a11f48de 100644
--- a/thoth-app/src/models/work/update_work_mutation.rs
+++ b/thoth-app/src/models/work/update_work_mutation.rs
@@ -19,6 +19,7 @@ const UPDATE_WORK_MUTATION: &str = "
         $imprintId: Uuid!,
         $doi: Doi,
         $publicationDate: NaiveDate,
+        $withdrawnDate: NaiveDate,
         $place: String,
         $pageCount: Int,
         $pageBreakdown: String,
@@ -55,6 +56,7 @@ const UPDATE_WORK_MUTATION: &str = "
             imprintId: $imprintId
             doi: $doi
             publicationDate: $publicationDate
+            withdrawnDate: $withdrawnDate
             place: $place
             pageCount: $pageCount
             pageBreakdown: $pageBreakdown
@@ -115,6 +117,7 @@ pub struct Variables {
     pub edition: Option<i32>,
     pub doi: Option<Doi>,
     pub publication_date: Option<String>,
+    pub withdrawn_date: Option<String>,
     pub place: Option<String>,
     pub page_count: Option<i32>,
     pub page_breakdown: Option<String>,
diff --git a/thoth-app/src/models/work/work_query.rs b/thoth-app/src/models/work/work_query.rs
index b31f4319..a32894fc 100644
--- a/thoth-app/src/models/work/work_query.rs
+++ b/thoth-app/src/models/work/work_query.rs
@@ -20,6 +20,7 @@ pub const WORK_QUERY: &str = "
             edition
             doi
             publicationDate
+            withdrawnDate
             place
             pageCount
             pageBreakdown
diff --git a/thoth-app/src/models/work/works_query.rs b/thoth-app/src/models/work/works_query.rs
index 4b8680b5..68ca4a53 100644
--- a/thoth-app/src/models/work/works_query.rs
+++ b/thoth-app/src/models/work/works_query.rs
@@ -21,6 +21,7 @@ pub const WORKS_QUERY_BODY: &str = "
             license
             place
             publicationDate
+            withdrawnDate
             updatedAt
             contributions {
                 contributionId
diff --git a/thoth-client/assets/queries.graphql b/thoth-client/assets/queries.graphql
index b25301c8..2f65dc35 100644
--- a/thoth-client/assets/queries.graphql
+++ b/thoth-client/assets/queries.graphql
@@ -46,6 +46,7 @@ fragment Work on Work {
     edition
     doi
     publicationDate
+    withdrawnDate
     license
     copyrightHolder
     shortAbstract
@@ -161,6 +162,7 @@ fragment Work on Work {
             edition
             doi
             publicationDate
+            withdrawnDate
             license
             shortAbstract
             longAbstract

From eb6bcaa981b3d190c2f5afe8e9a7af41a16e6840 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Mon, 15 Apr 2024 11:24:37 +0200
Subject: [PATCH 04/12] Added hook to set withdrawn_date for chapter to same as
 parent Work

---
 thoth-api/src/graphql/model.rs      |  2 ++
 thoth-app/src/component/new_work.rs | 25 ++++++++++---------------
 thoth-app/src/component/utils.rs    |  3 +++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/thoth-api/src/graphql/model.rs b/thoth-api/src/graphql/model.rs
index 0ca0defc..e8d15aa9 100644
--- a/thoth-api/src/graphql/model.rs
+++ b/thoth-api/src/graphql/model.rs
@@ -1713,9 +1713,11 @@ impl MutationRoot {
                 for child in work.children(&context.db)? {
                     if child.publication_date != w.publication_date
                         || child.work_status != w.work_status
+                        || child.withdrawn_date != w.withdrawn_date
                     {
                         let mut data: PatchWork = child.clone().into();
                         data.publication_date = w.publication_date;
+                        data.withdrawn_date = w.withdrawn_date;
                         data.work_status = w.work_status.clone();
                         child.update(&context.db, &data, &account_id)?;
                     }
diff --git a/thoth-app/src/component/new_work.rs b/thoth-app/src/component/new_work.rs
index 7b4d1625..dc29ebaf 100644
--- a/thoth-app/src/component/new_work.rs
+++ b/thoth-app/src/component/new_work.rs
@@ -289,6 +289,9 @@ impl Component for NewWorkComponent {
                     self.work.last_page = None;
                     self.work.page_interval = None;
                 }
+                if self.work.work_status == WorkStatus::OutOfPrint {
+                    self.work.withdrawn_date = None;
+                }
                 let body = CreateWorkRequestBody {
                     variables: Variables {
                         work_type: self.work.work_type.clone(),
@@ -451,6 +454,7 @@ impl Component for NewWorkComponent {
         // Grey out chapter-specific or "book"-specific fields
         // based on currently selected work type.
         let is_chapter = self.work.work_type == WorkType::BookChapter;
+        let is_not_withdrawn_or_out_of_print = self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint;
         html! {
             <>
                 <nav class="level">
@@ -518,21 +522,12 @@ impl Component for NewWorkComponent {
                         value={ self.work.publication_date.clone() }
                         oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeDate(e.to_value())) }
                     />
-                    {
-                        if self.work.work_status == WorkStatus::WithdrawnFromSale || self.work.work_status == WorkStatus::OutOfPrint {
-                            html! {
-                                <>
-                                <FormDateInput
-                                label = "Withdrawn Date"
-                                value={ self.work.withdrawn_date.clone() }
-                                oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
-                                />
-                                </>
-                            }
-                        } else {
-                            html!{}
-                        }
-                    }
+                    <FormDateInput
+                        label = "Withdrawn Date"
+                        value={ self.work.withdrawn_date.clone() }
+                        oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
+                        deactivated={ is_not_withdrawn_or_out_of_print }
+                    />
                     <FormTextInput
                         label = "Place of Publication"
                         value={ self.work.place.clone() }
diff --git a/thoth-app/src/component/utils.rs b/thoth-app/src/component/utils.rs
index 8d773721..b3eeb843 100644
--- a/thoth-app/src/component/utils.rs
+++ b/thoth-app/src/component/utils.rs
@@ -140,6 +140,8 @@ pub struct FormDateInputProps {
     pub onblur: Callback<FocusEvent>,
     #[prop_or(false)]
     pub required: bool,
+    #[prop_or(false)]
+    pub deactivated: bool,
     #[prop_or_default]
     pub help_text: String,
 }
@@ -501,6 +503,7 @@ pub fn form_date_input(props: &FormDateInputProps) -> VNode {
             oninput={ props.oninput.clone() }
             onblur={ props.onblur.clone() }
             required={ props.required }
+            deactivated={ props.deactivated }
             help_text={ props.help_text.clone() }
         />
     }

From 5a0f4b1653e2f482ec133ed0ec6a7e009c514c73 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Tue, 16 Apr 2024 10:02:31 +0200
Subject: [PATCH 05/12] add withdrawn_date to export tests

---
 thoth-export-server/src/bibtex/bibtex_thoth.rs        | 3 +++
 thoth-export-server/src/csv/csv_thoth.rs              | 9 +++++++--
 thoth-export-server/src/csv/kbart_oclc.rs             | 1 +
 thoth-export-server/src/json/json_thoth.rs            | 2 ++
 thoth-export-server/src/marc21/marc21record_thoth.rs  | 2 ++
 thoth-export-server/src/xml/doideposit_crossref.rs    | 4 ++++
 thoth-export-server/src/xml/onix21_ebsco_host.rs      | 1 +
 thoth-export-server/src/xml/onix21_proquest_ebrary.rs | 1 +
 thoth-export-server/src/xml/onix3_google_books.rs     | 1 +
 thoth-export-server/src/xml/onix3_jstor.rs            | 1 +
 thoth-export-server/src/xml/onix3_oapen.rs            | 1 +
 thoth-export-server/src/xml/onix3_overdrive.rs        | 1 +
 thoth-export-server/src/xml/onix3_project_muse.rs     | 1 +
 thoth-export-server/src/xml/onix3_thoth.rs            | 5 +++++
 14 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/thoth-export-server/src/bibtex/bibtex_thoth.rs b/thoth-export-server/src/bibtex/bibtex_thoth.rs
index 257e6cfb..cb2b1f10 100644
--- a/thoth-export-server/src/bibtex/bibtex_thoth.rs
+++ b/thoth-export-server/src/bibtex/bibtex_thoth.rs
@@ -283,6 +283,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("http://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: Some("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.".to_string()),
@@ -477,6 +478,7 @@ mod tests {
                     edition: None,
                     doi: None,
                     publication_date: None,
+                    withdrawn_date: None,
                     license: None,
                     short_abstract: None,
                     long_abstract: None,
@@ -507,6 +509,7 @@ mod tests {
                     edition: None,
                     doi: None,
                     publication_date: None,
+                    withdrawn_date: None,
                     license: None,
                     short_abstract: None,
                     long_abstract: None,
diff --git a/thoth-export-server/src/csv/csv_thoth.rs b/thoth-export-server/src/csv/csv_thoth.rs
index dd8a05f0..b92609d6 100644
--- a/thoth-export-server/src/csv/csv_thoth.rs
+++ b/thoth-export-server/src/csv/csv_thoth.rs
@@ -25,6 +25,7 @@ struct CsvThothRow {
     doi: Option<String>,
     reference: Option<String>,
     publication_date: Option<String>,
+    withdrawn_date: Option<String>,
     publication_place: Option<String>,
     license: Option<String>,
     copyright_holder: Option<String>,
@@ -120,6 +121,7 @@ impl From<Work> for CsvThothRow {
             edition: work.edition,
             doi: work.doi.map(|d| d.to_string()),
             publication_date: work.publication_date.map(|d| d.to_string()),
+            withdrawn_date: work.withdrawn_date.map(|d| d.to_string()),
             publication_place: work.place,
             license: work.license,
             copyright_holder: work.copyright_holder,
@@ -523,6 +525,7 @@ mod tests {
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             reference: Some("IntRef1".to_string()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("http://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: Some("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.".to_string()),
@@ -825,6 +828,7 @@ mod tests {
                     edition: None,
                     doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0001").unwrap()),
                     publication_date: None,
+                    withdrawn_date: None,
                     license: None,
                     short_abstract: None,
                     long_abstract: None,
@@ -870,8 +874,8 @@ mod tests {
         };
     }
 
-    const TEST_RESULT: &str = r#""publisher","imprint","work_type","work_status","title","subtitle","edition","doi","reference","publication_date","publication_place","license","copyright_holder","landing_page","page_count","page_breakdown","first_page","last_page","page_interval","image_count","table_count","audio_count","video_count","lccn","oclc","short_abstract","long_abstract","general_note","bibliography_note","toc","cover_url","cover_caption","contributions [(type, first_name, last_name, full_name, is_main, biography, orcid, website, [(position, institution, institution_doi, ror, country)])]","publications [(type, isbn, width (mm), width (cm), width (in), height (mm), height (cm), height (in), depth (mm), depth (cm), depth (in), weight (g), weight (oz), [(ISO_4217_currency, price)], [(landing_page, full_text, platform, is_canonical)])]","series [(type, name, issn_print, issn_digital, url, cfp_url, description, issue)]","languages [(relation, ISO_639-3/B_language, is_main)]","BIC [code]","THEMA [code]","BISAC [code]","LCC [code]","custom_categories [category]","keywords [keyword]","funding [(institution, institution_doi, ror, country, program, project, grant, jurisdiction)]","relations [(related_work, doi, relation_type, relation_number)]","references [(doi, citation, issn, isbn, journal_title, article_title, series_title, volume_title, edition, author, volume, issue, first_page, component_number, standard_designator, standards_body, publication_date, retrieval_date)]"
-"OA Editions","OA Editions Imprint","MONOGRAPH","ACTIVE","Book Title","Book Subtitle","1","10.00001/BOOK.0001","IntRef1","1999-12-31","León, Spain","http://creativecommons.org/licenses/by/4.0/","Author 1; Author 2","https://www.book.com","334","x+334","","","","15","20","25","30","123456789","987654321","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementum odio feugiat tempus. Etiam eu felis ac metus viverra ornare. In consectetur neque sed feugiat ornare. Mauris at purus fringilla orci tincidunt pulvinar sed a massa. Nullam vestibulum posuere augue, sit amet tincidunt nisl pulvinar ac.","This is a general note","This is a bibliography note","1. Chapter 1","https://www.book.com/cover","This is a cover caption","[(""AUTHOR"", ""Author"", ""1"", ""Author 1"", ""true"", ""Author 1 is an author"", ""0000-0002-0000-0001"", """", [(""Manager"", ""University of Life"", """", ""0abcdef12"", """")]),(""AUTHOR"", ""Author"", ""2"", ""Author 2"", ""true"", """", """", """", )]","[(""PAPERBACK"", ""978-3-16-148410-0"", ""156"", ""15.6"", ""6.14"", ""234"", ""23.4"", ""9.21"", ""25"", ""2.5"", ""1"", ""152"", ""5.3616"", [(""EUR"", ""25.95""),(""GBP"", ""22.95""),(""USD"", ""31.95"")], [(""https://www.book.com/paperback"", """", ""OTHER"", ""true""),(""https://www.jstor.com/paperback"", """", ""JSTOR"", ""false"")]),(""HARDBACK"", ""978-1-4028-9462-6"", """", """", """", """", """", """", """", """", """", """", """", [(""EUR"", ""36.95""),(""GBP"", ""32.95""),(""USD"", ""40.95"")], ),(""PDF"", ""978-1-56619-909-4"", """", """", """", """", """", """", """", """", """", """", """", , [(""https://www.book.com/pdf_landing"", ""https://www.book.com/pdf_fulltext"", ""OTHER"", ""true"")]),(""HTML"", """", """", """", """", """", """", """", """", """", """", """", """", , [(""https://www.book.com/html_landing"", ""https://www.book.com/html_fulltext"", ""OTHER"", ""true"")]),(""XML"", ""978-92-95055-02-5"", """", """", """", """", """", """", """", """", """", """", """", , )]","[(""JOURNAL"", ""Name of series"", ""1234-5678"", ""8765-4321"", ""https://www.series.com"", ""https://www.series.com/cfp"", ""Description of series"", ""1"")]","[(""ORIGINAL"", ""SPA"", ""true"")]","[""AAA"",""AAB""]","[""JWA""]","[""AAA000000"",""AAA000001""]","[""JA85""]","[""Category1""]","[""keyword1"",""keyword2""]","[(""Name of institution"", ""10.00001/INSTITUTION.0001"", ""0aaaaaa00"", ""MDA"", ""Name of program"", ""Name of project"", ""Number of grant"", ""Funding jurisdiction"")]","[(""Related work title"", ""10.00001/RELATION.0001"", ""HAS_CHILD"", ""1"")]","[(""10.00001/reference"", ""Author, A. (2022) Article, Journal."", ""1111-2222"", """", ""Journal"", ""Article"", """", """", """", ""Author, A"", """", """", ""3"", """", """", """", ""2022-01-01"", ""2022-12-31"")]"
+    const TEST_RESULT: &str = r#""publisher","imprint","work_type","work_status","title","subtitle","edition","doi","reference","publication_date","withdrawn_date,"publication_place","license","copyright_holder","landing_page","page_count","page_breakdown","first_page","last_page","page_interval","image_count","table_count","audio_count","video_count","lccn","oclc","short_abstract","long_abstract","general_note","bibliography_note","toc","cover_url","cover_caption","contributions [(type, first_name, last_name, full_name, is_main, biography, orcid, website, [(position, institution, institution_doi, ror, country)])]","publications [(type, isbn, width (mm), width (cm), width (in), height (mm), height (cm), height (in), depth (mm), depth (cm), depth (in), weight (g), weight (oz), [(ISO_4217_currency, price)], [(landing_page, full_text, platform, is_canonical)])]","series [(type, name, issn_print, issn_digital, url, cfp_url, description, issue)]","languages [(relation, ISO_639-3/B_language, is_main)]","BIC [code]","THEMA [code]","BISAC [code]","LCC [code]","custom_categories [category]","keywords [keyword]","funding [(institution, institution_doi, ror, country, program, project, grant, jurisdiction)]","relations [(related_work, doi, relation_type, relation_number)]","references [(doi, citation, issn, isbn, journal_title, article_title, series_title, volume_title, edition, author, volume, issue, first_page, component_number, standard_designator, standards_body, publication_date, retrieval_date)]"
+"OA Editions","OA Editions Imprint","MONOGRAPH","ACTIVE","Book Title","Book Subtitle","1","10.00001/BOOK.0001","IntRef1","1999-12-31","","León, Spain","http://creativecommons.org/licenses/by/4.0/","Author 1; Author 2","https://www.book.com","334","x+334","","","","15","20","25","30","123456789","987654321","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementum odio feugiat tempus. Etiam eu felis ac metus viverra ornare. In consectetur neque sed feugiat ornare. Mauris at purus fringilla orci tincidunt pulvinar sed a massa. Nullam vestibulum posuere augue, sit amet tincidunt nisl pulvinar ac.","This is a general note","This is a bibliography note","1. Chapter 1","https://www.book.com/cover","This is a cover caption","[(""AUTHOR"", ""Author"", ""1"", ""Author 1"", ""true"", ""Author 1 is an author"", ""0000-0002-0000-0001"", """", [(""Manager"", ""University of Life"", """", ""0abcdef12"", """")]),(""AUTHOR"", ""Author"", ""2"", ""Author 2"", ""true"", """", """", """", )]","[(""PAPERBACK"", ""978-3-16-148410-0"", ""156"", ""15.6"", ""6.14"", ""234"", ""23.4"", ""9.21"", ""25"", ""2.5"", ""1"", ""152"", ""5.3616"", [(""EUR"", ""25.95""),(""GBP"", ""22.95""),(""USD"", ""31.95"")], [(""https://www.book.com/paperback"", """", ""OTHER"", ""true""),(""https://www.jstor.com/paperback"", """", ""JSTOR"", ""false"")]),(""HARDBACK"", ""978-1-4028-9462-6"", """", """", """", """", """", """", """", """", """", """", """", [(""EUR"", ""36.95""),(""GBP"", ""32.95""),(""USD"", ""40.95"")], ),(""PDF"", ""978-1-56619-909-4"", """", """", """", """", """", """", """", """", """", """", """", , [(""https://www.book.com/pdf_landing"", ""https://www.book.com/pdf_fulltext"", ""OTHER"", ""true"")]),(""HTML"", """", """", """", """", """", """", """", """", """", """", """", """", , [(""https://www.book.com/html_landing"", ""https://www.book.com/html_fulltext"", ""OTHER"", ""true"")]),(""XML"", ""978-92-95055-02-5"", """", """", """", """", """", """", """", """", """", """", """", , )]","[(""JOURNAL"", ""Name of series"", ""1234-5678"", ""8765-4321"", ""https://www.series.com"", ""https://www.series.com/cfp"", ""Description of series"", ""1"")]","[(""ORIGINAL"", ""SPA"", ""true"")]","[""AAA"",""AAB""]","[""JWA""]","[""AAA000000"",""AAA000001""]","[""JA85""]","[""Category1""]","[""keyword1"",""keyword2""]","[(""Name of institution"", ""10.00001/INSTITUTION.0001"", ""0aaaaaa00"", ""MDA"", ""Name of program"", ""Name of project"", ""Number of grant"", ""Funding jurisdiction"")]","[(""Related work title"", ""10.00001/RELATION.0001"", ""HAS_CHILD"", ""1"")]","[(""10.00001/reference"", ""Author, A. (2022) Article, Journal."", ""1111-2222"", """", ""Journal"", ""Article"", """", """", """", ""Author, A"", """", """", ""3"", """", """", """", ""2022-01-01"", ""2022-12-31"")]"
 "#;
 
     #[test]
@@ -1150,6 +1154,7 @@ mod tests {
                 edition: None,
                 doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0001").unwrap()),
                 publication_date: None,
+                withdrawn_date: None,
                 license: None,
                 short_abstract: None,
                 long_abstract: None,
diff --git a/thoth-export-server/src/csv/kbart_oclc.rs b/thoth-export-server/src/csv/kbart_oclc.rs
index b0d29a82..9c8cfa39 100644
--- a/thoth-export-server/src/csv/kbart_oclc.rs
+++ b/thoth-export-server/src/csv/kbart_oclc.rs
@@ -248,6 +248,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("http://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: Some("Lorem ipsum dolor sit amet".to_string()),
diff --git a/thoth-export-server/src/json/json_thoth.rs b/thoth-export-server/src/json/json_thoth.rs
index 1c9eefbe..2d221ad1 100644
--- a/thoth-export-server/src/json/json_thoth.rs
+++ b/thoth-export-server/src/json/json_thoth.rs
@@ -86,6 +86,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("http://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: Some("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.".to_string()),
@@ -388,6 +389,7 @@ mod tests {
                     edition: None,
                     doi: None,
                     publication_date: None,
+                    withdrawn_date: None,
                     license: None,
                     short_abstract: None,
                     long_abstract: None,
diff --git a/thoth-export-server/src/marc21/marc21record_thoth.rs b/thoth-export-server/src/marc21/marc21record_thoth.rs
index 7b119eec..2dbb855d 100644
--- a/thoth-export-server/src/marc21/marc21record_thoth.rs
+++ b/thoth-export-server/src/marc21/marc21record_thoth.rs
@@ -793,6 +793,7 @@ pub(crate) mod tests {
             edition: Some(2),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(2010, 2, 1),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: None,
             short_abstract: None,
@@ -1056,6 +1057,7 @@ pub(crate) mod tests {
                 edition: None,
                 doi: None,
                 publication_date: None,
+                withdrawn_date: None,
                 license: None,
                 short_abstract: None,
                 long_abstract: None,
diff --git a/thoth-export-server/src/xml/doideposit_crossref.rs b/thoth-export-server/src/xml/doideposit_crossref.rs
index 1ab19866..9cc88cc2 100644
--- a/thoth-export-server/src/xml/doideposit_crossref.rs
+++ b/thoth-export-server/src/xml/doideposit_crossref.rs
@@ -814,6 +814,7 @@ mod tests {
                 edition: None,
                 doi: Some(Doi::from_str("https://doi.org/10.00001/CHAPTER.0001").unwrap()),
                 publication_date: chrono::NaiveDate::from_ymd_opt(2000, 2, 28),
+                withdrawn_date: None,
                 license: Some("https://creativecommons.org/licenses/by-nd/4.0/".to_string()),
                 short_abstract: Some("A shorter abstract".to_string()),
                 long_abstract: Some("First paragraph.\n\nSecond paragraph.".to_string()),
@@ -1016,6 +1017,7 @@ mod tests {
             edition: Some(100),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
@@ -1263,6 +1265,7 @@ mod tests {
                     edition: None,
                     doi: Some(Doi::from_str("https://doi.org/10.00001/PART.0001").unwrap()),
                     publication_date: chrono::NaiveDate::from_ymd_opt(2000, 2, 28),
+                    withdrawn_date: None,
                     license: Some("https://creativecommons.org/licenses/by-nd/4.0/".to_string()),
                     short_abstract: None,
                     long_abstract: None,
@@ -1584,6 +1587,7 @@ mod tests {
             edition: Some(100),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix21_ebsco_host.rs b/thoth-export-server/src/xml/onix21_ebsco_host.rs
index 18390d68..7bd26953 100644
--- a/thoth-export-server/src/xml/onix21_ebsco_host.rs
+++ b/thoth-export-server/src/xml/onix21_ebsco_host.rs
@@ -872,6 +872,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
index 395cb48f..ad152277 100644
--- a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
+++ b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
@@ -864,6 +864,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix3_google_books.rs b/thoth-export-server/src/xml/onix3_google_books.rs
index 0578701a..a5c1ecae 100644
--- a/thoth-export-server/src/xml/onix3_google_books.rs
+++ b/thoth-export-server/src/xml/onix3_google_books.rs
@@ -831,6 +831,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix3_jstor.rs b/thoth-export-server/src/xml/onix3_jstor.rs
index e679c1ee..928b37c3 100644
--- a/thoth-export-server/src/xml/onix3_jstor.rs
+++ b/thoth-export-server/src/xml/onix3_jstor.rs
@@ -712,6 +712,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix3_oapen.rs b/thoth-export-server/src/xml/onix3_oapen.rs
index 879c534e..406648b7 100644
--- a/thoth-export-server/src/xml/onix3_oapen.rs
+++ b/thoth-export-server/src/xml/onix3_oapen.rs
@@ -968,6 +968,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix3_overdrive.rs b/thoth-export-server/src/xml/onix3_overdrive.rs
index ab31ad56..d0202498 100644
--- a/thoth-export-server/src/xml/onix3_overdrive.rs
+++ b/thoth-export-server/src/xml/onix3_overdrive.rs
@@ -1075,6 +1075,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix3_project_muse.rs b/thoth-export-server/src/xml/onix3_project_muse.rs
index 54bdb102..45375baa 100644
--- a/thoth-export-server/src/xml/onix3_project_muse.rs
+++ b/thoth-export-server/src/xml/onix3_project_muse.rs
@@ -729,6 +729,7 @@ mod tests {
             edition: Some(1),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: None,
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 0f718536..02b61629 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -1987,6 +1987,7 @@ mod tests {
                 edition: None,
                 doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0001").unwrap()),
                 publication_date: None,
+                withdrawn_date: None,
                 license: None,
                 short_abstract: None,
                 long_abstract: None,
@@ -2069,6 +2070,7 @@ mod tests {
             edition: Some(2),
             doi: Some(Doi::from_str("https://doi.org/10.00001/BOOK.0001").unwrap()),
             publication_date: chrono::NaiveDate::from_ymd_opt(1999, 12, 31),
+            withdrawn_date: None,
             license: Some("https://creativecommons.org/licenses/by/4.0/".to_string()),
             copyright_holder: Some("Author 1; Author 2".to_string()),
             short_abstract: Some("Lorem ipsum dolor sit amet.".to_string()),
@@ -2199,6 +2201,7 @@ mod tests {
                         edition: None,
                         doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0001").unwrap()),
                         publication_date: None,
+                        withdrawn_date: None,
                         license: None,
                         short_abstract: None,
                         long_abstract: None,
@@ -2229,6 +2232,7 @@ mod tests {
                         edition: None,
                         doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0002").unwrap()),
                         publication_date: None,
+                        withdrawn_date: None,
                         license: None,
                         short_abstract: None,
                         long_abstract: None,
@@ -2259,6 +2263,7 @@ mod tests {
                         edition: None,
                         doi: Some(Doi::from_str("https://doi.org/10.00001/RELATION.0003").unwrap()),
                         publication_date: None,
+                        withdrawn_date: None,
                         license: None,
                         short_abstract: None,
                         long_abstract: None,

From 731e55163e8318e6f61d321709b918295ee10692 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Tue, 16 Apr 2024 16:45:48 +0200
Subject: [PATCH 06/12] Rename migrations folder

---
 thoth-api/migrations/{v0.11.20 => v0.12.4}/down.sql | 0
 thoth-api/migrations/{v0.11.20 => v0.12.4}/up.sql   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename thoth-api/migrations/{v0.11.20 => v0.12.4}/down.sql (100%)
 rename thoth-api/migrations/{v0.11.20 => v0.12.4}/up.sql (100%)

diff --git a/thoth-api/migrations/v0.11.20/down.sql b/thoth-api/migrations/v0.12.4/down.sql
similarity index 100%
rename from thoth-api/migrations/v0.11.20/down.sql
rename to thoth-api/migrations/v0.12.4/down.sql
diff --git a/thoth-api/migrations/v0.11.20/up.sql b/thoth-api/migrations/v0.12.4/up.sql
similarity index 100%
rename from thoth-api/migrations/v0.11.20/up.sql
rename to thoth-api/migrations/v0.12.4/up.sql

From dc07d54e23b5bd4d01bb0f8c962681b56dffab79 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Wed, 17 Apr 2024 11:10:24 +0200
Subject: [PATCH 07/12] Combined migrations v.0.12.3 and v.0.12.4 into v.0.12.3

---
 thoth-api/migrations/v0.12.3/down.sql |  4 ++++
 thoth-api/migrations/v0.12.3/up.sql   | 13 +++++++++++++
 thoth-api/migrations/v0.12.4/down.sql |  4 ----
 thoth-api/migrations/v0.12.4/up.sql   | 13 -------------
 4 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 thoth-api/migrations/v0.12.4/down.sql
 delete mode 100644 thoth-api/migrations/v0.12.4/up.sql

diff --git a/thoth-api/migrations/v0.12.3/down.sql b/thoth-api/migrations/v0.12.3/down.sql
index a0217cc8..527ec6cb 100644
--- a/thoth-api/migrations/v0.12.3/down.sql
+++ b/thoth-api/migrations/v0.12.3/down.sql
@@ -3,3 +3,7 @@ ALTER TABLE series
 
 ALTER TABLE series
     ALTER COLUMN issn_digital SET NOT NULL;
+
+ALTER TABLE work
+    DROP CONSTRAINT work_withdrawn_date_check,
+    DROP COLUMN withdrawn_date;
diff --git a/thoth-api/migrations/v0.12.3/up.sql b/thoth-api/migrations/v0.12.3/up.sql
index 46469ff6..c2369215 100644
--- a/thoth-api/migrations/v0.12.3/up.sql
+++ b/thoth-api/migrations/v0.12.3/up.sql
@@ -4,3 +4,16 @@ ALTER TABLE series
 ALTER TABLE series
     ALTER COLUMN issn_digital DROP NOT NULL;
 
+ALTER TABLE work
+    ADD COLUMN withdrawn_date DATE;
+
+UPDATE work                              
+    SET withdrawn_date = updated_at    
+    WHERE (work_status = 'withdrawn-from-sale' 
+    OR work_status = 'out-of-print');
+
+ALTER TABLE work
+    ADD CONSTRAINT work_withdrawn_date_check CHECK
+        (((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print')
+        AND withdrawn_date IS NOT NULL)
+        OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print') AND withdrawn_date IS NULL));
\ No newline at end of file
diff --git a/thoth-api/migrations/v0.12.4/down.sql b/thoth-api/migrations/v0.12.4/down.sql
deleted file mode 100644
index e9b5c49a..00000000
--- a/thoth-api/migrations/v0.12.4/down.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE work
-    DROP CONSTRAINT work_withdrawn_date_check,
-    DROP COLUMN withdrawn_date;
-    
\ No newline at end of file
diff --git a/thoth-api/migrations/v0.12.4/up.sql b/thoth-api/migrations/v0.12.4/up.sql
deleted file mode 100644
index 4257e211..00000000
--- a/thoth-api/migrations/v0.12.4/up.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE work
-    ADD COLUMN withdrawn_date DATE;
-
-UPDATE work                              
-    SET withdrawn_date = updated_at    
-    WHERE (work_status = 'withdrawn-from-sale' 
-    OR work_status = 'out-of-print');
-
-ALTER TABLE work
-    ADD CONSTRAINT work_withdrawn_date_check CHECK
-        (((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print')
-        AND withdrawn_date IS NOT NULL)
-        OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print') AND withdrawn_date IS NULL));
\ No newline at end of file

From e18407f44bede0e6ccb59856e7bc71a0d706d398 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Thu, 18 Apr 2024 13:04:25 +0200
Subject: [PATCH 08/12] Added withdrawn_date to all ONIX exports, added field
 to tests

---
 thoth-export-server/src/csv/csv_thoth.rs      |  2 +-
 thoth-export-server/src/json/json_thoth.rs    |  2 ++
 .../src/xml/onix21_ebsco_host.rs              | 11 ++++++
 .../src/xml/onix21_proquest_ebrary.rs         | 11 ++++++
 .../src/xml/onix3_google_books.rs             | 35 +++++++++++++++++--
 thoth-export-server/src/xml/onix3_jstor.rs    | 31 ++++++++++++++++
 thoth-export-server/src/xml/onix3_oapen.rs    | 32 +++++++++++++++++
 .../src/xml/onix3_overdrive.rs                | 31 ++++++++++++++++
 .../src/xml/onix3_project_muse.rs             | 34 ++++++++++++++++++
 thoth-export-server/src/xml/onix3_thoth.rs    | 31 ++++++++++++++++
 10 files changed, 217 insertions(+), 3 deletions(-)

diff --git a/thoth-export-server/src/csv/csv_thoth.rs b/thoth-export-server/src/csv/csv_thoth.rs
index 046472f7..dd9d37ae 100644
--- a/thoth-export-server/src/csv/csv_thoth.rs
+++ b/thoth-export-server/src/csv/csv_thoth.rs
@@ -876,7 +876,7 @@ mod tests {
         };
     }
 
-    const TEST_RESULT: &str = r#""publisher","imprint","work_type","work_status","title","subtitle","edition","doi","reference","publication_date","withdrawn_date,"publication_place","license","copyright_holder","landing_page","page_count","page_breakdown","first_page","last_page","page_interval","image_count","table_count","audio_count","video_count","lccn","oclc","short_abstract","long_abstract","general_note","bibliography_note","toc","cover_url","cover_caption","contributions [(type, first_name, last_name, full_name, is_main, biography, orcid, website, [(position, institution, institution_doi, ror, country)])]","publications [(type, isbn, width (mm), width (cm), width (in), height (mm), height (cm), height (in), depth (mm), depth (cm), depth (in), weight (g), weight (oz), [(ISO_4217_currency, price)], [(landing_page, full_text, platform, is_canonical)])]","series [(type, name, issn_print, issn_digital, url, cfp_url, description, issue)]","languages [(relation, ISO_639-3/B_language, is_main)]","BIC [code]","THEMA [code]","BISAC [code]","LCC [code]","custom_categories [category]","keywords [keyword]","funding [(institution, institution_doi, ror, country, program, project, grant, jurisdiction)]","relations [(related_work, doi, relation_type, relation_number)]","references [(doi, citation, issn, isbn, journal_title, article_title, series_title, volume_title, edition, author, volume, issue, first_page, component_number, standard_designator, standards_body, publication_date, retrieval_date)]"
+    const TEST_RESULT: &str = r#""publisher","imprint","work_type","work_status","title","subtitle","edition","doi","reference","publication_date","withdrawn_date","publication_place","license","copyright_holder","landing_page","page_count","page_breakdown","first_page","last_page","page_interval","image_count","table_count","audio_count","video_count","lccn","oclc","short_abstract","long_abstract","general_note","bibliography_note","toc","cover_url","cover_caption","contributions [(type, first_name, last_name, full_name, is_main, biography, orcid, website, [(position, institution, institution_doi, ror, country)])]","publications [(type, isbn, width (mm), width (cm), width (in), height (mm), height (cm), height (in), depth (mm), depth (cm), depth (in), weight (g), weight (oz), [(ISO_4217_currency, price)], [(landing_page, full_text, platform, is_canonical)])]","series [(type, name, issn_print, issn_digital, url, cfp_url, description, issue)]","languages [(relation, ISO_639-3/B_language, is_main)]","BIC [code]","THEMA [code]","BISAC [code]","LCC [code]","custom_categories [category]","keywords [keyword]","funding [(institution, institution_doi, ror, country, program, project, grant, jurisdiction)]","relations [(related_work, doi, relation_type, relation_number)]","references [(doi, citation, issn, isbn, journal_title, article_title, series_title, volume_title, edition, author, volume, issue, first_page, component_number, standard_designator, standards_body, publication_date, retrieval_date)]"
 "OA Editions","OA Editions Imprint","MONOGRAPH","ACTIVE","Book Title","Book Subtitle","1","10.00001/BOOK.0001","IntRef1","1999-12-31","","León, Spain","http://creativecommons.org/licenses/by/4.0/","Author 1; Author 2","https://www.book.com","334","x+334","","","","15","20","25","30","123456789","987654321","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.","Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam ornare bibendum ex nec dapibus. Proin porta risus elementum odio feugiat tempus. Etiam eu felis ac metus viverra ornare. In consectetur neque sed feugiat ornare. Mauris at purus fringilla orci tincidunt pulvinar sed a massa. Nullam vestibulum posuere augue, sit amet tincidunt nisl pulvinar ac.","This is a general note","This is a bibliography note","1. Chapter 1","https://www.book.com/cover","This is a cover caption","[(""AUTHOR"", ""Author"", ""1"", ""Author 1"", ""true"", ""Author 1 is an author"", ""0000-0002-0000-0001"", """", [(""Manager"", ""University of Life"", """", ""0abcdef12"", """")]),(""AUTHOR"", ""Author"", ""2"", ""Author 2"", ""true"", """", """", """", )]","[(""PAPERBACK"", ""978-3-16-148410-0"", ""156"", ""15.6"", ""6.14"", ""234"", ""23.4"", ""9.21"", ""25"", ""2.5"", ""1"", ""152"", ""5.3616"", [(""EUR"", ""25.95""),(""GBP"", ""22.95""),(""USD"", ""31.95"")], [(""https://www.book.com/paperback"", """", ""OTHER"", ""true""),(""https://www.jstor.com/paperback"", """", ""JSTOR"", ""false"")]),(""HARDBACK"", ""978-1-4028-9462-6"", """", """", """", """", """", """", """", """", """", """", """", [(""EUR"", ""36.95""),(""GBP"", ""32.95""),(""USD"", ""40.95"")], ),(""PDF"", ""978-1-56619-909-4"", """", """", """", """", """", """", """", """", """", """", """", , [(""https://www.book.com/pdf_landing"", ""https://www.book.com/pdf_fulltext"", ""OTHER"", ""true"")]),(""HTML"", """", """", """", """", """", """", """", """", """", """", """", """", , [(""https://www.book.com/html_landing"", ""https://www.book.com/html_fulltext"", ""OTHER"", ""true"")]),(""XML"", ""978-92-95055-02-5"", """", """", """", """", """", """", """", """", """", """", """", , )]","[(""JOURNAL"", ""Name of series"", ""1234-5678"", ""8765-4321"", ""https://www.series.com"", ""https://www.series.com/cfp"", ""Description of series"", ""1"")]","[(""ORIGINAL"", ""SPA"", ""true"")]","[""AAA"",""AAB""]","[""JWA""]","[""AAA000000"",""AAA000001""]","[""JA85""]","[""Category1""]","[""keyword1"",""keyword2""]","[(""Name of institution"", ""10.00001/INSTITUTION.0001"", ""0aaaaaa00"", ""MDA"", ""Name of program"", ""Name of project"", ""Number of grant"", ""Funding jurisdiction"")]","[(""Related work title"", ""10.00001/RELATION.0001"", ""HAS_CHILD"", ""1"")]","[(""10.00001/reference"", ""Author, A. (2022) Article, Journal."", ""1111-2222"", """", ""Journal"", ""Article"", """", """", """", ""Author, A"", """", """", ""3"", """", """", """", ""2022-01-01"", ""2022-12-31"")]"
 "#;
 
diff --git a/thoth-export-server/src/json/json_thoth.rs b/thoth-export-server/src/json/json_thoth.rs
index 10964dff..07e09504 100644
--- a/thoth-export-server/src/json/json_thoth.rs
+++ b/thoth-export-server/src/json/json_thoth.rs
@@ -448,6 +448,7 @@ mod tests {
   "edition": 1,
   "doi": "https://doi.org/10.00001/BOOK.0001",
   "publicationDate": "1999-12-31",
+  "withdrawnDate": null,
   "license": "http://creativecommons.org/licenses/by/4.0/",
   "copyrightHolder": "Author 1; Author 2",
   "shortAbstract": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum vel libero eleifend, ultrices purus vitae, suscipit ligula. Aliquam ornare quam et nulla vestibulum, id euismod tellus malesuada. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.",
@@ -761,6 +762,7 @@ mod tests {
         "edition": null,
         "doi": null,
         "publicationDate": null,
+        "withdrawnDate": null,
         "license": null,
         "shortAbstract": null,
         "longAbstract": null,
diff --git a/thoth-export-server/src/xml/onix21_ebsco_host.rs b/thoth-export-server/src/xml/onix21_ebsco_host.rs
index 0223238a..c718adb3 100644
--- a/thoth-export-server/src/xml/onix21_ebsco_host.rs
+++ b/thoth-export-server/src/xml/onix21_ebsco_host.rs
@@ -383,6 +383,12 @@ impl XmlElementBlock<Onix21EbscoHost> for Work {
                         })?;
                     }
                 }
+                if let Some(date) = self.withdrawn_date {
+                    write_element_block("OutofPrintDate", w, |w| {
+                        w.write(XmlEvent::Characters(&date.format("%Y%m%d").to_string()))
+                            .map_err(|e| e.into())
+                    })?;
+                }
                 write_element_block("SupplyDetail", w, |w| {
                     write_element_block("SupplierName", w, |w| {
                         w.write(XmlEvent::Characters(&self.imprint.publisher.publisher_name))
@@ -1087,6 +1093,11 @@ mod tests {
         assert!(output.contains(r#"      <PriceAmount>0.01</PriceAmount>"#));
         assert!(output.contains(r#"      <CurrencyCode>USD</CurrencyCode>"#));
 
+        // Add withdrawn date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(r#"  <OutofPrintDate>20201231</OutofPrintDate>"#));
+
         // Remove some values to test non-output of optional blocks
         test_work.doi = None;
         test_work.license = None;
diff --git a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
index edb9e1e0..edaa7266 100644
--- a/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
+++ b/thoth-export-server/src/xml/onix21_proquest_ebrary.rs
@@ -383,6 +383,12 @@ impl XmlElementBlock<Onix21ProquestEbrary> for Work {
                         })?;
                     }
                 }
+                if let Some(date) = self.withdrawn_date {
+                    write_element_block("OutofPrintDate", w, |w| {
+                        w.write(XmlEvent::Characters(&date.format("%Y%m%d").to_string()))
+                            .map_err(|e| e.into())
+                    })?;
+                }
                 write_element_block("SupplyDetail", w, |w| {
                     write_element_block("SupplierName", w, |w| {
                         w.write(XmlEvent::Characters(&self.imprint.publisher.publisher_name))
@@ -1076,6 +1082,11 @@ mod tests {
             .contains(r#"    <AudienceRestrictionNote>Open access</AudienceRestrictionNote>"#));
         assert!(output.contains(r#"    <UnpricedItemType>01</UnpricedItemType>"#));
 
+        // Add withdrawn date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(r#"  <OutofPrintDate>20201231</OutofPrintDate>"#));
+
         // Remove some values to test non-output of optional blocks
         test_work.doi = None;
         test_work.license = None;
diff --git a/thoth-export-server/src/xml/onix3_google_books.rs b/thoth-export-server/src/xml/onix3_google_books.rs
index 04571cf3..4c414ca2 100644
--- a/thoth-export-server/src/xml/onix3_google_books.rs
+++ b/thoth-export-server/src/xml/onix3_google_books.rs
@@ -339,6 +339,26 @@ impl XmlElementBlock<Onix3GoogleBooks> for Work {
                             .map_err(|e| e.into())
                         })
                     })?;
+                    if let Some(date) = &self.withdrawn_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 13 Out-of-print / permanently withdrawn date
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
                     write_element_block("SalesRights", w, |w| {
                         // 02 For sale with non-exclusive rights in the specified countries or territories
                         write_element_block("SalesRightsType", w, |w| {
@@ -1146,9 +1166,20 @@ mod tests {
             "Could not generate onix_3.0::google_books: Missing Publication Date".to_string()
         );
 
-        // Replace publication date but remove the only (PDF) publication's only location
-        // Result: error (can't generate Google Books ONIX without EPUB or PDF URL)
+        // Replace publication date, add withdrawn date
         test_work.publication_date = chrono::NaiveDate::from_ymd_opt(1999, 12, 31);
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>13</PublishingDateRole>
+      <Date dateformat="00">20201231</Date>
+    </PublishingDate>"#
+        ));
+
+        // Remove the only (PDF) publication's only location
+        // Result: error (can't generate Google Books ONIX without EPUB or PDF URL)
         test_work.publications[0].locations.clear();
         let output = generate_test_output(false, &test_work);
         assert_eq!(
diff --git a/thoth-export-server/src/xml/onix3_jstor.rs b/thoth-export-server/src/xml/onix3_jstor.rs
index 72cf123d..60233de5 100644
--- a/thoth-export-server/src/xml/onix3_jstor.rs
+++ b/thoth-export-server/src/xml/onix3_jstor.rs
@@ -310,6 +310,26 @@ impl XmlElementBlock<Onix3Jstor> for Work {
                             )
                         })?;
                     }
+                    if let Some(date) = &self.withdrawn_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 13 Out-of-print / permanently withdrawn date
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
                     Ok(())
                 })?;
                 if !print_isbn.is_empty() {
@@ -1032,6 +1052,17 @@ mod tests {
         assert!(!output.contains(r#"        <ProductIDType>15</ProductIDType>"#));
         assert!(!output.contains(r#"    <IDValue>9781402894626</IDValue>"#));
 
+        // Add withdrawn date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>13</PublishingDateRole>
+      <Date dateformat="00">20201231</Date>
+    </PublishingDate>"#
+        ));
+
         // Remove all subjects
         // Result: error (can't generate JSTOR ONIX without a BISAC subject)
         test_work.subjects.clear();
diff --git a/thoth-export-server/src/xml/onix3_oapen.rs b/thoth-export-server/src/xml/onix3_oapen.rs
index 396e1be9..688f5b86 100644
--- a/thoth-export-server/src/xml/onix3_oapen.rs
+++ b/thoth-export-server/src/xml/onix3_oapen.rs
@@ -305,6 +305,26 @@ impl XmlElementBlock<Onix3Oapen> for Work {
                             )
                         })?;
                     }
+                    if let Some(date) = &self.withdrawn_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 13 Out-of-print / permanently withdrawn date
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
                     Ok(())
                 })?;
                 if !isbns.is_empty() {
@@ -1181,6 +1201,18 @@ mod tests {
         ));
         assert!(!output.contains(r#"          <WebsiteLink>https://www.book.com</WebsiteLink>"#));
 
+        // Add withdrawn_date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        // println!("output is {output}");
+        assert!(output.contains(
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>13</PublishingDateRole>
+      <Date dateformat="00">20201231</Date>
+    </PublishingDate>"#
+        ));
+
         // Replace long abstract but remove cover URL
         // Result: CollateralDetail block still present, but now only contains long abstract
         test_work.long_abstract = Some("Lorem ipsum dolor sit amet".to_string());
diff --git a/thoth-export-server/src/xml/onix3_overdrive.rs b/thoth-export-server/src/xml/onix3_overdrive.rs
index 4bc56959..0f90f439 100644
--- a/thoth-export-server/src/xml/onix3_overdrive.rs
+++ b/thoth-export-server/src/xml/onix3_overdrive.rs
@@ -357,6 +357,26 @@ impl XmlElementBlock<Onix3Overdrive> for Work {
                             .map_err(|e| e.into())
                         })
                     })?;
+                    if let Some(date) = &self.withdrawn_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 13 Out-of-print / permanently withdrawn date
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
                     write_element_block("SalesRights", w, |w| {
                         // 02 For sale with non-exclusive rights in the specified countries or territories
                         write_element_block("SalesRightsType", w, |w| {
@@ -1386,6 +1406,17 @@ mod tests {
         assert!(!output.contains(r#"      <SubjectSchemeIdentifier>B2</SubjectSchemeIdentifier>"#));
         assert!(!output.contains(r#"      <SubjectCode>custom1</SubjectCode>"#));
 
+        // Add withdrawn_date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>13</PublishingDateRole>
+      <Date dateformat="00">20201231</Date>
+    </PublishingDate>"#
+        ));
+
         // Remove the only language: result is error
         test_work.languages.clear();
         let output = generate_test_output(false, &test_work);
diff --git a/thoth-export-server/src/xml/onix3_project_muse.rs b/thoth-export-server/src/xml/onix3_project_muse.rs
index d4dbea44..fabbac12 100644
--- a/thoth-export-server/src/xml/onix3_project_muse.rs
+++ b/thoth-export-server/src/xml/onix3_project_muse.rs
@@ -315,6 +315,26 @@ impl XmlElementBlock<Onix3ProjectMuse> for Work {
                             )
                         })?;
                     }
+                    if let Some(date) = &self.withdrawn_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 13 Out-of-print / permanently withdrawn date
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
                     Ok(())
                 })?;
                 if !isbns.is_empty() {
@@ -970,6 +990,20 @@ mod tests {
         assert!(!output.contains(r#"          <PartNumber>1</PartNumber>"#));
         assert!(!output.contains(r#"          <TitleText>Name of series</TitleText>"#));
 
+        // Add withdrawn_date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        println!("output is {output}");
+        assert!(output.contains(
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>13</PublishingDateRole>
+      <Date dateformat="00">20201231</Date>
+    </PublishingDate>"#
+        ));
+        // Remove withdrawn date so publication date test below doesn't fail
+        test_work.withdrawn_date = None;
+
         // Remove some values to test non-output of optional blocks
         test_work.doi = None;
         test_work.license = None;
diff --git a/thoth-export-server/src/xml/onix3_thoth.rs b/thoth-export-server/src/xml/onix3_thoth.rs
index 3ab1f85c..3061de7b 100644
--- a/thoth-export-server/src/xml/onix3_thoth.rs
+++ b/thoth-export-server/src/xml/onix3_thoth.rs
@@ -707,6 +707,26 @@ impl XmlElementBlock<Onix3Thoth> for Work {
                             )
                         })?;
                     }
+                    if let Some(date) = &self.withdrawn_date {
+                        write_element_block("PublishingDate", w, |w| {
+                            write_element_block("PublishingDateRole", w, |w| {
+                                // 13 Out-of-print / permanently withdrawn date
+                                w.write(XmlEvent::Characters("13")).map_err(|e| e.into())
+                            })?;
+                            // dateformat="00" YYYYMMDD
+                            write_full_element_block(
+                                "Date",
+                                Some(vec![("dateformat", "00")]),
+                                w,
+                                |w| {
+                                    w.write(XmlEvent::Characters(
+                                        &date.format("%Y%m%d").to_string(),
+                                    ))
+                                    .map_err(|e| e.into())
+                                },
+                            )
+                        })?;
+                    }
                     if let Some(copyright_holder) = &self.copyright_holder {
                         write_element_block("CopyrightStatement", w, |w| {
                             write_element_block("CopyrightOwner", w, |w| {
@@ -2858,6 +2878,17 @@ mod tests {
       </Price>"#
         ));
 
+        // Add withdrawn_date
+        test_work.withdrawn_date = chrono::NaiveDate::from_ymd_opt(2020, 12, 31);
+        let output = generate_test_output(true, &test_work);
+        assert!(output.contains(
+            r#"
+    <PublishingDate>
+      <PublishingDateRole>13</PublishingDateRole>
+      <Date dateformat="00">20201231</Date>
+    </PublishingDate>"#
+        ));
+
         // Test ProductForm[Detail] with different publication types
         test_work.publications[0].publication_type = PublicationType::HARDBACK;
         let output = generate_test_output(true, &test_work);

From 8c98b68960f0439f0c84f4a4c04b41090448175c Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Thu, 18 Apr 2024 16:01:10 +0200
Subject: [PATCH 09/12] Set withdrawn date input box to deactivated if work
 status isn't out of print or withdrawn; fixed bug to reset withdrawn date to
 None based on work status

---
 thoth-app/src/component/new_work.rs |  4 ++--
 thoth-app/src/component/work.rs     | 26 ++++++++++----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/thoth-app/src/component/new_work.rs b/thoth-app/src/component/new_work.rs
index dc29ebaf..a1a73df6 100644
--- a/thoth-app/src/component/new_work.rs
+++ b/thoth-app/src/component/new_work.rs
@@ -277,7 +277,7 @@ impl Component for NewWorkComponent {
                 } else if let Ok(result) = self.doi.parse::<Doi>() {
                     self.work.doi.neq_assign(Some(result));
                 }
-                // Clear any fields which are not applicable to the currently selected work type.
+                // Clear any fields which are not applicable to the currently selected work type or work status.
                 // (Do not clear them before the save point as the user may change the type again.)
                 if self.work.work_type == WorkType::BookChapter {
                     self.work.edition = None;
@@ -289,7 +289,7 @@ impl Component for NewWorkComponent {
                     self.work.last_page = None;
                     self.work.page_interval = None;
                 }
-                if self.work.work_status == WorkStatus::OutOfPrint {
+                if self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint {
                     self.work.withdrawn_date = None;
                 }
                 let body = CreateWorkRequestBody {
diff --git a/thoth-app/src/component/work.rs b/thoth-app/src/component/work.rs
index aa9af694..5b68b09d 100644
--- a/thoth-app/src/component/work.rs
+++ b/thoth-app/src/component/work.rs
@@ -299,6 +299,9 @@ impl Component for WorkComponent {
                     self.work.last_page = None;
                     self.work.page_interval = None;
                 }
+                if self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint {
+                    self.work.withdrawn_date = None;
+                }
                 let body = UpdateWorkRequestBody {
                     variables: UpdateVariables {
                         work_id: self.work.work_id,
@@ -565,6 +568,7 @@ impl Component for WorkComponent {
                 // Grey out chapter-specific or "book"-specific fields
                 // based on currently selected work type.
                 let is_chapter = self.work.work_type == WorkType::BookChapter;
+                let is_not_withdrawn_or_out_of_print = self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint;
                 html! {
                     <>
                         <nav class="level">
@@ -640,22 +644,12 @@ impl Component for WorkComponent {
                                 value={ self.work.publication_date.clone() }
                                 oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeDate(e.to_value())) }
                             />
-                            {
-                                if self.work.work_status == WorkStatus::WithdrawnFromSale || self.work.work_status == WorkStatus::OutOfPrint {
-                                    html! {
-                                        <>
-                                        <FormDateInput
-                                        label = "Withdrawn Date"
-                                        value={ self.work.withdrawn_date.clone() }
-                                        oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
-                                        />
-                                        </>
-                                    }
-                                } else {
-                                    html!{}
-                                }
-                            }
-                            
+                            <FormDateInput
+                                label = "Withdrawn Date"
+                                value={ self.work.withdrawn_date.clone() }
+                                oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
+                                deactivated={ is_not_withdrawn_or_out_of_print }
+                                />
                             <FormTextInput
                                 label = "Place of Publication"
                                 value={ self.work.place.clone() }

From 11109787d2a1dd3b3236be689f75d56a0a12238a Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Fri, 19 Apr 2024 15:14:20 +0200
Subject: [PATCH 10/12] Fixed migration, fixed formatting and clippy errors

---
 thoth-api/migrations/v0.12.3/up.sql |  3 +--
 thoth-api/src/graphql/model.rs      |  2 +-
 thoth-api/src/model/work/crud.rs    |  3 ++-
 thoth-api/src/model/work/mod.rs     |  8 +++-----
 thoth-app/src/component/new_work.rs | 12 +++++++++---
 thoth-app/src/component/work.rs     | 12 +++++++++---
 thoth-errors/src/lib.rs             |  4 +---
 7 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/thoth-api/migrations/v0.12.3/up.sql b/thoth-api/migrations/v0.12.3/up.sql
index c2369215..7001a993 100644
--- a/thoth-api/migrations/v0.12.3/up.sql
+++ b/thoth-api/migrations/v0.12.3/up.sql
@@ -14,6 +14,5 @@ UPDATE work
 
 ALTER TABLE work
     ADD CONSTRAINT work_withdrawn_date_check CHECK
-        (((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print')
-        AND withdrawn_date IS NOT NULL)
+        ((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print')
         OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print') AND withdrawn_date IS NULL));
\ No newline at end of file
diff --git a/thoth-api/src/graphql/model.rs b/thoth-api/src/graphql/model.rs
index 5c8c4a6e..843875d8 100644
--- a/thoth-api/src/graphql/model.rs
+++ b/thoth-api/src/graphql/model.rs
@@ -1709,7 +1709,7 @@ impl MutationRoot {
         // update the work and, if it succeeds, synchronise its children statuses and pub. date
         match work.update(&context.db, &data, &account_id) {
             Ok(w) => {
-                // update chapters if their pub. data or work_status doesn't match the parent's
+                // update chapters if their pub. data, withdrawn_date or work_status doesn't match the parent's
                 for child in work.children(&context.db)? {
                     if child.publication_date != w.publication_date
                         || child.work_status != w.work_status
diff --git a/thoth-api/src/model/work/crud.rs b/thoth-api/src/model/work/crud.rs
index 6d587577..a8f94a73 100644
--- a/thoth-api/src/model/work/crud.rs
+++ b/thoth-api/src/model/work/crud.rs
@@ -1,5 +1,6 @@
 use super::{
-    NewWork, NewWorkHistory, PatchWork, WorkProperties, Work, WorkField, WorkHistory, WorkOrderBy, WorkStatus, WorkType
+    NewWork, NewWorkHistory, PatchWork, Work, WorkField, WorkHistory, WorkOrderBy, WorkProperties,
+    WorkStatus, WorkType,
 };
 use crate::graphql::model::TimeExpression;
 use crate::graphql::utils::{Direction, Expression};
diff --git a/thoth-api/src/model/work/mod.rs b/thoth-api/src/model/work/mod.rs
index 05eb6081..1fac5a03 100644
--- a/thoth-api/src/model/work/mod.rs
+++ b/thoth-api/src/model/work/mod.rs
@@ -1,9 +1,9 @@
 use chrono::naive::NaiveDate;
 use serde::{Deserialize, Serialize};
-use thoth_errors::{ThothError, ThothResult};
 use std::fmt;
 use strum::Display;
 use strum::EnumString;
+use thoth_errors::{ThothError, ThothResult};
 use uuid::Uuid;
 
 use crate::graphql::utils::Direction;
@@ -355,10 +355,8 @@ pub trait WorkProperties {
     }
 
     fn withdrawn_date_error(&self) -> ThothResult<()> {
-        if self.is_not_withdrawn_out_of_print() {
-            if self.has_withdrawn_date() {
-                return Err(ThothError::WithdrawnDateError)
-            }
+        if self.is_not_withdrawn_out_of_print() && self.has_withdrawn_date() {
+            return Err(ThothError::WithdrawnDateError);
         }
         Ok(())
     }
diff --git a/thoth-app/src/component/new_work.rs b/thoth-app/src/component/new_work.rs
index a1a73df6..dcebfda2 100644
--- a/thoth-app/src/component/new_work.rs
+++ b/thoth-app/src/component/new_work.rs
@@ -289,7 +289,9 @@ impl Component for NewWorkComponent {
                     self.work.last_page = None;
                     self.work.page_interval = None;
                 }
-                if self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint {
+                if self.work.work_status != WorkStatus::WithdrawnFromSale
+                    && self.work.work_status != WorkStatus::OutOfPrint
+                {
                     self.work.withdrawn_date = None;
                 }
                 let body = CreateWorkRequestBody {
@@ -381,7 +383,9 @@ impl Component for NewWorkComponent {
                 }
             }
             Msg::ChangeDate(value) => self.work.publication_date.neq_assign(value.to_opt_string()),
-            Msg::ChangeWithdrawnDate(value) => self.work.withdrawn_date.neq_assign(value.to_opt_string()),
+            Msg::ChangeWithdrawnDate(value) => {
+                self.work.withdrawn_date.neq_assign(value.to_opt_string())
+            }
             Msg::ChangePlace(value) => self.work.place.neq_assign(value.to_opt_string()),
             Msg::ChangePageCount(value) => self.work.page_count.neq_assign(value.to_opt_int()),
             Msg::ChangePageBreakdown(value) => {
@@ -454,7 +458,9 @@ impl Component for NewWorkComponent {
         // Grey out chapter-specific or "book"-specific fields
         // based on currently selected work type.
         let is_chapter = self.work.work_type == WorkType::BookChapter;
-        let is_not_withdrawn_or_out_of_print = self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint;
+        let is_not_withdrawn_or_out_of_print = self.work.work_status
+            != WorkStatus::WithdrawnFromSale
+            && self.work.work_status != WorkStatus::OutOfPrint;
         html! {
             <>
                 <nav class="level">
diff --git a/thoth-app/src/component/work.rs b/thoth-app/src/component/work.rs
index 5b68b09d..00d2e28c 100644
--- a/thoth-app/src/component/work.rs
+++ b/thoth-app/src/component/work.rs
@@ -299,7 +299,9 @@ impl Component for WorkComponent {
                     self.work.last_page = None;
                     self.work.page_interval = None;
                 }
-                if self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint {
+                if self.work.work_status != WorkStatus::WithdrawnFromSale
+                    && self.work.work_status != WorkStatus::OutOfPrint
+                {
                     self.work.withdrawn_date = None;
                 }
                 let body = UpdateWorkRequestBody {
@@ -457,7 +459,9 @@ impl Component for WorkComponent {
                 }
             }
             Msg::ChangeDate(value) => self.work.publication_date.neq_assign(value.to_opt_string()),
-            Msg::ChangeWithdrawnDate(value) => self.work.withdrawn_date.neq_assign(value.to_opt_string()),
+            Msg::ChangeWithdrawnDate(value) => {
+                self.work.withdrawn_date.neq_assign(value.to_opt_string())
+            }
             Msg::ChangePlace(value) => self.work.place.neq_assign(value.to_opt_string()),
             Msg::ChangePageCount(value) => self.work.page_count.neq_assign(value.to_opt_int()),
             Msg::ChangePageBreakdown(value) => {
@@ -568,7 +572,9 @@ impl Component for WorkComponent {
                 // Grey out chapter-specific or "book"-specific fields
                 // based on currently selected work type.
                 let is_chapter = self.work.work_type == WorkType::BookChapter;
-                let is_not_withdrawn_or_out_of_print = self.work.work_status != WorkStatus::WithdrawnFromSale && self.work.work_status != WorkStatus::OutOfPrint;
+                let is_not_withdrawn_or_out_of_print = self.work.work_status
+                    != WorkStatus::WithdrawnFromSale
+                    && self.work.work_status != WorkStatus::OutOfPrint;
                 html! {
                     <>
                         <nav class="level">
diff --git a/thoth-errors/src/lib.rs b/thoth-errors/src/lib.rs
index 8175cacc..a2931a5a 100644
--- a/thoth-errors/src/lib.rs
+++ b/thoth-errors/src/lib.rs
@@ -85,9 +85,7 @@ pub enum ThothError {
         "Price values must be greater than zero. To indicate an unpriced Publication, omit all Prices."
     )]
     WithdrawnDateError,
-    #[error(
-        "Withdrawn Date can only be added to out of print or withdrawn from sale Works."
-    )]
+    #[error("Withdrawn Date can only be added to out of print or withdrawn from sale Works.")]
     PriceZeroError,
     #[error("{0}")]
     RequestError(String),

From 6d15f3cbc99fcbe73e18789c721af3114a7892e7 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Wed, 24 Apr 2024 14:15:46 +0200
Subject: [PATCH 11/12] Added database constraints for inactive works with no
 withdrawn date and withdrawn date < publication date; added validation errors
 for same constraints; made withdrawn date required on input form in component

---
 thoth-api/migrations/v0.12.3/down.sql |  5 +++-
 thoth-api/migrations/v0.12.3/up.sql   | 11 +++++--
 thoth-api/src/graphql/model.rs        |  4 +++
 thoth-api/src/model/work/crud.rs      |  4 ++-
 thoth-api/src/model/work/mod.rs       | 42 ++++++++++++++++++++++-----
 thoth-app/src/component/new_work.rs   |  1 +
 thoth-app/src/component/work.rs       |  1 +
 thoth-errors/src/database_errors.rs   |  4 ++-
 thoth-errors/src/lib.rs               |  8 +++--
 9 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/thoth-api/migrations/v0.12.3/down.sql b/thoth-api/migrations/v0.12.3/down.sql
index 527ec6cb..36c5925f 100644
--- a/thoth-api/migrations/v0.12.3/down.sql
+++ b/thoth-api/migrations/v0.12.3/down.sql
@@ -5,5 +5,8 @@ ALTER TABLE series
     ALTER COLUMN issn_digital SET NOT NULL;
 
 ALTER TABLE work
-    DROP CONSTRAINT work_withdrawn_date_check,
+    DROP CONSTRAINT work_active_withdrawn_date_check,
+    DROP CONSTRAINT work_inactive_no_withdrawn_date_check,
+    DROP CONSTRAINT work_withdrawn_date_after_publication_date_check,
     DROP COLUMN withdrawn_date;
+
diff --git a/thoth-api/migrations/v0.12.3/up.sql b/thoth-api/migrations/v0.12.3/up.sql
index 7001a993..23434478 100644
--- a/thoth-api/migrations/v0.12.3/up.sql
+++ b/thoth-api/migrations/v0.12.3/up.sql
@@ -13,6 +13,13 @@ UPDATE work
     OR work_status = 'out-of-print');
 
 ALTER TABLE work
-    ADD CONSTRAINT work_withdrawn_date_check CHECK
+    ADD CONSTRAINT work_active_withdrawn_date_check CHECK
         ((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print')
-        OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print') AND withdrawn_date IS NULL));
\ No newline at end of file
+        OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print') AND withdrawn_date IS NULL)),
+
+    ADD CONSTRAINT work_inactive_no_withdrawn_date_check CHECK
+        (((work_status = 'withdrawn-from-sale' OR work_status = 'out-of-print') AND withdrawn_date IS NOT NULL)
+        OR (work_status NOT IN ('withdrawn-from-sale', 'out-of-print'))),
+
+    ADD CONSTRAINT work_withdrawn_date_after_publication_date_check CHECK
+        (withdrawn_date IS NULL OR (publication_date < withdrawn_date));
\ No newline at end of file
diff --git a/thoth-api/src/graphql/model.rs b/thoth-api/src/graphql/model.rs
index 843875d8..e17fcf44 100644
--- a/thoth-api/src/graphql/model.rs
+++ b/thoth-api/src/graphql/model.rs
@@ -23,6 +23,7 @@ use crate::model::publisher::*;
 use crate::model::reference::*;
 use crate::model::series::*;
 use crate::model::subject::*;
+use crate::model::work::crud::WorkValidation;
 use crate::model::work::*;
 use crate::model::work_relation::*;
 use crate::model::Convert;
@@ -1516,6 +1517,8 @@ impl MutationRoot {
             .account_access
             .can_edit(publisher_id_from_imprint_id(&context.db, data.imprint_id)?)?;
 
+        data.validate()?;
+
         Work::create(&context.db, &data).map_err(|e| e.into())
     }
 
@@ -1705,6 +1708,7 @@ impl MutationRoot {
             work.can_be_chapter(&context.db)?;
         }
 
+        data.validate()?;
         let account_id = context.token.jwt.as_ref().unwrap().account_id(&context.db);
         // update the work and, if it succeeds, synchronise its children statuses and pub. date
         match work.update(&context.db, &data, &account_id) {
diff --git a/thoth-api/src/model/work/crud.rs b/thoth-api/src/model/work/crud.rs
index a8f94a73..343f424f 100644
--- a/thoth-api/src/model/work/crud.rs
+++ b/thoth-api/src/model/work/crud.rs
@@ -408,7 +408,9 @@ where
     Self: WorkProperties,
 {
     fn validate(&self) -> ThothResult<()> {
-        self.withdrawn_date_error()
+        self.withdrawn_date_error()?;
+        self.no_withdrawn_date_error()?;
+        self.withdrawn_date_before_publication_date_error()
     }
 }
 
diff --git a/thoth-api/src/model/work/mod.rs b/thoth-api/src/model/work/mod.rs
index 1fac5a03..3312bd98 100644
--- a/thoth-api/src/model/work/mod.rs
+++ b/thoth-api/src/model/work/mod.rs
@@ -336,18 +336,15 @@ impl WorkStatus {
     fn is_withdrawn_out_of_print(&self) -> bool {
         matches!(self, WorkStatus::OutOfPrint | WorkStatus::WithdrawnFromSale)
     }
-
-    fn is_not_withdrawn_out_of_print(&self) -> bool {
-        !self.is_withdrawn_out_of_print()
-    }
 }
 
 pub trait WorkProperties {
     fn work_status(&self) -> &WorkStatus;
+    fn publication_date(&self) -> &Option<NaiveDate>;
     fn withdrawn_date(&self) -> &Option<NaiveDate>;
 
-    fn is_not_withdrawn_out_of_print(&self) -> bool {
-        self.work_status().is_not_withdrawn_out_of_print()
+    fn is_withdrawn_out_of_print(&self) -> bool {
+        self.work_status().is_withdrawn_out_of_print()
     }
 
     fn has_withdrawn_date(&self) -> bool {
@@ -355,11 +352,30 @@ pub trait WorkProperties {
     }
 
     fn withdrawn_date_error(&self) -> ThothResult<()> {
-        if self.is_not_withdrawn_out_of_print() && self.has_withdrawn_date() {
+        if !self.is_withdrawn_out_of_print() && self.has_withdrawn_date() {
             return Err(ThothError::WithdrawnDateError);
         }
         Ok(())
     }
+
+    fn no_withdrawn_date_error(&self) -> ThothResult<()> {
+        if self.is_withdrawn_out_of_print() && !self.has_withdrawn_date() {
+            return Err(ThothError::NoWithdrawnDateError);
+        }
+        Ok(())
+    }
+
+    fn withdrawn_date_before_publication_date_error(&self) -> ThothResult<()> {
+        match (self.withdrawn_date(), self.publication_date()) {
+            (Some(withdrawn_date), Some(publication_date)) if withdrawn_date < publication_date => {
+                println!("withdrawn_date: {:?}", self.withdrawn_date());
+                println!("publication_date: {:?}", self.publication_date());
+                return Err(ThothError::WithdrawnDateBeforePublicationDateError);
+            }
+            _ => {}
+        }
+        Ok(())
+    }
 }
 
 impl WorkProperties for Work {
@@ -370,6 +386,10 @@ impl WorkProperties for Work {
     fn withdrawn_date(&self) -> &Option<NaiveDate> {
         &self.withdrawn_date
     }
+
+    fn publication_date(&self) -> &Option<NaiveDate> {
+        &self.publication_date
+    }
 }
 
 impl WorkProperties for NewWork {
@@ -380,6 +400,10 @@ impl WorkProperties for NewWork {
     fn withdrawn_date(&self) -> &Option<NaiveDate> {
         &self.withdrawn_date
     }
+
+    fn publication_date(&self) -> &Option<NaiveDate> {
+        &self.publication_date
+    }
 }
 
 impl WorkProperties for PatchWork {
@@ -390,6 +414,10 @@ impl WorkProperties for PatchWork {
     fn withdrawn_date(&self) -> &Option<NaiveDate> {
         &self.withdrawn_date
     }
+
+    fn publication_date(&self) -> &Option<NaiveDate> {
+        &self.publication_date
+    }
 }
 
 impl Work {
diff --git a/thoth-app/src/component/new_work.rs b/thoth-app/src/component/new_work.rs
index dcebfda2..ebe7aa48 100644
--- a/thoth-app/src/component/new_work.rs
+++ b/thoth-app/src/component/new_work.rs
@@ -532,6 +532,7 @@ impl Component for NewWorkComponent {
                         label = "Withdrawn Date"
                         value={ self.work.withdrawn_date.clone() }
                         oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
+                        required = true
                         deactivated={ is_not_withdrawn_or_out_of_print }
                     />
                     <FormTextInput
diff --git a/thoth-app/src/component/work.rs b/thoth-app/src/component/work.rs
index 00d2e28c..94390c97 100644
--- a/thoth-app/src/component/work.rs
+++ b/thoth-app/src/component/work.rs
@@ -654,6 +654,7 @@ impl Component for WorkComponent {
                                 label = "Withdrawn Date"
                                 value={ self.work.withdrawn_date.clone() }
                                 oninput={ ctx.link().callback(|e: InputEvent| Msg::ChangeWithdrawnDate(e.to_value())) }
+                                required = true
                                 deactivated={ is_not_withdrawn_or_out_of_print }
                                 />
                             <FormTextInput
diff --git a/thoth-errors/src/database_errors.rs b/thoth-errors/src/database_errors.rs
index 73837988..d07dfc45 100644
--- a/thoth-errors/src/database_errors.rs
+++ b/thoth-errors/src/database_errors.rs
@@ -120,6 +120,7 @@ static DATABASE_CONSTRAINT_ERRORS: Map<&'static str, &'static str> = phf_map! {
     "series_series_url_check" => "Invalid series URL.",
     "subject_subject_code_check" => "Subject codes must not be an empty string.",
     "subject_subject_ordinal_check" => "A subject ordinal number must be greater than 0.",
+    "work_active_withdrawn_date_check" => "Withdrawn Date can only be set for an out of print or withdrawn from sale Work.",
     "work_audio_count_check" => "An audio count must be greater than 0.",
     "work_bibliography_note_check" => "Bibliography note must not be an empty string.",
     "work_chapter_no_edition" => "Chapters must not have an edition number.",
@@ -135,6 +136,7 @@ static DATABASE_CONSTRAINT_ERRORS: Map<&'static str, &'static str> = phf_map! {
     "work_full_title_check" => "Full title must not be an empty string.",
     "work_general_note_check" => "General note must not be an empty string.",
     "work_image_count_check" => "An image count must be greater than 0.",
+    "work_inactive_no_withdrawn_date_check" => "An out of print or withdrawn from sale Work must include Withdrawn Date.",
     "work_landing_page_check" => "Invalid landing page URL.",
     "work_last_page_check" => "Last page must not be an empty string.",
     "work_lccn_check" => "LCCN must not be an empty string.",
@@ -160,7 +162,7 @@ static DATABASE_CONSTRAINT_ERRORS: Map<&'static str, &'static str> = phf_map! {
     "work_title_check" => "Title must not be an empty string.",
     "work_toc_check" => "Table of content must not be an empty string.",
     "work_video_count_check" => "A video count must be greater than 0.",
-    "work_withdrawn_date_check" => "Withdrawn Date can only be added to out of print or withdrawn from sale Works.",
+    "work_withdrawn_date_after_publication_date_check" => "Publication date must be before withdrawn date."
 };
 
 impl From<diesel::result::Error> for ThothError {
diff --git a/thoth-errors/src/lib.rs b/thoth-errors/src/lib.rs
index a2931a5a..46065083 100644
--- a/thoth-errors/src/lib.rs
+++ b/thoth-errors/src/lib.rs
@@ -84,13 +84,17 @@ pub enum ThothError {
     #[error(
         "Price values must be greater than zero. To indicate an unpriced Publication, omit all Prices."
     )]
-    WithdrawnDateError,
-    #[error("Withdrawn Date can only be added to out of print or withdrawn from sale Works.")]
     PriceZeroError,
     #[error("{0}")]
     RequestError(String),
     #[error("{0}")]
     GraphqlError(String),
+    #[error("Withdrawn Date must be later than Publication Date.")]
+    WithdrawnDateBeforePublicationDateError,
+    #[error("Withdrawn Date can only be added to an Out of Print or Withdrawn From Sale Work.")]
+    WithdrawnDateError,
+    #[error("An Out of Print or Withdrawn From Sale Work must have a Withdrawn Date.")]
+    NoWithdrawnDateError,
 }
 
 #[cfg(not(target_arch = "wasm32"))]

From 1aaf8247ab7db999d292db6d8977152bc2f84cd8 Mon Sep 17 00:00:00 2001
From: Brendan O'Connell <brendan@openbookpublishers.com>
Date: Thu, 25 Apr 2024 14:19:08 +0200
Subject: [PATCH 12/12] Refactored to remove match from fn
 withdrawn_date_before_publication_date_error

---
 thoth-api/src/model/work/mod.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/thoth-api/src/model/work/mod.rs b/thoth-api/src/model/work/mod.rs
index 3312bd98..6046a431 100644
--- a/thoth-api/src/model/work/mod.rs
+++ b/thoth-api/src/model/work/mod.rs
@@ -366,13 +366,12 @@ pub trait WorkProperties {
     }
 
     fn withdrawn_date_before_publication_date_error(&self) -> ThothResult<()> {
-        match (self.withdrawn_date(), self.publication_date()) {
-            (Some(withdrawn_date), Some(publication_date)) if withdrawn_date < publication_date => {
-                println!("withdrawn_date: {:?}", self.withdrawn_date());
-                println!("publication_date: {:?}", self.publication_date());
+        if let (Some(withdrawn_date), Some(publication_date)) =
+            (self.withdrawn_date(), self.publication_date())
+        {
+            if withdrawn_date < publication_date {
                 return Err(ThothError::WithdrawnDateBeforePublicationDateError);
             }
-            _ => {}
         }
         Ok(())
     }