collavre_github 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c11fdb398224bc3a5dfeeb326b2f5ddd1575c1a371907ce0fcb9d5592e2f9cf
-  data.tar.gz: '058cfbcf2a41677dd39ec6da17f3b8f31471875db56e158855f587985e26005b'
+  metadata.gz: 6fb4ed5d918d784abb2dbfcaf6618391b4e1f888ccd166844db4bd823dce2e08
+  data.tar.gz: 9d569c3485a15ae9a282c2857bf8e30a3928e30f50fe9efa6e1ab13f12d2fe7d
 SHA512:
-  metadata.gz: c9063bc158175ca780be591a837e7b185eb2e6fc7595422c4f52b17ae91c5f459246521ccaa0eac5d6dbb2de2b6fda1331f0df59cbab16730f7112b06eb780ff
-  data.tar.gz: 1fbcc7a46e22b45146a812335524dcd3a08ec10b2cc21d6f7588978a4a3960fad36b7fd6f680a29c30b632f44cf3367f230c78cbde588bc0342ade2c69a908c1
+  metadata.gz: ed515fb1cd7ea7481ec30269b871b792a74c8a30d780abe4fb5473bf478111937f8748a60e4a432928aa7dbe75f8bef8fc8f1f91bacbd809b8b6367012b91f4a
+  data.tar.gz: 4ffb6a588103ddf1865539e93bff437d8ead4187354e0c4807707248d6f773bd49245d96cde837b6c02330f508ff4b7108da687f298a73d43e546f0f27419180

data/app/controllers/collavre_github/creatives/integrations_controller.rb

@@ -1,12 +1,13 @@
 module CollavreGithub
   module Creatives
     class IntegrationsController < ApplicationController
+      include Collavre::IntegrationSetup
       include Collavre::IntegrationPermission
 
       before_action :set_creative
       before_action :set_origin
       before_action :ensure_read_permission
-      before_action :ensure_admin_permission, only: [ :show, :update ]
+      before_action :ensure_admin_permission, only: [ :show, :update, :resync ]
 
       def show
         account = Current.user.github_account
@@ -25,7 +26,14 @@ module CollavreGithub
           },
           selected_repositories: links.map(&:repository_full_name),
           all_repositories: all_repositories,
-          webhooks: serialize_webhooks(links)
+          webhooks: serialize_webhooks(links),
+          markdown_sync: links.each_with_object({}) { |l, h|
+            h[l.repository_full_name] = {
+              enabled: l.markdown_sync_enabled?,
+              last_synced_at: l.last_synced_at,
+              sync_branch: l.markdown_sync_branch
+            }
+          }
         }
       end
 
@@ -56,6 +64,24 @@ module CollavreGithub
           links = linked_repository_links(account).to_a
         end
 
+        # Handle markdown sync toggle BEFORE webhook provisioning
+        # so events_for() sees the updated markdown_sync_enabled state
+        markdown_sync = integration_attributes[:markdown_sync]
+        if markdown_sync.is_a?(ActionController::Parameters) || markdown_sync.is_a?(Hash)
+          links.each do |link|
+            repo = link.repository_full_name
+            next unless markdown_sync.key?(repo)
+
+            enabled = ActiveModel::Type::Boolean.new.cast(markdown_sync[repo])
+            was_enabled = link.markdown_sync_enabled?
+            link.update!(markdown_sync_enabled: enabled)
+
+            if enabled && !was_enabled
+              CollavreGithub::InitialMarkdownSyncJob.perform_later(link.id)
+            end
+          end
+        end
+
         CollavreGithub::WebhookProvisioner.ensure_for_links(
           account: account,
           links: links,
@@ -65,12 +91,43 @@ module CollavreGithub
         render json: {
           success: true,
           selected_repositories: links.map(&:repository_full_name),
-          webhooks: serialize_webhooks(links)
+          webhooks: serialize_webhooks(links),
+          markdown_sync: links.each_with_object({}) { |l, h|
+            h[l.repository_full_name] = {
+              enabled: l.markdown_sync_enabled?,
+              last_synced_at: l.last_synced_at,
+              sync_branch: l.markdown_sync_branch
+            }
+          }
         }
       rescue ActiveRecord::RecordInvalid => e
         render json: { error: e.message }, status: :unprocessable_entity
       end
 
+      def resync
+        account = Current.user.github_account
+        unless account
+          render json: { error: I18n.t("collavre_github.errors.not_connected") }, status: :unprocessable_entity
+          return
+        end
+
+        repo = params[:repository]
+        link = linked_repository_links(account).find_by(repository_full_name: repo)
+        unless link&.markdown_sync_enabled?
+          render json: { error: I18n.t("collavre_github.markdown_sync.not_enabled") }, status: :unprocessable_entity
+          return
+        end
+
+        # Archive existing synced tree and re-import
+        if link.markdown_root_creative
+          link.markdown_root_creative.archive! if link.markdown_root_creative.respond_to?(:archive!)
+          link.update!(markdown_root_creative_id: nil)
+        end
+
+        CollavreGithub::InitialMarkdownSyncJob.perform_later(link.id)
+        render json: { success: true, message: I18n.t("collavre_github.markdown_sync.resync_started") }
+      end
+
       def destroy
         unless @creative.has_permission?(Current.user, :write)
           render json: { error: integration_forbidden_message }, status: :forbidden
@@ -139,14 +196,6 @@ module CollavreGithub
 
       private
 
-      def set_creative
-        @creative = Collavre::Creative.find(params[:creative_id])
-      end
-
-      def set_origin
-        @origin = @creative.effective_origin
-      end
-
       def integration_forbidden_message
         I18n.t("collavre_github.errors.forbidden")
       end
@@ -158,7 +207,7 @@ module CollavreGithub
       end
 
       def integration_params
-        params.permit(repositories: [])
+        params.permit(repositories: [], markdown_sync: {})
       end
 
       def serialize_webhooks(links)

data/app/controllers/collavre_github/webhooks_controller.rb

@@ -13,7 +13,13 @@ module CollavreGithub
       return head :unauthorized unless valid_signature?(raw_body)
 
       payload = payload.presence || {}
-      create_system_comment(event, payload) if @repository_link&.creative
+
+      # Process all links for this repo (same repo can be linked to multiple creatives)
+      all_links = all_repository_links_for(payload)
+      all_links.each do |link|
+        create_system_comment_for(link, event, payload) if link.creative
+        trigger_markdown_sync_for(link, event, payload) if link.markdown_sync_enabled?
+      end
 
       head :ok
     rescue JSON::ParserError
@@ -22,8 +28,8 @@ module CollavreGithub
 
     private
 
-    def create_system_comment(event, payload)
-      creative = @repository_link.creative&.effective_origin
+    def create_system_comment_for(link, event, payload)
+      creative = link.creative&.effective_origin
       return unless creative
 
       content = format_github_event(event, payload)
@@ -33,7 +39,6 @@ module CollavreGithub
         content: content,
         private: false
       )
-      # Dispatch handled by Comment#after_create_commit (skipped for system messages with user: nil)
     end
 
     def format_github_event(event, payload)
@@ -202,6 +207,22 @@ module CollavreGithub
       I18n.t("collavre_github.webhooks.#{key}", **options)
     end
 
+    def trigger_markdown_sync_for(link, event, payload)
+      return unless event == "push"
+
+      CollavreGithub::MarkdownSyncJob.perform_later(
+        link.id,
+        payload.as_json
+      )
+    end
+
+    def all_repository_links_for(payload)
+      repo = payload&.dig("repository", "full_name") || payload&.dig(:repository, :full_name)
+      return [ @repository_link ].compact if repo.blank?
+
+      CollavreGithub::RepositoryLink.where(repository_full_name: repo).to_a
+    end
+
     def find_repository_link(payload)
       if payload.blank?
         Rails.logger.warn("[GitHub Webhook] Payload is blank")