Update deprecated dynamo db module

tesera · Nov 20, 2015 · 0fc2666 · 0fc2666
1 parent 7b77cb0
commit 0fc2666
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 27 deletions.
diff --git a/server/api/ast/ast.js b/server/api/ast/ast.js
@@ -3,9 +3,10 @@ var _ = require('lodash');
 var moment = require('moment');
 var uuid = require('node-uuid');
 var geohash = require('ngeohash');
-var DOC = require("dynamodb-doc");
 var geolib = require("geolib");
-var docClient = new DOC.DynamoDB();
+var AWS = require('aws-sdk');
+AWS.config.update({region: 'us-west-2'});
+var dynamodb = new AWS.DynamoDB.DocumentClient();
 var logger = require('../../logger.js');
 var Q = require('q');
 var role = require('../../components/role/role');
@@ -104,7 +105,7 @@ function getProviderDistanceList(success, fail, origin) {
 function getProviderList(success, fail) {
     var params = { TableName: AST_PROVIDER_TABLE };
 
-    docClient.scan(params, function(err, res) {
+    dynamodb.scan(params, function(err, res) {
         if (err) {
             fail(err);
         } else {
@@ -121,9 +122,12 @@ function getProviderList(success, fail) {
 
 function getProvider(provId, success, fail) {
     var params = { TableName: AST_PROVIDER_TABLE };
-    params.KeyConditions = [docClient.Condition('providerid', 'EQ', provId)];
+    params.KeyConditionExpression = 'providerid = :provId';
+    params.ExpressionAttributeValues = {
+        ':provId': provId
+    };
 
-    docClient.query(params, function(err, res) {
+    dynamodb.query(params, function(err, res) {
         if (err) {
             fail(err);
         } else {
@@ -143,8 +147,7 @@ function addProvider(providerDetails, success, fail) {
     if (validProvider(providerDetails)){
         var params  = { TableName: AST_PROVIDER_TABLE,
                         Item: provider(uuid.v4(), providerDetails)};
-        docClient.
-            putItem(params, function(err, res) {
+        dynamodb.put(params, function(err, res) {
                 if (err) {
                     fail(JSON.stringify(err));
                 } else {
@@ -187,20 +190,19 @@ function updateProvider(provId, providerDetails, success, fail) {
             pairs.push(prefix + key + ' = :' + key);
 
             params.ExpressionAttributeValues[':'+key] = providerDetails[key];
-            
+
             if(params.ExpressionAttributeValues[':'+key] === '') {
               params.ExpressionAttributeValues[':'+key] = null;
             }
-            
+
 
           }
         });
         params.UpdateExpression = 'SET ' + pairs.join(', ');
 
         params.ExpressionAttributeNames = {'#name' : 'name'};
 
-        docClient.
-            updateItem(params, function(err, res) {
+        dynamodb.update(params, function(err, res) {
                 if (err) {
                     fail(err);
                 } else {
@@ -302,7 +304,7 @@ function getCourseTagList(success, fail) {
 function getCourseList(success, fail) {
     var params = { TableName: AST_COURSE_TABLE };
 
-    docClient.scan(params, function(err, res) {
+    dynamodb.scan(params, function(err, res) {
         if (err) {
             fail(err);
         } else {
@@ -317,9 +319,12 @@ function getCourseList(success, fail) {
 
 function getCourse(courseId, success, fail) {
     var params = { TableName: AST_COURSE_TABLE };
-    params.KeyConditions = [docClient.Condition('courseid', 'EQ', courseId)];
+    params.KeyConditionExpression = "courseid = :courseid";
+    params.ExpressionAttributeValues= {
+        ':courseid': courseId
+    };
 
-    docClient.query(params, function(err, res) {
+    dynamodb.query(params, function(err, res) {
         if (err) {
             fail(err);
         } else {
@@ -337,8 +342,7 @@ function addCourse(courseDetails, success, fail) {
     if (validCourse(courseDetails)){
         var params  = { TableName: AST_COURSE_TABLE,
                         Item: course(uuid.v4(), courseDetails)};
-        docClient.
-            putItem(params, function(err, res) {
+        dynamodb.put(params, function(err, res) {
                 if (err) {
                     fail(JSON.stringify(err));
                 } else {
@@ -360,8 +364,7 @@ function updateCourse(courseId, courseDetails, success, fail) {
 
         console.log('updating course');
         //! \todo verify course exists
-        docClient.
-            putItem(params, function(err, res) {
+        dynamodb.put(params, function(err, res) {
                 if (err) {
                     fail(JSON.stringify(err));
                 } else {
@@ -387,8 +390,7 @@ function addInstructor(provId, inctructorDetails, success, fail) {
 
     console.log('Adding Course = ', JSON.stringify(params.ExpressionAttributeValues));
 
-    docClient.
-        updateItem(params, function(err, res) {
+    dynamodb.update(params, function(err, res) {
             if (err) {
                 fail(err);
             } else {
@@ -409,8 +411,7 @@ function updateInstructor(provId, inctructorId, inctructor, success, fail) {
 
     console.log('Adding Course = ', JSON.stringify(params.ExpressionAttributeValues));
 
-    docClient.
-        updateItem(params, function(err, res) {
+    dynamodb.update(params, function(err, res) {
             if (err) {
                 fail(err);
             } else {

diff --git a/server/components/role/role.js b/server/components/role/role.js
@@ -1,17 +1,20 @@
 'use strict';
 var _ = require('lodash');
-var DOC = require("dynamodb-doc");
-var docClient = new DOC.DynamoDB();
+var AWS = require('aws-sdk');
+AWS.config.update({region: 'us-west-2'});
+var dynamodb = new AWS.DynamoDB.DocumentClient();
 var logger = require('../../logger');
 var ROLE_TABLE = process.env.ROLE_TABLE || 'ast-roles-dev';
 var Q = require('q');
 
 module.exports.getRoles = function getRoles(uid, success, fail) {
     var params = { TableName: ROLE_TABLE };
 
-    params.KeyConditions = [docClient.Condition('userId', 'EQ', uid)];
-
-    docClient.query(params, function(err, res) {
+    params.KeyConditionExpression = 'userId = :userId';
+    params.ExpressionAttributeValues = {
+        ':userId': uid
+    };
+    dynamodb.query(params, function(err, res) {
         if (err) {
             fail(err);
         } else {