Initiala ändringar för övergången från Firebase till Expo.

Nexpo/Controllers/NotificationsController.cs

@@ -1,4 +1,4 @@
-using FirebaseAdmin.Messaging;
+//using FirebaseAdmin.Messaging;
 using Google.Apis.Auth.OAuth2;
 using FirebaseAdmin;
 using Microsoft.AspNetCore.Mvc;
@@ -9,20 +9,34 @@
 using Microsoft.AspNetCore.Http;
 using Nexpo.DTO;
 using Nexpo.Models;
-
+using Nexpo.Repositories;
+using System.Net.Http;
+using System.Text;
+using System.Text.Json;
 namespace Nexpo.Controllers
 {
     [Route("api/[controller]")]
     [ApiController]
     public class NotificationController : ControllerBase
     {
+        private readonly INotificationRepository _notificationRepo;
+        private readonly IUserRepository _userRepo;
 
+        public NotificationController(
+            INotificationRepository iNotificationRepo,
+            IUserRepository iUserRepo
+            )
+        {
+            _notificationRepo = iNotificationRepo;
+            _userRepo = iUserRepo;
+        }
+
         private static Queue<NotificationDTO> history;
 
         static NotificationController()
         {
             history = new Queue<NotificationDTO>(10);
-            history.Enqueue(new NotificationDTO { Title = "Welcome", Message = "Welcome to the app", Topic = "all" });
+            history.Enqueue(new NotificationDTO { Title = "Welcome", Message = "Welcome to the app"});
         }
 
         /// <summary>
@@ -33,7 +47,7 @@ static NotificationController()
         [HttpPost("register")]
         [Authorize]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<IActionResult> RegisterUser(RegisterUserDTO dto)
+        public async Task<IActionResult> RegisterUser(int id, RegisterUserDTO dto)
         {
             if (string.IsNullOrEmpty(dto.Token))
             {
@@ -42,13 +56,11 @@ public async Task<IActionResult> RegisterUser(RegisterUserDTO dto)
 
             try
             {
-                var messaging = FirebaseMessaging.DefaultInstance;
-
-                var registrationTokens = new List<string> { dto.Token };
-
-                TopicManagementResponse response = await messaging.SubscribeToTopicAsync(registrationTokens, dto.Topic);
-
+
+                await _userRepo.AddToken(dto.Token, await _userRepo.Get(id));
+
                 return Ok(new { success = true, detail = "Successfully registered for topic" });
+
             }
             catch (Exception)
             {
@@ -65,43 +77,49 @@ public async Task<IActionResult> RegisterUser(RegisterUserDTO dto)
         [HttpPut]
         [Authorize(Roles = nameof(Role.Administrator))]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<IActionResult> NotifyAll(NotificationDTO dto)
-        {
-            if (string.IsNullOrEmpty(dto.Topic))
-            {
-                return BadRequest("Topic is required input.");
-            }
+public async Task<IActionResult> Notify(NotificationDTO dto, Role role)
+{
 
-            if (string.IsNullOrEmpty(dto.Message))
-            {
-                return BadRequest("Message is required input.");
-            }
+    if (string.IsNullOrEmpty(dto.Message))
+    {
+        return BadRequest("Message is required input.");
+    }
 
-            try
-            {
-                var messaging = FirebaseMessaging.DefaultInstance;
-                var message = new Message
-                {
-                    Notification = new Notification { Title = dto.Title, Body = dto.Message },
-                    Topic = dto.Topic
-                };
+    try
+    {
+        var client = new HttpClient();
+        var payload = new
+        {
+            to = dto.Token,
+            title = dto.Title,
+            body = dto.Message,
+        };
 
-                var result = await messaging.SendAsync(message);
+        var jsonPayload = JsonSerializer.Serialize(payload);
+        var content = new StringContent(jsonPayload, Encoding.UTF8, "application/json");
 
-                if (history.Count >= 10)
-                {
-                    history.Dequeue(); 
-                }
-                history.Enqueue(dto);
+        var response = await client.PostAsync("https://exp.host/--/api/v2/push/send", content);
 
-                return Ok(new { success = true, detail = "Successfully sent notification" });
-            }
-            catch (Exception)
-            {
-                return StatusCode(StatusCodes.Status500InternalServerError, new { success = false, detail = "An error occurred while sending notification" });
-            }
+        if (!response.IsSuccessStatusCode)
+        {
+            return StatusCode(StatusCodes.Status500InternalServerError, new { success = false, detail = "An error occurred while sending notification" });
         }
 
+        if (history.Count >= 10)
+        {
+            history.Dequeue();
+        }
+        history.Enqueue(dto);
+
+        return Ok(new { success = true, detail = "Successfully sent notification" });
+
+    }
+    catch (Exception)
+    {
+        return StatusCode(StatusCodes.Status500InternalServerError, new { success = false, detail = "An error occurred while sending notification" });
+    }
+}
+
         /// <summary>
         /// Returns the past few notifications
         /// At most 10 notifications will be stored at once

Nexpo/DTO/Notifications/NotificationDTO.cs

@@ -1,3 +1,4 @@
+using System;
 using System.ComponentModel.DataAnnotations;
 
 namespace Nexpo.DTO
@@ -8,10 +9,11 @@ public class NotificationDTO
         public string Title { get; set; }
 
         [Required]
-        public string Message { get; set; }
+        public string Token { get; set; }
 
         [Required]
-        public string Topic { get; set; }
+        public string Message { get; set; }
+
 
 
     }

Nexpo/DTO/Notifications/RegisterUserDTO.cs

@@ -7,5 +7,5 @@ public class RegisterUserDTO
     public string Token { get; set; }
 
     [Required]
-    public string Topic { get; set; }
+    public int UserId { get; set; }
 }

Nexpo/Models/ApplicationDbContext.cs

@@ -19,6 +19,8 @@ public class ApplicationDbContext : DbContext
         public DbSet<Contact> Contacts { get; set; }
         public DbSet<FrequentAskedQuestion> FrequentAskedQuestion { get; set; }
 
+        public DbSet<Notification> Notification { get; set; }
+        public DbSet<UserNotification> UserNotification { get; set; }
 #pragma warning restore format
 
         private readonly PasswordService _passwordService;

Nexpo/Models/Notification.cs

@@ -0,0 +1,37 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+
+namespace Nexpo.Models
+{
+    /// <summary>
+    /// Represents a notification topic
+    /// </summary>
+    public class Notification
+    {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int? Id { get; set; }
+
+        [Required]
+        public string Message { get; set; }
+        [Required]
+        public DateTime ScheduledTime { get; set; }
+        [Required]
+        public NotificationType Type { get; set; }
+        [Required]
+        public int? EventId { get; set; }
+
+
+
+
+        public enum NotificationType
+        {
+            General,
+            EventReminder,
+            InternalMessage,
+        }
+
+    }
+}
+

Nexpo/Models/User.cs

@@ -35,6 +35,8 @@ public class User
         public bool hasCv { get; set; }
 
         public string profilePictureUrl { get; set; }
+
+        public string notificationToken { get; set; }
     }
 
     public enum Role

Nexpo/Models/UserNotification.cs

@@ -0,0 +1,25 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+
+namespace Nexpo.Models
+{
+    /// <summary>
+    /// Represents a notification topic
+    /// </summary>
+    public class UserNotification
+    {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int UserId { get; set; }
+        [Required]
+        [JsonIgnore]
+        public User User { get; set; }
+        [Required]
+        public int NotificationId { get; set; }
+        [Required]
+        [JsonIgnore]
+        public Notification Notification { get; set; }
+
+    }
+}
+

Nexpo/Repositories/NotificationRepository.cs

@@ -0,0 +1,64 @@
+using Nexpo.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+
+namespace Nexpo.Repositories
+{
+    public interface INotificationRepository
+    {
+        public Task<Notification> Get(int id);
+        public Task Add(Notification _notification);
+        public Task Update(Notification _notification);
+        public Task Remove(Notification _notification);
+        public Task<List<Notification>> GetAllNotExpired(DateTime date, Notification.NotificationType type);
+    }
+
+    public class NotificationRepository : INotificationRepository
+    {
+        private readonly ApplicationDbContext _context;
+
+        public NotificationRepository(ApplicationDbContext context)
+        {
+            _context = context;
+        }
+
+        public Task<Notification> Get(int id)
+        {
+            return _context.Notification.FirstOrDefaultAsync(_notification => _notification.Id == id);
+        }
+        public async Task Add(Notification _notification)
+        {
+            _context.Notification.Add(_notification);
+            await _context.SaveChangesAsync();
+        }
+        public async Task Remove(Notification _notification)
+        {
+            _context.Notification.Remove(_notification);
+            await _context.SaveChangesAsync();
+        }
+        public Task Update(Notification _notification){
+            _context.Entry(_notification).State = EntityState.Modified;
+            return _context.SaveChangesAsync();
+
+        }
+        public async Task<List<Notification>> GetAllNotExpired(DateTime date, Notification.NotificationType type)
+        {
+            return await _context.Notification.Where(_notification => _notification.ScheduledTime > date && _notification.Type == type).ToListAsync();
+        } 
+
+
+
+
+
+
+
+
+
+
+
+
+    }
+}

Nexpo/Repositories/UserNotificationRepository.cs

@@ -0,0 +1,52 @@
+using Nexpo.Models;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System;
+
+namespace Nexpo.Repositories
+{
+    public interface IUserNotificationRepository
+    {
+        public Task<UserNotification> Get(int userId, int notificationId);
+        public Task Add(UserNotification _userNotification);
+        public Task Update(UserNotification _userNotification);
+        public Task Remove(UserNotification _userNotification);
+
+    }
+
+    public class UserNotificationRepository : IUserNotificationRepository
+    {
+        private readonly ApplicationDbContext _context;
+
+        public UserNotificationRepository(ApplicationDbContext context)
+        {
+            _context = context;
+        }
+
+        public Task<UserNotification> Get(int userId, int notificationId)
+        {
+            return _context.UserNotification.FirstOrDefaultAsync(_userNotification => _userNotification.UserId == userId 
+            && _userNotification.NotificationId == notificationId);
+        }
+        public async Task Add(UserNotification _userNotification)
+        {
+            _context.UserNotification.Add(_userNotification);
+            await _context.SaveChangesAsync();
+        }
+        public async Task Remove(UserNotification _userNotification)
+        {
+            _context.UserNotification.Remove(_userNotification);
+            await _context.SaveChangesAsync();
+        }
+
+        public Task Update(UserNotification _userNotification){
+            _context.Entry(_userNotification).State = EntityState.Modified;
+            return _context.SaveChangesAsync();
+
+        }
+
+
+    }
+}

Nexpo/Repositories/UserRepository.cs

@@ -15,6 +15,7 @@ public interface IUserRepository
         public Task Add(User user);
         public Task Remove(User user);
         public Task Update(User user);
+        public Task AddToken(string Token, User user);
     }
 
     public class UserRepository : IUserRepository
@@ -66,5 +67,11 @@ public async Task Update(User user)
             _context.Entry(user).State = EntityState.Modified;
             await _context.SaveChangesAsync();
         }
+
+        public async Task AddToken(string Token, User user)
+        {
+            user.notificationToken = Token;
+            await Update(user);
+        }
     }
 }