Merge pull request #25 from amagovpt/PPR

Update Version
amagovpt · Dec 10, 2024 · f07daba · f07daba
2 parents dfc0bef + 417a1a7
commit f07daba
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 34 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "@nestjs/serve-static": "^3.0.1",
     "@nestjs/swagger": "^6.2.1",
     "@nestjs/typeorm": "9.0.1",
-    "@qualweb/core": "0.7.76",
+    "@qualweb/core": "0.7.77",
     "axios": "^1.3.4",
     "bcrypt": "5.1.0",
     "body-parser": "^1.20.2",

diff --git a/src/evaluation/evaluation.service.ts b/src/evaluation/evaluation.service.ts
@@ -351,7 +351,9 @@ export class EvaluationService {
 
     const newEvaluation = new Evaluation();
     newEvaluation.PageId = pageId;
-    newEvaluation.Title = evaluation.data.title.replace(/"/g, "");
+    newEvaluation.Title = evaluation.data.title
+      .replace(/"/g, "")
+      .replace(/[\u0800-\uFFFF]/g, "");
     newEvaluation.Score = evaluation.data.score;
     newEvaluation.Pagecode = Buffer.from(evaluation.pagecode).toString(
       "base64"

diff --git a/src/observatory/observatory.service.ts b/src/observatory/observatory.service.ts
@@ -165,6 +165,10 @@ export class ObservatoryService {
           }
         }
 
+        if (websitesToFetch.length === 0) {
+          continue
+        }
+
         pages = await this.observatoryRepository.query(
           `
           SELECT

diff --git a/src/page/page.service.ts b/src/page/page.service.ts
@@ -676,7 +676,7 @@ export class PageService {
   convertStringToStringArray(numStr: string): string[] {
     // remove first and last character
     numStr = numStr.substring(1, numStr.length - 1);
-    return numStr.split(",").map((s) => s.substring(1, numStr.length - 1));
+    return numStr.split(",").map((s) => s.substring(1, numStr.length - 1).replace(/"+/g, ''));
   }
 
   async createMyMonitorUserWebsitePages(
-Original file line number
+Diff line change
@@ Expand Up / @@ -165,6 +165,10 @@ export class ObservatoryService { @@
               }
             }
+            if (websitesToFetch.length === 0) {
+              continue
+            }
             pages = await this.observatoryRepository.query(
               `
               SELECT
@@ Expand Down @@