* MS all the GQLSet_MYTYPE structs are generated by a shared macro. (prompted by the desire to have extra, optional fields exposed for each gql-set, for making them compatible with both the old and new mobx-graphlink list-request structure)

Author: Venryx

.vscode/settings.json

@@ -53,6 +53,9 @@
 		"FOR_RUST_ANALYZER": "1",
 		"STRIP_ASYNC_GRAPHQL": "1",
 	},
+	"rust-analyzer.cargo.features": [
+		"rust-analyzer",
+	],
 	"rust-analyzer.runnableEnv": {
 		// this allows us to use unstable features (as is true for the Docker builds), without rust-analyzer showing an error on the "#![feature(XXX)]" line
 		//"RUSTC_BOOTSTRAP": "1", // not needed anymore

Cargo.lock

@@ -31,6 +31,7 @@ dyn-clone = "1.0.4"
 oauth2 = "4.4.2"
 dotenv = "0.15.0"
 lexicon_fractional_index = "0.0.3"
+pastey = "0.1.0"
 
 # temp-fix for https://github.com/tikv/pprof-rs/issues/232
 #pprof = {git = "https://github.com/Erigara/pprof-rs", branch = "fix-pointer-align"}
@@ -68,4 +69,7 @@ thiserror = "1.0.61"
 # v-desktop, base #1: 9m11s (8m5s + 1m6s)
 # v-desktop, base #2: 7m17s (6m14s + 1m3s)
 # v-desktop, with volumes, no base-build #1: 30s
-# v-desktop, with volumes, no base-build #2: 1.355s (cargo build realized that nothing actually needed recompiling)
+# v-desktop, with volumes, no base-build #2: 1.355s (cargo build realized that nothing actually needed recompiling)
+
+[features]
+rust-analyzer = []

Packages/app-server/Cargo.toml

@@ -127,7 +127,7 @@ struct PingResult {
 	async fn linkPreserver(&self, _ctx: &async_graphql::Context<'_>, input: LinkPreserverInput) -> impl Stream<Item = Result<LinkPreserverResult, SubError>> {
 		let base_stream = async_stream::stream! {
 			let LinkPreserverInput { updateInterval } = input;
-			if (updateInterval < 10000) { Err(SubError::new(format!("Update-interval cannot be lower than 10000ms.")))?; }
+			if updateInterval < 10000 { Err(SubError::new(format!("Update-interval cannot be lower than 10000ms.")))?; }
 
 			let mut refresh_requested_last_iteration = Path::new("./refreshPageForAllUsers_enabled").exists();
 			loop {

Packages/app-server/src/db/_general.rs

@@ -5,14 +5,15 @@ use rust_shared::anyhow::{anyhow, Error};
 use rust_shared::async_graphql::{Context, InputObject, Object, OutputType, Schema, SimpleObject, Subscription, ID};
 use rust_shared::db_constants::SYSTEM_USER_ID;
 use rust_shared::indexmap::IndexMap;
-use rust_shared::rust_macros::wrap_slow_macros;
+use rust_shared::rust_macros::{self, wrap_slow_macros};
 use rust_shared::serde::{Deserialize, Serialize};
 use rust_shared::serde_json::json;
 use rust_shared::tokio_postgres::Client;
 use rust_shared::tokio_postgres::Row;
 use rust_shared::utils::type_aliases::JSONValue;
 use rust_shared::{async_graphql, serde, serde_json, GQLError, SubError};
 
+use crate::gql_set_impl;
 use crate::utils::db::accessors::{get_db_entries, get_db_entry, AccessorContext};
 use crate::utils::db::generic_handlers::queries::{handle_generic_gql_collection_query, handle_generic_gql_doc_query};
 use crate::utils::db::{
@@ -46,12 +47,7 @@ pub async fn get_system_access_policy(ctx: &AccessorContext<'_>, name: &str) ->
 
 wrap_slow_macros! {
 
-#[derive(Clone)] pub struct GQLSet_AccessPolicy { pub nodes: Vec<AccessPolicy> }
-#[Object] impl GQLSet_AccessPolicy { async fn nodes(&self) -> &Vec<AccessPolicy> { &self.nodes } }
-impl GQLSet<AccessPolicy> for GQLSet_AccessPolicy {
-	fn from(entries: Vec<AccessPolicy>) -> GQLSet_AccessPolicy { Self { nodes: entries } }
-	fn nodes(&self) -> &Vec<AccessPolicy> { &self.nodes }
-}
+gql_set_impl!(AccessPolicy);
 
 #[derive(Default)] pub struct QueryShard_AccessPolicy;
 #[Object] impl QueryShard_AccessPolicy {

Packages/app-server/src/db/access_policies.rs

@@ -5,6 +5,7 @@ use rust_shared::serde::{Deserialize, Serialize};
 use rust_shared::tokio_postgres::{Client, Row};
 use rust_shared::{async_graphql, serde, serde_json, GQLError, SubError};
 
+use crate::gql_set_impl;
 use crate::utils::db::generic_handlers::queries::{handle_generic_gql_collection_query, handle_generic_gql_doc_query};
 use crate::utils::db::pg_row_to_json::postgres_row_to_struct;
 use crate::utils::db::{
@@ -69,12 +70,7 @@ impl From<Row> for CommandRun {
 	fn from(row: Row) -> Self { postgres_row_to_struct(row).unwrap() }
 }
 
-#[derive(Clone)] pub struct GQLSet_CommandRun { pub nodes: Vec<CommandRun> }
-#[Object] impl GQLSet_CommandRun { async fn nodes(&self) -> &Vec<CommandRun> { &self.nodes } }
-impl GQLSet<CommandRun> for GQLSet_CommandRun {
-	fn from(entries: Vec<CommandRun>) -> GQLSet_CommandRun { Self { nodes: entries } }
-	fn nodes(&self) -> &Vec<CommandRun> { &self.nodes }
-}
+gql_set_impl!(CommandRun);
 
 #[derive(Default)] pub struct QueryShard_CommandRun;
 #[Object] impl QueryShard_CommandRun {

Packages/app-server/src/db/command_runs.rs

@@ -9,6 +9,7 @@ use rust_shared::{
 	serde, GQLError,
 };
 
+use crate::gql_set_impl;
 use crate::utils::db::generic_handlers::queries::{handle_generic_gql_collection_query, handle_generic_gql_doc_query};
 use crate::utils::db::{
 	filter::FilterInput,
@@ -33,12 +34,7 @@ impl From<Row> for Proposal {
 	fn from(row: Row) -> Self { postgres_row_to_struct(row).unwrap() }
 }
 
-#[derive(Clone)] pub struct GQLSet_Proposal { pub nodes: Vec<Proposal> }
-#[Object] impl GQLSet_Proposal { async fn nodes(&self) -> &Vec<Proposal> { &self.nodes } }
-impl GQLSet<Proposal> for GQLSet_Proposal {
-	fn from(entries: Vec<Proposal>) -> GQLSet_Proposal { Self { nodes: entries } }
-	fn nodes(&self) -> &Vec<Proposal> { &self.nodes }
-}
+gql_set_impl!(Proposal);
 
 #[derive(Default)] pub struct QueryShard_Proposal;
 #[Object] impl QueryShard_Proposal {

Packages/app-server/src/db/feedback_proposals.rs

@@ -7,6 +7,7 @@ use rust_shared::serde::{Deserialize, Serialize};
 use rust_shared::tokio_postgres::{Client, Row};
 use rust_shared::{GQLError, SubError};
 
+use crate::gql_set_impl;
 use crate::utils::db::generic_handlers::queries::{handle_generic_gql_collection_query, handle_generic_gql_doc_query};
 use crate::utils::db::{
 	filter::FilterInput,
@@ -35,12 +36,7 @@ impl From<Row> for UserInfo {
 	}
 }
 
-#[derive(Clone)] pub struct GQLSet_UserInfo { pub nodes: Vec<UserInfo> }
-#[Object] impl GQLSet_UserInfo { async fn nodes(&self) -> &Vec<UserInfo> { &self.nodes } }
-impl GQLSet<UserInfo> for GQLSet_UserInfo {
-	fn from(entries: Vec<UserInfo>) -> GQLSet_UserInfo { Self { nodes: entries } }
-	fn nodes(&self) -> &Vec<UserInfo> { &self.nodes }
-}
+gql_set_impl!(UserInfo);
 
 #[derive(Default)] pub struct QueryShard_UserInfo;
 #[Object] impl QueryShard_UserInfo {

Packages/app-server/src/db/feedback_user_infos.rs

@@ -8,6 +8,7 @@ use rust_shared::tokio_postgres::{Client, Row};
 use rust_shared::utils::type_aliases::JSONValue;
 use rust_shared::{serde_json, GQLError, SubError};
 
+use crate::gql_set_impl;
 use crate::utils::db::generic_handlers::queries::{handle_generic_gql_collection_query, handle_generic_gql_doc_query};
 use crate::utils::db::{
 	filter::FilterInput,
@@ -36,12 +37,7 @@ impl From<Row> for GlobalData {
 	}
 }
 
-#[derive(Clone)] pub struct GQLSet_GlobalData { pub nodes: Vec<GlobalData> }
-#[Object] impl GQLSet_GlobalData { async fn nodes(&self) -> &Vec<GlobalData> { &self.nodes } }
-impl GQLSet<GlobalData> for GQLSet_GlobalData {
-	fn from(entries: Vec<GlobalData>) -> GQLSet_GlobalData { Self { nodes: entries } }
-	fn nodes(&self) -> &Vec<GlobalData> { &self.nodes }
-}
+gql_set_impl!(GlobalData);
 
 #[derive(Default)] pub struct QueryShard_GlobalData;
 #[Object] impl QueryShard_GlobalData {

Packages/app-server/src/db/global_data.rs

@@ -10,6 +10,7 @@ use rust_shared::tokio_postgres::{Client, Row};
 use rust_shared::GQLError;
 use rust_shared::SubError;
 
+use crate::gql_set_impl;
 use crate::utils::db::accessors::AccessorContext;
 use crate::utils::db::generic_handlers::queries::{handle_generic_gql_collection_query, handle_generic_gql_doc_query};
 use crate::utils::db::pg_row_to_json::postgres_row_to_struct;
@@ -47,12 +48,7 @@ impl From<Row> for MapNodeEdit {
 	fn from(row: Row) -> Self { postgres_row_to_struct(row).unwrap() }
 }
 
-#[derive(Clone)] pub struct GQLSet_MapNodeEdit { pub nodes: Vec<MapNodeEdit> }
-#[Object] impl GQLSet_MapNodeEdit { async fn nodes(&self) -> &Vec<MapNodeEdit> { &self.nodes } }
-impl GQLSet<MapNodeEdit> for GQLSet_MapNodeEdit {
-	fn from(entries: Vec<MapNodeEdit>) -> GQLSet_MapNodeEdit { Self { nodes: entries } }
-	fn nodes(&self) -> &Vec<MapNodeEdit> { &self.nodes }
-}
+gql_set_impl!(MapNodeEdit);
 
 #[derive(Default)] pub struct QueryShard_NodeEdit;
 #[Object] impl QueryShard_NodeEdit {