Merge pull request #2500 from refugies-info/matthieu/ri-405-les-fiche…

…s-traduites-ne-passent-pas-en-publiees

fix(server): 🐛 remove administrationName from added sections if null

apps/server/src/typegoose/Traductions.test.ts

@@ -120,6 +120,25 @@ const trad_avancement: RecursivePartial<TranslationContent> = {
   validatorId: new ObjectId("656076dbaf8df7a3f7bceeb4"),
 };
 
+const trad_added_adminName: TranslationContent = {
+  //@ts-ignore
+  content: {
+    titreInformatif: "abc",
+    titreMarque: "def",
+    abstract: "tyui",
+    what: "WHAT",
+    how: { "my-uuid-v4-key": { title: "title", text: "text" } },
+    next: {
+      "my-uuid-v4-key": { title: "title", text: "text" },
+      "my-uuid-v4-key-2": { title: "title", text: "text" },
+      "my-uuid-v4-key-3": { title: "title", text: "text" },
+    },
+  },
+
+  created_at: new Date(),
+  validatorId: new ObjectId("656076dbaf8df7a3f7bceeb4"),
+};
+
 describe("Traductions", () => {
   describe("diff", () => {
     it("should return empty array", () => {
@@ -153,6 +172,15 @@ describe("Traductions", () => {
         removed: ["content.next.my-uuid-v4-key.title", "content.next.my-uuid-v4-key.text"],
       });
     });
+    it("should not return administrationName ", () => {
+      const newTradAdded = JSON.parse(JSON.stringify(trad_added_adminName));
+      newTradAdded.content = { ...newTradAdded.content, administrationName: null };
+      expect(Traductions.diff(trad_added_adminName, newTradAdded)).toEqual({
+        modified: [],
+        added: [],
+        removed: [],
+      });
+    });
   });
 
   describe("computeFinished", () => {

apps/server/src/typegoose/Traductions.ts

@@ -122,7 +122,9 @@ export class Traductions extends Base {
     const originKeys = keys(origin);
     const compareToKeys = keys(compareTo);
     // ces champs devront être traduits impérativement => to review
-    const added = difference(compareToKeys, originKeys);
+    const added = difference(compareToKeys, originKeys).filter(
+      (key: keyof TranslationContent) => get(compareTo, key) !== null,
+    );
     // les champs supprimés peuvent être traités automatiquement sans re-traduction
     const removed = difference(originKeys, compareToKeys);
 

migrations/1733826190794_RemoveStuckedToReview.ts

@@ -0,0 +1,22 @@
+import { MigrationInterface } from "mongo-migrate-ts";
+import { Db } from "mongodb";
+
+export class Migration1733826190794 implements MigrationInterface {
+  public async up(db: Db): Promise<void | never> {
+    const trads = await db.collection("traductions").find({ toReview: "content.administrationName" }).toArray();
+    for (const trad of trads) {
+      const dispositif = await db.collection("dispositifs").findOne({ _id: trad.dispositifId });
+      if (dispositif && dispositif.translations.fr.content.administrationName === null) {
+        //@ts-ignore
+        await db
+          .collection("traductions")
+          .updateOne(
+            { _id: trad._id },
+            { $pull: { toReview: "content.administrationName", toReviewCache: "content.administrationName" } },
+          );
+      }
+    }
+  }
+
+  public async down(db: Db): Promise<void | never> {}
+}