From dcde35d2e7282ee88bae6c0ab7a43facf957754a Mon Sep 17 00:00:00 2001 From: Desai Wang Date: Fri, 30 Jun 2023 10:32:51 -0400 Subject: [PATCH 1/3] Updated file name to match method name --- .../CarbonQueryDatabase_Engine.csproj | 6 +++--- .../Create/{GetRequest.cs => CarbonQueryDatabaseRequest.cs} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename CarbonQueryDatabase_Engine/Create/{GetRequest.cs => CarbonQueryDatabaseRequest.cs} (100%) diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj index 27a1033..d8ef6b6 100644 --- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj +++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj @@ -1,4 +1,4 @@ - + @@ -76,7 +76,7 @@ - + @@ -103,4 +103,4 @@ --> - + \ No newline at end of file diff --git a/CarbonQueryDatabase_Engine/Create/GetRequest.cs b/CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs similarity index 100% rename from CarbonQueryDatabase_Engine/Create/GetRequest.cs rename to CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs From e17a9f175d5ed3b6d1faf830cf695376c2dc810c Mon Sep 17 00:00:00 2001 From: Desai Wang Date: Fri, 30 Jun 2023 11:57:39 -0400 Subject: [PATCH 2/3] Changed names to GetRequest to match return type -Create methods names must match type of item created --- CarbonQueryDatabase_Adapter/CRUD/Read.cs | 4 ++-- CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj | 2 +- .../Create/{CarbonQueryDatabaseRequest.cs => GetRequest.cs} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename CarbonQueryDatabase_Engine/Create/{CarbonQueryDatabaseRequest.cs => GetRequest.cs} (96%) diff --git a/CarbonQueryDatabase_Adapter/CRUD/Read.cs b/CarbonQueryDatabase_Adapter/CRUD/Read.cs index 76959e8..e03c94a 100644 --- a/CarbonQueryDatabase_Adapter/CRUD/Read.cs +++ b/CarbonQueryDatabase_Adapter/CRUD/Read.cs @@ -71,11 +71,11 @@ private List ReadEnvironmentalProductDeclaratio GetRequest epdGetRequest; if (id == null) { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds", m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds", m_apiToken, config); } else { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds/" + id, m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds/" + id, m_apiToken, config); } string reqString = epdGetRequest.ToUrlString(); diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj index d8ef6b6..5fb441b 100644 --- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj +++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj @@ -76,7 +76,7 @@ - + diff --git a/CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs b/CarbonQueryDatabase_Engine/Create/GetRequest.cs similarity index 96% rename from CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs rename to CarbonQueryDatabase_Engine/Create/GetRequest.cs index c9d614c..dcf3466 100644 --- a/CarbonQueryDatabase_Engine/Create/CarbonQueryDatabaseRequest.cs +++ b/CarbonQueryDatabase_Engine/Create/GetRequest.cs @@ -40,7 +40,7 @@ public static partial class Create [Input("apiToken", "The user's CarbonQueryDatabase APIToken")] [Input("parameters", "An optional config object with properties representing parameters to create the GetRequest with (ie count, name_like, etc)")] [Output("GetRequest", "A GetRequest with CarbonQueryDatabase specific headers and uri")] - public static GetRequest CarbonQueryDatabaseRequest(string apiCommand, string apiToken, CQDConfig parameters = null) + public static GetRequest GetRequest(string apiCommand, string apiToken, CQDConfig parameters = null) { Dictionary param = new Dictionary(); if(parameters.Count > 0) From 4097a10d64ffc186a1efcd65ef76105b3af24a55 Mon Sep 17 00:00:00 2001 From: Desai Wang Date: Fri, 30 Jun 2023 12:01:31 -0400 Subject: [PATCH 3/3] Renamed to CarbonQueryRequest -per Fraser's suggestion, we are still using CarbonQueryDatabaseRequest for the method name, but created a subfolder named GetRequest inside Create --- CarbonQueryDatabase_Adapter/CRUD/Read.cs | 4 ++-- CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj | 2 +- .../CarbonQueryDatabaseRequest.cs} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename CarbonQueryDatabase_Engine/Create/{GetRequest.cs => GetRequest/CarbonQueryDatabaseRequest.cs} (96%) diff --git a/CarbonQueryDatabase_Adapter/CRUD/Read.cs b/CarbonQueryDatabase_Adapter/CRUD/Read.cs index e03c94a..76959e8 100644 --- a/CarbonQueryDatabase_Adapter/CRUD/Read.cs +++ b/CarbonQueryDatabase_Adapter/CRUD/Read.cs @@ -71,11 +71,11 @@ private List ReadEnvironmentalProductDeclaratio GetRequest epdGetRequest; if (id == null) { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds", m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds", m_apiToken, config); } else { - epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.GetRequest("epds/" + id, m_apiToken, config); + epdGetRequest = BH.Engine.Adapters.CarbonQueryDatabase.Create.CarbonQueryDatabaseRequest("epds/" + id, m_apiToken, config); } string reqString = epdGetRequest.ToUrlString(); diff --git a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj index 5fb441b..8eb6868 100644 --- a/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj +++ b/CarbonQueryDatabase_Engine/CarbonQueryDatabase_Engine.csproj @@ -76,7 +76,7 @@ - + diff --git a/CarbonQueryDatabase_Engine/Create/GetRequest.cs b/CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs similarity index 96% rename from CarbonQueryDatabase_Engine/Create/GetRequest.cs rename to CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs index dcf3466..c9d614c 100644 --- a/CarbonQueryDatabase_Engine/Create/GetRequest.cs +++ b/CarbonQueryDatabase_Engine/Create/GetRequest/CarbonQueryDatabaseRequest.cs @@ -40,7 +40,7 @@ public static partial class Create [Input("apiToken", "The user's CarbonQueryDatabase APIToken")] [Input("parameters", "An optional config object with properties representing parameters to create the GetRequest with (ie count, name_like, etc)")] [Output("GetRequest", "A GetRequest with CarbonQueryDatabase specific headers and uri")] - public static GetRequest GetRequest(string apiCommand, string apiToken, CQDConfig parameters = null) + public static GetRequest CarbonQueryDatabaseRequest(string apiCommand, string apiToken, CQDConfig parameters = null) { Dictionary param = new Dictionary(); if(parameters.Count > 0)