FIX: Ensure untranslated post ids exclude those already translated to target locale

Author: nattsw

app/jobs/scheduled/automatic_translation_backfill.rb

@@ -15,40 +15,29 @@ def execute(args = nil)
     def fetch_untranslated_model_ids(model, content_column, limit, target_locale)
       m = model.name.downcase
 
-      # Query selects every model (post/topic) *except* those who are **both**
-      # already locale detected and translated
       DB.query_single(<<~SQL, target_locale: target_locale, limit: limit)
-        SELECT * FROM
-        (
-          ( -- every post / topic
-            SELECT m.id
-            FROM #{model.table_name} m
-            #{limit_to_public_clause(model)}
-            WHERE m.deleted_at IS NULL
-              AND m.#{content_column} != ''
-              AND m.user_id > 0
-              #{max_age_clause}
-            ORDER BY m.updated_at DESC
-          )
-          EXCEPT
-          (
-            ( -- locale detected
-              SELECT
-                #{m}_id
-              FROM
-                discourse_translator_#{m}_locales
-              WHERE
-                detected_locale = :target_locale
+        SELECT m.id
+        FROM #{model.table_name} m
+        #{limit_to_public_clause(model)}
+        WHERE m.deleted_at IS NULL
+          AND m.#{content_column} != ''
+          AND m.user_id > 0
+          #{max_age_clause}
+          AND (
+            m.id NOT IN (
+              SELECT #{m}_id
+              FROM discourse_translator_#{m}_locales
+              WHERE detected_locale = :target_locale
             )
-            INTERSECT
-            ( -- translated
+          )
+          AND (
+            m.id NOT IN (
               SELECT #{m}_id
               FROM discourse_translator_#{m}_translations
-              WHERE
-                locale = :target_locale
+              WHERE locale = :target_locale
             )
           )
-        ) AS subquery
+        ORDER BY m.updated_at DESC
         LIMIT :limit
       SQL
     end

spec/jobs/automatic_translation_backfill_spec.rb

@@ -251,5 +251,13 @@ def expect_google_translate(text)
 
       expect(result).not_to include(post_1.id)
     end
+
+    it "does not return posts that already have the target locale translation, even if detected_locale is not the target" do
+      post_7.set_detected_locale("en")
+      post_7.set_translation("de", "hallo")
+
+      result = described_class.new.fetch_untranslated_model_ids(Post, "raw", 50, "de")
+      expect(result).not_to include(post_7.id)
+    end
   end
 end