Merge pull request #11173 from opf/fix/journal-id-deletion

Do not delete data journal id, but journal_id reference
opf · Aug 18, 2022 · 4d827df · 4d827df
2 parents fa8d54a + 6a18f80
commit 4d827df
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/services/journals/create_service.rb b/app/services/journals/create_service.rb
@@ -177,22 +177,25 @@ def create_journal_sql(predecessor, notes)
     def cleanup_predecessor_data(predecessor)
       cleanup_predecessor(predecessor,
                           data_table_name,
-                          :id)
+                          :id,
+                          :data_id)
     end
 
     def cleanup_predecessor_attachable(predecessor)
       cleanup_predecessor(predecessor,
                           'attachable_journals',
-                          :journal_id)
+                          :journal_id,
+                          :id)
     end
 
     def cleanup_predecessor_customizable(predecessor)
       cleanup_predecessor(predecessor,
                           'customizable_journals',
-                          :journal_id)
+                          :journal_id,
+                          :id)
     end
 
-    def cleanup_predecessor(predecessor, table_name, column)
+    def cleanup_predecessor(predecessor, table_name, column, referenced_id)
       return "SELECT 1" unless predecessor
 
       sql = <<~SQL
@@ -204,7 +207,7 @@ def cleanup_predecessor(predecessor, table_name, column)
       SQL
 
       sanitize sql,
-               column => predecessor.id
+               column => predecessor.send(referenced_id)
     end
 
     def update_or_insert_journal_sql(predecessor, notes)