From fe630847e980d8f598cf0c9c4ca12c811ca3cc08 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 31 Oct 2018 13:32:17 +0100 Subject: [PATCH] Refactor legacy carto serializer --- app/serializers/dossier_serializer.rb | 17 +++++++++++++---- .../api/v1/dossiers_controller_spec.rb | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/serializers/dossier_serializer.rb b/app/serializers/dossier_serializer.rb index 8094badd1..75f40effb 100644 --- a/app/serializers/dossier_serializer.rb +++ b/app/serializers/dossier_serializer.rb @@ -23,11 +23,20 @@ class DossierSerializer < ActiveModel::Serializer has_many :pieces_justificatives has_many :types_de_piece_justificative - has_many :champs do - champs = object.champs + object.quartier_prioritaires + object.cadastres - if object.user_geometry.present? - champs << object.user_geometry + has_many :champs + + def champs + champs = object.champs.to_a + + if object.use_legacy_carto? + champs += object.quartier_prioritaires + champs += object.cadastres + + if object.user_geometry.present? + champs << object.user_geometry + end end + champs end diff --git a/spec/controllers/api/v1/dossiers_controller_spec.rb b/spec/controllers/api/v1/dossiers_controller_spec.rb index ba2018551..2cd99a95f 100644 --- a/spec/controllers/api/v1/dossiers_controller_spec.rb +++ b/spec/controllers/api/v1/dossiers_controller_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe API::V1::DossiersController do let(:admin) { create(:administrateur) } let(:token) { admin.renew_api_token } - let(:procedure) { create(:procedure, :with_two_type_de_piece_justificative, :with_type_de_champ, :with_type_de_champ_private, administrateur: admin) } + let(:procedure) { create(:procedure, :with_api_carto, :with_two_type_de_piece_justificative, :with_type_de_champ, :with_type_de_champ_private, administrateur: admin) } let(:wrong_procedure) { create(:procedure) } it { expect(described_class).to be < APIController }