Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor allocations-dao.js #164

Merged
merged 1 commit into from
Aug 19, 2019
Merged

refactor allocations-dao.js #164

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions app/data/allocations-dao.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var UserDAO = require("./user-dao").UserDAO;
const UserDAO = require("./user-dao").UserDAO;

/* The AllocationsDAO must be constructed with a connected database object */
function AllocationsDAO(db) {
const AllocationsDAO = function(db){

"use strict";

Expand All @@ -12,15 +12,14 @@ function AllocationsDAO(db) {
return new AllocationsDAO(db);
}

var allocationsCol = db.collection("allocations");
var userDAO = new UserDAO(db);
const allocationsCol = db.collection("allocations");
const userDAO = new UserDAO(db);


this.update = function(userId, stocks, funds, bonds, callback) {
var parsedUserId = parseInt(userId);
this.update = (userId, stocks, funds, bonds, callback) => {
const parsedUserId = parseInt(userId);

// Create allocations document
var allocations = {
const allocations = {
userId: userId,
stocks: stocks,
funds: funds,
Expand All @@ -31,13 +30,13 @@ function AllocationsDAO(db) {
userId: parsedUserId
}, allocations, {
upsert: true
}, function(err, result) {
}, (err, result) => {

if (!err) {

console.log("Updated allocations");

userDAO.getUserById(userId, function(err, user) {
userDAO.getUserById(userId, (err, user) => {

if (err) return callback(err, null);

Expand All @@ -55,10 +54,10 @@ function AllocationsDAO(db) {
});
};

this.getByUserIdAndThreshold = function(userId, threshold, callback) {
var parsedUserId = parseInt(userId);
this.getByUserIdAndThreshold = (userId, threshold, callback) => {
const parsedUserId = parseInt(userId);

function searchCriteria() {
const searchCriteria = () => {

if (threshold) {
/*
Expand All @@ -84,15 +83,15 @@ function AllocationsDAO(db) {
};
}

allocationsCol.find(searchCriteria()).toArray(function(err, allocations) {
allocationsCol.find(searchCriteria()).toArray((err, allocations) => {
if (err) return callback(err, null);
if (!allocations.length) return callback("ERROR: No allocations found for the user", null);

var doneCounter = 0;
var userAllocations = [];
let doneCounter = 0;
const userAllocations = [];

allocations.forEach(function (alloc) {
userDAO.getUserById(alloc.userId, function(err, user) {
allocations.forEach( (alloc) => {
userDAO.getUserById(alloc.userId, (err, user) => {
if (err) return callback(err, null);

alloc.userName = user.userName;
Expand Down