Merge pull request #536 from SCCapstone/main

528: Deploy landing page

Author: evan-scales

FU.API/FU.API.Tests/AccountServiceTests.cs

@@ -48,7 +48,7 @@ public void Dispose()
     public async void CreateUser_WithValidCredentials_ReturnsUser()
     {
         // Arange
-        Credentials credentials = new() { Username = "Test", Password = "Test" };
+        Credentials credentials = new() { Username = "Test", Password = "Test12345" };
 
         // Act
         ApplicationUser user = await _accountsService.Register(credentials);
@@ -62,7 +62,7 @@ public async void CreateUser_WithValidCredentials_ReturnsUser()
     public async void ChangeUsername_WithValidUsername_ChangesUsername()
     {
         // Arange
-        Credentials credentials = new() { Username = "Username1", Password = "Test" };
+        Credentials credentials = new() { Username = "Username1", Password = "Test12345" };
         string newUsername = "Username2";
         ApplicationUser user = await _accountsService.Register(credentials);
 

FU.API/FU.API.Tests/PostServiceTests.cs

@@ -137,7 +137,7 @@ public async void GetPostUsers_WithMultipleUsers_ReturnsCorrectUserCount()
         // Arrange
         // Note: CreateTestPostAsync creates one user as part of creating a post
         Post post = await TestsHelper.CreateTestPostAsync(_dbContext);
-        var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials() { Username = "user2", Password = "pass2", Email = "[email protected]" });
+        var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials() { Username = "user2", Password = "Test12345", Email = "[email protected]" });
         await _postService.JoinPost(post.Id, user2);
 
         // Act
@@ -166,7 +166,7 @@ public async void JoinPost_WhenAlreadyMember_ThrowsConflictException()
     {
         // Arrange
         Post post = await TestsHelper.CreateTestPostAsync(_dbContext);
-        var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials() { Username = "user2", Password = "pass2", Email = "[email protected]" });
+        var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials() { Username = "user2", Password = "Test12345", Email = "[email protected]" });
         await _postService.JoinPost(post.Id, user2);
 
         // Act & Assert
@@ -180,7 +180,7 @@ public async void LeavePost_WhenMember_LeavesPost()
     {
         // Arrange
         Post post = await TestsHelper.CreateTestPostAsync(_dbContext);
-        var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials() { Username = "user2", Password = "pass2", Email = "[email protected]" });
+        var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials() { Username = "user2", Password = "Test12345", Email = "[email protected]" });
         await _postService.JoinPost(post.Id, user2);
 
         // Act

FU.API/FU.API.Tests/SearchServiceSearchPostsTests.cs

@@ -159,7 +159,7 @@ public async Task Search_WithSearchStartDate_FiltersOne()
         // Act
         (List<Post> posts, var totalResults) = await _searchService.SearchPosts(new PostQuery()
         {
-            StartOnOrAfterDate = searchDate,
+            StartOnOrAfterDateTime = searchDate.ToDateTime(new TimeOnly(1, 1, 1)),
         });
 
         // Assert
@@ -196,7 +196,7 @@ public async Task Search_WithSearchEndDateDate_FiltersOne()
         // Act
         (List<Post> posts, var totalResults) = await _searchService.SearchPosts(new PostQuery()
         {
-            EndOnOrBeforeDate = searchDate,
+            EndOnOrBeforeDateTime = searchDate.ToDateTime(new TimeOnly(1, 1, 1)),
         });
 
         // Assert
@@ -232,7 +232,7 @@ public async Task Search_WithSearchDateAsToday_SearchesAfterNow()
         // Act
         (List<Post> posts, var totalResults) = await _searchService.SearchPosts(new PostQuery()
         {
-            StartOnOrAfterDate = DateOnly.FromDateTime(DateTime.UtcNow),
+            StartOnOrAfterDateTime = DateTime.UtcNow,
         });
 
         // Assert

FU.API/FU.API.Tests/SearchServiceSearchUsersTests.cs

@@ -56,19 +56,19 @@ public async Task Search_WithKeyword_SearchesTitleAndBio()
         {
             Username = "User1",
             Email = "[email protected]",
-            Password = "Pass1"
+            Password = "Test12345"
         });
         var user2 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials()
         {
             Username = "User2",
             Email = "[email protected]",
-            Password = "Pass2"
+            Password = "Test12345"
         });
         var user3 = await TestsHelper.CreateUserAsync(_dbContext, new Credentials()
         {
             Username = "User3",
             Email = "[email protected]",
-            Password = "Pass3"
+            Password = "Test12345"
         });
         await _userService.UpdateUserProfile(new UserProfile() { Bio = "Bio3", Id = user3.UserId });
 

FU.API/FU.API.Tests/TestsHelper.cs

@@ -17,7 +17,7 @@ public static async Task<Game> CreateTestGameAsync(AppDbContext dbContext)
 
     public static async Task<ApplicationUser> CreateUserAsync(AppDbContext context)
     {
-        Credentials credentials = new() { Username = "Test", Password = "Test", Email = "[email protected]" };
+        Credentials credentials = new() { Username = "Test", Password = "Test12345", Email = "[email protected]" };
         return await CreateUserAsync(context, credentials);
     }
 

FU.API/FU.API/.dockerignore

@@ -0,0 +1,6 @@
+bin/
+obj/
+Dockerfile
+docker-compose.yml
+README.md
+.env

FU.API/FU.API/Controllers/UsersController.cs

@@ -18,11 +18,13 @@ public class UsersController : ControllerBase
 {
     private readonly IUserService _userService;
     private readonly ISearchService _searchService;
+    private readonly IStorageService _storageService;
 
-    public UsersController(IUserService userService, ISearchService searchService)
+    public UsersController(IUserService userService, ISearchService searchService, IStorageService storageService)
     {
         _userService = userService;
         _searchService = searchService;
+        _storageService = storageService;
     }
 
     [HttpGet]
@@ -74,7 +76,28 @@ public async Task<IActionResult> UpdateProfile([FromBody] UserProfile profileCha
         // Overrides any client given id that may differ from userId.
         profileChanges.Id = userId;
 
-        var newProfile = await _userService.UpdateUserProfile(profileChanges);
+        // Make sure its an image already in our blob storage
+        // Otherwise we are unure if the image is cropped, resized, and in the right format
+        if (profileChanges?.PfpUrl is not null)
+        {
+            Uri avatarUri;
+
+            try
+            {
+                avatarUri = new(profileChanges.PfpUrl);
+            }
+            catch (UriFormatException)
+            {
+                throw new UnprocessableException("Invalid avatar url format.");
+            }
+
+            if (!(await _storageService.IsInStorageAsync(avatarUri)))
+            {
+                throw new UnprocessableException("Invalid profile picture. The image must be uploaded to our storage system");
+            }
+        }
+
+        var newProfile = await _userService.UpdateUserProfile(profileChanges!);
 
         return Ok(newProfile);
     }

FU.API/FU.API/DTOs/Search/PostSearchRequestDTO.cs

@@ -11,10 +11,10 @@ public record PostSearchRequestDTO
     public string? Games { get; set; }
 
     [FromQuery]
-    public DateOnly? StartOnOrAfterDate { get; set; }
+    public DateTime? StartOnOrAfterDateTime { get; set; }
 
     [FromQuery]
-    public DateOnly? EndOnOrBeforeDate { get; set; }
+    public DateTime? EndOnOrBeforeDateTime { get; set; }
 
     [FromQuery]
     public TimeOnly? StartOnOrAfterTime { get; set; }

FU.API/FU.API/Dockerfile

@@ -0,0 +1,15 @@
+# https://hub.docker.com/_/microsoft-dotnet
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+
+# copy everything and build app
+WORKDIR /source
+COPY . .
+RUN mkdir /app
+RUN dotnet publish -o /app
+
+# final stage/image
+FROM mcr.microsoft.com/dotnet/aspnet:7.0
+WORKDIR /app
+COPY --from=build /app ./
+ENTRYPOINT ["dotnet", "FU.API.dll"]
+

FU.API/FU.API/FU.API.csproj

@@ -25,7 +25,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>