From 97701d0200dc2d5b8e064ab056ea3f6c0a3f6997 Mon Sep 17 00:00:00 2001
From: Hannu Lyytikainen <hannu@sharetribe.com>
Date: Thu, 19 Oct 2017 15:16:58 +0300
Subject: [PATCH] Add a helper function and improve function naming

---
 server/sitemap.js | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/server/sitemap.js b/server/sitemap.js
index 5e2f7950..4b9825c7 100644
--- a/server/sitemap.js
+++ b/server/sitemap.js
@@ -6,39 +6,41 @@ const buildPath = path.resolve(__dirname, '..', 'build');
 const PORT = process.env.PORT || 4000;
 const USING_SSL = process.env.REACT_APP_SHARETRIBE_USING_SSL === 'true';
 
+/**
+ * Resolves domain and port information from
+ * a URL, for example:
+ * https://example.com:8080 => example.com:8080
+ */
+const domainAndPort = rootURL => {
+  if (rootURL.indexOf('//') === -1) {
+    return rootURL;
+  } else {
+    return rootURL.split('//')[1];
+  }
+};
+
 /**
  * Resolves the domain from a URL, for example:
  * https://example.com:8080 => example.com
  */
-const resolveDomain = rootURL => {
+const domain = rootURL => {
   if (!rootURL) {
     return 'INVALID_URL';
   }
 
-  if (rootURL.indexOf('//') === -1) {
-    return rootURL.split(':')[0];
-  } else {
-    const domainAndPort = rootURL.split('//')[1];
-    return domainAndPort.split(':')[0];
-  }
+  return domainAndPort(rootURL).split(':')[0];
 };
 
 /**
  * Resolves the port number from a URL. If the port
  * can not be found `undefined` will be returned.
  */
-const resolvePort = rootURL => {
+const port = rootURL => {
   if (!rootURL) {
     return 'INVALID_URL';
   }
 
-  let domainAndPort;
-  if (rootURL.indexOf('//') === -1) {
-    domainAndPort = rootURL;
-  } else {
-    domainAndPort = rootURL.split('//')[1];
-  }
-  return domainAndPort.split(':')[1];
+  return domainAndPort(rootURL).split(':')[1];
 };
 
 /**
@@ -50,9 +52,9 @@ exports.sitemapStructure = () => {
   const now = moment().format('YYYY-MM-DD');
 
   return {
-    url: resolveDomain(config.canonicalRootURL),
+    url: domain(config.canonicalRootURL),
     http: USING_SSL ? 'https' : 'http',
-    port: resolvePort(config.canonicalRootURL),
+    port: port(config.canonicalRootURL),
     sitemap: path.join(buildPath, 'static', 'sitemap.xml'),
     robots: path.join(buildPath, 'robots.txt'),
     sitemapSubmission: '/static/sitemap.xml',