diff --git a/api/lib/domain/usecases/get-user-details-for-admin.js b/api/lib/domain/usecases/get-user-details-for-admin.js deleted file mode 100644 index 021a445c0c1..00000000000 --- a/api/lib/domain/usecases/get-user-details-for-admin.js +++ /dev/null @@ -1,5 +0,0 @@ -const getUserDetailsForAdmin = async function ({ userId, userRepository }) { - return await userRepository.getUserDetailsForAdmin(userId); -}; - -export { getUserDetailsForAdmin }; diff --git a/api/src/identity-access-management/application/user/user.admin.controller.js b/api/src/identity-access-management/application/user/user.admin.controller.js index ceeb7c70b68..eacbc3e5829 100644 --- a/api/src/identity-access-management/application/user/user.admin.controller.js +++ b/api/src/identity-access-management/application/user/user.admin.controller.js @@ -1,4 +1,3 @@ -import { usecases as libUsecases } from '../../../../lib/domain/usecases/index.js'; import { usecases } from '../../domain/usecases/index.js'; import * as userDetailsForAdminSerializer from '../../infrastructure/serializers/jsonapi/user-details-for-admin.serializer.js'; import * as userForAdminSerializer from '../../infrastructure/serializers/jsonapi/user-for-admin.serializer.js'; @@ -59,7 +58,7 @@ const updateUserDetailsByAdmin = async function (request, h, dependencies = { us */ const getUserDetails = async function (request, h, dependencies = { userDetailsForAdminSerializer }) { const userId = request.params.id; - const userDetailsForAdmin = await libUsecases.getUserDetailsForAdmin({ userId }); + const userDetailsForAdmin = await usecases.getUserDetailsForAdmin({ userId }); return dependencies.userDetailsForAdminSerializer.serialize(userDetailsForAdmin); }; diff --git a/api/src/identity-access-management/domain/usecases/get-user-details-for-admin.js b/api/src/identity-access-management/domain/usecases/get-user-details-for-admin.js new file mode 100644 index 00000000000..60239687208 --- /dev/null +++ b/api/src/identity-access-management/domain/usecases/get-user-details-for-admin.js @@ -0,0 +1,12 @@ +/** + * @param {Object} params + * @param {string} params.userId + * @param {UserRepository} userRepository + * @throws UserNotFoundError + * @returns {Promise} + */ +const getUserDetailsForAdmin = async function ({ userId, userRepository }) { + return await userRepository.getUserDetailsForAdmin(userId); +}; + +export { getUserDetailsForAdmin }; diff --git a/api/tests/identity-access-management/unit/application/user/user.admin.controller.test.js b/api/tests/identity-access-management/unit/application/user/user.admin.controller.test.js index 1e0709bd6f2..08b08abb371 100644 --- a/api/tests/identity-access-management/unit/application/user/user.admin.controller.test.js +++ b/api/tests/identity-access-management/unit/application/user/user.admin.controller.test.js @@ -1,4 +1,3 @@ -import { usecases as libUsecases } from '../../../../../lib/domain/usecases/index.js'; import { userAdminController } from '../../../../../src/identity-access-management/application/user/user.admin.controller.js'; import { User } from '../../../../../src/identity-access-management/domain/models/User.js'; import { usecases } from '../../../../../src/identity-access-management/domain/usecases/index.js'; @@ -168,14 +167,14 @@ describe('Unit | Identity Access Management | Application | Controller | Admin | beforeEach(function () { request = { params: { id: 123 } }; - sinon.stub(libUsecases, 'getUserDetailsForAdmin'); + sinon.stub(usecases, 'getUserDetailsForAdmin'); const userDetailsForAdminSerializer = { serialize: sinon.stub() }; dependencies = { userDetailsForAdminSerializer }; }); it('gets the specified user', async function () { // given - libUsecases.getUserDetailsForAdmin.withArgs({ userId: 123 }).resolves('userDetail'); + usecases.getUserDetailsForAdmin.withArgs({ userId: 123 }).resolves('userDetail'); dependencies.userDetailsForAdminSerializer.serialize.withArgs('userDetail').returns('ok'); // when diff --git a/api/tests/unit/domain/usecases/get-user-details-for-admin_test.js b/api/tests/identity-access-management/unit/domain/usecases/get-user-details-for-admin_test.js similarity index 55% rename from api/tests/unit/domain/usecases/get-user-details-for-admin_test.js rename to api/tests/identity-access-management/unit/domain/usecases/get-user-details-for-admin_test.js index c87fdacc8ea..c9277ca2c6a 100644 --- a/api/tests/unit/domain/usecases/get-user-details-for-admin_test.js +++ b/api/tests/identity-access-management/unit/domain/usecases/get-user-details-for-admin_test.js @@ -1,14 +1,14 @@ -import { getUserDetailsForAdmin } from '../../../../lib/domain/usecases/get-user-details-for-admin.js'; -import { expect, sinon } from '../../../test-helper.js'; +import { getUserDetailsForAdmin } from '../../../../../src/identity-access-management/domain/usecases/get-user-details-for-admin.js'; +import { expect, sinon } from '../../../../test-helper.js'; -describe('Unit | UseCase | get-user-details-for-admin', function () { +describe('Unit | Identity Access Management | Domain | UseCase | get-user-details-for-admin', function () { let userRepository; beforeEach(function () { userRepository = { getUserDetailsForAdmin: sinon.stub() }; }); - it('should get the user details in administration context', async function () { + it('gets the user details in administration context', async function () { // given const userId = 1; const expectedUserDetailsForAdmin = { id: userId };