Code cleanup
This commit is contained in:
@@ -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";
|
||||
*/
|
||||
Reference in New Issue
Block a user