Merge pull request #1 from COMP-1640-GRE/cuongphgch210011

Cuongphgch210011

DotnetGRPC/AppDbContext.cs

@@ -1,6 +1,5 @@
 using DotnetGRPC.Model;
 using Microsoft.EntityFrameworkCore;
-
 public class AppDbContext : DbContext
 {
     public AppDbContext(DbContextOptions<AppDbContext> options) : base(options) { }
@@ -9,4 +8,5 @@ public AppDbContext(DbContextOptions<AppDbContext> options) : base(options) { }
     public DbSet<Template> Template { get; set; }
     public DbSet<Notification> Notification { get; set; }
     public DbSet<User> User { get; set; }
+
 }

DotnetGRPC/Model/Faculty.cs

@@ -9,9 +9,11 @@ public class Faculty
     {
         [Key]
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Column("id")]
         public long Id { get; set; }
 
         [Required]
+        [Column("name")]
         public string Name { get; set; }
 
         [Required]

DotnetGRPC/Model/User.cs

@@ -1,7 +1,6 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-
 namespace DotnetGRPC.Model
 {
     [Table("user")]
@@ -26,33 +25,26 @@ public class User
 
         [Required]
         [Column("role")]
-        public RoleType Role { get; set; }
+        public string Role { get; set; }
 
-        public enum RoleType
-        {
-            Administrator, Student, Guest
-        }
+        // public enum RoleType
+        // {
+        //     Administrator, Student, Guest
+        // }
 
         [Required]
         [Column("email")]
         public string Email { get; set; }
 
-        [Required]
         [Column("first_name")]
-        public string FirstName { get; set; }
+        public string? FirstName { get; set; }
 
-        [Required]
         [Column("last_name")]
-        public string LastName { get; set; }
+        public string? LastName { get; set; }
 
         [Required]
         [Column("account_status")]
-        public AccountType AccountStatus { get; set; }
-
-        public enum AccountType
-        {
-            Active, Locked, Inactive
-        }
+        public string AccountStatus { get; set; }
 
         [Required]
         [Column("created_at")]
@@ -64,5 +56,8 @@ public enum AccountType
 
         [ForeignKey("FacultyId")]
         public Faculty Faculty { get; set; }
+
+        [Column("faculty_id")]
+        public long? FacultyId { get; set; }
     }
-}
+}

DotnetGRPC/Repository/TemplateRepository.cs

@@ -2,8 +2,6 @@
 using Microsoft.EntityFrameworkCore;
 
 public class TemplateRepository
-
-
 {
     private readonly AppDbContext _context;
 
@@ -16,6 +14,4 @@ public async Task<Template> FindByTemplateCodeAsync(string templateCode)
     {
         return await _context.Template.FirstOrDefaultAsync(t => t.TemplateCode == templateCode);
     }
-
-    // Add other methods as needed
 }

DotnetGRPC/Repository/UserRepository.cs

@@ -1,4 +1,5 @@
 using DotnetGRPC.Model;
+using Microsoft.EntityFrameworkCore;
 
 public class UserRepository
 {
@@ -11,6 +12,6 @@ public UserRepository(AppDbContext context)
 
     public async Task<User> FindByIdAsync(long id)
     {
-        return await _context.User.FindAsync(id);
+        return await _context.User.SingleOrDefaultAsync(user => user.Id == id);
     }
 }

DotnetGRPC/Services/NotificationService.cs

@@ -1,7 +1,5 @@
 using System.Net.Mail;
 using DotnetGRPC.Model.DTO;
-using DotnetGRPC.Model;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Grpc.Core;
 using System.Net;
@@ -27,26 +25,24 @@ public NotificationService(AppDbContext dbContext, IOptions<EmailSettings> email
             _notificationRepository = notificationRepository;
         }
 
-        public async Task SendEmailAsync(long studentUserId, string templateCode, long staffUserId, string option)
+        public async Task SendEmailAsync(long studentUserId, string templateCode, string option)
         {
             if (studentUserId == 0)
             {
                 throw new ArgumentException("Student is null");
             }
 
-            var student = await _userRepository.FindByIdAsync(studentUserId);
-            var staff = await _userRepository.FindByIdAsync(staffUserId);
-            var template = await _templateRepository.FindByTemplateCodeAsync(templateCode);
+            var student = await _userRepository.FindByIdAsync(studentUserId) ?? throw new ArgumentException("Student not found");
+            var template = await _templateRepository.FindByTemplateCodeAsync(templateCode) ?? throw new ArgumentException("Template not found");
             using (var mailMessage = new MailMessage())
             {
                 mailMessage.To.Add(new MailAddress(student.Email));
-                mailMessage.From = new MailAddress(staff.Email);
+                mailMessage.From = new MailAddress("[email protected]");
                 mailMessage.Subject = template.TemplateName;
                 mailMessage.Body = template.TemplateContent
                     .Replace("[Student Name]", $"{student.FirstName} {student.LastName}")
-                    .Replace("[Name]", $"{staff.FirstName} {staff.LastName}")
-                    .Replace("[Role]", staff.Role.ToString())
-                    .Replace("[choose appropriate option]", option);
+                    .Replace("[choose appropriate option]", option)
+                    .Replace("[6-Letter Code]", option);
                 mailMessage.IsBodyHtml = true;
 
                 using (var smtpClient = new SmtpClient(_emailSettings.Host, _emailSettings.Port))
@@ -60,47 +56,56 @@ public async Task SendEmailAsync(long studentUserId, string templateCode, long s
 
         public override async Task<NotificationResponse> sendNotification(NotificationRequest request, ServerCallContext context)
         {
-            if (request.WithEmail)
-            {
-                await SendEmailAsync(request.StudentUserid, request.TemplateCode.Replace("noti", "email"), request.StaffUserid, request.Option);
-            }
+            var content = string.Empty;
 
-            var template = await _templateRepository.FindByTemplateCodeAsync(request.TemplateCode);
-            var content = template.TemplateContent.Replace("[choose appropriate option]", request.Option);
-
-            var notification = new Model.Notification
+            if (request.TemplateCode != "reset_pw_email")
             {
-                Content = content,
-                Seen = false,
-                UserId = request.StudentUserid,
-                WithEmail = request.WithEmail
-            };
+                if (request.WithEmail)
+                {
+                    await SendEmailAsync(request.UserId, request.TemplateCode.Replace("noti", "email"), request.Option);
+                }
+                var template = await _templateRepository.FindByTemplateCodeAsync(request.TemplateCode);
+                content = template.TemplateContent.Replace("[choose appropriate option]", request.Option);
 
-            await _notificationRepository.SaveAsync(notification);
+                var notification = new Model.Notification
+                {
+                    Content = content,
+                    Seen = false,
+                    UserId = request.UserId,
+                    WithEmail = request.WithEmail
+                };
 
+                await _notificationRepository.SaveAsync(notification);
+            }
+            else
+            {
+                await SendEmailAsync(request.UserId, request.TemplateCode, request.Option);
+            }
             var notificationResponse = new NotificationResponse
             {
                 Content = content,
-                StudentUserid = notification.UserId,
+                UserId = request.UserId,
+                WithEmail = request.WithEmail
             };
 
             return notificationResponse;
         }
 
         public override async Task getListNotifications(ListNotificationRequest request, IServerStreamWriter<NotificationResponse> responseStream, ServerCallContext context)
         {
-            var notifications = await _notificationRepository.GetNotifications(request.StudentUserid, request.Seen);
+            var notifications = await _notificationRepository.GetNotifications(request.UserId, request.Seen);
 
             foreach (var notification in notifications)
             {
                 var notificationResponse = new NotificationResponse
                 {
                     Content = notification.Content,
-                    StudentUserid = notification.UserId,
+                    UserId = notification.UserId,
                 };
 
                 await responseStream.WriteAsync(notificationResponse);
             }
         }
     }
 }
+