Merge pull request #36 from anthonypena97/develop

Develop

config/connections.js

@@ -1,15 +1,15 @@
-require('dotenv').config();
-
+// import the Sequelize constructor from the library
 const Sequelize = require('sequelize');
 
-const sequelize = process.env.JAWSDB_URL ?
-    new Sequelize(process.env.JAWSDB_URL) :
-    new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PW, {
+require('dotenv').config();
+
+const sequelize = process.env.JAWSDB_URL
+    ? new Sequelize(process.env.JAWSDB_URL)
+    : new Sequelize(process.env.DB_NAME, process.env.DB_USER, process.env.DB_PW, {
         host: 'localhost',
         dialect: 'mysql',
-        dialectOptions: {
-            decimalNumbers: true,
-        },
+        port: 3306
     });
 
+
 module.exports = sequelize;

models/Playlist.js

@@ -0,0 +1,30 @@
+const { Model, DataTypes, INTEGER } = require('sequelize');
+const sequelize = require('../config/connections');
+
+class Playlist extends Model { }
+
+Playlist.init({
+    id: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        primaryKey: true,
+        autoIncrement: true,
+    },
+    playlist_name: {
+        type: DataTypes.STRING,
+        allowNull: false,
+    },
+    playlist_artwork: {
+        type: DataTypes.STRING,
+        allowNull: false
+    }
+},
+    {
+        sequelize,
+        timestamps: false,
+        freezeTableName: true,
+        underscored: true,
+        modelName: 'playlist'
+    });
+
+module.exports = Playlist;

models/Songs.js

@@ -0,0 +1,38 @@
+const { Model, DataTypes, INTEGER } = require('sequelize');
+const sequelize = require('../config/connections');
+const Playlist = require('./Playlist');
+
+class Songs extends Model { }
+
+Songs.init({
+    id: {
+        type: DataTypes.INTEGER,
+        allowNull: false,
+        primaryKey: true,
+        autoIncrement: true,
+    },
+    song_title: {
+        type: DataTypes.STRING,
+        allowNull: false,
+    },
+    artist: {
+        type: DataTypes.STRING,
+        allowNull: false,
+    },
+    playlist_id: {
+        type: DataTypes.INTEGER,
+        references: {
+            model: 'playlist',
+            key: 'id'
+        }
+    }
+},
+    {
+        sequelize,
+        timestamps: false,
+        freezeTableName: true,
+        underscored: true,
+        modelName: 'songs',
+    })
+
+module.exports = Songs

models/UserLogin.js

@@ -0,0 +1,60 @@
+const { Model, DataTypes, INTEGER } = require('sequelize');
+const sequelize = require('../config/connections')
+const bcrypt = require('bcrypt');
+// const { beforeUpdate, beforeCreate } = require('./Playlist');
+// const { Hooks } = require('sequelize/types/lib/hooks');
+
+class UserLogin extends Model {
+    checksPassword(loginPw) {
+        return bcrypt.compareSync(loginPw, this.password)
+    }
+    checksToken(tokenKey) {
+        return bcrypt.compareSync(tokenKey, this.token_for_user)
+    }
+}
+
+UserLogin.init({
+        id: {
+            type: DataTypes.INTEGER,
+            allowNull: false,
+            primaryKey: true,
+            autoIncrement: true
+        },
+        username: {
+            type: DataTypes.STRING,
+            allowNull: false
+
+        },
+        password: {
+            type: DataTypes.STRING,
+            allowNull: false
+        },
+        token_for_user: {
+            type: DataTypes.STRING,
+            allowNull: false
+        },
+
+    },
+    //  {
+    //     hooks: {
+    //         async beforeCreate(newUserPw) {
+    //             newUserPw.password = await bcrypt.hash(newUserPw.password, 10);
+    //             return newUserPw;
+    //         },
+    //         async beforeUpdate(updateUserPw) {
+    //             updateUserPw.password = await bcrypt.hash(updateUserPw.password, 10);
+    //             return updateUserPw;
+    //         }
+    //     },
+    // }, 
+    {
+
+        sequelize,
+        timestamps: false,
+        freezeTableName: true,
+        underscored: true,
+        modelName: 'user_login'
+
+    })
+
+module.exports = UserLogin

models/index.js

@@ -1,18 +1,16 @@
-const Playlist = require('./playlist')
-const PlaylistSongs = require('./songs')
+const Playlist = require('./Playlist')
+const Songs = require('./Songs')
+const UserLogin = require('./UserLogin')
 
 
-PlaylistSongs.belongsTo(Playlist, {
+Songs.belongsTo(Playlist, {
     foreignKey: 'playlist_id'
 })
 
 
-Playlist.hasMany(PlaylistSongs, {
+Playlist.hasMany(Songs, {
     foreignKey: 'playlist_id'
 })
 
 
-module.exports = {
-    Playlist,
-    PlaylistSongs
-};
+module.exports = { Playlist, Songs, UserLogin };