From 0b3e3d97bf39f0489690da8ae7ad30ee2a677ae3 Mon Sep 17 00:00:00 2001
From: Ernie <erne@powernav.com>
Date: Thu, 10 Sep 2015 12:16:14 -0400
Subject: [PATCH] Changed urls in client/main.js to urls consistent with routes
 in lib/rest/api.posts.js.  Changed treatment of param Id.  converted to
 objectId and used the converted value to find, update, and delete.

---
 webapp/client/main.js        | 10 +++++-----
 webapp/lib/rest/api.posts.js |  9 ++++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/webapp/client/main.js b/webapp/client/main.js
index 79a9486..ce9ca03 100644
--- a/webapp/client/main.js
+++ b/webapp/client/main.js
@@ -23,7 +23,7 @@ Template.homePage.events({
     console.count('click #listButton');
     //var newRecordId = Math.random().toString(36).slice(2,26);
     //HTTP.call("GET", Session.get('serverUrl') + '/api/', function(error, result){
-    HTTP.call("GET", Session.get('serverUrl') + 'api/', function(error, result){
+    HTTP.call("GET", Session.get('serverUrl') + 'api/find/posts/', function(error, result){
       if(result){
         console.log(result);
         Session.set('apiResponse', result.content);
@@ -42,7 +42,7 @@ Template.homePage.events({
       }
     };
     //HTTP.call("POST", Session.get('serverUrl') + '/api/', dataObject, function(error, result){
-    HTTP.call("POST", Session.get('serverUrl') + 'api/', dataObject, function(error, result){
+    HTTP.call("POST", Session.get('serverUrl') + 'api/insert/post/', dataObject, function(error, result){
       if(result){
         console.log(result);
         Session.set('apiResponse', result.content, true, 2);
@@ -57,7 +57,7 @@ Template.homePage.events({
     //var newRecordId = Math.random().toString(36).slice(2,26);
     var newRecordId = $('#findRecordByIdInput').val();
     //HTTP.call("GET", Session.get('serverUrl') + '/api/' + newRecordId, function(error, result){
-    HTTP.call("GET", Session.get('serverUrl') + 'api/' + newRecordId, function(error, result){
+    HTTP.call("GET", Session.get('serverUrl') + 'api/find/post/' + newRecordId, function(error, result){
       if(result){
         console.log(result);
         Session.set('apiResponse', result.content, true, 2);
@@ -79,7 +79,7 @@ Template.homePage.events({
     };
 
     //HTTP.call("PUT", Session.get('serverUrl') + '/api/' + newRecordId, updatedObject, function(error, result){
-    HTTP.call("PUT", Session.get('serverUrl') + 'api/' + newRecordId, updatedObject, function(error, result){
+    HTTP.call("PUT", Session.get('serverUrl') + 'api/update/post/' + newRecordId, updatedObject, function(error, result){
       if(result){
         console.log(result);
         Session.set('apiResponse', result.content, true, 2);
@@ -94,7 +94,7 @@ Template.homePage.events({
     //var newRecordId = Math.random().toString(36).slice(2,26);
     var newRecordId = $('#deleteRecordByIdInput').val();
     //HTTP.call("DELETE", Session.get('serverUrl') + '/api/'  + newRecordId, function(error, result){
-    HTTP.call("DELETE", Session.get('serverUrl') + 'api/'  + newRecordId, function(error, result){
+    HTTP.call("DELETE", Session.get('serverUrl') + 'api/delete/post/'  + newRecordId, function(error, result){
       if(result){
         console.log(result);
         Session.set('apiResponse', result.content, true, 2);
diff --git a/webapp/lib/rest/api.posts.js b/webapp/lib/rest/api.posts.js
index f600194..455d314 100644
--- a/webapp/lib/rest/api.posts.js
+++ b/webapp/lib/rest/api.posts.js
@@ -40,8 +40,9 @@ Router.route('/api/find/post/:postId', function(){
   this.response.setHeader("Content-Type", "application/json");
   this.response.setHeader("Access-Control-Allow-Origin", "*");
   this.response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+  var oid=new Meteor.Collection.ObjectID(this.params.postId)
   this.response.end('Post contents... ' + JSON.stringify(
-    Posts.findOne({_id: this.params.postId })
+    Posts.findOne({_id: oid })
   ));
 }, {where: 'server'});
 
@@ -54,8 +55,9 @@ Router.route('/api/update/post/:postId', function(){
   this.response.setHeader("Content-Type", "application/json");
   this.response.setHeader("Access-Control-Allow-Origin", "*");
   this.response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+  var oid=new Meteor.Collection.ObjectID(this.params.postId)
   this.response.end('Result of updating post is ' + JSON.stringify(
-    Posts.update({_id: this.params.postId },{$set:{
+    Posts.update({_id: oid },{$set:{
       title: this.request.body.title,
       text: this.request.body.text
     }})
@@ -70,7 +72,8 @@ Router.route('/api/delete/post/:postId', function(){
   this.response.setHeader("Content-Type", "application/json");
   this.response.setHeader("Access-Control-Allow-Origin", "*");
   this.response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
+  var oid=new Meteor.Collection.ObjectID(this.params.postId)
   this.response.end('Result of deleting post is ' + JSON.stringify(
-    Posts.remove({_id: this.params.postId })
+    Posts.remove({_id: oid })
   ));
 }, {where: 'server'});