Merge branch 'develop' into feature/deprecate_website

.github/workflows/check_changelog.yml

@@ -0,0 +1,11 @@
+name: check-changelog
+on:
+  pull_request:
+
+jobs:
+  check-changelog:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: tarides/changelog-check-action@v2
+        with:
+          changelog: CHANGELOG.md

.github/workflows/run_migrations.yml

@@ -66,3 +66,8 @@ jobs:
       with:
         command: run
         args: migrate
+    - name: Revert migrations
+      uses: actions-rs/cargo@v1
+      with:
+        command: run
+        args: migrate --revert

CHANGELOG.md

@@ -5,13 +5,20 @@ 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]
+### Removed
+  - [549](https://github.com/thoth-pub/thoth/pull/549) - Deprecate public-facing pages in Thoth APP in favour of a separate, standalone, website
+
 ### Changed
   - [553](https://github.com/thoth-pub/thoth/pull/553) - Upgrade rust to `1.76.0` in production and development `Dockerfile`
   - [549](https://github.com/thoth-pub/thoth/pull/549) - Build and push staging docker images on pull requests
   - [549](https://github.com/thoth-pub/thoth/pull/549) - Upgrade GitHub actions dependencies (`docker/setup-qemu-action@v3`, `docker/setup-buildx-action@v3`, `docker/login-action@v3`, `docker/build-push-action@v5`, `actions/checkout@v4`, `actions/setup-node@v4`)
+  - [305](https://github.com/thoth-pub/thoth/issues/305) - Update rust edition to 2021
+  - [555](https://github.com/thoth-pub/thoth/pull/555) - Remove thoth-client's schema.json with auto-generated GraphQL schema language file on compilation
 
-### Removed
-  - [549](https://github.com/thoth-pub/thoth/pull/549) - Deprecate public-facing pages in Thoth APP in favour of a separate, standalone, website
+### Added
+  - [244](https://github.com/thoth-pub/thoth/issues/244) - Expose GraphQL schema file in /schema.graphql
+  - [503](https://github.com/thoth-pub/thoth/issues/503) - Allow reverting migrations in the CLI and check that migrations can be reverted in run-migration github action
+  - [557](https://github.com/thoth-pub/thoth/pull/557) - Added github action to chech that the changelog has been updated on PRs
 
 ## [[0.11.15]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.15) - 2024-01-18
 ### Changed

Cargo.toml

@@ -2,7 +2,7 @@
 name = "thoth"
 version = "0.11.15"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "GraphQL API for bibliographic data"
 repository = "https://github.com/thoth-pub/thoth"

Dockerfile.dev

@@ -48,6 +48,7 @@ RUN mkdir thoth-api/src thoth-api-server/src thoth-app/src \
 RUN touch thoth-api/src/lib.rs thoth-api-server/src/lib.rs \
     thoth-app/src/lib.rs thoth-app-server/src/lib.rs thoth-client/src/lib.rs \
     thoth-errors/src/lib.rs thoth-export-server/src/lib.rs
+RUN echo "fn main() {}" > thoth-client/build.rs
 RUN wasm-pack build thoth-app/ \
   --target web \
   --debug

src/bin/thoth.rs

@@ -1,10 +1,10 @@
-use clap::{crate_authors, crate_version, value_parser, Arg, Command};
+use clap::{crate_authors, crate_version, value_parser, Arg, ArgAction, Command};
 use dialoguer::{console::Term, theme::ColorfulTheme, Input, MultiSelect, Password, Select};
 use dotenv::dotenv;
 use std::env;
 use thoth::api::account::model::{AccountData, LinkedPublisher};
 use thoth::api::account::service::{all_emails, all_publishers, register, update_password};
-use thoth::api::db::{establish_connection, run_migrations};
+use thoth::api::db::{establish_connection, revert_migrations, run_migrations};
 use thoth::api_server;
 use thoth::app_server;
 use thoth::export_server;
@@ -129,7 +129,16 @@ fn thoth_commands() -> Command {
         .about(env!("CARGO_PKG_DESCRIPTION"))
         .subcommand_required(true)
         .arg_required_else_help(true)
-        .subcommand(Command::new("migrate").about("Run the database migrations"))
+        .subcommand(
+            Command::new("migrate")
+                .about("Run the database migrations")
+                .arg(
+                    Arg::new("revert")
+                        .long("revert")
+                        .help("Revert all database migrations")
+                        .action(ArgAction::SetTrue),
+                ),
+        )
         .subcommand(
             Command::new("start")
                 .about("Start an instance of Thoth API or GUI")
@@ -240,7 +249,10 @@ fn main() -> ThothResult<()> {
             }
             _ => unreachable!(),
         },
-        Some(("migrate", _)) => run_migrations(),
+        Some(("migrate", migrate_matches)) => match migrate_matches.get_flag("revert") {
+            true => revert_migrations(),
+            false => run_migrations(),
+        },
         Some(("init", init_matches)) => {
             let host = init_matches.get_one::<String>("host").unwrap().to_owned();
             let port = init_matches.get_one::<String>("port").unwrap().to_owned();

thoth-api-server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "thoth-api-server"
 version = "0.11.15"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "Actix instance serving Thoth's GraphQL endpoints"
 repository = "https://github.com/thoth-pub/thoth"

thoth-api-server/src/lib.rs

@@ -84,6 +84,11 @@ async fn graphql_index(config: Data<ApiConfig>) -> HttpResponse {
     ))
 }
 
+#[get("/schema.graphql")]
+async fn graphql_schema(st: Data<Arc<Schema>>) -> HttpResponse {
+    HttpResponse::Ok().body(st.as_schema_language())
+}
+
 #[post("/graphql")]
 async fn graphql(
     st: Data<Arc<Schema>>,
@@ -192,6 +197,7 @@ fn config(cfg: &mut ServiceConfig) {
     cfg.service(login_credentials);
     cfg.service(login_session);
     cfg.service(account_details);
+    cfg.service(graphql_schema);
 }
 
 #[allow(clippy::too_many_arguments)]

thoth-api/Cargo.toml

@@ -2,7 +2,7 @@
 name = "thoth-api"
 version = "0.11.15"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "GraphQL API for bibliographic data"
 repository = "https://github.com/thoth-pub/thoth"

thoth-api/src/db.rs

@@ -39,3 +39,11 @@ pub fn run_migrations() -> ThothResult<()> {
         Err(error) => Err(ThothError::DatabaseError(error.to_string())),
     }
 }
+
+pub fn revert_migrations() -> ThothResult<()> {
+    let mut connection = establish_connection().get().unwrap();
+    match connection.revert_all_migrations(MIGRATIONS) {
+        Ok(_) => Ok(()),
+        Err(error) => Err(ThothError::DatabaseError(error.to_string())),
+    }
+}

thoth-app-server/Cargo.toml

@@ -2,7 +2,7 @@
 name = "thoth-app-server"
 version = "0.11.15"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "Actix instance serving Thoth's WASM GUI statically"
 repository = "https://github.com/thoth-pub/thoth"

thoth-app/Cargo.toml

@@ -2,7 +2,7 @@
 name = "thoth-app"
 version = "0.11.15"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "WASM APP for bibliographic data"
 repository = "https://github.com/thoth-pub/thoth"

thoth-client/.gitignore

@@ -0,0 +1 @@
+assets/schema.graphql

thoth-client/Cargo.toml

@@ -2,11 +2,12 @@
 name = "thoth-client"
 version = "0.11.15"
 authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
-edition = "2018"
+edition = "2021"
 license = "Apache-2.0"
 description = "GraphQL Client for bibliographic data"
 repository = "https://github.com/thoth-pub/thoth"
 readme = "README.md"
+build = "build.rs"
 
 [dependencies]
 thoth-api = {version = "0.11.15", path = "../thoth-api" }
@@ -19,3 +20,6 @@ reqwest-retry = "0.2.3"
 serde = "1.0"
 serde_json = "1.0"
 uuid = { version = "0.8.2", features = ["serde"] }
+
+[build-dependencies]
+thoth-api = { version = "0.11.15", path = "../thoth-api", features = ["backend"] }