Merge pull request #2837 from betagouv/refactor-ban

Refactor ban
This commit is contained in:
gregoirenovel 2018-10-16 09:44:21 +02:00 committed by GitHub
commit 60a383e174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 14 deletions

View file

@ -1,5 +1,5 @@
class Ban::SearchController < ApplicationController class AddressController < ApplicationController
def get def suggestions
request = params[:request] request = params[:request]
json = ApiAdresse::AddressAdapter.new(request).get_suggestions.map do |value| json = ApiAdresse::AddressAdapter.new(request).get_suggestions.map do |value|
@ -9,7 +9,7 @@ class Ban::SearchController < ApplicationController
render json: json render json: json
end end
def get_address_point def geocode
request = params[:request] request = params[:request]
point = ApiAdresse::PointAdapter.new(request).geocode point = ApiAdresse::PointAdapter.new(request).geocode

View file

@ -63,7 +63,7 @@ function addEventFreeDraw(freeDraw) {
} }
function getAddressPoint(map, request) { function getAddressPoint(map, request) {
getJSON('/ban/address_point', { request }).then(data => { getJSON('/address/geocode', { request }).then(data => {
if (data.lat !== null) { if (data.lat !== null) {
map.setView(new L.LatLng(data.lat, data.lon), data.zoom); map.setView(new L.LatLng(data.lat, data.lon), data.zoom);
} }

View file

@ -4,7 +4,7 @@ import { getJSON, fire } from '@utils';
const sources = [ const sources = [
{ {
type: 'address', type: 'address',
url: '/ban/search' url: '/address/suggestions'
}, },
{ {
type: 'path', type: 'path',

View file

@ -250,10 +250,8 @@ Rails.application.routes.draw do
# Addresses # Addresses
# #
namespace :ban do get 'address/suggestions' => 'address#suggestions'
get 'search' => 'search#get' get 'address/geocode' => 'address#geocode'
get 'address_point' => 'search#get_address_point'
end
namespace :invites do namespace :invites do
post 'dossier/:dossier_id' => '/invites#create', as: 'dossier' post 'dossier/:dossier_id' => '/invites#create', as: 'dossier'

View file

@ -1,8 +1,8 @@
require 'spec_helper' require 'spec_helper'
describe Ban::SearchController, type: :controller do describe AddressController, type: :controller do
describe '#GET get' do describe '#GET suggestions' do
subject { get :get, params: { request: request } } subject { get :suggestions, params: { request: request } }
before do before do
subject subject
@ -23,9 +23,9 @@ describe Ban::SearchController, type: :controller do
end end
end end
describe '#GET get_address_point' do describe '#GET geocode' do
let(:dossier_id) { "1" } let(:dossier_id) { "1" }
subject { get :get_address_point, params: { request: request, dossier_id: dossier_id } } subject { get :geocode, params: { request: request, dossier_id: dossier_id } }
before do before do
subject subject