Merge pull request #2 from KYJKY/master

모델관계 개선, Logger추가, IdentityUser 사용

Author: KYJKY

EveryPinApi.Entites/Entites.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.14" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.15" />
   </ItemGroup>
 
 </Project>

EveryPinApi.Entites/Models/CodeOAuthPlatform.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Entites.Models
+{
+    public class CodeOAuthPlatform
+    {
+        [Column("PlatformCodeId")]
+        public int Id { get; set; }
+        [Required]
+        public string? PlatformName { get; set; }
+    }
+}

EveryPinApi.Entites/Models/Comment.cs

@@ -10,9 +10,15 @@ namespace Entites.Models
     public class Comment
     {
         [Column("CommentId")]
-        public Guid Id { get; set; }
-        [ForeignKey(nameof(User))]
-        public Guid UserId { get; set; }
+        public int Id { get; set; }
+
+        public int? PostId { get; set; }
+        public Post? Post { get; set; }
+
+        [ForeignKey("User")]
+        public required string UserId { get; set; }
+        public User? User { get; set; }
+
         public string? CommentMessage { get; set; }
         public DateTime? CreatedDate { get; set; } = DateTime.Now;
     }

EveryPinApi.Entites/Models/Like.cs

@@ -10,9 +10,15 @@ namespace Entites.Models
     public class Like
     {
         [Column("LikeId")]
-        public Guid Id { get; set; }
-        [ForeignKey(nameof(User))]
-        public Guid UserId { get; set; }
+        public int Id { get; set; }
+
+        public int? PostId { get; set; }
+        public Post? Post { get; set; }
+
+        [ForeignKey("User")]
+        public required string UserId { get; set; }
+        public User? User { get; set; }
+        
         public DateTime? CreatedDate { get; set; } = DateTime.Now;
     }
 }

EveryPinApi.Entites/Models/Post.cs

@@ -9,19 +9,14 @@ namespace Entites.Models
 {
     public class Post
     {
-        public Post()
-        {
-            this.PostPhotos = new HashSet<PostPhoto>();
-            this.Likes = new HashSet<Like>();
-            this.Comments = new HashSet<Comment>();
-        }
-
         [Column("PostId")]
-        public Guid PostId { get; set; }
+        public int PostId { get; set; }
         public string? PostContent { get; set; }
-        public virtual ICollection<PostPhoto> PostPhotos { get; set; }
-        public virtual ICollection<Like> Likes { get; set; }
-        public virtual ICollection<Comment> Comments { get; set; }
+        [ForeignKey("User")]
+        public required string UserId { get; set; }
+        public ICollection<PostPhoto> PostPhotos { get; } = new List<PostPhoto>();
+        public ICollection<Like> Likes { get; } = new List<Like>();    
+        public ICollection<Comment> Comments { get; } = new List<Comment>();
         public DateTime? UpdateDate { get; set; } = null;
         public DateTime? CreatedDate { get; set; } = DateTime.Now;
     }

EveryPinApi.Entites/Models/PostPhoto.cs

@@ -11,7 +11,11 @@ namespace Entites.Models
     public class PostPhoto
     {
         [Column("PostPhotoId")]
-        public Guid Id { get; set; }
-        public string? photoUrl;
+        public int Id { get; set; }
+
+        public int? PostId { get; set; }
+        public Post? Post { get; set; }
+        
+        public string? photoUrl { get; set; }
     }
 }

EveryPinApi.Entites/Models/Profile.cs

@@ -10,13 +10,17 @@ namespace Entites.Models
     public class Profile
     {
         [Column("ProfileId")]
-        public Guid Id { get; set; }
+        public int Id { get; set; }
+
+        [ForeignKey("User")]
+        public required string UserId { get; set; }
+        public User? User { get; set; }
+        
         public string? Name { get; set; }
         public string? SelfIntroduction { get; set; }
         public string? PhotoUrl { get; set; }
-        [ForeignKey(nameof(User))]
-        public Guid UserId { get; set; }
         public DateTime? UpdatedDate { get; set; } = null;
         public DateTime? CreatedDate { get; set; } = DateTime.Now;
+
     }
 }

EveryPinApi.Entites/Models/User.cs

@@ -10,15 +10,15 @@ namespace Entites.Models
 {
     public class User : IdentityUser
     {
-        [Column("UserId")]
-        public Guid Id { get; set; }
-        public string? GoogleId { get; set; }
-        public string? GoogleName { get; set; }
-        public string? GoogleEmail { get; set; }
-        public string? KakaoId { get; set; }
-        public string? KakaoName { get; set; }
-        public string? KakaoEmail { get; set; }
-        [ForeignKey(nameof(Profile))]
-        public Guid ProfileId { get; set; }
+        //[Column("UserId")]
+        //public int Id { get; set; } 
+        public int PlatformCodeId { get; set; }
+        public Profile? Profile { get; set; }
+        public ICollection<Like> Like { get; set; } = new List<Like>();
+        public string? Name { get; set; }
+        //public string? Email { get; set; }
+        public DateTime CreatedDate { get; set; }
+        public DateTime LastLoginDate { get; set; }
+        public bool DeleteCheck { get; set; }
     }
 }

EveryPinApi.Presentation/Controllers/AuthenticationController.cs

@@ -1,4 +1,7 @@
-using Service.Contracts;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Service.Contracts;
+using Shared.DataTransferObject;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,11 +11,37 @@
 
 namespace EveryPinApi.Presentation.Controllers
 {
-    //[Route("api/authentication")]
-    //[ApiController]
-    //public class AuthenticationController : ControllerBase
-    //{
-    //    private readonly IServiceManager _service;
-    //    public AuthenticationController(IServiceManager service) => _service = service;
-    //}
+    [Route("api/authentication")]
+    [ApiController]
+    public class AuthenticationController : ControllerBase
+    {
+        private readonly ILogger _logger;
+        private readonly IServiceManager _service;
+
+        public AuthenticationController(ILogger<AuthenticationController> logger, IServiceManager service)
+        {
+            _logger = logger;
+            _service = service;
+        }
+
+        [HttpPost]
+        //[ServiceFilter(typeof(ValidationFilterAttribute))]
+        public async Task<IActionResult> RegisterUser([FromBody] RegistUserDto registUserDto)
+        {
+            var result = await
+            _service.AuthenticationService.RegisterUser(registUserDto);
+
+            if (!result.Succeeded)
+            {
+                foreach (var error in result.Errors)
+                {
+                    ModelState.TryAddModelError(error.Code, error.Description);
+                }
+                return BadRequest(ModelState);
+            }
+
+            return StatusCode(201);
+        }
+    }
+
 }

EveryPinApi.Presentation/Controllers/CommentController.cs

@@ -7,15 +7,22 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
 
 namespace EveryPinApi.Presentation.Controllers
 {
     [Route("api/comment")]
     [ApiController]
     public class CommentController : ControllerBase
     {
+        private readonly ILogger _logger;
         private readonly IServiceManager _service;
-        public CommentController(IServiceManager service) => _service = service;
+
+        public CommentController(ILogger<CommentController> logger, IServiceManager service)
+        {
+            _logger = logger;
+            _service = service;
+        }
 
         [HttpGet]
         public IActionResult GetAllComment()