diff --git a/dopt.DeltaBarth.Tests/JsonStructsTest.cs b/dopt.DeltaBarth.Tests/DataObjectsTest.cs similarity index 74% rename from dopt.DeltaBarth.Tests/JsonStructsTest.cs rename to dopt.DeltaBarth.Tests/DataObjectsTest.cs index 4aecb2f..fa1fbbd 100644 --- a/dopt.DeltaBarth.Tests/JsonStructsTest.cs +++ b/dopt.DeltaBarth.Tests/DataObjectsTest.cs @@ -7,18 +7,18 @@ namespace dopt.DeltaBarth.Tests using System.Collections.Immutable; internal class TestPlugin : DeltaBarth.Plugin { - internal dynamic pyModJsonStructs; + internal dynamic pyModJsonData; private const string absPath = @"A:\Arbeitsaufgaben\Delta-Barth\cs-wrapper\dopt.DeltaBarth"; internal TestPlugin() : base(absPath) { using (Py.GIL()) { - pyModJsonStructs = Py.Import("delta_barth._csharp.json_types"); + pyModJsonData = Py.Import("delta_barth._csharp.json_types"); } } } [TestClass] - public class JsonStructsTest + public class DataObjectsTest { static void PrettyPrint(object toSerialise) { @@ -35,9 +35,9 @@ namespace dopt.DeltaBarth.Tests string pyJson; using (Py.GIL()) { - pyJson = (string)plugin.pyModJsonStructs.status_err(); + pyJson = (string)plugin.pyModJsonData.status_err(); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); Assert.AreEqual(102, parsed.code); Assert.AreEqual("internal error occurred", parsed.description); Assert.AreEqual("caused by test", parsed.message); @@ -52,9 +52,9 @@ namespace dopt.DeltaBarth.Tests string pyJson; using (Py.GIL()) { - pyJson = (string)plugin.pyModJsonStructs.delta_barth_api_error(); + pyJson = (string)plugin.pyModJsonData.delta_barth_api_error(); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); Assert.AreEqual(401, parsed.status_code); Assert.AreEqual("test message", parsed.message); Assert.AreEqual("test code", parsed.code); @@ -72,9 +72,9 @@ namespace dopt.DeltaBarth.Tests string pyJson; using (Py.GIL()) { - pyJson = (string)plugin.pyModJsonStructs.api_credentials(); + pyJson = (string)plugin.pyModJsonData.api_credentials(); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); Assert.AreEqual("user", parsed.username); Assert.AreEqual("pass", parsed.password); Assert.AreEqual("test1", parsed.database); @@ -89,9 +89,9 @@ namespace dopt.DeltaBarth.Tests string pyJson; using (Py.GIL()) { - pyJson = (string)plugin.pyModJsonStructs.sales_prognosis_result(); + pyJson = (string)plugin.pyModJsonData.sales_prognosis_result(); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); Assert.AreEqual(2023, parsed.jahr); Assert.AreEqual(12, parsed.monat); Assert.AreEqual(3000.3456m, parsed.vorhersage); @@ -105,14 +105,14 @@ namespace dopt.DeltaBarth.Tests string pyJson; using (Py.GIL()) { - pyJson = (string)plugin.pyModJsonStructs.sales_prognosis_results(); + pyJson = (string)plugin.pyModJsonData.sales_prognosis_results(); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); Assert.AreEqual(3, parsed.daten.Length); - var e1 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m }; - var e2 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m }; - var e3 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m }; - ImmutableArray arr = ImmutableArray.Create(e1, e2, e3); + var e1 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m }; + var e2 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m }; + var e3 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m }; + ImmutableArray arr = ImmutableArray.Create(e1, e2, e3); for (int i = 0; i < parsed.daten.Length; i++) { @@ -128,15 +128,15 @@ namespace dopt.DeltaBarth.Tests string pyJson; using (Py.GIL()) { - pyJson = (string)plugin.pyModJsonStructs.sales_prognosis_results_export(); + pyJson = (string)plugin.pyModJsonData.sales_prognosis_results_export(); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); // result - var e1 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m }; - var e2 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m }; - var e3 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m }; - ImmutableArray arr = ImmutableArray.Create(e1, e2, e3); - var data = new JsonStructs.UmsatzPrognoseErgebnisse { daten = arr }; + var e1 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m }; + var e2 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m }; + var e3 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m }; + ImmutableArray arr = ImmutableArray.Create(e1, e2, e3); + var data = new DataObjects.UmsatzPrognoseErgebnisse { daten = arr }; // check status Assert.AreEqual(0, parsed.status.code); Assert.AreEqual("Erfolg", parsed.status.description); diff --git a/dopt.DeltaBarth/JsonStructs.cs b/dopt.DeltaBarth/DataObjects.cs similarity index 97% rename from dopt.DeltaBarth/JsonStructs.cs rename to dopt.DeltaBarth/DataObjects.cs index 59a41bd..3cacf84 100644 --- a/dopt.DeltaBarth/JsonStructs.cs +++ b/dopt.DeltaBarth/DataObjects.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Collections.Immutable; -namespace dopt.DeltaBarth.JsonStructs +namespace dopt.DeltaBarth.DataObjects { public readonly struct ApiServerError { diff --git a/dopt.DeltaBarth/Plugin.cs b/dopt.DeltaBarth/Plugin.cs index 610424d..888622d 100644 --- a/dopt.DeltaBarth/Plugin.cs +++ b/dopt.DeltaBarth/Plugin.cs @@ -34,7 +34,7 @@ namespace dopt.DeltaBarth pyModManagement.set_credentials(nutzername, passwort, datenbank, mandant); } } - public JsonStructs.UmsatzPrognoseAusgabe UmsatzprognoseDummy(int? firmaId, DateTime? buchungsDatum) + public DataObjects.UmsatzPrognoseAusgabe UmsatzprognoseDummy(int? firmaId, DateTime? buchungsDatum) { AssertNotDisposed(); string pyJson; @@ -42,11 +42,11 @@ namespace dopt.DeltaBarth { pyJson = pyModPipeline.pipeline_sales_forecast_dummy(firmaId, buchungsDatum); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); return parsed; } - public JsonStructs.UmsatzPrognoseAusgabe Umsatzprognose(int? firmaId, DateTime? buchungsDatum) + public DataObjects.UmsatzPrognoseAusgabe Umsatzprognose(int? firmaId, DateTime? buchungsDatum) { AssertNotDisposed(); string pyJson; @@ -54,7 +54,7 @@ namespace dopt.DeltaBarth { pyJson = pyModPipeline.pipeline_sales_forecast(firmaId, buchungsDatum); } - var parsed = JsonSerializer.Deserialize(pyJson); + var parsed = JsonSerializer.Deserialize(pyJson); return parsed; } @@ -68,7 +68,7 @@ namespace dopt.DeltaBarth } return pyJson; } - protected JsonStructs.Credentials GetCredentials() + protected DataObjects.Credentials GetCredentials() { AssertNotDisposed(); string pyJson; @@ -77,7 +77,7 @@ namespace dopt.DeltaBarth pyJson = (string)pyModManagement.get_credentials(); } - JsonStructs.Credentials credentials = JsonSerializer.Deserialize(pyJson); + DataObjects.Credentials credentials = JsonSerializer.Deserialize(pyJson); return credentials; }