fix colection create api (#766)

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

projects/app/src/pages/api/core/app/getChatLogs.ts

@@ -40,6 +40,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     const [data, total] = await Promise.all([
       MongoChat.aggregate([
         { $match: where },
+        {
+          $sort: {
+            userBadFeedbackCount: -1,
+            userGoodFeedbackCount: -1,
+            customFeedbacksCount: -1,
+            updateTime: -1
+          }
+        },
+        { $skip: (pageNum - 1) * pageSize },
+        { $limit: pageSize },
         {
           $lookup: {
             from: ChatItemCollectionName,
@@ -107,16 +117,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
             }
           }
         },
-        {
-          $sort: {
-            userBadFeedbackCount: -1,
-            userGoodFeedbackCount: -1,
-            customFeedbacksCount: -1,
-            updateTime: -1
-          }
-        },
-        { $skip: (pageNum - 1) * pageSize },
-        { $limit: pageSize },
         {
           $project: {
             _id: 1,

projects/app/src/pages/api/core/chat/init.ts

@@ -35,7 +35,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
     ]);
 
     // auth chat permission
-    if (!app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
+    if (chat && !app.canWrite && String(tmbId) !== String(chat?.tmbId)) {
       throw new Error(ChatErrEnum.unAuthChat);
     }
 

projects/app/src/pages/api/core/dataset/collection/create/file.ts

@@ -0,0 +1,85 @@
+import type { NextApiRequest, NextApiResponse } from 'next';
+import { jsonRes } from '@fastgpt/service/common/response';
+import { connectToDatabase } from '@/service/mongo';
+import { uploadFile } from '@fastgpt/service/common/file/gridfs/controller';
+import { getUploadModel } from '@fastgpt/service/common/file/multer';
+import { authDataset } from '@fastgpt/service/support/permission/auth/dataset';
+import { FileCreateDatasetCollectionParams } from '@fastgpt/global/core/dataset/api';
+import { removeFilesByPaths } from '@fastgpt/service/common/file/utils';
+import { createOneCollection } from '@fastgpt/service/core/dataset/collection/controller';
+import { DatasetCollectionTypeEnum } from '@fastgpt/global/core/dataset/constants';
+
+/**
+ * Creates the multer uploader
+ */
+const upload = getUploadModel({
+  maxSize: 500 * 1024 * 1024
+});
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse<any>) {
+  let filePaths: string[] = [];
+
+  const { datasetId } = req.query as { datasetId: string };
+
+  try {
+    await connectToDatabase();
+
+    const { teamId, tmbId } = await authDataset({
+      req,
+      authToken: true,
+      authApiKey: true,
+      per: 'w',
+      datasetId
+    });
+
+    const { file, bucketName, data } = await upload.doUpload<FileCreateDatasetCollectionParams>(
+      req,
+      res
+    );
+    filePaths = [file.path];
+
+    if (!file || !bucketName) {
+      throw new Error('file is empty');
+    }
+
+    const { fileMetadata, collectionMetadata, ...collectionData } = data;
+
+    // upload file and create collection
+    const fileId = await uploadFile({
+      teamId,
+      tmbId,
+      bucketName,
+      path: file.path,
+      filename: file.originalname,
+      contentType: file.mimetype,
+      metadata: fileMetadata
+    });
+
+    // create collection
+    const collectionId = await createOneCollection({
+      ...collectionData,
+      metadata: collectionMetadata,
+      teamId,
+      tmbId,
+      type: DatasetCollectionTypeEnum.file,
+      fileId
+    });
+
+    jsonRes(res, {
+      data: collectionId
+    });
+  } catch (error) {
+    jsonRes(res, {
+      code: 500,
+      error
+    });
+  }
+
+  removeFilesByPaths(filePaths);
+}
+
+export const config = {
+  api: {
+    bodyParser: false
+  }
+};

projects/app/src/pages/api/core/dataset/collection/list.ts

@@ -78,16 +78,25 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
         {
           $match: match
         },
+        {
+          $sort: { updateTime: -1 }
+        },
+        {
+          $skip: (pageNum - 1) * pageSize
+        },
+        {
+          $limit: pageSize
+        },
         // count training data
         {
           $lookup: {
             from: DatasetTrainingCollectionName,
-            let: { id: '$_id' },
+            let: { id: '$_id', team_id: match.teamId, dataset_id: match.datasetId },
             pipeline: [
               {
                 $match: {
                   $expr: {
-                    $and: [{ $eq: ['$teamId', match.teamId] }, { $eq: ['$collectionId', '$$id'] }]
+                    $and: [{ $eq: ['$teamId', '$$team_id'] }, { $eq: ['$collectionId', '$$id'] }]
                   }
                 }
               },
@@ -100,14 +109,14 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
         {
           $lookup: {
             from: DatasetDataCollectionName,
-            let: { id: '$_id' },
+            let: { id: '$_id', team_id: match.teamId, dataset_id: match.datasetId },
             pipeline: [
               {
                 $match: {
                   $expr: {
                     $and: [
-                      { $eq: ['$teamId', match.teamId] },
-                      { $eq: ['$datasetId', match.datasetId] },
+                      { $eq: ['$teamId', '$$team_id'] },
+                      { $eq: ['$datasetId', '$$dataset_id'] },
                       { $eq: ['$collectionId', '$$id'] }
                     ]
                   }
@@ -136,15 +145,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
               $ifNull: [{ $arrayElemAt: ['$trainingCount.count', 0] }, 0]
             }
           }
-        },
-        {
-          $sort: { updateTime: -1 }
-        },
-        {
-          $skip: (pageNum - 1) * pageSize
-        },
-        {
-          $limit: pageSize
         }
       ]),
       MongoDatasetCollection.countDocuments(match)