Feature/member domain model v2 by strawberri16 · Pull Request #48 · UoaWDCC/lug

strawberri16 · 2026-05-14T00:35:35Z

added the member registration domain types!

…update

…mber-domain-model-v2

…oaWDCC/lug into feature/member-domain-model-v2

WilliamTayNZ

Good work, this is almost there!

There's just a few changes and improvements we could do, so I've left some comments :D

WilliamTayNZ · 2026-05-15T07:26:01Z

@@ -1,2 +1,57 @@
-// Vedanti will develop this
-// If you are doing the validation task, I will provide you with the expected domain shape
+export type LinuxSkillLevel =


The LinuxSkillLevel, PotentialInvolvement, YearLevel are generally good, this comment is more nitpicky.

We want to capitalise the values in the types, this is not strictly necessary, but these correspond to enums in Prisma, and it is convention for enum values in Prisma to be capitalised, so we prefer the domain to match this.

Would also prefer to use these names for the values (very nitpicky)

LinuxSkillLevel: "NOTHING", "AWARE_OF_EXISTENCE", "BEGINNER_USER", "REGULAR_USER", "POWER_USER", "CONTRIBUTOR"

PotentialInvolvement: "ATTENDING", "SPEAKING", "EXECUTIVE", "PROJECTS"

YearLevel: "FIRST_YEAR", "SECOND_YEAR", "THIRD_YEAR", "FOURTH_YEAR", "FIFTH_YEAR_OR_LATER", "POSTGRADUATE"

WilliamTayNZ · 2026-05-15T08:17:46Z

+  | "other";
+
+//shared base fields present on every registration path
+export type BaseMemberRegistration = {


This is good, but one field is missing! (and its an optional field)

Can we also leave an empty line after the email field? (very nitpicky)

WilliamTayNZ · 2026-05-15T08:20:59Z

+  potentialInvolvement: PotentialInvolvement[];
+};
+
+//case1: if memeber is returning - Registration path 1


For the 3 cases, use the same field names as the updated Prisma schema (isCurrentUoaStudent, primaryAffiliation) etc. Otherwise the structure is good!

WilliamTayNZ

Better, still a number of changes we should make and I've explained them as well.

The main thing to note is this: the domain types should be stricter than the Prisma model. Prisma has nullable fields because all registration paths are stored in one table, but each registration type should require the fields needed for that path.

Otherwise good stuff, let's get this PR finished soon 🔥

Also, after you make your changes, do merge the main branch into this branch. This is a good habit as it ensures your changes are compatible with the current main branch of the repository. For this PR, these changes shouldn't really affect the current main branch, but this is a good practice to make a habit.

WilliamTayNZ · 2026-05-26T10:54:34Z

+  upi?: string;
+  studentId?: string;
+  faculty: string[];
+  programme?: string;


Current UoA students are required to provide their programme, so this field should be required for this path

programme made required! stupid mistake on my end!

WilliamTayNZ · 2026-05-26T10:55:48Z

+export type NonCurrentUoaStudentMember = BaseMemberRegistration & {
+  memberType: "NON_CURRENT_UOA_STUDENT";
+  isCurrentUoaStudent: false;
+  primaryAffiliation?: string;


Non-current UoA students are required to give their primary affiliation.

In the Prisma schema, this is optional because the other 2 registration paths don't need to provide it. But for this path, it is required.

made required!

WilliamTayNZ · 2026-05-26T10:57:28Z

+
+// Case 2: Current UoA student - Registration path 2
+export type CurrentUoaStudentMember = BaseMemberRegistration & {
+  memberType: "CURRENT_UOA_STUDENT";


As above, we don't want to use a memberType field here.

We should use isConditionalReturningMember: false here, this makes the union stricter and clearly differentiates this path from the conditional returning member path.

removed and made changes!

WilliamTayNZ · 2026-05-26T10:57:56Z

+
+// Case 3: Non-current UoA student - Registration path 3
+export type NonCurrentUoaStudentMember = BaseMemberRegistration & {
+  memberType: "NON_CURRENT_UOA_STUDENT";


Same as above, memberType should be removed and this should include isConditionalReturningMember: false so the union clearly models the three mutually exclusive registration paths

removed and included!

WilliamTayNZ · 2026-05-26T10:58:46Z

+  lastName: string;
+  email: string;
+
+  discordUsername?: string; //the missing field


awesome, can we remove this comment for merging? the committed domain model should only have comments that explain the model itself

removed! :))

WilliamTayNZ · 2026-05-26T10:59:06Z

+  | "THIRD_YEAR"
+  | "FOURTH_YEAR"
+  | "FIFTH_YEAR_OR_LATER"
+  | "GRADUATED_WITHIN_2_YEARS"; // was "POSTGRADUATE" - corrected using the Prisma schema


good catch - can we remove this comment too?

removed comments :))

WilliamTayNZ · 2026-05-26T11:03:54Z

@@ -0,0 +1,17 @@
+export interface Member {


This file is not needed, so can we delete it :)

WilliamTayNZ

good work! functionally everything is perfect now

just a minor nitpick for the comments on the 3 different cases:

Can we change "Case 1: Returning member" to "Case 1: Conditional returning member" to make it clear it's not just any returning member?
Can we remove "- Registration path 1", "- Registration path 2", "- Registration path 3" for each comment, so they become just "Case 1: Returning member", "Case 2: Current UoA student", "Case 3: Not a current UoA student"?

strawberri16 and others added 7 commits April 29, 2026 22:55

added the member domain model-attemp-2

f42649a

feat(database): update Prisma member schema and create migration

6284d18

fix(admin-members): removed original admin placeholder due to schema …

aff4f4a

…update

Merge branch 'main' of https://github.com/UoaWDCC/lug into feature/me…

861ac88

…mber-domain-model-v2

added Member Registration domain types

d6922c7

added member registration domain types

95ce9f3

Merge branch 'feature/member-domain-model-v2' of https://github.com/U…

cae0742

…oaWDCC/lug into feature/member-domain-model-v2

WilliamTayNZ requested changes May 15, 2026

View reviewed changes

strawberri16 added 2 commits May 21, 2026 20:21

feat(member): define registration domain types

282500c

feat(member): fixed the registration types

c195183

WilliamTayNZ requested changes May 26, 2026

View reviewed changes

strawberri16 added 2 commits May 28, 2026 10:12

cleaned up code per PR review

1e33ed3

Merge branch 'main' into feature/member-domain-model-v2

5b8fb30

WilliamTayNZ requested changes May 28, 2026

View reviewed changes

Conversation

strawberri16 commented May 14, 2026

Uh oh!

WilliamTayNZ left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WilliamTayNZ left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

strawberri16 May 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WilliamTayNZ left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

strawberri16 May 27, 2026 •

edited

Loading