some model changes were required in order to init properly

Author: cgencer

src/app.ts

@@ -1,4 +1,4 @@
-import express, { Express, Request, Response } from 'express';
+import express, { Express, Request, Response, Router } from 'express';
 import cors from 'cors';
 import helmet from 'helmet';
 import morgan from 'morgan';
@@ -12,11 +12,13 @@ import { fileURLToPath } from 'url';
 import rfs from 'rotating-file-stream';
 
 import { config, policies } from './config/config.js';
+import { authRoutes } from './routes/auth.js';
+import { userRoutes } from './routes/user.js';
+import { contentRoutes } from './routes/content.js';
 
 import { errorHandler } from "./helpers/error.mw.js";
 import { notFoundHandler } from "./helpers/not-found.mw.js";
-import routes from './routes/index.js';
-
+//import routes from './routes/index.js';
 
 export default class App {
 
@@ -56,10 +58,13 @@ export default class App {
 			console.log('::: logfile is at: logs/access.log');
 			this.app.use(morgan('tiny', { stream: accessLogStream }))
 		}
-		this.app.use(errorHandler);
-		this.app.use(notFoundHandler);
+//		this.app.use(errorHandler);
+//		this.app.use(notFoundHandler);
+
+		this.app.use('/auth', authRoutes);
+		this.app.use('/user', userRoutes);
+		this.app.use('/content', contentRoutes);
 
-		this.app.use('/', routes);
 		console.log(':::--------------------------------');
 
 		this.app.listen(config.port, () => {

src/controllers/AuthController.ts

@@ -2,7 +2,6 @@ import { validationResult } from 'express-validator';
 import bcrypt from "bcrypt";
 import { encode_reg_token } from '../helpers/tokens.js';
 import _ from 'lodash';
-import { BaseController } from './BaseController.js';
 import { Users } from '../models/Users.js';
 
 interface Base {

src/controllers/BaseController.ts

@@ -1,5 +1,4 @@
 import { validationResult } from 'express-validator';
-import { BaseController } from './BaseController.js';
 import { Users } from '../models/Users.js';
 import { Contents } from '../models/Contents.js';
 
@@ -17,7 +16,6 @@ export class ContentController implements Base {
     async get_contents(req: any, res: any): Promise<void> {
         try {
             const posts = await Contents.findAll();
-            console.dir(posts);
             res.status(200).json({
                 type: "success",
                 posts
@@ -176,3 +174,11 @@ export class ContentController implements Base {
         }
     };
 };
+
+
+export class ArticleController extends ContentController implements Base {
+}
+export class ProductController extends ContentController implements Base {
+}
+export class GameController extends ContentController implements Base {
+}

src/controllers/ContentController.ts

@@ -1,5 +1,6 @@
 import { Sequelize } from 'sequelize';
 import { Singleton } from '../helpers/singleton.js'
+import { initModels } from "../models/init-models.js";
 
 @Singleton
 export default class dbInit {
@@ -9,8 +10,13 @@ export default class dbInit {
 	public static init(DBString: string) {
 		// @ts-ignore
 
-		dbInit._instance = new Sequelize(DBString).authenticate().then(() => {
-			console.log('Connection has been established successfully.');
+		dbInit._instance = new Sequelize(DBString, {
+			logging: console.log
+		});
+		dbInit._instance.authenticate().then(() => {
+			console.log('Connection has been established and authenticated.');
+
+			const { Contents, Users, CrossBindings } = initModels(dbInit._instance);
 		}).catch((error) => {
 			console.error('::: Unable to connect to the database...');
 			console.error('::: @@@'+error.message);

src/database/db.ts

@@ -1,10 +1,10 @@
 import type { Sequelize } from "sequelize";
-import { Contents as _Contents } from "./Contents";
-import type { ContentsAttributes, ContentsCreationAttributes } from "./Contents";
-import { CrossBindings as _CrossBindings } from "./CrossBindings";
-import type { CrossBindingsAttributes, CrossBindingsCreationAttributes } from "./CrossBindings";
-import { Users as _Users } from "./Users";
-import type { UsersAttributes, UsersCreationAttributes } from "./Users";
+import { Contents as _Contents } from "./Contents.js";
+import type { ContentsAttributes, ContentsCreationAttributes } from "./Contents.js";
+import { CrossBindings as _CrossBindings } from "./CrossBindings.js";
+import type { CrossBindingsAttributes, CrossBindingsCreationAttributes } from "./CrossBindings.js";
+import { Users as _Users } from "./Users.js";
+import type { UsersAttributes, UsersCreationAttributes } from "./Users.js";
 
 export {
   _Contents as Contents,

src/models/init-models.ts

@@ -1,7 +1,7 @@
 import express from 'express';
 import { authController, userController, contentController } from '../controllers/index.js';
-import { Router } from 'express';
-const routes = Router();
+//const routes = Router();
+const routes = express.Router();
 
 routes.post('/register', authController.create_user);
 routes.post('/login', authController.login_user);

src/routes/auth.ts

@@ -1,7 +1,7 @@
 import express from 'express';
 import { authController, userController, contentController } from '../controllers/index.js';
-import { Router } from 'express';
-const routes = Router();
+//const routes = Router();
+const routes = express.Router();
 
 routes.get('/', contentController.get_contents);
 routes.get('/:id', contentController.get_content);

src/routes/content.ts

@@ -6,7 +6,7 @@ import expressListRoutes from 'express-list-routes';
 
 const routes = express.Router();
 
-routes.use(authRoutes);
+routes.use('/auth', authRoutes);
 routes.use('/user', userRoutes);
 routes.use('/content', contentRoutes);
 

src/routes/index.ts

@@ -1,8 +1,8 @@
 import express from 'express';
 import { authController, userController, contentController } from '../controllers/index.js';
 import { accessVerifier } from '../helpers/auth.mw.js';
-import { Router } from 'express';
-const routes = Router();
+//const routes = Router();
+const routes = express.Router();
 
 routes.get('/:id', userController.get_user);
 routes.put('/:id', accessVerifier, userController.update_user);