Merge pull request #1280 from AletheiaFact/refactored-kanban-page

Refactored Kanban Page to support different `reviewTask` types
AletheiaFact · Jul 5, 2024 · 08edcb0 · 08edcb0
2 parents d7f65b1 + 8c87b90
commit 08edcb0
Show file tree

Hide file tree

Showing 61 changed files with 877 additions and 535 deletions.
diff --git a/migrations/20240701184655-add-namespace-in-review-task-schemae.ts b/migrations/20240701184655-add-namespace-in-review-task-schemae.ts
@@ -0,0 +1,51 @@
+import { Db } from "mongodb";
+const ObjectId = require("mongodb").ObjectID;
+
+export async function up(db: Db) {
+    const reviewTasksCursor = await db.collection("reviewtasks").find();
+
+    while (await reviewTasksCursor.hasNext()) {
+        const reviewTask = await reviewTasksCursor.next();
+        if (reviewTask.machine.context.claimReview.claim) {
+            const claim = await db.collection("claims").findOne({
+                _id: ObjectId(reviewTask.machine.context.claimReview.claim),
+            });
+
+            await db
+                .collection("reviewtasks")
+                .updateOne(
+                    { _id: reviewTask._id },
+                    {
+                        $set: {
+                            nameSpace: claim?.nameSpace,
+                            reviewTaskType: "Claim",
+                        },
+                    }
+                );
+        }
+
+        if (reviewTask.machine.context.claimReview.source) {
+            const source = await db.collection("sources").findOne({
+                _id: ObjectId(reviewTask.machine.context.claimReview.source),
+            });
+
+            await db
+                .collection("reviewtasks")
+                .updateOne(
+                    { _id: reviewTask._id },
+                    {
+                        $set: {
+                            nameSpace: source?.nameSpace,
+                            reviewTaskType: "Source",
+                        },
+                    }
+                );
+        }
+    }
+}
+
+export async function down(db: Db) {
+    await db
+        .collection("reviewtasks")
+        .updateMany({}, { $unset: { nameSpace: "", reviewTaskType: "" } });
+}
diff --git a/migrations/20240701191347-add-target-field-in-machine-context.ts b/migrations/20240701191347-add-target-field-in-machine-context.ts
@@ -0,0 +1,36 @@
+import { Db } from "mongodb";
+
+export async function up(db: Db) {
+    const reviewTasksCursor = await db.collection("reviewtasks").find();
+
+    while (await reviewTasksCursor.hasNext()) {
+        const reviewTask = await reviewTasksCursor.next();
+        if (reviewTask.machine.context.claimReview.claim) {
+            await db.collection("reviewtasks").updateOne(
+                { _id: reviewTask._id },
+                {
+                    $set: {
+                        target: reviewTask.machine.context.claimReview.claim,
+                    },
+                    $unset: {
+                        "machine.context.claimReview.claim": undefined,
+                    },
+                }
+            );
+        }
+
+        if (reviewTask.machine.context.claimReview.source) {
+            await db.collection("reviewtasks").updateOne(
+                { _id: reviewTask._id },
+                {
+                    $set: {
+                        target: reviewTask.machine.context.claimReview.source,
+                    },
+                    $unset: {
+                        "machine.context.claimReview.source": undefined,
+                    },
+                }
+            );
+        }
+    }
+}
diff --git a/migrations/20240701221810-rename-claim-review-field-in-review-task-schema.ts b/migrations/20240701221810-rename-claim-review-field-in-review-task-schema.ts
@@ -0,0 +1,39 @@
+import { Db } from "mongodb";
+
+export async function up(db: Db) {
+    const reviewTasksCursor = await db.collection("reviewtasks").find();
+
+    while (await reviewTasksCursor.hasNext()) {
+        const reviewTask = await reviewTasksCursor.next();
+
+        await db
+            .collection("reviewtasks")
+            .updateOne(
+                { _id: reviewTask._id },
+                {
+                    $rename: {
+                        "machine.context.claimReview": "machine.context.review",
+                    },
+                }
+            );
+    }
+}
+
+export async function down(db: Db) {
+    const reviewTasksCursor = await db.collection("reviewtasks").find();
+
+    while (await reviewTasksCursor.hasNext()) {
+        const reviewTask = await reviewTasksCursor.next();
+
+        await db
+            .collection("reviewtasks")
+            .updateOne(
+                { _id: reviewTask._id },
+                {
+                    $rename: {
+                        "machine.context.review": "machine.context.claimReview",
+                    },
+                }
+            );
+    }
+}
diff --git a/public/locales/en/kanban.json b/public/locales/en/kanban.json
@@ -1,7 +1,10 @@
 {
     "claimBy": "Claim by",
     "assignedTo": "Fact-checkers",
-    "myTasks": "My tasks only",
-    "myCrossChecks": "My cross-checks only",
-    "myReviews": "My reviews only"
+    "myAssigned": "My tasks only",
+    "myCrossChecked": "My cross-checks only",
+    "myReviewed": "My reviews only",
+    "tabClaimTitle": "Claims",
+    "tabSourceTitle": "Sources",
+    "tabVerificationRequestTitle": "Verification Requests"
 }
diff --git a/public/locales/en/reviewTask.json b/public/locales/en/reviewTask.json
@@ -59,6 +59,8 @@
     "submitted": "In review",
     "published": "Published",
     "draft": "Draft",
+    "assignedRequest": "User assigned",
+    "rejectedRequest": "Rejected",
     "crossCheckingAlertTitle": "This report is beeing cross-checked",
     "reviewingAlertTitle": "This report is beeing reviewed",
     "rejectionAlertTitle": "This review was rejected with the following comment",

diff --git a/public/locales/pt/kanban.json b/public/locales/pt/kanban.json
@@ -1,7 +1,10 @@
 {
     "claimBy": "Afirmação de",
     "assignedTo": "Checadores",
-    "myTasks": "Apenas minhas tarefas",
-    "myCrossChecks": "Apenas meus cross-checkings",
-    "myReviews": "Minhas revisões"
+    "myAssigned": "Apenas minhas tarefas",
+    "myCrossChecked": "Apenas meus cross-checkings",
+    "myReviewed": "Minhas revisões",
+    "tabClaimTitle": "Afirmações",
+    "tabSourceTitle": "Fontes",
+    "tabVerificationRequestTitle": "Denúncias"
 }
diff --git a/public/locales/pt/reviewTask.json b/public/locales/pt/reviewTask.json
@@ -59,6 +59,8 @@
     "submitted": "Em revisão",
     "published": "Publicado",
     "draft": "Rascunho",
+    "assignedRequest": "Usuário atribuído",
+    "rejectedRequest": "Rejeitado",
     "crossCheckingAlertTitle": "Este relatório está em processo de cross-checking",
     "reviewingAlertTitle": "Este relatório está em processo de revisão",
     "rejectionAlertTitle": "A revisão foi rejeitada com o seguinte comentário",

diff --git a/server/claim-review/claim-review.service.ts b/server/claim-review/claim-review.service.ts
@@ -15,8 +15,6 @@ import { REQUEST } from "@nestjs/core";
 import type { BaseRequest } from "../types";
 import { ImageService } from "../claim/types/image/image.service";
 import { ContentModelEnum } from "../types/enums";
-import lookUpPersonalityties from "../mongo-pipelines/lookUpPersonalityties";
-import lookupClaims from "../mongo-pipelines/lookupClaims";
 import { NameSpaceEnum } from "../auth/name-space/schemas/name-space.schema";
 import { EditorParseService } from "../editor-parse/editor-parse.service";
 import { WikidataService } from "../wikidata/wikidata.service";
@@ -149,8 +147,22 @@ export class ClaimReviewService {
 
         aggregation.push(
             { $match: query },
-            lookUpPersonalityties(TargetModel.ClaimReview),
-            lookupClaims(TargetModel.ClaimReview),
+            {
+                $lookup: {
+                    from: "personalities",
+                    localField: "personality",
+                    foreignField: "_id",
+                    as: "personality",
+                },
+            },
+            {
+                $lookup: {
+                    from: "claims",
+                    localField: "claim",
+                    foreignField: "_id",
+                    as: "claim",
+                },
+            },
             { $unwind: "$claim" },
             {
                 $match: {
@@ -235,12 +247,8 @@ export class ClaimReviewService {
             claimReview.personality = Types.ObjectId(claimReview.personality);
         }
 
-        if (claimReview.claim) {
-            claimReview.claim = Types.ObjectId(claimReview.claim);
-        }
-
-        if (claimReview.source) {
-            claimReview.source = Types.ObjectId(claimReview.source);
+        if (claimReview.target) {
+            claimReview.target = Types.ObjectId(claimReview.target);
         }
 
         claimReview.usersId = claimReview.report.usersId.map((userId) => {

diff --git a/server/mongo-pipelines/lookUpPersonalityties.ts b/server/mongo-pipelines/lookUpPersonalityties.ts
diff --git a/server/mongo-pipelines/lookupClaimReviews.ts b/server/mongo-pipelines/lookupClaimReviews.ts
diff --git a/server/mongo-pipelines/lookupClaimRevisions.ts b/server/mongo-pipelines/lookupClaimRevisions.ts
diff --git a/server/mongo-pipelines/lookupClaims.ts b/server/mongo-pipelines/lookupClaims.ts
diff --git a/server/mongo-pipelines/lookupUsers.ts b/server/mongo-pipelines/lookupUsers.ts
diff --git a/server/review-task/dto/create-review-task.dto.ts b/server/review-task/dto/create-review-task.dto.ts
@@ -1,11 +1,10 @@
 import { IsEnum, IsNotEmpty, IsObject, IsString } from "class-validator";
 
 import { ClassificationEnum } from "../../claim-review/dto/create-claim-review.dto";
-import { Claim } from "../../claim/schemas/claim.schema";
 import { Personality } from "../../personality/schemas/personality.schema";
 import { User } from "../../users/schemas/user.schema";
 import { ApiProperty } from "@nestjs/swagger";
-import { ReportModelEnum } from "../../types/enums";
+import { ReportModelEnum, ReviewTaskTypeEnum } from "../../types/enums";
 
 export type ReviewTaskMachineContextReviewData = {
     usersId?: any[];
@@ -29,11 +28,9 @@ export type ReviewTaskMachineContextReviewData = {
 
 export type ReviewTaskMachineContext = {
     reviewData: ReviewTaskMachineContextReviewData;
-    claimReview: {
+    review: {
         usersId?: User[];
-        data_hash: string;
         personality: Personality;
-        claim: Claim;
         isPartialReview: boolean;
         targetId: string;
     };
@@ -74,4 +71,14 @@ export class CreateReviewTaskDTO {
     @IsString()
     @ApiProperty()
     nameSpace: string;
+
+    @IsString()
+    @ApiProperty()
+    target: string;
+
+    @IsNotEmpty()
+    @IsEnum(ReviewTaskTypeEnum)
+    @IsString()
+    @ApiProperty()
+    reviewTaskType: string;
 }