From c838f22bac570e2f0c439f8e812a561712fc94c9 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Wed, 7 Jul 2021 08:09:25 -0700
Subject: [PATCH] Moved wlogger lib to adapters dir

---
 bin/server.js                                     | 2 +-
 src/{lib => adapters}/nodemailer.js               | 0
 src/{lib => adapters}/wlogger.js                  | 0
 src/controllers/json-rpc/auth/index.js            | 2 +-
 src/controllers/json-rpc/index.js                 | 2 +-
 src/controllers/rest-api/middleware/validators.js | 2 +-
 src/controllers/rest-api/users/controller.js      | 2 +-
 src/lib/contact.js                                | 4 ++--
 src/lib/users.js                                  | 2 +-
 test/unit/biz-logic/a03-nodemailer.lib-unit.js    | 2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename src/{lib => adapters}/nodemailer.js (100%)
 rename src/{lib => adapters}/wlogger.js (100%)

diff --git a/bin/server.js b/bin/server.js
index f3b7b6a..90324a1 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -19,7 +19,7 @@ const adminLib = new AdminLib()
 // const rpc = new JSONRPC()
 
 const errorMiddleware = require('../src/controllers/rest-api/middleware/error')
-const wlogger = require('../src/lib/wlogger')
+const wlogger = require('../src/adapters/wlogger')
 
 async function startServer () {
   // Create a Koa instance.
diff --git a/src/lib/nodemailer.js b/src/adapters/nodemailer.js
similarity index 100%
rename from src/lib/nodemailer.js
rename to src/adapters/nodemailer.js
diff --git a/src/lib/wlogger.js b/src/adapters/wlogger.js
similarity index 100%
rename from src/lib/wlogger.js
rename to src/adapters/wlogger.js
diff --git a/src/controllers/json-rpc/auth/index.js b/src/controllers/json-rpc/auth/index.js
index 4ab1a14..1ba6d6e 100644
--- a/src/controllers/json-rpc/auth/index.js
+++ b/src/controllers/json-rpc/auth/index.js
@@ -8,7 +8,7 @@ const jsonrpc = require('jsonrpc-lite')
 // Local libraries
 // const AuthLib = require('../../lib/auth')
 const UserLib = require('../../../lib/users')
-const wlogger = require('../../../lib/wlogger')
+const wlogger = require('../../../adapters/wlogger')
 const RateLimit = require('../rate-limit')
 
 class AuthRPC {
diff --git a/src/controllers/json-rpc/index.js b/src/controllers/json-rpc/index.js
index 5bad7ff..b56c04d 100644
--- a/src/controllers/json-rpc/index.js
+++ b/src/controllers/json-rpc/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local support libraries
-const wlogger = require('../../lib/wlogger')
+const wlogger = require('../../adapters/wlogger')
 const UserController = require('./users')
 const AuthController = require('./auth')
 const AboutController = require('./about')
diff --git a/src/controllers/rest-api/middleware/validators.js b/src/controllers/rest-api/middleware/validators.js
index 7c5c1c9..47aa3a3 100644
--- a/src/controllers/rest-api/middleware/validators.js
+++ b/src/controllers/rest-api/middleware/validators.js
@@ -6,7 +6,7 @@ const User = require('../../../adapters/localdb/models/users')
 const config = require('../../../../config')
 const getToken = require('../../../lib/auth')
 const jwt = require('jsonwebtoken')
-const wlogger = require('../../../lib/wlogger')
+const wlogger = require('../../../adapters/wlogger')
 
 let _this
 
diff --git a/src/controllers/rest-api/users/controller.js b/src/controllers/rest-api/users/controller.js
index 47ed22b..f2e981b 100644
--- a/src/controllers/rest-api/users/controller.js
+++ b/src/controllers/rest-api/users/controller.js
@@ -8,7 +8,7 @@ const UserModel = require('../../../adapters/localdb/models/users')
 // User library for business logic.
 const UserLib = require('../../../lib/users')
 
-const wlogger = require('../../../lib/wlogger')
+const wlogger = require('../../../adapters/wlogger')
 
 let _this
 
diff --git a/src/lib/contact.js b/src/lib/contact.js
index 0c69393..636cc0b 100644
--- a/src/lib/contact.js
+++ b/src/lib/contact.js
@@ -7,9 +7,9 @@ process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
 const config = require('../../config')
 
-const NodeMailer = require('../lib/nodemailer')
+const NodeMailer = require('../adapters/nodemailer')
 const nodemailer = new NodeMailer()
-const wlogger = require('./wlogger')
+const wlogger = require('../adapters/wlogger')
 
 let _this
 
diff --git a/src/lib/users.js b/src/lib/users.js
index c195841..0024ed8 100644
--- a/src/lib/users.js
+++ b/src/lib/users.js
@@ -4,7 +4,7 @@
 */
 
 const UserModel = require('../adapters/localdb/models/users')
-const wlogger = require('./wlogger')
+const wlogger = require('../adapters/wlogger')
 
 class UserLib {
   constructor (configObj) {
diff --git a/test/unit/biz-logic/a03-nodemailer.lib-unit.js b/test/unit/biz-logic/a03-nodemailer.lib-unit.js
index 79c2fce..11f29ac 100644
--- a/test/unit/biz-logic/a03-nodemailer.lib-unit.js
+++ b/test/unit/biz-logic/a03-nodemailer.lib-unit.js
@@ -6,7 +6,7 @@
 const assert = require('chai').assert
 const sinon = require('sinon')
 
-const NodeMailer = require('../../../src/lib/nodemailer')
+const NodeMailer = require('../../../src/adapters/nodemailer')
 
 let sandbox
 let uut