Skip to content

Commit ec6ac82

Browse files
dz-aidz-ai
committed
Merge branch 'main' into jwt_binding_with_machine
# Conflicts: # controller/auth.js # util.js
2 parents f620948 + e87f000 commit ec6ac82

15 files changed

+441
-13
lines changed

‎controller/auth.js‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
const { generateToken } = require('../util');
1+
const { generateToken, sendOTP } = require('../util');
22
const user = require('../models/user');
33

4+
otpStore = {}
5+
46
exports.login = async function(req, res, next) {
57
const {id, password} = req.body;
68
let userValidated = await user.validateUser(id, password);
@@ -25,3 +27,31 @@ exports.validateUser = function(req, res, next) {
2527
res.json({res: req.user, msg: "user validated", err:null})
2628
}
2729

30+
exports.sendOTP = async function(req, res, next){
31+
const {uid, emailId} = req.body;
32+
let userExists = await user.checkUser(uid, emailId);
33+
if(userExists){
34+
let otp = Math.floor(1000 + Math.random() * 9000);
35+
otpStore[uid] = otp;
36+
sendOTP(emailId, otp);
37+
res.send({res:"otp sent to emailID"})
38+
}
39+
else{
40+
res.send({err:"incorrect UID or emailId"})
41+
}
42+
}
43+
44+
exports.resetPassword = async function(req, res, next){
45+
const {uid, otp, password} = req.body;
46+
if(otpStore[uid]==otp){
47+
let passwordUpdated = await user.updatePassword(uid, password);
48+
if(passwordUpdated)
49+
res.send({res:"successfully updated password"})
50+
else
51+
res.send({err:"Something went wrong while updating password"})
52+
}
53+
else{
54+
res.send({err:"incorrect otp"});
55+
}
56+
}
57+

‎models/databaseUtil.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
const mongoose = require('mongoose');
22
require("dotenv").config();
3-
43
mongoose.set('strictQuery', true);
54
mongoose.connect(`${process.env.DB_URL}`);
6-
7-
8-
module.exports = { connector:mongoose };
5+
module.exports = { connector:mongoose };

‎models/emp_bankSchema.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
const { connector } = require("./databaseUtil");
2+
3+
const EmpBankSchema = {
4+
userId: {
5+
type: String,
6+
required: true,
7+
unique: true,
8+
},
9+
bank_name: {
10+
type: String,
11+
required: true,
12+
minLength: 7,
13+
},
14+
bank_acc: {
15+
type: String,
16+
required: true,
17+
unique: true,
18+
},
19+
bank_branch: {
20+
type: String,
21+
required: true,
22+
},
23+
bank_ifsc: {
24+
type: String,
25+
required: true,
26+
maxLength: 11,
27+
minLength: 11,
28+
},
29+
bank_micr: {
30+
type: String,
31+
required: true,
32+
maxLength: 9,
33+
minLength: 9,
34+
},
35+
appointment_approve_sg_dte: {
36+
type: String,
37+
},
38+
};
39+
40+
const Bank = new connector.model("EmpBank", EmpBankSchema);
41+
module.exports = {};

‎models/emp_cur_details_model.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
const { connector } = require("./databaseUtil");
2+
3+
const employeeCurrentEmployementSchema = {
4+
date_of_joining: { type: Date, required: true },
5+
department_name: { type: String, required: true },
6+
designation: { type: String, required: true },
7+
job_status: { type: String, required: true },
8+
job_profile: { type: String, required: true },
9+
current_ctc: { type: Number, required: true },
10+
};
11+
12+
const employeeCurrentEmployement = new connector.model(
13+
"empCurrentDetails",
14+
employeeCurrentEmployementSchema
15+
);
16+
17+
module.exports = {};

‎models/emp_edu_history.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
const { connector } = require('./databaseUtil');
2+
const Education = {
3+
education_type: { type: String, required: true },
4+
education_name: { type: String, required: true },
5+
specialization: { type: String, required: true },
6+
period: { type: String, required: true },
7+
institution_name: { type: String, required: true },
8+
university: { type: String, required: true },
9+
passing_division: { type: String, required: true },
10+
from_year: { type: String, required: true },
11+
upto_year: { type: String, required: true },
12+
registration_number: { type: String, required: true },
13+
aggregate_pct: { type: String, required: true },
14+
final_year_pct: { type: String, required: true },
15+
number_of_attempts: { type: Number, required: true },
16+
rank: { type: Number, required: true },
17+
passing_year: { type: String, required: true },
18+
}
19+
const employeeEducationHistorySchema = {
20+
ssc: { type: Education, required: true },
21+
hsc: { type: Education, required: true },
22+
dip: { type: Education },
23+
iti: { type: Education },
24+
deg: { type: Education },
25+
pgd: { type: Education },
26+
phd: { type: Education },
27+
pdoc: { type: Education }
28+
}
29+
const employeeEducationHistory = new connector.model('emp-edu-history',employeeEducationHistorySchema);

‎models/std_bankSchema.js‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
const { connector } = require("./databaseUtil");
2+
3+
const stdBankSchema = {
4+
userId: {
5+
type: String,
6+
required: true,
7+
unique: true,
8+
},
9+
bank_name: {
10+
type: String,
11+
required: true,
12+
minLength: 7,
13+
},
14+
bank_acc: {
15+
type: String,
16+
required: true,
17+
unique: true,
18+
},
19+
bank_branch: {
20+
type: String,
21+
required: true,
22+
},
23+
bank_ifsc: {
24+
type: String,
25+
required: true,
26+
maxLength: 11,
27+
minLength: 11,
28+
},
29+
bank_micr: {
30+
type: String,
31+
required: true,
32+
maxLength: 9,
33+
minLength: 9,
34+
},
35+
};
36+
37+
const std_bank = new connector.model("stdBankSchema", stdBankSchema);
38+
module.exports = {};

‎models/std_college.js‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
const { connector } = require("./databaseUtil");
2+
3+
const StudentCollegeSchema = {
4+
userId: {
5+
type: String,
6+
required: true,
7+
unique: true,
8+
},
9+
AdmissionYear: {
10+
type: String,
11+
required: true,
12+
},
13+
StudentCode: {
14+
type: String,
15+
},
16+
Rollno: {
17+
type: String,
18+
},
19+
AdmissionStatus: {
20+
type: String,
21+
required: true,
22+
},
23+
AdmissionPattern: {
24+
type: String,
25+
},
26+
Admissioncategory: {
27+
type: String,
28+
required: true,
29+
},
30+
SeatDesc: {
31+
type: String,
32+
},
33+
QuotaType: {
34+
type: String,
35+
required: true,
36+
},
37+
QuotaType: {
38+
type: String,
39+
required: true,
40+
},
41+
Boarder: {
42+
type: Boolean,
43+
},
44+
Seattype: {
45+
type: String,
46+
required: true,
47+
},
48+
Seatsubtype: {
49+
type: String,
50+
required: true,
51+
},
52+
EligibilityNo: {
53+
type: String,
54+
required: true,
55+
},
56+
EnrollmentNo: {
57+
type: String,
58+
required: true,
59+
unique: true,
60+
},
61+
};
62+
63+
const studentcollegeCollege = new connector.model(
64+
"StudentCollegeSchema",
65+
StudentCollegeSchema
66+
);
67+
68+
module.exports = {};

‎models/std_edu_history.js‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
const { Schema, default: mongoose } = require('mongoose');
2+
const {connector} = require('./databaseUtil');
3+
4+
const studentEducationSchema = new Schema({
5+
personal_info: {
6+
name: { type: String, required: true },
7+
emailId: { type: String, unique: true, required: true },
8+
gender: { type: String, required: true },
9+
password: { type: String, required: true },
10+
},
11+
//tenth_details
12+
tenth: {
13+
marks: { type: String, required: true },
14+
percentage: { type: Number, required: true },
15+
seat_number: { type: String, required: true },
16+
exam_name: { type: String, required: true },
17+
exam_board: { type: String, required: true },
18+
ms_oms: { type: String, required: true },
19+
merit_number_in_qualifying_exam: { type: String, required: true },
20+
admitted_number: { type: String, required: true },
21+
},
22+
cet_hsc_details: {
23+
cet_roll_no: { type: String, required: true },
24+
cet_marks: { type: String, required: true },
25+
qualifying_exam_for_admission: { type: String, required: true },
26+
std_type: { type: String, required: true },
27+
stream_opted: { type: String, required: true },
28+
medium_of_instruction: { type: String, required: true },
29+
agg_total_marks: { type: Number, required: true },
30+
total_marks_out_of: { type: Number, required: true },
31+
percent_of_marks: { type: String, required: true },
32+
attempt_no: { type: String, required: true },
33+
passing_month: { type: String, required: true },
34+
passing_year: { type: String, required: true },
35+
institution_name: { type: String, required: true },
36+
educ_board_name:{type:String,required:true},
37+
pcm_percent:{type:String,required:true},
38+
pbm_percent:{type:String,required:true},
39+
stu_qualifying_exam:{type:String,required:true},
40+
marks_obtained:{type:String,required:true},
41+
state_rank:{type:String,required:true},
42+
prev_exam_seat_number:{type:String,required:false},
43+
prev_tc_number:{type:String,required:false},
44+
hsc_passed_school_name:{type:String,required:true},
45+
board_pattern:{type:String,required:true},
46+
scholarship_name:{type:String,required:false},
47+
scholarship_type:{type:String,required:false},
48+
dte_seat_type:{type:String,required:true},
49+
dte_user_password:{type:String,required:true},
50+
dte_user_id:{type:String,required:true},
51+
},
52+
graduation_details: {
53+
graduation_institute:{type:String,required:true},
54+
graduation_branch:{type:String,required:true},
55+
graduation_degree:{type:String,required:true},
56+
graduation_marks_pct:{type:Number,required:true},
57+
graduations_passing_year:{type:String,required:true},
58+
urban_rural:{type:String,required:true},
59+
scholarship_number:{type:String,required:false},
60+
last_school_college_attended:{type:String,required:true},
61+
}
62+
})
63+
const studentEducation = new connector.model('std-edu',studentEducationSchema);
64+
module.exports={};

‎models/std_med_history.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { connector } from './databaseUtil';
2+
3+
const studentMedicalSchema={
4+
bloodGroup:{type:String, required:true},
5+
pastMedicalHistory:{type:String, required:true},
6+
immunisationHistory:{type:String, required:true},
7+
chronicMedicalConditions:{type:String},
8+
parentsEmailId:{type:String, required:true},
9+
parentsContact:{type:Number, required:true},
10+
relativeContacts:{type:Number, required:true},
11+
}
12+
const medicalHistory=new connector.model('stu-med',studentMedicalSchema);
13+
module.exports={};

0 commit comments

Comments
 (0)