From 507a650a41b337814508c23d475304254b1dd5ed Mon Sep 17 00:00:00 2001 From: onlyjackfrost Date: Tue, 12 Nov 2024 18:31:33 +0800 Subject: [PATCH] update generateProjectRecommendationQuestions input --- .../src/apollo/server/resolvers/askingResolver.ts | 5 ++--- .../src/apollo/server/resolvers/projectResolver.ts | 4 ++-- wren-ui/src/apollo/server/schema.ts | 2 +- .../src/apollo/server/services/projectService.ts | 14 ++++++++------ 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/wren-ui/src/apollo/server/resolvers/askingResolver.ts b/wren-ui/src/apollo/server/resolvers/askingResolver.ts index 04607fef6..f49f74bef 100644 --- a/wren-ui/src/apollo/server/resolvers/askingResolver.ts +++ b/wren-ui/src/apollo/server/resolvers/askingResolver.ts @@ -75,11 +75,10 @@ export class AskingResolver { public async generateProjectRecommendationQuestions( _root: any, - args: { projectId: number }, + _args: any, ctx: IContext, ): Promise { - const { projectId } = args; - await ctx.projectService.generateProjectRecommendationQuestions(projectId); + await ctx.projectService.generateProjectRecommendationQuestions(); return true; } diff --git a/wren-ui/src/apollo/server/resolvers/projectResolver.ts b/wren-ui/src/apollo/server/resolvers/projectResolver.ts index 2fe3d39d9..a601ef605 100644 --- a/wren-ui/src/apollo/server/resolvers/projectResolver.ts +++ b/wren-ui/src/apollo/server/resolvers/projectResolver.ts @@ -107,7 +107,7 @@ export class ProjectResolver { }); // update project recommendation questions - await ctx.projectService.generateProjectRecommendationQuestions(project.id); + await ctx.projectService.generateProjectRecommendationQuestions(); return true; } @@ -623,7 +623,7 @@ export class ProjectResolver { const { manifest } = await ctx.mdlService.makeCurrentModelMDL(); const deployRes = await ctx.deployService.deploy(manifest, project.id); - await ctx.projectService.generateProjectRecommendationQuestions(project.id); + await ctx.projectService.generateProjectRecommendationQuestions(); return deployRes; } diff --git a/wren-ui/src/apollo/server/schema.ts b/wren-ui/src/apollo/server/schema.ts index c6ae1245c..2656b4c9a 100644 --- a/wren-ui/src/apollo/server/schema.ts +++ b/wren-ui/src/apollo/server/schema.ts @@ -863,6 +863,6 @@ export const typeDefs = gql` # Recommendation questions generateThreadRecommendationQuestions(threadId: Int!): Boolean! - generateProjectRecommendationQuestions(projectId: Int!): Boolean! + generateProjectRecommendationQuestions: Boolean! } `; diff --git a/wren-ui/src/apollo/server/services/projectService.ts b/wren-ui/src/apollo/server/services/projectService.ts index 99a2a1fde..b8b07c158 100644 --- a/wren-ui/src/apollo/server/services/projectService.ts +++ b/wren-ui/src/apollo/server/services/projectService.ts @@ -58,7 +58,7 @@ export interface IProjectService { getProjectRecommendationQuestions: () => Promise; // recommend questions - generateProjectRecommendationQuestions: (projectId: number) => Promise; + generateProjectRecommendationQuestions: () => Promise; } export class ProjectService implements IProjectService { @@ -92,12 +92,10 @@ export class ProjectService implements IProjectService { }); } - public async generateProjectRecommendationQuestions( - projectId: number, - ): Promise { - const project = await this.getProjectById(projectId); + public async generateProjectRecommendationQuestions(): Promise { + const project = await this.getCurrentProject(); if (!project) { - throw new Error(`Project ${projectId} not found`); + throw new Error(`Project not found`); } const { manifest } = await this.mdlService.makeCurrentModelMDL(); @@ -117,6 +115,10 @@ export class ProjectService implements IProjectService { this.projectRecommendQuestionBackgroundTracker.taskKey(updatedProject); if (!tasks[taskKey]) { this.projectRecommendQuestionBackgroundTracker.addTask(updatedProject); + } else { + logger.debug( + `Generate Project Recommendation Questions Task ${taskKey} already exists, skip adding`, + ); } }