Revert "Dev admin img url (#529)"

This reverts commit 084df17.
Scents-Note · Aug 26, 2023 · 04b5a18 · 04b5a18
1 parent 084df17
commit 04b5a18
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/src/controllers/Admin.ts b/src/controllers/Admin.ts
@@ -522,11 +522,6 @@ 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
@@ -548,15 +543,14 @@ 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, perfumeIdx);
+        await Perfume.createImg(imageUrl);
         res.status(StatusCode.OK).json({
             message: '성공',
         });

diff --git a/src/dao/PerfumeDao.ts b/src/dao/PerfumeDao.ts
@@ -470,12 +470,12 @@ class PerfumeDao {
         });
     }
 
-    async createImg(imageUrl: string | any, perfumeIdx: number) {
+    async createImg(imageUrl: string | any) {
         const created = await Perfume.update(
             {
                 imageUrl,
             },
-            { where: { perfumeIdx } }
+            { where: {} }
         );
         return created;
     }

diff --git a/src/service/ImageService.ts b/src/service/ImageService.ts
@@ -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;
@@ -33,20 +33,29 @@ class ImageService {
         fileData: Express.Multer.File
     ): Promise<string> {
         try {
+            console.log('Inside the Service');
             const fileContent: Buffer = fs.readFileSync(fileData.path);
-            const keyWithPrefix = `perfumes/${fileData.originalname}`;
+
+            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 params: {
                 Bucket: string;
                 Key: string;
                 Body: Buffer;
             } = {
                 Bucket: config.development.bucketName as string,
-                Key: keyWithPrefix,
+                Key: fileData.originalname,
                 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) {

diff --git a/src/service/PerfumeService.ts b/src/service/PerfumeService.ts
@@ -497,9 +497,9 @@ class PerfumeService {
         }
     }
 
-    async createImg(imageUrl: string, perfumeIdx: number) {
+    async createImg(imageUrl: string) {
         try {
-            return await perfumeDao.createImg(imageUrl, perfumeIdx);
+            return await perfumeDao.createImg(imageUrl);
         } catch (err: Error | any) {
             if (err.parent?.errno === 1062) {
                 throw new DuplicatedEntryError();