algorithm/tech-interview-handbook
1
0
Fork 0
mirror of https://github.com/yangshun/tech-interview-handbook.git synced 2025-07-29 13:13:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[offers][fix] Fix pagination, include yoe in DTO and fix story bug

Browse Source
This commit is contained in:
BryannYeap
2022-10-10 22:09:38 +08:00
parent e6f2be64b4
commit 7052e8c175
3 changed files with 65 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/portal/src/pages/offers/test.tsx
View File

@ -2,25 +2,29 @@ import React from 'react';
import { trpc } from '~/utils/trpc';
function test() {
function Test() {
const data = trpc.useQuery([
'offers.list',
{
limit: 3,
limit: 5,
location: 'Singapore, Singapore',
offset: 0,
sortBy: '-monthYearReceived',
yoeCategory: 0,
sortBy: '-totalYoe',
yoeCategory: 1,
},
]);
return (
<ul>
{data.data?.map((x) => {
return <li key={x.id}>{JSON.stringify(x)}</li>;
})}
</ul>
<>
<ul>
{data.data?.data.map((x) => {
return <li key={x.id}>{JSON.stringify(x)}</li>;
})}
</ul>
<br />
<p>{JSON.stringify(data.data?.paging)}</p>
</>
);
}
export default test;
export default Test;

58
apps/portal/src/server/router/offers.ts
View File

@ -22,7 +22,7 @@ const getYoeRange = (yoeCategory: number) => {
const ascOrder = '+';
const descOrder = '-';
const sortingKeys = ['monthYearReceived', 'totalCompensation', 'yoe'];
const sortingKeys = ['monthYearReceived', 'totalCompensation', 'totalYoe'];
const createSortByValidationRegex = () => {
const startsWithPlusOrMinusOnly = '^[+-]{1}';
@ -65,9 +65,12 @@ export const offersRouter = createRouter().query('list', {
},
},
company: true,
profile: {
include: {
background: true,
},
},
},
skip: input.limit * input.offset,
take: input.limit,
where: {
AND: [
{
@ -103,10 +106,13 @@ export const offersRouter = createRouter().query('list', {
},
},
company: true,
profile: {
include: {
background: true,
},
},
},
// Junior, Mid
skip: input.limit * input.offset,
take: input.limit,
where: {
AND: [
{
@ -160,9 +166,12 @@ export const offersRouter = createRouter().query('list', {
},
},
company: true,
profile: {
include: {
background: true,
},
},
},
skip: input.limit * input.offset,
take: input.limit,
where: {
AND: [
{
@ -259,6 +268,16 @@ export const offersRouter = createRouter().query('list', {
return salary1 - salary2;
}
}
if (sortingKey === 'totalYoe') {
const yoe1 = offer1.profile.background?.totalYoe;
const yoe2 = offer2.profile.background?.totalYoe;
if (yoe1 && yoe2) {
return yoe1 - yoe2;
}
}
return defaultReturn;
})();
}
@ -286,12 +305,35 @@ export const offersRouter = createRouter().query('list', {
}
}
if (sortingKey === 'totalYoe') {
const yoe1 = offer1.profile.background?.totalYoe;
const yoe2 = offer2.profile.background?.totalYoe;
if (yoe1 && yoe2) {
return yoe2 - yoe1;
}
}
return defaultReturn;
})();
}
return defaultReturn;
});
return data;
const startRecordIndex: number = input.limit * input.offset;
const endRecordIndex: number =
startRecordIndex + input.limit <= data.length
? startRecordIndex + input.limit
: data.length;
const paginatedData = data.slice(startRecordIndex, endRecordIndex);
return {
data: paginatedData,
paging: {
currPage: input.offset,
numOfItemsInPage: paginatedData.length,
numOfPages: Math.ceil(data.length / input.limit),
},
};
},
});

2
packages/ui/src/SlideOut/SlideOut.tsx
View File

@ -8,7 +8,7 @@ export type SlideOutEnterFrom = 'end' | 'start';
type Props = Readonly<{
children: React.ReactNode;
className: string;
className?: string;
enterFrom?: SlideOutEnterFrom;
isShown?: boolean;
onClose?: () => void;