From eae05b0a6f6041cc59df0682f2287b4cab3af307 Mon Sep 17 00:00:00 2001
From: Martin <martin@sharypic.com>
Date: Fri, 16 Sep 2022 15:50:50 +0200
Subject: [PATCH] feat(export.xslx): add code commune to geo_area.label

---
 app/models/geo_area.rb                | 2 +-
 config/locales/models/geo_area/en.yml | 2 +-
 config/locales/models/geo_area/fr.yml | 2 +-
 spec/models/geo_area_spec.rb          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/geo_area.rb b/app/models/geo_area.rb
index c5bee3bc8..bb94da325 100644
--- a/app/models/geo_area.rb
+++ b/app/models/geo_area.rb
@@ -73,7 +73,7 @@ class GeoArea < ApplicationRecord
   def label
     case source
     when GeoArea.sources.fetch(:cadastre)
-      I18n.t("cadastre", scope: 'geo_area.label', numero: numero, prefixe: prefixe, section: section, surface: surface.round)
+      I18n.t("cadastre", scope: 'geo_area.label', numero: numero, prefixe: prefixe, section: section, surface: surface.round, commune: commune)
     when GeoArea.sources.fetch(:selection_utilisateur)
       if polygon?
         if area > 0
diff --git a/config/locales/models/geo_area/en.yml b/config/locales/models/geo_area/en.yml
index 867d1868c..732d30d3f 100644
--- a/config/locales/models/geo_area/en.yml
+++ b/config/locales/models/geo_area/en.yml
@@ -8,7 +8,7 @@ en:
           selection_utilisateur: User selection
   geo_area:
     label:
-      cadastre: "Parcel n° %{numero} - Sheet %{prefixe} %{section} - %{surface} m²"
+      cadastre: "Parcel n° %{numero} - Sheet %{prefixe} %{section} - %{surface} m² - town %{commune}"
       area: "An area of %{area} m²"
       area_unknown: "An area of unknown surface"
       line: "A %{length} m long line"
diff --git a/config/locales/models/geo_area/fr.yml b/config/locales/models/geo_area/fr.yml
index 65441a2d5..fdb35de89 100644
--- a/config/locales/models/geo_area/fr.yml
+++ b/config/locales/models/geo_area/fr.yml
@@ -8,7 +8,7 @@ fr:
           selection_utilisateur: Sélection utilisateur
   geo_area:
     label:
-      cadastre: "Parcelle n° %{numero} - Feuille %{prefixe} %{section} - %{surface} m²"
+      cadastre: "Parcelle n° %{numero} - Feuille %{prefixe} %{section} - %{surface} m² – commune %{commune}"
       area: "Une aire de surface %{area} m²"
       area_unknown: "Une aire de surface inconnue"
       line: "Une ligne longue de %{length} m"
diff --git a/spec/models/geo_area_spec.rb b/spec/models/geo_area_spec.rb
index 00bf833ad..0a746f363 100644
--- a/spec/models/geo_area_spec.rb
+++ b/spec/models/geo_area_spec.rb
@@ -140,7 +140,7 @@ RSpec.describe GeoArea, type: :model do
     context "when geo is a cadastre parcelle" do
       let(:geo_area) { build(:geo_area, :selection_utilisateur, :cadastre, champ: nil) }
       it "should return the label" do
-        expect(geo_area.label).to eq("Parcelle n° 42 - Feuille 000 A11 - 123 m²")
+        expect(geo_area.label).to eq("Parcelle n° 42 - Feuille 000 A11 - 123 m² – commune 75127")
       end
     end
   end