diff --git a/DataAccess/CategoryPostDAO.cs b/DataAccess/CategoryPostDAO.cs index 9ecc6a5..ff80a3a 100644 --- a/DataAccess/CategoryPostDAO.cs +++ b/DataAccess/CategoryPostDAO.cs @@ -11,11 +11,11 @@ namespace DataAccess public class CategoryPostDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public CategoryPostDAO(FBLADbContext db) + public CategoryPostDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/ChatDAO.cs b/DataAccess/ChatDAO.cs index 1d86f18..95beda0 100644 --- a/DataAccess/ChatDAO.cs +++ b/DataAccess/ChatDAO.cs @@ -12,11 +12,11 @@ namespace DataAccess public class ChatDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public ChatDAO(FBLADbContext db) + public ChatDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/MatchDAO.cs b/DataAccess/MatchDAO.cs index 3e21043..5d7096e 100644 --- a/DataAccess/MatchDAO.cs +++ b/DataAccess/MatchDAO.cs @@ -11,11 +11,11 @@ namespace DataAccess public class MatchDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public MatchDAO(FBLADbContext db) + public MatchDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/MessageChatDAO.cs b/DataAccess/MessageChatDAO.cs index 912c445..b50d8e9 100644 --- a/DataAccess/MessageChatDAO.cs +++ b/DataAccess/MessageChatDAO.cs @@ -10,11 +10,11 @@ namespace DataAccess public class MessageChatDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public MessageChatDAO(FBLADbContext db) + public MessageChatDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/NotificationsDAO.cs b/DataAccess/NotificationsDAO.cs index 17fdcf9..50e94e6 100644 --- a/DataAccess/NotificationsDAO.cs +++ b/DataAccess/NotificationsDAO.cs @@ -11,12 +11,12 @@ namespace DataAccess public class NotificationsDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; private readonly UsersDAO usersDAO; #endregion #region Constructor - public NotificationsDAO(FBLADbContext db, UsersDAO usersDAO) + public NotificationsDAO(BackToMeDbContext db, UsersDAO usersDAO) { this.db = db; this.usersDAO = usersDAO; diff --git a/DataAccess/PickUpRequestDAO.cs b/DataAccess/PickUpRequestDAO.cs index d01fc44..0d69664 100644 --- a/DataAccess/PickUpRequestDAO.cs +++ b/DataAccess/PickUpRequestDAO.cs @@ -12,11 +12,11 @@ namespace DataAccess public class PickUpRequestDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public PickUpRequestDAO(FBLADbContext db) + public PickUpRequestDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/PostDAO.cs b/DataAccess/PostDAO.cs index caa831a..a9b87a3 100644 --- a/DataAccess/PostDAO.cs +++ b/DataAccess/PostDAO.cs @@ -13,12 +13,12 @@ namespace DataAccess public class PostDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; private readonly UsersDAO usersDAO; #endregion #region Constructor - public PostDAO(FBLADbContext db, UsersDAO usersDAO) + public PostDAO(BackToMeDbContext db, UsersDAO usersDAO) { this.db = db; this.usersDAO = usersDAO; diff --git a/DataAccess/StudentDAO.cs b/DataAccess/StudentDAO.cs index e284bf0..b07531f 100644 --- a/DataAccess/StudentDAO.cs +++ b/DataAccess/StudentDAO.cs @@ -11,11 +11,11 @@ namespace DataAccess public class StudentDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public StudentDAO(FBLADbContext db) + public StudentDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/TransferRequestDAO.cs b/DataAccess/TransferRequestDAO.cs index bb4086d..18c45a4 100644 --- a/DataAccess/TransferRequestDAO.cs +++ b/DataAccess/TransferRequestDAO.cs @@ -11,11 +11,11 @@ namespace DataAccess public class TransferRequestDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public TransferRequestDAO(FBLADbContext db) + public TransferRequestDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/UsersDAO.cs b/DataAccess/UsersDAO.cs index 2f0e868..8a42f6e 100644 --- a/DataAccess/UsersDAO.cs +++ b/DataAccess/UsersDAO.cs @@ -11,11 +11,11 @@ namespace DataAccess public class UsersDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public UsersDAO(FBLADbContext db) + public UsersDAO(BackToMeDbContext db) { this.db = db; } diff --git a/DataAccess/VerificationCodeDAO.cs b/DataAccess/VerificationCodeDAO.cs index 1a5b8df..3b9cb66 100644 --- a/DataAccess/VerificationCodeDAO.cs +++ b/DataAccess/VerificationCodeDAO.cs @@ -11,11 +11,11 @@ namespace DataAccess public class VerificationCodeDAO { #region Variables - private readonly FBLADbContext db; + private readonly BackToMeDbContext db; #endregion #region Constructor - public VerificationCodeDAO(FBLADbContext db) + public VerificationCodeDAO(BackToMeDbContext db) { this.db = db; } diff --git a/LostFound_API/Controllers/CategoryPostController.cs b/LostFound_API/Controllers/CategoryPostController.cs index 8773624..1e1bc4a 100644 --- a/LostFound_API/Controllers/CategoryPostController.cs +++ b/LostFound_API/Controllers/CategoryPostController.cs @@ -7,7 +7,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/CheckAuthController.cs b/LostFound_API/Controllers/CheckAuthController.cs index fe61e25..d0548fc 100644 --- a/LostFound_API/Controllers/CheckAuthController.cs +++ b/LostFound_API/Controllers/CheckAuthController.cs @@ -2,7 +2,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/MatchController.cs b/LostFound_API/Controllers/MatchController.cs index 26e3b2a..726cd2c 100644 --- a/LostFound_API/Controllers/MatchController.cs +++ b/LostFound_API/Controllers/MatchController.cs @@ -1,5 +1,5 @@ -using FBLA_API.DTOs.Match; -using FBLA_API.DTOs.VerificationCodes; +using LostFound_API.DTOs.Match; +using LostFound_API.DTOs.VerificationCodes; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -11,7 +11,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/MessageChatController.cs b/LostFound_API/Controllers/MessageChatController.cs index 2185c41..7e3eb23 100644 --- a/LostFound_API/Controllers/MessageChatController.cs +++ b/LostFound_API/Controllers/MessageChatController.cs @@ -1,4 +1,4 @@ -using FBLA_API.DTOs.Chat; +using LostFound_API.DTOs.Chat; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; @@ -12,7 +12,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/NotificationController.cs b/LostFound_API/Controllers/NotificationController.cs index accf2ca..fd61024 100644 --- a/LostFound_API/Controllers/NotificationController.cs +++ b/LostFound_API/Controllers/NotificationController.cs @@ -6,7 +6,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/PickUpRequestController.cs b/LostFound_API/Controllers/PickUpRequestController.cs index e4b975a..0bbf6ec 100644 --- a/LostFound_API/Controllers/PickUpRequestController.cs +++ b/LostFound_API/Controllers/PickUpRequestController.cs @@ -1,6 +1,6 @@ using DataAccess; -using FBLA_API.DTOs.Posts; -using FBLA_API.DTOs.Users; +using LostFound_API.DTOs.Posts; +using LostFound_API.DTOs.Users; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; @@ -14,7 +14,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/PostController.cs b/LostFound_API/Controllers/PostController.cs index b2f50ce..70065d7 100644 --- a/LostFound_API/Controllers/PostController.cs +++ b/LostFound_API/Controllers/PostController.cs @@ -1,5 +1,5 @@ using DataAccess; -using FBLA_API.DTOs.Match; +using LostFound_API.DTOs.Match; using Microsoft.AspNetCore.Mvc; using ObjectBusiness; using Repository; @@ -10,13 +10,13 @@ using Microsoft.AspNetCore; using Microsoft.EntityFrameworkCore; using Microsoft.AspNetCore.Authorization; -using FBLA_API.DTOs.Users; +using LostFound_API.DTOs.Users; using Microsoft.Extensions.Hosting; -using FBLA_API.DTOs.Posts; +using LostFound_API.DTOs.Posts; // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/TransferRequestsController.cs b/LostFound_API/Controllers/TransferRequestsController.cs index 79eb59d..3b55650 100644 --- a/LostFound_API/Controllers/TransferRequestsController.cs +++ b/LostFound_API/Controllers/TransferRequestsController.cs @@ -1,4 +1,4 @@ -using FBLA_API.DTOs.Users; +using LostFound_API.DTOs.Users; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; @@ -8,7 +8,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/Controllers/UsersController.cs b/LostFound_API/Controllers/UsersController.cs index 60723b5..ed31897 100644 --- a/LostFound_API/Controllers/UsersController.cs +++ b/LostFound_API/Controllers/UsersController.cs @@ -1,5 +1,5 @@ -using FBLA_API.DTOs.Auth; -using FBLA_API.DTOs.Users; +using LostFound_API.DTOs.Auth; +using LostFound_API.DTOs.Users; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.SignalR; @@ -19,7 +19,7 @@ // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace FBLA_API.Controllers +namespace LostFound_API.Controllers { [Route("api/[controller]")] [ApiController] diff --git a/LostFound_API/DTOs/Auth/SignInRequestDTO.cs b/LostFound_API/DTOs/Auth/SignInRequestDTO.cs index fd7a4e1..8dc1af0 100644 --- a/LostFound_API/DTOs/Auth/SignInRequestDTO.cs +++ b/LostFound_API/DTOs/Auth/SignInRequestDTO.cs @@ -1,4 +1,4 @@ -namespace FBLA_API.DTOs.Auth +namespace LostFound_API.DTOs.Auth { public class SignInRequestDTO { diff --git a/LostFound_API/DTOs/Chat/MessageChatDTO.cs b/LostFound_API/DTOs/Chat/MessageChatDTO.cs index d3614e5..67cdf10 100644 --- a/LostFound_API/DTOs/Chat/MessageChatDTO.cs +++ b/LostFound_API/DTOs/Chat/MessageChatDTO.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; -namespace FBLA_API.DTOs.Chat +namespace LostFound_API.DTOs.Chat { public class MessageChatDTO { diff --git a/LostFound_API/DTOs/Match/MatchDTO.cs b/LostFound_API/DTOs/Match/MatchDTO.cs index aa78363..50faf3b 100644 --- a/LostFound_API/DTOs/Match/MatchDTO.cs +++ b/LostFound_API/DTOs/Match/MatchDTO.cs @@ -1,4 +1,4 @@ -namespace FBLA_API.DTOs.Match +namespace LostFound_API.DTOs.Match { public class MatchDTO { diff --git a/LostFound_API/DTOs/Match/MatchSuggestionDTO.cs b/LostFound_API/DTOs/Match/MatchSuggestionDTO.cs index baa2eaa..bf92f88 100644 --- a/LostFound_API/DTOs/Match/MatchSuggestionDTO.cs +++ b/LostFound_API/DTOs/Match/MatchSuggestionDTO.cs @@ -1,6 +1,6 @@ using ObjectBusiness; -namespace FBLA_API.DTOs.Match +namespace LostFound_API.DTOs.Match { public class MatchSuggestionDTO { diff --git a/LostFound_API/DTOs/Posts/PostDTO.cs b/LostFound_API/DTOs/Posts/PostDTO.cs index 43690cc..95c8c59 100644 --- a/LostFound_API/DTOs/Posts/PostDTO.cs +++ b/LostFound_API/DTOs/Posts/PostDTO.cs @@ -1,6 +1,6 @@ using ObjectBusiness; -namespace FBLA_API.DTOs.Posts +namespace LostFound_API.DTOs.Posts { public class PostDTO { diff --git a/LostFound_API/DTOs/Users/UserDTO.cs b/LostFound_API/DTOs/Users/UserDTO.cs index d3858e0..539af40 100644 --- a/LostFound_API/DTOs/Users/UserDTO.cs +++ b/LostFound_API/DTOs/Users/UserDTO.cs @@ -1,4 +1,4 @@ -namespace FBLA_API.DTOs.Users +namespace LostFound_API.DTOs.Users { public class UserDTO { diff --git a/LostFound_API/DTOs/Users/UserHandOverAdminDTO.cs b/LostFound_API/DTOs/Users/UserHandOverAdminDTO.cs index 228adfd..b500213 100644 --- a/LostFound_API/DTOs/Users/UserHandOverAdminDTO.cs +++ b/LostFound_API/DTOs/Users/UserHandOverAdminDTO.cs @@ -1,4 +1,4 @@ -namespace FBLA_API.DTOs.Users +namespace LostFound_API.DTOs.Users { public class UserHandOverAdminDTO { diff --git a/LostFound_API/DTOs/VerificationCodes/VerificationCodesDTO.cs b/LostFound_API/DTOs/VerificationCodes/VerificationCodesDTO.cs index 359e71c..6a5e638 100644 --- a/LostFound_API/DTOs/VerificationCodes/VerificationCodesDTO.cs +++ b/LostFound_API/DTOs/VerificationCodes/VerificationCodesDTO.cs @@ -1,4 +1,4 @@ -namespace FBLA_API.DTOs.VerificationCodes +namespace LostFound_API.DTOs.VerificationCodes { public class VerificationCodesDTO { diff --git a/LostFound_API/Program.cs b/LostFound_API/Program.cs index 170549f..8b251e4 100644 --- a/LostFound_API/Program.cs +++ b/LostFound_API/Program.cs @@ -1,9 +1,9 @@ using DataAccess; -using FBLA_API.DTOs.Chat; -using FBLA_API.DTOs.Match; -using FBLA_API.DTOs.Posts; -using FBLA_API.DTOs.Users; -using FBLA_API.DTOs.VerificationCodes; +using LostFound_API.DTOs.Chat; +using LostFound_API.DTOs.Match; +using LostFound_API.DTOs.Posts; +using LostFound_API.DTOs.Users; +using LostFound_API.DTOs.VerificationCodes; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.EntityFrameworkCore; using Microsoft.IdentityModel.Tokens; @@ -118,7 +118,7 @@ builder.Services.AddHostedService(); // Connect to SQL Server -builder.Services.AddDbContext(options => +builder.Services.AddDbContext(options => { options.UseSqlServer(builder.Configuration.GetConnectionString("MyConnection")); }); diff --git a/LostFound_API/WeatherForecast.cs b/LostFound_API/WeatherForecast.cs deleted file mode 100644 index 3fad1f2..0000000 --- a/LostFound_API/WeatherForecast.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace LostFound_API -{ - public class WeatherForecast - { - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } - } -} diff --git a/LostFound_API/appsettings.json b/LostFound_API/appsettings.json index c230511..9123a04 100644 --- a/LostFound_API/appsettings.json +++ b/LostFound_API/appsettings.json @@ -7,8 +7,8 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "MyConnection": "Data Source=DESKTOP-A6BFNON\\ANSQLSERVER;Database=FBLADB;User Id=sa;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;" - //"MyConnection": "Data Source=my-sqlserver.cnoi0okmult3.ap-southeast-2.rds.amazonaws.com,1433;Database=FBLADB;User Id=admin;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;" + "MyConnection": "Data Source=DESKTOP-A6BFNON\\ANSQLSERVER;Database=BackToMeDB;User Id=sa;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;" + //"MyConnection": "Data Source=my-sqlserver.cnoi0okmult3.ap-southeast-2.rds.amazonaws.com,1433;Database=BackToMeDB;User Id=admin;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;" }, "AzureSignalR": { "ConnectionString": "Endpoint=https://lostandfound-signalr.service.signalr.net;AccessKey=5H02R43oOOa5BOEnT0vq477WDuiU2aQYtcvs53CGsEoKqzgxdF93JQQJ99CAAC1i4TkXJ3w3AAAAASRSY1Xq;Version=1.0;" diff --git a/ObjectBusiness/FBLADbContext.cs b/ObjectBusiness/BackToMeDbContext.cs similarity index 96% rename from ObjectBusiness/FBLADbContext.cs rename to ObjectBusiness/BackToMeDbContext.cs index fe3ab73..33a585c 100644 --- a/ObjectBusiness/FBLADbContext.cs +++ b/ObjectBusiness/BackToMeDbContext.cs @@ -7,11 +7,11 @@ namespace ObjectBusiness { - public class FBLADbContext : DbContext + public class BackToMeDbContext : DbContext { // Get DbContext from DI #region Constructor - public FBLADbContext(DbContextOptions options) : base(options) + public BackToMeDbContext(DbContextOptions options) : base(options) { } #endregion diff --git a/ObjectBusiness/FBLADbContextFactory.cs b/ObjectBusiness/BackToMeDbContextFactory.cs similarity index 68% rename from ObjectBusiness/FBLADbContextFactory.cs rename to ObjectBusiness/BackToMeDbContextFactory.cs index c36afe4..4c05ea6 100644 --- a/ObjectBusiness/FBLADbContextFactory.cs +++ b/ObjectBusiness/BackToMeDbContextFactory.cs @@ -9,20 +9,20 @@ namespace ObjectBusiness { - public class FBLADbContextFactory : IDesignTimeDbContextFactory + public class BackToMeDbContextFactory : IDesignTimeDbContextFactory { // Create DBContext without DI - public FBLADbContext CreateDbContext(string[] args) + public BackToMeDbContext CreateDbContext(string[] args) { IConfigurationRoot configuration = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) .AddJsonFile("appsettings.json") .Build(); - var optionsBuilder = new DbContextOptionsBuilder(); + var optionsBuilder = new DbContextOptionsBuilder(); optionsBuilder.UseSqlServer(configuration.GetConnectionString("MyConnection")); - return new FBLADbContext(optionsBuilder.Options); + return new BackToMeDbContext(optionsBuilder.Options); } } } diff --git a/ObjectBusiness/appsettings.json b/ObjectBusiness/appsettings.json new file mode 100644 index 0000000..57b8c54 --- /dev/null +++ b/ObjectBusiness/appsettings.json @@ -0,0 +1,6 @@ +{ + "ConnectionStrings": { + //"MyConnection": "Data Source=DESKTOP-A6BFNON\\ANSQLSERVER;Database=BackToMeDB;User Id=sa;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;", + "MyConnection": "Data Source=my-sqlserver.cnoi0okmult3.ap-southeast-2.rds.amazonaws.com,1433;Database=BackToMeDB;User Id=admin;Password=Baoan123.cntt;TrustServerCertificate=true;Encrypt=false;" + } +} \ No newline at end of file diff --git a/Services/HolderReminderService.cs b/Services/HolderReminderService.cs index 12f185e..ffb69bd 100644 --- a/Services/HolderReminderService.cs +++ b/Services/HolderReminderService.cs @@ -26,7 +26,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) while (await timer.WaitForNextTickAsync()) { using var scope = scopeFactory.CreateScope(); - var db = scope.ServiceProvider.GetRequiredService(); // Used to connect Entity/DB + var db = scope.ServiceProvider.GetRequiredService(); // Used to connect Entity/DB var emailSender = scope.ServiceProvider.GetRequiredService(); var twoDaysAgo = DateTime.UtcNow.AddDays(-2);