Skip to content

task 1938 #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

task 1938 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/constants/app-constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ export enum WorkflowName {
"osw_union_dataset" = "osw_union_dataset"
}

export const ONE_GB_IN_BYTES = 1073741824;
export const ONE_GB_IN_BYTES = 1073741824;
export const TWO_GB_IN_BYTES = 2147483648;
14 changes: 7 additions & 7 deletions src/controller/osw-controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Ajv, { ErrorObject } from "ajv";
import polygonSchema from "../../schema/polygon.geojson.schema.json";
import { SpatialJoinRequest, UnionRequest } from "../model/request-interfaces";
import { apiTracker } from "../middleware/api-tracker";
import { ONE_GB_IN_BYTES } from "../constants/app-constants";
import { TWO_GB_IN_BYTES } from "../constants/app-constants";
/**
* Multer for multiple uploads
* Configured to pull to 'uploads' folder
Expand Down Expand Up @@ -367,8 +367,8 @@ class OSWController implements IController {

const file_size_in_bytes = Utility.calculateTotalSize([request.file] as any);
//if file size greater than 1GB then throw error
if (file_size_in_bytes > ONE_GB_IN_BYTES) {
throw new HttpException(400, `The total size of dataset zip files exceeds 1 GB upload limit.`);
if (file_size_in_bytes > TWO_GB_IN_BYTES) {
throw new HttpException(400, `The total size of dataset zip files exceeds ${TWO_GB_IN_BYTES / (1024 * 1024 * 1024)} GB upload limit.`);
}


Expand Down Expand Up @@ -491,8 +491,8 @@ class OSWController implements IController {

const file_size_in_bytes = Utility.calculateTotalSize(uploadRequest.datasetFile);
//if file size greater than 1GB then throw error
if (file_size_in_bytes > ONE_GB_IN_BYTES) {
throw new HttpException(400, `The total size of dataset zip files exceeds 1 GB upload limit.`);
if (file_size_in_bytes > TWO_GB_IN_BYTES) {
throw new HttpException(400, `The total size of dataset zip files exceeds ${TWO_GB_IN_BYTES / (1024 * 1024 * 1024)} GB upload limit.`);
}

if (!uploadRequest.metadataFile) {
Expand Down Expand Up @@ -578,8 +578,8 @@ class OSWController implements IController {

const file_size_in_bytes = Utility.calculateTotalSize([request.file] as any);
//if file size greater than 1GB then throw error
if (file_size_in_bytes > ONE_GB_IN_BYTES) {
throw new HttpException(400, `The total size of dataset zip files exceeds 1 GB upload limit.`);
if (file_size_in_bytes > TWO_GB_IN_BYTES) {
throw new HttpException(400, `The total size of dataset zip files exceeds ${TWO_GB_IN_BYTES / (1024 * 1024 * 1024)} GB upload limit.`);
}

let source = request.body['source_format']; //TODO: Validate the input enums
Expand Down
14 changes: 7 additions & 7 deletions test/unit/osw.controller.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import HttpException from "../../src/exceptions/http/http-base-exception";
import { ForbiddenAccess, InputException, UnAuthenticated } from "../../src/exceptions/http/http-exceptions";
import tdeiCoreService from "../../src/service/tdei-core-service";
import { Utility } from "../../src/utility/utility";
import { ONE_GB_IN_BYTES } from "../../src/constants/app-constants";
import { TWO_GB_IN_BYTES } from "../../src/constants/app-constants";

// group test using describe
describe("OSW Controller Test", () => {
Expand Down Expand Up @@ -509,12 +509,12 @@ describe("OSW Controller Test", () => {
it('should handle file size restriction error', async () => {
const req = getMockReq();
const { res, next } = getMockRes();
jest.spyOn(Utility, "calculateTotalSize").mockReturnValue(ONE_GB_IN_BYTES + 1);
jest.spyOn(Utility, "calculateTotalSize").mockReturnValue(TWO_GB_IN_BYTES + 1);

await oswController.processUploadRequest(mockRequest, mockResponse, mockNext);

expect(mockResponse.status).toHaveBeenCalledWith(400);
expect(mockResponse.send).toHaveBeenCalledWith('The total size of dataset zip files exceeds 1 GB upload limit.');
expect(mockResponse.send).toHaveBeenCalledWith(`The total size of dataset zip files exceeds ${TWO_GB_IN_BYTES / (1024 * 1024 * 1024)} GB upload limit.`);
expect(mockNext).toHaveBeenCalledWith(expect.any(HttpException));
});
});
Expand Down Expand Up @@ -636,12 +636,12 @@ describe("OSW Controller Test", () => {
it('should handle file size restriction error', async () => {
const req = getMockReq();
const { res, next } = getMockRes();
jest.spyOn(Utility, "calculateTotalSize").mockReturnValue(ONE_GB_IN_BYTES + 1);
jest.spyOn(Utility, "calculateTotalSize").mockReturnValue(TWO_GB_IN_BYTES + 1);

await oswController.processValidationOnlyRequest(mockRequest, mockResponse, mockNext);

expect(mockResponse.status).toHaveBeenCalledWith(400);
expect(mockResponse.send).toHaveBeenCalledWith('The total size of dataset zip files exceeds 1 GB upload limit.');
expect(mockResponse.send).toHaveBeenCalledWith(`The total size of dataset zip files exceeds ${TWO_GB_IN_BYTES / (1024 * 1024 * 1024)} GB upload limit.`);
expect(mockNext).toHaveBeenCalledWith(expect.any(HttpException));
});
});
Expand Down Expand Up @@ -776,12 +776,12 @@ describe("OSW Controller Test", () => {
it('should handle file size restriction error', async () => {
const req = getMockReq();
const { res, next } = getMockRes();
jest.spyOn(Utility, "calculateTotalSize").mockReturnValue(ONE_GB_IN_BYTES + 1);
jest.spyOn(Utility, "calculateTotalSize").mockReturnValue(TWO_GB_IN_BYTES + 1);

await oswController.createFormatRequest(mockRequest, mockResponse, mockNext);

expect(mockResponse.status).toHaveBeenCalledWith(400);
expect(mockResponse.send).toHaveBeenCalledWith('The total size of dataset zip files exceeds 1 GB upload limit.');
expect(mockResponse.send).toHaveBeenCalledWith(`The total size of dataset zip files exceeds ${TWO_GB_IN_BYTES / (1024 * 1024 * 1024)} GB upload limit.`);
expect(mockNext).toHaveBeenCalledWith(expect.any(HttpException));
});
});
Expand Down
Loading