mod:fixedProjStruct

AcademiaY4 · Sep 21, 2024 · 72f5247 · 72f5247
1 parent 9db917d
commit 72f5247
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/Controllers/TestController.cs b/Controllers/TestController.cs
@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using apekade.Dto;
+using apekade.Models.Dto;
 using Microsoft.AspNetCore.Authorization;
 
 namespace apekade.Controllers;

diff --git a/Controllers/UserController.cs b/Controllers/UserController.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using apekade.Enums;
 using apekade.Services;
-using apekade.Dto.UserDto;
+using apekade.Models.Dto.UserDto;
 
 namespace apekade.Controllers;
 

diff --git a/Helpers/GenerateJwtToken.cs b/Helpers/GenerateJwtToken.cs
@@ -28,6 +28,7 @@ public string GenerateJwt(User user)
             Subject = new ClaimsIdentity(new[]
             {
                 new Claim(ClaimTypes.NameIdentifier, user.Id),
+                new Claim(ClaimTypes.Email, user.Email),
                 new Claim(ClaimTypes.Role, user.Role.ToString())
             }),
             Expires = DateTime.UtcNow.AddHours(1),

diff --git a/dto/ApiRes.cs → Models/Dto/ApiRes.cs b/dto/ApiRes.cs → Models/Dto/ApiRes.cs
@@ -1,4 +1,4 @@
-namespace apekade.Dto;
+namespace apekade.Models.Dto;
 
 public class ApiRes<T>{
     public Boolean? Status {get;set;}

diff --git a/dto/UserDto/UserReqDto.cs → Models/Dto/UserDto/UserReqDto.cs b/dto/UserDto/UserReqDto.cs → Models/Dto/UserDto/UserReqDto.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using apekade.Enums;
 
-namespace apekade.Dto.UserDto;
+namespace apekade.Models.Dto.UserDto;
 
 public class UserReqtDto
 {

diff --git a/dto/UserDto/UserResDto.cs → Models/Dto/UserDto/UserResDto.cs b/dto/UserDto/UserResDto.cs → Models/Dto/UserDto/UserResDto.cs
@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using apekade.Enums;
 
-namespace apekade.Dto.UserDto;
+namespace apekade.Models.Dto.UserDto;
 
 public class UserResDto
 {

diff --git a/dto/UserDto/UserTokenResDto.cs → Models/Dto/UserDto/UserTokenResDto.cs b/dto/UserDto/UserTokenResDto.cs → Models/Dto/UserDto/UserTokenResDto.cs
@@ -1,4 +1,4 @@
-namespace apekade.Dto.UserDto;
+namespace apekade.Models.Dto.UserDto;
 
 public class UserTokenResDto
 {

diff --git a/Program.cs b/Program.cs
@@ -1,5 +1,5 @@
 using apekade.Configuration;
-using apekade.Dto;
+using apekade.Models.Dto;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -30,7 +30,7 @@
 {
     Status = true,
     Code = 200,
-    Data = new { Message = "Server Online" }
+    Data = new { Message = "server_online" }
 });
 
 app.Run();
diff --git a/Repositories/UserRepository.cs b/Repositories/UserRepository.cs
@@ -12,7 +12,7 @@ public UserRepository(IMongoDatabase database)
         _usersCollection = database.GetCollection<User>("Users");
     }
 
-    public async Task save(User user)
+    public async Task Save(User user)
     {
         await _usersCollection.InsertOneAsync(user);
     }

diff --git a/Services/IUserService.cs b/Services/IUserService.cs
@@ -1,5 +1,5 @@
-using apekade.Dto;
-using apekade.Dto.UserDto;
+using apekade.Models.Dto;
+using apekade.Models.Dto.UserDto;
 
 namespace apekade.Services;
 

diff --git a/Services/Impl/UserService.cs b/Services/Impl/UserService.cs
@@ -1,10 +1,10 @@
 using AutoMapper;
 using apekade.Models;
-using apekade.Dto;
+using apekade.Models.Dto;
 using apekade.Repositories;
 using apekade.Helpers;
 using apekade.Services.Impl;
-using apekade.Dto.UserDto;
+using apekade.Models.Dto.UserDto;
 
 namespace apekade.Services.Impl;
 
@@ -34,7 +34,7 @@ public async Task<ApiRes<UserTokenResDto>> CreateNewUser(UserReqtDto userRequest
             newUser.PasswordHash = passwordHash;
             newUser.PasswordSalt = passwordSalt;
 
-            await _userRepository.save(newUser);
+            await _userRepository.Save(newUser);
 
             var token = _generateJwtToken.GenerateJwt(newUser);
 

diff --git a/configuration/MapperConfig.cs b/configuration/MapperConfig.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using apekade.Models;
-using apekade.Dto.UserDto;
+using apekade.Models.Dto.UserDto;
 
 namespace apekade.Configuration;
 

diff --git a/configuration/ServiceConfiguration.cs b/configuration/ServiceConfiguration.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
-using apekade.Dto.UserDto;
+using apekade.Models.Dto.UserDto;
 using apekade.Helpers;
 using apekade.Repositories;
 using apekade.Services;