From 78c987921d41e88d99cea1f3ec6b5b334fff5535 Mon Sep 17 00:00:00 2001
From: Peter Johnson <insomnia@rcpt.at>
Date: Thu, 23 Jan 2025 15:12:24 +0100
Subject: [PATCH] refactor(middleware): rename middleware/renamePlacenames to
 middleware/mapFields

---
 middleware/{renamePlacenames.js => mapFields.js}     |  4 ++--
 routes/v1.js                                         | 12 ++++++------
 .../middleware/{renamePlacenames.js => mapFields.js} | 10 +++++-----
 test/unit/run.js                                     |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename middleware/{renamePlacenames.js => mapFields.js} (95%)
 rename test/unit/middleware/{renamePlacenames.js => mapFields.js} (94%)

diff --git a/middleware/renamePlacenames.js b/middleware/mapFields.js
similarity index 95%
rename from middleware/renamePlacenames.js
rename to middleware/mapFields.js
index 281988e0d..f076f0311 100644
--- a/middleware/renamePlacenames.js
+++ b/middleware/mapFields.js
@@ -11,10 +11,10 @@ const ADDRESS_PROPS = [
 
 
 function setup() {
-  return renamePlacenames;
+  return mapFields;
 }
 
-function renamePlacenames(req, res, next) {
+function mapFields(req, res, next) {
   // do nothing if no result data set
   if (!res || !res.data) {
     return next();
diff --git a/routes/v1.js b/routes/v1.js
index 4fceacabd..540fa566c 100644
--- a/routes/v1.js
+++ b/routes/v1.js
@@ -233,7 +233,7 @@ function addRoutes(app, peliasConfig) {
       middleware.dedupe(),
       middleware.accuracy(),
       middleware.localNamingConventions(),
-      middleware.renamePlacenames(),
+      middleware.mapFields(),
       middleware.parseBBox(),
       middleware.normalizeParentIds(),
       middleware.changeLanguage(changeLanguageService, changeLanguageShouldExecute),
@@ -256,7 +256,7 @@ function addRoutes(app, peliasConfig) {
       middleware.dedupe(),
       middleware.accuracy(),
       middleware.localNamingConventions(),
-      middleware.renamePlacenames(),
+      middleware.mapFields(),
       middleware.parseBBox(),
       middleware.normalizeParentIds(),
       middleware.changeLanguage(changeLanguageService, changeLanguageShouldExecute),
@@ -275,7 +275,7 @@ function addRoutes(app, peliasConfig) {
       middleware.dedupe(),
       middleware.accuracy(),
       middleware.localNamingConventions(),
-      middleware.renamePlacenames(),
+      middleware.mapFields(),
       middleware.parseBBox(),
       middleware.normalizeParentIds(),
       middleware.changeLanguage(changeLanguageService, changeLanguageShouldExecute),
@@ -297,7 +297,7 @@ function addRoutes(app, peliasConfig) {
       middleware.dedupe(),
       middleware.accuracy(),
       middleware.localNamingConventions(),
-      middleware.renamePlacenames(),
+      middleware.mapFields(),
       middleware.parseBBox(),
       middleware.normalizeParentIds(),
       middleware.changeLanguage(changeLanguageService, changeLanguageShouldExecute),
@@ -318,7 +318,7 @@ function addRoutes(app, peliasConfig) {
       middleware.dedupe(),
       middleware.accuracy(),
       middleware.localNamingConventions(),
-      middleware.renamePlacenames(),
+      middleware.mapFields(),
       middleware.parseBBox(),
       middleware.normalizeParentIds(),
       middleware.changeLanguage(changeLanguageService, changeLanguageShouldExecute),
@@ -333,7 +333,7 @@ function addRoutes(app, peliasConfig) {
       middleware.expandDocument(peliasConfig.api, esclient),
       middleware.accuracy(),
       middleware.localNamingConventions(),
-      middleware.renamePlacenames(),
+      middleware.mapFields(),
       middleware.parseBBox(),
       middleware.normalizeParentIds(),
       middleware.changeLanguage(changeLanguageService, changeLanguageShouldExecute),
diff --git a/test/unit/middleware/renamePlacenames.js b/test/unit/middleware/mapFields.js
similarity index 94%
rename from test/unit/middleware/renamePlacenames.js
rename to test/unit/middleware/mapFields.js
index 39372df38..3e7086cbd 100644
--- a/test/unit/middleware/renamePlacenames.js
+++ b/test/unit/middleware/mapFields.js
@@ -1,8 +1,8 @@
-const renamePlacenames = require('../../../middleware/renamePlacenames')();
+const mapFields = require('../../../middleware/mapFields')();
 
 module.exports.tests = {};
 
-module.exports.tests.renamePlacenames = function(test, common) {
+module.exports.tests.mapFields = function(test, common) {
 
   test('rename address_parts', function(t) {
     const req = {};
@@ -30,7 +30,7 @@ module.exports.tests.renamePlacenames = function(test, common) {
       street: 'street value'
     }];
 
-    renamePlacenames(req, res, () => {});
+    mapFields(req, res, () => {});
     t.deepEqual(res.data, expected);
     t.end();
   });
@@ -168,7 +168,7 @@ module.exports.tests.renamePlacenames = function(test, common) {
       street: 'street value',
     }];
 
-    renamePlacenames(req, res, () => {});
+    mapFields(req, res, () => {});
     t.deepEqual(res.data, expected);
     t.end();
   });
@@ -176,7 +176,7 @@ module.exports.tests.renamePlacenames = function(test, common) {
 
 module.exports.all = function (tape, common) {
   function test(name, testFunction) {
-    return tape(`[middleware] renamePlacenames: ${name}`, testFunction);
+    return tape(`[middleware] mapFields: ${name}`, testFunction);
   }
 
   for( var testCase in module.exports.tests ){
diff --git a/test/unit/run.js b/test/unit/run.js
index 318a47498..66d512ded 100644
--- a/test/unit/run.js
+++ b/test/unit/run.js
@@ -58,8 +58,8 @@ var tests = [
   require('./middleware/dedupe'),
   require('./middleware/parseBBox'),
   require('./middleware/sendJSON'),
+  require('./middleware/mapFields'),
   require('./middleware/normalizeParentIds'),
-  require('./middleware/renamePlacenames'),
   require('./middleware/sizeCalculator'),
   require('./middleware/sortResponseData'),
   require('./middleware/trimByGranularity'),