:sparkles: switching to objectiion and schwifty

backend/config/dev.js

@@ -5,7 +5,7 @@ const config = {
 
     db: 'test',
     dbPort: 3306,
-    dbDialect: 'mariadb',
+    dbDialect: 'mysql', // even for mariadb
 
     /** URL preceding endpoints */
     apiBase: 'api',

backend/package.json

@@ -11,12 +11,14 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@hapi/hapi": "^20.1.3",
+    "@hapipal/schwifty": "^6.0.0",
     "hapi-sequelizejs": "^4.4.0",
     "hapi-swaggered": "^3.0.2",
     "hapi-swaggered-ui": "^3.1.0",
     "joi": "^13.7.0",
-    "mariadb": "^2.5.3",
-    "sequelize": "^6.6.2"
+    "knex": "^0.21.19",
+    "mysql": "^2.18.1",
+    "objection": "^2.2.15"
   },
   "devDependencies": {
     "nodemon": "^2.0.7"

backend/src/docs.js

@@ -24,5 +24,6 @@ const swaggeredUI = {
         },
     }
 }
+const docs = [ vision, inert, swaggered, swaggeredUI ]
 
-export default [ vision, inert, swaggered, swaggeredUI ]
+export { docs }

backend/src/index.js

@@ -1,14 +1,13 @@
 import Hapi from '@hapi/hapi'
-import Sequelize from 'sequelize'
+import Schwifty from '@hapipal/schwifty'
 
-import hapiSequelizejs from 'hapi-sequelizejs'
+import { config } from '../config/dev.js'
 
 import { routes } from './routes/index.js'
 import { plugins } from './plugins/index.js'
+import { docs } from './docs.js'
 
-import docs from './docs.js'
-
-import { config } from '../config/dev.js'
+import Joi from 'joi'
 
 const server = Hapi.server({
     port: config.port,
@@ -18,21 +17,11 @@ const server = Hapi.server({
     }
 })
 
-const dbOpts = {
-    name: config.db, // identifier
-    models: ['./models/**/*.js'], // paths/globs to model files
-    ignoredModels: ['./models/**/*.js'], // OPTIONAL: paths/globs to ignore files
-    sequelize: new Sequelize(
-        config.db, // db name
-        'root', // U
-        'root', // P
-        {
-            host: config.host,
-            dialect: config.dbDialect
-        }
-    ),
-    sync: true, // sync models - default false
-    forceSync: false, // force sync (drops tables) - default false
+const dbConnection = {
+    host : config.host,
+    user : 'root',
+    password : 'root',
+    database : config.db
 }
 
 const init = async () => {
@@ -47,18 +36,51 @@ const init = async () => {
 
         await server.register(docs)
 
-        /** Register the Sequlize instance as a plugin */
-        await server.register({ plugin: hapiSequelizejs, options: dbOpts })
-
-        /** Uncomment to print the Sequlize instance */
-        // console.log(server.plugins['hapi-sequelizejs'][config.db])
-
-        /** Double-check the database connection */
+        /** Register the database connection */
         console.log(`\n[SIIMEE API] Database: ${config.db} | Attempting to connect on port ${config.dbPort}...`)
-        await server.plugins['hapi-sequelizejs'][config.db].sequelize.authenticate()
+        await server.register({
+            plugin: Schwifty,
+            options: {
+                knex: { client: config.dbDialect, connection: dbConnection }
+            }
+        })
         console.log(`[SIIMEE API] Database: ${config.db} | Connection has been established on port ${config.dbPort}!`)
 
+
+
+
+
+        server.registerModel(
+            class Dog extends Schwifty.Model {
+                static tableName = 'Dog'
+                static joiSchema = Joi.object({
+                    id: Joi.number(),
+                    name: Joi.string()
+                })
+            }
+        )
+
+
         /** Lift Off! */
+        await server.initialize()
+        
+        const knex = server.knex()
+        // console.log(knex)
+        await knex.schema.createTable('Dog', (table) => {
+            table.increments('id').primary()
+            table.string('name')
+        })
+    
+        // ... then add some records ...
+    
+        const { Dog } = server.models()
+    
+        await Promise.all([
+            Dog.query().insert({ name: 'Guinness' }),
+            Dog.query().insert({ name: 'Sully' }),
+            Dog.query().insert({ name: 'Ren' })
+        ])
+
         await server.start()
         console.log('\n[SIIMEE API] Server running on %s', server.info.uri)
     }