Merge branch 'release/v0.11.12'

ja573 · ja573 · commit 037eba09b3f2 · 2023-12-20T11:48:17.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [[0.11.12]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.12) - 2023-12-20
+### Fixed
+  - [530](https://github.com/thoth-pub/thoth/pull/530) - Fix pagination offset calculation in export API
+  - [530](https://github.com/thoth-pub/thoth/pull/530) - Do not allow to create more than one price in the same currency for the same publication
+
 ## [[0.11.11]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.11) - 2023-12-19
 ### Changed
   - Upgrade rust to `1.74.1` in production and development `Dockerfile`
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.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 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.11.11", path = "thoth-api", features = ["backend"] }
-thoth-api-server = { version = "0.11.11", path = "thoth-api-server" }
-thoth-app-server = { version = "0.11.11", path = "thoth-app-server" }
-thoth-errors = { version = "0.11.11", path = "thoth-errors" }
-thoth-export-server = { version = "0.11.11", path = "thoth-export-server" }
+thoth-api = { version = "0.11.12", path = "thoth-api", features = ["backend"] }
+thoth-api-server = { version = "0.11.12", path = "thoth-api-server" }
+thoth-app-server = { version = "0.11.12", path = "thoth-app-server" }
+thoth-errors = { version = "0.11.12", path = "thoth-errors" }
+thoth-export-server = { version = "0.11.12", 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.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.11", path = "../thoth-api", features = ["backend"] }
-thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
+thoth-api = { version = "0.11.12", path = "../thoth-api", features = ["backend"] }
+thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
 actix-web = "4.4.0"
 actix-cors = "0.6.4"
 actix-identity = "0.6.0"
diff --git a/thoth-api/Cargo.toml b/thoth-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-api"
-version = "0.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
 backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
 
 [dependencies]
-thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
+thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
 actix-web = { version = "4.4.0", optional = true }
 argon2rs = "0.2.5"
 isbn2 = "0.4.0"
diff --git a/thoth-api/migrations/v0.11.12/down.sql b/thoth-api/migrations/v0.11.12/down.sql
@@ -0,0 +1 @@
+ALTER TABLE price DROP CONSTRAINT price_publication_id_currency_code_uniq;
diff --git a/thoth-api/migrations/v0.11.12/up.sql b/thoth-api/migrations/v0.11.12/up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE price ADD CONSTRAINT price_publication_id_currency_code_uniq
+  UNIQUE (publication_id, currency_code);
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.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 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.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -41,5 +41,5 @@ 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.11.11", path = "../thoth-api"  }
-thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
+thoth-api = { version = "0.11.12", path = "../thoth-api"  }
+thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
diff --git a/thoth-app/manifest.json b/thoth-app/manifest.json
@@ -9,7 +9,7 @@
   "start_url": "/?homescreen=1",
   "background_color": "#ffffff",
   "theme_color": "#ffdd57",
-  "version": "0.11.11",
+  "version": "0.11.12",
   "icons": [
       {
         "src": "\/android-icon-36x36.png",
diff --git a/thoth-client/Cargo.toml b/thoth-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-client"
-version = "0.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = {version = "0.11.11", path = "../thoth-api" }
-thoth-errors = {version = "0.11.11", path = "../thoth-errors" }
+thoth-api = {version = "0.11.12", path = "../thoth-api" }
+thoth-errors = {version = "0.11.12", path = "../thoth-errors" }
 graphql_client = "0.13.0"
 chrono = { version = "0.4.31", features = ["serde"] }
 reqwest = { version = "0.11", features = ["json"] }
diff --git a/thoth-errors/Cargo.toml b/thoth-errors/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "thoth-errors"
-version = "0.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
diff --git a/thoth-errors/src/database_errors.rs b/thoth-errors/src/database_errors.rs
@@ -62,6 +62,7 @@ static DATABASE_CONSTRAINT_ERRORS: Map<&'static str, &'static str> = phf_map! {
     "location_uniq_platform_idx" => "A location on the selected platform already exists.",
     "location_url_check" => "A location must have a landing page and/or a full text URL.",
     "orcid_uniq_idx" => "A contributor with this ORCID ID already exists.",
+    "price_publication_id_currency_code_uniq" => "A price in this currency already exists for this publication.",
     "price_unit_price_check" => "Price values must be greater than zero. To indicate an unpriced Publication, omit all Prices.",
     "publication_depth_in_check" => "Publication depth must be greater than 0.0.",
     "publication_depth_in_not_missing" => "When specifying Depth, both values (mm and in) must be supplied.",
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.11.11"
+version = "0.11.12"
 authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
 edition = "2018"
 license = "Apache-2.0"
@@ -9,9 +9,9 @@ repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
 
 [dependencies]
-thoth-api = { version = "0.11.11", path = "../thoth-api" }
-thoth-errors = { version = "0.11.11", path = "../thoth-errors" }
-thoth-client = { version = "0.11.11", path = "../thoth-client" }
+thoth-api = { version = "0.11.12", path = "../thoth-api" }
+thoth-errors = { version = "0.11.12", path = "../thoth-errors" }
+thoth-client = { version = "0.11.12", path = "../thoth-client" }
 actix-web = "4.4.0"
 actix-cors = "0.6.4"
 cc_license = "0.1.0"
diff --git a/thoth-export-server/src/specification_query.rs b/thoth-export-server/src/specification_query.rs
@@ -51,14 +51,12 @@ impl SpecificationQuery {
             .thoth_client
             .get_work_count(Some(vec![publisher_id]))
             .await?;
-        let total_pages = (work_count / PAGINATION_LIMIT) + 1;
+        // calculate total pages, rounding up to ensure all works are covered
+        let total_pages = (work_count + PAGINATION_LIMIT - 1) / PAGINATION_LIMIT;
         // get a vector of all page offsets we will need
-        let offsets = match total_pages {
-            1 => vec![0], // otherwise a range of (1..1) gives us nothing
-            _ => (1..total_pages)
-                .map(|current_page| (current_page - 1) * PAGINATION_LIMIT)
-                .collect::<Vec<i64>>(),
-        };
+        let offsets = (1..=total_pages) // inclusive upper bound
+            .map(|current_page| (current_page - 1) * PAGINATION_LIMIT)
+            .collect::<Vec<i64>>();
 
         // make concurrent requests iterating the list of offsets to asynchronously obtain all pages
         let mut works_pages = stream::iter(offsets)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ALTER TABLE price DROP CONSTRAINT price_publication_id_currency_code_uniq;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ALTER TABLE price ADD CONSTRAINT price_publication_id_currency_code_uniq`
	`2`	`+ UNIQUE (publication_id, currency_code);`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`"start_url": "/?homescreen=1",`
`10`	`10`	`"background_color": "#ffffff",`
`11`	`11`	`"theme_color": "#ffdd57",`
`12`		`- "version": "0.11.11",`
	`12`	`+ "version": "0.11.12",`
`13`	`13`	`"icons": [`
`14`	`14`	`{`
`15`	`15`	`"src": "\/android-icon-36x36.png",`