From d72b2487f50559652e14b3befe0e015b71fedef4 Mon Sep 17 00:00:00 2001 From: Aditya Anand M C Date: Wed, 20 Nov 2024 18:12:01 +0530 Subject: [PATCH 1/2] add evaluator status --- src/controllers/evaluationController.ts | 2 ++ src/entity/Evaluation.ts | 11 ++++++ ...5729635-Add-Evaluation-EvaluationStatus.ts | 34 +++++++++++++++++++ src/routes/evaluationRoutes.ts | 1 + src/service/EvaluationService.ts | 17 +++++++++- 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts diff --git a/src/controllers/evaluationController.ts b/src/controllers/evaluationController.ts index 19b32fd..8092967 100644 --- a/src/controllers/evaluationController.ts +++ b/src/controllers/evaluationController.ts @@ -111,6 +111,7 @@ export const evaluateApplication = async ( alloApplicationId, cid, evaluator, + evaluationStatus, summaryInput, chainId, signature, @@ -126,6 +127,7 @@ export const evaluateApplication = async ( alloApplicationId, cid, evaluator, + evaluationStatus, summaryInput, }; diff --git a/src/entity/Evaluation.ts b/src/entity/Evaluation.ts index dac0260..16ecbbb 100644 --- a/src/entity/Evaluation.ts +++ b/src/entity/Evaluation.ts @@ -16,6 +16,11 @@ export enum EVALUATOR_TYPE { LLM_GPT3 = 'llm_gpt3', // evaluator: address(1) } +export enum EVALUATION_STATUS { + APPROVED = 'approved', + REJECTED = 'rejected', +} + @Entity() @Unique(['evaluator', 'applicationId']) export class Evaluation { @@ -37,6 +42,12 @@ export class Evaluation { @Column() evaluatorScore: number; + @Column({ + type: 'enum', + enum: EVALUATION_STATUS, + }) + evaluationStatus: EVALUATION_STATUS; + @Column() metadataCid: string; diff --git a/src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts b/src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts new file mode 100644 index 0000000..e71c8a5 --- /dev/null +++ b/src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts @@ -0,0 +1,34 @@ +import { type MigrationInterface, type QueryRunner } from "typeorm"; + +export class AddEvaluationEvaluationStatus1732105729635 implements MigrationInterface { + name = 'AddEvaluationEvaluationStatus1732105729635' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "evaluation" DROP CONSTRAINT "FK_f459958482585b957ef22cca734"`); + await queryRunner.query(`ALTER TABLE "evaluation_answer" DROP CONSTRAINT "FK_758462d7b628e9d86fe25861566"`); + await queryRunner.query(`ALTER TABLE "evaluation_question" DROP CONSTRAINT "FK_afa6632818bad5e99f65a6261ed"`); + await queryRunner.query(`ALTER TABLE "application" DROP CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284"`); + await queryRunner.query(`CREATE TYPE "public"."evaluation_evaluationstatus_enum" AS ENUM('approved', 'rejected')`); + await queryRunner.query(`ALTER TABLE "evaluation" ADD "evaluationStatus" "public"."evaluation_evaluationstatus_enum" NOT NULL`); + await queryRunner.query(`ALTER TABLE "evaluation" ADD CONSTRAINT "FK_f459958482585b957ef22cca734" FOREIGN KEY ("applicationId") REFERENCES "application"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "evaluation_answer" ADD CONSTRAINT "FK_ffe01531544524587279e70fe15" FOREIGN KEY ("evaluationId") REFERENCES "evaluation"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "evaluation_answer" ADD CONSTRAINT "FK_758462d7b628e9d86fe25861566" FOREIGN KEY ("evaluationQuestionId") REFERENCES "evaluation_question"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "evaluation_question" ADD CONSTRAINT "FK_afa6632818bad5e99f65a6261ed" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "application" ADD CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "application" DROP CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284"`); + await queryRunner.query(`ALTER TABLE "evaluation_question" DROP CONSTRAINT "FK_afa6632818bad5e99f65a6261ed"`); + await queryRunner.query(`ALTER TABLE "evaluation_answer" DROP CONSTRAINT "FK_758462d7b628e9d86fe25861566"`); + await queryRunner.query(`ALTER TABLE "evaluation_answer" DROP CONSTRAINT "FK_ffe01531544524587279e70fe15"`); + await queryRunner.query(`ALTER TABLE "evaluation" DROP CONSTRAINT "FK_f459958482585b957ef22cca734"`); + await queryRunner.query(`ALTER TABLE "evaluation" DROP COLUMN "evaluationStatus"`); + await queryRunner.query(`DROP TYPE "public"."evaluation_evaluationstatus_enum"`); + await queryRunner.query(`ALTER TABLE "application" ADD CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "evaluation_question" ADD CONSTRAINT "FK_afa6632818bad5e99f65a6261ed" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "evaluation_answer" ADD CONSTRAINT "FK_758462d7b628e9d86fe25861566" FOREIGN KEY ("evaluationQuestionId") REFERENCES "evaluation_question"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); + await queryRunner.query(`ALTER TABLE "evaluation" ADD CONSTRAINT "FK_f459958482585b957ef22cca734" FOREIGN KEY ("applicationId") REFERENCES "application"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); + } + +} diff --git a/src/routes/evaluationRoutes.ts b/src/routes/evaluationRoutes.ts index 433f3cc..ff8ca72 100644 --- a/src/routes/evaluationRoutes.ts +++ b/src/routes/evaluationRoutes.ts @@ -59,6 +59,7 @@ const router = Router(); * alloPoolId: "609" * alloApplicationId: "0" * evaluator: "0x12345abcdef67890" + * evaluationStatus: "APPROVED" * cid: "cid1234567890" * summaryInput: * questions: diff --git a/src/service/EvaluationService.ts b/src/service/EvaluationService.ts index 3e4c67d..d68e11f 100644 --- a/src/service/EvaluationService.ts +++ b/src/service/EvaluationService.ts @@ -1,4 +1,8 @@ -import { type Evaluation, EVALUATOR_TYPE } from '@/entity/Evaluation'; +import { + type Evaluation, + EVALUATION_STATUS, + EVALUATOR_TYPE, +} from '@/entity/Evaluation'; import { evaluationQuestionRepository, evaluationRepository, @@ -27,6 +31,7 @@ export interface CreateEvaluationParams { cid: string; evaluator: string; summaryInput: EvaluationSummaryInput; + evaluationStatus?: EVALUATION_STATUS; evaluatorType?: EVALUATOR_TYPE; } @@ -70,6 +75,7 @@ class EvaluationService { cid, evaluator, summaryInput, + evaluationStatus = EVALUATION_STATUS.REJECTED, evaluatorType = EVALUATOR_TYPE.HUMAN, }: CreateEvaluationParams): Promise { const { questions, summary } = summaryInput; @@ -97,12 +103,21 @@ class EvaluationService { (1 - totalScore / maxPossibleScore) * 100 ); + // Set the evaluation status if the evaluator is not human + if (evaluatorType !== EVALUATOR_TYPE.HUMAN) { + evaluationStatus = + evaluatorScore >= 60 + ? EVALUATION_STATUS.APPROVED + : EVALUATION_STATUS.REJECTED; + } + // Create the Evaluation const evaluation = await this.createEvaluation({ evaluator, evaluatorType, summary, evaluatorScore, + evaluationStatus, metadataCid: cid, applicationId: application.id, application, From 1e49e93aa2bb775d85c630f49cc33a5705f88267 Mon Sep 17 00:00:00 2001 From: Aditya Anand M C Date: Wed, 20 Nov 2024 18:21:56 +0530 Subject: [PATCH 2/2] add evaluation status --- ...5729635-Add-Evaluation-EvaluationStatus.ts | 34 ------------------- ...tion.ts => 1732106699497-InitMigration.ts} | 10 +++--- src/routes/evaluationRoutes.ts | 2 +- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts rename src/migration/{1732016597076-InitMigration.ts => 1732106699497-InitMigration.ts} (84%) diff --git a/src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts b/src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts deleted file mode 100644 index e71c8a5..0000000 --- a/src/migration/1732105729635-Add-Evaluation-EvaluationStatus.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { type MigrationInterface, type QueryRunner } from "typeorm"; - -export class AddEvaluationEvaluationStatus1732105729635 implements MigrationInterface { - name = 'AddEvaluationEvaluationStatus1732105729635' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "evaluation" DROP CONSTRAINT "FK_f459958482585b957ef22cca734"`); - await queryRunner.query(`ALTER TABLE "evaluation_answer" DROP CONSTRAINT "FK_758462d7b628e9d86fe25861566"`); - await queryRunner.query(`ALTER TABLE "evaluation_question" DROP CONSTRAINT "FK_afa6632818bad5e99f65a6261ed"`); - await queryRunner.query(`ALTER TABLE "application" DROP CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284"`); - await queryRunner.query(`CREATE TYPE "public"."evaluation_evaluationstatus_enum" AS ENUM('approved', 'rejected')`); - await queryRunner.query(`ALTER TABLE "evaluation" ADD "evaluationStatus" "public"."evaluation_evaluationstatus_enum" NOT NULL`); - await queryRunner.query(`ALTER TABLE "evaluation" ADD CONSTRAINT "FK_f459958482585b957ef22cca734" FOREIGN KEY ("applicationId") REFERENCES "application"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "evaluation_answer" ADD CONSTRAINT "FK_ffe01531544524587279e70fe15" FOREIGN KEY ("evaluationId") REFERENCES "evaluation"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "evaluation_answer" ADD CONSTRAINT "FK_758462d7b628e9d86fe25861566" FOREIGN KEY ("evaluationQuestionId") REFERENCES "evaluation_question"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "evaluation_question" ADD CONSTRAINT "FK_afa6632818bad5e99f65a6261ed" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "application" ADD CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE CASCADE ON UPDATE NO ACTION`); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`ALTER TABLE "application" DROP CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284"`); - await queryRunner.query(`ALTER TABLE "evaluation_question" DROP CONSTRAINT "FK_afa6632818bad5e99f65a6261ed"`); - await queryRunner.query(`ALTER TABLE "evaluation_answer" DROP CONSTRAINT "FK_758462d7b628e9d86fe25861566"`); - await queryRunner.query(`ALTER TABLE "evaluation_answer" DROP CONSTRAINT "FK_ffe01531544524587279e70fe15"`); - await queryRunner.query(`ALTER TABLE "evaluation" DROP CONSTRAINT "FK_f459958482585b957ef22cca734"`); - await queryRunner.query(`ALTER TABLE "evaluation" DROP COLUMN "evaluationStatus"`); - await queryRunner.query(`DROP TYPE "public"."evaluation_evaluationstatus_enum"`); - await queryRunner.query(`ALTER TABLE "application" ADD CONSTRAINT "FK_a2d1c7a2c6ee681b42112d41284" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "evaluation_question" ADD CONSTRAINT "FK_afa6632818bad5e99f65a6261ed" FOREIGN KEY ("poolId") REFERENCES "pool"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "evaluation_answer" ADD CONSTRAINT "FK_758462d7b628e9d86fe25861566" FOREIGN KEY ("evaluationQuestionId") REFERENCES "evaluation_question"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); - await queryRunner.query(`ALTER TABLE "evaluation" ADD CONSTRAINT "FK_f459958482585b957ef22cca734" FOREIGN KEY ("applicationId") REFERENCES "application"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`); - } - -} diff --git a/src/migration/1732016597076-InitMigration.ts b/src/migration/1732106699497-InitMigration.ts similarity index 84% rename from src/migration/1732016597076-InitMigration.ts rename to src/migration/1732106699497-InitMigration.ts index 7bb89a0..e657ff3 100644 --- a/src/migration/1732016597076-InitMigration.ts +++ b/src/migration/1732106699497-InitMigration.ts @@ -1,10 +1,11 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; +import { type MigrationInterface, type QueryRunner } from "typeorm"; -export class InitMigration1732016597076 implements MigrationInterface { - name = 'InitMigration1732016597076' +export class InitMigration1732106699497 implements MigrationInterface { + name = 'InitMigration1732106699497' public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`CREATE TABLE "evaluation" ("id" SERIAL NOT NULL, "evaluator" character varying(42) NOT NULL, "evaluatorType" "public"."evaluation_evaluatortype_enum" NOT NULL, "summary" character varying NOT NULL, "evaluatorScore" integer NOT NULL, "metadataCid" character varying NOT NULL, "applicationId" integer NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "lastUpdatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_566857ce7db15aa0fb1930b4cdf" UNIQUE ("evaluator", "applicationId"), CONSTRAINT "PK_b72edd439b9db736f55b584fa54" PRIMARY KEY ("id"))`); + await queryRunner.query(`CREATE TYPE "public"."evaluation_evaluationstatus_enum" AS ENUM('approved', 'rejected')`); + await queryRunner.query(`CREATE TABLE "evaluation" ("id" SERIAL NOT NULL, "evaluator" character varying(42) NOT NULL, "evaluatorType" "public"."evaluation_evaluatortype_enum" NOT NULL, "summary" character varying NOT NULL, "evaluatorScore" integer NOT NULL, "evaluationStatus" "public"."evaluation_evaluationstatus_enum" NOT NULL, "metadataCid" character varying NOT NULL, "applicationId" integer NOT NULL, "createdAt" TIMESTAMP NOT NULL DEFAULT now(), "lastUpdatedAt" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_566857ce7db15aa0fb1930b4cdf" UNIQUE ("evaluator", "applicationId"), CONSTRAINT "PK_b72edd439b9db736f55b584fa54" PRIMARY KEY ("id"))`); await queryRunner.query(`CREATE TABLE "evaluation_answer" ("id" SERIAL NOT NULL, "answer" "public"."evaluation_answer_answer_enum" NOT NULL, "evaluationId" integer NOT NULL, "evaluationQuestionId" integer NOT NULL, CONSTRAINT "UQ_5d5571491f885c88023b5f56366" UNIQUE ("evaluationId", "evaluationQuestionId"), CONSTRAINT "PK_26adcf2e8e65214d2558b8f6910" PRIMARY KEY ("id"))`); await queryRunner.query(`CREATE TABLE "evaluation_question" ("id" SERIAL NOT NULL, "questionIndex" integer NOT NULL, "question" character varying NOT NULL, "poolId" integer NOT NULL, CONSTRAINT "UQ_bd9653bd57844a98c0863a0a5b8" UNIQUE ("poolId", "questionIndex"), CONSTRAINT "PK_6ecc0e6614b9c4bc65c6de2c021" PRIMARY KEY ("id"))`); await queryRunner.query(`CREATE TABLE "pool" ("id" SERIAL NOT NULL, "chainId" integer NOT NULL, "alloPoolId" character varying NOT NULL, CONSTRAINT "UQ_72fcaa655b2b7348f4feaf25ea3" UNIQUE ("chainId", "alloPoolId"), CONSTRAINT "PK_db1bfe411e1516c01120b85f8fe" PRIMARY KEY ("id"))`); @@ -31,6 +32,7 @@ export class InitMigration1732016597076 implements MigrationInterface { await queryRunner.query(`DROP TABLE "evaluation_question"`); await queryRunner.query(`DROP TABLE "evaluation_answer"`); await queryRunner.query(`DROP TABLE "evaluation"`); + await queryRunner.query(`DROP TYPE "public"."evaluation_evaluationstatus_enum"`); } } diff --git a/src/routes/evaluationRoutes.ts b/src/routes/evaluationRoutes.ts index ff8ca72..4f948c2 100644 --- a/src/routes/evaluationRoutes.ts +++ b/src/routes/evaluationRoutes.ts @@ -59,7 +59,7 @@ const router = Router(); * alloPoolId: "609" * alloApplicationId: "0" * evaluator: "0x12345abcdef67890" - * evaluationStatus: "APPROVED" + * evaluationStatus: "approved" * cid: "cid1234567890" * summaryInput: * questions: