Merge pull request #2090 from AletheiaFact/refactor-filters-Generalize-filtering-mechanism-for-Verification-Request-board

POC: New board on verification request page

Author: caneppelevitor

public/locales/en/search.json

@@ -5,5 +5,6 @@
   "searchPageTittle": "Search",
   "searchInputLabel": "searching",
   "advancedSearchLabel": "Advanced search",
-  "advancedSearchPlaceHolder": "Filter by topics"
+  "advancedSearchPlaceHolder": "Enter a topic..."
+
 }

public/locales/en/verificationRequest.json

@@ -58,16 +58,26 @@
     "contentFilterLabel": "Content:",
     "filterByTypeLabel": "Filter by",
     "topicsFilterOption": "Topics",
+    "impactAreaFilterOption": "Impact Areas",
     "contentFilterOption": "Content",
     "filterByContentLabel": "Filter by Content",
     "applyButtonLabel": "Apply",
     "showText": "Show",
-    "reportedContent": "Reported Content",
-    "contentTypeLabel": "Content Type",
-    "receptionChannelLabel": "Reception Channel",
-    "impactAreaLabel": "Impact Area",
-    "severityLabel": "Severity",
-    "editVerificationRequestSuccess": "Verification Request edited successfully",
-    "editVerificationRequestError": "Error while editing the Verification Request",
-    "titleEditVerificationRequest": "Verification Request Edition"
-}
+    "statusPreTriage": "Pre Triage",
+    "statusInTriage": "In Triage",
+    "statusPosted": "Posted",
+    "statusDeclined": "Declined",
+    "allPriorities": "All Priorities",
+    "allSourceChannels": "All Source Channels",
+    "priorityCritical": "Critical",
+    "priorityHigh": "High",
+    "priorityMedium": "Medium",
+    "priorityLow": "Low",
+    "automated_monitoring": "Automated Monitoring",
+    "filterByPriority": "Filter by Priority",
+    "filterBySourceChannel": "Filter by Source Channel",
+    "noRequestsInStatus": "No requests in this status",
+    "statusFilterOption": "Status",
+    "statusFilterLabel": "Status:",
+    "impactAreaFilterLabel": "Impact Area:"
+}

public/locales/pt/search.json

@@ -5,5 +5,5 @@
   "searchPageTittle": "Busca",
   "searchInputLabel": "pesquisar",
   "advancedSearchLabel": "Pesquisa avançada",
-  "advancedSearchPlaceHolder": "Filtrar por tópicos"
+  "advancedSearchPlaceHolder": "Digite um tópico..."
 }

public/locales/pt/verificationRequest.json

@@ -58,16 +58,26 @@
     "contentFilterLabel": "Conteúdo:",
     "filterByTypeLabel": "Filtrar por",
     "topicsFilterOption": "Tópicos",
+    "impactAreaFilterOption": "Áreas de impacto",
     "contentFilterOption": "Conteudo",
     "filterByContentLabel": "Filtrar por Conteudo",
     "applyButtonLabel": "Aplicar",
     "showText": "Mostrar",
-    "reportedContent": "Conteúdo Reportado",
-    "contentTypeLabel": "Tipo de Conteúdo",
-    "receptionChannelLabel": "Canal de Recepção",
-    "impactAreaLabel": "Área de impacto",
-    "severityLabel": "Prioridade",
-    "editVerificationRequestSuccess": "Denúncia editada com sucesso",
-    "editVerificationRequestError": "Erro ao editar a denúncia",
-    "titleEditVerificationRequest": "Edição de Denúncia"
+    "statusPreTriage": "Pré-Triagem",
+    "statusInTriage": "Em Triagem",
+    "statusPosted": "Publicado",
+    "statusDeclined": "Recusado",
+    "allPriorities": "Todas as Prioridades",
+    "allSourceChannels": "Todos os Canais de Origem",
+    "priorityCritical": "Crítica",
+    "priorityHigh": "Alta",
+    "priorityMedium": "Média",
+    "priorityLow": "Baixa",
+    "automated_monitoring": "Monitoramento Automatizado",
+    "filterByPriority": "Filtrar por Prioridade",
+    "filterBySourceChannel": "Filtrar por Canal de Origem",
+    "noRequestsInStatus": "Nenhuma solicitação neste status",
+    "statusFilterOption": "Status",
+    "statusFilterLabel": "Status:",
+    "impactAreaFilterLabel": "Área de Impacto:"
 }

server/claim/types/image/image.service.ts

@@ -1,4 +1,4 @@
-import { Inject, Injectable, NotFoundException, Scope } from "@nestjs/common";
+import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from "@nestjs/common";
 import { InjectModel } from "@nestjs/mongoose";
 import { HistoryService } from "../../../history/history.service";
 import { Model } from "mongoose";
@@ -46,6 +46,9 @@ export class ImageService {
     }
 
     async getByDataHash(data_hash) {
+        if (typeof data_hash !== "string" || data_hash.length !== 32) {
+              throw new BadRequestException("Invalid data hash format.");
+            }
         const report = await this.reportService.findByDataHash(data_hash);
         const image = await this.ImageModel.findOne({ data_hash });
         if (image) {

server/claim/types/sentence/sentence.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, NotFoundException } from "@nestjs/common";
+import { BadRequestException, Injectable, NotFoundException } from "@nestjs/common";
 import { Model } from "mongoose";
 import { SentenceDocument, Sentence } from "./schemas/sentence.schema";
 import { InjectModel } from "@nestjs/mongoose";
@@ -29,8 +29,13 @@ export class SentenceService {
     }
 
     async getByDataHash(data_hash) {
+        if (typeof data_hash !== "string") {
+          throw new BadRequestException("Invalid data_hash: must be a string.");
+        }
         const report = await this.reportService.findByDataHash(data_hash);
-        const sentence = await this.SentenceModel.findOne({ data_hash });
+        const sentence = await this.SentenceModel.findOne({
+          data_hash: { $eq: data_hash },
+        });
         if (sentence) {
             sentence.props = {
                 classification: report?.classification,
@@ -45,11 +50,18 @@ export class SentenceService {
     async updateSentenceWithTopics(topics, data_hash) {
         const sentence = await this.getByDataHash(data_hash);
 
+        if (!Array.isArray(topics) || !topics.every((t) => typeof t === "string")) {
+          throw new BadRequestException("Invalid topics array.");
+        }
+
         const newSentence = {
             ...sentence.toObject(),
             topics,
         };
-        return this.SentenceModel.updateOne({ _id: sentence._id }, newSentence);
+        return this.SentenceModel.updateOne(
+          { _id: sentence._id },
+          { $set: { topics } }
+        );
     }
 
     async findAll({
@@ -179,4 +191,4 @@ export class SentenceService {
             ),
         };
     }
-}
+}

server/report/report.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from "@nestjs/common";
+import { BadRequestException, Injectable } from "@nestjs/common";
 import { InjectModel } from "@nestjs/mongoose";
 import { Model } from "mongoose";
 import { SourceService } from "../source/source.service";
@@ -54,7 +54,11 @@ export class ReportService {
         return this.sourceService.update(data_hash, newSourceBody);
     }
 
-    findByDataHash(data_hash) {
-        return this.ReportModel.findOne({ data_hash });
-    }
+  findByDataHash(data_hash: string) {
+  if (!data_hash || typeof data_hash !== "string" || data_hash.length !== 32) {
+    throw new BadRequestException("Invalid data hash provided.");
+  }
+
+  return this.ReportModel.findOne({ data_hash: { $eq: data_hash } });
 }
+}

server/topic/topic.controller.ts

@@ -5,28 +5,31 @@ import { ApiTags } from "@nestjs/swagger";
 
 @Controller()
 export class TopicController {
-    constructor(private topicService: TopicService) {}
+  constructor(private topicService: TopicService) {}
 
-    @IsPublic()
-    @ApiTags("topics")
-    @Get("api/topics")
-    public async getAll(@Query() getTopics) {
-        return this.topicService.findAll(getTopics);
-    }
+  @IsPublic()
+  @ApiTags("topics")
+  @Get("api/topics")
+  public async getAll(@Query() getTopics) {
+    return this.topicService.findAll(getTopics);
+  }
 
-    @ApiTags("topics")
-    @Get("api/topics/search")
-    async searchTopics(@Query("query") query: string) {
-        const topicsList = await this.topicService.searchTopics(query);
-        return topicsList;
-    }
+  @ApiTags("topics")
+  @Get("api/topics/search")
+  async searchTopics(
+    @Query("query") query: string,
+    @Query("limit") limit: number = 10,
+    @Query("language") language: string = "pt"
+  ) {
+    return this.topicService.searchTopics(query, language, limit);
+  }
 
-    @ApiTags("topics")
-    @Post("api/topics")
-    create(@Body() topicBody, @Req() req) {
-        return this.topicService.create(
-            topicBody,
-            req.cookies.default_language
-        );
-    }
+  @ApiTags("topics")
+  @Post("api/topics")
+  create(@Body() topicBody, @Req() req) {
+    return this.topicService.create(
+        topicBody,
+        req.cookies.default_language
+    );
+  }
 }

server/topic/topic.service.ts

@@ -25,13 +25,23 @@ export class TopicService {
         );
     }
 
-    async searchTopics(query: string, language = "pt"): Promise<Topic[]> {
-        return this.TopicModel.find({
-            name: { $regex: query, $options: "i" },
-            language,
-        });
+  async searchTopics(
+    query: string,
+    language = "pt",
+    limit = 10
+  ): Promise<Topic[]> {
+    if (typeof language !== "string") {
+       throw new TypeError("Invalid language");
     }
 
+    return this.TopicModel.find({
+    name: { $regex: query, $options: "i" },
+    language: { $eq: language }
+  })
+    .limit(limit)
+    .sort({ name: 1 });
+  }
+
     /**
      *
      * @param getTopics options to fetch topics
@@ -121,4 +131,12 @@ export class TopicService {
     getBySlug(slug) {
         return this.TopicModel.findOne({ slug });
     }
+    /**
+     *
+     * @param names topic names array
+     * @returns topics
+     */
+    findByNames(names: string[]) {
+        return this.TopicModel.find({ name: { $in: names } });
+    }
 }

server/verification-request/dto/types.ts

@@ -18,6 +18,14 @@ export enum VerificationRequestStatus {
     DECLINED = "Declined",
 }
 
+export enum VerificationRequestSourceChannel {
+    Website = "Web",
+    Instagram = "instagram",
+    Whatsapp = "whatsapp",
+    Telegram = "telegram",
+    AutomatedMonitoring = "automated_monitoring",
+}
+
 export enum VerificationRequestStateMachineStates {
     REQUESTING = 'requesting',
     CREATING = 'creating',
@@ -42,7 +50,7 @@ export enum VerificationRequestStateMachineEvents {
     DEFINE_TOPICS = 'defineTopics',
     DEFINE_IMPACT_AREA = 'defineImpactArea',
     DEFINE_SEVERITY = 'defineSeverity',
-} 
+}
 
 export const VerificationRequestMessages = {
     DESCRIPTIONS: {
@@ -56,7 +64,7 @@ export const VerificationRequestMessages = {
         CANCELLING: 'Verification is being cancelled. Status changes to Cancelled.',
         CANCELLED: 'Verification has been cancelled.',
         ERROR:
-        'An unhandled error occurred on any of the steps of the request process.\n\nShould notify all entities associated and to inner channels.',
+            'An unhandled error occurred on any of the steps of the request process.\n\nShould notify all entities associated and to inner channels.',
     },
     ERRORS: {
         LOCATION_SERVICE_PROVIDER_OR_USER_NOT_FOUND: 'Location, Service, Provider or User not  found.',