move database code from utils

docker-compose.yml

@@ -12,6 +12,7 @@ services:
       - ./public/uploads:/uploads
       - ./db:/usr/src/app/db
       - ./app-config.yaml:/usr/src/app/app-config.yaml
+      - ./app-config.local.yaml:/usr/src/app/app-config.local.yaml
   mongodb:
     image: mongo:6.0.1
     ports:

src/backend/controllers/pages.ts

@@ -4,8 +4,8 @@ import PagesOrder from './pagesOrder.js';
 import PageOrder from '../models/pageOrder.js';
 import HttpException from '../exceptions/httpException.js';
 import PagesFlatArray from '../models/pagesFlatArray.js';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
-import { isEqualIds } from '../utils/database/index.js';
+import { isEqualIds } from '../database/index.js';
 
 type PageDataFields = keyof PageData;
 

src/backend/controllers/pagesOrder.ts

@@ -1,8 +1,8 @@
 import PageOrder from '../models/pageOrder.js';
 import Page from '../models/page.js';
 import PagesFlatArray from '../models/pagesFlatArray.js';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
-import { isEqualIds } from '../utils/database/index.js';
+import { isEqualIds } from '../database/index.js';
 
 /**
  * @class PagesOrder

src/backend/database/index.ts

@@ -1,8 +1,8 @@
-import { AliasData } from '../../models/alias.js';
+import { AliasData } from '../models/alias.js';
-import { FileData } from '../../models/file.js';
+import { FileData } from '../models/file.js';
-import { PageData } from '../../models/page.js';
+import { PageData } from '../models/page.js';
-import { PageOrderData } from '../../models/pageOrder.js';
+import { PageOrderData } from '../models/pageOrder.js';
-import appConfig from '../appConfig.js';
+import appConfig from '../utils/appConfig.js';
 import LocalDatabaseDriver from './local.js';
 import MongoDatabaseDriver from './mongodb.js';
 import { EntityId } from './types.js';

src/backend/database/local.ts

@@ -1,7 +1,7 @@
 import Datastore from 'nedb';
 import { DatabaseDriver, Options, RejectFunction, ResolveFunction } from './types.js';
 import path from 'path';
-import appConfig from '../appConfig.js';
+import appConfig from '../utils/appConfig.js';
 
 /**
  * Init function for nedb instance

src/backend/database/mongodb.ts

@@ -1,6 +1,6 @@
 import { Collection, Filter, MongoClient, OptionalUnlessRequiredId, UpdateFilter } from 'mongodb';
 import { DatabaseDriver, Options } from './types.js';
-import appConfig from '../appConfig.js';
+import appConfig from '../utils/appConfig.js';
 
 const mongodbUri = appConfig.database.driver === 'mongodb' ? appConfig.database.mongodb.uri : null;
 const mongodbClient = mongodbUri ? await MongoClient.connect(mongodbUri): null;

src/backend/models/alias.ts

@@ -1,6 +1,6 @@
 import crypto from '../utils/crypto.js';
-import database from '../utils/database/index.js';
+import database from '../database/index.js';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
 
 const binaryMD5 = crypto.binaryMD5;
 const aliasesDb = database['aliases'];

src/backend/models/file.ts

@@ -1,5 +1,5 @@
-import database from '../utils/database/index.js';
+import database from '../database/index.js';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
 
 const filesDb = database['files'];
 

src/backend/models/page.ts

@@ -1,6 +1,6 @@
 import urlify from '../utils/urlify.js';
-import database from '../utils/database/index.js';
+import database from '../database/index.js';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
 
 const pagesDb = database['pages'];
 

src/backend/models/pageOrder.ts

@@ -1,6 +1,6 @@
-import database, { isEntityId, isEqualIds } from '../utils/database/index.js';
+import database, { isEntityId, isEqualIds } from '../database/index.js';
 import { ObjectId } from 'mongodb';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
 
 const db = database['pagesOrder'];
 

src/backend/models/pagesFlatArray.ts

@@ -1,7 +1,7 @@
 import Page from './page.js';
 import PageOrder from './pageOrder.js';
 import NodeCache from 'node-cache';
-import { EntityId } from '../utils/database/types.js';
+import { EntityId } from '../database/types.js';
 
 // Create cache for flat array
 const cache = new NodeCache({ stdTTL: 120 });

src/backend/routes/api/pages.ts

@@ -2,8 +2,8 @@ import express, { Request, Response } from 'express';
 import multerFunc from 'multer';
 import Pages from '../../controllers/pages.js';
 import PagesOrder from '../../controllers/pagesOrder.js';
-import { EntityId } from '../../utils/database/types.js';
+import { EntityId } from '../../database/types.js';
-import { isEntityId, isEqualIds, toEntityId } from '../../utils/database/index.js';
+import { isEntityId, isEqualIds, toEntityId } from '../../database/index.js';
 
 const router = express.Router();
 const multer = multerFunc();

src/backend/routes/middlewares/pages.ts

@@ -4,8 +4,8 @@ import PagesOrder from '../../controllers/pagesOrder.js';
 import Page from '../../models/page.js';
 import asyncMiddleware from '../../utils/asyncMiddleware.js';
 import PageOrder from '../../models/pageOrder.js';
-import { EntityId } from '../../utils/database/types.js';
+import { EntityId } from '../../database/types.js';
-import { isEqualIds } from '../../utils/database/index.js';
+import { isEqualIds } from '../../database/index.js';
 
 /**
  * Process one-level pages list to parent-children list

src/backend/routes/pages.ts

@@ -4,7 +4,7 @@ import PagesOrder from '../controllers/pagesOrder.js';
 import verifyToken from './middlewares/token.js';
 import allowEdit from './middlewares/locals.js';
 import PagesFlatArray from '../models/pagesFlatArray.js';
-import { toEntityId } from '../utils/database/index.js';
+import { toEntityId } from '../database/index.js';
 
 const router = express.Router();
 

src/test/database.ts

@@ -3,7 +3,7 @@ import config from 'config';
 import { expect } from 'chai';
 import Datastore from 'nedb';
 
-import { Database } from '../backend/utils/database/index.js';
+import { Database } from '../backend/database/index.js';
 
 interface Document {
   data?: any;

src/test/models/alias.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import config from 'config';
 import Alias from '../../backend/models/alias.js';
 import { binaryMD5 } from '../../backend/utils/crypto.js';
-import database from '../../backend/utils/database/index.js';
+import database from '../../backend/database/index.js';
 import { fileURLToPath } from 'url';
 
 const aliases = database['aliases'];

src/test/models/file.ts

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import config from 'config';
 import File from '../../backend/models/file.js';
-import database from '../../backend/utils/database/index.js';
+import database from '../../backend/database/index.js';
 import { fileURLToPath } from 'url';
 
 /**

src/test/models/page.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import config from 'config';
 import Page from '../../backend/models/page.js';
 import translateString from '../../backend/utils/translation.js';
-import database from '../../backend/utils/database/index.js';
+import database from '../../backend/database/index.js';
 import { fileURLToPath } from 'url';
 
 /**

src/test/models/pageOrder.ts

@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import config from 'config';
 import PageOrder from '../../backend/models/pageOrder.js';
-import database from '../../backend/utils/database/index.js';
+import database from '../../backend/database/index.js';
 import { fileURLToPath } from 'url';
 
 /**