Skip to content

Commit bbdb622

Browse files
dev92dev92
committed
update db model calls
1 parent 3655cb4 commit bbdb622

File tree

8 files changed

+41
-51
lines changed

8 files changed

+41
-51
lines changed

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
The OpenShift `nodejs` cartridge documentation can be found at:
21

3-
http://openshift.github.io/documentation/oo_cartridge_guide.html#nodejs

‎public/assignment/server/models/field.model.js‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
var q = require("q");
44

5-
module.exports = function(mongoose,db) {
5+
module.exports = function(mongoose) {
66
//var forms = require("./form.mock.json");
77
var FormSchema = require('./form.schema.server.js')(mongoose);
8-
var FormModel = db.model("FormModelForField", FormSchema);
8+
var FormModel = mongoose.model("FormModelForField", FormSchema);
99

10-
var api = {
10+
return {
1111
//CRUD for fields in a form
1212

1313
AddFormField: AddFormField,
@@ -17,7 +17,6 @@ module.exports = function(mongoose,db) {
1717
DeleteFormField: DeleteFormField,
1818
ReorderFormFields: ReorderFormFields
1919
};
20-
return api;
2120

2221
function AddFormField(formId,field){
2322

@@ -76,10 +75,10 @@ module.exports = function(mongoose,db) {
7675
if (err) {
7776
deferred.reject(err);
7877
} else {
79-
var fields = form.fields;
80-
for(var f in fields){
81-
if(fields[f]._id == fieldId){
82-
deferred.resolve(fields[f]);
78+
let fields = form.fields;
79+
for(const field of fields){
80+
if(field._id === fieldId){
81+
deferred.resolve(field);
8382
break;
8483
}
8584
}
@@ -108,9 +107,9 @@ module.exports = function(mongoose,db) {
108107
if (err) {
109108
deferred.reject(err);
110109
} else {
111-
var fields = form.fields;
112-
for (var f in fields) {
113-
if (fields[f]._id == fieldId) {
110+
const fields = form.fields;
111+
for (const f in fields) {
112+
if (fields[f]._id === fieldId) {
114113
fields[f] = field;
115114
break;
116115
}
@@ -158,7 +157,7 @@ module.exports = function(mongoose,db) {
158157
var formFields = form.fields;
159158

160159
for(var i=0; i<formFields.length; i++){
161-
if(formFields[i]._id == fieldId){
160+
if(formFields[i]._id === fieldId){
162161
formFields.splice(i,1);
163162
}
164163
}

‎public/assignment/server/models/form.model.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
//var uuid = require('node-uuid');
44
var q = require("q");
55

6-
module.exports = function(mongoose,db) {
6+
module.exports = function(mongoose) {
77
//var forms = require("./form.mock.json");
88
var FormSchema = require('./form.schema.server.js')(mongoose);
9-
var FormModel = db.model("FormModel", FormSchema);
9+
var FormModel = mongoose.model("FormModel", FormSchema);
1010

11-
var api = {
11+
return {
1212
Create: Create,
1313
FindAll: FindAll,
1414
FindFormByTitle: FindFormByTitle,
@@ -18,7 +18,6 @@ module.exports = function(mongoose,db) {
1818
Delete: Delete
1919

2020
};
21-
return api;
2221

2322
function Create(form, userId){
2423
var deferred = q.defer();

‎public/assignment/server/models/user.model.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ var q = require("q");
55
var bcrypt = require("bcrypt-nodejs");
66

77

8-
module.exports = function(mongoose,db) {
8+
module.exports = function(mongoose) {
99

1010
//var users = require("./user.mock.json");
1111
var UserSchema = require('./user.schema.server.js')(mongoose);
12-
var UserModel = db.model("UserModelAsgmt", UserSchema);
12+
var UserModel = mongoose.model("UserModelAsgmt", UserSchema);
1313

1414

15-
var api = {
15+
return {
1616
Create: Create,
1717
FindAll: FindAll,
1818
FindById: FindById,
@@ -22,7 +22,6 @@ module.exports = function(mongoose,db) {
2222
FindUserByCredentials: FindUserByCredentials
2323
//checkExistingUser:checkExistingUser
2424
};
25-
return api;
2625

2726
function Create(user){
2827

‎public/project/server/models/event.model.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
var q = require("q");
22

3-
module.exports = function(mongoose,db) {
3+
module.exports = function(mongoose) {
44

55
var EventSchema = require('./event.schema.server.js')(mongoose);
6-
var EventModel = db.model("EventModel", EventSchema);
6+
var EventModel = mongoose.model("EventModel", EventSchema);
77

8-
var api = {
8+
return {
99
findEventByID: findEventByID,
1010
FindEventsByUserId: FindEventsByUserId,
1111
CreateEvent: CreateEvent,
1212
UpdateEvent: UpdateEvent,
1313
DeleteEvent: DeleteEvent,
1414
RemoveUser: RemoveUser
1515
};
16-
return api;
1716

1817

1918

‎public/project/server/models/movie.model.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@
22

33
var q = require("q");
44

5-
module.exports = function(mongoose,db) {
5+
module.exports = function(mongoose) {
66

77
// load movie schema from movie model
88
var MovieSchema = require('./movie.schema.server.js')(mongoose);
9-
var MovieModel = db.model("MovieModel", MovieSchema);
9+
var MovieModel = mongoose.model("MovieModel", MovieSchema);
1010

1111
//var movies = require("./movies.mock.json");
1212

13-
var api = {
13+
return {
1414
findMovieByTmdbID: findMovieByTmdbID,
1515
findMoviesByTmdbIDs: findMoviesByTmdbIDs,
1616
createMovie: createMovie,
1717
userLikesMovie: userLikesMovie,
18-
userDislikesMovie:userDislikesMovie,
18+
userDislikesMovie: userDislikesMovie,
1919
userReviewsMovie: userReviewsMovie,
2020
deleteMovieReview: deleteMovieReview,
2121
};
22-
return api;
2322

2423

2524
function userLikesMovie (tmdbID, userId) {
@@ -169,8 +168,8 @@ module.exports = function(mongoose,db) {
169168
}else{
170169
var newReview = reviewedMovie;
171170
}
172-
for(var m in reviewedUsers){
173-
if(reviewedUsers[m].userId == newReview.userId){
171+
for(const m in reviewedUsers){
172+
if(reviewedUsers[m].userId === newReview.userId){
174173
reviewedUsers[m].review = newReview.review;
175174
found = true;
176175
break;
@@ -210,9 +209,8 @@ module.exports = function(mongoose,db) {
210209
deferred.reject(err);
211210
} else {
212211
var reviewedUsers = doc.userReviews;
213-
var found = false;
214-
for(var m in reviewedUsers){
215-
if(reviewedUsers[m].userId == userId){
212+
for(const m in reviewedUsers){
213+
if(reviewedUsers[m].userId === userId){
216214
reviewedUsers.splice(m,1);
217215
break;
218216
}

‎public/project/server/models/user.model.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
var q = require("q");
44
var bcrypt = require("bcrypt-nodejs");
55

6-
module.exports = function(mongoose,db) {
6+
module.exports = function(mongoose) {
77

88
//var users = require("./users.mock.json");
99
var UserSchema = require('./user.schema.server.js')(mongoose);
10-
var UserModel = db.model("UserModelProject", UserSchema);
10+
var UserModel = mongoose.model("UserModelProject", UserSchema);
1111

1212

13-
var api = {
13+
return {
1414
Create: Create,
1515
FindAll: FindAll,
1616
FindById: FindById,
@@ -26,10 +26,9 @@ module.exports = function(mongoose,db) {
2626
userRatesMovie: userRatesMovie,
2727
userReviewsMovie: userReviewsMovie,
2828
deleteUserReview: deleteUserReview,
29-
userDislikesMovie:userDislikesMovie,
30-
deleteUserFriend:deleteUserFriend,
29+
userDislikesMovie: userDislikesMovie,
30+
deleteUserFriend: deleteUserFriend,
3131
};
32-
return api;
3332

3433
function Create(user){
3534

@@ -447,8 +446,8 @@ module.exports = function(mongoose,db) {
447446
} else {
448447
var ratedMovies = doc.moviesRated;
449448
var found = false;
450-
for(var m in ratedMovies){
451-
if(ratedMovies[m].tmdbId == ratedMovie.tmdbId){
449+
for(const m in ratedMovies){
450+
if(ratedMovies[m].tmdbId === ratedMovie.tmdbId){
452451
ratedMovies[m].rating = ratedMovie.rating;
453452
found = true;
454453
break;
@@ -495,8 +494,8 @@ module.exports = function(mongoose,db) {
495494
}
496495

497496
var found = false;
498-
for(var m in reviewedMovies){
499-
if(reviewedMovies[m].tmdbId == newReview.tmdbId){
497+
for(const m in reviewedMovies){
498+
if(reviewedMovies[m].tmdbId === newReview.tmdbId){
500499
reviewedMovies[m].review = newReview.review;
501500
found = true;
502501
break;
@@ -536,7 +535,7 @@ module.exports = function(mongoose,db) {
536535
deferred.reject(err);
537536
} else {
538537
var reviewedMovies = doc.moviesReviewed;
539-
for(var m in reviewedMovies){
538+
for(const m in reviewedMovies){
540539
if(reviewedMovies[m].tmdbId == tmdbId){
541540
reviewedMovies.splice(m,1);
542541
break;

‎server.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ if(process.env.MLAB_USERNAME) { // check if running remotely
1818
//'@ds235860.mlab.com:35860/heroku_9w9phl17';
1919
//@webdev2016.vzvax.mongodb.net/WebDev2016?retryWrites=true&w=majority
2020
}
21-
var db = mongoose.connect(connectionString, {
22-
useMongoClient: true,
23-
});
21+
var db = mongoose.connect(connectionString);
2422

2523

2624
app.use(bodyParser.json());
@@ -31,7 +29,8 @@ app.use(multer());
3129
console.log(process.env.SESSION_SECRET);
3230

3331
app.use(session({
34-
secret: process.env.SESSION_SECRET,
32+
secret: "FormMaker",
33+
//process.env.SESSION_SECRET,
3534
resave: true,
3635
saveUninitialized: true
3736
}));

0 commit comments

Comments
 (0)