Chessito - reestructuring repo

index.js

@@ -1,6 +1,6 @@
 import conf from "./src/conf/index.js";
-import Bot from "./src/bot/bot.js";
-import Router from "./src/routes.js";
+import Bot from "./src/controllers/bot.controller.js";
+import Router from "./src/routes/index.routes.js";
 
 const router = new Router();
 router.registerRoutes();

src/conf/index.js

@@ -15,8 +15,5 @@ export default {
     },
     server: {
         port: 3000,
-    },
-    database: {
-        connector: "Mongoose"
     }
 };

src/bot/bot.js → src/controllers/bot.controller.js

@@ -1,6 +1,6 @@
 import { Telegraf } from "telegraf";
-import Commands from "./commands.js"
-import LichessService from "../services/lichess/lichess.js";
+import Commands from "./commands.controller.js"
+import LichessService from "../services/lichess.service.js";
 
 
 export default class Bot {

src/database/connectors/mongoose.js → src/database/db-connector.js

@@ -1,7 +1,7 @@
 import mongoose from 'mongoose';
-import conf from "../../conf/index.js";
+import conf from "../conf/index.js";
 
-export default class MongooseConnector {
+export default class DBConnector {
 
     constructor() {
         const { dbUserName, dbPassword, dbName } = conf.mongodb;
@@ -22,7 +22,11 @@ export default class MongooseConnector {
         }
     }
 
-    close() {
+    disconnect() {
         mongoose.connection.close();
     }
+
+    buildModel(type, schema) {
+        return mongoose.model(type, mongoose.Schema(schema));
+    }
 }

src/database/schemas.js

@@ -0,0 +1,25 @@
+// eslint-disable-next-line import/prefer-default-export
+export const userSchema = {
+    id: {
+        type: String,
+        required: true,
+        trim: true,
+        index: true,
+        unique: true,
+    },
+    name: {
+        type: String,
+        required: true,
+        lowercase: true,
+        trim: true,
+        index: true,
+    },
+    email: {
+        type: String,
+        required: true,
+        lowercase: true,
+        trim: true,
+        index: true,
+        unique: true,
+    }
+};

src/models/user.model.js

@@ -0,0 +1,18 @@
+import DBConnector from "../database/db-connector.js";
+import { userSchema } from "../database/schemas.js";
+
+export default class UserModel {
+    constructor() {
+        this.connector = new DBConnector();
+        this.connection = this.connector.connect();
+        this.user = this.connector.buildModel("User", userSchema);
+    }
+
+    login(chatId) {
+        console.log(chatId);
+    }
+
+    getLiveGames() {
+        console.log("getLiveGames");
+    }
+}

src/routes.js → src/routes/index.routes.js

@@ -1,7 +1,7 @@
 import express from "express";
 import passport from "passport";
-import conf from "./conf/index.js";
-import LichessRouter from "./services/lichess/router-lichess.js";
+import conf from "../conf/index.js";
+import LichessRouter from "./lichess.routes.js";
 
 export default class Router {
 

src/services/lichess/router-lichess.js → src/routes/lichess.routes.js

@@ -1,4 +1,4 @@
-import lichessStrategy from "./lichess-strategy.js";
+import lichessStrategy from "./strategies/lichess-strategy.js";
 
 export default class LichessRouter {
     constructor(app, passport) {

src/services/lichess/lichess.js → src/services/lichess.service.js

@@ -1,18 +1,18 @@
-import LichessModel from "../../models/lichess.js";
+import User from "../models/user.model.js";
 
 export default class LichessService {
 
     constructor(credentials) {
         this.credentials = credentials;
-        this.lichessModel = new LichessModel(this.credentials);
+        this.user = new User(this.credentials);
     }
 
     login(chatId) {
-        this.lichessModel.login(chatId);
+        this.user.login(chatId);
         return `https://chessito.org/auth/lichess?chat_id=${chatId}`;
     }
 
     getLiveGames() {
-        return this.lichessModel.getLiveGames();
+        return this.user.getLiveGames();
     }
 }