backend ancha muncha changelar

UrphaCapital.API/Controllers/AdminsController.cs

@@ -78,7 +78,7 @@ public async Task<ResponseModel> RemoveAdmin(long id, CancellationToken cancella
 
         [HttpPost("Login")]
         [EnableRateLimiting("sliding")]
-        public async Task<string> Login([FromBody] AdminLogin loginModel, CancellationToken cancellation)
+        public async Task<TokenModel> Login([FromBody] AdminLogin loginModel, CancellationToken cancellation)
         {
             if (ModelState.IsValid == false)
             {

UrphaCapital.API/Controllers/CoursesController.cs

@@ -27,7 +27,7 @@ public async Task<ResponseModel> Create([FromForm] CreateCourseCommand command,
         }
 
         [HttpGet("GetById/{id}")]
-        public async Task<Course> GetById(long id, CancellationToken cancellation)
+        public async Task<Course> GetById(string id, CancellationToken cancellation)
         {
             var query = new GetCourseByIdQuery { Id = id };
 
@@ -74,7 +74,7 @@ public async Task<ResponseModel> Update([FromForm] UpdateCourseCommand command,
         }
 
         [HttpDelete("{id}")]
-        public async Task<ResponseModel> Delete(long id, CancellationToken cancellation)
+        public async Task<ResponseModel> Delete(string id, CancellationToken cancellation)
         {
             var command = new DeleteCourseCommand { Id = id };
 

UrphaCapital.API/Controllers/LessonsController.cs

@@ -29,7 +29,7 @@ public async Task<ResponseModel> PostLesson([FromForm] CreateLessonCommand comma
         }
 
         [HttpGet("{id}")]
-        public async Task<Lesson> GetLessonById(long id, CancellationToken cancellation)
+        public async Task<Lesson> GetLessonById(string id, CancellationToken cancellation)
         {
             var query = new GetLessonByIdQuery { Id = id };
 
@@ -39,7 +39,7 @@ public async Task<Lesson> GetLessonById(long id, CancellationToken cancellation)
         }
 
         [HttpGet("getvideo")]
-        public async Task<IActionResult> GetLessonVideo([FromQuery] long lessonId, CancellationToken cancellation)
+        public async Task<IActionResult> GetLessonVideo([FromQuery] string lessonId, CancellationToken cancellation)
         {
             var query = new GetLessonVideoQuery { Id = lessonId };
 
@@ -58,7 +58,7 @@ public async Task<IActionResult> GetLessonVideo([FromQuery] long lessonId, Cance
         }
 
         [HttpGet("{courseId}/{index}/{count}")]
-        public async Task<IEnumerable<Lesson>> GetLessonsByCourseId(int index, int count, long courseId, CancellationToken cancellation)
+        public async Task<IEnumerable<Lesson>> GetLessonsByCourseId(string courseId, int index, int count, CancellationToken cancellation)
         {
             var query = new GetAllLessonsByCourseIdQuery()
             {
@@ -81,7 +81,7 @@ public async Task<ResponseModel> PutLesson([FromForm] UpdateLessonCommand comman
         }
 
         [HttpDelete("{id}")]
-        public async Task<ResponseModel> RemoveLesson(long id, CancellationToken cancellation)
+        public async Task<ResponseModel> RemoveLesson(string id, CancellationToken cancellation)
         {
             var command = new DeleteLessonCommand { Id = id };
 

UrphaCapital.API/Controllers/MentorsController.cs

@@ -79,7 +79,7 @@ public async Task<ResponseModel> Delete(long id, CancellationToken cancellation)
 
         [HttpPost("Login")]
         [EnableRateLimiting("sliding")]
-        public async Task<string> Login([FromBody] MentorLogin loginModel, CancellationToken cancellation)
+        public async Task<TokenModel> Login([FromBody] MentorLogin loginModel, CancellationToken cancellation)
         {
             if (ModelState.IsValid == false)
             {

UrphaCapital.API/Controllers/StudentController.cs

@@ -67,7 +67,7 @@ public async Task<ResponseModel> PutStudent([FromBody] UpdateStudentCommand comm
         }
 
         [HttpDelete("{id}")]
-        public async Task<ResponseModel> RemoveStudent(long id, CancellationToken cancellation)
+        public async Task<ResponseModel> RemoveStudent(string id, CancellationToken cancellation)
         {
             var command = new DeleteLessonCommand { Id = id };
 
@@ -78,7 +78,7 @@ public async Task<ResponseModel> RemoveStudent(long id, CancellationToken cancel
 
         [HttpPost("Login")]
         [EnableRateLimiting("sliding")]
-        public async Task<string> Login([FromBody] AdminLogin loginModel, CancellationToken cancellation)
+        public async Task<TokenModel> Login([FromBody] AdminLogin loginModel, CancellationToken cancellation)
         {
             if (ModelState.IsValid == false)
             {

UrphaCapital.Application/AuthServices/AuthService.cs

@@ -4,6 +4,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
+using UrphaCapital.Application.ViewModels;
 using UrphaCapital.Domain.Entities.Auth;
 
 namespace UrphaCapital.Application.AuthServices
@@ -17,7 +18,7 @@ public AuthService(IConfiguration configuration)
             _configuration = configuration;
         }
 
-        public string GenerateToken(Student user)
+        public TokenModel GenerateToken(Student user)
         {
             SymmetricSecurityKey securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["JWTSettings:Secret"]!));
             SigningCredentials credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
@@ -35,12 +36,13 @@ public string GenerateToken(Student user)
                 new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
                 new Claim(JwtRegisteredClaimNames.Iat, EpochTime.GetIntDate(DateTime.UtcNow).ToString(CultureInfo.InvariantCulture), ClaimValueTypes.Integer64),
                 new Claim("UserId", user.Id.ToString()),
-                new Claim(ClaimTypes.Name, user.FullName),
-                new Claim(ClaimTypes.MobilePhone, user.PhoneNumber),
+                new Claim("Name", user.FullName),
+                new Claim("Phone", user.PhoneNumber),
                 new Claim("ids", ids),
-                new Claim(ClaimTypes.StreetAddress, user.Address),
-                new Claim(ClaimTypes.Email, user.Email),
-                new Claim(ClaimTypes.Role, user.Role!)
+                new Claim("Address", user.Address),
+                new Claim("Email", user.Email),
+                new Claim("Role", user.Role!),
+                new Claim(ClaimTypes.UserData, ids)
             };
 
 
@@ -52,10 +54,17 @@ public string GenerateToken(Student user)
                 expires: DateTime.UtcNow.AddMinutes(expirePeriod),
                 signingCredentials: credentials);
 
-            return new JwtSecurityTokenHandler().WriteToken(token);
+            var response = new TokenModel()
+            {
+                Token = new JwtSecurityTokenHandler().WriteToken(token),
+                isSuccess = true,
+                Message = "Token generated successfully!"
+            };
+
+            return response;
         }
 
-        public string GenerateToken(Admin user)
+        public TokenModel GenerateToken(Admin user)
         {
             SymmetricSecurityKey securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["JWTSettings:Secret"]!));
             SigningCredentials credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
@@ -65,11 +74,11 @@ public string GenerateToken(Admin user)
             {
                 new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
                 new Claim(JwtRegisteredClaimNames.Iat, EpochTime.GetIntDate(DateTime.UtcNow).ToString(CultureInfo.InvariantCulture), ClaimValueTypes.Integer64),
-                new Claim("UserId", user.Id.ToString()),
-                new Claim(ClaimTypes.Name, user.Name),
-                new Claim(ClaimTypes.MobilePhone, user.PhoneNumber),
-                new Claim(ClaimTypes.Email, user.Email),
-                new Claim(ClaimTypes.Role, user.Role!)
+                new Claim("Id", user.Id.ToString()),
+                new Claim("Name", user.Name),
+                new Claim("Phone", user.PhoneNumber),
+                new Claim("Email", user.Email),
+                new Claim("Role", user.Role!)
             };
 
 
@@ -81,10 +90,17 @@ public string GenerateToken(Admin user)
                 expires: DateTime.UtcNow.AddMinutes(expirePeriod),
                 signingCredentials: credentials);
 
-            return new JwtSecurityTokenHandler().WriteToken(token);
+            var response = new TokenModel()
+            {
+                Token = new JwtSecurityTokenHandler().WriteToken(token),
+                isSuccess = true,
+                Message = "Token generated successfully!"
+            };
+
+            return response;
         }
 
-        public string GenerateToken(Mentor user)
+        public TokenModel GenerateToken(Mentor user)
         {
             SymmetricSecurityKey securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["JWTSettings:Secret"]!));
             SigningCredentials credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
@@ -94,11 +110,11 @@ public string GenerateToken(Mentor user)
             {
                 new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
                 new Claim(JwtRegisteredClaimNames.Iat, EpochTime.GetIntDate(DateTime.UtcNow).ToString(CultureInfo.InvariantCulture), ClaimValueTypes.Integer64),
-                new Claim("UserId", user.Id.ToString()),
-                new Claim(ClaimTypes.Name, user.Name),
-                new Claim(ClaimTypes.MobilePhone, user.PhoneNumber),
-                new Claim(ClaimTypes.Email, user.Email),
-                new Claim(ClaimTypes.Role, user.Role!)
+                new Claim("Id", user.Id.ToString()),
+                new Claim("Name", user.Name),
+                new Claim("Phone", user.PhoneNumber),
+                new Claim("Email", user.Email),
+                new Claim("Role", user.Role!)
             };
 
 
@@ -110,7 +126,14 @@ public string GenerateToken(Mentor user)
                 expires: DateTime.UtcNow.AddMinutes(expirePeriod),
                 signingCredentials: credentials);
 
-            return new JwtSecurityTokenHandler().WriteToken(token);
+            var response = new TokenModel()
+            {
+                Token = new JwtSecurityTokenHandler().WriteToken(token),
+                isSuccess = true,
+                Message = "Token generated successfully!"
+            };
+
+            return response;
         }
     }
 }

UrphaCapital.Application/AuthServices/IAuthService.cs

@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using UrphaCapital.Application.ViewModels;
 using UrphaCapital.Domain.Entities.Auth;
 
 namespace UrphaCapital.Application.AuthServices
 {
     public interface IAuthService
     {
-        public string GenerateToken(Student user);
-        public string GenerateToken(Admin user);
-        public string GenerateToken(Mentor user);
+        public TokenModel GenerateToken(Student user);
+        public TokenModel GenerateToken(Admin user);
+        public TokenModel GenerateToken(Mentor user);
     }
 }

UrphaCapital.Application/UseCases/Courses/Commands/DeleteCourseCommand.cs

@@ -10,6 +10,6 @@ namespace UrphaCapital.Application.UseCases.Courses.Commands
 {
     public class DeleteCourseCommand : IRequest<ResponseModel>
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Courses/Commands/UpdateCourseCommand.cs

@@ -11,7 +11,7 @@ namespace UrphaCapital.Application.UseCases.Courses.Commands
 {
     public class UpdateCourseCommand : IRequest<ResponseModel>
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
         public string Name { get; set; }
         public string Description { get; set; }
         public string Subtitle { get; set; }

UrphaCapital.Application/UseCases/Courses/Handlers/CommandHandlers/DeleteCourseCommandHandler.cs

@@ -25,7 +25,7 @@ public DeleteCourseCommandHandler(IApplicationDbContext context, IWebHostEnviron
 
         public async Task<ResponseModel> Handle(DeleteCourseCommand request, CancellationToken cancellationToken)
         {
-            var course = await _context.Courses.FirstOrDefaultAsync(x => x.Id == request.Id, cancellationToken);
+            var course = await _context.Courses.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id, cancellationToken);
 
             if (course == null)
             {

UrphaCapital.Application/UseCases/Courses/Handlers/CommandHandlers/UpdateCourseCommandHandler.cs

@@ -25,7 +25,7 @@ public UpdateCourseCommandHandler(IApplicationDbContext context, IWebHostEnviron
 
         public async Task<ResponseModel> Handle(UpdateCourseCommand request, CancellationToken cancellationToken)
         {
-            var course = await _context.Courses.FirstOrDefaultAsync(x => x.Id == request.Id, cancellationToken);
+            var course = await _context.Courses.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id, cancellationToken);
 
             if (course == null)
             {

UrphaCapital.Application/UseCases/Courses/Handlers/QueryHandlers/GetCourseByIdQueryHandler.cs

@@ -17,7 +17,7 @@ public GetCourseByIdQueryHandler(IApplicationDbContext context)
 
         public async Task<Course> Handle(GetCourseByIdQuery request, CancellationToken cancellationToken)
         {
-            return await _context.Courses.FirstOrDefaultAsync(x => x.Id == request.Id) ??
+            return await _context.Courses.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id) ??
                  throw new Exception("Not found");
         }
     }

UrphaCapital.Application/UseCases/Courses/Queries/GetCourseByIdQuery.cs

@@ -10,6 +10,6 @@ namespace UrphaCapital.Application.UseCases.Courses.Queries
 {
     public class GetCourseByIdQuery : IRequest<Course>
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Homework/Commands/CreateHomeworkCommand.cs

@@ -15,6 +15,6 @@ public class CreateHomeworkCommand: IRequest<ResponseModel>
         public IFormFile FILE { get; set; }
         public string Description { get; set; }
         public long studentId { get; set; }
-        public long LessonId { get; set; }
+        public Guid LessonId { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Homework/Commands/UpdateHomeworkCommand.cs

@@ -16,6 +16,6 @@ public class UpdateHomeworkCommand: IRequest<ResponseModel>
         public IFormFile FILE { get; set; }
         public string Description { get; set; }
         public long studentId { get; set; }
-        public long LessonId { get; set; }
+        public Guid LessonId { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Lessons/Commands/CreateLessonCommand.cs

@@ -7,7 +7,7 @@ namespace UrphaCapital.Application.UseCases.Lessons.Commands
     public class CreateLessonCommand : IRequest<ResponseModel>
     {
         public string Name { get; set; }
-        public long CourseId { get; set; }
+        public Guid CourseId { get; set; }
         public IFormFile Video { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Lessons/Commands/DeleteLessonCommand.cs

@@ -10,6 +10,6 @@ namespace UrphaCapital.Application.UseCases.Lessons.Commands
 {
     public class DeleteLessonCommand : IRequest<ResponseModel>
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Lessons/Commands/UpdateLessonCommand.cs

@@ -11,9 +11,9 @@ namespace UrphaCapital.Application.UseCases.Lessons.Commands
 {
     public class UpdateLessonCommand : IRequest<ResponseModel>
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
         public string Name { get; set; }
-        public long CourseId { get; set; }
+        public Guid CourseId { get; set; }
         public IFormFile Video { get; set; }
     }
 }

UrphaCapital.Application/UseCases/Lessons/Handlers/CommandHandlers/DeleteLessonCommandHandler.cs

@@ -27,7 +27,7 @@ public DeleteLessonCommandHandler(IApplicationDbContext context, IWebHostEnviron
         public async Task<ResponseModel> Handle(DeleteLessonCommand request, CancellationToken cancellationToken)
         {
 
-            var lesson = await _context.Lessons.FirstOrDefaultAsync(x => x.Id == request.Id, cancellationToken);
+            var lesson = await _context.Lessons.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id, cancellationToken);
 
             if (lesson == null)
                 return new ResponseModel()

UrphaCapital.Application/UseCases/Lessons/Handlers/CommandHandlers/UpdateLessonCommandHandler.cs

@@ -29,7 +29,7 @@ public UpdateLessonCommandHandler(IApplicationDbContext context, IWebHostEnviron
 
         public async Task<ResponseModel> Handle(UpdateLessonCommand request, CancellationToken cancellationToken)
         {
-            var lesson = await _context.Lessons.FirstOrDefaultAsync(x => x.Id == request.Id, cancellationToken);
+            var lesson = await _context.Lessons.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id, cancellationToken);
 
             if (lesson == null)
                 return new ResponseModel()

UrphaCapital.Application/UseCases/Lessons/Handlers/QueryHandlers/GetAllLessonsByCourseIdQueryHandler.cs

@@ -33,7 +33,7 @@ public async Task<IEnumerable<Lesson>> Handle(GetAllLessonsByCourseIdQuery reque
                 _memoryCache.Set(
                         key: "lesson",
                         value: await _context.Lessons
-            .Where(l => l.CourseId == request.CourseId)
+            .Where(l => l.CourseId.ToString() == request.CourseId)
                 .Skip(request.Index - 1)
                     .Take(request.Count)
                 .Select(x => new Lesson

UrphaCapital.Application/UseCases/Lessons/Handlers/QueryHandlers/GetLessonByIdQueryHandler.cs

@@ -22,7 +22,7 @@ public GetLessonByIdQueryHandler(IApplicationDbContext context)
 
         public async Task<Lesson> Handle(GetLessonByIdQuery request, CancellationToken cancellationToken)
         {
-            return await _context.Lessons.FirstOrDefaultAsync(x => x.Id == request.Id) ??
+            return await _context.Lessons.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id) ??
                     throw new NotImplementedException();
         }
     }

UrphaCapital.Application/UseCases/Lessons/Handlers/QueryHandlers/GetLessonVideoQueryHandler.cs

@@ -22,7 +22,7 @@ public GetLessonVideoQueryHandler(IApplicationDbContext context)
 
         public async Task<Stream?> Handle(GetLessonVideoQuery request, CancellationToken cancellationToken)
         {
-            var lesson = await _context.Lessons.FirstOrDefaultAsync(x => x.Id == request.Id);
+            var lesson = await _context.Lessons.FirstOrDefaultAsync(x => x.Id.ToString() == request.Id);
             if (lesson == null)
             {
                 return null;

UrphaCapital.Application/UseCases/Lessons/Queries/GetAllLessonsByCourseIdQuery.cs

@@ -10,7 +10,7 @@ namespace UrphaCapital.Application.UseCases.Lessons.Queries
 {
     public class GetAllLessonsByCourseIdQuery : IRequest<IEnumerable<Lesson>>
     {
-        public long CourseId { get; set; }
+        public string CourseId { get; set; }
         public int Index { get; set; }
         public int Count { get; set; }
     }

UrphaCapital.Application/UseCases/Lessons/Queries/GetLessonByIdQuery.cs

@@ -10,6 +10,6 @@ namespace UrphaCapital.Application.UseCases.Lessons.Queries
 {
     public class GetLessonByIdQuery : IRequest<Lesson>
     {
-        public long Id { get; set; }
+        public string Id { get; set; }
     }
 }