Merge pull request #114 from Basimodo/RegisteredUser

added standard values for RegisteredUser and RUSettings
pull/1/head
Sascha 2021-07-08 11:57:34 +07:00 committed by GitHub
commit 34a9b0e91a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 154 additions and 126 deletions

@ -392,38 +392,93 @@ namespace Gremlin.GremlinData.DBClasses
_ = db.SaveChanges();
}
//UserSetting
//List<LoggedInUser> seedUserSettings = new();
//LoggedInUser userSascha = new("Dr. Sascha Woitschetzki",
// "+49 208 74129134",
// "+49 176 22285334",
// "sascha.woitschetzki@non.agilent.com",
// "83PE89",
// 6000,
// "Tex");
//seedUserSettings.Add(userSascha);
//LoggedInUser userSebastian = new("Dr. Sebastian Welsch",
// "+49 2222 9611441",
// "+49 160 7523241",
// "sebastian.welsch@non.agilent.com",
// "83RE32",
// 1324,
// "Word");
//seedUserSettings.Add(userSebastian);
//using (GremlinContext db = new())
//{
// foreach (LoggedInUser userSetting in seedUserSettings)
// {
// userSetting.DataCreationDate = now;
// userSetting.DataModificationByUser = "DB Initializer";
// userSetting.DataModificationDate = now;
// }
// db.UserSetting.AddRange(seedUserSettings);
// _ = db.SaveChanges();
//}
//RegisteredUser
List<RegisteredUser> seedRegisteredUser = new();
RegisteredUser userSascha = new();
userSascha.UserName = "woitsche";
userSascha.PasswordHash = "527646";
seedRegisteredUser.Add(userSascha);
RegisteredUser userSebastian = new();
userSebastian.UserName = "sewelsch";
userSebastian.PasswordHash = "123456";
seedRegisteredUser.Add(userSebastian);
using (GremlinContext db = new())
{
foreach (RegisteredUser userSetting in seedRegisteredUser)
{
userSetting.DataCreationDate = DateTime.Now;
userSetting.DataModificationByUser = "DB Initializer";
userSetting.DataModificationDate = DateTime.Now;
}
db.RegisteredUser.AddRange(seedRegisteredUser);
_ = db.SaveChanges();
}
//RUSetting
List<RUSettings> seedRUSettings = new();
using (RUSettings saschaName = new())
{
saschaName.RegisteredUserID = 1;
saschaName.SettingKey = "userName";
saschaName.SettingValue = "Dr. Sascha Woitschetzki";
seedRUSettings.Add(saschaName);
}
using (RUSettings saschaPhone = new())
{
saschaPhone.RegisteredUserID = 1;
saschaPhone.SettingKey = "userPhone";
saschaPhone.SettingValue = "+49 208 74129134";
seedRUSettings.Add(saschaPhone);
}
using (RUSettings saschaMobile = new())
{
saschaMobile.RegisteredUserID = 1;
saschaMobile.SettingKey = "userMobile";
saschaMobile.SettingValue = "+49 176 22285334";
seedRUSettings.Add(saschaMobile);
}
using (RUSettings saschaMail = new())
{
saschaMail.RegisteredUserID = 1;
saschaMail.SettingKey = "userMail";
saschaMail.SettingValue = "sascha.woitschetzki@non.agilent.com";
seedRUSettings.Add(saschaMail);
}
using (RUSettings saschaTerritoryID = new())
{
saschaTerritoryID.RegisteredUserID = 1;
saschaTerritoryID.SettingKey = "userTerritoryID";
saschaTerritoryID.SettingValue = "83PE89";
seedRUSettings.Add(saschaTerritoryID);
}
using (RUSettings saschaTexRand = new())
{
saschaTexRand.RegisteredUserID = 1;
saschaTexRand.SettingKey = "texRand";
saschaTexRand.SettingValue = "2";
seedRUSettings.Add(saschaTexRand);
}
using (GremlinContext db = new())
{
foreach (RUSettings userSetting in seedRUSettings)
{
userSetting.DataCreationDate = DateTime.Now;
userSetting.DataModificationByUser = "DB Initializer";
userSetting.DataModificationDate = DateTime.Now;
}
db.RUSettings.AddRange(seedRUSettings);
_ = db.SaveChanges();
}
}
public static void InsertTestDataIntoDB()

@ -294,9 +294,9 @@ namespace Gremlin.GremlinData.DBClasses
}
}
public class RUSettingsConfiguration : IEntityTypeConfiguration<RUSetting>
public class RUSettingsConfiguration : IEntityTypeConfiguration<RUSettings>
{
public void Configure(EntityTypeBuilder<RUSetting> builder)
public void Configure(EntityTypeBuilder<RUSettings> builder)
{
builder.HasKey(e => e.RUSettingsID);

@ -16,7 +16,7 @@ namespace Gremlin.GremlinData.DBClasses
public DbSet<ProductLine> ProductLines { get; set; }
public DbSet<AccountType> AccountTypes { get; set; }
public DbSet<SubMarket> SubMarkets { get; set; }
public DbSet<RUSetting> RUSettings { get; set; }
public DbSet<RUSettings> RUSettings { get; set; }
public DbSet<RegisteredUser> RegisteredUser { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)

@ -1,28 +0,0 @@
using System;
using System.Collections.Generic;
namespace Gremlin.GremlinData.EntityClasses
{
public class LoggedInUser
{
//primary key
public uint LoggedInUserID { get; set; }
//navigation properties
public IList<LoggedInUserSettings> LoggedInUserSettings { get; set; }
//standard properties
public DateTime DataCreationDate { get; set; }
public DateTime DataModificationDate { get; set; }
public string DataModificationByUser { get; set; }
//class properties
public string UserName { get; set; }
public string PasswordHash { get; set; }
//Constructur
public LoggedInUser()
{
}
}
}

@ -1,30 +0,0 @@
using System;
namespace Gremlin.GremlinData.EntityClasses
{
public class LoggedInUserSettings
{
//primary key
public uint LoggedInUserSettingsID { get; set; }
//forgein key
public uint LoggedInUserID { get; set; }
//navigation properties
public LoggedInUser LoggedInUser { get; set; }
//standard properties:
public DateTime DataCreationDate { get; set; }
public DateTime DataModificationDate { get; set; }
public string DataModificationByUser { get; set; }
//class properties
public string SettingKey { get; set; }
public string SettingValue { get; set; }
//Constructur
public LoggedInUserSettings()
{
}
}
}

@ -1,30 +0,0 @@
using System;
namespace Gremlin.GremlinData.EntityClasses
{
public class RUSetting
{
//primary key
public uint RUSettingsID { get; set; }
//forgein key
public uint RegisteredUserID { get; set; }
//navigation properties
public RegisteredUser RegisteredUser { get; set; }
//class properties
public string SettingKey { get; set; }
public string SettingValue { get; set; }
//metadata (subset of IMetadata)
public DateTime DataCreationDate { get; set; }
public DateTime DataModificationDate { get; set; }
public string DataModificationByUser { get; set; }
//Constructur
public RUSetting()
{
}
}
}

@ -0,0 +1,61 @@
using System;
namespace Gremlin.GremlinData.EntityClasses
{
public class RUSettings : IDisposable
{
private bool disposedValue;
//primary key
public uint RUSettingsID { get; set; }
//forgein key
public uint RegisteredUserID { get; set; }
//navigation properties
public RegisteredUser RegisteredUser { get; set; }
//class properties
public string SettingKey { get; set; }
public string SettingValue { get; set; }
//metadata (subset of IMetadata)
public DateTime DataCreationDate { get; set; }
public DateTime DataModificationDate { get; set; }
public string DataModificationByUser { get; set; }
//Constructur
public RUSettings()
{
}
protected virtual void Dispose(bool disposing)
{
if (!disposedValue)
{
if (disposing)
{
// TODO: Verwalteten Zustand (verwaltete Objekte) bereinigen
}
// TODO: Nicht verwaltete Ressourcen (nicht verwaltete Objekte) freigeben und Finalizer überschreiben
// TODO: Große Felder auf NULL setzen
disposedValue = true;
}
}
// // TODO: Finalizer nur überschreiben, wenn "Dispose(bool disposing)" Code für die Freigabe nicht verwalteter Ressourcen enthält
// ~RUSettings()
// {
// // Ändern Sie diesen Code nicht. Fügen Sie Bereinigungscode in der Methode "Dispose(bool disposing)" ein.
// Dispose(disposing: false);
// }
public void Dispose()
{
// Ändern Sie diesen Code nicht. Fügen Sie Bereinigungscode in der Methode "Dispose(bool disposing)" ein.
Dispose(disposing: true);
GC.SuppressFinalize(this);
}
}
}

@ -9,7 +9,7 @@ namespace Gremlin.GremlinData.EntityClasses
public uint RegisteredUserID { get; set; }
//navigation properties
public IList<RUSetting> RUSettings { get; set; }
public IList<RUSettings> RUSettings { get; set; }
//class properties
public string UserName { get; set; }

@ -16,11 +16,11 @@ namespace Gremlin.Models
{
try
{
List<RUSetting> ruSettings = gremlinContext.RUSettings.Where(gC => gC.RegisteredUserID == registeredUserID).ToList();
List<RUSettings> ruSettings = gremlinContext.RUSettings.Where(gC => gC.RegisteredUserID == registeredUserID).ToList();
Dictionary<string, string> settings = new();
foreach (RUSetting ruSetting in ruSettings)
foreach (RUSettings ruSetting in ruSettings)
{
settings.Add(ruSetting.SettingKey, ruSetting.SettingValue);
}