Merge pull request #28 from topcoder-platform/develop

June 16 deploy

Author: jmgasper

build.sh

@@ -28,7 +28,6 @@ KAFKA_CLIENT_CERT_KEY=$(eval "echo \$${ENV}_KAFKA_CLIENT_CERT_KEY")
 KAFKA_URL=$(eval "echo \$${ENV}_KAFKA_URL")
 ZOO_KEEPER=$(eval "echo \$${ENV}_ZOO_KEEPER")
 TOPIC=$(eval "echo \$${ENV}_TOPIC")
-MONGODB_URI=$(eval "echo \$${ENV}_MONGODB_URI")
 
 LOG_LEVEL=$(eval "echo \$${ENV}_LOG_LEVEL")
 NODE_ENV=$(eval "echo \$${ENV}_NODE_ENV")

config/default.js

@@ -25,9 +25,9 @@ module.exports = {
     }
   },
   DYNAMODB: {
-    // AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID || '',
-    // AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || '',
+    AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID || '',
+    AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || '',
     AWS_REGION: process.env.AWS_REGION || '',
-    IS_LOCAL: process.env.IS_LOCAL === 'true' || 'false'
+    IS_LOCAL: process.env.IS_LOCAL || 'false'
   }
 };

models/Project.js

@@ -21,13 +21,7 @@ const schema = new Schema({
   title: {type: String, required: true},
   tcDirectId: {
     type: Number,
-    required: true,
-    index: {
-      global: true,
-      rangeKey: 'id',
-      project: true,
-      name: 'TcDirectIdIndex'
-    }
+    required: true
   },
   repoUrl: {type: String, required: true},
   repoId: {type: String, required: false},

models/index.js

@@ -13,31 +13,16 @@
 const config = require('config');
 const dynamoose = require('dynamoose');
 
-
-const awsConfigs = config.DYNAMODB.IS_LOCAL_DB ? {
+dynamoose.AWS.config.update({
   accessKeyId: config.DYNAMODB.AWS_ACCESS_KEY_ID,
   secretAccessKey: config.DYNAMODB.AWS_SECRET_ACCESS_KEY,
   region: config.DYNAMODB.AWS_REGION
-} : {
-  region: config.DYNAMODB.AWS_REGION
-};
-
-dynamoose.AWS.config.update(awsConfigs);
+});
 
-if (config.DYNAMODB.IS_LOCAL_DB) {
-  dynamoose.local(config.DYNAMODB.DYNAMODB_URL);
+if (config.DYNAMODB.IS_LOCAL === 'true') {
+  dynamoose.local();
 }
 
-// dynamoose.AWS.config.update({
-//   // accessKeyId: config.DYNAMODB.AWS_ACCESS_KEY_ID,
-//   // secretAccessKey: config.DYNAMODB.AWS_SECRET_ACCESS_KEY,
-//   region: config.DYNAMODB.AWS_REGION
-// });
-
-// if (config.DYNAMODB.IS_LOCAL === 'true') {
-//   dynamoose.local();
-// }
-
 dynamoose.setDefaults({
   create: false,
   update: false

utils/db-helper.js

@@ -26,25 +26,6 @@ async function scan(model, scanParams) {
   });
 }
 
-/**
- * Get single data by scan parameters
- * @param {Object} model The dynamoose model to scan
- * @param {Object} scanParams The scan parameters object
- * @returns {Promise<void>}
- */
-async function scanOne(model, scanParams) {
-  return await new Promise((resolve, reject) => {
-    model.scan(scanParams).consistent().all().exec((err, result) => {
-      if (err) {
-        reject(err);
-      }
-
-      return resolve(result[0]);
-    });
-  });
-}
-
 module.exports = {
-  scan,
-  scanOne
-};
+  scan
+};