Merge branch 'develop' into feature/user-create

.gitignore

@@ -264,3 +264,4 @@ logs
 .env
 .swp
 server/Migrations/
+server/Data/

server/ApplicationDbContext.cs

@@ -8,7 +8,10 @@ namespace server
 {
     public class ApplicationDbContext : DbContext
     {
-        public Microsoft.EntityFrameworkCore.DbSet<UserEntity> Users { get; set; }
+        public DbSet<UserEntity> Users { get; set; }
+        public DbSet<ChatLogsEntity> ChatLogsEntities { get; set; }
+        public DbSet<ChatParticipantsEntity> ChatParticipantsEntities { get; set; }
+        public DbSet<ChatRoomEntity> ChatRoomEntities { get; set; }
 
         public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : base(options) { }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

server/Controllers/ChatHttpController.cs

@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc;
+using server.Services;
+
+namespace server.Controllers;
+
+[Route("chat")]
+[ApiController]
+public class ChatHttpController : ControllerBase
+{
+    public readonly ChatHttpService mChatHttpService;
+
+    public ChatHttpController(ChatHttpService chatHttpService)
+    {
+        mChatHttpService = chatHttpService;
+    }
+}

server/Controllers/UserController.cs

@@ -10,6 +10,7 @@
 using server.Attributes;
 using server.DTOs;
 using server.Entities;
+using server.Middlewares;
 using server.Services;
 using server.Utilities;
 
@@ -86,9 +87,16 @@ public async Task<ActionResult<KeyValueErrorResponse>> Update([FromBody] PutUser
 
         [HttpDelete]
         [Authorize]
-        public ActionResult Delete()
+        public async Task<ActionResult> Delete()
         {
-            return Unauthorized();
+            JwtSecurityToken jwtToken = HttpContext.GetJwtToken();
+            long id = long.Parse(jwtToken.GetClaimByType("id"));
+
+            await mUserService.Delete(id);
+
+            JwtMiddleware.BanUser(id, TimeSpan.FromDays(28));
+
+            return Ok();
         }
     }
 }

server/DTOs/GetUserResponse.cs → server/DTOs/Auth/GetUserResponse.cs

@@ -5,7 +5,7 @@ public class GetUserResponse
     public string email { get; set; }
     public string username { get; set; }
     public string phone { get; set; }
-    public string birth { get; set; }
+    public DateTime birth { get; set; }
     public string? profile_url { get; set; }
     public long level { get; set; }
     public string[] sns { get; set; }

server/DTOs/PutUserRequest.cs → server/DTOs/Auth/PutUserRequest.cs

@@ -15,5 +15,5 @@ public class PutUserRequest
     public string? phone { get; set; }
 
     [RegularExpression(@"^\d{4}-\d{2}-\d{2}$")]
-    public string? birth { get; set; }
+    public DateTime? birth { get; set; }
 }

server/Entities/ChatLogsEntity.cs

@@ -0,0 +1,29 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace server.Entities
+{
+    public class ChatLogsEntity : BaseEntity
+    {
+        [Required]
+        public long Sender { get; set; }
+
+        [Required]
+        public long Receiver { get; set; }
+
+        [Required]
+        public string DateTime { get; set; }
+
+        [Required]
+        public string Message { get; set; }
+
+        [Required]
+        public long RoomId { get; set; }
+
+        public ChatLogsEntity()
+        {
+            DateTime = "";
+            Message = "";
+        }
+    }
+}
+

server/Entities/ChatParticipantsEntity.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace server.Entities
+{
+    public class ChatParticipantsEntity : BaseEntity
+    {
+        [Required]
+        public long UserId { get; set; }
+
+        [Required]
+        public long ChatRoomId { get; set; }
+    }
+}

server/Entities/ChatRoomEntity.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace server.Entities
+{
+    public class ChatRoomEntity : BaseEntity
+    {
+        [Required]
+        public string Name { get; set; }
+
+        public ChatRoomEntity()
+        {
+            Name = "";
+        }
+    }
+}

server/Entities/UserEntity.cs

@@ -5,26 +5,26 @@ namespace server.Entities
 {
     public class UserEntity : BaseEntity
     {
-        [Required(ErrorMessage = "이메일을 입력하지 않았습니다.")]
-        [EmailAddress(ErrorMessage = "이메일 형식이 올바르지 않습니다.")]
+        [Required]
+        [EmailAddress]
         public string Email { get; set; }
-
-        [Required(ErrorMessage = "비밀번호를 입력하지 않았습니다.")]
-        [RegularExpression(@"^(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$", ErrorMessage = "비밀번호는 8자 이상이어야 하며, 특수문자, 숫자, 알파벳이 반드시 포함되어야 합니다.")]
+        
+        [Required]
+        [RegularExpression(@"^(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$")]
         public string Password { get; set; }
-
-        [Required(ErrorMessage = "사용자의 이름을 입력하지 않았습니다.")]
-        [StringLength(20, MinimumLength = 3, ErrorMessage = "사용자 이름의 최소 길이는 3자리 입니다.")]
+        
+        [Required]
+        [StringLength(20, MinimumLength = 3)]
         public string Username { get; set; }
-
-        [Required(ErrorMessage = "휴대폰 번호를 입력하지 않았습니다.")]
-        [Phone(ErrorMessage = "휴대폰 번호 형식이 올바르지 않습니다.")]
+        
+        [Required]
+        [Phone]
         public string Phone { get; set; }
-
-        [Required(ErrorMessage = "생년월일을 입력하지 않았습니다.")]
-        [RegularExpression(@"^\d{4}-\d{2}-\d{2}$", ErrorMessage = "생년월일의 형식이 올바르지 않습니다.")]
+        
+        [Required]
+        [RegularExpression(@"^\d{4}-\d{2}-\d{2}$")]
         public string Birth { get; set; }
-
+        
         public string? ProfileURL { get; set; }
 
         public long Level { get; set; }
@@ -37,7 +37,7 @@ public UserEntity()
             Password = "";
             Username = "";
             Phone = "";
-            Birth = "";
+            Birth = new DateTime();
             ProfileURL = null;
             Level = 0;
             Sns = "";

server/Interface/IChatHttpService.cs

@@ -0,0 +1,6 @@
+namespace server.Interface;
+
+public interface IChatHttpService
+{
+
+}