ictgilde/fiber-package
84
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Tiago Scholten 2026-07-27 16:45:10 +02:00
parent 4fd9b5e099
commit 664fe2a50a
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fiber_package/entity/person.py
View File

@ -39,13 +39,8 @@ class PersonModel(FiberBaseModel):
@model_validator(mode="after") @model_validator(mode="after")
def generate_full_name(self) -> Self: def generate_full_name(self) -> Self:
full_name = self.first_name full_name = self.first_name
<<<<<<< HEAD
if self.infix:
full_name += " " + self.infix
=======
if self.infix_name: if self.infix_name:
full_name += " " + self.infix_name full_name += " " + self.infix_name
>>>>>>> tiago/db_structure
full_name += " " + self.last_name full_name += " " + self.last_name
self.full_name = full_name self.full_name = full_name
return self return self

17
src/fiber_package/system/association.py
View File

@ -1,17 +0,0 @@
from fiber_package.base import FiberBaseModel
from fiber_package.refs import EntityRefList, CommitteeRefList, GuildRefList
class AssociationModel(FiberBaseModel):
full_name: str
members: EntityRefList
alumni: EntityRefList
extern: EntityRefList
committees: CommitteeRefList
guilds: GuildRefList
# TODO: also add former_members, alumns, etc... ?
# events: GroupList
# activities: GroupList
# mailings: GroupList