Convert queries to promises, useMasterKey

cloud/Community.js

@@ -55,21 +55,21 @@ function incrementCommunityTotalsForKey(community, key, response) {
 
 	CommunityTotals.getAllTimeTotals(community, function(allTimeTotals) {
 		allTimeTotals.increment(key);
-		allTimeTotals.save();
+		allTimeTotals.save({},{ useMasterKey: true });
 		if (--queryCount == 0) {
 			response.success();
 		}
 	});
 	CommunityTotals.getDailyTotals(community, currDate, function(dailyTotals) {
 		dailyTotals.increment(key);
-		dailyTotals.save();
+		dailyTotals.save({},{ useMasterKey: true });
 		if (--queryCount == 0) {
 			response.success();
 		}
 	});
 	CommunityTotals.getMonthlyTotals(community, currDate, function(monthlyTotals) {
 		monthlyTotals.increment(key);
-		monthlyTotals.save();
+		monthlyTotals.save({},{ useMasterKey: true });
 		if (--queryCount == 0) {
 			response.success();
 		}

cloud/CommunityTotals.js

@@ -5,8 +5,8 @@ exports.getAllTimeTotals = function(community, callback) {
 	var CommunityAllTimeTotals = Parse.Object.extend("CommunityAllTimeTotals");
 	var totalQuery = new Parse.Query(CommunityAllTimeTotals);
 	totalQuery.equalTo("community", community);
-	totalQuery.first({
-		success: function(object) {
+	totalQuery.first().then(
+		function(object) { // success
 			var allTimeTotals = object;
 			if (!allTimeTotals) {
 				console.log("CommunityAllTimeTotals not found, creating");
@@ -20,14 +20,14 @@ exports.getAllTimeTotals = function(community, callback) {
 				allTimeTotals.set("missedCallCount", 0);
 				allTimeTotals.set("missedOtherCount", 0);
 				allTimeTotals.set("community", community);
-				allTimeTotals.save();
+				allTimeTotals.save({},{ useMasterKey: true });
 			}
 			callback(allTimeTotals);
 		},
-		error: function(error) {
+		function(error) { // error
 			console.error("Got an error " + error.code + " : " + error.message);
 		}
-	});
+	);
 }
 
 exports.getDailyTotals = function(community, date, callback, failCallback) {
@@ -38,8 +38,8 @@ exports.getDailyTotals = function(community, date, callback, failCallback) {
 	queryDate.setHours(0, 0, 0, 0); //only year, month, day remain
 	totalQuery.equalTo("date", queryDate);
 	totalQuery.equalTo("community", community);
-	totalQuery.first({
-		success: function(object) {
+	totalQuery.first().then(
+		function(object) { //success
 			var dailyTotals = object;
 			if (!dailyTotals) {
 				console.log("CommunityDailyTotals not found, creating");
@@ -54,18 +54,18 @@ exports.getDailyTotals = function(community, date, callback, failCallback) {
 				dailyTotals.set("missedCallCount", 0);
 				dailyTotals.set("missedOtherCount", 0);
 				dailyTotals.set("community", community);
-				dailyTotals.save();
+				dailyTotals.save({},{ useMasterKey: true });
 			}
 			callback(dailyTotals);
 		},
-		error: function(error) {
+		function(error) { // error
 			console.error("Got an error " + error.code + " : " + error.message);
 
 			if (failCallback) {
 				failCallback(error);
 			}
 		}
-	});
+	);
 }
 
 exports.getMonthlyTotals = function(community, date, callback, failCallback) {
@@ -77,8 +77,8 @@ exports.getMonthlyTotals = function(community, date, callback, failCallback) {
 	queryDate.setDate(1); //only year, month remain
 	totalQuery.equalTo("date", queryDate);
 	totalQuery.equalTo("community", community);
-	totalQuery.first({
-		success: function(object) {
+	totalQuery.first().then(
+		function(object) {
 			var monthlyTotals = object;
 			if (!monthlyTotals) {
 				console.log("CommunityMonthlyTotals not found, creating");
@@ -93,18 +93,18 @@ exports.getMonthlyTotals = function(community, date, callback, failCallback) {
 				monthlyTotals.set("missedCallCount", 0);
 				monthlyTotals.set("missedOtherCount", 0);
 				monthlyTotals.set("community", community);
-				monthlyTotals.save();
+				monthlyTotals.save({},{ useMasterKey: true });
 			}
 			callback(monthlyTotals);
 		},
-		error: function(error) {
+		function(error) {
 			console.error("Got an error " + error.code + " : " + error.message);
 
 			if (failCallback) {
 				failCallback(error);
 			}
 		}
-	});
+	);
 }
 
 exports.updateTotals = function(trip, totals) {
@@ -136,6 +136,6 @@ exports.updateTotals = function(trip, totals) {
 		if (missedOtherCount) {
 			totals.increment("missedOtherCount", missedOtherCount);
 		}
-		totals.save();
+		totals.save({},{ useMasterKey: true });
 	}
 }

cloud/Installation.js

@@ -10,17 +10,16 @@ Parse.Cloud.beforeSave(Parse.Installation, function(request, response) {
             id: installation.get("user").id
         });
 
-        userPointer.fetch({
-            success: function(user) {
+        userPointer.fetch({ useMasterKey: true }).then(
+            function(user) {
                 installation.set("channels", user.get("channels"));
                 response.success();
             },
-            error: function(myObject, error) {
+            function(myObject, error) {
                 console.error("Unable to find user " + userPointer.id + " " + error.code + " : " + error.message);
                 response.error();
-            },
-            useMasterKey:true
-        });
+            }
+        );
     } else {
         response.success();
     }

cloud/POFriendRelation.js

@@ -6,26 +6,24 @@ Parse.Cloud.beforeSave("POFriendRelation", function(request, response) {
 
 	var friendUser = request.object.get("friendUser");
 
-	var saveOptions = {
-		success: function(user) {
-			response.success();
-		},
-		error: function(user, error) {
-			response.error("Unable to save the user");
-  		}
-	}
-
 	function addAndRemoveChannels(addedChannel, removedChannel) {
 		request.user.remove("channels", removedChannel);
-		request.user.save(null, {
-            success: function(user) {
+		request.user.save({},{ useMasterKey: true }).then(
+			function(user) {
 				request.user.addUnique("channels", addedChannel);
-				request.user.save(null, saveOptions);
+				request.user.save(null, { useMasterKey: true }).then(
+					function(user) {
+						response.success();
+					},
+					function(user, error) {
+						response.error("Unable to save the user");
+			  		}
+				);
 			},
-			error: function(user, error) {
+			function(user, error) {
 				response.error("Unable to save the user");
 			}
-        });
+        );
 	}
 
 	function updateChannelsIfNeeded() {
@@ -49,25 +47,23 @@ Parse.Cloud.beforeSave("POFriendRelation", function(request, response) {
 		if (request.user.id != friendUser.id) {
 		    var roleQuery = new Parse.Query(Parse.Role);
 		    roleQuery.equalTo("name", "user-" + request.user.id);
-		    roleQuery.first({
-		        success: function(role) {
-		            Parse.Cloud.useMasterKey();
+		    roleQuery.first({ useMasterKey: true }).then(
+		        function(role) {
 		            role.relation("users").add(friendUser);
-		            role.save(null, {
-		            	success: function(user) {
+		            role.save({},{ useMasterKey: true }).then(
+		            	function(user) {
 							updateChannelsIfNeeded();
 						},
-						error: function(user, error) {
+						function(user, error) {
 							response.error("Unable to save the role");
   						}
-		            });
+		            );
 		        },
-		        error: function(error) {
+		        function(error) {
 		            console.log("Failed to save role for friend relation with error " + error.code + " : " + error.message);
 					response.error("Unable to find the role");
-		        },
-		        useMasterKey:true
-		    });
+		        }
+		    );
 		} else {
 			response.success();
 		}
@@ -85,34 +81,34 @@ Parse.Cloud.afterSave("POFriendRelation", function(request) {
 	var query = new Parse.Query("POFriendRequest");
 	query.equalTo("requestingUser", user);
 	query.equalTo("requestedUser", friendUser);
-	query.find({
-		success: function(results) {
+	query.find({ useMasterKey: true }).then(
+		function(results) {
 			if (results.length > 0) {
 				for (var i = 0; i < results.length; i++) {
-					results[i].destroy();
+					results[i].destroy({ useMasterKey: true });
 				}
 			}
 
 			var friendQuery = new Parse.Query("POFriendRequest");
 			friendQuery.equalTo("requestingUser", friendUser);
 			friendQuery.equalTo("requestedUser", user);
-			friendQuery.find({
-				success: function(results) {
+			friendQuery.find({ useMasterKey: true }).then(
+				function(results) {
 					if (results.length > 0) {
 						for (var i = 0; i < results.length; i++) {
-							results[i].destroy();
+							results[i].destroy({ useMasterKey: true });
 						}
 					}
 				},
-				error: function(error) {
+				function(error) {
 					console.log("error when destroying friend request");
 				}
-			});
+			);
 		},
-		error: function(error) {
+		function(error) {
 			console.log("error when destroying friend request");
 		}
-	});
+	);
 });
 
 
@@ -122,27 +118,24 @@ Parse.Cloud.afterDelete("POFriendRelation", function(request) {
 	var userPointer = request.object.get("user");
 	var friendUserPointer = request.object.get("friendUser");
 
-	userPointer.fetch({
-		success: function(user) {
+	userPointer.fetch({ useMasterKey: true }).then(
+		function(user) {
 		    var roleQuery = new Parse.Query(Parse.Role);
 		    roleQuery.equalTo("name", "user-" + user.id);
-		    roleQuery.first({
-		        success: function(role) {
-		            Parse.Cloud.useMasterKey();
+		    roleQuery.first({ useMasterKey: true }).then(
+		        function(role) {
 		            role.relation("users").remove(friendUserPointer);
-		            role.save();
+		            role.save({},{ useMasterKey: true });
 		        },
-		        error: function(error) {
+		        function(error) {
 		            console.log("Failed to remove role for friend relation with error " + error.code + " : " + error.message);
-		        },
-		        useMasterKey:true
-		    });
+		        }
+		    );
 			user.remove("channels", "friend-" + friendUserPointer.id);
 			user.save(null, {useMasterKey:true});
 		},
-		error: function(myObject, error) {
+		function(myObject, error) {
 			console.error("Unable to find user " + userPointer.id + " " + error.code + " : " + error.message);
-		},
-		useMasterKey: true
-	});
+		}
+	);
 });