Merge branch 'release/v0.12.4'

thoth-pub · Apr 30, 2024 · 3a28358 · 3a28358
2 parents a494e74 + 0161672
commit 3a28358
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.12.4]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.4) - 2024-04-30
+### Changed
+  - [545](https://github.com/thoth-pub/thoth/issues/545) - Add Zenodo as a location platform
+
 ## [[0.12.3]](https://github.com/thoth-pub/thoth/releases/tag/v0.12.3) - 2024-04-26
 ### 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.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
 members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
 
 [dependencies]
-thoth-api = { version = "0.12.3", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.12.3", path = "thoth-api-server" }
-thoth-app-server = { version = "0.12.3", path = "thoth-app-server" }
-thoth-errors = { version = "0.12.3", path = "thoth-errors" }
-thoth-export-server = { version = "0.12.3", path = "thoth-export-server" }
+thoth-api = { version = "=0.12.4", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "=0.12.4", path = "thoth-api-server" }
+thoth-app-server = { version = "=0.12.4", path = "thoth-app-server" }
+thoth-errors = { version = "=0.12.4", path = "thoth-errors" }
+thoth-export-server = { version = "=0.12.4", path = "thoth-export-server" }
 clap = { version = "4.4.7", features = ["cargo", "env"] }
 dialoguer = { version = "0.11.0", features = ["password"] }
 dotenv = "0.15.0"

diff --git a/thoth-api-server/Cargo.toml b/thoth-api-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api-server"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.12.3", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.12.3", path = "../thoth-errors" }
+thoth-api = { version = "=0.12.4", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "=0.12.4", path = "../thoth-errors" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 actix-identity = "0.7.1"

diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web", "jsonwebtoken"]
 
 [dependencies]
-thoth-errors = { version = "0.12.3", path = "../thoth-errors" }
+thoth-errors = { version = "=0.12.4", path = "../thoth-errors" }
 actix-web = { version = "4.5.1", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"

diff --git a/thoth-api/migrations/v0.12.4/down.sql b/thoth-api/migrations/v0.12.4/down.sql
@@ -0,0 +1,33 @@
+UPDATE location SET location_platform = 'Other' WHERE location_platform = 'Zenodo';
+
+-- Drop the default and unique constraint, otherwise it won't be able to cast to text
+ALTER TABLE location ALTER COLUMN location_platform DROP DEFAULT;
+DROP INDEX location_uniq_platform_idx;
+
+ALTER TABLE location ALTER COLUMN location_platform TYPE text;
+DROP TYPE location_platform;
+CREATE TYPE location_platform AS ENUM (
+    'Project MUSE',
+    'OAPEN',
+    'DOAB',
+    'JSTOR',
+    'EBSCO Host',
+    'OCLC KB',
+    'ProQuest KB',
+    'ProQuest ExLibris',
+    'EBSCO KB',
+    'JISC KB',
+    'Google Books',
+    'Internet Archive',
+    'ScienceOpen',
+    'SciELO Books',
+    'Publisher Website',
+    'Other'
+    );
+ALTER TABLE location ALTER location_platform TYPE location_platform USING location_platform::location_platform;
+ALTER TABLE location
+    ALTER COLUMN location_platform SET DEFAULT 'Other'::location_platform;
+
+CREATE UNIQUE INDEX location_uniq_platform_idx
+    ON location (publication_id, location_platform)
+    WHERE NOT location_platform = 'Other'::location_platform;
diff --git a/thoth-api/migrations/v0.12.4/up.sql b/thoth-api/migrations/v0.12.4/up.sql
@@ -0,0 +1 @@
+ALTER TYPE location_platform ADD VALUE IF NOT EXISTS 'Zenodo';
diff --git a/thoth-api/src/model/location/mod.rs b/thoth-api/src/model/location/mod.rs
@@ -60,6 +60,9 @@ pub enum LocationPlatform {
     #[cfg_attr(feature = "backend", db_rename = "SciELO Books")]
     #[strum(serialize = "SciELO Books")]
     ScieloBooks,
+    #[cfg_attr(feature = "backend", db_rename = "Zenodo")]
+    #[strum(serialize = "Zenodo")]
+    Zenodo,
     #[cfg_attr(feature = "backend", db_rename = "Publisher Website")]
     #[strum(serialize = "Publisher Website")]
     PublisherWebsite,
@@ -183,6 +186,7 @@ fn test_locationplatform_display() {
     );
     assert_eq!(format!("{}", LocationPlatform::ScienceOpen), "ScienceOpen");
     assert_eq!(format!("{}", LocationPlatform::ScieloBooks), "SciELO Books");
+    assert_eq!(format!("{}", LocationPlatform::Zenodo), "Zenodo");
     assert_eq!(
         format!("{}", LocationPlatform::PublisherWebsite),
         "Publisher Website"
@@ -249,6 +253,10 @@ fn test_locationplatform_fromstr() {
         LocationPlatform::from_str("SciELO Books").unwrap(),
         LocationPlatform::ScieloBooks
     );
+    assert_eq!(
+        LocationPlatform::from_str("Zenodo").unwrap(),
+        LocationPlatform::Zenodo
+    );
     assert_eq!(
         LocationPlatform::from_str("Publisher Website").unwrap(),
         LocationPlatform::PublisherWebsite

diff --git a/thoth-app-server/Cargo.toml b/thoth-app-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app-server"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/thoth-app/Cargo.toml b/thoth-app/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-app"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -36,8 +36,8 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
 # `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
 # https://docs.rs/getrandom/latest/getrandom/#webassembly-support
 getrandom = { version = "0.2", features = ["js"] }
-thoth-api = { version = "0.12.3", path = "../thoth-api"  }
-thoth-errors = { version = "0.12.3", path = "../thoth-errors" }
+thoth-api = { version = "=0.12.4", path = "../thoth-api"  }
+thoth-errors = { version = "=0.12.4", path = "../thoth-errors" }
 
 [build-dependencies]
 dotenv = "0.15.0"
diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,8 +10,8 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = {version = "0.12.3", path = "../thoth-api" }
-thoth-errors = {version = "0.12.3", path = "../thoth-errors" }
+thoth-api = {version = "=0.12.4", path = "../thoth-api" }
+thoth-errors = {version = "=0.12.4", path = "../thoth-errors" }
 graphql_client = "0.13.0"
 chrono = { version = "0.4.31", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }
@@ -22,4 +22,4 @@ serde_json = "1.0"
 uuid = { version = "0.8.2", features = ["serde"] }
 
 [build-dependencies]
-thoth-api = { version = "0.12.3", path = "../thoth-api", features = ["backend"] }
+thoth-api = { version = "=0.12.4", path = "../thoth-api", features = ["backend"] }
diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/thoth-export-server/Cargo.toml b/thoth-export-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-export-server"
-version = "0.12.3"
+version = "0.12.4"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -10,9 +10,9 @@ readme = "README.md"
 build = "build.rs"
 
 [dependencies]
-thoth-api = { version = "0.12.3", path = "../thoth-api" }
-thoth-errors = { version = "0.12.3", path = "../thoth-errors" }
-thoth-client = { version = "0.12.3", path = "../thoth-client" }
+thoth-api = { version = "=0.12.4", path = "../thoth-api" }
+thoth-errors = { version = "=0.12.4", path = "../thoth-errors" }
+thoth-client = { version = "=0.12.4", path = "../thoth-client" }
 actix-web = "4.5.1"
 actix-cors = "0.7.0"
 cc_license = "0.1.0"