eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🪵 Logging file path and verify s3 test (#461)

Browse Source 
* feat: logging file path while verifying ci
* fix: files e2e test

---------
Co-authored-by: Monta <monta@HP-ProBook-445-14-inch-G9-Notebook-PC-505aadfc.localdomain>
This commit is contained in:
Montassar Ghanmy
2024-03-15 16:12:09 +01:00
committed by GitHub
parent d856cf4e10
commit f777f55136
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/backend/node/src/core/platform/services/storage/connectors/S3/s3-service.ts
+1
View File
@@ -46,6 +46,7 @@ export default class S3ConnectorService implements StorageConnectorAPI {
let err = null;
for (let i = 0; i <= tries; i++) {
try {
console.log("🚀🚀 reading s3 object: ", path);
const stat = await this.client.statObject(this.minioConfiguration.bucket, path);
if (stat?.size > 0) {
break;
tdrive/backend/node/test/e2e/files/files.spec.ts
+12 -17
View File
@@ -3,11 +3,9 @@ import { afterAll, beforeAll, describe, expect, it } from "@jest/globals";
import { init, TestPlatform } from "../setup";
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
import fs from "fs";
import LocalConnectorService from "../../../src/core/platform/services/storage/connectors/local/service";
import S3ConnectorService from "../../../src/core/platform/services/storage/connectors/S3/s3-service";
import UserApi from "../common/user-api";
describe("The Files feature", () => {
const url = "/internal/services/files/v1";
let platform: TestPlatform;
@@ -17,14 +15,17 @@ describe("The Files feature", () => {
platform = await init({
services: ["webserver", "database", "storage", "files", "previews"],
});
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
await platform.database.getConnector().init();
helpers = await UserApi.getInstance(platform)
helpers = await UserApi.getInstance(platform);
});
afterAll(async () => {
await platform?.tearDown();
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
platform = null;
});
describe("On user send files", () => {
@@ -34,10 +35,9 @@ describe("The Files feature", () => {
//given file
const filesUpload = await helpers.uploadRandomFile();
expect(filesUpload.id).toBeTruthy();
//clean files directory
expect(platform.storage.getConnector()).toBeInstanceOf(LocalConnectorService)
const path = (<LocalConnectorService>platform.storage.getConnector()).configuration.path;
fs.readdirSync(path).forEach(f => fs.rmSync(`${path}/${f}`, {recursive: true, force: true}));
// expect(platform.storage.getConnector()).toBeInstanceOf(S3ConnectorService);
const path = `tdrive/files/${platform.workspace.company_id}/${platform.currentUser.id}/${filesUpload.id}/chunk1`;
await platform.storage.getConnector().remove(path);
//when try to download the file
const fileDownloadResponse = await platform.app.inject({
method: "GET",
@@ -46,15 +46,14 @@ describe("The Files feature", () => {
//then file should be not found with 404 error and "File not found message"
expect(fileDownloadResponse).toBeTruthy();
expect(fileDownloadResponse.statusCode).toBe(500);
}, 120000);
it("Download file should return 200 if file exists", async () => {
//given file
const filesUpload = await helpers.uploadRandomFile()
const filesUpload = await helpers.uploadRandomFile();
expect(filesUpload.id).toBeTruthy();
//clean files directory
expect(platform.storage.getConnector()).toBeInstanceOf(LocalConnectorService)
// expect(platform.storage.getConnector()).toBeInstanceOf(S3ConnectorService);
//when try to download the file
const fileDownloadResponse = await platform.app.inject({
@@ -64,7 +63,6 @@ describe("The Files feature", () => {
//then file should be not found with 404 error and "File not found message"
expect(fileDownloadResponse).toBeTruthy();
expect(fileDownloadResponse.statusCode).toBe(200);
}, 120000);
it.skip("should save file and generate previews", async () => {
@@ -79,16 +77,13 @@ describe("The Files feature", () => {
for (const thumb of filesUpload.thumbnails) {
const thumbnails = await platform.app.inject({
headers: {"authorization": `Bearer ${await platform.auth.getJWTToken()}`},
headers: { authorization: `Bearer ${await platform.auth.getJWTToken()}` },
method: "GET",
url: `${url}/companies/${platform.workspace.company_id}/files/${filesUpload.id}/thumbnails/${thumb.index}`,
});
expect(thumbnails.statusCode).toBe(200);
}
}
}, 1200000);
});
});