4.6.4 (#588)

packages/service/core/dataset/data/controller.ts

@@ -16,22 +16,22 @@ export async function delDatasetRelevantData({ datasetIds }: { datasetIds: strin
     datasetId: { $in: datasetIds }
   });
 
-  // delete related files
-  await Promise.all(
-    datasetIds.map((id) => delFileByMetadata({ bucketName: BucketNameEnum.dataset, datasetId: id }))
-  );
+  await delay(2000);
 
-  await delay(500);
-
-  // delete pg data
-  await deletePgDataById(`dataset_id IN ('${datasetIds.join("','")}')`);
   // delete dataset.datas
   await MongoDatasetData.deleteMany({ datasetId: { $in: datasetIds } });
+  // delete pg data
+  await deletePgDataById(`dataset_id IN ('${datasetIds.join("','")}')`);
 
   // delete collections
   await MongoDatasetCollection.deleteMany({
     datasetId: { $in: datasetIds }
   });
+
+  // delete related files
+  await Promise.all(
+    datasetIds.map((id) => delFileByMetadata({ bucketName: BucketNameEnum.dataset, datasetId: id }))
+  );
 }
 /**
  * delete all data by collectionIds
@@ -51,6 +51,18 @@ export async function delCollectionRelevantData({
     collectionId: { $in: collectionIds }
   });
 
+  await delay(2000);
+
+  // delete dataset.datas
+  await MongoDatasetData.deleteMany({ collectionId: { $in: collectionIds } });
+  // delete pg data
+  await deletePgDataById(`collection_id IN ('${collectionIds.join("','")}')`);
+
+  // delete collections
+  await MongoDatasetCollection.deleteMany({
+    _id: { $in: collectionIds }
+  });
+
   // delete file and imgs
   await Promise.all([
     delImgByFileIdList(filterFileIds),
@@ -59,13 +71,6 @@ export async function delCollectionRelevantData({
       fileIdList: filterFileIds
     })
   ]);
-
-  await delay(500);
-
-  // delete pg data
-  await deletePgDataById(`collection_id IN ('${collectionIds.join("','")}')`);
-  // delete dataset.datas
-  await MongoDatasetData.deleteMany({ collectionId: { $in: collectionIds } });
 }
 /**
  * delete one data by mongoDataId

packages/service/core/dataset/data/schema.ts

@@ -71,7 +71,6 @@ const DatasetDataSchema = new Schema({
     ],
     default: []
   },
-  // metadata
   updateTime: {
     type: Date,
     default: () => new Date()
@@ -89,6 +88,7 @@ try {
   DatasetDataSchema.index({ teamId: 1 });
   DatasetDataSchema.index({ datasetId: 1 });
   DatasetDataSchema.index({ collectionId: 1 });
+  DatasetDataSchema.index({ updateTime: -1 });
   // full text index
   DatasetDataSchema.index({ datasetId: 1, fullTextToken: 'text' });
   DatasetDataSchema.index({ inited: 1 });