wlinator/tux
1
Fork 0
mirror of https://github.com/allthingslinux/tux.git synced 2024-10-02 16:43:12 +00:00
Code Issues Releases Wiki Activity

refactor(schema.prisma, case.py, note.py): rename 'target' to 'user' for better clarity

Browse source 
- 'case_target_id' and 'note_target_id' renamed to 'case_user_id' and 'note_user_id' respectively
- 'case_target_roles' renamed to 'case_user_roles'
- All related function names and parameters updated to reflect these changes
This commit is contained in:
kzndotsh 2024-08-27 10:31:49 +00:00
parent bdcf8087c9
commit ebc652ce1c
3 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
prisma/schema.prisma
View file

@ -88,8 +88,8 @@ model Case {
case_type CaseType
case_reason String
case_moderator_id BigInt
case_target_id BigInt
case_target_roles BigInt[] @default([]) // Role IDs for the jailed user
case_user_id BigInt
case_user_roles BigInt[] @default([]) // Role IDs for the jailed user
case_number BigInt? // Incremented for each case per guild via a trigger/function
case_created_at DateTime? @default(now())
case_expires_at DateTime? // For temporary bans and timeouts
@ -120,7 +120,7 @@ model Note {
note_content String
note_created_at DateTime @default(now())
note_moderator_id BigInt
note_target_id BigInt
note_user_id BigInt
note_number BigInt? // Incremented for each note per guild via a trigger/function
guild_id BigInt
guild Guild @relation(fields: [guild_id], references: [guild_id])

28
tux/database/controllers/case.py
View file

@ -37,11 +37,11 @@ class CaseController:
async def insert_case(
self,
guild_id: int,
case_target_id: int,
case_user_id: int,
case_moderator_id: int,
case_type: CaseType,
case_reason: str,
case_target_roles: list[int] | None = None,
case_user_roles: list[int] | None = None,
case_expires_at: datetime | None = None,
) -> Case:
"""
@ -51,7 +51,7 @@ class CaseController:
----------
guild_id : int
The ID of the guild to insert the case into.
case_target_id : int
case_user_id : int
The ID of the target of the case.
case_moderator_id : int
The ID of the moderator of the case.
@ -59,7 +59,7 @@ class CaseController:
The type of the case.
case_reason : str
The reason for the case.
case_target_roles : list[int] | None
case_user_roles : list[int] | None
The roles of the target of the case.
case_expires_at : datetime | None
The expiration date of the case.
@ -74,12 +74,12 @@ class CaseController:
return await self.table.create(
data={
"guild_id": guild_id,
"case_target_id": case_target_id,
"case_user_id": case_user_id,
"case_moderator_id": case_moderator_id,
"case_type": case_type,
"case_reason": case_reason,
"case_expires_at": case_expires_at,
"case_target_roles": case_target_roles if case_target_roles is not None else [],
"case_user_roles": case_user_roles if case_user_roles is not None else [],
},
)
@ -146,7 +146,11 @@ class CaseController:
"""
return await self.table.find_first(where={"guild_id": guild_id, "case_number": case_number})
async def get_all_cases_by_target_id(self, guild_id: int, case_target_id: int) -> list[Case]:
async def get_all_cases_by_user_id(
self,
guild_id: int,
case_user_id: int,
) -> list[Case]:
"""
Get all cases for a target in a guild.
@ -154,7 +158,7 @@ class CaseController:
----------
guild_id : int
The ID of the guild to get cases for.
case_target_id : int
case_user_id : int
The ID of the target to get cases for.
Returns
@ -163,7 +167,7 @@ class CaseController:
A list of cases for the target in the guild.
"""
return await self.table.find_many(
where={"guild_id": guild_id, "case_target_id": case_target_id},
where={"guild_id": guild_id, "case_user_id": case_user_id},
order={"case_created_at": "desc"},
)
@ -209,13 +213,13 @@ class CaseController:
order={"case_created_at": "desc"},
)
async def get_last_jail_case_by_target_id(
async def get_last_jail_case_by_user_id(
self,
guild_id: int,
case_target_id: int,
case_user_id: int,
) -> Case | None:
return await self.table.find_first(
where={"guild_id": guild_id, "case_target_id": case_target_id, "case_type": CaseType.JAIL},
where={"guild_id": guild_id, "case_user_id": case_user_id, "case_type": CaseType.JAIL},
order={"case_created_at": "desc"},
)

26
tux/database/controllers/note.py
View file

@ -21,7 +21,7 @@ class NoteController:
async def insert_note(
self,
note_target_id: int,
note_user_id: int,
note_moderator_id: int,
note_content: str,
guild_id: int,
@ -30,7 +30,7 @@ class NoteController:
return await self.table.create(
data={
"note_target_id": note_target_id,
"note_user_id": note_user_id,
"note_moderator_id": note_moderator_id,
"note_content": note_content,
"guild_id": guild_id,
@ -46,8 +46,8 @@ class NoteController:
data={"note_content": note_content},
)
async def get_notes_by_target_id(self, target_id: int) -> list[Note]:
return await self.table.find_many(where={"note_target_id": target_id})
async def get_notes_by_user_id(self, note_user_id: int) -> list[Note]:
return await self.table.find_many(where={"note_user_id": note_user_id})
async def get_notes_by_moderator_id(self, moderator_id: int) -> list[Note]:
return await self.table.find_many(where={"note_moderator_id": moderator_id})
@ -55,12 +55,12 @@ class NoteController:
async def get_notes_by_guild_id(self, guild_id: int) -> list[Note]:
return await self.table.find_many(where={"guild_id": guild_id})
async def get_notes_by_target_id_and_guild_id(
async def get_notes_by_user_id_and_guild_id(
self,
target_id: int,
note_user_id: int,
guild_id: int,
) -> list[Note]:
return await self.table.find_many(where={"note_target_id": target_id, "guild_id": guild_id})
return await self.table.find_many(where={"note_user_id": note_user_id, "guild_id": guild_id})
async def get_notes_by_moderator_id_and_guild_id(
self,
@ -71,24 +71,24 @@ class NoteController:
where={"note_moderator_id": moderator_id, "guild_id": guild_id},
)
async def get_notes_by_target_id_and_moderator_id(
async def get_notes_by_user_id_and_moderator_id(
self,
target_id: int,
user_id: int,
moderator_id: int,
) -> list[Note]:
return await self.table.find_many(
where={"note_target_id": target_id, "note_moderator_id": moderator_id},
where={"note_user_id": user_id, "note_moderator_id": moderator_id},
)
async def get_notes_by_target_id_moderator_id_and_guild_id(
async def get_notes_by_user_id_moderator_id_and_guild_id(
self,
target_id: int,
user_id: int,
moderator_id: int,
guild_id: int,
) -> list[Note]:
return await self.table.find_many(
where={
"note_target_id": target_id,
"note_user_id": user_id,
"note_moderator_id": moderator_id,
"guild_id": guild_id,
},