From 620842f600dd62ab0eb857095a8bd27294d3ff19 Mon Sep 17 00:00:00 2001
From: ilitirit <ilitirit@gmail.com>
Date: Fri, 14 Apr 2023 00:42:15 +0200
Subject: [PATCH] Refact duty/content

---
 .../ExpedienceContext.cs                      | 15 ++++++++++++---
 Expedience.Infrastructure/Models/Duty.cs      | 16 ----------------
 Expedience.Infrastructure/Models/Territory.cs | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+), 19 deletions(-)
 delete mode 100644 Expedience.Infrastructure/Models/Duty.cs
 create mode 100644 Expedience.Infrastructure/Models/Territory.cs

diff --git a/Expedience.Infrastructure/ExpedienceContext.cs b/Expedience.Infrastructure/ExpedienceContext.cs
index 144cd19..7a1f3d0 100644
--- a/Expedience.Infrastructure/ExpedienceContext.cs
+++ b/Expedience.Infrastructure/ExpedienceContext.cs
@@ -1,4 +1,5 @@
 using Expedience.Infrastructure.Models;
+using Expedience.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace Expedience.Infrastructure
@@ -13,19 +14,21 @@ namespace Expedience.Infrastructure
 
         public DbSet<DutyMember> DutyMembers { get; set; }
 
+        public DbSet<Territory> Territories { get; set; }
+
         public DbSet<User> Users { get; set; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<DutyCompletionResult>(cfg =>
             {
-                cfg.ToTable(nameof(DutyCompletionResult));
+                cfg.ToTable("dutycompletionresult");
                 cfg.HasKey(e => e.Id);
             });
 
             modelBuilder.Entity<DutyMember>(cfg =>
             {
-                cfg.ToTable(nameof(DutyMember));
+                cfg.ToTable("dutymember");
 
                 cfg.HasKey(e => new { e.UploadId, e.GroupNumber, e.MemberNumber });
 
@@ -36,7 +39,7 @@ namespace Expedience.Infrastructure
 
             modelBuilder.Entity<User>(cfg =>
             {
-                cfg.ToTable(nameof(User));
+                cfg.ToTable("user");
 
                 cfg.Property(e => e.UserId)
                     .UseIdentityAlwaysColumn()
@@ -48,6 +51,12 @@ namespace Expedience.Infrastructure
                 cfg.HasIndex(e => new { e.WorldId, e.UserHash });
             });
 
+            modelBuilder.Entity<Territory>(cfg =>
+            {
+                cfg.ToTable("territory");
+                cfg.HasKey(e => new { e.TerritoryId });
+            });
+
             base.OnModelCreating(modelBuilder);
         }
     }
diff --git a/Expedience.Infrastructure/Models/Duty.cs b/Expedience.Infrastructure/Models/Duty.cs
deleted file mode 100644
index 6ae3396..0000000
--- a/Expedience.Infrastructure/Models/Duty.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Expedience.Infrastructure.Models
-{
-    public class Duty
-    {
-        public int Id { get; set; }
-        public string ContentName { get; set; }
-        public string DutyType { get; set; }
-        
-    }
-}
diff --git a/Expedience.Infrastructure/Models/Territory.cs b/Expedience.Infrastructure/Models/Territory.cs
new file mode 100644
index 0000000..ceeb6c7
--- /dev/null
+++ b/Expedience.Infrastructure/Models/Territory.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Expedience.Models
+{
+    public class Territory
+    {
+        public int TerritoryId { get; set; }
+        public string ContentId { get; set; }
+        public string PlaceName { get; set; }
+        public string? ContentName { get; set; }
+        public string? ContentType { get; set; }
+        public int Level { get; set; }
+        public string? Expac { get; set; }
+    }
+}