Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: SJIP-569 filter to keep only available biospecimen for request report #99

Merged
merged 1 commit into from
Oct 18, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { contact, generateStudyTab, wantedFields } from './config';
import { resolveSetsInSqon } from '../../utils/sqonUtils';
import { SheetConfig } from '../types';
import generateTxtFile from '../utils/generateTxtFile';
import { addConditionAvailableInSqon } from '../utils/getAvailableBiospecimensFromSqon';

/**
* Generate and write locally.
Expand Down Expand Up @@ -102,7 +103,8 @@ const makeReportQuery = async (
) => {
const nestedFields = getNestedFields(extendedConfig);
const newSqon = await resolveSetsInSqon(sqon, userId, accessToken);
const query = buildQuery({ nestedFields, filters: newSqon });
const newSqonForAvailableOnly = addConditionAvailableInSqon(newSqon);
const query = buildQuery({ nestedFields, filters: newSqonForAvailableOnly });

return {
query,
Expand Down