From cc0b08c2b93532fc06adf4d8e8e68e9a8e72dd92 Mon Sep 17 00:00:00 2001
From: Chris Troutner <chris.troutner@gmail.com>
Date: Tue, 6 Jul 2021 15:17:14 -0700
Subject: [PATCH] moved rpc folder into controllers folder

---
 src/{ => controllers}/rpc/about/index.js  |  2 +-
 src/{ => controllers}/rpc/auth/index.js   |  4 ++--
 src/{ => controllers}/rpc/index.js        |  2 +-
 src/{ => controllers}/rpc/rate-limit.js   |  0
 src/{ => controllers}/rpc/users/index.js  |  2 +-
 src/{ => controllers}/rpc/validators.js   |  9 ++++++---
 src/lib/ipfs.js                           |  2 +-
 test/unit/biz-logic/a10-rpc.unit.js       |  2 +-
 test/unit/json-rpc/a10-rpc.unit.js        |  2 +-
 test/unit/json-rpc/a11-auth.unit.js       | 15 ++++++---------
 test/unit/json-rpc/a12-validators.unit.js | 13 +++++--------
 test/unit/json-rpc/a13-users.unit.js      | 15 ++++++---------
 test/unit/json-rpc/a14-rate-limits.js     |  2 +-
 13 files changed, 32 insertions(+), 38 deletions(-)
 rename src/{ => controllers}/rpc/about/index.js (95%)
 rename src/{ => controllers}/rpc/auth/index.js (97%)
 rename src/{ => controllers}/rpc/index.js (98%)
 rename src/{ => controllers}/rpc/rate-limit.js (100%)
 rename src/{ => controllers}/rpc/users/index.js (99%)
 rename src/{ => controllers}/rpc/validators.js (92%)

diff --git a/src/rpc/about/index.js b/src/controllers/rpc/about/index.js
similarity index 95%
rename from src/rpc/about/index.js
rename to src/controllers/rpc/about/index.js
index 772382b..08e5221 100644
--- a/src/rpc/about/index.js
+++ b/src/controllers/rpc/about/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const aboutStr = require('../../../config/about')
+const aboutStr = require('../../../../config/about')
 
 class AuthRPC {
   constructor (localConfig) {
diff --git a/src/rpc/auth/index.js b/src/controllers/rpc/auth/index.js
similarity index 97%
rename from src/rpc/auth/index.js
rename to src/controllers/rpc/auth/index.js
index e9f3d67..4ab1a14 100644
--- a/src/rpc/auth/index.js
+++ b/src/controllers/rpc/auth/index.js
@@ -7,8 +7,8 @@ const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
 // const AuthLib = require('../../lib/auth')
-const UserLib = require('../../lib/users')
-const wlogger = require('../../lib/wlogger')
+const UserLib = require('../../../lib/users')
+const wlogger = require('../../../lib/wlogger')
 const RateLimit = require('../rate-limit')
 
 class AuthRPC {
diff --git a/src/rpc/index.js b/src/controllers/rpc/index.js
similarity index 98%
rename from src/rpc/index.js
rename to src/controllers/rpc/index.js
index 88f5505..59d4a46 100644
--- a/src/rpc/index.js
+++ b/src/controllers/rpc/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local support libraries
-const wlogger = require('../lib/wlogger')
+const wlogger = require('../../lib/wlogger')
 const UserController = require('./users')
 const AuthController = require('./auth')
 const AboutController = require('./about')
diff --git a/src/rpc/rate-limit.js b/src/controllers/rpc/rate-limit.js
similarity index 100%
rename from src/rpc/rate-limit.js
rename to src/controllers/rpc/rate-limit.js
diff --git a/src/rpc/users/index.js b/src/controllers/rpc/users/index.js
similarity index 99%
rename from src/rpc/users/index.js
rename to src/controllers/rpc/users/index.js
index fd4bfa4..72545d8 100644
--- a/src/rpc/users/index.js
+++ b/src/controllers/rpc/users/index.js
@@ -6,7 +6,7 @@
 const jsonrpc = require('jsonrpc-lite')
 
 // Local libraries
-const UserLib = require('../../lib/users')
+const UserLib = require('../../../lib/users')
 const Validators = require('../validators')
 const RateLimit = require('../rate-limit')
 
diff --git a/src/rpc/validators.js b/src/controllers/rpc/validators.js
similarity index 92%
rename from src/rpc/validators.js
rename to src/controllers/rpc/validators.js
index 662e723..2df5f6e 100644
--- a/src/rpc/validators.js
+++ b/src/controllers/rpc/validators.js
@@ -7,8 +7,8 @@
 const jwt = require('jsonwebtoken')
 
 // Local libraries
-const config = require('../../config')
-const UserModel = require('../models/users')
+const config = require('../../../config')
+const UserModel = require('../../models/users')
 
 class Validators {
   constructor () {
@@ -71,7 +71,10 @@ class Validators {
       }
 
       // Get the user model for the targeted User
-      const targetedUser = await this.UserModel.findById(targetUserId, '-password')
+      const targetedUser = await this.UserModel.findById(
+        targetUserId,
+        '-password'
+      )
 
       // Return the user model.
       return targetedUser
diff --git a/src/lib/ipfs.js b/src/lib/ipfs.js
index 897504f..5dbbc4f 100644
--- a/src/lib/ipfs.js
+++ b/src/lib/ipfs.js
@@ -11,7 +11,7 @@ const BCHJS = require('@psf/bch-js')
 
 // Local libraries
 const config = require('../../config')
-const JSONRPC = require('../rpc')
+const JSONRPC = require('../controllers/rpc')
 
 class IPFSLib {
   constructor (localConfig) {
diff --git a/test/unit/biz-logic/a10-rpc.unit.js b/test/unit/biz-logic/a10-rpc.unit.js
index 84f36dc..bdffbd5 100644
--- a/test/unit/biz-logic/a10-rpc.unit.js
+++ b/test/unit/biz-logic/a10-rpc.unit.js
@@ -5,7 +5,7 @@
 // Public npm libraries
 const jsonrpc = require('jsonrpc-lite')
 
-const JSONRPC = require('../../../src/rpc')
+const JSONRPC = require('../../../src/controllers/rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a10-rpc.unit.js b/test/unit/json-rpc/a10-rpc.unit.js
index ff5a5af..0d1d851 100644
--- a/test/unit/json-rpc/a10-rpc.unit.js
+++ b/test/unit/json-rpc/a10-rpc.unit.js
@@ -12,7 +12,7 @@ const { v4: uid } = require('uuid')
 process.env.SVC_ENV = 'test'
 
 // Local libraries.
-const JSONRPC = require('../../../src/rpc')
+const JSONRPC = require('../../../src/controllers/rpc')
 
 describe('#JSON RPC', () => {
   let uut
diff --git a/test/unit/json-rpc/a11-auth.unit.js b/test/unit/json-rpc/a11-auth.unit.js
index 76a09ae..3ec17c4 100644
--- a/test/unit/json-rpc/a11-auth.unit.js
+++ b/test/unit/json-rpc/a11-auth.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const AuthRPC = require('../../../src/rpc/auth')
-const RateLimit = require('../../../src/rpc/rate-limit')
+const AuthRPC = require('../../../src/controllers/rpc/auth')
+const RateLimit = require('../../../src/controllers/rpc/rate-limit')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
@@ -29,13 +29,10 @@ describe('#AuthRPC', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
 
     // Create a test user.
     testUser = await userLib.createUser({
diff --git a/test/unit/json-rpc/a12-validators.unit.js b/test/unit/json-rpc/a12-validators.unit.js
index 60b1820..341c2d8 100644
--- a/test/unit/json-rpc/a12-validators.unit.js
+++ b/test/unit/json-rpc/a12-validators.unit.js
@@ -16,7 +16,7 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const Validators = require('../../../src/rpc/validators')
+const Validators = require('../../../src/controllers/rpc/validators')
 const UserLib = require('../../../src/lib/users')
 const userLib = new UserLib()
 
@@ -30,13 +30,10 @@ describe('#validators', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
 
     // Create a test user.
     testUser = await userLib.createUser({
diff --git a/test/unit/json-rpc/a13-users.unit.js b/test/unit/json-rpc/a13-users.unit.js
index aecb427..693f95e 100644
--- a/test/unit/json-rpc/a13-users.unit.js
+++ b/test/unit/json-rpc/a13-users.unit.js
@@ -14,8 +14,8 @@ process.env.SVC_ENV = 'test'
 
 // Local libraries
 const config = require('../../../config')
-const UserRPC = require('../../../src/rpc/users')
-const RateLimit = require('../../../src/rpc/rate-limit')
+const UserRPC = require('../../../src/controllers/rpc/users')
+const RateLimit = require('../../../src/controllers/rpc/rate-limit')
 const UserModel = require('../../../src/models/users')
 
 describe('#UserRPC', () => {
@@ -28,13 +28,10 @@ describe('#UserRPC', () => {
     console.log(`Connecting to database: ${config.database}`)
     mongoose.Promise = global.Promise
     mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-    await mongoose.connect(
-      config.database,
-      {
-        useUnifiedTopology: true,
-        useNewUrlParser: true
-      }
-    )
+    await mongoose.connect(config.database, {
+      useUnifiedTopology: true,
+      useNewUrlParser: true
+    })
   })
 
   beforeEach(() => {
diff --git a/test/unit/json-rpc/a14-rate-limits.js b/test/unit/json-rpc/a14-rate-limits.js
index 4b34428..506f748 100644
--- a/test/unit/json-rpc/a14-rate-limits.js
+++ b/test/unit/json-rpc/a14-rate-limits.js
@@ -12,7 +12,7 @@ const assert = require('chai').assert
 process.env.SVC_ENV = 'test'
 
 // Local libraries
-const RateLimit = require('../../../src/rpc/rate-limit')
+const RateLimit = require('../../../src/controllers/rpc/rate-limit')
 
 describe('#rate-limit', () => {
   let uut