Skip to content

Deleted entities classified as Unknown in analytics #830

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

Merged
merged 1 commit into from
Oct 18, 2016
Merged

Deleted entities classified as Unknown in analytics #830

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
18 changes: 8 additions & 10 deletions server/app/services/analyticsService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ var AWSProvider = require('_pr/model/classes/masters/cloudprovider/awsCloudProvi

var analyticsService = module.exports = {}

// @TODO To be re-factored
analyticsService.aggregateEntityCosts
= function aggregateEntityCosts(parentEntity, parentEntityId, parentEntityQuery, endTime, period, callback) {
var catalystEntityHierarchy = appConfig.catalystEntityHierarchy
Expand Down Expand Up @@ -80,7 +81,7 @@ analyticsService.aggregateEntityCosts
if(err) {
next0(err)
} else {
//@TODO Blocking call to be avoided
// @TODO To be improved
var entityCosts = {}
for(var i = 0; i < aggregateCosts.totalCosts.length; i++) {
entityCosts[aggregateCosts.totalCosts[i]._id] = {
Expand All @@ -100,7 +101,7 @@ analyticsService.aggregateEntityCosts
}
}

// @TODO Blocking call to be avoided
// @TODO To be improved
for(var i = 0; i < aggregateCosts.serviceCosts.length; i++) {
if(aggregateCosts.serviceCosts[i]._id.entityId in entityCosts) {
entityCosts[aggregateCosts.serviceCosts[i]._id.entityId]
Expand Down Expand Up @@ -410,9 +411,6 @@ analyticsService.formatCostTrend = function formatCostTrend(entityCosts, callbac
//@TODO To be optimized. Better abstractions and attribute naming conventions will guarantee less code duplication
//@TODO Centralized error handling to reduce code duplication
analyticsService.getEntityDetails = function getEntityDetails(entityType, entityId, callback) {
var notFoundError = new Error('Invalid entity id')
notFoundError.status = 404

var internalServerError = new Error('Internal Server Error')
internalServerError.status = 500

Expand All @@ -427,7 +425,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity
} else if (organizations.length > 0) {
callback(null, {'name': organizations[0].orgname})
} else {
callback(notFoundError)
callback(null, {'name': 'Unknown'})
}
}
)
Expand All @@ -440,7 +438,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity
logger.error(err)
callback(internalServerError)
} else if(provider == null) {
callback(notFoundError)
callback(null, {'name': 'Unknown'})
} else {
callback(null, {'name': provider.providerName})
}
Expand All @@ -457,7 +455,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity
} else if(businessGroups.length > 0) {
callback(null, {'name': businessGroups[0].productgroupname})
} else {
callback(notFoundError)
callback(null, {'name': 'Unknown'})
}
}
)
Expand All @@ -472,7 +470,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity
} else if(projects.length > 0) {
callback(null, {'name': projects[0].projectname})
} else {
callback(notFoundError)
callback(null, {'name': 'Unknown'})
}
}
)
Expand All @@ -487,7 +485,7 @@ analyticsService.getEntityDetails = function getEntityDetails(entityType, entity
} else if (environments.length > 0) {
callback(null, {'name': environments[0].environmentname})
} else {
callback(notFoundError)
callback(null, {'name': 'Unknown'})
}
}
)
Expand Down