Merge pull request #198 from crupest/back-dev

Refactor back end.

1 files changed, 12 insertions, 6 deletions

diff --git a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
index 00164835..7b9a992f 100644
--- a/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
+++ b/BackEnd/Timeline.Tests/Helpers/TestDatabase.cs
@@ -33,16 +33,22 @@ namespace Timeline.Tests.Helpers
                 {

                     Key = JwtTokenGenerateHelper.GenerateKey()

                 });

+

                 await context.SaveChangesAsync();

 

-                if (_createUser)

-                {

-                    var passwordService = new PasswordService();

-                    var userService = new UserService(NullLogger<UserService>.Instance, context, passwordService, new UserPermissionService(context), new Clock());

+                var passwordService = new PasswordService();

+                var userService = new UserService(NullLogger<UserService>.Instance, context, passwordService, new Clock());

 

-                    var admin = await userService.CreateUser("admin", "adminpw");

-                    await userService.ModifyUser(admin.Id, new ModifyUserParams() { Nickname = "administrator" });

+                var admin = await userService.CreateUser("admin", "adminpw");

+                await userService.ModifyUser(admin.Id, new ModifyUserParams() { Nickname = "administrator" });

 

+                admin.Permissions.Add(new UserPermissionEntity { Permission = UserPermission.AllTimelineManagement.ToString() });

+                admin.Permissions.Add(new UserPermissionEntity { Permission = UserPermission.HighlightTimelineManagement.ToString() });

+                admin.Permissions.Add(new UserPermissionEntity { Permission = UserPermission.UserManagement.ToString() });

+                await context.SaveChangesAsync();

+

+                if (_createUser)

+                {

                     var user = await userService.CreateUser("user", "userpw");

                     await userService.ModifyUser(user.Id, new ModifyUserParams() { Nickname = "imuser" });

                 }