feat: TT-188 add & remove groups to user service

src/app/modules/users/models/users.ts

@@ -7,3 +7,8 @@ export interface User {
   tenant_id?: string;
   deleted?: string;
 }
+
+export interface UserState extends User {
+  isLoading: boolean;
+  error: string;
+}

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

@@ -52,22 +52,38 @@ describe('UsersService', () => {
     expect(grantRoleRequest.request.method).toBe('POST');
   });
 
+<<<<<<< HEAD
   it('add user to group', () => {
+=======
+  it('add group to a User', () => {
+>>>>>>> feat: TT-188 add & remove groups to user service
     const userId = 'userId';
     const group = 'admin';
     const addGroupURL = `${service.baseUrl}/${userId}/groups/add`;
 
+<<<<<<< HEAD
     service.addUserToGroup(userId, group).subscribe();
+=======
+    service.addGroupToUser(userId, group).subscribe();
+>>>>>>> feat: TT-188 add & remove groups to user service
 
     expect(httpMock.expectOne(addGroupURL).request.method).toBe('POST');
   });
 
+<<<<<<< HEAD
   it('remove user from group', () => {
+=======
+  it('remove group to a User', () => {
+>>>>>>> feat: TT-188 add & remove groups to user service
     const userId = 'userId';
     const group = 'admin';
     const removeGroupURL = `${service.baseUrl}/${userId}/groups/remove`;
 
+<<<<<<< HEAD
     service.removeUserFromGroup(userId, group).subscribe();
+=======
+    service.removeGroupToUser(userId, group).subscribe();
+>>>>>>> feat: TT-188 add & remove groups to user service
 
     expect(httpMock.expectOne(removeGroupURL).request.method).toBe('POST');
   });

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

@@ -25,13 +25,21 @@ export class UsersService {
     return this.http.post(url, null);
   }
 
+<<<<<<< HEAD
   addUserToGroup(userId: string, group: string): Observable<User> {
+=======
+  addGroupToUser(userId: string, group: string): Observable<User> {
+>>>>>>> feat: TT-188 add & remove groups to user service
     return this.http.post<User>(`${this.baseUrl}/${userId}/groups/add`, {
       group_name: group,
     });
   }
 
+<<<<<<< HEAD
   removeUserFromGroup(userId: string, group: string): Observable<User> {
+=======
+  removeGroupToUser(userId: string, group: string): Observable<User> {
+>>>>>>> feat: TT-188 add & remove groups to user service
     return this.http.post<User>(`${this.baseUrl}/${userId}/groups/remove`, {
       group_name: group,
     });