refactor: rewrite get connected apps with RQ
This commit is contained in:
@@ -1,67 +0,0 @@
|
||||
import App from '../../models/app.js';
|
||||
import Flow from '../../models/flow.js';
|
||||
import Connection from '../../models/connection.js';
|
||||
|
||||
const getConnectedApps = async (_parent, params, context) => {
|
||||
const conditions = context.currentUser.can('read', 'Connection');
|
||||
|
||||
const userConnections = context.currentUser.$relatedQuery('connections');
|
||||
const allConnections = Connection.query();
|
||||
const connectionBaseQuery = conditions.isCreator
|
||||
? userConnections
|
||||
: allConnections;
|
||||
|
||||
const userFlows = context.currentUser.$relatedQuery('flows');
|
||||
const allFlows = Flow.query();
|
||||
const flowBaseQuery = conditions.isCreator ? userFlows : allFlows;
|
||||
|
||||
let apps = await App.findAll(params.name);
|
||||
|
||||
const connections = await connectionBaseQuery
|
||||
.clone()
|
||||
.select('connections.key')
|
||||
.where({ draft: false })
|
||||
.count('connections.id as count')
|
||||
.groupBy('connections.key');
|
||||
|
||||
const flows = await flowBaseQuery
|
||||
.clone()
|
||||
.withGraphJoined('steps')
|
||||
.orderBy('created_at', 'desc');
|
||||
|
||||
const duplicatedUsedApps = flows
|
||||
.map((flow) => flow.steps.map((step) => step.appKey))
|
||||
.flat()
|
||||
.filter(Boolean);
|
||||
|
||||
const connectionKeys = connections.map((connection) => connection.key);
|
||||
const usedApps = [...new Set([...duplicatedUsedApps, ...connectionKeys])];
|
||||
|
||||
apps = apps
|
||||
.filter((app) => {
|
||||
return usedApps.includes(app.key);
|
||||
})
|
||||
.map((app) => {
|
||||
const connection = connections.find(
|
||||
(connection) => connection.key === app.key
|
||||
);
|
||||
|
||||
app.connectionCount = connection?.count || 0;
|
||||
app.flowCount = 0;
|
||||
|
||||
flows.forEach((flow) => {
|
||||
const usedFlow = flow.steps.find((step) => step.appKey === app.key);
|
||||
|
||||
if (usedFlow) {
|
||||
app.flowCount += 1;
|
||||
}
|
||||
});
|
||||
|
||||
return app;
|
||||
})
|
||||
.sort((appA, appB) => appA.name.localeCompare(appB.name));
|
||||
|
||||
return apps;
|
||||
};
|
||||
|
||||
export default getConnectedApps;
|
@@ -1,7 +0,0 @@
|
||||
import getConnectedApps from './queries/get-connected-apps.js';
|
||||
|
||||
const queryResolvers = {
|
||||
getConnectedApps,
|
||||
};
|
||||
|
||||
export default queryResolvers;
|
@@ -1,8 +1,6 @@
|
||||
import mutationResolvers from './mutation-resolvers.js';
|
||||
import queryResolvers from './query-resolvers.js';
|
||||
|
||||
const resolvers = {
|
||||
Query: queryResolvers,
|
||||
Mutation: mutationResolvers,
|
||||
};
|
||||
|
||||
|
@@ -1,7 +1,6 @@
|
||||
type Query {
|
||||
getConnectedApps(name: String): [App]
|
||||
placeholderQuery(name: String): Boolean
|
||||
}
|
||||
|
||||
type Mutation {
|
||||
createAppConfig(input: CreateAppConfigInput): AppConfig
|
||||
createAppAuthClient(input: CreateAppAuthClientInput): AppAuthClient
|
||||
|
@@ -40,9 +40,6 @@ export const authenticateUser = async (request, response, next) => {
|
||||
const isAuthenticatedRule = rule()(isAuthenticated);
|
||||
|
||||
export const authenticationRules = {
|
||||
Query: {
|
||||
'*': isAuthenticatedRule,
|
||||
},
|
||||
Mutation: {
|
||||
'*': isAuthenticatedRule,
|
||||
forgotPassword: allow,
|
||||
|
@@ -42,19 +42,21 @@ describe('authentication rules', () => {
|
||||
|
||||
const { queries, mutations } = getQueryAndMutationNames(authenticationRules);
|
||||
|
||||
describe('for queries', () => {
|
||||
queries.forEach((query) => {
|
||||
it(`should apply correct rule for query: ${query}`, () => {
|
||||
const ruleApplied = authenticationRules.Query[query];
|
||||
if (queries.length) {
|
||||
describe('for queries', () => {
|
||||
queries.forEach((query) => {
|
||||
it(`should apply correct rule for query: ${query}`, () => {
|
||||
const ruleApplied = authenticationRules.Query[query];
|
||||
|
||||
if (query === '*') {
|
||||
expect(ruleApplied.func).toBe(isAuthenticated);
|
||||
} else {
|
||||
expect(ruleApplied).toEqual(allow);
|
||||
}
|
||||
if (query === '*') {
|
||||
expect(ruleApplied.func).toBe(isAuthenticated);
|
||||
} else {
|
||||
expect(ruleApplied).toEqual(allow);
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
describe('for mutations', () => {
|
||||
mutations.forEach((mutation) => {
|
||||
|
Reference in New Issue
Block a user