Merge branch 'main' into N21-1029-renaming-of-collections

.eslintrc.js

@@ -65,22 +65,24 @@ module.exports = {
 	overrides: [
 		{
 			files: ['apps/**/*.ts'],
+			env: {
+				node: true,
+				es6: true,
+			},
 			parser: '@typescript-eslint/parser',
-			plugins: ['@typescript-eslint/eslint-plugin'],
+			parserOptions: {
+				project: 'apps/server/tsconfig.lint.json',
+				sourceType: 'module',
+			},
+			plugins: ['@typescript-eslint/eslint-plugin', 'import'],
 			extends: [
 				'airbnb-typescript/base',
 				'plugin:@typescript-eslint/recommended',
 				'plugin:@typescript-eslint/recommended-requiring-type-checking',
 				'prettier',
 				'plugin:promise/recommended',
+				'plugin:import/typescript',
 			],
-			parserOptions: {
-				project: 'apps/server/tsconfig.lint.json',
-			},
-			env: {
-				node: true,
-				es6: true,
-			},
 			rules: {
 				'import/no-unresolved': 'off', // better handled by ts resolver
 				'import/no-extraneous-dependencies': 'off', // better handles by ts resolver
@@ -98,6 +100,17 @@ module.exports = {
 						allowSingleExtends: true,
 					},
 				],
+				'@typescript-eslint/no-restricted-imports': [
+					'warn',
+					{
+						patterns: [
+							{
+								group: ['@infra/*/*', '@modules/*/*', '!*.module'],
+								message: 'Do not deep import from a module',
+							},
+						],
+					},
+				],
 			},
 			overrides: [
 				{

apps/server/src/apps/server.app.ts

@@ -7,7 +7,7 @@ import { ExpressAdapter } from '@nestjs/platform-express';
 import { enableOpenApiDocs } from '@shared/controller/swagger';
 import { Mail, MailService } from '@infra/mail';
 import { LegacyLogger, Logger } from '@src/core/logger';
-import { AccountService } from '@modules/account/services/account.service';
+import { AccountService } from '@modules/account';
 import { TeamService } from '@modules/teams/service/team.service';
 import { AccountValidationService } from '@modules/account/services/account.validation.service';
 import { AccountUc } from '@modules/account/uc/account.uc';

apps/server/src/modules/account/index.ts

@@ -1,3 +1,3 @@
 export * from './account.module';
 export * from './account-config';
-export { AccountService } from './services';
+export { AccountService, AccountDto } from './services';

apps/server/src/modules/account/services/index.ts

@@ -1 +1,2 @@
 export * from './account.service';
+export { AccountDto } from './dto';

apps/server/src/modules/user/service/user.service.spec.ts

@@ -7,12 +7,11 @@ import { UserDO } from '@shared/domain/domainobject/user.do';
 import { UserRepo } from '@shared/repo';
 import { UserDORepo } from '@shared/repo/user/user-do.repo';
 import { roleFactory, setupEntities, userDoFactory, userFactory } from '@shared/testing';
-import { AccountService } from '@modules/account/services/account.service';
-import { AccountDto } from '@modules/account/services/dto';
-import { RoleService } from '@modules/role/service/role.service';
-import { UserService } from '@modules/user/service/user.service';
-import { UserDto } from '@modules/user/uc/dto/user.dto';
+import { AccountService, AccountDto } from '@modules/account';
+import { RoleService } from '@modules/role';
 import { OauthCurrentUser } from '@modules/authentication/interface';
+import { UserDto } from '../uc/dto/user.dto';
+import { UserService } from './user.service';
 import { UserQuery } from './user-query.type';
 
 describe('UserService', () => {