[sdesk-4980] Create two locations with same name

superdesk · Jan 30, 2020 · 6480382 · 6480382
1 parent 08ce57d
commit 6480382
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/client/actions/locations.js b/client/actions/locations.js
@@ -117,13 +117,14 @@ const getMoreLocations = () => (
     }
 );
 
-const saveNominatim = (nominatim) => (
+const saveNominatim = (nominatim, language) => (
     (dispatch, getState, {api}) => {
         const {address} = formatAddress(nominatim);
 
         return api('locations').save({}, {
             unique_name: nominatim.display_name,
-            name: nominatim.namedetails.name,
+            name: get(nominatim, 'namedetails.name:' + language,
+                get(nominatim, 'namedetails.name', get(address, 'line[0]'))),
             address: address,
             position: {
                 latitude: nominatim.lat,
@@ -137,15 +138,15 @@ const saveFreeTextLocation = (location) => (
     (dispatch, getState, {api}) => (
         api('locations').save({}, {
             ...location,
-            unique_name: location.name,
+            unique_name: get(location, 'name').concat(' ', get(formatAddress(location), 'formattedAddress')),
         })
     )
 );
 
 const saveLocation = (newLocation) => (
     (dispatch) => {
         const uniqueName = get(newLocation, 'nominatim.display_name')
-            || get(newLocation, 'name')
+            || get(newLocation, 'name').concat(' ', get(formatAddress(newLocation), 'formattedAddress'))
             || newLocation;
         // Check if the newLocation is already saved in internal
         // locations resources, if so just return the name and guid as qcode
@@ -159,7 +160,7 @@ const saveLocation = (newLocation) => (
 
                 // this is a new location
                 if (newLocation.nominatim) {
-                    return dispatch(self.saveNominatim(newLocation.nominatim))
+                    return dispatch(self.saveNominatim(newLocation.nominatim, get(newLocation, 'language')))
                         .then(
                             (result) => Promise.resolve(result),
                             () => Promise.reject('Failed to save location.!')
@@ -198,6 +199,7 @@ const getLocation = (searchText, unique = false, page = 1) => (
                         query: {
                             bool: {
                                 must: [{term: {unique_name: {value: searchText}}}],
+                                must_not: [{term: {is_active: {value: false}}}],
                             },
                         },
                     },

diff --git a/client/components/GeoLookupInput/AddGeoLookupInput.jsx b/client/components/GeoLookupInput/AddGeoLookupInput.jsx
@@ -251,6 +251,7 @@ export class GeoLookupInputComponent extends React.Component {
                 name: get(suggest, nameField, shortName),
                 boundingbox: get(suggest, 'boundingbox'),
                 type: get(suggest, 'type'),
+                language: this.language,
             };
         }
     }

diff --git a/server/planning/locations.py b/server/planning/locations.py
@@ -45,7 +45,10 @@ def delete(self, lookup):
                 events = superdesk.get_resource_service('events').find(
                     where={'location.qcode': str(location.get('guid'))})
                 if events.count():
-                    superdesk.get_resource_service('locations').patch(location[config.ID_FIELD], {'is_active': False})
+                    # patch the unique name in case the location get recreated
+                    superdesk.get_resource_service('locations').patch(location[config.ID_FIELD],
+                                                                      {'is_active': False,
+                                                                       'unique_name': str(location[config.ID_FIELD])})
                     return
         super().delete(lookup)