|
|
@ -4,7 +4,11 @@ import NcConnectionMgrv2 from '../../../utils/common/NcConnectionMgrv2'; |
|
|
|
import Noco from '../../../Noco'; |
|
|
|
import Noco from '../../../Noco'; |
|
|
|
import User from '../../../models/User'; |
|
|
|
import User from '../../../models/User'; |
|
|
|
import NocoCache from '../../../cache/NocoCache'; |
|
|
|
import NocoCache from '../../../cache/NocoCache'; |
|
|
|
import { CacheScope } from '../../../utils/globals'; |
|
|
|
import { |
|
|
|
|
|
|
|
CacheDelDirection, |
|
|
|
|
|
|
|
CacheScope, |
|
|
|
|
|
|
|
MetaTable, |
|
|
|
|
|
|
|
} from '../../../utils/globals'; |
|
|
|
import ProjectUser from '../../../models/ProjectUser'; |
|
|
|
import ProjectUser from '../../../models/ProjectUser'; |
|
|
|
import resetPgSakilaProject from './resetPgSakilaProject'; |
|
|
|
import resetPgSakilaProject from './resetPgSakilaProject'; |
|
|
|
import resetMysqlSakilaProject from './resetMysqlSakilaProject'; |
|
|
|
import resetMysqlSakilaProject from './resetMysqlSakilaProject'; |
|
|
@ -80,6 +84,7 @@ export class TestResetService { |
|
|
|
try { |
|
|
|
try { |
|
|
|
await removeAllProjectCreatedByTheTest(this.parallelId); |
|
|
|
await removeAllProjectCreatedByTheTest(this.parallelId); |
|
|
|
await removeAllPrefixedUsersExceptSuper(this.parallelId); |
|
|
|
await removeAllPrefixedUsersExceptSuper(this.parallelId); |
|
|
|
|
|
|
|
await removeAllTokensCreatedByTheTest(); |
|
|
|
} catch (e) { |
|
|
|
} catch (e) { |
|
|
|
console.log(`Error in cleaning up project: ${this.parallelId}`, e); |
|
|
|
console.log(`Error in cleaning up project: ${this.parallelId}`, e); |
|
|
|
} |
|
|
|
} |
|
|
@ -174,6 +179,22 @@ const removeAllPrefixedUsersExceptSuper = async (parallelId: string) => { |
|
|
|
} |
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const removeAllTokensCreatedByTheTest = async () => { |
|
|
|
|
|
|
|
const tokens = await Noco.ncMeta.metaList(null, null, MetaTable.API_TOKENS); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (const token of tokens) { |
|
|
|
|
|
|
|
await NocoCache.deepDel( |
|
|
|
|
|
|
|
CacheScope.API_TOKEN, |
|
|
|
|
|
|
|
`${CacheScope.API_TOKEN}:${token.token}`, |
|
|
|
|
|
|
|
CacheDelDirection.CHILD_TO_PARENT, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
await Noco.ncMeta.metaDelete(null, null, MetaTable.API_TOKENS, { |
|
|
|
|
|
|
|
token: token.token, |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
// todo: Remove this once user deletion improvement PR is merged
|
|
|
|
// todo: Remove this once user deletion improvement PR is merged
|
|
|
|
const removeProjectUsersFromCache = async (project: Project) => { |
|
|
|
const removeProjectUsersFromCache = async (project: Project) => { |
|
|
|
const projectUsers: ProjectUser[] = await ProjectUser.getUsersList({ |
|
|
|
const projectUsers: ProjectUser[] = await ProjectUser.getUsersList({ |
|
|
|