Merge pull request #56 from csc301-winter-2019/feat/34

Feat/34

2 files changed, 22 insertions, 2 deletions

diff --git a/web/models/mockpoints.js b/web/models/mockpoints.js
index ac9ecd4..51bd422 100644
--- a/web/models/mockpoints.js
+++ b/web/models/mockpoints.js
@@ -10,7 +10,8 @@ var dumbJsonSchema = new Schema({
 	race: String,
 	longhair: Boolean,
 	longbeard: Boolean,
-	extra: String
+	extra: String,
+	status: String
 });
 
 // Mongoose Model definition
diff --git a/web/models/points.js b/web/models/points.js
index d27f2a7..e8c181e 100644
--- a/web/models/points.js
+++ b/web/models/points.js
@@ -10,7 +10,8 @@ var JsonSchema = new Schema({
 	race: String,
 	longhair: Boolean,
 	longbeard: Boolean,
-	extra: String
+	extra: String,
+	status: String
 });
 
 // Mongoose Model definition
@@ -25,6 +26,14 @@ exports.get_points = function(callback) {
 	});
 }
 
+exports.get_all_active_points = function(callback) {
+	var activeStatusTypes = ["new", "pending"];
+	Json.find({ status: { $in: activeStatusTypes } }).exec(function(err, docs) {
+		if (err) callback(err, null);
+		callback(null, docs);
+	});
+}
+
 // this function stores A user report into the db
 exports.save_request = function(data, callback) {
 	Json.create(data, function(err, result) {
@@ -32,3 +41,13 @@ exports.save_request = function(data, callback) {
 		callback(null, result);
 	});
 }
+
+exports.update_point_status = function(id, newStatus, callback) {
+	Json.findByIdAndUpdate(id, {status: newStatus}, {new: true},
+		function(err, result) {
+			if (err) callback(err, null);
+			// result contains the updated point document
+			callback(null, result);
+		}
+	);
+}