diff --git a/.gitignore b/.gitignore index 6769715..db5a468 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +Secrets.json + # globs Makefile.in *.userprefs diff --git a/CommBank-Server/CommBank.csproj b/CommBank-Server/CommBank.csproj index 983cc88..79cbbd4 100644 --- a/CommBank-Server/CommBank.csproj +++ b/CommBank-Server/CommBank.csproj @@ -13,7 +13,7 @@ - + diff --git a/CommBank-Server/Models/Goal.cs b/CommBank-Server/Models/Goal.cs index 77ff1ad..f0f392f 100644 --- a/CommBank-Server/Models/Goal.cs +++ b/CommBank-Server/Models/Goal.cs @@ -27,4 +27,7 @@ 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/Program.cs b/CommBank-Server/Program.cs index a88e560..b024dde 100644 --- a/CommBank-Server/Program.cs +++ b/CommBank-Server/Program.cs @@ -12,7 +12,7 @@ builder.Configuration.SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile("Secrets.json"); var mongoClient = new MongoClient(builder.Configuration.GetConnectionString("CommBank")); -var mongoDatabase = mongoClient.GetDatabase("CommBank"); +var mongoDatabase = mongoClient.GetDatabase("test"); IAccountsService accountsService = new AccountsService(mongoDatabase); IAuthService authService = new AuthService(mongoDatabase); diff --git a/CommBank-Server/Secrets.json b/CommBank-Server/Secrets.json deleted file mode 100644 index 0e5bf94..0000000 --- a/CommBank-Server/Secrets.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ConnectionStrings": { - "CommBank": "{CONNECTION_STRING}" - } -} \ No newline at end of file diff --git a/CommBank-Server/data/Accounts.json b/CommBank-Server/data/Accounts.json new file mode 100644 index 0000000..c94a91d --- /dev/null +++ b/CommBank-Server/data/Accounts.json @@ -0,0 +1,53 @@ +[{ + "_id": { + "$oid": "62a3e6aad25715026d1a2938" + }, + "Number": 123456789, + "Name": "Tag's Goal Saver", + "Balance": 6483.81, + "AccountType": "GoalSaver", + "TransactionIds": [ + { + "$oid": "62a3a284d07648900df72860" + }, + { + "$oid": "62a3a2ded07648900df72861" + }, + { + "$oid": "62a3a2ded07648900df72862" + }, + { + "$oid": "62a3a2ded07648900df72863" + }, + { + "$oid": "62a3a2ded07648900df72864" + }, + { + "$oid": "62a3a2ded07648900df72865" + }, + { + "$oid": "62a3a2ded07648900df72866" + }, + { + "$oid": "62a3a2ded07648900df72867" + }, + { + "$oid": "62a3a2ded07648900df72868" + }, + { + "$oid": "62a3a2ded07648900df72869" + }, + { + "$oid": "62a3a344d07648900df7286a" + }, + { + "$oid": "62a3a344d07648900df7286b" + }, + { + "$oid": "62a3a344d07648900df7286c" + }, + { + "$oid": "62a3a344d07648900df7286d" + } + ] +}] \ No newline at end of file diff --git a/CommBank-Server/data/Goals.json b/CommBank-Server/data/Goals.json new file mode 100644 index 0000000..7fa6830 --- /dev/null +++ b/CommBank-Server/data/Goals.json @@ -0,0 +1,50 @@ +[ + { + "_id": { "$oid": "62a3f587102e921da1253d32" }, + "Name": "House Down Payment", + "TargetAmount": 100000, + "TargetDate": { "$date": { "$numberLong": "1736312400000" } }, + "Balance": 73501.82, + "Created": { "$date": { "$numberLong": "1654912390857" } }, + "TransactionIds": null, + "TagIds": null, + "UserId": { "$oid": "62a29c15f4605c4c9fa7f306" }, + "Icon": "🤺" + }, + { + "_id": { "$oid": "62a3f5e0102e921da1253d33" }, + "Name": "Tesla Model Y", + "TargetAmount": 60000, + "TargetDate": { "$date": { "$numberLong": "1662004800000" } }, + "Balance": 43840.02, + "Created": { "$date": { "$numberLong": "1654912480950" } }, + "TransactionIds": null, + "TagIds": null, + "UserId": { "$oid": "62a29c15f4605c4c9fa7f306" }, + "Icon": "🚗" + }, + { + "_id": { "$oid": "62a3f62e102e921da1253d34" }, + "Name": "Trip to London", + "TargetAmount": 3500, + "TargetDate": { "$date": { "$numberLong": "1659412800000" } }, + "Created": { "$date": { "$numberLong": "1654912558236" } }, + "TransactionIds": null, + "TagIds": null, + "Balance": 753.89, + "UserId": { "$oid": "62a29c15f4605c4c9fa7f306" }, + "Icon": "🎡" + }, + { + "_id": { "$oid": "62a61945fa15f1cd18516a5f" }, + "Name": "Trip to NYC", + "TargetAmount": 800, + "TargetDate": { "$date": { "$numberLong": "1702184400000" } }, + "Balance": 0, + "Created": { "$date": { "$numberLong": "1655053065668" } }, + "TransactionIds": null, + "TagIds": null, + "UserId": { "$oid": "62a29c15f4605c4c9fa7f306" }, + "Icon": "🗽" + } +] diff --git a/CommBank-Server/data/Tags.json b/CommBank-Server/data/Tags.json new file mode 100644 index 0000000..202e1ab --- /dev/null +++ b/CommBank-Server/data/Tags.json @@ -0,0 +1,26 @@ +[{ + "_id": { + "$oid": "62a39d27025ca1ba8f1f1c1e" + }, + "Name": "Groceries" +},{ + "_id": { + "$oid": "62a39d42025ca1ba8f1f1c1f" + }, + "Name": "Restaurant" +},{ + "_id": { + "$oid": "62a39d4e025ca1ba8f1f1c20" + }, + "Name": "Income" +},{ + "_id": { + "$oid": "62a39d5a025ca1ba8f1f1c21" + }, + "Name": "Gas" +},{ + "_id": { + "$oid": "62a39d63025ca1ba8f1f1c22" + }, + "Name": "Investment" +}] \ No newline at end of file diff --git a/CommBank-Server/data/Transactions.json b/CommBank-Server/data/Transactions.json new file mode 100644 index 0000000..9320984 --- /dev/null +++ b/CommBank-Server/data/Transactions.json @@ -0,0 +1,310 @@ +[ + { + "_id": { + "$oid": "62a3a284d07648900df72860" + }, + "TransactionType": "Debit", + "Amount": 135.39, + "DateTime": { + "$date": { + "$numberLong": "1654891140391" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d27025ca1ba8f1f1c1e" + } + ], + "Description": "Whole Foods", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a2ded07648900df72861" + }, + "TransactionType": "Debit", + "Amount": 139.26, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d27025ca1ba8f1f1c1e" + } + ], + "Description": "Whole Foods", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a2ebd07648900df72862" + }, + "TransactionType": "Debit", + "Amount": 26.39, + "DateTime": { + "$date": { + "$numberLong": "1654891243091" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d42025ca1ba8f1f1c1f" + } + ], + "Description": "Chipotle", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a2ecd07648900df72863" + }, + "TransactionType": "Debit", + "Amount": 21.9, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d42025ca1ba8f1f1c1f" + } + ], + "Description": "Chipotle", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a316d07648900df72864" + }, + "TransactionType": "Credit", + "Amount": 5622.81, + "DateTime": { + "$date": { + "$numberLong": "1654891286080" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d4e025ca1ba8f1f1c20" + } + ], + "Description": "Dropbox", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a318d07648900df72865" + }, + "TransactionType": "Credit", + "Amount": 5622.92, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d4e025ca1ba8f1f1c20" + } + ], + "Description": "Dropbox", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a323d07648900df72866" + }, + "TransactionType": "Credit", + "Amount": 1439.18, + "DateTime": { + "$date": { + "$numberLong": "1654891299481" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d4e025ca1ba8f1f1c20" + } + ], + "Description": "Fencer", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a324d07648900df72867" + }, + "TransactionType": "Credit", + "Amount": 1439.89, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d4e025ca1ba8f1f1c20" + } + ], + "Description": "Fencer", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a337d07648900df72868" + }, + "TransactionType": "Debit", + "Amount": 44.52, + "DateTime": { + "$date": { + "$numberLong": "1654891319411" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d5a025ca1ba8f1f1c21" + } + ], + "Description": "Gas", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a338d07648900df72869" + }, + "TransactionType": "Debit", + "Amount": 44.13, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d5a025ca1ba8f1f1c21" + } + ], + "Description": "Gas", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a344d07648900df7286a" + }, + "TransactionType": "Debit", + "Amount": 1500, + "DateTime": { + "$date": { + "$numberLong": "1654891332111" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d63025ca1ba8f1f1c22" + } + ], + "Description": "Coinbase", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a344d07648900df7286b" + }, + "TransactionType": "Debit", + "Amount": 1500, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d63025ca1ba8f1f1c22" + } + ], + "Description": "Coinbase", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a348d07648900df7286c" + }, + "TransactionType": "Debit", + "Amount": 1500, + "DateTime": { + "$date": { + "$numberLong": "1654891336929" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d63025ca1ba8f1f1c22" + } + ], + "Description": "Titan", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + }, + { + "_id": { + "$oid": "62a3a349d07648900df7286d" + }, + "TransactionType": "Debit", + "Amount": 1500, + "DateTime": { + "$date": { + "$numberLong": "1654027230566" + } + }, + "GoalId": null, + "TagIds": [ + { + "$oid": "62a39d63025ca1ba8f1f1c22" + } + ], + "Description": "Titan", + "UserId": { + "$oid": "62a29c15f4605c4c9fa7f306" + } + } +] \ No newline at end of file diff --git a/CommBank-Server/data/Users.json b/CommBank-Server/data/Users.json new file mode 100644 index 0000000..aa8243c --- /dev/null +++ b/CommBank-Server/data/Users.json @@ -0,0 +1,69 @@ +[ + { + "_id": { + "$oid": "62a29c15f4605c4c9fa7f306" + }, + "Name": "Tag Ramotar", + "Email": "tag@dropbox.com", + "Password": "$2a$11$10VhY5XIwBeWA4uLIE.sr.c34UvwLRQPD8yy7z/4iiN6ez5z2Pg1S", + "AccountIds": null, + "GoalIds": [ + { + "$oid": "62a3f587102e921da1253d32" + }, + { + "$oid": "62a3f5e0102e921da1253d33" + }, + { + "$oid": "62a3f62e102e921da1253d34" + }, + { + "$oid": "62a61945fa15f1cd18516a5f" + } + ], + "TransactionIds": [ + { + "$oid": "62a3a284d07648900df72860" + }, + { + "$oid": "62a3a2ded07648900df72861" + }, + { + "$oid": "62a3a2ebd07648900df72862" + }, + { + "$oid": "62a3a2ebd07648900df72863" + }, + { + "$oid": "62a3a2ebd07648900df72864" + }, + { + "$oid": "62a3a2ebd07648900df72865" + }, + { + "$oid": "62a3a2ebd07648900df72866" + }, + { + "$oid": "62a3a2ebd07648900df72867" + }, + { + "$oid": "62a3a2ebd07648900df72868" + }, + { + "$oid": "62a3a2ebd07648900df72869" + }, + { + "$oid": "62a3a344d07648900df7286a" + }, + { + "$oid": "62a3a344d07648900df7286b" + }, + { + "$oid": "62a3a348d07648900df7286c" + }, + { + "$oid": "62a3a349d07648900df7286d" + } + ] + } +] \ No newline at end of file diff --git a/CommBank.Tests/GoalControllerTests.cs b/CommBank.Tests/GoalControllerTests.cs index 8380181..a4888d6 100644 --- a/CommBank.Tests/GoalControllerTests.cs +++ b/CommBank.Tests/GoalControllerTests.cs @@ -66,9 +66,30 @@ 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; + + // Request goals for the first user + var userId = users[0].Id!; + var result = await controller.GetForUser(userId); + // Assert + Assert.NotNull(result); + + if (result != null) + { + foreach (Goal goal in result) + { + Assert.IsAssignableFrom(goal); + Assert.Equal(userId, goal.UserId); + } + } } -} \ No newline at end of file +} diff --git a/response.json b/response.json new file mode 100644 index 0000000..acecf87 --- /dev/null +++ b/response.json @@ -0,0 +1 @@ +[{"id":"62a3f5e0102e921da1253d33","name":"Tesla Model Y","targetAmount":60000,"targetDate":"2022-09-01T04:00:00Z","balance":43840.02,"created":"2022-06-11T01:54:40.95Z","transactionIds":null,"tagIds":null,"userId":"62a29c15f4605c4c9fa7f306","icon":"\uD83D\uDE97"},{"id":"62a3f62e102e921da1253d34","name":"Trip to London","targetAmount":3500,"targetDate":"2022-08-02T04:00:00Z","balance":753.89,"created":"2022-06-11T01:55:58.236Z","transactionIds":null,"tagIds":null,"userId":"62a29c15f4605c4c9fa7f306","icon":"\uD83C\uDFA1"},{"id":"62a3f587102e921da1253d32","name":"House Down Payment","targetAmount":100000,"targetDate":"2025-01-08T05:00:00Z","balance":73501.82,"created":"2022-06-11T01:53:10.857Z","transactionIds":null,"tagIds":null,"userId":"62a29c15f4605c4c9fa7f306","icon":"\uD83E\uDD3A"},{"id":"62a61945fa15f1cd18516a5f","name":"Trip to NYC","targetAmount":800,"targetDate":"2023-12-10T05:00:00Z","balance":0,"created":"2022-06-12T16:57:45.668Z","transactionIds":null,"tagIds":null,"userId":"62a29c15f4605c4c9fa7f306","icon":"\uD83D\uDDFD"}] \ No newline at end of file