Skip to content

Commit b00baf9

Browse files
thegreatyamorithegreatyamori
committed
refactor: TT-188 refactor some names
1 parent e1e94f1 commit b00baf9

File tree

8 files changed

+108
-108
lines changed

8 files changed

+108
-108
lines changed

‎src/app/modules/users/services/users.service.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('UsersService', () => {
5757
const group = 'admin';
5858
const addGroupURL = `${service.baseUrl}/${userId}/groups/add`;
5959

60-
service.addGroupToUser(userId, group).subscribe();
60+
service.addUserToGroup(userId, group).subscribe();
6161

6262
expect(httpMock.expectOne(addGroupURL).request.method).toBe('POST');
6363
});
@@ -67,7 +67,7 @@ describe('UsersService', () => {
6767
const group = 'admin';
6868
const removeGroupURL = `${service.baseUrl}/${userId}/groups/remove`;
6969

70-
service.removeGroupToUser(userId, group).subscribe();
70+
service.removeUserToGroup(userId, group).subscribe();
7171

7272
expect(httpMock.expectOne(removeGroupURL).request.method).toBe('POST');
7373
});

‎src/app/modules/users/services/users.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ export class UsersService {
2525
return this.http.post(url, null);
2626
}
2727

28-
addGroupToUser(userId: string, group: string): Observable<User> {
28+
addUserToGroup(userId: string, group: string): Observable<User> {
2929
return this.http.post<User>(`${this.baseUrl}/${userId}/groups/add`, {
3030
group_name: group,
3131
});
3232
}
3333

34-
removeGroupToUser(userId: string, group: string): Observable<User> {
34+
removeUserToGroup(userId: string, group: string): Observable<User> {
3535
return this.http.post<User>(`${this.baseUrl}/${userId}/groups/remove`, {
3636
group_name: group,
3737
});

‎src/app/modules/users/store/user.actions.spec.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,45 +53,45 @@ describe('UserActions', () => {
5353
expect(action.type).toEqual(actions.UserActionTypes.REVOKE_USER_ROLE_FAIL);
5454
});
5555

56-
it('AddGroupToUser type is UserActionTypes.ADD_GROUP_TO_USER', () => {
56+
it('AddUserToGroup type is UserActionTypes.ADD_USER_TO_GROUP', () => {
5757
const userId = 'userId';
5858
const groupName = 'groupName';
59-
const action = new actions.AddGroupToUser(userId, groupName);
59+
const action = new actions.AddUserToGroup(userId, groupName);
6060

61-
expect(action.type).toEqual(actions.UserActionTypes.ADD_GROUP_TO_USER);
61+
expect(action.type).toEqual(actions.UserActionTypes.ADD_USER_TO_GROUP);
6262
});
6363

64-
it('AddGroupToUserSuccess type is UserActionTypes.ADD_GROUP_TO_USER_SUCCESS', () => {
64+
it('AddUserToGroupSuccess type is UserActionTypes.ADD_USER_TO_GROUP_SUCCESS', () => {
6565
const payload: User = { id: 'id', email: 'email', name: 'name' };
66-
const action = new actions.AddGroupToUserSuccess(payload);
66+
const action = new actions.AddUserToGroupSuccess(payload);
6767

68-
expect(action.type).toEqual(actions.UserActionTypes.ADD_GROUP_TO_USER_SUCCESS);
68+
expect(action.type).toEqual(actions.UserActionTypes.ADD_USER_TO_GROUP_SUCCESS);
6969
});
7070

71-
it('AddGroupToUserFail type is UserActionTypes.ADD_GROUP_TO_USER_FAIL', () => {
72-
const action = new actions.AddGroupToUserFail('error');
71+
it('AddUserToGroupFail type is UserActionTypes.ADD_USER_TO_GROUP_FAIL', () => {
72+
const action = new actions.AddUserToGroupFail('error');
7373

74-
expect(action.type).toEqual(actions.UserActionTypes.ADD_GROUP_TO_USER_FAIL);
74+
expect(action.type).toEqual(actions.UserActionTypes.ADD_USER_TO_GROUP_FAIL);
7575
});
7676

77-
it('RemoveGroupToUser type is UserActionTypes.REMOVE_GROUP_TO_USER', () => {
77+
it('RemoveUserToGroup type is UserActionTypes.REMOVE_USER_TO_GROUP', () => {
7878
const userId = 'userId';
7979
const groupName = 'groupName';
80-
const action = new actions.RemoveGroupToUser(userId, groupName);
80+
const action = new actions.RemoveUserToGroup(userId, groupName);
8181

82-
expect(action.type).toEqual(actions.UserActionTypes.REMOVE_GROUP_TO_USER);
82+
expect(action.type).toEqual(actions.UserActionTypes.REMOVE_USER_TO_GROUP);
8383
});
8484

85-
it('RemoveGroupToUserSuccess type is UserActionTypes.REMOVE_GROUP_TO_USER_SUCCESS', () => {
85+
it('RemoveUserToGroupSuccess type is UserActionTypes.REMOVE_USER_TO_GROUP_SUCCESS', () => {
8686
const payload: User = { id: 'id', email: 'email', name: 'name' };
87-
const action = new actions.RemoveGroupToUserSuccess(payload);
87+
const action = new actions.RemoveUserToGroupSuccess(payload);
8888

89-
expect(action.type).toEqual(actions.UserActionTypes.REMOVE_GROUP_TO_USER_SUCCESS);
89+
expect(action.type).toEqual(actions.UserActionTypes.REMOVE_USER_TO_GROUP_SUCCESS);
9090
});
9191

92-
it('RemoveGroupToUserFail type is UserActionTypes.REMOVE_GROUP_TO_USER_FAIL', () => {
93-
const action = new actions.RemoveGroupToUserFail('error');
92+
it('RemoveUserToGroupFail type is UserActionTypes.REMOVE_USER_TO_GROUP_FAIL', () => {
93+
const action = new actions.RemoveUserToGroupFail('error');
9494

95-
expect(action.type).toEqual(actions.UserActionTypes.REMOVE_GROUP_TO_USER_FAIL);
95+
expect(action.type).toEqual(actions.UserActionTypes.REMOVE_USER_TO_GROUP_FAIL);
9696
});
9797
});

‎src/app/modules/users/store/user.actions.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ export enum UserActionTypes {
1111
REVOKE_USER_ROLE = '[User] REVOKE_USER_ROLE',
1212
REVOKE_USER_ROLE_SUCCESS = '[User] REVOKE_USER_ROLE_SUCCESS',
1313
REVOKE_USER_ROLE_FAIL = '[User] REVOKE_USER_ROLE_FAIL',
14-
ADD_GROUP_TO_USER = '[User] ADD_GROUP_TO_USER',
15-
ADD_GROUP_TO_USER_SUCCESS = '[User] ADD_GROUP_TO_USER_SUCCESS',
16-
ADD_GROUP_TO_USER_FAIL = '[User] ADD_GROUP_TO_USER_FAIL',
17-
REMOVE_GROUP_TO_USER = '[User] REMOVE_GROUP_TO_USER',
18-
REMOVE_GROUP_TO_USER_SUCCESS = '[User] REMOVE_GROUP_TO_USER_SUCCESS',
19-
REMOVE_GROUP_TO_USER_FAIL = '[User] REMOVE_GROUP_TO_USER_FAIL',
14+
ADD_USER_TO_GROUP = '[User] ADD_USER_TO_GROUP',
15+
ADD_USER_TO_GROUP_SUCCESS = '[User] ADD_USER_TO_GROUP_SUCCESS',
16+
ADD_USER_TO_GROUP_FAIL = '[User] ADD_USER_TO_GROUP_FAIL',
17+
REMOVE_USER_TO_GROUP = '[User] REMOVE_USER_TO_GROUP',
18+
REMOVE_USER_TO_GROUP_SUCCESS = '[User] REMOVE_USER_TO_GROUP_SUCCESS',
19+
REMOVE_USER_TO_GROUP_FAIL = '[User] REMOVE_USER_TO_GROUP_FAIL',
2020
DEFAULT_USER = '[USER] DEFAULT_USER',
2121
}
2222

@@ -64,33 +64,33 @@ export class RevokeRoleUserFail implements Action {
6464
constructor(public error: string) {}
6565
}
6666

67-
export class AddGroupToUser implements Action {
68-
public readonly type = UserActionTypes.ADD_GROUP_TO_USER;
67+
export class AddUserToGroup implements Action {
68+
public readonly type = UserActionTypes.ADD_USER_TO_GROUP;
6969
constructor(public userId: string, public groupName: string) {}
7070
}
7171

72-
export class AddGroupToUserSuccess implements Action {
73-
public readonly type = UserActionTypes.ADD_GROUP_TO_USER_SUCCESS;
72+
export class AddUserToGroupSuccess implements Action {
73+
public readonly type = UserActionTypes.ADD_USER_TO_GROUP_SUCCESS;
7474
constructor(readonly payload: User) {}
7575
}
7676

77-
export class AddGroupToUserFail implements Action {
78-
public readonly type = UserActionTypes.ADD_GROUP_TO_USER_FAIL;
77+
export class AddUserToGroupFail implements Action {
78+
public readonly type = UserActionTypes.ADD_USER_TO_GROUP_FAIL;
7979
constructor(public error: string) {}
8080
}
8181

82-
export class RemoveGroupToUser implements Action {
83-
public readonly type = UserActionTypes.REMOVE_GROUP_TO_USER;
82+
export class RemoveUserToGroup implements Action {
83+
public readonly type = UserActionTypes.REMOVE_USER_TO_GROUP;
8484
constructor(public userId: string, public groupName: string) {}
8585
}
8686

87-
export class RemoveGroupToUserSuccess implements Action {
88-
public readonly type = UserActionTypes.REMOVE_GROUP_TO_USER_SUCCESS;
87+
export class RemoveUserToGroupSuccess implements Action {
88+
public readonly type = UserActionTypes.REMOVE_USER_TO_GROUP_SUCCESS;
8989
constructor(readonly payload: User) {}
9090
}
9191

92-
export class RemoveGroupToUserFail implements Action {
93-
public readonly type = UserActionTypes.REMOVE_GROUP_TO_USER_FAIL;
92+
export class RemoveUserToGroupFail implements Action {
93+
public readonly type = UserActionTypes.REMOVE_USER_TO_GROUP_FAIL;
9494
constructor(public error: string) {}
9595
}
9696

@@ -109,9 +109,9 @@ export type UserActions =
109109
| RevokeRoleUser
110110
| RevokeRoleUserSuccess
111111
| RevokeRoleUserFail
112-
| AddGroupToUser
113-
| AddGroupToUserSuccess
114-
| AddGroupToUserFail
115-
| RemoveGroupToUser
116-
| RemoveGroupToUserSuccess
117-
| RemoveGroupToUserFail;
112+
| AddUserToGroup
113+
| AddUserToGroupSuccess
114+
| AddUserToGroupFail
115+
| RemoveUserToGroup
116+
| RemoveUserToGroupSuccess
117+
| RemoveUserToGroupFail;

‎src/app/modules/users/store/user.effects.spec.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,75 +106,75 @@ describe('UserEffects', () => {
106106
});
107107
});
108108

109-
it('action type is ADD_GROUP_TO_USER_SUCCESS when service is executed sucessfully', async () => {
109+
it('action type is ADD_USER_TO_GROUP_SUCCESS when service is executed sucessfully', async () => {
110110
const userId = 'userId';
111111
const groupName = 'groupName';
112112
actions$ = of({
113-
type: UserActionTypes.ADD_GROUP_TO_USER,
113+
type: UserActionTypes.ADD_USER_TO_GROUP,
114114
userId,
115115
groupName,
116116
});
117117

118118
spyOn(toastrService, 'success');
119-
spyOn(service, 'addGroupToUser').and.returnValue(of(user));
119+
spyOn(service, 'addUserToGroup').and.returnValue(of(user));
120120

121-
effects.addGroupToUser$.subscribe((action) => {
122-
expect(toastrService.success).toHaveBeenCalledWith('Add group to a user success');
123-
expect(action.type).toEqual(UserActionTypes.ADD_GROUP_TO_USER_SUCCESS);
121+
effects.addUserToGroup$.subscribe((action) => {
122+
expect(toastrService.success).toHaveBeenCalledWith('Add user to group success');
123+
expect(action.type).toEqual(UserActionTypes.ADD_USER_TO_GROUP_SUCCESS);
124124
});
125125
});
126126

127-
it('action type is ADD_GROUP_TO_USER_FAIL when service is executed and fail', async () => {
127+
it('action type is ADD_USER_TO_GROUP_FAIL when service is executed and fail', async () => {
128128
const userId = 'userId';
129129
const groupName = 'groupName';
130130
actions$ = of({
131-
type: UserActionTypes.ADD_GROUP_TO_USER,
131+
type: UserActionTypes.ADD_USER_TO_GROUP,
132132
userId,
133133
groupName,
134134
});
135135

136136
spyOn(toastrService, 'error');
137-
spyOn(service, 'addGroupToUser').and.returnValue(throwError({ error: { message: 'error' } }));
137+
spyOn(service, 'addUserToGroup').and.returnValue(throwError({ error: { message: 'error' } }));
138138

139-
effects.addGroupToUser$.subscribe((action) => {
139+
effects.addUserToGroup$.subscribe((action) => {
140140
expect(toastrService.error).toHaveBeenCalled();
141-
expect(action.type).toEqual(UserActionTypes.ADD_GROUP_TO_USER_FAIL);
141+
expect(action.type).toEqual(UserActionTypes.ADD_USER_TO_GROUP_FAIL);
142142
});
143143
});
144144

145-
it('action type is REMOVE_GROUP_TO_USER_SUCCESS when service is executed succesfully', async () => {
145+
it('action type is REMOVE_USER_TO_GROUP_SUCCESS when service is executed succesfully', async () => {
146146
const userId = 'userId';
147147
const groupName = 'groupName';
148148
actions$ = of({
149-
type: UserActionTypes.REMOVE_GROUP_TO_USER,
149+
type: UserActionTypes.REMOVE_USER_TO_GROUP,
150150
userId,
151151
groupName,
152152
});
153153

154154
spyOn(toastrService, 'success');
155-
spyOn(service, 'removeGroupToUser').and.returnValue(of(user));
155+
spyOn(service, 'removeUserToGroup').and.returnValue(of(user));
156156

157-
effects.removeGroupToUser$.subscribe((action) => {
158-
expect(toastrService.success).toHaveBeenCalledWith('Remove group to a user success');
159-
expect(action.type).toEqual(UserActionTypes.REMOVE_GROUP_TO_USER_SUCCESS);
157+
effects.removeUserToGroup$.subscribe((action) => {
158+
expect(toastrService.success).toHaveBeenCalledWith('Remove user to group success');
159+
expect(action.type).toEqual(UserActionTypes.REMOVE_USER_TO_GROUP_SUCCESS);
160160
});
161161
});
162162

163-
it('action type is REMOVE_GROUP_TO_USER_FAIL when service is executed succesfully', async () => {
163+
it('action type is REMOVE_USER_TO_GROUP_FAIL when service is executed succesfully', async () => {
164164
const userId = 'userId';
165165
const groupName = 'groupName';
166166
actions$ = of({
167-
type: UserActionTypes.REMOVE_GROUP_TO_USER,
167+
type: UserActionTypes.REMOVE_USER_TO_GROUP,
168168
userId,
169169
groupName,
170170
});
171171

172172
spyOn(toastrService, 'error');
173-
spyOn(service, 'removeGroupToUser').and.returnValue(throwError({ error: { message: 'error' } }));
173+
spyOn(service, 'removeUserToGroup').and.returnValue(throwError({ error: { message: 'error' } }));
174174

175-
effects.removeGroupToUser$.subscribe((action) => {
175+
effects.removeUserToGroup$.subscribe((action) => {
176176
expect(toastrService.error).toHaveBeenCalled();
177-
expect(action.type).toEqual(UserActionTypes.REMOVE_GROUP_TO_USER_FAIL);
177+
expect(action.type).toEqual(UserActionTypes.REMOVE_USER_TO_GROUP_FAIL);
178178
});
179179
});
180180
});

‎src/app/modules/users/store/user.effects.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,36 +65,36 @@ export class UserEffects {
6565
);
6666

6767
@Effect()
68-
addGroupToUser$: Observable<Action> = this.actions$.pipe(
69-
ofType(actions.UserActionTypes.ADD_GROUP_TO_USER),
70-
map((action: actions.AddGroupToUser) => action),
68+
addUserToGroup$: Observable<Action> = this.actions$.pipe(
69+
ofType(actions.UserActionTypes.ADD_USER_TO_GROUP),
70+
map((action: actions.AddUserToGroup) => action),
7171
mergeMap((action) =>
72-
this.userService.addGroupToUser(action.userId, action.groupName).pipe(
72+
this.userService.addUserToGroup(action.userId, action.groupName).pipe(
7373
map((response) => {
74-
this.toastrService.success('Add group to a user success');
75-
return new actions.AddGroupToUserSuccess(response);
74+
this.toastrService.success('Add user to group success');
75+
return new actions.AddUserToGroupSuccess(response);
7676
}),
7777
catchError((error) => {
7878
this.toastrService.error(error.error.message);
79-
return of(new actions.AddGroupToUserFail(error));
79+
return of(new actions.AddUserToGroupFail(error));
8080
})
8181
)
8282
)
8383
);
8484

8585
@Effect()
86-
removeGroupToUser$: Observable<Action> = this.actions$.pipe(
87-
ofType(actions.UserActionTypes.REMOVE_GROUP_TO_USER),
88-
map((action: actions.RemoveGroupToUser) => action),
86+
removeUserToGroup$: Observable<Action> = this.actions$.pipe(
87+
ofType(actions.UserActionTypes.REMOVE_USER_TO_GROUP),
88+
map((action: actions.RemoveUserToGroup) => action),
8989
mergeMap((action) =>
90-
this.userService.removeGroupToUser(action.userId, action.groupName).pipe(
90+
this.userService.removeUserToGroup(action.userId, action.groupName).pipe(
9191
map((response) => {
92-
this.toastrService.success('Remove group to a user success');
93-
return new actions.RemoveGroupToUserSuccess(response);
92+
this.toastrService.success('Remove user to group success');
93+
return new actions.RemoveUserToGroupSuccess(response);
9494
}),
9595
catchError((error) => {
9696
this.toastrService.error(error.error.message);
97-
return of(new actions.RemoveGroupToUserFail(error));
97+
return of(new actions.RemoveUserToGroupFail(error));
9898
})
9999
)
100100
)

0 commit comments

Comments
 (0)