From 04049f31f654f5cc77c0491c91b085a35f35076e Mon Sep 17 00:00:00 2001 From: "t.ruspekhofer" Date: Tue, 22 Feb 2022 00:28:48 +0100 Subject: [PATCH] reworked Model --- Lieb/Data/LiebContext.cs | 19 ++++++------------- Lieb/Models/{ => GuildWars2}/Equipped.cs | 4 ++-- .../{ => GuildWars2}/GuildWars2Account.cs | 2 +- .../GuildWars2Build.cs} | 8 ++++---- .../{ => GuildWars2}/Raid/PlannedRaidRole.cs | 2 +- Lieb/Models/{ => GuildWars2}/Raid/Raid.cs | 15 ++++++++++++++- .../{ => GuildWars2}/Raid/RaidReminder.cs | 2 +- .../{ => GuildWars2}/Raid/RaidSignUp.cs | 2 +- .../{ => GuildWars2}/Raid/SignUpHistory.cs | 2 +- Lieb/Models/LiebUser.cs | 4 +++- Lieb/Models/Raid/PlannedRaid.cs | 8 -------- Lieb/Models/Raid/RandomRaid.cs | 14 -------------- 12 files changed, 34 insertions(+), 48 deletions(-) rename Lieb/Models/{ => GuildWars2}/Equipped.cs (73%) rename Lieb/Models/{ => GuildWars2}/GuildWars2Account.cs (89%) rename Lieb/Models/{RaidRole.cs => GuildWars2/GuildWars2Build.cs} (90%) rename Lieb/Models/{ => GuildWars2}/Raid/PlannedRaidRole.cs (86%) rename Lieb/Models/{ => GuildWars2}/Raid/Raid.cs (73%) rename Lieb/Models/{ => GuildWars2}/Raid/RaidReminder.cs (94%) rename Lieb/Models/{ => GuildWars2}/Raid/RaidSignUp.cs (94%) rename Lieb/Models/{ => GuildWars2}/Raid/SignUpHistory.cs (88%) delete mode 100644 Lieb/Models/Raid/PlannedRaid.cs delete mode 100644 Lieb/Models/Raid/RandomRaid.cs diff --git a/Lieb/Data/LiebContext.cs b/Lieb/Data/LiebContext.cs index 2c199fd..0b69060 100644 --- a/Lieb/Data/LiebContext.cs +++ b/Lieb/Data/LiebContext.cs @@ -1,11 +1,8 @@ #nullable disable -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.EntityFrameworkCore; using Lieb.Models; -using Lieb.Models.Raid; +using Lieb.Models.GuildWars2; +using Lieb.Models.GuildWars2.Raid; +using Microsoft.EntityFrameworkCore; namespace Lieb.Data { @@ -19,28 +16,24 @@ namespace Lieb.Data public DbSet Users { get; set; } public DbSet GuildWars2Account { get; set; } public DbSet Equipped { get; set; } - public DbSet RaidRoles { get; set; } - public DbSet PlannedRaids { get; set; } + public DbSet RaidRoles { get; set; } public DbSet PlannedRaidRoles { get; set; } public DbSet Raids { get; set; } public DbSet RaidReminders { get; set; } public DbSet RaidSignUps { get; set; } - public DbSet RandomRaids { get; set; } public DbSet SignUpHistories { get; set; } protected override void OnModelCreating(ModelBuilder modelBuilder) { - modelBuilder.Entity().ToTable("User"); + modelBuilder.Entity().ToTable("LiebUser"); modelBuilder.Entity().ToTable("GuildWars2Account"); modelBuilder.Entity().ToTable("Equipped"); - modelBuilder.Entity().ToTable("RaidRole"); - modelBuilder.Entity().ToTable("PlannedRaid"); + modelBuilder.Entity().ToTable("GuildWars2Build"); modelBuilder.Entity().ToTable("PlannedRaidRole"); modelBuilder.Entity().ToTable("Raid"); modelBuilder.Entity().ToTable("RaidReminder"); modelBuilder.Entity().ToTable("RaidSignUp"); - modelBuilder.Entity().ToTable("RandomRaid"); modelBuilder.Entity().ToTable("SignUpHistory"); } } diff --git a/Lieb/Models/Equipped.cs b/Lieb/Models/GuildWars2/Equipped.cs similarity index 73% rename from Lieb/Models/Equipped.cs rename to Lieb/Models/GuildWars2/Equipped.cs index e760545..dfb73e9 100644 --- a/Lieb/Models/Equipped.cs +++ b/Lieb/Models/GuildWars2/Equipped.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models +namespace Lieb.Models.GuildWars2 { public class Equipped { @@ -9,6 +9,6 @@ public int GuildWars2AccountId { get; set; } public int RaidRoleId { get; set; } public GuildWars2Account GuildWars2Account { get; set; } = new GuildWars2Account(); - public RaidRole RaidRole { get; set; } = new RaidRole(); + public GuildWars2Build RaidRole { get; set; } = new GuildWars2Build(); } } diff --git a/Lieb/Models/GuildWars2Account.cs b/Lieb/Models/GuildWars2/GuildWars2Account.cs similarity index 89% rename from Lieb/Models/GuildWars2Account.cs rename to Lieb/Models/GuildWars2/GuildWars2Account.cs index f6ae943..e4c228e 100644 --- a/Lieb/Models/GuildWars2Account.cs +++ b/Lieb/Models/GuildWars2/GuildWars2Account.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models +namespace Lieb.Models.GuildWars2 { public class GuildWars2Account { diff --git a/Lieb/Models/RaidRole.cs b/Lieb/Models/GuildWars2/GuildWars2Build.cs similarity index 90% rename from Lieb/Models/RaidRole.cs rename to Lieb/Models/GuildWars2/GuildWars2Build.cs index 1414813..a7baf73 100644 --- a/Lieb/Models/RaidRole.cs +++ b/Lieb/Models/GuildWars2/GuildWars2Build.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models +namespace Lieb.Models.GuildWars2 { public enum Role { @@ -64,10 +64,10 @@ Bladesworn = 36, } - public class RaidRole + public class GuildWars2Build { - public int RaidRoleId { get; set; } - public string RoleName { get; set; } = String.Empty; + public int GuildWars2BuildId { get; set; } + public string BuildName { get; set; } = String.Empty; public short Might { get; set; } public short Quickness { get; set; } diff --git a/Lieb/Models/Raid/PlannedRaidRole.cs b/Lieb/Models/GuildWars2/Raid/PlannedRaidRole.cs similarity index 86% rename from Lieb/Models/Raid/PlannedRaidRole.cs rename to Lieb/Models/GuildWars2/Raid/PlannedRaidRole.cs index 0608e9c..ac13524 100644 --- a/Lieb/Models/Raid/PlannedRaidRole.cs +++ b/Lieb/Models/GuildWars2/Raid/PlannedRaidRole.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models.Raid +namespace Lieb.Models.GuildWars2.Raid { public class PlannedRaidRole { diff --git a/Lieb/Models/Raid/Raid.cs b/Lieb/Models/GuildWars2/Raid/Raid.cs similarity index 73% rename from Lieb/Models/Raid/Raid.cs rename to Lieb/Models/GuildWars2/Raid/Raid.cs index 8709d5b..81ebd9c 100644 --- a/Lieb/Models/Raid/Raid.cs +++ b/Lieb/Models/GuildWars2/Raid/Raid.cs @@ -1,5 +1,13 @@ -namespace Lieb.Models.Raid +namespace Lieb.Models.GuildWars2.Raid { + public enum RaidType + { + Planned = 1, + RandomWithBoons = 2, + RandomClasses = 3, + RandomEliteSpecialization = 4, + } + public abstract class Raid { public int RaidId { get; private set; } @@ -20,6 +28,11 @@ public int Frequency { get; set; } + public RaidType RaidType { get; set; } + + //role name, number of spots + public ICollection Roles { get; set; } = new HashSet(); + public ICollection Reminders { get; set; } = new List(); public ICollection SignUps { get; set; } = new HashSet(); diff --git a/Lieb/Models/Raid/RaidReminder.cs b/Lieb/Models/GuildWars2/Raid/RaidReminder.cs similarity index 94% rename from Lieb/Models/Raid/RaidReminder.cs rename to Lieb/Models/GuildWars2/Raid/RaidReminder.cs index 38bf88f..d4b9599 100644 --- a/Lieb/Models/Raid/RaidReminder.cs +++ b/Lieb/Models/GuildWars2/Raid/RaidReminder.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models.Raid +namespace Lieb.Models.GuildWars2.Raid { public class RaidReminder { diff --git a/Lieb/Models/Raid/RaidSignUp.cs b/Lieb/Models/GuildWars2/Raid/RaidSignUp.cs similarity index 94% rename from Lieb/Models/Raid/RaidSignUp.cs rename to Lieb/Models/GuildWars2/Raid/RaidSignUp.cs index c862a3c..f15d8b2 100644 --- a/Lieb/Models/Raid/RaidSignUp.cs +++ b/Lieb/Models/GuildWars2/Raid/RaidSignUp.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models.Raid +namespace Lieb.Models.GuildWars2.Raid { public enum SignUpType { diff --git a/Lieb/Models/Raid/SignUpHistory.cs b/Lieb/Models/GuildWars2/Raid/SignUpHistory.cs similarity index 88% rename from Lieb/Models/Raid/SignUpHistory.cs rename to Lieb/Models/GuildWars2/Raid/SignUpHistory.cs index 125471a..1b848d4 100644 --- a/Lieb/Models/Raid/SignUpHistory.cs +++ b/Lieb/Models/GuildWars2/Raid/SignUpHistory.cs @@ -1,4 +1,4 @@ -namespace Lieb.Models.Raid +namespace Lieb.Models.GuildWars2.Raid { public class SignUpHistory { diff --git a/Lieb/Models/LiebUser.cs b/Lieb/Models/LiebUser.cs index d319e09..87dbff2 100644 --- a/Lieb/Models/LiebUser.cs +++ b/Lieb/Models/LiebUser.cs @@ -1,4 +1,6 @@ -namespace Lieb.Models +using Lieb.Models.GuildWars2; + +namespace Lieb.Models { public class LiebUser { diff --git a/Lieb/Models/Raid/PlannedRaid.cs b/Lieb/Models/Raid/PlannedRaid.cs deleted file mode 100644 index 3614bdf..0000000 --- a/Lieb/Models/Raid/PlannedRaid.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace Lieb.Models.Raid -{ - public class PlannedRaid : Raid - { - //role name, number of spots - public ICollection Roles { get; set; } = new HashSet(); - } -} diff --git a/Lieb/Models/Raid/RandomRaid.cs b/Lieb/Models/Raid/RandomRaid.cs deleted file mode 100644 index 9339fe2..0000000 --- a/Lieb/Models/Raid/RandomRaid.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Lieb.Models.Raid -{ - public class RandomRaid : Raid - { - public short Might { get; set; } - public short Quickness { get; set; } - public short Alacrity { get; set; } - public short Heal { get; set; } - public LiebUser Tank { get; set; } = new LiebUser(); - - public bool RandomClass { get; set; } - public bool RandomEliteSpecialization { get; set; } - } -}