[question][fix] fix frontend

pull/384/head
Jeff Sieu 3 years ago
parent 620c3676c2
commit 54f30c2d6d

@ -26,6 +26,8 @@ import {
} from '~/utils/questions/useSearchFilter'; } from '~/utils/questions/useSearchFilter';
import { trpc } from '~/utils/trpc'; import { trpc } from '~/utils/trpc';
import { SortOrder, SortType } from '~/types/questions';
export default function QuestionsHomePage() { export default function QuestionsHomePage() {
const router = useRouter(); const router = useRouter();
@ -70,6 +72,9 @@ export default function QuestionsHomePage() {
locations: selectedLocations, locations: selectedLocations,
questionTypes: selectedQuestionTypes, questionTypes: selectedQuestionTypes,
roles: [], roles: [],
// TODO: Implement sort order and sort type choices
sortOrder: SortOrder.DESC,
sortType: SortType.BEST,
startDate, startDate,
}, },
], ],

@ -7,7 +7,6 @@ import { createProtectedRouter } from './context';
import type { Question } from '~/types/questions'; import type { Question } from '~/types/questions';
import { SortOrder, SortType } from '~/types/questions'; import { SortOrder, SortType } from '~/types/questions';
export const questionsQuestionRouter = createProtectedRouter() export const questionsQuestionRouter = createProtectedRouter()
.query('getQuestionsByFilter', { .query('getQuestionsByFilter', {
input: z.object({ input: z.object({
@ -18,8 +17,8 @@ export const questionsQuestionRouter = createProtectedRouter()
questionTypes: z.nativeEnum(QuestionsQuestionType).array(), questionTypes: z.nativeEnum(QuestionsQuestionType).array(),
roles: z.string().array(), roles: z.string().array(),
sortOrder: z.nativeEnum(SortOrder), sortOrder: z.nativeEnum(SortOrder),
startDate: z.date().optional() sortType: z.nativeEnum(SortType),
sortType : z.nativeEnum(SortType), startDate: z.date().optional(),
}), }),
async resolve({ ctx, input }) { async resolve({ ctx, input }) {
const questionsData = await ctx.prisma.questionsQuestion.findMany({ const questionsData = await ctx.prisma.questionsQuestion.findMany({
@ -56,68 +55,67 @@ export const questionsQuestionRouter = createProtectedRouter()
}, },
} }
: {}), : {}),
encounters : { encounters: {
some: { some: {
...(input.companies.length > 0 ...(input.companies.length > 0
? { ? {
company : { company: {
in : input.companies in: input.companies,
} },
} }
: {}), : {}),
...(input.locations.length > 0 ...(input.locations.length > 0
? { ? {
location: { location: {
in: input.locations in: input.locations,
}, },
} }
: {}), : {}),
...(input.roles.length > 0 ...(input.roles.length > 0
? { ? {
role : { role: {
in: input.roles in: input.roles,
} },
} }
: {}), : {}),
} },
} },
}, },
}); });
return questionsData return questionsData.map((data) => {
.map((data) => { const votes: number = data.votes.reduce(
const votes: number = data.votes.reduce( (previousValue: number, currentValue) => {
(previousValue: number, currentValue) => { let result: number = previousValue;
let result: number = previousValue;
switch (currentValue.vote) { switch (currentValue.vote) {
case Vote.UPVOTE: case Vote.UPVOTE:
result += 1; result += 1;
break; break;
case Vote.DOWNVOTE: case Vote.DOWNVOTE:
result -= 1; result -= 1;
break; break;
} }
return result; return result;
}, },
0, 0,
); );
const question: Question = { const question: Question = {
company: data.encounters[0].company, company: data.encounters[0].company,
content: data.content, content: data.content,
id: data.id, id: data.id,
location: data.encounters[0].location ?? 'Unknown location', location: data.encounters[0].location ?? 'Unknown location',
numAnswers: data._count.answers, numAnswers: data._count.answers,
numComments: data._count.comments, numComments: data._count.comments,
numVotes: votes, numVotes: votes,
role: data.encounters[0].role ?? 'Unknown role', role: data.encounters[0].role ?? 'Unknown role',
seenAt: data.encounters[0].seenAt, seenAt: data.encounters[0].seenAt,
type: data.questionType, type: data.questionType,
updatedAt: data.updatedAt, updatedAt: data.updatedAt,
user: data.user?.name ?? '', user: data.user?.name ?? '',
}; };
return question; return question;
}); });
}, },
}) })
.query('getQuestionById', { .query('getQuestionById', {
@ -264,7 +262,6 @@ export const questionsQuestionRouter = createProtectedRouter()
const { content, questionType } = input; const { content, questionType } = input;
return await ctx.prisma.questionsQuestion.update({ return await ctx.prisma.questionsQuestion.update({
data: { data: {
content, content,
questionType, questionType,

Loading…
Cancel
Save