Adjust age limit#1319
Merged
joshunrau merged 12 commits intoDouglasNeuroInformatics:mainfrom Mar 25, 2026
Merged
Conversation
Contributor
|
Warning Rate limit exceeded
⌛ How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. 🚦 How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. ℹ️ Review info⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (3)
WalkthroughAdded configurable minimum-age settings to group configuration: new Changes
Sequence Diagram(s)sequenceDiagram
participant Admin as Group Admin (UI)
participant Manage as Manage Group Route
participant API as API Server
participant DB as Database (Prisma)
participant User as Session Starter (UI)
participant StartForm as StartSessionForm
Admin->>Manage: submit minimumAge + minimumAgeApplied
Manage->>API: POST updated group settings
API->>DB: persist Group.settings (minimumAge, minimumAgeApplied)
DB-->>API: confirmation
API-->>Manage: success
User->>StartForm: open session form
StartForm->>API: fetch group + settings
API->>DB: read Group.settings
DB-->>API: return settings
API-->>StartForm: settings (minimumAge, minimumAgeApplied)
StartForm->>StartForm: compute MIN_DATE_OF_BIRTH if applied
User->>StartForm: submit DOB
StartForm->>StartForm: validate DOB against MIN_DATE_OF_BIRTH (if present)
StartForm-->>API: create session (if valid)
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes 🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 3
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
apps/web/src/routes/_app/group/manage.tsx (1)
196-211:⚠️ Potential issue | 🟠 MajorRequire
minimumAgewhen the toggle is enabled.This schema can submit
minimumAgeApplied: truewith nominimumAge, and the payload forwards that state unchanged. The session form later treats that like a 0-year cutoff, so the rule silently stops enforcing anything.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@apps/web/src/routes/_app/group/manage.tsx` around lines 196 - 211, The schema currently allows minimumAgeApplied: true without a minimumAge; update the Zod schema (the object that defines minimumAge and minimumAgeApplied) so that when minimumAgeApplied is true minimumAge is required and must satisfy the positive int constraint. Implement this by adding a conditional/refinement on the full object (e.g. .refine(data => !data.minimumAgeApplied || data.minimumAge != null, { message: "minimumAge is required when minimumAgeApplied is true", path: ["minimumAge"] }) or .superRefine) to the schema that defines minimumAge and minimumAgeApplied, and keep onSubmit (the object assembled for submission in onSubmit) unchanged so it forwards a guaranteed valid minimumAge when minimumAgeApplied is true.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@apps/web/src/components/StartSessionForm/StartSessionForm.tsx`:
- Around line 181-195: subjectDateOfBirth currently remains optional so users
selecting CUSTOM_ID can skip DOB; change the validation so DOB is required
whenever the group minimum-age is active (MIN_DATE_OF_BIRTH /
currentGroup?.settings.minimumAge is set). Replace the .optional() behavior with
a refine that first enforces presence when MIN_DATE_OF_BIRTH exists (e.g.,
return false if MIN_DATE_OF_BIRTH && !date) and then checks date <=
MIN_DATE_OF_BIRTH; update the refine error message accordingly so the schema for
subjectDateOfBirth (and any logic that checks CUSTOM_ID) will fail when DOB is
missing while the age limit is enabled.
- Around line 181-195: The server is missing age validation for
subjectData.dateOfBirth when creating sessions; update sessionsService.create to
enforce group.settings.minimumAge after you load the group (or alternatively add
a context-aware refinement to $CreateSessionData if you propagate group info
into validation). Specifically, after retrieving group in
sessionsService.create, if subjectData.dateOfBirth and group.settings.minimumAge
are present compute a cutoff date = today minus group.settings.minimumAge years
and if subjectData.dateOfBirth is after that cutoff (i.e. subject is too young)
throw a clear bad-request/validation error (e.g., TRPCError with code
'BAD_REQUEST' or a ValidationError) with the same message used client-side
("Subject must be above age of ...") so server-side behavior matches the client.
In `@apps/web/src/routes/_app/group/manage.tsx`:
- Around line 35-37: The form's initialValues (constructed in the useMemo block)
doesn't copy currentGroup.settings.minimumAge or minimumAgeApplied, so existing
groups render blank; update the initialValues object inside useMemo to read from
currentGroup.settings.minimumAge and currentGroup.settings.minimumAgeApplied
(falling back to defaults as other fields do) so the form controls reflect saved
values, and apply the same change to the other initialValues construction
referenced around the other useMemo/initialization area that builds the form
state (ensure you update the same keys: minimumAge and minimumAgeApplied).
---
Outside diff comments:
In `@apps/web/src/routes/_app/group/manage.tsx`:
- Around line 196-211: The schema currently allows minimumAgeApplied: true
without a minimumAge; update the Zod schema (the object that defines minimumAge
and minimumAgeApplied) so that when minimumAgeApplied is true minimumAge is
required and must satisfy the positive int constraint. Implement this by adding
a conditional/refinement on the full object (e.g. .refine(data =>
!data.minimumAgeApplied || data.minimumAge != null, { message: "minimumAge is
required when minimumAgeApplied is true", path: ["minimumAge"] }) or
.superRefine) to the schema that defines minimumAge and minimumAgeApplied, and
keep onSubmit (the object assembled for submission in onSubmit) unchanged so it
forwards a guaranteed valid minimumAge when minimumAgeApplied is true.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: a6052e26-5785-4262-8c4e-a87bc5c2f719
📒 Files selected for processing (4)
apps/api/prisma/schema.prismaapps/web/src/components/StartSessionForm/StartSessionForm.tsxapps/web/src/routes/_app/group/manage.tsxpackages/schemas/src/group/group.ts
Contributor
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
apps/web/src/routes/_app/group/manage.tsx (1)
189-198:⚠️ Potential issue | 🟠 MajorAlign the schema with the new nullable settings.
initialValuesnow carriesnullforminimumAge,minimumAgeApplied, andsubjectIdDisplayLength, but the validation schema still uses.optional(), which rejectsnullin Zod v3. This breaks the ability to clear these settings and prevents validation of persistednullvalues. Additionally, there's no constraint ensuringminimumAgeApplied: truerequiresminimumAge != null.Suggested fix
- validationSchema={z.object({ + validationSchema={z + .object({ accessibleFormInstrumentIds: z.set(z.string()), accessibleInteractiveInstrumentIds: z.set(z.string()), defaultIdentificationMethod: $SubjectIdentificationMethod.optional(), idValidationRegex: $RegexString.optional(), idValidationRegexErrorMessageEn: z.string().optional(), idValidationRegexErrorMessageFr: z.string().optional(), - minimumAge: z.number().int().positive().optional(), - minimumAgeApplied: z.boolean().optional(), - subjectIdDisplayLength: z.number().int().min(1).optional() - })} + minimumAge: z.number().int().positive().nullish(), + minimumAgeApplied: z.boolean().nullish(), + subjectIdDisplayLength: z.number().int().min(1).nullish() + }) + .refine((values) => !values.minimumAgeApplied || values.minimumAge != null, { + message: t({ + en: 'Minimum age is required when the setting is enabled', + fr: "L'âge minimum est requis lorsque le paramètre est activé" + }), + path: ['minimumAge'] + })}🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@apps/web/src/routes/_app/group/manage.tsx` around lines 189 - 198, The Zod schema in validationSchema must accept nulls and enforce the dependency rule: change minimumAge, minimumAgeApplied, and subjectIdDisplayLength to accept null by using .nullable() (e.g., minimumAge: z.number().int().positive().nullable(), minimumAgeApplied: z.boolean().nullable(), subjectIdDisplayLength: z.number().int().min(1).nullable()), and add a refinement (use .superRefine or .refine) on the top-level object to ensure that when minimumAgeApplied === true the minimumAge is not null (and is a valid number); update the validationSchema object accordingly.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Outside diff comments:
In `@apps/web/src/routes/_app/group/manage.tsx`:
- Around line 189-198: The Zod schema in validationSchema must accept nulls and
enforce the dependency rule: change minimumAge, minimumAgeApplied, and
subjectIdDisplayLength to accept null by using .nullable() (e.g., minimumAge:
z.number().int().positive().nullable(), minimumAgeApplied:
z.boolean().nullable(), subjectIdDisplayLength:
z.number().int().min(1).nullable()), and add a refinement (use .superRefine or
.refine) on the top-level object to ensure that when minimumAgeApplied === true
the minimumAge is not null (and is a valid number); update the validationSchema
object accordingly.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: b649ce3e-ed4e-44ed-a0dd-74bd1697499e
📒 Files selected for processing (1)
apps/web/src/routes/_app/group/manage.tsx
joshunrau
requested changes
Mar 25, 2026
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (1)
apps/api/prisma/schema.prisma (1)
102-102: Optional: AddminimumAgeAppliedto PrismaGroupSettingsfor schema consistency.The web layer uses
minimumAgeAppliedas an explicit boolean flag, but Prisma only storesminimumAge. The app works correctly by deriving the flag from whetherminimumAgeis set (line 266 in manage.tsx), but addingminimumAgeAppliedto the schema would make the design explicit rather than implicit.Suggested addition
type GroupSettings { defaultIdentificationMethod SubjectIdentificationMethod idValidationRegex String? idValidationRegexErrorMessage ErrorMessage? subjectIdDisplayLength Int? minimumAge Int? + minimumAgeApplied Boolean? }🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@apps/api/prisma/schema.prisma` at line 102, Add an explicit optional boolean field minimumAgeApplied to the Prisma model GroupSettings to match the web layer's flag (in addition to the existing minimumAge Int?), update any generated Prisma types by running a migration/generate step, and adjust code that constructs/reads GroupSettings (e.g., places that set or derive minimumAgeApplied such as the logic referenced in manage.tsx) to read/write the new boolean instead of inferring it solely from minimumAge where appropriate.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@apps/api/prisma/schema.prisma`:
- Line 102: Add an explicit optional boolean field minimumAgeApplied to the
Prisma model GroupSettings to match the web layer's flag (in addition to the
existing minimumAge Int?), update any generated Prisma types by running a
migration/generate step, and adjust code that constructs/reads GroupSettings
(e.g., places that set or derive minimumAgeApplied such as the logic referenced
in manage.tsx) to read/write the new boolean instead of inferring it solely from
minimumAge where appropriate.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository UI
Review profile: CHILL
Plan: Pro
Run ID: acd5698d-3c8f-484b-8502-390fd09f6ee3
📒 Files selected for processing (1)
apps/api/prisma/schema.prisma
joshunrau
approved these changes
Mar 25, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Allows group managers to adjust the minimum age requirement for subjects via the group management form
Removes the current default age minimum of 18
closes issue #1314
Summary by CodeRabbit