[AAE-6389] Remove duplicated identity user service mock (#7373)

* [AAE-6389] removed duplicate services and refactored existing

* [AAE-6389] improved and moved mocks to proper files

* [AAE-6389] fixed circular dependency

lib/core/services/identity-group.service.spec.ts

@@ -24,20 +24,22 @@ import { IdentityGroupSearchParam } from '../models/identity-group.model';
 import { HttpErrorResponse } from '@angular/common/http';
 import { throwError, of } from 'rxjs';
 import {
-    noRoleMappingApi,
     mockIdentityRoles,
-    groupsMockApi,
-    roleMappingApi,
     clientRoles,
-    applicationDetailsMockApi,
     mockIdentityGroup1,
-    createGroupMappingApi,
-    updateGroupMappingApi,
-    deleteGroupMappingApi,
     mockIdentityGroupsCount
-} from '../mock/identity-group.service.mock';
+} from '../mock/identity-group.mock';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+    applicationDetailsMockApi,
+    createGroupMappingApi,
+    deleteGroupMappingApi,
+    groupsMockApi,
+    noRoleMappingApi,
+    roleMappingApi,
+    updateGroupMappingApi
+} from '../mock/oauth2.service.mock';
 
 describe('IdentityGroupService', () => {
     let service: IdentityGroupService;

lib/core/services/identity-group.service.ts

@@ -210,7 +210,7 @@ export class IdentityGroupService implements IdentityGroupServiceInterface {
     checkGroupHasRole(groupId: string, roleNames: string[]): Observable<boolean>  {
         return this.getGroupRoles(groupId).pipe(map((groupRoles) => {
             let hasRole = false;
-            if (groupRoles && groupRoles.length > 0) {
+            if (groupRoles?.length > 0) {
                 roleNames.forEach((roleName: string) => {
                     const role = groupRoles.find(({ name }) => roleName === name);
                     if (role) {

lib/core/services/identity-user.service.interface.ts

@@ -46,6 +46,7 @@ export interface IdentityJoinGroupRequestModel {
 
 export interface IdentityUserServiceInterface {
     getCurrentUserInfo(): IdentityUserModel;
+    findUserById(id: string): Observable<any>;
     findUsersByName(search: string): Observable<IdentityUserModel[]>;
     findUserByUsername(username: string): Observable<IdentityUserModel[]>;
     findUserByEmail(email: string): Observable<IdentityUserModel[]>;

lib/core/services/identity-user.service.spec.ts

@@ -19,24 +19,12 @@ import { TestBed } from '@angular/core/testing';
 import { HttpErrorResponse } from '@angular/common/http';
 import { throwError, of } from 'rxjs';
 import {
-    queryUsersMockApi,
-    createUserMockApi,
     mockIdentityUser1,
-    updateUserMockApi,
     mockIdentityUser2,
-    deleteUserMockApi,
-    getInvolvedGroupsMockApi,
-    joinGroupMockApi,
-    leaveGroupMockApi,
-    getAvailableRolesMockApi,
-    getAssignedRolesMockApi,
-    getEffectiveRolesMockApi,
-    assignRolesMockApi,
     mockIdentityRole,
-    removeRolesMockApi,
-    mockIdentityUsers,
-    mockJoinGroupRequest
-} from 'core/mock/identity-user.service.mock';
+    mockIdentityUsers
+} from '../mock/identity-user.mock';
+import { mockJoinGroupRequest } from '../mock/identity-group.mock';
 import { IdentityUserService } from '../services/identity-user.service';
 import { setupTestBed } from '../testing/setup-test-bed';
 import { AlfrescoApiService } from './alfresco-api.service';
@@ -44,6 +32,20 @@ import { mockToken } from '../mock/jwt-helper.service.spec';
 import { IdentityRoleModel } from '../models/identity-role.model';
 import { CoreTestingModule } from '../testing/core.testing.module';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+    assignRolesMockApi,
+    createUserMockApi,
+    deleteUserMockApi,
+    getAssignedRolesMockApi,
+    getAvailableRolesMockApi,
+    getEffectiveRolesMockApi,
+    getInvolvedGroupsMockApi,
+    joinGroupMockApi,
+    leaveGroupMockApi,
+    queryUsersMockApi,
+    removeRolesMockApi,
+    updateUserMockApi
+} from '../mock/oauth2.service.mock';
 
 describe('IdentityUserService', () => {