Skip to content

Bugfix/file download adjustments #10

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
dev-dantas wants to merge 15 commits into
base: release
Choose a base branch
from
Open

Bugfix/file download adjustments #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
82c1314
Added file download method on repository
Jun 8, 2021
cc51b6c
Implemented file download route
Jun 8, 2021
53a12aa
Added file download method on service
Jun 8, 2021
879a180
Added error handling to file find route
Jun 8, 2021
17f8320
package-lock update
Jun 8, 2021
f9b632d
Merge remote-tracking branch 'nxcd/release' into feature/file-downloa…
Jun 16, 2021
b4883b4
Updated dependencies
Jun 16, 2021
8104373
Adjustments on presentation layer
Jun 16, 2021
0204611
Merge remote-tracking branch 'nxcd/release' into feature/file-downloa…
Jun 17, 2021
f256e8c
Updated Niffler version
Jul 15, 2021
6b94e8b
Added file MIME type return on repository
Jul 15, 2021
32d457a
Placed content type header on download route response
Jul 15, 2021
c4ca96b
Added inteface for file buffer object
Jul 15, 2021
8ffef8c
Added file buffer interface on service
Jul 15, 2021
522347a
Merge remote-tracking branch 'origin/release' into bugfix/file-downlo…
Jul 15, 2021
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "niffler",
"version": "1.4.1",
"version": "1.6.0",
"description": "A minio based storage microservice",
"main": "dist/index.js",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/data/repositories/StorageRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { S3 } from 'aws-sdk'
import { Body } from 'aws-sdk/clients/s3'
import { IFile } from '../../domain/structures/interfaces/IFile'
import { IFileBuffer } from '../../domain/structures/interfaces/IFileBuffer'

export interface IStorageRepositoryConfig {
ttl: number,
Expand Down Expand Up @@ -48,10 +48,10 @@ export class StorageRepository {
return file
}

async download (id: string): Promise<Body | undefined> {
const { Body: buffer } = await this.s3.getObject({ Key: id, Bucket: this.bucket })
async download (id: string): Promise<IFileBuffer> {
const { Body: buffer, ContentType: mimetype } = await this.s3.getObject({ Key: id, Bucket: this.bucket })
.promise()

return buffer
return { buffer, mimetype }
}
}
6 changes: 6 additions & 0 deletions src/domain/structures/interfaces/IFileBuffer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { Body } from "aws-sdk/clients/s3";

export interface IFileBuffer {
buffer: Body | undefined,
mimetype: string | undefined
}
6 changes: 4 additions & 2 deletions src/presentation/routes/download.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import { Request, Response, RequestHandler, NextFunction } from 'express'
export function factory (service: StorageService): RequestHandler[] {
return [
rescue(async (req: Request, res: Response) => {
const file = await service.download(req.params[0])
const { buffer, mimetype } = await service.download(req.params[0])

res.status(200).send(file)
res.set({ 'Content-Type': mimetype })

res.status(200).send(buffer)
}),
(err: AWSError, _req: Request, _res: Response, next: NextFunction) => {
if (err.statusCode === 404) {
Expand Down
4 changes: 2 additions & 2 deletions src/services/StorageService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Body } from 'aws-sdk/clients/s3'
import { IFile } from '../domain/structures/interfaces/IFile'
import { IFileBuffer } from '../domain/structures/interfaces/IFileBuffer'
import { StorageRepository } from '../data/repositories/StorageRepository'

export class StorageService {
Expand All @@ -13,7 +13,7 @@ export class StorageService {
return this.repository.findById(id)
}

async download (id: string): Promise<Body | undefined> {
async download (id: string): Promise<IFileBuffer> {
return this.repository.download(id)
}
}