Update commands for new documents table

app/commands/v2/discard_draft.rb

@@ -63,17 +63,17 @@ def increment_live_lock_version
       end
 
       def draft
-        @draft ||= ContentItem.find_by(
-          content_id: content_id,
-          locale: locale,
+        @draft ||= ContentItem.joins(:document).find_by(
+          'documents.content_id': content_id,
+          'documents.locale': locale,
           state: "draft",
         )
       end
 
       def live
-        @live ||= ContentItem.find_by(
-          content_id: content_id,
-          locale: locale,
+        @live ||= ContentItem.joins(:document).find_by(
+          'documents.content_id': content_id,
+          'documents.locale': locale,
           state: %w(published unpublished),
         )
       end

app/commands/v2/patch_link_set.rb

@@ -136,7 +136,7 @@ def schema_validator
 
       def schema_name
         @schema_name ||= Queries::GetLatest.(
-          ContentItem.where(content_id: payload[:content_id])
+          ContentItem.where('documents.content_id': payload[:content_id])
         ).pluck(:schema_name).first
       end
     end

app/commands/v2/post_action.rb

@@ -42,9 +42,9 @@ def action_type
       end
 
       def find_content_item
-        content_item = ContentItem.find_by(
-          content_id: content_id,
-          locale: locale,
+        content_item = ContentItem.joins(:document).find_by(
+          'documents.content_id': content_id,
+          'documents.locale': locale,
           state: draft? ? %w(draft) : %w(published unpublished),
         )
 

app/commands/v2/publish.rb

@@ -85,17 +85,19 @@ def valid_update_types
 
       def find_draft_content_item
         ContentItem.find_by(
-          id: pessimistic_content_item_scope.pluck(:id),
+          document_id: pessimistic_document_scope.pluck(:id),
           state: "draft",
         )
       end
 
       def already_published?
-        ContentItem.exists?(content_id: content_id, locale: locale, state: "published")
+        ContentItem.joins(:document)
+          .exists?("documents.content_id": content_id,
+                   "documents.locale": locale, state: "published")
       end
 
-      def pessimistic_content_item_scope
-        ContentItem.where(content_id: content_id, locale: locale).lock
+      def pessimistic_document_scope
+        Document.where(content_id: content_id, locale: locale).lock
       end
 
       def clear_published_items_of_same_locale_and_base_path(content_item, locale, base_path)
@@ -127,9 +129,9 @@ def set_first_published_at(content_item)
       end
 
       def publish_redirect(previous_base_path, locale)
-        draft_redirect = ContentItem.find_by(
+        draft_redirect = ContentItem.joins(:document).find_by(
           state: "draft",
-          locale: locale,
+          "documents.locale": locale,
           base_path: previous_base_path,
           schema_name: "redirect",
         )
@@ -148,8 +150,7 @@ def publish_redirect(previous_base_path, locale)
 
       def lookup_previous_item
         previous_items = ContentItem.where(
-          content_id: content_id,
-          locale: locale,
+          document_id: pessimistic_document_scope.pluck(:id),
           state: %w(published unpublished),
         )
 

app/commands/v2/put_content.rb

@@ -107,7 +107,7 @@ def create_or_update_access_limit(content_item, users:)
 
       def find_previously_drafted_content_item
         ContentItem.find_by(
-          id: pessimistic_content_item_scope.pluck(:id),
+          document_id: pessimistic_document_scope.pluck(:id),
           state: "draft",
         )
       end
@@ -167,16 +167,16 @@ def user_facing_version_number_for_new_draft
         end
       end
 
-      def pessimistic_content_item_scope
-        ContentItem.where(content_id: content_id, locale: locale).lock
+      def pessimistic_document_scope
+        Document.where(content_id: content_id, locale: locale).lock
       end
 
       def previously_published_item
         @previously_published_item ||=
-          ContentItem.find_by(
-            content_id: content_id,
+          ContentItem.joins(:document).find_by(
+            "documents.content_id": content_id,
             state: %w(published unpublished),
-            locale: locale,
+            "documents.locale": locale,
           ) || ITEM_NOT_FOUND
       end
 

app/commands/v2/unpublish.rb

@@ -124,9 +124,9 @@ def find_unpublishable_content_item
           allowed_states = %w(draft)
         end
 
-        content_item = ContentItem.where(
-          content_id: content_id,
-          locale: locale,
+        content_item = ContentItem.joins(:document).where(
+          'documents.content_id': content_id,
+          'documents.locale': locale,
           state: allowed_states
         ).lock.first
 
@@ -139,17 +139,17 @@ def previous_item
       end
 
       def previous_items
-        @previous_items ||= ContentItem.where(
-          content_id: content_id,
-          locale: locale,
+        @previous_items ||= ContentItem.joins(:document).where(
+          'documents.content_id': content_id,
+          'documents.locale': locale,
           state: %w(published unpublished),
         )
       end
 
       def draft_exists?
-        ContentItem.where(
-          content_id: content_id,
-          locale: locale,
+        ContentItem.joins(:document).where(
+          'documents.content_id': content_id,
+          'documents.locale': locale,
           state: "draft",
         ).exists?
       end

app/presenters/change_history_presenter.rb

@@ -28,7 +28,8 @@ def change_notes_for_content_item
     end
 
     def content_item_ids
-      ContentItem.where(content_id: content_item.content_id)
+      ContentItem.joins(:document)
+                 .where('documents.content_id': content_item.content_id)
                  .where("user_facing_version <= ?", version_number)
                  .pluck(:id)
     end

app/presenters/queries/available_translations.rb

@@ -19,8 +19,9 @@ def translations
       attr_reader :content_id, :state_fallback_order, :expanded_translations
 
       def grouped_translations
-        ContentItem.where(content_id: content_id, state: state_fallback_order)
-          .pluck(:id, :locale, :state)
+        ContentItem.joins(:document)
+          .where('documents.content_id': content_id, state: state_fallback_order)
+          .pluck(:id, 'documents.locale', :state)
           .sort_by { |(_, _, state)| state_fallback_order.index(state.to_sym) }
           .group_by { |(_, locale)| locale }
       end

app/queries/get_content_item_ids_with_fallbacks.rb

@@ -6,16 +6,18 @@ def self.call(content_ids, locale_fallback_order: ContentItem::DEFAULT_LOCALE, s
       state_fallback_order = Array(state_fallback_order).map(&:to_s)
       locale_fallback_order = Array(locale_fallback_order).map(&:to_s)
 
+      documents = Document.arel_table
       content_items = ContentItem.arel_table
       unpublishings = Unpublishing.arel_table
 
       fallback_scope = content_items.project(
-        content_items[:id],
-            content_items[:content_id],
+            content_items[:id],
+            documents[:content_id],
           )
-          .where(content_items[:content_id].in(content_ids))
+          .where(documents[:content_id].in(content_ids))
           .where(content_items[:document_type].not_in(::ContentItem::NON_RENDERABLE_FORMATS))
-          .where(content_items[:locale].in(locale_fallback_order))
+          .where(documents[:locale].in(locale_fallback_order))
+          .join(documents).on(documents[:id].eq(content_items[:document_id]))
 
       if state_fallback_order.include?("withdrawn")
         fallback_scope = fallback_scope.where(content_items[:state].in(state_fallback_order).or(content_items[:state]
@@ -29,7 +31,7 @@ def self.call(content_ids, locale_fallback_order: ContentItem::DEFAULT_LOCALE, s
 
       fallback_scope = fallback_scope.order(
         order_by_clause(:content_items, :state, state_fallback_order),
-        order_by_clause(:content_items, :locale, locale_fallback_order)
+        order_by_clause(:documents, :locale, locale_fallback_order)
       )
 
       fallbacks = cte(fallback_scope, as: "fallbacks")

app/queries/get_web_content_items.rb

@@ -16,14 +16,15 @@ def self.find(content_item_id)
     end
 
     def self.for_content_store(content_id, locale, include_draft = false)
+      documents = Document.arel_table
       content_items = ContentItem.arel_table
       unpublishings = Unpublishing.arel_table
 
       allowed_states = [:published, :unpublished]
       allowed_states << :draft if include_draft
       filtered = scope(content_items[:user_facing_version].desc)
-        .where(content_items[:content_id].eq(content_id))
-        .where(content_items[:locale].eq(locale))
+        .where(documents[:content_id].eq(content_id))
+        .where(documents[:locale].eq(locale))
         .where(content_items[:state].in(allowed_states))
         .where(
           unpublishings[:type].eq(nil).or(
@@ -38,14 +39,15 @@ def self.for_content_store(content_id, locale, include_draft = false)
     end
 
     def self.scope(order = nil)
+      documents = Document.arel_table
       content_items = ContentItem.arel_table
       unpublishings = Unpublishing.arel_table
 
       content_items
         .project(
           content_items[:id],
           content_items[:analytics_identifier],
-          content_items[:content_id],
+          documents[:content_id],
           content_items[:description],
           content_items[:details],
           content_items[:document_type],
@@ -63,10 +65,11 @@ def self.scope(order = nil)
           content_items[:update_type],
           content_items[:base_path],
           content_items[:state],
-          content_items[:locale],
+          documents[:locale],
           content_items[:user_facing_version],
           unpublishings[:type].as("unpublishing_type")
         )
+        .join(documents).on(content_items[:document_id].eq(documents[:id]))
         .outer_join(unpublishings).on(
           content_items[:id].eq(unpublishings[:content_item_id])
             .and(content_items[:state].eq("unpublished"))

app/validators/state_for_locale_validator.rb

@@ -3,9 +3,8 @@ def validate(record)
     return unless record.state && record.locale && %w(draft published unpublished).include?(record.state)
 
     criteria = {
-      content_id: record.content_id,
+      document: record.document,
       state: record.state == "draft" ? "draft" : %w(published unpublished),
-      locale: record.locale,
     }
 
     conflict = ContentItem.where(criteria).where.not(id: record.id).first

app/validators/version_for_locale_validator.rb

@@ -3,9 +3,8 @@ def validate(record)
     return unless record.locale && record.user_facing_version
 
     criteria = {
-      content_id: record.content_id,
+      document: record.document,
       user_facing_version: record.user_facing_version,
-      locale: record.locale,
     }
 
     conflict = ContentItem.where(criteria).where.not(id: record.id).first