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

[offers][chore] Change location filter from city to country

Browse Source
This commit is contained in:
Bryann Yeap Kok Keong
2022-11-03 01:05:53 +08:00
parent 6881fe8bd5
commit b47cfceb09
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/portal/src/components/offers/table/OffersTable.tsx
View File

@ -55,9 +55,9 @@ export default function OffersTable({
[ [
'offers.list', 'offers.list',
{ {
// Location: 'Singapore, Singapore', // TODO: Geolocation
cityId: cityFilter,
companyId: companyFilter, companyId: companyFilter,
// Location: 'Singapore, Singapore', // TODO: Geolocation
countryId: cityFilter,
currency, currency,
limit: NUMBER_OF_OFFERS_IN_PAGE, limit: NUMBER_OF_OFFERS_IN_PAGE,
offset: pagination.currentPage, offset: pagination.currentPage,

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

@ -42,8 +42,8 @@ const getYoeRange = (yoeCategory: number | null | undefined) => {
export const offersRouter = createRouter().query('list', { export const offersRouter = createRouter().query('list', {
input: z.object({ input: z.object({
cityId: z.string().nullish(),
companyId: z.string().nullish(), companyId: z.string().nullish(),
countryId: z.string().nullish(),
currency: z.string().nullish(), currency: z.string().nullish(),
dateEnd: z.date().nullish(), dateEnd: z.date().nullish(),
dateStart: z.date().nullish(), dateStart: z.date().nullish(),
@ -131,10 +131,14 @@ export const offersRouter = createRouter().query('list', {
where: { where: {
AND: [ AND: [
{ {
cityId: location: {
input.cityId != null && input.cityId.length !== 0 state: {
? input.cityId countryId:
: undefined, input.countryId != null && input.countryId.length !== 0
? input.countryId
: undefined,
},
},
}, },
{ {
offersIntern: { offersIntern: {
@ -247,10 +251,14 @@ export const offersRouter = createRouter().query('list', {
where: { where: {
AND: [ AND: [
{ {
cityId: location: {
input.cityId != null && input.cityId.length !== 0 state: {
? input.cityId countryId:
: undefined, input.countryId != null && input.countryId.length !== 0
? input.countryId
: undefined,
},
},
}, },
{ {
offersIntern: { offersIntern: {