From 62810143acb7e64a4d89d020c78b3d4f0b9e04b5 Mon Sep 17 00:00:00 2001
From: Paul Melnikow <github@paulmelnikow.com>
Date: Mon, 21 Jan 2019 16:11:23 -0500
Subject: [PATCH] Move coalesce and validate (#2828)

Ref #2698
---
 {lib => core/base-service}/coalesce.js      | 0
 {lib => core/base-service}/coalesce.spec.js | 0
 {lib => core/base-service}/validate.js      | 2 +-
 {lib => core/base-service}/validate.spec.js | 4 ++--
 lib/logos.js                                | 2 +-
 services/base.js                            | 4 ++--
 services/cache-headers.js                   | 2 +-
 services/dynamic-common.js                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename {lib => core/base-service}/coalesce.js (100%)
 rename {lib => core/base-service}/coalesce.spec.js (100%)
 rename {lib => core/base-service}/validate.js (95%)
 rename {lib => core/base-service}/validate.spec.js (96%)

diff --git a/lib/coalesce.js b/core/base-service/coalesce.js
similarity index 100%
rename from lib/coalesce.js
rename to core/base-service/coalesce.js
diff --git a/lib/coalesce.spec.js b/core/base-service/coalesce.spec.js
similarity index 100%
rename from lib/coalesce.spec.js
rename to core/base-service/coalesce.spec.js
diff --git a/lib/validate.js b/core/base-service/validate.js
similarity index 95%
rename from lib/validate.js
rename to core/base-service/validate.js
index 4b262cbb6a..38adcebfdd 100644
--- a/lib/validate.js
+++ b/core/base-service/validate.js
@@ -2,7 +2,7 @@
 
 const emojic = require('emojic')
 const Joi = require('joi')
-const trace = require('../services/trace')
+const trace = require('../../services/trace')
 
 function validate(
   {
diff --git a/lib/validate.spec.js b/core/base-service/validate.spec.js
similarity index 96%
rename from lib/validate.spec.js
rename to core/base-service/validate.spec.js
index 57cf560ee8..3a9afd8162 100644
--- a/lib/validate.spec.js
+++ b/core/base-service/validate.spec.js
@@ -3,8 +3,8 @@
 const Joi = require('joi')
 const { expect } = require('chai')
 const sinon = require('sinon')
-const trace = require('../services/trace')
-const { InvalidParameter } = require('../services/errors')
+const trace = require('../../services/trace')
+const { InvalidParameter } = require('../../services/errors')
 const validate = require('./validate')
 
 describe('validate', function() {
diff --git a/lib/logos.js b/lib/logos.js
index 50795b0501..926b4774e3 100644
--- a/lib/logos.js
+++ b/lib/logos.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const { toSvgColor } = require('../gh-badges/lib/color')
-const coalesce = require('./coalesce')
+const coalesce = require('../core/base-service/coalesce')
 const { svg2base64 } = require('./svg-helpers')
 
 const logos = require('./load-logos')()
diff --git a/services/base.js b/services/base.js
index 664cd307cc..c2067ec3d3 100644
--- a/services/base.js
+++ b/services/base.js
@@ -11,8 +11,8 @@ const {
   InvalidParameter,
   Deprecated,
 } = require('./errors')
-const coalesce = require('../lib/coalesce')
-const validate = require('../lib/validate')
+const coalesce = require('../core/base-service/coalesce')
+const validate = require('../core/base-service/validate')
 const { checkErrorResponse } = require('../lib/error-helper')
 const { toArray } = require('../lib/badge-data')
 const { svg2base64 } = require('../lib/svg-helpers')
diff --git a/services/cache-headers.js b/services/cache-headers.js
index 76d75756a2..a9370a290f 100644
--- a/services/cache-headers.js
+++ b/services/cache-headers.js
@@ -2,7 +2,7 @@
 
 const assert = require('assert')
 const Joi = require('joi')
-const coalesce = require('../lib/coalesce')
+const coalesce = require('../core/base-service/coalesce')
 
 const serverStartTimeGMTString = new Date().toGMTString()
 const serverStartTimestamp = Date.now()
diff --git a/services/dynamic-common.js b/services/dynamic-common.js
index eaa7df086c..1eb0345ec5 100644
--- a/services/dynamic-common.js
+++ b/services/dynamic-common.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Joi = require('joi')
-const validate = require('../lib/validate')
+const validate = require('../core/base-service/validate')
 const { toArray } = require('../lib/badge-data')
 const { InvalidResponse } = require('./errors')
 
-- 
GitLab