fix

Co-authored-by: Pierre-André Boissinot <pierreandre.boissinot@noesya.coop>

app/models/communication/website.rb

@@ -43,6 +43,7 @@ class Communication::Website < ApplicationRecord
   include WithGit
   include WithGitRepository
   include WithImport
+  include WithLanguages
   include WithOldDependencies
   include WithProgramCategories
   include WithReferences
@@ -57,16 +58,6 @@ class Communication::Website < ApplicationRecord
     gitlab: 1
   }
 
-  belongs_to :default_language, class_name: "Language"
-  has_and_belongs_to_many :languages,
-                          class_name: 'Language',
-                          join_table: 'communication_websites_languages',
-                          foreign_key: 'communication_website_id',
-                          association_foreign_key: 'language_id'
-
-  validates :languages, length: { minimum: 1 }
-  validate :languages_must_include_default_language
-
   before_validation :sanitize_fields
 
   scope :ordered, -> { order(:name) }
@@ -102,12 +93,6 @@ class Communication::Website < ApplicationRecord
     []
   end
 
-  def best_language_for(iso_code)
-    # We look for the language by the ISO code in the websites languages.
-    # If not found, we fallback to the default language.
-    languages.find_by(iso_code: iso_code) || default_language
-  end
-
   def website
     self
   end
@@ -126,8 +111,4 @@ class Communication::Website < ApplicationRecord
     self.repository = Osuny::Sanitizer.sanitize(self.repository, 'string')
     self.url = Osuny::Sanitizer.sanitize(self.url, 'string')
   end
-
-  def languages_must_include_default_language
-    errors.add(:languages, :must_include_default) unless language_ids.include?(default_language_id)
-  end
 end

app/models/communication/website/with_git_repository.rb

@@ -5,6 +5,8 @@ module Communication::Website::WithGitRepository
     has_many :website_git_files,
              class_name: 'Communication::Website::GitFile',
              dependent: :destroy
+
+    after_save :destroy_obsolete_git_files, if: :should_clean_on_git?
   end
 
   def git_repository
@@ -30,4 +32,8 @@ module Communication::Website::WithGitRepository
   def exportable_to_git?
     true
   end
+
+  def should_clean_on_git?
+    saved_change_to_about_id? || language_was_removed
+  end
 end

app/models/communication/website/with_languages.rb

+module Communication::Website::WithLanguages
+  extend ActiveSupport::Concern
+
+  included do
+    attr_accessor :language_was_removed
+
+    belongs_to :default_language, class_name: "Language"
+    has_and_belongs_to_many :languages,
+                            class_name: 'Language',
+                            join_table: 'communication_websites_languages',
+                            foreign_key: 'communication_website_id',
+                            association_foreign_key: 'language_id',
+                            after_remove: :flag_languages_change
+
+    validates :languages, length: { minimum: 1 }
+    validate :languages_must_include_default_language
+
+  end
+
+  def best_language_for(iso_code)
+    # We look for the language by the ISO code in the websites languages.
+    # If not found, we fallback to the default language.
+    languages.find_by(iso_code: iso_code) || default_language
+  end
+
+  protected
+
+  def languages_must_include_default_language
+    errors.add(:languages, :must_include_default) unless language_ids.include?(default_language_id)
+  end
+
+  def flag_languages_change(_)
+    @language_was_removed = true
+  end
+
+end