Merge branch 'feature/new-fmu-certificate' into staging

Author: tsubik

app/admin/fmu.rb

@@ -46,9 +46,10 @@ def download_shapefiles(fmus)
     link_to I18n.t("active_admin.fmus_page.download_shapefile"), download_shapefile_admin_fmu_path(fmu), method: :get
   end
 
-  permit_params :id, :name, :certification_fsc, :certification_pefc,
+  permit_params :id, :name,
+    :certification_fsc, :certification_pefc, :certification_ls, :certification_pbn,
     :certification_olb, :certification_pafc, :certification_fsc_cw, :certification_tlv,
-    :certification_ls, :esri_shapefiles_zip, :forest_type, :country_id,
+    :esri_shapefiles_zip, :forest_type, :country_id,
     fmu_operator_attributes: [:id, :operator_id, :start_date, :end_date]
 
   filter :id, as: :select
@@ -95,6 +96,7 @@ def download_shapefiles(fmus)
     column :certification_pefc
     column :certification_olb
     column :certification_pafc
+    column :certification_pbn
     column :certification_fsc_cw
     column :certification_tlv
     column :certification_ls
@@ -142,6 +144,7 @@ def download_shapefiles(fmus)
           row :certification_olb
           row :certification_pafc
           row :certification_fsc_cw
+          row :certification_pbn
           row :certification_tlv
           row :certification_ls
         end
@@ -159,6 +162,7 @@ def download_shapefiles(fmus)
     column "PEFC", :certification_pefc
     column "OLB", :certification_olb
     column "PAFC", :certification_pafc
+    column "PbN", :certification_pbn
     column "FSC CW", :certification_fsc_cw
     column "TLV", :certification_tlv
     column "LS", :certification_ls
@@ -186,6 +190,7 @@ def download_shapefiles(fmus)
           f.input :certification_olb
           f.input :certification_pafc
           f.input :certification_fsc_cw
+          f.input :certification_pbn
           f.input :certification_tlv
           f.input :certification_ls
         end

app/importers/observations_importer.rb

@@ -30,7 +30,7 @@ class ObservationsImporter < FileDataImport::BaseImporter
 
   belongs_to Fmu,
     permitted_attributes: %i[
-      geojson forest_type certification_fsc certification_pefc
+      geojson forest_type certification_fsc certification_pefc certification_pbn
       certification_olb certification_vlc certification_vlo certification_tltv
     ],
     permitted_translations: %i[name]

app/models/fmu.rb

@@ -99,6 +99,7 @@ def update_geojson_properties
       "certification_olb" => certification_olb,
       "certification_pafc" => certification_pafc,
       "certification_fsc_cw" => certification_fsc_cw,
+      "certification_pbn" => certification_pbn,
       "certification_tlv" => certification_tlv,
       "certification_ls" => certification_ls,
       "observations" => active_observations.reload.uniq.count,

app/resources/v1/fmu_resource.rb

@@ -9,15 +9,15 @@ class FmuResource < BaseResource
     attributes :name, :geojson, :forest_type,
       :certification_fsc, :certification_pefc, :certification_olb,
       :certification_pafc, :certification_fsc_cw, :certification_tlv,
-      :certification_ls
+      :certification_ls, :certification_pbn
 
     has_one :country
     has_one :operator, foreign_key_on: :related
 
     filters :country, :free, :certification, :operator
 
     filter :certification, apply: ->(records, value, _options) {
-      values = value.select { |c| %w[fsc pefc olb pafc fsc_cw tlv ls].include? c }
+      values = value.select { |c| %w[fsc pefc olb pafc pbn fsc_cw tlv ls].include? c }
       return records unless values.any?
 
       certifications = []

app/resources/v1/operator_resource.rb

@@ -36,7 +36,7 @@ def set_active
     end
 
     filter :certification, apply: ->(records, value, _options) {
-      values = value.select { |c| %w[fsc pefc olb pafc fsc_cw tlv ls].include? c }
+      values = value.select { |c| %w[fsc pefc olb pafc pbn fsc_cw tlv ls].include? c }
       return records unless values.any?
 
       certifications = []

config/locales/en.yml

@@ -659,6 +659,7 @@ en:
         certification_ls: Certification ls  #g
         certification_olb: Certification olb  #g
         certification_pafc: Certification pafc  #g
+        certification_pbn: Certification pbn  #g
         certification_pefc: Certification pefc  #g
         certification_tlv: Certification tlv  #g
         country: :activerecord.models.country  #g

config/locales/es.yml

@@ -676,6 +676,7 @@ es:
         certification_ls: Certificación LS
         certification_olb: Certificación OLB
         certification_pafc: Certificación PAFC
+        certification_pbn: Certificación PbN
         certification_pefc: Certificación PEFC
         certification_tlv: Certificación TLV
         country: :activerecord.models.country

db/migrate/20250717073611_add_pbn_certificate_to_fmu.rb

@@ -0,0 +1,5 @@
+class AddPbnCertificateToFmu < ActiveRecord::Migration[7.2]
+  def change
+    add_column :fmus, :certification_pbn, :boolean, default: false, null: false
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_07_16_100255) do
+ActiveRecord::Schema[7.2].define(version: 2025_07_17_073611) do
   create_schema "tiger"
   create_schema "tiger_data"
   create_schema "topology"
@@ -246,6 +246,7 @@
     t.datetime "deleted_at", precision: nil
     t.boolean "certification_ls", default: false, null: false
     t.string "name", null: false
+    t.boolean "certification_pbn", default: false, null: false
     t.index ["country_id"], name: "index_fmus_on_country_id"
     t.index ["deleted_at"], name: "index_fmus_on_deleted_at"
     t.index ["forest_type"], name: "index_fmus_on_forest_type"

spec/fixtures/snapshots/importers/geojson_fmus_importer.json

@@ -50,6 +50,7 @@
             "certification_tlv": false,
             "certification_pafc": false,
             "certification_pefc": false,
+            "certification_pbn": false,
             "certification_fsc_cw": false
           },
           "geometry": {