yaml-admin-api 0.0.80 → 0.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml-admin-api",
-  "version": "0.0.80",
+  "version": "0.0.82",
   "license": "MIT",
   "description": "YAML Admin API package",
   "type": "commonjs",

package/src/crud/entity-api-generator.js

@@ -338,6 +338,34 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         res.json(list);
     }));
 
+    //view
+    app.get(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, asyncErrorHandler(async (req, res) => {
+        let f = {}
+        f[key_field.name] = parseKey(req.params.id)
+        Object.assign(f, default_filter)
+
+        let aggregate = await makeApiGenerateAggregate(db, entity_name, yml_entity, yml, options)
+
+        let m
+        if(aggregate?.length > 0) {
+            aggregate = [{$match: f}, ...aggregate, { $limit: 1 }]
+            if(yml.debug && entity_name == 'ils')
+                console.log('list', entity_name, JSON.stringify(aggregate, null, 2))
+            const result = await db.collection(collection_name).aggregate(aggregate).toArray()
+            m = result.length > 0 ? result[0] : null
+        } else {
+            m = await db.collection(collection_name).findOne(f);
+        }
+
+        if (!m)
+            return res.status(404).send('Not found');
+
+        m.id = getKeyFromEntity(m)
+        await addInfo(db, [m])
+
+        res.json(m);
+    }))
+
 
     const constructEntity = async (req, entityId) => {
         var entity = {};
@@ -467,35 +495,6 @@ const generateCrud = async ({ app, db, entity_name, yml_entity, yml, options })
         res.json(entity);
     }));
 
-    //view
-    app.get(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, asyncErrorHandler(async (req, res) => {
-        let f = {}
-        f[key_field.name] = parseKey(req.params.id)
-        Object.assign(f, default_filter)
-
-        let aggregate = await makeApiGenerateAggregate(db, entity_name, yml_entity, yml, options)
-
-        let m
-        if(aggregate?.length > 0) {
-            aggregate = [{$match: f}, ...aggregate, { $limit: 1 }]
-            const result = await db.collection(collection_name).aggregate(aggregate).toArray()
-            m = result.length > 0 ? result[0] : null
-        } else {
-            m = await db.collection(collection_name).findOne(f);
-        }
-
-        if (!m)
-            return res.status(404).send('Not found');
-
-        m.id = getKeyFromEntity(m)
-        await addInfo(db, [m])
-
-        if(yml.debug)
-            console.log('show', entity_name, m)
-
-        res.json(m);
-    }))
-
     //delete
     app.delete(`${api_prefix}/${entity_name}/:id`, auth.isAuthenticated, asyncErrorHandler(async (req, res) =>{
         let f = {}
@@ -793,9 +792,7 @@ const makeApiGenerateAggregate = async (db, entity_name, yml_entity, yml, option
             projection[field] = 1
         } else if(fields) {
             fields.forEach(m => {
-                if(m.type !== 'reference') {
-                    projection[m.name] = 1
-                }
+                projection[m.name] = 1
             })
 
             // reference 필드는 중첩 lookup으로 처리

package/src/upload/upload-api-generator.js

@@ -29,10 +29,10 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let ext = req.params.ext;
 
         let contentType = whatIsContentType(ext)
-        let key = `${member_no}/${fileName}.${ext}`
+        let key = `${prefix}/${member_no}/${fileName}.${ext}`
         const uploadUrl = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket,
             ContentType: contentType,
-            Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
+            Key: key}), { expiresIn: 300 }); 
 
         let r = {upload_url:uploadUrl, key, fileName:`${fileName}.${ext}`, member_no, contentType}
         console.log(r)
@@ -46,10 +46,10 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let ext = req.params.ext;
 
         let contentType = whatIsContentType(ext)
-        let key = `${member_no}/${fileName}.${ext}`
+        let key = `${prefix}/${member_no}/${fileName}.${ext}`
         const uploadUrl = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket_private,
             ContentType: contentType,   
-            Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
+            Key: `${key}`}), { expiresIn: 300 }); 
 
         let r = {upload_url:uploadUrl, key, fileName:`${fileName}.${ext}`, member_no, contentType}
         
@@ -63,12 +63,12 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let fileName = await genEntityIdWithKey(db, 'file');
         let ext = req.params.ext;
         
-        let key = `/${member_no}/${fileName}.${ext}`;
+        let key = `${prefix}/${member_no}/${fileName}.${ext}`;
         let contentType = whatIsContentType(ext);
 
         const createMultipartUpload = await s3.send(new CreateMultipartUploadCommand({
             Bucket: bucket_private,
-            Key: `${prefix}/${key}`,
+            Key: `${key}`,
             ContentType: contentType
         }));
 
@@ -79,10 +79,9 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
     app.post(api_prefix+'/api/media/url/secure/part', auth.isAuthenticated, async function (req, res) {
         let s3 = getS3();
         let { key, uploadId, partNumber } = req.body;
-
         const command = new UploadPartCommand({
             Bucket: bucket_private,
-            Key: `${prefix}/${key}`,
+            Key: `${key}`,
             UploadId: uploadId,
             PartNumber: partNumber
         });
@@ -101,7 +100,7 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
 
         await s3.send(new CompleteMultipartUploadCommand({
             Bucket: bucket_private,
-            Key: `${prefix}/${key}`,
+            Key: `${key}`,
             UploadId: uploadId,
             MultipartUpload: { Parts: parts }
         }));
@@ -117,7 +116,7 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
 
             await s3.send(new AbortMultipartUploadCommand({
                 Bucket: bucket_private,
-                Key: `${prefix}/${key}`,
+                Key: `${key}`,
                 UploadId: uploadId
             }));
 
@@ -136,11 +135,11 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let r = {list:[], r:true}
         for(let ext of ext_list) {
             let fileName = await genEntityIdWithKey(db, 'file')
-            let key = `/${member_no}/${fileName}.${ext}`
+            let key = `${prefix}/${member_no}/${fileName}.${ext}`
             let contentType = whatIsContentType(ext)
             const upload_url = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket,
                 ContentType: contentType,
-                Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
+                Key: `${key}`}), { expiresIn: 300 }); 
             
             r.list.push({upload_url, key, fileName:`${fileName}.${ext}`, member_no, contentType})
         }
@@ -156,11 +155,11 @@ const generateS3UploadApi = async ({ app, db, yml, options }) => {
         let r = {list:[], r:true}
         for(let ext of ext_list) {
             let fileName = await genEntityIdWithKey(db, 'file')
-            let key = `${member_no}/${fileName}.${ext}`
+            let key = `${prefix}/${member_no}/${fileName}.${ext}`
             let contentType = whatIsContentType(ext)
             const upload_url = await getSignedUrl(s3, new PutObjectCommand({Bucket: bucket_private,
                 ContentType: contentType,
-                Key: `${prefix}/${key}`}), { expiresIn: 300 }); 
+                Key: `${key}`}), { expiresIn: 300 }); 
 
             r.list.push({upload_url, key, fileName:`${fileName}.${ext}`, member_no, contentType})
         }