Browse Source

clean code

Shun Miyazawa 1 year ago
parent
commit
9d896155d7
1 changed files with 10 additions and 10 deletions
  1. 10 10
      apps/app/src/features/openai/server/services/openai.ts

+ 10 - 10
apps/app/src/features/openai/server/services/openai.ts

@@ -237,7 +237,7 @@ class OpenaiService implements IOpenaiService {
       return;
       return;
     }
     }
 
 
-    const currentVectorStoreIds: Types.ObjectId[] = await VectorStoreFileRelationModel.aggregate([
+    const currentVectorStoreRelationIds: Types.ObjectId[] = await VectorStoreFileRelationModel.aggregate([
       {
       {
         $group: {
         $group: {
           _id: '$vectorStoreRelationId',
           _id: '$vectorStoreRelationId',
@@ -248,11 +248,11 @@ class OpenaiService implements IOpenaiService {
       { $project: { _id: 1 } },
       { $project: { _id: 1 } },
     ]);
     ]);
 
 
-    if (currentVectorStoreIds.length === 0) {
+    if (currentVectorStoreRelationIds.length === 0) {
       return;
       return;
     }
     }
 
 
-    await VectorStoreModel.deleteMany({ _id: { $nin: currentVectorStoreIds }, isDeleted: true });
+    await VectorStoreModel.deleteMany({ _id: { $nin: currentVectorStoreRelationIds }, isDeleted: true });
   }
   }
 
 
   async deleteVectorStoreFile(vectorStoreRelationId: Types.ObjectId, pageId: Types.ObjectId, apiCallInterval?: number): Promise<void> {
   async deleteVectorStoreFile(vectorStoreRelationId: Types.ObjectId, pageId: Types.ObjectId, apiCallInterval?: number): Promise<void> {
@@ -295,23 +295,23 @@ class OpenaiService implements IOpenaiService {
     await this.deleteObsolatedVectorStoreRelations();
     await this.deleteObsolatedVectorStoreRelations();
 
 
     // Retrieves all VectorStore documents that are marked as deleted
     // Retrieves all VectorStore documents that are marked as deleted
-    const deletedVectorStores = await VectorStoreModel.find({ isDeleted: true });
-    if (deletedVectorStores.length === 0) {
+    const deletedVectorStoreRelations = await VectorStoreModel.find({ isDeleted: true });
+    if (deletedVectorStoreRelations.length === 0) {
       return;
       return;
     }
     }
 
 
     // Retrieves VectorStoreFileRelation documents associated with deleted VectorStore documents
     // Retrieves VectorStoreFileRelation documents associated with deleted VectorStore documents
-    const obsoleteVectorStoreFiles = await VectorStoreFileRelationModel.find(
-      { vectorStoreRelationId: { $in: deletedVectorStores.map(vectorStore => vectorStore._id) } },
+    const obsoleteVectorStoreFileRelations = await VectorStoreFileRelationModel.find(
+      { vectorStoreRelationId: { $in: deletedVectorStoreRelations.map(deletedVectorStoreRelation => deletedVectorStoreRelation._id) } },
     ).limit(limit);
     ).limit(limit);
-    if (obsoleteVectorStoreFiles.length === 0) {
+    if (obsoleteVectorStoreFileRelations.length === 0) {
       return;
       return;
     }
     }
 
 
     // Delete obsolete VectorStoreFile
     // Delete obsolete VectorStoreFile
-    for await (const vectorStoreFile of obsoleteVectorStoreFiles) {
+    for await (const vectorStoreFileRelation of obsoleteVectorStoreFileRelations) {
       try {
       try {
-        await this.deleteVectorStoreFile(vectorStoreFile.vectorStoreRelationId, vectorStoreFile.pageId, apiCallInterval);
+        await this.deleteVectorStoreFile(vectorStoreFileRelation.vectorStoreRelationId, vectorStoreFileRelation.pageId, apiCallInterval);
       }
       }
       catch (err) {
       catch (err) {
         logger.error(err);
         logger.error(err);