Skip to content

feat: evaluations tab for gov users #505

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

Open
wants to merge 4 commits into
base: in-app-evaluation
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 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
85 changes: 50 additions & 35 deletions src/back-end/lib/db/opportunity/sprint-with-us.ts
Original file line number Diff line number Diff line change
Expand Up @@ -619,18 +619,33 @@ export const readManyTeamQuestions = tryDb<[Id], SWUTeamQuestion[]>(
}
);

export const readManySWUOpportunities = tryDb<[Session], SWUOpportunitySlim[]>(
async (connection, session) => {
let query = generateSWUOpportunityQuery(connection);
export const readManySWUOpportunities = tryDb<
[Session, boolean?],
SWUOpportunitySlim[]
>(async (connection, session, isPanelMember = false) => {
let query = generateSWUOpportunityQuery(connection);

if (!session || session.user.type === UserType.Vendor) {
// Anonymous users and vendors can only see public opportunities
query = query.whereIn(
"statuses.status",
publicOpportunityStatuses as SWUOpportunityStatus[]
);
if (!session || session.user.type === UserType.Vendor) {
// Anonymous users and vendors can only see public opportunities
query = query.whereIn(
"statuses.status",
publicOpportunityStatuses as SWUOpportunityStatus[]
);
} else if (
session.user.type === UserType.Government ||
session.user.type === UserType.Admin
) {
if (isPanelMember) {
// When isPanelMember=true, ONLY include opportunities where user is on evaluation panel
// works for admin and gov basic users
query = query.whereIn("versions.id", function () {
this.select("opportunityVersion")
.from("swuEvaluationPanelMembers")
.where("user", "=", session.user.id);
});
} else if (session.user.type === UserType.Government) {
// Gov basic users should only see private opportunities that they own, and public opportunities
// Regular behavior - show public opportunities and private ones the user created
// works for gov basic users only
query = query
.whereIn(
"statuses.status",
Expand All @@ -643,33 +658,33 @@ export const readManySWUOpportunities = tryDb<[Session], SWUOpportunitySlim[]>(
).andWhere({ "opportunities.createdBy": session.user?.id });
});
}
// Admins can see all opportunities, so no additional filter necessary if none of the previous conditions match
// Process results to eliminate fields not viewable by the current role
const results = await Promise.all(
(
await query
).map(async (result: RawSWUOpportunity | RawSWUOpportunitySlim) => {
if (session) {
result.subscribed = await isSubscribed(
connection,
result.id,
session.user.id
);
}
return processForRole(result, session);
})
);
}
// Admins can see all opportunities, so no additional filter necessary if none of the previous conditions match
// Process results to eliminate fields not viewable by the current role
const results = await Promise.all(
(
await query
).map(async (result: RawSWUOpportunity | RawSWUOpportunitySlim) => {
if (session) {
result.subscribed = await isSubscribed(
connection,
result.id,
session.user.id
);
}
return processForRole(result, session);
})
);

return valid(
await Promise.all(
results.map(
async (raw) =>
await rawSWUOpportunitySlimToSWUOpportunitySlim(connection, raw)
)
return valid(
await Promise.all(
results.map(
async (raw) =>
await rawSWUOpportunitySlimToSWUOpportunitySlim(connection, raw)
)
);
}
);
)
);
});

export const readOneSWUOpportunityPhase = tryDb<[Id], SWUOpportunityPhase>(
async (connection, id) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,14 @@ const readMany: crud.ReadMany<Session, db.Connection> = (
>(async (request) => {
const respond = (code: number, body: SWUOpportunitySlim[] | string[]) =>
basicResponse(code, request.session, makeJsonResponseBody(body));

// Read and validate the panelMember flag
const isPanelMember = request.query.panelMember === "true";

const dbResult = await db.readManySWUOpportunities(
connection,
request.session
request.session,
isPanelMember
);
if (isInvalid(dbResult)) {
return respond(503, [db.ERROR_MESSAGE]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ export function create<Msg>(): crud.CreateAction<
return crud.makeCreateAction(NAMESPACE, rawSWUOpportunityToSWUOpportunity);
}

export function readMany<Msg>(): crud.ReadManyAction<
Resource.SWUOpportunitySlim,
string[],
Msg
> {
export function readMany<Msg>(
query?: string
): crud.ReadManyAction<Resource.SWUOpportunitySlim, string[], Msg> {
return crud.makeReadManyAction(
NAMESPACE,
query ? `${NAMESPACE}${query}` : NAMESPACE,
(a: Resource.SWUOpportunitySlim) => a
);
}
Expand Down
Loading
Loading