added associate membership status

src/fiber_package/entity/associate.py

@@ -0,0 +1,16 @@
+from pydantic import Field
+
+from .person import PersonModel
+from .submodels import Address, LoginInfo
+from .enums import Study
+
+# An associate is someone who frequents activities & receives weekly mailing
+# However this person is not a full member, so no GMM rights
+# Combines concepts of "Nano-science" from DLF and "Activity-goer" from Kaiser
+
+class AssociateModel(PersonModel):
+    # optional fields are now required for associates & members
+    login: LoginInfo
+    address: Address
+
+

src/fiber_package/entity/enums.py

@@ -8,3 +8,11 @@ class Gender(StrEnum):
     male = "m"
     female = "f"
     nonbinary = "n"
+
+class Study(StrEnum):
+    bsc_math = "Bachelor Mathematics"
+    bsc_phys = "Bachelor Physics"
+    bsc_dsai = "Bachelor Data Science & AI"
+    msc_math = "Master Mathematics"
+    msc_phys = "Master Physics"
+    min_dsai = "Minor Data Science & AI"

src/fiber_package/entity/member.py

@@ -1,19 +1,16 @@
 from pydantic import Field
 
-from .person import PersonModel
+from .associate import AssociateModel
 from .submodels import Address, LoginInfo
+from .enums import Study
 
-class MemberModel(PersonModel):
+class MemberModel(AssociateModel):
-    login: LoginInfo
+    study: list[Study] = Field(default_factory=list)
-    address: Address
     contribution_paid: bool = False
-    active_member: bool = False
+    active_member_override: bool = False
-    studying: bool = False
 
     # preferences
     receive_company_mail: bool = True
-    receive_spam_mail: bool = True
+    receive_physical_mail: bool = True
     in_physical_almanac: bool = False
-    # IT stuff
+
-    shell: str = "/bin/bash"  # TODO: support other shells?
-    mail_token: str | None = None

src/fiber_package/entity/non_members.py

@@ -2,8 +2,7 @@
 from .person import PersonModel
 
 class AlumnModel(PersonModel):
-    graduated: bool = False
+    pass
-    receive_spam_mail: bool = True
 
 class ExternalModel(PersonModel):
     pass

src/fiber_package/membership_tag.py

@@ -6,7 +6,7 @@ BARE_TAGS = ["public"]
 
 class Membership(StrEnum):
     member = "member"
-    activity_goer = "activity_goer"
+    associate = "associate"
     alumn = "alumn"
     # extern is linked to association A if they ever visisted an activity of association A
     extern = "extern"

src/fiber_package/root.py

@@ -1,5 +0,0 @@
-from fiber_package.base import FiberBaseModel
-from fiber_package.refs import AssociationRefList, EntityRefList
-
-class RootGroupModel(FiberBaseModel):
-    sys_admins: EntityRefList