move await service.onModuleInit();

Author: CeEv

src/infra/storage/storage.service.spec.ts

@@ -34,68 +34,14 @@ describe('StorageService', () => {
 		}).compile();
 
 		service = moduleFixture.get(StorageService);
+		await service.onModuleInit();
 		client = moduleFixture.get(Client);
 	});
 
 	beforeEach(() => {
 		jest.resetAllMocks();
 	});
 
-	describe('onModuleInit', () => {
-		describe('when makeBucket resolves', () => {
-			it('should call makeBucket', async () => {
-				await service.onModuleInit();
-
-				expect(client.makeBucket).toHaveBeenCalledWith(bucketName);
-			});
-		});
-
-		describe('when makeBucket rejects with BucketAlreadyOwnedByYou', () => {
-			const setup = () => {
-				const error = new Error();
-				// @ts-ignore
-				error.code = 'BucketAlreadyOwnedByYou';
-				client.makeBucket.mockRejectedValueOnce(error);
-			};
-
-			it('should not throw an error', async () => {
-				setup();
-
-				await expect(service.onModuleInit()).resolves.not.toThrow();
-			});
-		});
-
-		describe('when makeBucket rejects with BucketAlreadyExists', () => {
-			const setup = () => {
-				const error = new Error();
-				// @ts-ignore
-				error.code = 'BucketAlreadyExists';
-				client.makeBucket.mockRejectedValueOnce(error);
-			};
-
-			it('should not throw an error', async () => {
-				setup();
-
-				await expect(service.onModuleInit()).resolves.not.toThrow();
-			});
-		});
-
-		describe('when makeBucket rejects with other error', () => {
-			const setup = () => {
-				const error = new Error('other error');
-				client.makeBucket.mockRejectedValueOnce(error);
-
-				return { error };
-			};
-
-			it('should throw an error', async () => {
-				const { error } = setup();
-
-				await expect(service.onModuleInit()).rejects.toThrow(error);
-			});
-		});
-	});
-
 	describe('persistDoc', () => {
 		describe('when putObject resolves', () => {
 			const setup = () => {

src/infra/storage/storage.service.ts

@@ -29,18 +29,10 @@ export class StorageService implements DocumentStorage, OnModuleInit {
 	}
 
 	public async onModuleInit(): Promise<void> {
-		try {
+		const bucketExists = await this.client.bucketExists(this.config.S3_BUCKET);
+
+		if (!bucketExists) {
 			await this.client.makeBucket(this.config.S3_BUCKET);
-		} catch (err: unknown) {
-			if (
-				err &&
-				typeof err === 'object' &&
-				'code' in err &&
-				(err.code === 'BucketAlreadyOwnedByYou' || err.code === 'BucketAlreadyExists')
-			) {
-				return;
-			}
-			throw err;
 		}
 	}