delta-barth/delta-barth-cs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 3 Releases 1 Wiki Activity

rename namespace for data objects

Browse Source
This commit is contained in:
Florian Förster 2025-04-03 08:24:41 +02:00
parent 71a3143fd3
commit 068af2bdbd
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dopt.DeltaBarth.Tests/JsonStructsTest.cs → dopt.DeltaBarth.Tests/DataObjectsTest.cs
View File

@ -7,18 +7,18 @@ namespace dopt.DeltaBarth.Tests
using System.Collections.Immutable; using System.Collections.Immutable;
internal class TestPlugin : DeltaBarth.Plugin internal class TestPlugin : DeltaBarth.Plugin
{ {
internal dynamic pyModJsonStructs; internal dynamic pyModJsonData;
private const string absPath = @"A:\Arbeitsaufgaben\Delta-Barth\cs-wrapper\dopt.DeltaBarth"; private const string absPath = @"A:\Arbeitsaufgaben\Delta-Barth\cs-wrapper\dopt.DeltaBarth";
internal TestPlugin() : base(absPath) { internal TestPlugin() : base(absPath) {
using (Py.GIL()) using (Py.GIL())
{ {
pyModJsonStructs = Py.Import("delta_barth._csharp.json_types"); pyModJsonData = Py.Import("delta_barth._csharp.json_types");
} }
} }
} }
[TestClass] [TestClass]
public class JsonStructsTest public class DataObjectsTest
{ {
static void PrettyPrint(object toSerialise) static void PrettyPrint(object toSerialise)
{ {
@ -35,9 +35,9 @@ namespace dopt.DeltaBarth.Tests
string pyJson; string pyJson;
using (Py.GIL()) using (Py.GIL())
{ {
pyJson = (string)plugin.pyModJsonStructs.status_err(); pyJson = (string)plugin.pyModJsonData.status_err();
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.Status>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.Status>(pyJson);
Assert.AreEqual(102, parsed.code); Assert.AreEqual(102, parsed.code);
Assert.AreEqual("internal error occurred", parsed.description); Assert.AreEqual("internal error occurred", parsed.description);
Assert.AreEqual("caused by test", parsed.message); Assert.AreEqual("caused by test", parsed.message);
@ -52,9 +52,9 @@ namespace dopt.DeltaBarth.Tests
string pyJson; string pyJson;
using (Py.GIL()) using (Py.GIL())
{ {
pyJson = (string)plugin.pyModJsonStructs.delta_barth_api_error(); pyJson = (string)plugin.pyModJsonData.delta_barth_api_error();
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.ApiServerError>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.ApiServerError>(pyJson);
Assert.AreEqual(401, parsed.status_code); Assert.AreEqual(401, parsed.status_code);
Assert.AreEqual("test message", parsed.message); Assert.AreEqual("test message", parsed.message);
Assert.AreEqual("test code", parsed.code); Assert.AreEqual("test code", parsed.code);
@ -72,9 +72,9 @@ namespace dopt.DeltaBarth.Tests
string pyJson; string pyJson;
using (Py.GIL()) using (Py.GIL())
{ {
pyJson = (string)plugin.pyModJsonStructs.api_credentials(); pyJson = (string)plugin.pyModJsonData.api_credentials();
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.Credentials>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.Credentials>(pyJson);
Assert.AreEqual("user", parsed.username); Assert.AreEqual("user", parsed.username);
Assert.AreEqual("pass", parsed.password); Assert.AreEqual("pass", parsed.password);
Assert.AreEqual("test1", parsed.database); Assert.AreEqual("test1", parsed.database);
@ -89,9 +89,9 @@ namespace dopt.DeltaBarth.Tests
string pyJson; string pyJson;
using (Py.GIL()) using (Py.GIL())
{ {
pyJson = (string)plugin.pyModJsonStructs.sales_prognosis_result(); pyJson = (string)plugin.pyModJsonData.sales_prognosis_result();
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.UmsatzPrognoseEinzelergebnis>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.UmsatzPrognoseEinzelergebnis>(pyJson);
Assert.AreEqual(2023, parsed.jahr); Assert.AreEqual(2023, parsed.jahr);
Assert.AreEqual(12, parsed.monat); Assert.AreEqual(12, parsed.monat);
Assert.AreEqual(3000.3456m, parsed.vorhersage); Assert.AreEqual(3000.3456m, parsed.vorhersage);
@ -105,14 +105,14 @@ namespace dopt.DeltaBarth.Tests
string pyJson; string pyJson;
using (Py.GIL()) using (Py.GIL())
{ {
pyJson = (string)plugin.pyModJsonStructs.sales_prognosis_results(); pyJson = (string)plugin.pyModJsonData.sales_prognosis_results();
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.UmsatzPrognoseErgebnisse>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.UmsatzPrognoseErgebnisse>(pyJson);
Assert.AreEqual(3, parsed.daten.Length); Assert.AreEqual(3, parsed.daten.Length);
var e1 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m }; var e1 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m };
var e2 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m }; var e2 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m };
var e3 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m }; var e3 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m };
ImmutableArray<JsonStructs.UmsatzPrognoseEinzelergebnis> arr = ImmutableArray.Create(e1, e2, e3); ImmutableArray<DataObjects.UmsatzPrognoseEinzelergebnis> arr = ImmutableArray.Create(e1, e2, e3);
for (int i = 0; i < parsed.daten.Length; i++) for (int i = 0; i < parsed.daten.Length; i++)
{ {
@ -128,15 +128,15 @@ namespace dopt.DeltaBarth.Tests
string pyJson; string pyJson;
using (Py.GIL()) using (Py.GIL())
{ {
pyJson = (string)plugin.pyModJsonStructs.sales_prognosis_results_export(); pyJson = (string)plugin.pyModJsonData.sales_prognosis_results_export();
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.UmsatzPrognoseAusgabe>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.UmsatzPrognoseAusgabe>(pyJson);
// result // result
var e1 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m }; var e1 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2023, monat = 12, vorhersage = 3000.3456m };
var e2 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m }; var e2 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 1, vorhersage = 3300.685m };
var e3 = new JsonStructs.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m }; var e3 = new DataObjects.UmsatzPrognoseEinzelergebnis { jahr = 2024, monat = 2, vorhersage = 3700.548m };
ImmutableArray<JsonStructs.UmsatzPrognoseEinzelergebnis> arr = ImmutableArray.Create(e1, e2, e3); ImmutableArray<DataObjects.UmsatzPrognoseEinzelergebnis> arr = ImmutableArray.Create(e1, e2, e3);
var data = new JsonStructs.UmsatzPrognoseErgebnisse { daten = arr }; var data = new DataObjects.UmsatzPrognoseErgebnisse { daten = arr };
// check status // check status
Assert.AreEqual(0, parsed.status.code); Assert.AreEqual(0, parsed.status.code);
Assert.AreEqual("Erfolg", parsed.status.description); Assert.AreEqual("Erfolg", parsed.status.description);

2
dopt.DeltaBarth/JsonStructs.cs → dopt.DeltaBarth/DataObjects.cs
View File

@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Collections.Immutable; using System.Collections.Immutable;
namespace dopt.DeltaBarth.JsonStructs namespace dopt.DeltaBarth.DataObjects
{ {
public readonly struct ApiServerError public readonly struct ApiServerError
{ {

12
dopt.DeltaBarth/Plugin.cs
View File

@ -34,7 +34,7 @@ namespace dopt.DeltaBarth
pyModManagement.set_credentials(nutzername, passwort, datenbank, mandant); pyModManagement.set_credentials(nutzername, passwort, datenbank, mandant);
} }
} }
public JsonStructs.UmsatzPrognoseAusgabe UmsatzprognoseDummy(int? firmaId, DateTime? buchungsDatum) public DataObjects.UmsatzPrognoseAusgabe UmsatzprognoseDummy(int? firmaId, DateTime? buchungsDatum)
{ {
AssertNotDisposed(); AssertNotDisposed();
string pyJson; string pyJson;
@ -42,11 +42,11 @@ namespace dopt.DeltaBarth
{ {
pyJson = pyModPipeline.pipeline_sales_forecast_dummy(firmaId, buchungsDatum); pyJson = pyModPipeline.pipeline_sales_forecast_dummy(firmaId, buchungsDatum);
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.UmsatzPrognoseAusgabe>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.UmsatzPrognoseAusgabe>(pyJson);
return parsed; return parsed;
} }
public JsonStructs.UmsatzPrognoseAusgabe Umsatzprognose(int? firmaId, DateTime? buchungsDatum) public DataObjects.UmsatzPrognoseAusgabe Umsatzprognose(int? firmaId, DateTime? buchungsDatum)
{ {
AssertNotDisposed(); AssertNotDisposed();
string pyJson; string pyJson;
@ -54,7 +54,7 @@ namespace dopt.DeltaBarth
{ {
pyJson = pyModPipeline.pipeline_sales_forecast(firmaId, buchungsDatum); pyJson = pyModPipeline.pipeline_sales_forecast(firmaId, buchungsDatum);
} }
var parsed = JsonSerializer.Deserialize<JsonStructs.UmsatzPrognoseAusgabe>(pyJson); var parsed = JsonSerializer.Deserialize<DataObjects.UmsatzPrognoseAusgabe>(pyJson);
return parsed; return parsed;
} }
@ -68,7 +68,7 @@ namespace dopt.DeltaBarth
} }
return pyJson; return pyJson;
} }
protected JsonStructs.Credentials GetCredentials() protected DataObjects.Credentials GetCredentials()
{ {
AssertNotDisposed(); AssertNotDisposed();
string pyJson; string pyJson;
@ -77,7 +77,7 @@ namespace dopt.DeltaBarth
pyJson = (string)pyModManagement.get_credentials(); pyJson = (string)pyModManagement.get_credentials();
} }
JsonStructs.Credentials credentials = JsonSerializer.Deserialize<JsonStructs.Credentials>(pyJson); DataObjects.Credentials credentials = JsonSerializer.Deserialize<DataObjects.Credentials>(pyJson);
return credentials; return credentials;
} }