Merge pull request #18 from cieslarmichal/feature/remove-da

remove domain actions & refactor
cieslarmichal · Feb 28, 2024 · d4c7f64 · d4c7f64
2 parents 8ce4fb5 + b63ddc8
commit d4c7f64
Show file tree

Hide file tree

Showing 61 changed files with 508 additions and 1,144 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,6 @@ jobs:
       - run: npm ci
       - run: npm run build:dev
       - run: npm run test:unit
-      - run: docker-compose -f docker-compose.dev.yml up -d
+      - run: docker-compose up -d
       - run: npm run test:integration
       # - run: NODE_ENV=ci npm run test:e2e
diff --git a/apps/backend/src/common/types/databaseTable.ts b/apps/backend/src/common/types/databaseTable.ts
@@ -1,4 +1,3 @@
-export interface DatabaseTable<Entity> {
+export interface DatabaseTable {
   readonly name: string;
-  readonly columns: Record<keyof Entity, string>;
 }
diff --git a/apps/backend/src/libs/database/types/queryBuilder.ts b/apps/backend/src/libs/database/types/queryBuilder.ts
diff --git a/...andlers/deleteResourceCommandHandler/deleteResourceCommandHandlerImpl.integration.test.ts b/...andlers/deleteResourceCommandHandler/deleteResourceCommandHandlerImpl.integration.test.ts
@@ -11,6 +11,7 @@ import { ResourceNotFoundError } from '../../../../../common/errors/common/resou
 import { type SqliteDatabaseClient } from '../../../../../core/database/sqliteDatabaseClient/sqliteDatabaseClient.js';
 import { coreSymbols } from '../../../../../core/symbols.js';
 import { type DependencyInjectionContainer } from '../../../../../libs/dependencyInjection/dependencyInjectionContainer.js';
+import { type UserBucketTestUtils } from '../../../../userModule/tests/utils/userBucketTestUtils/userBucketTestUtils.js';
 import { type UserTestUtils } from '../../../../userModule/tests/utils/userTestUtils/userTestUtils.js';
 import { symbols } from '../../../symbols.js';
 import { type S3TestUtils } from '../../../tests/utils/s3TestUtils.js';
@@ -26,6 +27,8 @@ describe('DeleteResourceCommandHandlerImpl', () => {
 
   let userTestUtils: UserTestUtils;
 
+  let userBucketTestUtils: UserBucketTestUtils;
+
   const resourcesDirectory = path.resolve(__dirname, '../../../../../../../../resources');
 
   const sampleFileName = 'sample_video1.mp4';
@@ -41,16 +44,22 @@ describe('DeleteResourceCommandHandlerImpl', () => {
 
     userTestUtils = container.get<UserTestUtils>(testSymbols.userTestUtils);
 
+    userBucketTestUtils = container.get<UserBucketTestUtils>(testSymbols.userBucketTestUtils);
+
     s3TestUtils = container.get<S3TestUtils>(testSymbols.s3TestUtils);
 
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await s3TestUtils.createBucket(bucketName);
   });
 
   afterEach(async () => {
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await sqliteDatabaseClient.destroy();
 
     await s3TestUtils.deleteBucket(bucketName);
@@ -97,7 +106,7 @@ describe('DeleteResourceCommandHandlerImpl', () => {
 
     const user = await userTestUtils.createAndPersist();
 
-    await userTestUtils.createAndPersistUserBucket({
+    await userBucketTestUtils.createAndPersist({
       input: {
         userId: user.id,
         bucketName,
@@ -122,7 +131,7 @@ describe('DeleteResourceCommandHandlerImpl', () => {
   it('deletes a resource', async () => {
     const user = await userTestUtils.createAndPersist();
 
-    await userTestUtils.createAndPersistUserBucket({
+    await userBucketTestUtils.createAndPersist({
       input: {
         userId: user.id,
         bucketName,

diff --git a/...andlers/downloadResourceQueryHandler/downloadResourceQueryHandlerImpl.integration.test.ts b/...andlers/downloadResourceQueryHandler/downloadResourceQueryHandlerImpl.integration.test.ts
@@ -10,6 +10,7 @@ import { ResourceNotFoundError } from '../../../../../common/errors/common/resou
 import { type SqliteDatabaseClient } from '../../../../../core/database/sqliteDatabaseClient/sqliteDatabaseClient.js';
 import { coreSymbols } from '../../../../../core/symbols.js';
 import { type DependencyInjectionContainer } from '../../../../../libs/dependencyInjection/dependencyInjectionContainer.js';
+import { type UserBucketTestUtils } from '../../../../userModule/tests/utils/userBucketTestUtils/userBucketTestUtils.js';
 import { type UserTestUtils } from '../../../../userModule/tests/utils/userTestUtils/userTestUtils.js';
 import { symbols } from '../../../symbols.js';
 import { type S3TestUtils } from '../../../tests/utils/s3TestUtils.js';
@@ -25,6 +26,8 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
 
   let userTestUtils: UserTestUtils;
 
+  let userBucketTestUtils: UserBucketTestUtils;
+
   const resourcesDirectory = path.resolve(__dirname, '../../../../../../../../resources');
 
   const sampleFileName1 = 'sample_video1.mp4';
@@ -40,16 +43,22 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
 
     userTestUtils = container.get<UserTestUtils>(testSymbols.userTestUtils);
 
+    userBucketTestUtils = container.get<UserBucketTestUtils>(testSymbols.userBucketTestUtils);
+
     s3TestUtils = container.get<S3TestUtils>(testSymbols.s3TestUtils);
 
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await s3TestUtils.createBucket(bucketName);
   });
 
   afterEach(async () => {
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await sqliteDatabaseClient.destroy();
 
     await s3TestUtils.deleteBucket(bucketName);
@@ -94,7 +103,7 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
   it('throws an error - when Resource does not exist', async () => {
     const user = await userTestUtils.createAndPersist();
 
-    await userTestUtils.createAndPersistUserBucket({
+    await userBucketTestUtils.createAndPersist({
       input: {
         userId: user.id,
         bucketName,
@@ -119,7 +128,7 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
   it('downloads a Resource', async () => {
     const user = await userTestUtils.createAndPersist();
 
-    await userTestUtils.createAndPersistUserBucket({
+    await userBucketTestUtils.createAndPersist({
       input: {
         userId: user.id,
         bucketName,
@@ -134,8 +143,6 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
       bucketName,
     });
 
-    // TODO: validate data
-
     expect(resource).toEqual({
       name: sampleFileName1,
       updatedAt: expect.any(Date),

diff --git a/...ndResourcesMetadataQueryHandler/findResourcesMetadataQueryHandlerImpl.integration.test.ts b/...ndResourcesMetadataQueryHandler/findResourcesMetadataQueryHandlerImpl.integration.test.ts
@@ -10,6 +10,7 @@ import { ResourceNotFoundError } from '../../../../../common/errors/common/resou
 import { type SqliteDatabaseClient } from '../../../../../core/database/sqliteDatabaseClient/sqliteDatabaseClient.js';
 import { coreSymbols } from '../../../../../core/symbols.js';
 import { type DependencyInjectionContainer } from '../../../../../libs/dependencyInjection/dependencyInjectionContainer.js';
+import { type UserBucketTestUtils } from '../../../../userModule/tests/utils/userBucketTestUtils/userBucketTestUtils.js';
 import { type UserTestUtils } from '../../../../userModule/tests/utils/userTestUtils/userTestUtils.js';
 import { symbols } from '../../../symbols.js';
 import { type S3TestUtils } from '../../../tests/utils/s3TestUtils.js';
@@ -25,6 +26,8 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
 
   let userTestUtils: UserTestUtils;
 
+  let userBucketTestUtils: UserBucketTestUtils;
+
   const resourcesDirectory = path.resolve(__dirname, '../../../../../../../../resources');
 
   const sampleFileName1 = 'sample_video1.mp4';
@@ -42,16 +45,22 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
 
     userTestUtils = container.get<UserTestUtils>(testSymbols.userTestUtils);
 
+    userBucketTestUtils = container.get<UserBucketTestUtils>(testSymbols.userBucketTestUtils);
+
     s3TestUtils = container.get<S3TestUtils>(testSymbols.s3TestUtils);
 
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await s3TestUtils.createBucket(bucketName);
   });
 
   afterEach(async () => {
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await sqliteDatabaseClient.destroy();
 
     await s3TestUtils.deleteBucket(bucketName);
@@ -98,7 +107,7 @@ describe('FindResourcesMetadataQueryHandlerImpl', () => {
   it('finds resources metadata', async () => {
     const user = await userTestUtils.createAndPersist();
 
-    await userTestUtils.createAndPersistUserBucket({
+    await userBucketTestUtils.createAndPersist({
       input: {
         userId: user.id,
         bucketName,

diff --git a/...dule/application/commandHandlers/createUserCommandHandler/createUserCommandHandlerImpl.ts b/...dule/application/commandHandlers/createUserCommandHandler/createUserCommandHandlerImpl.ts
@@ -42,10 +42,12 @@ export class CrateUserCommandHandlerImpl implements CreateUserCommandHandler {
 
     const hashedPassword = await this.hashService.hash({ plainData: password });
 
-    const user = await this.userRepository.createUser({
-      email,
-      password: hashedPassword,
-      role: UserRole.user,
+    const user = await this.userRepository.saveUser({
+      user: {
+        email,
+        password: hashedPassword,
+        role: UserRole.user,
+      },
     });
 
     this.loggerService.debug({

diff --git a/...s/grantBucketAccessCommandHandler/grantBucketAccessCommandHandlerImpl.integration.test.ts b/...s/grantBucketAccessCommandHandler/grantBucketAccessCommandHandlerImpl.integration.test.ts
@@ -9,6 +9,7 @@ import { OperationNotValidError } from '../../../../../common/errors/common/oper
 import { type SqliteDatabaseClient } from '../../../../../core/database/sqliteDatabaseClient/sqliteDatabaseClient.js';
 import { coreSymbols } from '../../../../../core/symbols.js';
 import { symbols } from '../../../symbols.js';
+import { type UserBucketTestUtils } from '../../../tests/utils/userBucketTestUtils/userBucketTestUtils.js';
 import { type UserTestUtils } from '../../../tests/utils/userTestUtils/userTestUtils.js';
 
 describe('GrantBucketAccessCommandHandlerImpl', () => {
@@ -18,6 +19,8 @@ describe('GrantBucketAccessCommandHandlerImpl', () => {
 
   let userTestUtils: UserTestUtils;
 
+  let userBucketTestUtils: UserBucketTestUtils;
+
   beforeEach(async () => {
     const container = TestContainer.create();
 
@@ -27,12 +30,18 @@ describe('GrantBucketAccessCommandHandlerImpl', () => {
 
     userTestUtils = container.get<UserTestUtils>(testSymbols.userTestUtils);
 
+    userBucketTestUtils = container.get<UserBucketTestUtils>(testSymbols.userBucketTestUtils);
+
     await userTestUtils.truncate();
+
+    await userBucketTestUtils.truncate();
   });
 
   afterEach(async () => {
     await userTestUtils.truncate();
 
+    await userBucketTestUtils.truncate();
+
     await sqliteDatabaseClient.destroy();
   });
 
@@ -46,7 +55,7 @@ describe('GrantBucketAccessCommandHandlerImpl', () => {
       bucketName,
     });
 
-    const userBuckets = await userTestUtils.findBucketsByUserId({ userId: user.id });
+    const userBuckets = await userBucketTestUtils.findUserBuckets({ userId: user.id });
 
     expect(userBuckets.find((userBucket) => userBucket.bucketName === bucketName)).toBeDefined();
   });

diff --git a/...on/commandHandlers/grantBucketAccessCommandHandler/grantBucketAccessCommandHandlerImpl.ts b/...on/commandHandlers/grantBucketAccessCommandHandler/grantBucketAccessCommandHandlerImpl.ts
@@ -4,11 +4,13 @@ import {
 } from './grantBucketAccessCommandHandler.js';
 import { OperationNotValidError } from '../../../../../common/errors/common/operationNotValidError.js';
 import { type LoggerService } from '../../../../../libs/logger/services/loggerService/loggerService.js';
+import { type UserBucketRepository } from '../../../domain/repositories/userBucketRepository/userBucketRepository.js';
 import { type UserRepository } from '../../../domain/repositories/userRepository/userRepository.js';
 
 export class GrantBucketAccessCommandHandlerImpl implements GrantBucketAccessCommandHandler {
   public constructor(
     private readonly userRepository: UserRepository,
+    private readonly userBucketRepository: UserBucketRepository,
     private readonly loggerService: LoggerService,
   ) {}
 
@@ -30,7 +32,7 @@ export class GrantBucketAccessCommandHandlerImpl implements GrantBucketAccessCom
       });
     }
 
-    const existingBuckets = await this.userRepository.findUserBuckets({ userId });
+    const existingBuckets = await this.userBucketRepository.findUserBuckets({ userId });
 
     if (existingBuckets.find((userBucket) => userBucket.getBucketName() === bucketName)) {
       this.loggerService.debug({
@@ -42,13 +44,9 @@ export class GrantBucketAccessCommandHandlerImpl implements GrantBucketAccessCom
       return;
     }
 
-    existingUser.addGrantBucketAccessAction({
+    await this.userBucketRepository.createUserBucket({
       bucketName,
-    });
-
-    await this.userRepository.updateUser({
-      id: userId,
-      domainActions: existingUser.getDomainActions(),
+      userId,
     });
 
     this.loggerService.debug({

diff --git a/...n/commandHandlers/loginUserCommandHandler/loginUserCommandHandlerImpl.integration.test.ts b/...n/commandHandlers/loginUserCommandHandler/loginUserCommandHandlerImpl.integration.test.ts
@@ -80,12 +80,6 @@ describe('LoginUserCommandHandler', () => {
 
     expect(refreshTokenPayload['userId']).toBe(createdUser.getId());
 
-    const userTokens = await userTestUtils.findTokensByUserId({
-      userId: createdUser.getId(),
-    });
-
-    expect(userTokens.refreshTokens.includes(refreshToken)).toBe(true);
-
     expect(accessTokenExpiresIn).toBe(configProvider.getAccessTokenExpiresIn());
   });
 

diff --git a/...Module/application/commandHandlers/loginUserCommandHandler/loginUserCommandHandlerImpl.ts b/...Module/application/commandHandlers/loginUserCommandHandler/loginUserCommandHandlerImpl.ts
@@ -70,18 +70,6 @@ export class LoginUserCommandHandlerImpl implements LoginUserCommandHandler {
       expiresIn: refreshTokenExpiresIn,
     });
 
-    const expiresAt = new Date(Date.now() + refreshTokenExpiresIn * 1000);
-
-    user.addCreateRefreshTokenAction({
-      token: refreshToken,
-      expiresAt,
-    });
-
-    await this.userRepository.updateUser({
-      id: user.getId(),
-      domainActions: user.getDomainActions(),
-    });
-
     this.loggerService.debug({
       message: 'User logged in.',
       email,