Merge pull request #103 from BinaryStudioAcademy/task/thjs-56-move-functional-routes-to-controllers

thjs-56: Move functional routes to controllers

Author: v0ldemar01

server/knexfile.js

@@ -1,50 +1,3 @@
-import { knexSnakeCaseMappers } from 'objection';
+import { database } from '#libs/packages/database/database.js';
 
-import { AppEnvironment } from '#libs/enums/enums.js';
-
-import { config } from './src/libs/packages/config/config.js';
-
-const {
-  DATABASE: database,
-  TEST_DATABASE: testDatabase,
-  USERNAME: username,
-  PASSWORD: password,
-  HOST: host,
-  PORT: port,
-  CLIENT: client,
-  DEBUG: debug
-} = config.ENV.DB;
-
-const DEFAULT_ENV_CONFIG = {
-  client,
-  connection: {
-    user: username,
-    port,
-    host,
-    database,
-    password
-  },
-  migrations: {
-    directory: './src/db/migrations',
-    tableName: 'knex_migrations'
-  },
-  seeds: {
-    directory: './src/db/seeds'
-  },
-  debug,
-  ...knexSnakeCaseMappers({ underscoreBetweenUppercaseLetters: true })
-};
-
-const knexConfig = {
-  [AppEnvironment.DEVELOPMENT]: DEFAULT_ENV_CONFIG,
-  [AppEnvironment.PRODUCTION]: DEFAULT_ENV_CONFIG,
-  [AppEnvironment.TEST]: {
-    ...DEFAULT_ENV_CONFIG,
-    connection: {
-      ...DEFAULT_ENV_CONFIG.connection,
-      database: testDatabase
-    }
-  }
-};
-
-export default knexConfig;
+export default database.environmentsConfig;

server/src/libs/packages/controller/controller.api.js

@@ -0,0 +1,24 @@
+import { getJoinedNormalizedPath } from '#libs/packages/path/path.js';
+
+class Controller {
+  #apiPath;
+
+  #routes = [];
+
+  get routes() {
+    return this.#routes;
+  }
+
+  constructor({ apiPath }) {
+    this.#apiPath = apiPath;
+  }
+
+  addRoute = ({ url, ...options }) => {
+    this.#routes.push({
+      url: getJoinedNormalizedPath([this.#apiPath, url]),
+      ...options
+    });
+  };
+}
+
+export { Controller };

server/src/libs/packages/controller/controller.js

@@ -1 +1,2 @@
+export { Controller } from './controller.api.js';
 export { ControllerHook } from './libs/enums/enums.js';

server/src/libs/packages/database/database.js

@@ -1,3 +1,10 @@
+import { config } from '#libs/packages/config/config.js';
+
+import { Database } from './database.package.js';
+
+const database = new Database({ config });
+
+export { database };
 export { Abstract as AbstractModel } from './abstract.model.js';
 export { Abstract as AbstractRepository } from './abstract.repository.js';
 export { DatabaseTableName } from './libs/enums/enums.js';

server/src/libs/packages/database/database.package.js

@@ -0,0 +1,79 @@
+import Knex from 'knex';
+import { knexSnakeCaseMappers, Model } from 'objection';
+
+import { AppEnvironment } from '#libs/enums/enums.js';
+
+class Database {
+  #config;
+
+  #knex;
+
+  constructor({ config }) {
+    this.#config = config;
+  }
+
+  get knex() {
+    return this.#knex;
+  }
+
+  connect() {
+    const knex = Knex(this.environmentConfig);
+    Model.knex(knex);
+
+    this.#knex = knex;
+  }
+
+  get environmentsConfig() {
+    const { TEST_DATABASE: testDatabase } = this.#config.ENV.DB;
+
+    return {
+      [AppEnvironment.DEVELOPMENT]: this.initialConfig,
+      [AppEnvironment.PRODUCTION]: this.initialConfig,
+      [AppEnvironment.TEST]: {
+        ...this.initialConfig,
+        connection: {
+          ...this.initialConfig.connection,
+          database: testDatabase
+        }
+      }
+    };
+  }
+
+  get initialConfig() {
+    const {
+      DATABASE: database,
+      USERNAME: username,
+      PASSWORD: password,
+      HOST: host,
+      PORT: port,
+      CLIENT: client,
+      DEBUG: debug
+    } = this.#config.ENV.DB;
+
+    return {
+      client,
+      connection: {
+        user: username,
+        port,
+        host,
+        database,
+        password
+      },
+      migrations: {
+        directory: './src/db/migrations',
+        tableName: 'knex_migrations'
+      },
+      seeds: {
+        directory: './src/db/seeds'
+      },
+      debug,
+      ...knexSnakeCaseMappers({ underscoreBetweenUppercaseLetters: true })
+    };
+  }
+
+  get environmentConfig() {
+    return this.environmentsConfig[this.#config.ENV.APP.ENVIRONMENT];
+  }
+}
+
+export { Database };

…ath/get-joined-normalized-path.helper.js …ath/get-joined-normalized-path.helper.jsserver/tests/libs/packages/path/libs/helpers/get-joined-normalized-path/get-joined-normalized-path.helper.js renamed to server/src/libs/packages/path/libs/helpers/get-joined-normalized-path/get-joined-normalized-path.helper.js server/tests/libs/packages/path/libs/helpers/get-joined-normalized-path/get-joined-normalized-path.helper.js renamed to server/src/libs/packages/path/libs/helpers/get-joined-normalized-path/get-joined-normalized-path.helper.js

@@ -0,0 +1,3 @@
+export { getJoinedNormalizedPath } from './get-joined-normalized-path/get-joined-normalized-path.helper.js';
+export { joinPath } from './join-path/join-path.helper.js';
+export { normalizeTrailingSlash } from './normalize-trailing-slash/normalize-trailing-slash.helper.js';

server/src/libs/packages/path/libs/helpers/helpers.js

@@ -0,0 +1,5 @@
+export {
+  getJoinedNormalizedPath,
+  joinPath,
+  normalizeTrailingSlash
+} from './libs/helpers/helpers.js';