Merge pull request #35 from xeptagondev/meedan_label_issue

Meedan label issue

Author: janithr1

apps/publisher/src/wp-publisher/wp-publisher-helper.service.ts

@@ -1,12 +1,12 @@
-import { TasksLabels } from "@iverify/common/src";
+import { getLabel, MeedanLabels,} from "@iverify/common/src";
 import { Injectable } from "@nestjs/common";
 import { CommentStatus, CreatePostDto, PostFields, PostFormat, PostStatus } from "libs/wp-client/src/lib/interfaces/create-post.dto";
 import { SharedHelper } from "../shared/helper";
 var showdown  = require('showdown')
 
 @Injectable()
 export class WpPublisherHelper{
-    lang = process.env.language;
+    lang = process.env.language + `-` + process.env.COUNTRY_CODE;
 
     constructor(private sharedHelper: SharedHelper){}
 
@@ -36,22 +36,22 @@ export class WpPublisherHelper{
         const title = meedanReport.title;
         const subtitle = meedanReport.description;
 
-        const violation_type = this.sharedHelper.extractTask(report, TasksLabels[this.lang].violation_type);
+        const violation_type = this.sharedHelper.extractTask(report, getLabel(this.lang, MeedanLabels.VIOLATION_TYPE));
         // const toxicField = this.sharedHelper.extractTask(report, TasksLabels[this.lang].toxic);
         // const toxic = !!toxicField ? 1 : 0;
-        const toxic = (violation_type === TasksLabels[this.lang].violation_hate_speech) ? 1 : 0;
+        const toxic = (violation_type === getLabel(this.lang, MeedanLabels.VIOLATION_HATE_SPEECH)) ? 1 : 0;
         const factchecking_status = this.extractFactcheckingStatus(report);
         const claim = this.sharedHelper.extractTitle(report);
         // this.sharedHelper.extractTask(report, TasksLabels[this.lang].claim);
-        let rating_justification = this.sharedHelper.extractTask(report, TasksLabels[this.lang].rating_justification);
+        let rating_justification = this.sharedHelper.extractTask(report, getLabel(this.lang, MeedanLabels.RATING_JUSTIFICATION));
         rating_justification = this.formatMarkupText(rating_justification);
-        const evidence = this.sharedHelper.extractTask(report, TasksLabels[this.lang].evidences_and_references);
+        const evidence = this.sharedHelper.extractTask(report,getLabel(this.lang, MeedanLabels.EVIDENCES_AND_REFERENCES));
         const evidence_and_references = this.formatEvidence(evidence);
         const _webdados_fb_open_graph_specific_image = visualCard;
-        const category = this.sharedHelper.extractTask(report, TasksLabels[this.lang].category_checked);
+        const category = this.sharedHelper.extractTask(report, getLabel(this.lang, MeedanLabels.CATEGORY_CHECKED));
         const fields: PostFields = {check_id, factchecking_status, claim, rating_justification, evidence_and_references, subtitle, toxic,category};
         console.log('visual card url: ', _webdados_fb_open_graph_specific_image)
-        const email_address = this.sharedHelper.extractTask(report, TasksLabels[this.lang].email_address);
+        const email_address = this.sharedHelper.extractTask(report, getLabel(this.lang, MeedanLabels.EMAIL_ADDRESS));
         const post: CreatePostDto = {
           format,
           author,

apps/triage/src/app/app.service.ts

@@ -1,4 +1,4 @@
-import { HttpException, HttpService, Injectable, Logger } from '@nestjs/common';
+import { HttpException, Injectable, Logger } from '@nestjs/common';
 import { CrowdtangleClientService } from 'libs/crowdtangle-client/src/lib/crowdtangle-client.service';
 import { UnitedwaveClientService } from 'libs/unitedwave-client/src/lib/unitedwave-client.service';
 import { MeedanCheckClientService, ToxicityScores } from '@iverify/meedan-check-client';

libs/common/src/lib/common.ts

@@ -1,3 +1,21 @@
+import { TasksLabels } from "./tasks-labels";
+
 export function common(): string {
   return 'common';
 }
+
+
+export function getLabel(lang, key) {
+  // Check the country-specific language first
+  if (TasksLabels[lang] && TasksLabels[lang][key]) {
+      return TasksLabels[lang][key];
+  }
+  // Fallback to base language (e.g., 'en' from 'en-malawi')
+  const baseLang = lang.split('-')[0]; // Extract base language code
+  console.log('baselang', baseLang,lang)
+  if (TasksLabels[baseLang] && TasksLabels[baseLang][key]) {
+      return TasksLabels[baseLang][key];
+  }
+  // If key is not found in either, return null or a default value
+  return null;
+}

libs/common/src/lib/tasks-labels.ts

@@ -178,5 +178,61 @@ export const TasksLabels = {
       message:'message',
       original_reported_date: 'original_reported_date',
       meedan_category:'category'
-  },
+
+    },
+    "en-mw": {
+      rating_justification: 'Verdict and Verification Process',
+      evidences_and_references: 'Evidence and References',
+      violation_type: 'Type of Violation',
+      meedan_category:'Category',
+      email_address: 'Email Address',
+      upload_file: 'Upload Files',
+    }
+}
+
+
+export enum MeedanLabels {
+  CLAIM = "claim",
+  RATING_JUSTIFICATION = "rating_justification",
+  EVIDENCES_AND_REFERENCES = "evidences_and_references",
+  CARD_TITLE = "card_title",
+  TOXIC = "toxic",
+  THREAT_LEVEL = "threat_level",
+  VIOLATION_TYPE = "violation_type",
+  DISINFO_TYPE = "disinfo_type",
+  HATE_SPEECH_TYPE = "hate_speech_type",
+  TOXIC_SCORE = "toxic_score",
+  OBSCENE_SCORE = "obscene_score",
+  IDENTITY_SCORE = "identity_score",
+  THREAT_SCORE = "threat_score",
+  SEXUALLY_EXPLICIT_SCORE = "sexually_explicit_score",
+  D_TOXIC_SCORE = "d_toxic_score",
+  D_SEVERE_TOXIC_SCORE = "d_severe_toxic_score",
+  D_OBSCENE_SCORE = "d_obscene_score",
+  D_IDENTITY_SCORE = "d_identity_score",
+  D_INSULT_SCORE = "d_insult_score",
+  D_THREAT_SCORE = "d_threat_score",
+  D_SEXUALLY_EXPLICIT_SCORE = "d_sexually_explicit_score",
+  VIOLATION_DISINFO = "violation_disinfo",
+  VIOLATION_MISINFO = "violation_misinfo",
+  VIOLATION_HATE_SPEECH = "violation_hate_speech",
+  VIOLATION_THREAT = "violation_threat",
+  VIOLATION_VIOLENCE = "violation_violence",
+  VIOLATION_NO_THREAT = "violation_no_threat",
+  STATUS_UNSTARTED = "status_unstarted",
+  STATUS_IN_PROGRESS = "status_in_progress",
+  STATUS_FALSE = "status_false",
+  STATUS_TRUE = "status_true",
+  STATUS_MISLEADING = "status_misleading",
+  STATUS_OUT_OF_SCOPE = "status_out_of_scope",
+  STATUS_PARTLY_FALSE = "status_partly_false",
+  STATUS_INCONCLUSIVE = "status_inconclusive",
+  STATUS_PRE_CHECKED = "status_pre_checked",
+  CATEGORY_CHECKED = "category_checked",
+  EMAIL_ADDRESS = "email_address",
+  UPLOAD_FILE = "upload_file",
+  AUDIO_URL = "audio_url",
+  MESSAGE = "message",
+  ORIGINAL_REPORTED_DATE = "original_reported_date",
+  MEEDAN_CATEGORY = "meedan_category",
 }

libs/meedan-check-client/src/lib/check-stats.service.ts

@@ -1,7 +1,7 @@
 import { TasksLabels } from "@iverify/common/src";
 import { HttpException, HttpService, Injectable, Logger } from "@nestjs/common";
 import { combineLatest, from, Observable } from "rxjs";
-import { catchError, concatMap, filter, first, map, reduce, retry, take, tap } from "rxjs/operators";
+import { catchError, concatMap, filter, map, reduce, retry} from "rxjs/operators";
 import { CheckClientConfig } from "./config";
 import { CheckClientHelperService } from "./helper.service";
 // import { StatusesMap, TasksLabels } from "@iverify/iverify-common";
@@ -12,12 +12,12 @@ export class CheckStatsService{
     lang = process.env.language;
 
     constructor(
-        private http: HttpService, 
+        private http: HttpService,
         private config: CheckClientConfig,
         private helper: CheckClientHelperService
         ){}
 
-    
+
 
     getTicketsByAgent(statuses: string[]): Observable<any>{
         const teamSlug = this.config.checkApiTeam;
@@ -29,7 +29,7 @@ export class CheckStatsService{
                 this.logger.error(`Error getting tickets by agents: `, err.message)
                 throw new HttpException(err.message, 500);
             })
-        )         
+        )
     }
 
     getByAgentAllStatuses(agent: any, statuses: string[]){
@@ -57,7 +57,7 @@ export class CheckStatsService{
             this.logger.error(`Error getting tickets for agentId ${agentId} and status ${status}: `, err.message)
             throw new HttpException(err.message, 500);
             })
-        );  
+        );
     }
 
     getAllAgents(teamSlug: string){
@@ -71,7 +71,7 @@ export class CheckStatsService{
             this.logger.error('Error getting all agents: ', err.message)
             throw new HttpException(err.message, 500);
             })
-        );  
+        );
     }
 
     getTicketsByInputProjects(){
@@ -116,7 +116,7 @@ export class CheckStatsService{
             this.logger.error(`Error getting tickets for projectId ${projectId}: `, err.message)
             throw new HttpException(err.message, 500);
             })
-        );  
+        );
     }
 
     getAllProjects(teamSlug: string){
@@ -130,7 +130,7 @@ export class CheckStatsService{
             this.logger.error('Error getting all agents: ', err.message)
             throw new HttpException(err.message, 500);
             })
-        );  
+        );
     }
 
     getTicketsByTags(): Observable<any>{
@@ -308,4 +308,4 @@ export class CheckStatsService{
             })
         );
     }
-}
+}

libs/meedan-check-client/src/lib/helper.service.ts

@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { throwIfEmpty } from 'rxjs/operators';
+// import { throwIfEmpty } from 'rxjs/operators';
 import { ToxicityScores } from './interfaces/toxicity-scores';
-import { TasksLabels } from '@iverify/common/src';
+import { getLabel, MeedanLabels} from '@iverify/common/src';
 
 @Injectable()
 export class CheckClientHelperService {
-  lang = process.env.language;
+  lang = process.env.language + `-` + process.env.COUNTRY_CODE;
   buildGetReportQuery(id: string) {
     return `query {
         project_media(ids: "${id}"){
@@ -81,9 +81,9 @@ export class CheckClientHelperService {
 
     buildCreateItemFromRadioMessage(url: string, name, content, created_date, tag = 'Radio') {
       const tasksResponsesObj = {
-        [TasksLabels[this.lang].audio_url]: url,
-        [TasksLabels[this.lang].message]: content,
-        [TasksLabels[this.lang].original_reported_date]: created_date,
+        [getLabel(this.lang, MeedanLabels.AUDIO_URL)]: url,
+        [getLabel(this.lang, MeedanLabels.MESSAGE)]: content,
+        [getLabel(this.lang, MeedanLabels.ORIGINAL_REPORTED_DATE)]: created_date,
       };
       let setTasksResponses = JSON.stringify(tasksResponsesObj);
       setTasksResponses = setTasksResponses.replace(/\\/g, '\\\\').replace(/"/g, '\\"');

libs/meedan-check-client/src/lib/meedan-check-client.service.ts

@@ -1,16 +1,16 @@
 import { HttpException, HttpService, Injectable, Logger } from '@nestjs/common';
-import { forkJoin, from, iif, Observable, of } from 'rxjs';
+import { forkJoin, from, Observable, of } from 'rxjs';
 import { catchError, map, retry, switchMap, tap } from 'rxjs/operators';
 import { CheckClientConfig } from './config';
 import { CheckClientHelperService } from './helper.service';
 import { ToxicityScores } from './interfaces/toxicity-scores';
 import { S3Service } from 'libs/s3/src/lib/s3.service';
 import { v4 as uuidv4 } from 'uuid';
-import { TasksLabels } from '@iverify/common/src';
+import { getLabel, MeedanLabels} from '@iverify/common/src';
 @Injectable()
 export class MeedanCheckClientService {
   private readonly logger = new Logger('MeedanCheckClient');
-  lang = process.env.language;
+  lang = process.env.language + `-` + process.env.COUNTRY_CODE;
   constructor(
     private http: HttpService,
     private config: CheckClientConfig,
@@ -204,7 +204,7 @@ export class MeedanCheckClientService {
 
     if (files) {
       const bucketName:string = process.env.AWS_BUCKET_NAME ?? 'iverify-prod-cd-web'
-      const id = this.getAnnotationId(annotationList, `${TasksLabels[this.lang].upload_file}`);
+      const id = this.getAnnotationId(annotationList, `${getLabel(this.lang, MeedanLabels.UPLOAD_FILE)}`);
       let url_format = '';
       for (let count = 1; count <= files.length; count++) {
         // Upload the current file to the bucket and get the file URL
@@ -236,7 +236,7 @@ export class MeedanCheckClientService {
   ): Observable<any> {
     const emailAnnotationId = this.getAnnotationId(
       annotationList,
-      TasksLabels[this.lang].email_address
+      getLabel(this.lang, MeedanLabels.EMAIL_ADDRESS)
     );
     const combinedQuery = this.helper.buildAnnotationItemsCombinedFromWpMutation(
       emailAnnotationId,
@@ -255,7 +255,7 @@ export class MeedanCheckClientService {
     const headers = this.config.headers;
     const categoryId = this.getAnnotationId(
       annotationList,
-      TasksLabels[this.lang].meedan_category
+      getLabel(this.lang, MeedanLabels.MEEDAN_CATEGORY)
     );
     console.log('UpdateRadioCategory',categoryId,category)
     const combinedQuery = this.helper.buildAnnotationItemsCombinedFromWpMutation(