- {cities.map((city) => (
-
- ))}
- {!regionsAreDerived
- ? regions.map((region) => (
-
- ))
- : null}
- {neighborhoodsEnabled
- ? neighborhoods.map((neighborhood) => (
-
- ))
- : null}
-
-
- Territórios de identidade
- {displayRegions.length ? (
- `Remover território ${region}`}
- />
- ) : null}
- {regionsAreDerived ? (
-
- Derivados automaticamente dos municípios selecionados. Remova municípios para editar
- territórios manualmente.
-
- ) : (
- {
- if (nextRegion) addRegion(nextRegion)
- else setRegionDraft('')
- }}
- onInvalid={() => {
- setRegionError('Selecione um território de identidade válido da Bahia.')
- }}
- error={visibleRegionError}
- />
- )}
- {visibleRegionError ? (
- {visibleRegionError}
- ) : null}
-
-
-
- Municípios
- addCity(suggestion.city)}
- />
- {cities.length ? (
- `Remover município ${city}`}
- />
- ) : null}
- {
- if (nextCity) addCity(nextCity)
- else setCityDraft('')
- }}
- onInvalid={() => {
- setCityError('Selecione um município válido da Bahia.')
- }}
- error={visibleCityError}
- />
-
- Selecione um ou mais municípios. Territórios são derivados automaticamente; bairros só
- ficam disponíveis com exatamente um município.
-
- {visibleCityError ? (
- {visibleCityError}
- ) : null}
-
-
-
- Bairros
- {neighborhoodsEnabled && neighborhoods.length ? (
-
- setNeighborhoods((current) => current.filter((item) => item !== neighborhood))
- }
- removeLabel={(neighborhood) => `Remover bairro ${neighborhood}`}
- />
- ) : null}
-
- {
- setNeighborhoodDraft(event.target.value)
- setNeighborhoodError(undefined)
- }}
- onKeyDown={(event) => {
- if (event.key === 'Enter') {
- event.preventDefault()
- commitNeighborhood(neighborhoodDraft)
- } else if (
- event.key === 'Backspace' &&
- !neighborhoodDraft &&
- neighborhoods.length > 0
- ) {
- setNeighborhoods((current) => current.slice(0, -1))
- }
- }}
- onBlur={() => commitNeighborhood(neighborhoodDraft)}
- />
-
-
- Use Enter para adicionar. Disponível somente quando há exatamente um município.
-
- {visibleNeighborhoodError ? (
- {visibleNeighborhoodError}
- ) : null}
-
+
Zonas TSE
diff --git a/src/components/campaign/NucleusTerritoryFields.tsx b/src/components/campaign/NucleusTerritoryFields.tsx
index 849d2b39..51c7fbdc 100644
--- a/src/components/campaign/NucleusTerritoryFields.tsx
+++ b/src/components/campaign/NucleusTerritoryFields.tsx
@@ -1,53 +1,10 @@
'use client'
-import { useMemo, useState } from 'react'
-import { XIcon } from 'lucide-react'
-
-import { StrictCombobox } from '@/components/campaign/StrictCombobox'
-import { TerritorySuggestionChips } from '@/components/campaign/TerritorySuggestionChips'
-import { Badge } from '@/components/ui/Badge'
-import { Field, FieldDescription, FieldError, FieldLabel } from '@/components/ui/field'
-import { InputGroup, InputGroupInput } from '@/components/ui/input-group'
-import { territoriesForCities } from '@/lib/bahiaTerritories'
+import { CampaignTerritoryCoreFields } from '@/components/campaign/CampaignTerritoryCoreFields'
import {
- dedupeTrimmedStrings,
- MAX_NUCLEUS_CITIES,
- MAX_NUCLEUS_NEIGHBORHOODS,
- MAX_NUCLEUS_REGIONS,
-} from '@/lib/schemas/nucleus'
-import { buildTerritorySuggestions } from '@/lib/territorySuggestions'
-import {
- allMunicipalityComboboxOptions,
- territoryComboboxOptions,
-} from '@/utilities/territoryComboboxOptions'
-import { fieldError } from '@/utilities/campaignFormFields'
-
-type TerritoryValues = {
- regions?: string[] | null
- cities?: string[] | null
- neighborhoods?: string[] | null
-}
-
-const ChipList = ({
- values,
- onRemove,
- removeLabel,
-}: {
- values: string[]
- onRemove: (value: string) => void
- removeLabel: (value: string) => string
-}) => (
-
- {values.map((value) => (
-
-
-
- ))}
-
-)
+ useCampaignTerritoryFieldsState,
+ type CampaignTerritoryValues,
+} from '@/components/campaign/useCampaignTerritoryFieldsState'
/**
* Territory-only fields (regions/cities/neighborhoods) shared by any campaign
@@ -59,262 +16,14 @@ export const CampaignTerritoryFields = ({
values,
fieldErrors = {},
}: {
- values?: TerritoryValues
+ values?: CampaignTerritoryValues
fieldErrors?: Record
}) => {
- const [regions, setRegions] = useState(() => dedupeTrimmedStrings(values?.regions ?? []))
- const [cities, setCities] = useState(() => dedupeTrimmedStrings(values?.cities ?? []))
- const [neighborhoods, setNeighborhoods] = useState(() =>
- dedupeTrimmedStrings(values?.neighborhoods ?? []),
- )
- const [cityDraft, setCityDraft] = useState('')
- const [regionDraft, setRegionDraft] = useState('')
- const [neighborhoodDraft, setNeighborhoodDraft] = useState('')
- const [regionError, setRegionError] = useState()
- const [cityError, setCityError] = useState()
- const [neighborhoodError, setNeighborhoodError] = useState()
-
- const errorFor = (name: string) => fieldError(fieldErrors, name)
- const derivedRegions = useMemo(() => territoriesForCities(cities), [cities])
- const displayRegions = cities.length > 0 ? derivedRegions : regions
- const regionsAreDerived = cities.length > 0
- const neighborhoodsEnabled = cities.length === 1
-
- const { citySuggestions } = useMemo(
- () =>
- buildTerritorySuggestions({
- cities,
- regions: displayRegions,
- tseZones: [],
- }),
- [cities, displayRegions],
- )
-
- const visibleRegionError = regionError ?? errorFor('regions')
- const visibleCityError = cityError ?? errorFor('cities')
- const visibleNeighborhoodError = neighborhoodError ?? errorFor('neighborhoods')
-
- const availableCityOptions = useMemo(() => {
- const selected = new Set(cities)
- return allMunicipalityComboboxOptions.filter((option) => !selected.has(option.value))
- }, [cities])
- const availableRegionOptions = useMemo(() => {
- const selected = new Set(regions)
- return territoryComboboxOptions.filter((option) => !selected.has(option.value))
- }, [regions])
-
- const addCity = (nextCity: string) => {
- if (!nextCity) return
- if (cities.length >= MAX_NUCLEUS_CITIES) {
- setCityError(`Informe no máximo ${MAX_NUCLEUS_CITIES} municípios.`)
- setCityDraft('')
- return
- }
- setCities((current) => {
- const next = dedupeTrimmedStrings([...current, nextCity])
- if (next.length !== 1) setNeighborhoods([])
- return next
- })
- setCityDraft('')
- setCityError(undefined)
- setRegionError(undefined)
- }
-
- const removeCity = (city: string) => {
- setCities((current) => {
- const next = current.filter((item) => item !== city)
- if (next.length !== 1) setNeighborhoods([])
- return next
- })
- setCityError(undefined)
- }
-
- const addRegion = (nextRegion: string) => {
- if (!nextRegion || regionsAreDerived) return
- if (regions.length >= MAX_NUCLEUS_REGIONS) {
- setRegionError(`Informe no máximo ${MAX_NUCLEUS_REGIONS} territórios.`)
- setRegionDraft('')
- return
- }
- setRegions((current) => dedupeTrimmedStrings([...current, nextRegion]))
- setRegionDraft('')
- setRegionError(undefined)
- }
-
- const removeRegion = (region: string) => {
- if (regionsAreDerived) return
- setRegions((current) => current.filter((item) => item !== region))
- setRegionError(undefined)
- }
-
- const commitNeighborhood = (value: string) => {
- if (!neighborhoodsEnabled) {
- setNeighborhoodDraft('')
- return
- }
- const trimmed = value.trim()
- if (!trimmed) {
- setNeighborhoodDraft('')
- return
- }
- if (neighborhoods.length >= MAX_NUCLEUS_NEIGHBORHOODS) {
- setNeighborhoodError(`Informe no máximo ${MAX_NUCLEUS_NEIGHBORHOODS} bairros.`)
- setNeighborhoodDraft('')
- return
- }
- setNeighborhoods((current) => dedupeTrimmedStrings([...current, trimmed]))
- setNeighborhoodDraft('')
- setNeighborhoodError(undefined)
- }
+ const state = useCampaignTerritoryFieldsState(values)
return (
- {cities.map((city) => (
-
- ))}
- {!regionsAreDerived
- ? regions.map((region) => (
-
- ))
- : null}
- {neighborhoodsEnabled
- ? neighborhoods.map((neighborhood) => (
-
- ))
- : null}
-
-
- Territórios de identidade
- {displayRegions.length ? (
- `Remover território ${region}`}
- />
- ) : null}
- {regionsAreDerived ? (
-
- Derivados automaticamente dos municípios selecionados. Remova municípios para editar
- territórios manualmente.
-
- ) : (
- {
- if (nextRegion) addRegion(nextRegion)
- else setRegionDraft('')
- }}
- onInvalid={() => {
- setRegionError('Selecione um território de identidade válido da Bahia.')
- }}
- error={visibleRegionError}
- />
- )}
- {visibleRegionError ? (
- {visibleRegionError}
- ) : null}
-
-
-
- Municípios
- addCity(suggestion.city)}
- />
- {cities.length ? (
- `Remover município ${city}`}
- />
- ) : null}
- {
- if (nextCity) addCity(nextCity)
- else setCityDraft('')
- }}
- onInvalid={() => {
- setCityError('Selecione um município válido da Bahia.')
- }}
- error={visibleCityError}
- />
-
- Selecione um ou mais municípios. Territórios são derivados automaticamente; bairros só
- ficam disponíveis com exatamente um município.
-
- {visibleCityError ? (
- {visibleCityError}
- ) : null}
-
-
-
- Bairros
- {neighborhoodsEnabled && neighborhoods.length ? (
-
- setNeighborhoods((current) => current.filter((item) => item !== neighborhood))
- }
- removeLabel={(neighborhood) => `Remover bairro ${neighborhood}`}
- />
- ) : null}
-
- {
- setNeighborhoodDraft(event.target.value)
- setNeighborhoodError(undefined)
- }}
- onKeyDown={(event) => {
- if (event.key === 'Enter') {
- event.preventDefault()
- commitNeighborhood(neighborhoodDraft)
- } else if (
- event.key === 'Backspace' &&
- !neighborhoodDraft &&
- neighborhoods.length > 0
- ) {
- setNeighborhoods((current) => current.slice(0, -1))
- }
- }}
- onBlur={() => commitNeighborhood(neighborhoodDraft)}
- />
-
-
- Use Enter para adicionar. Disponível somente quando há exatamente um município.
-
- {visibleNeighborhoodError ? (
- {visibleNeighborhoodError}
- ) : null}
-
+
)
}
diff --git a/src/components/campaign/PrimaryContactCombobox.tsx b/src/components/campaign/PrimaryContactCombobox.tsx
index 1ba685a4..92f2bd1b 100644
--- a/src/components/campaign/PrimaryContactCombobox.tsx
+++ b/src/components/campaign/PrimaryContactCombobox.tsx
@@ -1,18 +1,8 @@
'use client'
-import { useEffect, useRef, useState } from 'react'
-import { ChevronsUpDownIcon } from 'lucide-react'
+import { useRef } from 'react'
-import { Button } from '@/components/ui/button'
-import {
- Command,
- CommandDialog,
- CommandGroup,
- CommandInput,
- CommandItem,
- CommandList,
-} from '@/components/ui/Command'
-import { Spinner } from '@/components/ui/Spinner'
+import { AsyncSearchCombobox } from '@/components/campaign/AsyncSearchCombobox'
import type {
NucleusPrimaryContactPageData,
PrimaryContactOption,
@@ -24,136 +14,36 @@ type PrimaryContactComboboxProps = {
search: (query: string) => Promise
}
-const contactLabel = (contact: PrimaryContactOption | null) =>
- contact ? `${contact.name} · ${contact.phone}` : 'Sem contato principal'
+const contactLabel = (contact: PrimaryContactOption) =>
+ `${contact.name} · ${contact.phone}`
export const PrimaryContactCombobox = ({
name,
current,
search,
}: PrimaryContactComboboxProps) => {
- const [open, setOpen] = useState(false)
- const [query, setQuery] = useState('')
- const [selected, setSelected] = useState(current)
- const [result, setResult] = useState({
- current,
- options: [],
- })
- const [loading, setLoading] = useState(false)
- const [failed, setFailed] = useState(false)
- const requestId = useRef(0)
-
- useEffect(() => {
- if (!open) return
-
- const currentRequestId = ++requestId.current
- const timeout = window.setTimeout(() => {
- setLoading(true)
- setFailed(false)
- void search(query)
- .then((nextResult) => {
- if (requestId.current !== currentRequestId) return
- setResult({
- current: nextResult.current,
- options: nextResult.options.slice(0, nextResult.current ? 99 : 100),
- })
- })
- .catch(() => {
- if (requestId.current !== currentRequestId) return
- setFailed(true)
- })
- .finally(() => {
- if (requestId.current === currentRequestId) setLoading(false)
- })
- }, 250)
-
- return () => window.clearTimeout(timeout)
- }, [open, query, search])
-
- const choose = (contact: PrimaryContactOption | null) => {
- setSelected(contact)
- setOpen(false)
- setQuery('')
- }
+ const contactsById = useRef(new Map())
+ if (current) contactsById.current.set(current.id, current)
return (
- <>
-
-
-
-
-
-
- {loading ? (
-
-
- Buscando…
-
- ) : failed ? (
-
- Não foi possível buscar as lideranças.
-
- ) : (
- <>
-
- choose(null)}>
- Sem contato principal
-
-
- {result.current ? (
-
- choose(result.current)}
- >
- {contactLabel(result.current)}
-
-
- ) : null}
- {result.options.length ? (
-
- {result.options.map((contact) => (
- choose(contact)}
- >
- {contactLabel(contact)}
-
- ))}
-
- ) : (
-
- Nenhuma liderança encontrada.
-
- )}
-
- )}
-
-
-
-
+ {
+ const result = await search(query)
+ if (result.current) contactsById.current.set(result.current.id, result.current)
+ for (const contact of result.options) contactsById.current.set(contact.id, contact)
+ const limit = result.current ? 99 : 100
+ return result.options.slice(0, limit).map((contact) => ({
+ id: contact.id,
+ label: contactLabel(contact),
+ }))
+ }}
+ pinnedOptions={current ? [{ id: current.id, label: contactLabel(current) }] : []}
+ pinnedGroupHeading="Contato atual"
+ />
)
}
diff --git a/src/utilities/actionPlanLeadershipOptions.ts b/src/utilities/actionPlanLeadershipOptions.ts
index 40d3f86b..22584258 100644
--- a/src/utilities/actionPlanLeadershipOptions.ts
+++ b/src/utilities/actionPlanLeadershipOptions.ts
@@ -2,6 +2,10 @@ import 'server-only'
import type { Payload } from 'payload'
+import {
+ isContactSearchQueryReady,
+ normalizeContactSearchQuery,
+} from '@/lib/contactSearchQuery'
import type { CampaignUser, Contact, Leadership } from '@/payload-types'
import { isPopulatedRelationship, relationshipId } from '@/utilities/relationship'
@@ -10,19 +14,44 @@ export type ActionPlanLeadershipOption = {
label: string
}
+const LEADERSHIP_SEARCH_LIMIT = 20
+
+const leadershipLabel = (leadership: Leadership): string | null => {
+ const id = relationshipId(leadership.id)
+ if (!id) return null
+ const contact = leadership.contact
+ return isPopulatedRelationship(contact) ? contact.name : `Liderança #${id}`
+}
+
/**
* Engaged leaderships visible to the actor (for linking a plan to a leadership).
* Uses overrideAccess: false so Payload row-level access applies.
*/
-export const getActionPlanLeadershipOptions = async (
+export const searchActionPlanLeadershipOptions = async (
payload: Pick,
user: CampaignUser,
+ query: string,
): Promise => {
+ const normalizedQuery = typeof query === 'string' ? query : ''
+ if (!isContactSearchQueryReady(normalizedQuery)) return []
+
+ const { trimmed, digits } = normalizeContactSearchQuery(normalizedQuery)
+
const result = await payload.find({
collection: 'leadership',
- where: { supportStatus: { equals: 'engajado' } },
+ where: {
+ and: [
+ { supportStatus: { equals: 'engajado' } },
+ {
+ or: [
+ { 'contact.name': { contains: trimmed } },
+ { 'contact.phone': { contains: digits || trimmed } },
+ ],
+ },
+ ],
+ },
depth: 1,
- limit: 200,
+ limit: LEADERSHIP_SEARCH_LIMIT,
sort: 'id',
select: {
contact: true,
@@ -36,11 +65,8 @@ export const getActionPlanLeadershipOptions = async (
.map((doc) => {
const leadership = doc as Leadership
const id = relationshipId(leadership.id)
- if (!id) return null
- const contact = leadership.contact
- const label = isPopulatedRelationship(contact)
- ? contact.name
- : `Liderança #${id}`
+ const label = leadershipLabel(leadership)
+ if (!id || !label) return null
return { id, label }
})
.filter((option): option is ActionPlanLeadershipOption => option !== null)
diff --git a/src/utilities/actionPlanPageData.ts b/src/utilities/actionPlanPageData.ts
index 8a7d2247..4b382ff3 100644
--- a/src/utilities/actionPlanPageData.ts
+++ b/src/utilities/actionPlanPageData.ts
@@ -1,11 +1,11 @@
import type { Payload } from 'payload'
import type { ActionPlan, CampaignUser } from '@/payload-types'
+import type { ActionPlanDetailTab } from '@/utilities/actionPlanDetailTabUi'
import {
- actionPlanDetailSelect,
actionPlanFormSelect,
actionPlanListSelect,
- toActionPlanDetailViewModel,
+ getActionPlanDetailSelect,
toActionPlanFormViewModel,
} from '@/utilities/actionPlanViewModels'
import {
@@ -52,16 +52,20 @@ export const loadActionPlanListPageData = async (
return { result, state }
}
+const getActionPlanDetailQueryDepth = (activeTab: ActionPlanDetailTab): number =>
+ activeTab === 'updates' ? 0 : 1
+
const loadAccessibleActionPlanBySlug = async (
payload: Pick,
user: CampaignUser,
planSlug: string,
- select: typeof actionPlanDetailSelect | typeof actionPlanFormSelect,
+ select: ReturnType | typeof actionPlanFormSelect,
+ depth: number,
): Promise => {
const result = await payload.find({
collection: 'actionPlan',
where: { slug: { equals: planSlug } },
- depth: 1,
+ depth,
limit: 1,
pagination: false,
select,
@@ -77,12 +81,14 @@ export const resolveAccessibleActionPlanContext = async (
payload: Pick,
user: CampaignUser,
planSlug: string,
+ activeTab: ActionPlanDetailTab = 'overview',
): Promise => {
const document = await loadAccessibleActionPlanBySlug(
payload,
user,
planSlug,
- actionPlanDetailSelect,
+ getActionPlanDetailSelect(activeTab),
+ getActionPlanDetailQueryDepth(activeTab),
)
return {
@@ -92,14 +98,11 @@ export const resolveAccessibleActionPlanContext = async (
}
}
-export const getActionPlanDetailPageData = (context: AccessibleActionPlanContext) =>
- toActionPlanDetailViewModel(context.document)
-
export const getActionPlanEditPageData = async (
payload: Payload,
user: CampaignUser,
planSlug: string,
) =>
toActionPlanFormViewModel(
- await loadAccessibleActionPlanBySlug(payload, user, planSlug, actionPlanFormSelect),
+ await loadAccessibleActionPlanBySlug(payload, user, planSlug, actionPlanFormSelect, 1),
)
diff --git a/src/utilities/actionPlanViewModels.ts b/src/utilities/actionPlanViewModels.ts
index a05b48a0..21b5ccb4 100644
--- a/src/utilities/actionPlanViewModels.ts
+++ b/src/utilities/actionPlanViewModels.ts
@@ -1,4 +1,5 @@
import type { ActionPlan, CampaignUser, Contact } from '@/payload-types'
+import type { ActionPlanDetailTab } from '@/utilities/actionPlanDetailTabUi'
import { isPopulatedRelationship, relationshipId } from '@/utilities/relationship'
const asStringArray = (value: string[] | null | undefined): string[] =>
@@ -175,7 +176,7 @@ export const toActionPlanFormViewModel = (plan: ActionPlan): ActionPlanFormViewM
})),
})
-export const actionPlanDetailSelect = {
+export const actionPlanDetailContextSelect = {
title: true,
slug: true,
kind: true,
@@ -191,13 +192,31 @@ export const actionPlanDetailSelect = {
territoryNotes: true,
coordinators: true,
responsible: true,
- tasks: true,
- updates: true,
createdBy: true,
updatedAt: true,
createdAt: true,
} as const
+export const getActionPlanDetailSelect = (activeTab: ActionPlanDetailTab) => {
+ if (activeTab === 'overview') {
+ return {
+ ...actionPlanDetailContextSelect,
+ taskDoneCount: true,
+ taskTotal: true,
+ } as const
+ }
+ if (activeTab === 'tasks') {
+ return {
+ ...actionPlanDetailContextSelect,
+ tasks: true,
+ } as const
+ }
+ return {
+ ...actionPlanDetailContextSelect,
+ updates: true,
+ } as const
+}
+
export type ActionPlanTaskViewModel = {
id: string | null
title: string
@@ -234,6 +253,7 @@ export type ActionPlanDetailViewModel = {
coordinators: Array<{ id: number; name: string }>
responsibleId: number | null
responsibleName: string | null
+ taskProgress: { done: number; total: number }
tasks: ActionPlanTaskViewModel[]
updates: ActionPlanUpdateViewModel[]
createdByName: string | null
@@ -241,7 +261,38 @@ export type ActionPlanDetailViewModel = {
createdAt: string
}
-export const toActionPlanDetailViewModel = (plan: ActionPlan): ActionPlanDetailViewModel => ({
+const mapActionPlanTasks = (plan: ActionPlan): ActionPlanTaskViewModel[] =>
+ (plan.tasks ?? []).map((task) => ({
+ id: task.id ?? null,
+ title: task.title,
+ responsibleId: relationshipId(task.responsible),
+ responsibleName: relationshipName(task.responsible),
+ due: task.due ?? null,
+ done: Boolean(task.done),
+ doneAt: task.doneAt ?? null,
+ }))
+
+export const mapActionPlanUpdates = (
+ plan: ActionPlan,
+ authorNamesById: ReadonlyMap = new Map(),
+): ActionPlanUpdateViewModel[] =>
+ (plan.updates ?? []).map((update) => {
+ const authorId = relationshipId(update.author)
+ const populatedName = relationshipName(update.author)
+ return {
+ id: update.id ?? null,
+ body: update.body,
+ authorName:
+ populatedName ?? (authorId ? (authorNamesById.get(authorId) ?? null) : null),
+ createdAt: update.createdAt ?? null,
+ }
+ })
+
+export const toActionPlanDetailViewModel = (
+ plan: ActionPlan,
+ activeTab: ActionPlanDetailTab = 'overview',
+ authorNamesById: ReadonlyMap = new Map(),
+): ActionPlanDetailViewModel => ({
id: plan.id,
title: plan.title,
slug: plan.slug,
@@ -265,21 +316,13 @@ export const toActionPlanDetailViewModel = (plan: ActionPlan): ActionPlanDetailV
.map(({ id, name }) => ({ id, name })) ?? [],
responsibleId: relationshipId(plan.responsible),
responsibleName: relationshipName(plan.responsible),
- tasks: (plan.tasks ?? []).map((task) => ({
- id: task.id ?? null,
- title: task.title,
- responsibleId: relationshipId(task.responsible),
- responsibleName: relationshipName(task.responsible),
- due: task.due ?? null,
- done: Boolean(task.done),
- doneAt: task.doneAt ?? null,
- })),
- updates: (plan.updates ?? []).map((update) => ({
- id: update.id ?? null,
- body: update.body,
- authorName: relationshipName(update.author),
- createdAt: update.createdAt ?? null,
- })),
+ taskProgress: {
+ done: plan.taskDoneCount ?? 0,
+ total: plan.taskTotal ?? 0,
+ },
+ tasks: activeTab === 'tasks' ? mapActionPlanTasks(plan) : [],
+ updates:
+ activeTab === 'updates' ? mapActionPlanUpdates(plan, authorNamesById) : [],
createdByName: relationshipName(plan.createdBy),
updatedAt: plan.updatedAt,
createdAt: plan.createdAt,