Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions add.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
function sum(a, b) {
return a + b;
}
module.exports = sum;
5 changes: 5 additions & 0 deletions add.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const sum = require('./add');

test('adds 1 + 2 to equal 3', () => {
expect(sum(1, 2)).toBe(3);
});
6 changes: 5 additions & 1 deletion config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ exports.EMAIL_FROM = process.env.emailFrom
exports.EMAIL_TO = process.env.emailTo
exports.URL = process.env.url
exports.URL1 = process.env.url1
exports.snapURL = process.env.snapurl
exports.snapURL = process.env.snapurl
exports.EMAIL_PASS = process.env.pass
exports.DB = process.env.database
exports.USERNAME = process.env.username
exports.PASS = process.env.password
10 changes: 9 additions & 1 deletion controllers/userController.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,12 @@ exports.snapdealTshirt = async (req,res)=>{
}catch(error){
res.status(401).send({success: "false", message: "userdata not found" ,error});
}
};
};
exports.aggregate = async (req,res) => {
try {
const data = await userServices.findByAggregate()
res.status(201).send({success: "true", message: "userdata found", Data : data });
} catch (error) {
res.status(401).send({success: "false",error});
}
}
27 changes: 17 additions & 10 deletions dbconnection.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
const mongoose = require("mongoose");
const { db_url } = require("./config/config");
const { Sequelize } = require("sequelize");
const config = require("./config/config");

const db_connect = async ()=>{
try {
await mongoose.connect(db_url)
console.log("Database connected");
} catch (error) {
console.log("DB connection failed");
}
const sequelize = new Sequelize(config.DB, 'root',config.PASS, {
host: 'localhost',
dialect: 'mysql',
});

const connectdb= async () => {
try {
await sequelize.authenticate();
console.log("Connection has been established successfully.");
} catch (error) {
console.error("Unable to connect to the database:", error);
}
}
db_connect();
connectdb();

module.exports = sequelize
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ const express = require("express");
const app = express();
const config = require("./config/config")
const userRoute = require("./routes/register.js");
const User = require("./model/register");

require("./dbconnection");
app.use(express.json());

app.use("/user", userRoute)

User.sync()

app.listen(config.portNo,()=>{
console.log("server is running");
Expand Down
3 changes: 2 additions & 1 deletion middleware/mid_register.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ const users = require("../model/userModel")
const jwt = require("jsonwebtoken");
const config = require("../config/config");
const multer = require("multer")
const User = require("../model/register")

exports.REG_MIDDLE = async (req, res, next) => {
const userData = await users.findOne({ email: req.body.email });
const userData = await User.findOne({where:{ email: req.body.email }});

if (userData) {
return res.status(409).send({ success: false, msg: "Email already exist" });
Expand Down
30 changes: 30 additions & 0 deletions model/DummyData.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
const mongoose=require("mongoose");
const user = mongoose.Schema({
name:{
name: String,
},
country:{
type:String
},
region:{
type:String
},
email:{
type:String
},
phone:{
type:String
},
currency:{
type:Number
},
numberrange:{
type:Number
},
postalZip:{
type:Number
}
}
);

module.exports = mongoose.model("dummydatas",user)
38 changes: 38 additions & 0 deletions model/register.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
const { DataTypes } = require("sequelize");
const sequelize = require("../dbconnection");
const User = sequelize.define("User",
{
username: {
type: DataTypes.STRING,
allowNull: false,
},
firstname: {
type: DataTypes.STRING,
allowNull: false,
},
lastname: {
type: DataTypes.STRING,
},
email: {
type: DataTypes.STRING,
},
password: {
type: DataTypes.STRING,
},
mobile: {
type: DataTypes.STRING,
},
address: {
type: DataTypes.STRING,
}
},
{
tableName: "users",
timestamps: true,
}
);

// `sequelize.define` also returns the model
console.log(User === sequelize.models.User); // true

module.exports = User;
31 changes: 20 additions & 11 deletions model/userToken.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
const mongoose = require("mongoose");
const user = mongoose.Schema({
userId:{
type:Object
const { DataTypes } = require("sequelize");
const sequelize = require("../dbconnection");

const userToken = sequelize.define("userToken",
{
userId: {
type: DataTypes.STRING,
allowNull: false,
},
token:{
type:String,
required:true
token: {
type: DataTypes.STRING,
allowNull: false,
},
expiry:{
type:String
expiry: {
type: DataTypes.STRING,
}
});
},
{
tableName: "userToken",
timestamps: true,
}
);

module.exports = mongoose.model("usertoken",user)
module.exports = userToken;
Loading