-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into IN-857-user-management
- Loading branch information
Showing
12 changed files
with
171 additions
and
181 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 43 additions & 38 deletions
81
packages/api/router/organization/query.forOrgPage.handler.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,56 @@ | ||
| import { prisma } from '@weareinreach/db' | ||
| import { handleError } from '~api/lib/errorHandler' | ||
| import { attributes, freeText, isPublic } from '~api/schemas/selects/common' | ||
| import { type TRPCHandlerParams } from '~api/types/handler' | ||
|
|
||
| import { type TForOrgPageSchema } from './query.forOrgPage.schema' | ||
|
|
||
| const forOrgPage = async ({ input }: TRPCHandlerParams<TForOrgPageSchema>) => { | ||
| const { slug } = input | ||
| const org = await prisma.organization.findUniqueOrThrow({ | ||
| where: { | ||
| slug, | ||
| ...isPublic, | ||
| }, | ||
| select: { | ||
| id: true, | ||
| name: true, | ||
| slug: true, | ||
| published: true, | ||
| lastVerified: true, | ||
| allowedEditors: { where: { authorized: true }, select: { userId: true } }, | ||
| description: freeText, | ||
|
|
||
| reviews: { | ||
| where: { visible: true, deleted: false }, | ||
| select: { id: true }, | ||
| try { | ||
| const { slug } = input | ||
| const org = await prisma.organization.findUniqueOrThrow({ | ||
| where: { | ||
| slug, | ||
| ...isPublic, | ||
| }, | ||
| locations: { | ||
| where: isPublic, | ||
| select: { | ||
| id: true, | ||
| street1: true, | ||
| street2: true, | ||
| city: true, | ||
| postCode: true, | ||
| country: { select: { cca2: true } }, | ||
| govDist: { select: { abbrev: true, tsKey: true, tsNs: true } }, | ||
| notVisitable: true, | ||
| select: { | ||
| id: true, | ||
| name: true, | ||
| slug: true, | ||
| published: true, | ||
| lastVerified: true, | ||
| allowedEditors: { where: { authorized: true }, select: { userId: true } }, | ||
| description: freeText, | ||
|
|
||
| reviews: { | ||
| where: { visible: true, deleted: false }, | ||
| select: { id: true }, | ||
| }, | ||
| locations: { | ||
| where: isPublic, | ||
| select: { | ||
| id: true, | ||
| street1: true, | ||
| street2: true, | ||
| city: true, | ||
| postCode: true, | ||
| country: { select: { cca2: true } }, | ||
| govDist: { select: { abbrev: true, tsKey: true, tsNs: true } }, | ||
| notVisitable: true, | ||
| }, | ||
| }, | ||
| attributes, | ||
| }, | ||
| attributes, | ||
| }, | ||
| }) | ||
| const { allowedEditors, ...orgData } = org | ||
| const reformatted = { | ||
| ...orgData, | ||
| isClaimed: Boolean(allowedEditors.length), | ||
| } | ||
| }) | ||
| const { allowedEditors, ...orgData } = org | ||
| const reformatted = { | ||
| ...orgData, | ||
| isClaimed: Boolean(allowedEditors.length), | ||
| } | ||
|
|
||
| return reformatted | ||
| return reformatted | ||
| } catch (err) { | ||
| return handleError(err) | ||
| } | ||
| } | ||
| export default forOrgPage |
41 changes: 23 additions & 18 deletions
41
packages/api/router/organization/query.getIdFromSlug.handler.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,36 @@ | ||
| import { checkPermissions } from '@weareinreach/auth' | ||
| import { prisma } from '@weareinreach/db' | ||
| import { readSlugCache, writeSlugCache } from '~api/cache/slugToOrgId' | ||
| import { handleError } from '~api/lib/errorHandler' | ||
| import { isPublic } from '~api/schemas/selects/common' | ||
| import { type TRPCHandlerParams } from '~api/types/handler' | ||
|
|
||
| import { type TGetIdFromSlugSchema } from './query.getIdFromSlug.schema' | ||
|
|
||
| const getIdFromSlug = async ({ ctx, input }: TRPCHandlerParams<TGetIdFromSlugSchema>) => { | ||
| const { slug } = input | ||
| const cachedId = await readSlugCache(slug) | ||
| if (cachedId) { | ||
| return { id: cachedId } | ||
| } | ||
| const canSeeUnpublished = | ||
| ctx.session !== null && | ||
| checkPermissions({ | ||
| session: ctx.session, | ||
| permissions: ['dataPortalBasic', 'dataPortalAdmin', 'dataPortalManager'], | ||
| has: 'some', | ||
| try { | ||
| const { slug } = input | ||
| const cachedId = await readSlugCache(slug) | ||
| if (cachedId) { | ||
| return { id: cachedId } | ||
| } | ||
| const canSeeUnpublished = | ||
| ctx.session !== null && | ||
| checkPermissions({ | ||
| session: ctx.session, | ||
| permissions: ['dataPortalBasic', 'dataPortalAdmin', 'dataPortalManager'], | ||
| has: 'some', | ||
| }) | ||
| const orgId = await prisma.organization.findUniqueOrThrow({ | ||
| where: { slug, ...(canSeeUnpublished ? {} : isPublic) }, | ||
| select: { id: true, published: true, deleted: true }, | ||
| }) | ||
| const orgId = await prisma.organization.findUniqueOrThrow({ | ||
| where: { slug, ...(canSeeUnpublished ? {} : isPublic) }, | ||
| select: { id: true, published: true, deleted: true }, | ||
| }) | ||
| if (orgId.published && !orgId.deleted) { | ||
| await writeSlugCache(slug, orgId.id) | ||
| if (orgId.published && !orgId.deleted) { | ||
| await writeSlugCache(slug, orgId.id) | ||
| } | ||
| return { id: orgId.id } | ||
| } catch (err) { | ||
| return handleError(err) | ||
| } | ||
| return { id: orgId.id } | ||
| } | ||
| export default getIdFromSlug |
Oops, something went wrong.