Fixing history, remove, and logs views
This commit is contained in:
1 parent
6785a45415
commit
ee91e02cec
9 files changed
+96
-48
No files matched your search
@@ -12,6 +12,8 @@ import {
|
||||
import { Clone } from '../../models'
|
||||
import logger from '../../config/logger'
|
||||
import removeKuberneteClone from '../../kubernetes/removeClone'
|
||||
import teams_FbByTeamMember from '../../graphQLCalls/teams_FbByTeamMember'
|
||||
import { isDefined, getSelectedBot } from '../../config/utils'
|
||||
|
||||
const args = {
|
||||
id: { type: new GraphQLNonNull(GraphQLID) }
|
||||
@@ -24,7 +26,22 @@ const resolve = async (parent, { id }, context) => {
|
||||
throw new AuthentificationError()
|
||||
}
|
||||
|
||||
await removeKuberneteClone(id)
|
||||
let clone = await Clone.findOne({
|
||||
_id: id,
|
||||
authId: context.userId,
|
||||
active: true
|
||||
})
|
||||
|
||||
if(!isDefined(clone)){
|
||||
throw new CustomError('You are not authorized to remove this clone.')
|
||||
}
|
||||
|
||||
// Authorization is also handled by the teams module
|
||||
let botsByUser = await teams_FbByTeamMember(context.authorization)
|
||||
let selectedBot = getSelectedBot(botsByUser.data.data.teams_FbByTeamMember, clone.botId)
|
||||
|
||||
logger.debug('removeClone -> Removing Clone from Kubernates.')
|
||||
await removeKuberneteClone(clone, botsByUser.data.data.teams_FbByTeamMember.slug, selectedBot.slug)
|
||||
|
||||
const query = {
|
||||
_id: id,
|
||||
@@ -33,12 +50,13 @@ const resolve = async (parent, { id }, context) => {
|
||||
const options = { new: true }
|
||||
const update = { active: false }
|
||||
|
||||
logger.debug('removeClone -> Removing Clone from DB.')
|
||||
Clone.findOneAndUpdate(query, update, options, (err, doc) => {
|
||||
if (err){
|
||||
logger.error('removeClone -> Error removing clone from the DB. %s', err.stack)
|
||||
throw new OperationsError(err)
|
||||
}else{
|
||||
resolve('Clone Removed.')
|
||||
logger.debug('removeClone -> Clone Removed from the DB.')
|
||||
return('Clone Removed.')
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user