Skip to content
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.

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

Dev admin img url #529

Merged
merged 4 commits into from
Aug 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/controllers/Admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,11 @@ export const createPerfume: RequestHandler = async (
* in: formData
* type: file
* description: uploaded file
* - name: perfumeIdx
* in: query
* required: true
* type: integer
* format: int64
* responses:
* 200:
* description: success
Expand All @@ -543,14 +548,15 @@ export const createPerfumeImg: RequestHandler = async (
req: Request,
res: Response
) => {
console.log(req.file);
if (!req.file)
return res
.status(400)
.json({ error: 'cannot find file from the request' });
const imageUrl = await createImageUrl(req.file);
const perfumeIdx: number = Number(req.query.perfumeIdx);

try {
await Perfume.createImg(imageUrl);
await Perfume.createImg(imageUrl, perfumeIdx);
res.status(StatusCode.OK).json({
message: '성공',
});
Expand Down
4 changes: 2 additions & 2 deletions src/dao/PerfumeDao.ts
Original file line number Diff line number Diff line change
Expand Up @@ -470,12 +470,12 @@ class PerfumeDao {
});
}

async createImg(imageUrl: string | any) {
async createImg(imageUrl: string | any, perfumeIdx: number) {
const created = await Perfume.update(
{
imageUrl,
},
{ where: {} }
{ where: { perfumeIdx } }
);
return created;
}
Expand Down
15 changes: 3 additions & 12 deletions src/service/ImageService.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import S3FileDao from '@src/dao/S3FileDao';
import config from '../config/config';
import fs from 'fs';
import AWS from 'aws-sdk';
import {
DuplicatedEntryError,
FailedToCreateError,
} from '@src/utils/errors/errors';
import storage from '../config/s3Config';

class ImageService {
s3FileDao: S3FileDao;
Expand Down Expand Up @@ -33,29 +33,20 @@ class ImageService {
fileData: Express.Multer.File
): Promise<string> {
try {
console.log('Inside the Service');
const fileContent: Buffer = fs.readFileSync(fileData.path);

const storage: AWS.S3 = new AWS.S3({
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
region: 'ap-northeast-2',
});
console.log('Inside the Service2');
const keyWithPrefix = `perfumes/${fileData.originalname}`;

const params: {
Bucket: string;
Key: string;
Body: Buffer;
} = {
Bucket: config.development.bucketName as string,
Key: fileData.originalname,
Key: keyWithPrefix,
Body: fileContent,
};
console.log('Inside the Service3');

const result = await storage.upload(params).promise();
console.log(result.Location);
return result.Location;
} catch (err: Error | any) {
if (err.parent?.errno === 1062) {
Expand Down
4 changes: 2 additions & 2 deletions src/service/PerfumeService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,9 @@ class PerfumeService {
}
}

async createImg(imageUrl: string) {
async createImg(imageUrl: string, perfumeIdx: number) {
try {
return await perfumeDao.createImg(imageUrl);
return await perfumeDao.createImg(imageUrl, perfumeIdx);
} catch (err: Error | any) {
if (err.parent?.errno === 1062) {
throw new DuplicatedEntryError();
Expand Down