Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/routers/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ router.get('/component', auth, [
query('domain', 'Please, specify the \'domain\' id').isMongoId()
], validate, async (req, res) => {
try {
let components = await Services.getComponents({ domain: req.query.domain },
let components = await Services.getComponents({ domain: req.query.domain.toString() },
['_id', 'name', 'description'],
{
skip: Number.parseInt(req.query.skip || 0),
Expand Down
5 changes: 3 additions & 2 deletions src/services/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ export async function updateAccount(args, admin) {
}

export async function leaveDomain(domainid, admin) {
const teams = await getTeams({ domain: domainid, members: admin.id });
const adminId = admin.id.toString();
const teams = await getTeams({ domain: domainid, members: adminId });

if (!teams.length) {
throw new NotFoundError('No team found for this given domain id');
}

for (const admin_team of teams) {
let indexMmeber = admin_team.members.indexOf(admin.id);
let indexMmeber = admin_team.members.indexOf(adminId);
admin_team.members.splice(indexMmeber, 1);

let indexTeam = admin.teams.indexOf(admin_team._id);
Expand Down
4 changes: 2 additions & 2 deletions src/services/metric.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export async function deleteMetrics(req) {
}

config = await verifyOwnership(req.admin, config, config.domain, ActionTypes.DELETE, RouterTypes.ADMIN);
await Metric.deleteMany({ domain: config.domain, config: config._id }).exec();
await Metric.deleteMany({ domain: config.domain, config: config._id.toString() }).exec();
}

async function aggreagateReasons(aggregate, result) {
Expand Down Expand Up @@ -178,7 +178,7 @@ function buildMetricsFilter(req) {
let aggregate = Metric.aggregate();
let args = {};

args.domain = req.query.domainid;
args.domain = req.query.domainid.toString();
aggregate.match({ $expr: { $eq: [{ $toString: '$domain' }, args.domain] } });

if (req.query.environment) {
Expand Down
2 changes: 1 addition & 1 deletion src/services/slack.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async function deleteSlackTicketsBySlackId(slackId) {
async function hasSlackTicket(slack, ticket_content) {
const tickets = await SlackTicket.find({
slack: slack._id.toString(),
domain: slack.domain,
domain: slack.domain.toString(),
environment: ticket_content.environment,
group: ticket_content.group,
switcher: ticket_content.switcher,
Expand Down