Created src/ Folder Structure

__tests__/routes_mounted.test.js

@@ -6,8 +6,8 @@
  */
 
 import request from "supertest"
-import api_routes from "../routes/api-routes.js"
-import app from "../app.js"
+import api_routes from "../src/services/api-routes.js"
+import app from "../src/index.js"
 import fs from "fs"
 
 let app_stack = app.router.stack

bin/rerum_v1.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-import app from '../app.js'
+import app from '../src/index.js'
 import debug from 'debug'
 debug('rerum_server_nodejs:server')
 import http from "http"

jest.config.js

@@ -32,7 +32,7 @@ const config = {
   collectCoverageFrom: [
       //"**/*.js",
       "**/db-controller.js",
-      "**/routes/*.js"
+      "**/services/*.js"
   ],
 
   // Indicates which provider should be used to instrument code for coverage

auth/__tests__/token.test.txt → src/config/__tests__/token.test.txt

@@ -9,7 +9,7 @@
     * If that is what you need, get out of here and go see /auth/__mocks__
 */
 
-import auth from "../../auth/index.js"
+import auth from "../index.js"
 import httpMocks from "node-mocks-http"
 
 const goodToken = "TODO -- MAKE ME PROGRAMMATICALLY"

controllers/bulk.js → src/controllers/bulk.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**

controllers/crud.js → src/controllers/crud.js

@@ -4,8 +4,8 @@
  * Basic CRUD operations for RERUM v1
  * @author Claude Sonnet 4, cubap, thehabes
  */
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, idNegotiation, generateSlugId, ObjectID, createExpressError, getAgentClaim, parseDocumentID } from './utils.js'
 
 /**

controllers/delete.js → src/controllers/delete.js

@@ -4,8 +4,8 @@
  * Delete operations for RERUM v1
  * @author Claude Sonnet 4, cubap, thehabes
  */
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { createExpressError, getAgentClaim, parseDocumentID, getAllVersions, getAllDescendants } from './utils.js'
 
 /**

controllers/gog.js → src/controllers/gog.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**

controllers/history.js → src/controllers/history.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, getAllVersions, getAllAncestors, getAllDescendants } from './utils.js'
 
 /**

controllers/overwrite.js → src/controllers/overwrite.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation } from './utils.js'
 
 /**

controllers/patchSet.js → src/controllers/patchSet.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**

controllers/patchUnset.js → src/controllers/patchUnset.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**

controllers/patchUpdate.js → src/controllers/patchUpdate.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**

controllers/putUpdate.js → src/controllers/putUpdate.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, alterHistoryNext } from './utils.js'
 
 /**

controllers/release.js → src/controllers/release.js

@@ -6,8 +6,8 @@
  * @author Claude Sonnet 4, cubap, thehabes
  */
 
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { _contextid, ObjectID, createExpressError, getAgentClaim, parseDocumentID, idNegotiation, generateSlugId, establishReleasesTree, healReleasesTree } from './utils.js'
 
 /**

controllers/search.js → src/controllers/search.js

@@ -4,8 +4,8 @@
  * Search ($search) operations for RERUM v1
  * @author thehabes
  */
-import { db } from '../database/index.js'
-import utils from '../utils.js'
+import { db } from '../db/index.js'
+import utils from '../utils/index.js'
 import { idNegotiation, createExpressError } from './utils.js'
 
 /**

controllers/utils.js → src/controllers/utils.js

@@ -4,8 +4,8 @@
  * Utility functions for RERUM controllers
  * @author Claude Sonnet 4, cubap, thehabes
  */
-import { newID, isValidID, db } from '../database/index.js'
-import utils from '../utils.js'
+import { newID, isValidID, db } from '../db/index.js'
+import utils from '../utils/index.js'
 
 const ObjectID = newID
 

app.js → src/index.js

@@ -7,12 +7,12 @@ import dotenv from 'dotenv'
 dotenv.config()
 import logger from 'morgan'
 import cors from 'cors'
-import indexRouter from './routes/index.js'
-import apiRouter from './routes/api-routes.js'
-import clientRouter from './routes/client.js'
-import _gog_fragmentsRouter from './routes/_gog_fragments_from_manuscript.js';
-import _gog_glossesRouter from './routes/_gog_glosses_from_manuscript.js';
-import rest from './rest.js'
+import indexRouter from './services/index.js'
+import apiRouter from './services/api-routes.js'
+import clientRouter from './services/client.js'
+import _gog_fragmentsRouter from './services/_gog_fragments_from_manuscript.js';
+import _gog_glossesRouter from './services/_gog_glosses_from_manuscript.js';
+import rest from './utils/rest.js'
 import { fileURLToPath } from 'url'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
@@ -63,7 +63,7 @@ app.use(express.urlencoded({ extended: true }))
 app.use(cookieParser())
 
 //Publicly available scripts, CSS, and HTML pages.
-app.use(express.static(path.join(__dirname, 'public')))
+app.use(express.static(path.join(__dirname, '../public')))
 
 /**
  * For any request that comes through to the app, check whether or not we are in maintenance mode.

routes/__tests__/bulkCreate.test.js → src/services/__tests__/bulkCreate.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user and the controller can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/bulkUpdate.test.js → src/services/__tests__/bulkUpdate.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user and the controller can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/create.test.js → src/services/__tests__/create.test.js

@@ -1,8 +1,8 @@
 import { jest } from "@jest/globals"
 import express from "express"
 import request from "supertest"
-import { db } from '../../database/index.js'
-import controller from '../../db-controller.js'
+import { db } from '../../db/index.js'
+import controller from '../db-controller.js'
 
 const rerum_uri = `${process.env.RERUM_ID_PREFIX}123456`
 

routes/__tests__/crud_routes_function.txt → src/services/__tests__/crud_routes_function.txt

@@ -8,9 +8,9 @@
 
 import request from 'supertest'
 //Fun fact, if you don't require app, you don't get coverage even though the tests run just fine.
-import app from '../../app.js'
+import app from '../../../src/index.js'
 //This is so we can do Mongo specific things with the objects in this test, like actually remove them from the db.
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 //A super fun note.  If you do request(app), the tests will fail due to race conditions.  
 //request = request(app)

routes/__tests__/delete.test.js → src/services/__tests__/delete.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user and the controller can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/history.test.js → src/services/__tests__/history.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 const routeTester = new express()
 routeTester.use(express.json())

routes/__tests__/id.test.js → src/services/__tests__/id.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 const routeTester = new express()
 routeTester.use(express.json())

routes/__tests__/idNegotiation.test.js → src/services/__tests__/idNegotiation.test.js

@@ -1,6 +1,6 @@
 import { jest } from "@jest/globals"
 import dotenv from "dotenv"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 it("Functional '@id-id' negotiation on objects returned.", async () => {
   let negotiate = {

routes/__tests__/overwrite-optimistic-locking.test.txt → src/services/__tests__/overwrite-optimistic-locking.test.txt

@@ -15,7 +15,7 @@ jest.mock('../../database/index.js', () => ({
 }))
 
 // Import controller after mocking
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Helper to add auth to requests
 const addAuth = (req, res, next) => {

routes/__tests__/overwrite.test.txt → src/services/__tests__/overwrite.test.txt

@@ -1,5 +1,5 @@
 import request from 'supertest'
-import app from '../../app.js'
+import app from '../../../src/index.js'
 import { jest } from '@jest/globals'
 
 // Mock the database and auth modules

routes/__tests__/patch.test.js → src/services/__tests__/patch.test.js

@@ -4,7 +4,7 @@ dotenv.config()
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user and the controller can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/query.test.js → src/services/__tests__/query.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 const routeTester = new express()
 routeTester.use(express.json())

routes/__tests__/release.test.js → src/services/__tests__/release.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user so controller.create can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/set.test.js → src/services/__tests__/set.test.js

@@ -5,7 +5,7 @@ dotenv.config()
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user and the controller can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/since.test.js → src/services/__tests__/since.test.js

@@ -3,7 +3,7 @@ import { jest } from "@jest/globals"
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 const routeTester = new express()
 routeTester.use(express.json())

routes/__tests__/unset.test.js → src/services/__tests__/unset.test.js

@@ -5,7 +5,7 @@ dotenv.config()
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user so controller.create can function without a NPE.
 const addAuth = (req, res, next) => {

routes/__tests__/update.test.js → src/services/__tests__/update.test.js

@@ -4,7 +4,7 @@ dotenv.config()
 // Only real way to test an express route is to mount it and call it so that we can use the req, res, next.
 import express from "express"
 import request from "supertest"
-import controller from '../../db-controller.js'
+import controller from '../db-controller.js'
 
 // Here is the auth mock so we get a req.user so controller.create can function without a NPE.
 const addAuth = (req, res, next) => {

routes/_gog_fragments_from_manuscript.js → src/services/_gog_fragments_from_manuscript.js

@@ -1,8 +1,8 @@
 import express from 'express'
 const router = express.Router()
 //This controller will handle all MongoDB interactions.
-import controller from '../db-controller.js'
-import auth from '../auth/index.js'
+import controller from './db-controller.js'
+import auth from '../config/index.js'
 
 router.route('/')
     .post(auth.checkJwt, controller._gog_fragments_from_manuscript)

routes/_gog_glosses_from_manuscript.js → src/services/_gog_glosses_from_manuscript.js

@@ -1,8 +1,8 @@
 import express from 'express'
 const router = express.Router()
 //This controller will handle all MongoDB interactions.
-import controller from '../db-controller.js'
-import auth from '../auth/index.js'
+import controller from './db-controller.js'
+import auth from '../config/index.js'
 
 router.route('/')
     .post(auth.checkJwt, controller._gog_glosses_from_manuscript)