Skip to content
Merged
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
7 changes: 4 additions & 3 deletions src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import { CreateSetBody, Set, SetSqon, UpdateSetContentBody, UpdateSetTagBody } f
import { getStatistics, getStudiesStatistics } from './endpoints/statistics';
import transcriptomicsRouter from './endpoints/transcriptomics/route';
import { computeUpset } from './endpoints/upset';
import { reformatVenn, venn, VennOutput } from './endpoints/venn/venn';
import { reformatVenn, venn } from './endpoints/venn/venn';
import { esHost, keycloakURL, userApiURL } from './env';
import { globalErrorHandler, globalErrorLogger } from './errors';
import { flushAllCache, STATISTICS_CACHE_ID, STATISTICS_PUBLIC_CACHE_ID, twineWithCache } from './middleware/cache';
import { injectBodyHttpHeaders } from './middleware/injectBodyHttpHeaders';
import { resolveSetIdMiddleware } from './middleware/resolveSetIdInSqon';
import { replaceIdsWithSetId, resolveSetsInAllSqonsWithMapper } from './sqon/resolveSetInSqon';
import { replaceIdsWithSetId, resolveSetsInAllSqonsWithMapper, resolveSetsInSqon } from './sqon/resolveSetInSqon';
import { Sqon } from './sqon/types';

export default (keycloak: Keycloak, getProject: (projectId: string) => ArrangerProject): Express => {
Expand Down Expand Up @@ -195,7 +195,8 @@ export default (keycloak: Keycloak, getProject: (projectId: string) => ArrangerP

app.post('/upset', keycloak.protect(), async (req, res, next) => {
try {
const data = await computeUpset(req.body.sqon, req.body.topN);
const sqon = await resolveSetsInSqon(req.body.sqon, null, req.headers.authorization);
const data = await computeUpset(sqon, req.body.topN);
res.send(data);
} catch (e) {
next(e);
Expand Down
Loading