From 73cf24b7610bb7989ad99f858df857b1a5c7e4e2 Mon Sep 17 00:00:00 2001 From: Yuhsuancheng43 Date: Sun, 22 Feb 2026 12:38:40 +1000 Subject: [PATCH 1/3] Support icons --- CommBank-Server/Models/Goal.cs | 2 ++ CommBank-Server/Secrets.json | 2 +- CommBank.Tests/GoalControllerTests.cs | 21 +++++++++++++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CommBank-Server/Models/Goal.cs b/CommBank-Server/Models/Goal.cs index 77ff1ad..20b9b5d 100644 --- a/CommBank-Server/Models/Goal.cs +++ b/CommBank-Server/Models/Goal.cs @@ -27,4 +27,6 @@ public class Goal [BsonRepresentation(BsonType.ObjectId)] public string? UserId { get; set; } + + public string? Icon { get; set; } } \ No newline at end of file diff --git a/CommBank-Server/Secrets.json b/CommBank-Server/Secrets.json index 0e5bf94..b791da4 100644 --- a/CommBank-Server/Secrets.json +++ b/CommBank-Server/Secrets.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "CommBank": "{CONNECTION_STRING}" + "CommBank": "mongodb+srv://yuhsuancheng1_db_user:5hoIZYE6FO7B4bUn@commonbank-program.cparlyn.mongodb.net/?appName=commonbank-program" } } \ No newline at end of file diff --git a/CommBank.Tests/GoalControllerTests.cs b/CommBank.Tests/GoalControllerTests.cs index 8380181..86352f7 100644 --- a/CommBank.Tests/GoalControllerTests.cs +++ b/CommBank.Tests/GoalControllerTests.cs @@ -66,9 +66,26 @@ public async void Get() public async void GetForUser() { // Arrange - + var goals = collections.GetGoals(); + var users = collections.GetUsers(); + IGoalsService goalsService = new FakeGoalsService(goals, goals[0]); + IUsersService usersService = new FakeUsersService(users, users[0]); + GoalController controller = new(goalsService, usersService); + // Act - + var httpContext = new Microsoft.AspNetCore.Http.DefaultHttpContext(); + controller.ControllerContext.HttpContext = httpContext; + var result = await controller.GetForUser(users[0].Id!); + // Assert + Assert.NotNull(result); + + var index = 0; + foreach (Goal goal in result!) + { + Assert.IsAssignableFrom(goal); + Assert.Equal(goals[0].UserId, goal.UserId); + index++; + } } } \ No newline at end of file From bd5a79475b85fb8ecd9f4e73a18c18b61dcd5fd3 Mon Sep 17 00:00:00 2001 From: Yuhsuancheng43 Date: Sun, 22 Feb 2026 12:51:41 +1000 Subject: [PATCH 2/3] Support icons --- .gitignore | 1 + CommBank-Server/Secrets.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6769715..b9f498c 100644 --- a/.gitignore +++ b/.gitignore @@ -405,3 +405,4 @@ ASALocalRun/ .localhistory/ +CommBank-Server/Secrets.json diff --git a/CommBank-Server/Secrets.json b/CommBank-Server/Secrets.json index b791da4..ba4fdd2 100644 --- a/CommBank-Server/Secrets.json +++ b/CommBank-Server/Secrets.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "CommBank": "mongodb+srv://yuhsuancheng1_db_user:5hoIZYE6FO7B4bUn@commonbank-program.cparlyn.mongodb.net/?appName=commonbank-program" + "CommBank": "mongodb+srv://yuhsuancheng1_db_user:6hoIZXe4FO3B5bUB@commonbank-program.cparlyn.mongodb.net/?appName=commonbank-program" } } \ No newline at end of file From 29bfd69aa2badb7787a08f39524c596761332bb8 Mon Sep 17 00:00:00 2001 From: Yuhsuancheng43 Date: Sun, 22 Feb 2026 12:54:48 +1000 Subject: [PATCH 3/3] Remove Secrets.json from tracking --- CommBank-Server/Secrets.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 CommBank-Server/Secrets.json diff --git a/CommBank-Server/Secrets.json b/CommBank-Server/Secrets.json deleted file mode 100644 index ba4fdd2..0000000 --- a/CommBank-Server/Secrets.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ConnectionStrings": { - "CommBank": "mongodb+srv://yuhsuancheng1_db_user:6hoIZXe4FO3B5bUB@commonbank-program.cparlyn.mongodb.net/?appName=commonbank-program" - } -} \ No newline at end of file