From c0e4b88c0560234ae2db0f89c279f370dc378171 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 6 Jun 2026 17:03:35 +0200 Subject: [PATCH] remane queries to query --- src/domain/benutzer/queries.rs | 1 - src/domain/benutzer/query.rs | 3 +++ .../benutzer/{queries => query}/benutzer.rs | 0 src/domain/gruppe.rs | 3 ++- src/domain/gruppe/mutation.rs | 3 +++ .../gruppe/mutation}/gruppe.rs | 0 src/domain/gruppe/queries.rs | 1 - src/domain/gruppe/query.rs | 3 +++ src/domain/gruppe/{queries => query}/gruppe.rs | 0 src/domain/liegenschaft.rs | 2 +- src/domain/liegenschaft/queries.rs | 1 - src/domain/liegenschaft/query.rs | 3 +++ .../{queries => query}/liegenschaft.rs | 0 src/domain/rolle.rs | 2 +- src/domain/rolle/queries.rs | 1 - src/domain/rolle/query.rs | 3 +++ src/domain/rolle/{queries => query}/rolle.rs | 0 src/domain/typ.rs | 2 +- src/domain/typ/queries.rs | 1 - src/domain/typ/query.rs | 3 +++ src/domain/typ/{queries => query}/typ.rs | 0 src/mutations/mod.rs | 9 +++++---- src/queries/mod.rs | 18 +++++------------- 23 files changed, 33 insertions(+), 26 deletions(-) delete mode 100644 src/domain/benutzer/queries.rs create mode 100644 src/domain/benutzer/query.rs rename src/domain/benutzer/{queries => query}/benutzer.rs (100%) create mode 100644 src/domain/gruppe/mutation.rs rename src/{mutations => domain/gruppe/mutation}/gruppe.rs (100%) delete mode 100644 src/domain/gruppe/queries.rs create mode 100644 src/domain/gruppe/query.rs rename src/domain/gruppe/{queries => query}/gruppe.rs (100%) delete mode 100644 src/domain/liegenschaft/queries.rs create mode 100644 src/domain/liegenschaft/query.rs rename src/domain/liegenschaft/{queries => query}/liegenschaft.rs (100%) delete mode 100644 src/domain/rolle/queries.rs create mode 100644 src/domain/rolle/query.rs rename src/domain/rolle/{queries => query}/rolle.rs (100%) delete mode 100644 src/domain/typ/queries.rs create mode 100644 src/domain/typ/query.rs rename src/domain/typ/{queries => query}/typ.rs (100%) diff --git a/src/domain/benutzer/queries.rs b/src/domain/benutzer/queries.rs deleted file mode 100644 index 4c39041..0000000 --- a/src/domain/benutzer/queries.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod benutzer; diff --git a/src/domain/benutzer/query.rs b/src/domain/benutzer/query.rs new file mode 100644 index 0000000..9c3b83f --- /dev/null +++ b/src/domain/benutzer/query.rs @@ -0,0 +1,3 @@ +pub mod benutzer; + +pub use benutzer::BenutzerQuery; diff --git a/src/domain/benutzer/queries/benutzer.rs b/src/domain/benutzer/query/benutzer.rs similarity index 100% rename from src/domain/benutzer/queries/benutzer.rs rename to src/domain/benutzer/query/benutzer.rs diff --git a/src/domain/gruppe.rs b/src/domain/gruppe.rs index 758c8f6..f40bcec 100644 --- a/src/domain/gruppe.rs +++ b/src/domain/gruppe.rs @@ -1,6 +1,7 @@ pub mod dataloader; pub mod entity; pub mod model; -pub mod queries; +pub mod mutation; +pub mod query; pub mod repository; pub mod service; diff --git a/src/domain/gruppe/mutation.rs b/src/domain/gruppe/mutation.rs new file mode 100644 index 0000000..2714c47 --- /dev/null +++ b/src/domain/gruppe/mutation.rs @@ -0,0 +1,3 @@ +pub mod gruppe; + +pub use gruppe::GruppeMutation; diff --git a/src/mutations/gruppe.rs b/src/domain/gruppe/mutation/gruppe.rs similarity index 100% rename from src/mutations/gruppe.rs rename to src/domain/gruppe/mutation/gruppe.rs diff --git a/src/domain/gruppe/queries.rs b/src/domain/gruppe/queries.rs deleted file mode 100644 index 5c58ccf..0000000 --- a/src/domain/gruppe/queries.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod gruppe; diff --git a/src/domain/gruppe/query.rs b/src/domain/gruppe/query.rs new file mode 100644 index 0000000..6b43c4a --- /dev/null +++ b/src/domain/gruppe/query.rs @@ -0,0 +1,3 @@ +pub mod gruppe; + +pub use gruppe::GruppeQuery; diff --git a/src/domain/gruppe/queries/gruppe.rs b/src/domain/gruppe/query/gruppe.rs similarity index 100% rename from src/domain/gruppe/queries/gruppe.rs rename to src/domain/gruppe/query/gruppe.rs diff --git a/src/domain/liegenschaft.rs b/src/domain/liegenschaft.rs index 758c8f6..95df34d 100644 --- a/src/domain/liegenschaft.rs +++ b/src/domain/liegenschaft.rs @@ -1,6 +1,6 @@ pub mod dataloader; pub mod entity; pub mod model; -pub mod queries; +pub mod query; pub mod repository; pub mod service; diff --git a/src/domain/liegenschaft/queries.rs b/src/domain/liegenschaft/queries.rs deleted file mode 100644 index 0f2ea98..0000000 --- a/src/domain/liegenschaft/queries.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod liegenschaft; diff --git a/src/domain/liegenschaft/query.rs b/src/domain/liegenschaft/query.rs new file mode 100644 index 0000000..4cfb94c --- /dev/null +++ b/src/domain/liegenschaft/query.rs @@ -0,0 +1,3 @@ +pub mod liegenschaft; + +pub use liegenschaft::LiegenschaftQuery; diff --git a/src/domain/liegenschaft/queries/liegenschaft.rs b/src/domain/liegenschaft/query/liegenschaft.rs similarity index 100% rename from src/domain/liegenschaft/queries/liegenschaft.rs rename to src/domain/liegenschaft/query/liegenschaft.rs diff --git a/src/domain/rolle.rs b/src/domain/rolle.rs index 9daf971..f40bcec 100644 --- a/src/domain/rolle.rs +++ b/src/domain/rolle.rs @@ -2,6 +2,6 @@ pub mod dataloader; pub mod entity; pub mod model; pub mod mutation; -pub mod queries; +pub mod query; pub mod repository; pub mod service; diff --git a/src/domain/rolle/queries.rs b/src/domain/rolle/queries.rs deleted file mode 100644 index 6c5482c..0000000 --- a/src/domain/rolle/queries.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod rolle; diff --git a/src/domain/rolle/query.rs b/src/domain/rolle/query.rs new file mode 100644 index 0000000..2c5a91a --- /dev/null +++ b/src/domain/rolle/query.rs @@ -0,0 +1,3 @@ +pub mod rolle; + +pub use rolle::RolleQuery; diff --git a/src/domain/rolle/queries/rolle.rs b/src/domain/rolle/query/rolle.rs similarity index 100% rename from src/domain/rolle/queries/rolle.rs rename to src/domain/rolle/query/rolle.rs diff --git a/src/domain/typ.rs b/src/domain/typ.rs index 9daf971..f40bcec 100644 --- a/src/domain/typ.rs +++ b/src/domain/typ.rs @@ -2,6 +2,6 @@ pub mod dataloader; pub mod entity; pub mod model; pub mod mutation; -pub mod queries; +pub mod query; pub mod repository; pub mod service; diff --git a/src/domain/typ/queries.rs b/src/domain/typ/queries.rs deleted file mode 100644 index cf0929e..0000000 --- a/src/domain/typ/queries.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod typ; diff --git a/src/domain/typ/query.rs b/src/domain/typ/query.rs new file mode 100644 index 0000000..8c24ddc --- /dev/null +++ b/src/domain/typ/query.rs @@ -0,0 +1,3 @@ +pub mod typ; + +pub use typ::TypQuery; diff --git a/src/domain/typ/queries/typ.rs b/src/domain/typ/query/typ.rs similarity index 100% rename from src/domain/typ/queries/typ.rs rename to src/domain/typ/query/typ.rs diff --git a/src/mutations/mod.rs b/src/mutations/mod.rs index 24e5ab8..07a935a 100644 --- a/src/mutations/mod.rs +++ b/src/mutations/mod.rs @@ -1,12 +1,13 @@ // pub mod benutzer; -pub mod gruppe; // pub mod hersteller; // pub mod modell; pub mod liegenschaft; use async_graphql::MergedObject; -use crate::domain::{rolle::mutation::rolle, typ::mutation::TypMutation}; +use crate::domain::{ + gruppe::mutation::GruppeMutation, rolle::mutation::RolleMutation, typ::mutation::TypMutation, +}; #[derive(MergedObject, Default)] pub struct Mutation( @@ -14,7 +15,7 @@ pub struct Mutation( // hersteller::HerstellerMutation, // modell::ModellMutation, // benutzer::BenutzerMutation, - gruppe::GruppeMutation, - rolle::RolleMutation, + GruppeMutation, + RolleMutation, liegenschaft::LiegenschaftMutation, ); diff --git a/src/queries/mod.rs b/src/queries/mod.rs index c489204..38dab58 100644 --- a/src/queries/mod.rs +++ b/src/queries/mod.rs @@ -1,20 +1,12 @@ -// pub mod hersteller; -// pub mod modell; use crate::domain::{ // benutzer::queries::benutzer, - gruppe::queries::gruppe, - liegenschaft::queries::liegenschaft, - rolle::queries::rolle, - typ::queries::typ::TypQuery, + gruppe::query::GruppeQuery, + liegenschaft::query::LiegenschaftQuery, + rolle::query::RolleQuery, + typ::query::TypQuery, }; use async_graphql::MergedObject; #[derive(MergedObject, Default)] -pub struct Query( - TypQuery, - // benutzer::BenutzerQuery, - rolle::RolleQuery, - gruppe::GruppeQuery, - liegenschaft::LiegenschaftQuery, // modell::ModellQuery, -); +pub struct Query(TypQuery, RolleQuery, GruppeQuery, LiegenschaftQuery);