AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Migrate from Filesystem to Base

Browse Source
This commit is contained in:
Jonathan Jenne
2023-09-18 09:34:44 +02:00
parent 7aec23abd9
commit ba55b17009
14 changed files with 43 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
WEBSERVICES/ZUGFeRDRESTService/Config.cs
View File

@@ -7,7 +7,6 @@
public string MSSQLConnectionString { get; set; }
public string MaxFileSizeInMegabytes { get; set; }
public ZugferdConfig Zugferd { get; set; }
public FirebirdConfig Firebird { get; set; }
}
public class ZugferdConfig
@@ -19,12 +18,4 @@
}
public class FirebirdConfig
{
public string Datasource { get; set; }
public string Database { get; set; }
public string Username { get; set; }
public string Password { get; set; }
}
}

14
WEBSERVICES/ZUGFeRDRESTService/Database.cs
View File

@@ -19,30 +19,20 @@ namespace ZUGFeRDRESTService
private Dictionary<string, XmlItemProperty> _propertyMap = null;
private const string QUERY_GET_GDPICTURE_KEY = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'";
private const string QUERY_GET_PROPERTY_MAP = "SELECT * FROM TBEDM_XML_ITEMS WHERE ACTIVE = True ORDER BY XML_PATH";
private const string QUERY_GET_PROPERTY_MAP = "SELECT * FROM TBDD_ZUGFERD_XML_ITEMS WHERE ACTIVE = 1 ORDER BY XML_PATH";
public MSSQLServer MSSQL { get; set; }
public Firebird Firebird { get; set; }
public Database(ILogging Logging, IConfiguration Config)
{
var oLogConfig = Logging.LogConfig;
var oLogger = Logging.LogConfig.GetLogger();
var oAppConfig = Config.GetSection("Config");
var oFirebirdConfig = oAppConfig.GetSection("Firebird");
oLogger.Debug("Establishing MSSQL Database connection..");
MSSQL = new MSSQLServer(oLogConfig, oAppConfig["MSSQLConnectionString"]);
oLogger.Debug("Establishing Firebird Database connection..");
Firebird = new Firebird(oLogConfig,
oFirebirdConfig["Datasource"],
oFirebirdConfig["Database"],
oFirebirdConfig["Username"],
oFirebirdConfig["Password"]);
oLogger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString);
oLogger.Debug("Firebird Connection: [{0}]", Firebird.ConnectionString);
_Logger = oLogger;
}
@@ -62,7 +52,7 @@ namespace ZUGFeRDRESTService
_Logger.Debug("Property map does not exist, creating.");
_propertyMap = new Dictionary<string, XmlItemProperty>();
var oDatatable = Firebird.GetDatatable(QUERY_GET_PROPERTY_MAP);
var oDatatable = MSSQL.GetDatatable(QUERY_GET_PROPERTY_MAP);
_Logger.Debug("Datatable Rows: [{0}]", oDatatable.Rows);

1
WEBSERVICES/ZUGFeRDRESTService/IDatabase.cs
View File

@@ -8,7 +8,6 @@ namespace ZUGFeRDRESTService
public interface IDatabase
{
public MSSQLServer MSSQL { get; set; }
public Firebird Firebird { get; set; }
public string GetGDPictureKey();
public Dictionary<String, XmlItemProperty> GetPropertyMap();