Revert "Fix the Product request on entities"

This reverts commit ca54df7.

backend/graphql/Cargo.toml

@@ -14,7 +14,6 @@ util = { path = "../util" }
 graphql_configuration = { path = "configuration" }
 graphql_drug_interactions = { path = "drug_interactions" }
 graphql_core = { path = "core" }
-graphql_v1_core = { path = "../graphql_v1/core" }
 graphql_barcode = { path = "barcode" }
 graphql_types = { path = "types" }
 graphql_general = { path = "general" }

backend/graphql/core/Cargo.toml

@@ -12,7 +12,6 @@ doctest = false
 repository = { path = "../../repository" }
 service = { path = "../../service" }
 util = { path = "../../util" }
-graphql_v1_core = { path = "../../graphql_v1/core" }
 
 actix-web = { version = "4.0.1", default-features = false, features = ["macros", "cookies"] }
 anymap = "0.12"
@@ -25,4 +24,4 @@ serde = "1.0.126"
 serde_json = "1.0.66"
 thiserror = "1.0.30"
 tokio = { version = "1.29", features = ["macros" ] }
-async-std = { version = "1", features = ["attributes", "tokio1"] }
+async-std = "1.12"

backend/graphql/core/src/lib.rs

@@ -5,8 +5,6 @@ pub mod simple_generic_errors;
 pub mod standard_graphql_error;
 pub mod test_helpers;
 
-use graphql_v1_core::loader::LoaderRegistry as LoaderRegistryV1;
-
 use std::sync::Arc;
 
 use actix_web::cookie::Cookie;
@@ -36,7 +34,6 @@ pub trait SelfRequest: Send + Sync {
 pub trait ContextExt {
     fn get_connection_manager(&self) -> &StorageConnectionManager;
     fn get_loader<T: anymap::any::Any + Send + Sync>(&self) -> &T;
-    fn get_loader_v1<T: anymap::any::Any + Send + Sync>(&self) -> &T;
     fn service_provider(&self) -> Arc<ServiceProvider>;
     fn service_context(
         &self,
@@ -58,10 +55,6 @@ impl<'a> ContextExt for Context<'a> {
         self.data_unchecked::<Data<LoaderRegistry>>().get::<T>()
     }
 
-    fn get_loader_v1<T: anymap::any::Any + Send + Sync>(&self) -> &T {
-        self.data_unchecked::<Data<LoaderRegistryV1>>().get::<T>()
-    }
-
     fn service_provider(&self) -> Arc<ServiceProvider> {
         self.data_unchecked::<Data<ServiceProvider>>()
             .clone()

backend/graphql/lib.rs

@@ -16,7 +16,6 @@ use graphql_general::GeneralQueries;
 use graphql_universal_codes::{UniversalCodesMutations, UniversalCodesQueries};
 use graphql_universal_codes_v1::UniversalCodesV1Queries;
 use graphql_user_account::{UserAccountMutations, UserAccountQueries};
-use graphql_v1_core::loader::LoaderRegistry as LoaderRegistryV1;
 
 use logger::{RequestLogger, ResponseLogger};
 use repository::StorageConnectionManager;
@@ -77,7 +76,6 @@ pub fn schema_builder() -> Builder {
 pub fn build_schema(
     connection_manager: Data<StorageConnectionManager>,
     loader_registry: Data<LoaderRegistry>,
-    loader_registry_v1: Data<LoaderRegistryV1>,
     service_provider: Data<ServiceProvider>,
     auth_data: Data<AuthData>,
     settings_data: Data<Settings>,
@@ -88,7 +86,6 @@ pub fn build_schema(
     let mut builder = schema_builder()
         .data(connection_manager)
         .data(loader_registry)
-        .data(loader_registry_v1)
         .data(service_provider)
         .data(auth_data)
         .data(settings_data)
@@ -123,7 +120,6 @@ impl SelfRequest for SelfRequestImpl {
 pub fn config(
     connection_manager: Data<StorageConnectionManager>,
     loader_registry: Data<LoaderRegistry>,
-    loader_registry_v1: Data<LoaderRegistryV1>,
     service_provider: Data<ServiceProvider>,
     auth_data: Data<AuthData>,
     settings_data: Data<Settings>,
@@ -134,7 +130,6 @@ pub fn config(
             schema: build_schema(
                 connection_manager.clone(),
                 loader_registry.clone(),
-                loader_registry_v1.clone(),
                 service_provider.clone(),
                 auth_data.clone(),
                 settings_data.clone(),
@@ -147,7 +142,6 @@ pub fn config(
         let schema = build_schema(
             connection_manager,
             loader_registry,
-            loader_registry_v1,
             service_provider,
             auth_data,
             settings_data,

backend/graphql_v1/Cargo.toml

@@ -23,7 +23,6 @@ async-graphql = { version = "3.0.35", features = [
 ] }
 async-graphql-actix-web = "3.0.35"
 async-trait = "0.1.30"
-tokio = { version = "1.29", features = ["macros"] }
 log = "0.4.14"
 
 

backend/graphql_v1/core/Cargo.toml

@@ -9,13 +9,7 @@ doctest = false
 
 [dependencies]
 
-dgraph = { path = "../../dgraph" }
 service = { path = "../../service" }
 
 actix-web = { version = "4.0.1", default-features = false, features = ["macros", "cookies"] }
-anymap = "0.12"
 async-graphql = { version = "3.0.35", features = ["dataloader", "chrono"] }
-async-graphql-actix-web = "3.0.35"
-async-trait = "0.1.30"
-tokio = { version = "1.29", features = ["macros" ] }
-async-std = { version = "1", features = ["attributes", "tokio1"] }

backend/graphql_v1/core/src/lib.rs

@@ -3,23 +3,15 @@ use std::sync::Arc;
 use actix_web::web::Data;
 use async_graphql::Context;
 
-pub mod loader;
-
-use loader::LoaderRegistry;
 use service::service_provider::ServiceProvider;
 
 #[allow(clippy::borrowed_box)]
 // Sugar that helps make things neater and avoid errors that would only crop up at runtime.
 pub trait ContextExt {
     fn service_provider(&self) -> Arc<ServiceProvider>;
-    fn get_loader_v1<T: anymap::any::Any + Send + Sync>(&self) -> &T;
 }
 
 impl<'a> ContextExt for Context<'a> {
-    fn get_loader_v1<T: anymap::any::Any + Send + Sync>(&self) -> &T {
-        self.data_unchecked::<Data<LoaderRegistry>>().get::<T>()
-    }
-
     fn service_provider(&self) -> Arc<ServiceProvider> {
         self.data_unchecked::<Data<ServiceProvider>>()
             .clone()

backend/graphql_v1/lib.rs

@@ -9,7 +9,6 @@ use async_graphql::{EmptyMutation, EmptySubscription, MergedObject, SchemaBuilde
 use async_graphql_actix_web::{GraphQLRequest, GraphQLResponse};
 use graphql_universal_codes_v1::UniversalCodesV1Queries;
 
-use graphql_v1_core::loader::LoaderRegistry;
 use logger::{RequestLogger, ResponseLogger};
 use repository::StorageConnectionManager;
 use service::service_provider::ServiceProvider;
@@ -34,14 +33,12 @@ pub fn schema_builder() -> Builder {
 
 pub fn build_schema(
     connection_manager: Data<StorageConnectionManager>,
-    loader_registry: Data<LoaderRegistry>,
     service_provider: Data<ServiceProvider>,
     settings_data: Data<Settings>,
     include_logger: bool,
 ) -> Schema {
     let mut builder = schema_builder()
         .data(connection_manager)
-        .data(loader_registry)
         .data(service_provider)
         .data(settings_data);
 
@@ -54,18 +51,11 @@ pub fn build_schema(
 
 pub fn config(
     connection_manager: Data<StorageConnectionManager>,
-    loader_registry: Data<LoaderRegistry>,
     service_provider: Data<ServiceProvider>,
     settings_data: Data<Settings>,
 ) -> impl FnOnce(&mut actix_web::web::ServiceConfig) {
     |cfg| {
-        let schema = build_schema(
-            connection_manager,
-            loader_registry,
-            service_provider,
-            settings_data,
-            true,
-        );
+        let schema = build_schema(connection_manager, service_provider, settings_data, true);
 
         cfg.app_data(Data::new(schema))
             .service(

backend/graphql_v1/universal_codes/src/types/entity.rs

@@ -1,11 +1,6 @@
-use async_graphql::dataloader::DataLoader;
 use async_graphql::*;
-
 use dgraph::Entity;
 
-use graphql_v1_core::loader::ProductLoader;
-use graphql_v1_core::ContextExt;
-
 use crate::AlternativeNameType;
 use crate::BarcodeType;
 
@@ -92,17 +87,9 @@ impl EntityType {
         &self.alternative_names
     }
 
-    pub async fn product(
-        &self,
-        ctx: &Context<'_>,
-    ) -> Result<Option<EntityType>, async_graphql::Error> {
-        let loader = ctx.get_loader_v1::<DataLoader<ProductLoader>>();
-        let result = loader
-            .load_one(self.code.to_string())
-            .await?
-            .unwrap_or_default();
-
-        Ok(result.map(EntityType::from_domain))
+    pub async fn product(&self) -> Option<EntityType> {
+        // TODO: Probably a loader? Implement Product Lookup
+        None
     }
 
     pub async fn parents(&self) -> &Vec<EntityType> {

backend/server/Cargo.toml

@@ -34,7 +34,6 @@ maintainer-scripts = "debian/scripts"
 graphql = { path = "../graphql" }
 graphql_v1 = { path = "../graphql_v1" }
 graphql_core = { path = "../graphql/core" }
-graphql_v1_core = { path = "../graphql_v1/core" }
 graphql_types = { path = "../graphql/types" }
 dgraph = {path = "../dgraph"}
 repository = { path = "../repository" }

backend/server/src/lib.rs

@@ -5,8 +5,6 @@ use crate::{
 
 use self::middleware::{compress as compress_middleware, logger as logger_middleware};
 use graphql_core::loader::{get_loaders, LoaderRegistry};
-use graphql_v1_core::loader::get_loaders_v1;
-use graphql_v1_core::loader::LoaderRegistry as LoaderRegistryV1;
 
 use graphql::config as graphql_config;
 use graphql_v1::config as graphql_v1_config;
@@ -71,11 +69,6 @@ async fn run_server(
     let loaders = get_loaders(&connection_manager, service_provider_data.clone()).await;
     let loader_registry_data = Data::new(LoaderRegistry { loaders });
 
-    let loaders_v1 = get_loaders_v1(service_provider_data.clone()).await;
-    let loader_registry_data_v1 = Data::new(LoaderRegistryV1 {
-        loaders: loaders_v1,
-    });
-
     let settings_data = Data::new(config_settings.clone());
 
     let restart_switch = Data::new(restart_switch);
@@ -147,15 +140,13 @@ async fn run_server(
             .configure(graphql_config(
                 connection_manager_data_app.clone(),
                 loader_registry_data.clone(),
-                loader_registry_data_v1.clone(),
                 service_provider_data.clone(),
                 auth_data.clone(),
                 settings_data.clone(),
                 restart_switch.clone(),
             ))
             .configure(graphql_v1_config(
                 connection_manager_data_app.clone(),
-                loader_registry_data_v1.clone(),
                 service_provider_data.clone(),
                 settings_data.clone(),
             ))

backend/service/src/service_provider.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use dgraph::DgraphClient;
 use repository::{RepositoryError, StorageConnection, StorageConnectionManager};
 
 use crate::{
@@ -88,14 +87,4 @@ impl ServiceProvider {
     pub fn connection(&self) -> Result<StorageConnection, RepositoryError> {
         self.connection_manager.connection()
     }
-
-    pub fn dgraph_client(&self) -> DgraphClient {
-        let url = format!(
-            "{}:{}/graphql",
-            self.settings.dgraph.host.clone(),
-            self.settings.dgraph.port
-        );
-
-        DgraphClient::new(&url)
-    }
 }