Husky/SewerGenerator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Damian Wessels
2023-04-12 22:29:49 +02:00
parent b100eca490
commit 7a036b3404
22 changed files with 184 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SewerStammGen.DAL/Class1.cs
View File

@@ -1,7 +0,0 @@
namespace SewerStammGen.DAL
{
public class Class1
{
}
}

64
SewerStammGen.DAL/Services/AuftraggeberDataService.cs
View File

@@ -9,33 +9,45 @@ using System.Threading.Tasks;
namespace SewerStammGen.DAL.Services
{
public class AuftraggeberDataService : IAuftraggeberDataService
public class AuftraggeberDataService : PostgresqlDataService, IAuftraggeberDataService
{
string connString = "Host = localhost; Database = SewerGen; Username = SewerGen; Password = SewerGen";
NpgsqlDataSource dataSource;
NpgsqlConnection? conn = null;
public AuftraggeberDataService()
{
var dataSourceBuilder = new NpgsqlDataSourceBuilder(connString);
dataSource = dataSourceBuilder.Build();
/*
* CREATE TABLE public."Auftraggebers"
(
"Id" serial,
"Name" text,
"Strasse" text,
"Ort" text,
"Postleitzahl" text,
"Ansprechpartner" text,
"Telefonnummer" text,
PRIMARY KEY ("Id")
);
//OpenConnection();
conn = dataSource.OpenConnection();
}
public Task<Auftraggeber> Create(Auftraggeber entity)
ALTER TABLE IF EXISTS public."Auftraggebers"
OWNER to "SewerGen";
*/
public AuftraggeberDataService() : base("public.\"Auftraggebers\"") { }
public async Task<Auftraggeber> Create(Auftraggeber entity)
{
throw new NotImplementedException();
}
string command = "INSERT INTO public.\"Auftraggebers\" (\"Name\", \"Strasse\", \"Ort\", \"Postleitzahl\", \"Ansprechpartner\", \"Telefonnummer\") " +
"VALUES(@1,@2,@3,@4,@5,@6) RETURNING \"Id\"";
public Auftraggeber CreateNonAsync(Auftraggeber entity)
{
throw new NotImplementedException();
}
public Task<bool> Delete(int id)
{
throw new NotImplementedException();
await using (var cmd = new NpgsqlCommand(command, conn))
{
cmd.Parameters.AddWithValue("1", entity.Name);
cmd.Parameters.AddWithValue("2", entity.Strasse);
cmd.Parameters.AddWithValue("3", entity.Ort);
cmd.Parameters.AddWithValue("4", entity.Postleitzahl);
cmd.Parameters.AddWithValue("5", entity.Ansprechpartner);
cmd.Parameters.AddWithValue("6", entity.Telefonnummer);
using var reader = await cmd.ExecuteReaderAsync();
reader.Read();
entity.Id = reader.GetInt32(0);
}
return entity;
}
public async Task<Auftraggeber> Get(int id)
@@ -48,9 +60,7 @@ namespace SewerStammGen.DAL.Services
reader.Read();
result = parseAuftraggeber(reader);
}
return result;
return result;
}
private Auftraggeber parseAuftraggeber(NpgsqlDataReader reader)
@@ -81,7 +91,7 @@ namespace SewerStammGen.DAL.Services
return result;
}
public Task<Auftraggeber> Update(int id, Auftraggeber entity)
public Task<Auftraggeber> Update(Auftraggeber entity)
{
throw new NotImplementedException();
}

49
SewerStammGen.DAL/Services/PostgresqlDataService.cs Normal file
View File

@@ -0,0 +1,49 @@
using Npgsql;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SewerStammGen.DAL.Services
{
public class PostgresqlDataService : IDisposable
{
string connString = "Host = localhost; Database = SewerGen; Username = SewerGen; Password = SewerGen";
NpgsqlDataSource dataSource;
protected NpgsqlConnection? conn = null;
private string tableName = "";
public PostgresqlDataService(string tableName)
{
var dataSourceBuilder = new NpgsqlDataSourceBuilder(connString);
dataSource = dataSourceBuilder.Build();
conn = dataSource.OpenConnection();
this.tableName = tableName;
}
public virtual async Task<bool> Delete(int id)
{
string command = $"DELETE "+tableName+" WHERE \"Id\" = @1";
await using (var cmd = new NpgsqlCommand(command, conn))
{
cmd.Parameters.AddWithValue("1", id);
int res = await cmd.ExecuteNonQueryAsync();
}
return true;
}
public void Dispose()
{
if(conn != null && conn.State == System.Data.ConnectionState.Open)
{
conn.Close();
conn.Dispose();
}
}
}
}

81
SewerStammGen.DAL/Services/ProjektDataService.cs
View File

@@ -8,29 +8,17 @@ using System.Threading.Tasks;
using Npgsql;
using SewerStammGen.Shared.Domain;
using SewerStammGen.Shared.Enum;
using System.Diagnostics;
namespace SewerStammGen.DAL.Services
{
public class ProjektDataService : IProjektDataService
public class ProjektDataService : PostgresqlDataService, IProjektDataService
{
string connString = "Host = localhost; Database = SewerGen; Username = SewerGen; Password = SewerGen";
NpgsqlDataSource dataSource;
NpgsqlConnection? conn = null;
public ProjektDataService()
public ProjektDataService() : base("public.\"Projekte\"")
{
var dataSourceBuilder = new NpgsqlDataSourceBuilder(connString);
dataSource = dataSourceBuilder.Build();
//OpenConnection();
conn = dataSource.OpenConnection();
}
private async void OpenConnection()
{
conn = await dataSource.OpenConnectionAsync();
}
public async Task<Projekt> Create(Projekt entity)
{
string command = "INSERT INTO public.\"Projekte\" (\"Projektname\", \"Erstelldatum\", \"Strasse\", \"Ort\", \"ExportType\", \"Kodierungssystem\",\"AuftraggeberId\") " +
@@ -52,15 +40,6 @@ namespace SewerStammGen.DAL.Services
return entity;
}
public Projekt CreateNonAsync(Projekt entity)
{
throw new NotImplementedException();
}
public Task<bool> Delete(int id)
{
throw new NotImplementedException();
}
public async Task<Projekt> Get(int id)
{
@@ -77,17 +56,17 @@ namespace SewerStammGen.DAL.Services
return result;
}
private Projekt? parseProjekt(NpgsqlDataReader reader)
private Projekt parseProjekt(NpgsqlDataReader reader)
{
return new Projekt()
{
Id = reader.GetInt32(0),
Projektname = reader.GetString(1),
Erstelldatum = reader.GetString(2),
Strasse = reader.GetString(3),
Ort = reader.GetString(4),
ExportType = (EExportType)reader.GetInt32(5),
Kodierungssystem = (EKodierungssystem)reader.GetInt32(6)
Projektname = reader.IsDBNull(1) ? "" : reader.GetString(1),
Erstelldatum = reader.IsDBNull(2) ? "" : reader.GetString(2),
Strasse = reader.IsDBNull(3) ? "" : reader.GetString(3),
Ort = reader.IsDBNull(4) ? "" : reader.GetString(4),
ExportType = reader.IsDBNull(5) ? EExportType.XML2013 : (EExportType)reader.GetInt32(5),
Kodierungssystem = reader.IsDBNull(6) ? EKodierungssystem.EN13508_2_2011_DWA_M_192_2 : (EKodierungssystem)reader.GetInt32(6)
};
}
@@ -111,9 +90,45 @@ namespace SewerStammGen.DAL.Services
return result;
}
public Task<Projekt> Update(int id, Projekt entity)
public async Task<Projekt> Update(Projekt entity)
{
throw new NotImplementedException();
string command = "UPDATE public.\"Projekte\" SET \"Projektname\"=@1, \"Erstelldatum\"=@2, \"Strasse\"=@3, \"Ort\"=@4, \"ExportType\"=@5, \"Kodierungssystem\"=@6 WHERE \"Id\" = @8";
using(var cmd = new NpgsqlCommand(command, conn))
{
cmd.Parameters.AddWithValue("1", entity.Projektname);
cmd.Parameters.AddWithValue("2", entity.Erstelldatum);
cmd.Parameters.AddWithValue("3", entity.Strasse);
cmd.Parameters.AddWithValue("4", entity.Ort);
cmd.Parameters.AddWithValue("5", (int)entity.ExportType);
cmd.Parameters.AddWithValue("6", (int)entity.Kodierungssystem);
cmd.Parameters.AddWithValue("8", entity.Id);
int res = await cmd.ExecuteNonQueryAsync();
Trace.WriteLine(res);
}
return entity;
}
}
}
/*
* CREATE TABLE public."Projekte"
(
"Id" serial,
"Projektname" text,
"Erstelldatum" text,
"Strasse" text,
"Ort" text,
"ExportType" bigint,
"Kodierungssystem" bigint,
"AuftraggeberId" bigint,
PRIMARY KEY ("Id"),
CONSTRAINT "Auftraggeber" FOREIGN KEY ("AuftraggeberId")
REFERENCES public."Auftraggebers" ("Id") MATCH SIMPLE
ON UPDATE NO ACTION
ON DELETE NO ACTION
NOT VALID
);
ALTER TABLE IF EXISTS public."Projekte"
OWNER to "SewerGen";
*/