Skip to content

Commit bcc20f3

Browse files
committed
ref(adapters): remove chat_id from logs
1 parent 976f351 commit bcc20f3

File tree

3 files changed

+19
-62
lines changed

3 files changed

+19
-62
lines changed

src/ttt/infrastructure/adapters/invitation_to_game_log.py

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ async def invitation_self_to_game(
4545
) -> None:
4646
await self._logger.ainfo(
4747
"invitation_self_to_game",
48-
chat_id=user.id,
4948
user_id=user.id,
5049
)
5150

@@ -56,10 +55,9 @@ async def user_invited_other_user_to_game(
5655
) -> None:
5756
await self._logger.ainfo(
5857
"user_invited_other_user_to_game",
59-
chat_id=invitation_to_game.inviting_user.id,
6058
user_id=invitation_to_game.inviting_user.id,
6159
invited_user_id=invitation_to_game.invited_user.id,
62-
invitation_to_game_id=invitation_to_game.id_,
60+
invitation_to_game_id=invitation_to_game.id_.hex,
6361
)
6462

6563
async def double_invitation_to_game(
@@ -69,9 +67,9 @@ async def double_invitation_to_game(
6967
) -> None:
7068
await self._logger.ainfo(
7169
"double_invitation_to_game",
72-
chat_id=invitation_to_game.inviting_user.id,
7370
user_id=invitation_to_game.inviting_user.id,
7471
invited_user_id=invitation_to_game.invited_user.id,
72+
invitation_to_game_id=invitation_to_game.id_.hex,
7573
)
7674

7775
async def invitation_to_game_is_not_active_to_cancel(
@@ -82,9 +80,8 @@ async def invitation_to_game_is_not_active_to_cancel(
8280
) -> None:
8381
await self._logger.ainfo(
8482
"invitation_to_game_is_not_active_to_cancel",
85-
chat_id=user_id,
8683
user_id=user_id,
87-
invitation_to_game_id=invitation_to_game.id_,
84+
invitation_to_game_id=invitation_to_game.id_.hex,
8885
invitation_to_game_state=invitation_to_game_state_in_log(
8986
invitation_to_game.state,
9087
),
@@ -98,9 +95,8 @@ async def user_is_not_inviting_user_to_cancel_invitation_to_game(
9895
) -> None:
9996
await self._logger.ainfo(
10097
"user_is_not_inviting_user_to_cancel_invitation_to_game",
101-
chat_id=user_id,
10298
user_id=user_id,
103-
invitation_to_game_id=invitation_to_game.id_,
99+
invitation_to_game_id=invitation_to_game.id_.hex,
104100
)
105101

106102
async def invitation_to_game_is_not_active_to_reject(
@@ -111,9 +107,8 @@ async def invitation_to_game_is_not_active_to_reject(
111107
) -> None:
112108
await self._logger.ainfo(
113109
"invitation_to_game_is_not_active_to_reject",
114-
chat_id=user_id,
115110
user_id=user_id,
116-
invitation_to_game_id=invitation_to_game.id_,
111+
invitation_to_game_id=invitation_to_game.id_.hex,
117112
invitation_to_game_state=invitation_to_game_state_in_log(
118113
invitation_to_game.state,
119114
),
@@ -127,9 +122,8 @@ async def user_is_not_invited_user_to_reject_invitation_to_game(
127122
) -> None:
128123
await self._logger.ainfo(
129124
"user_is_not_invited_user_to_reject_invitation_to_game",
130-
chat_id=user_id,
131125
user_id=user_id,
132-
invitation_to_game_id=invitation_to_game.id_,
126+
invitation_to_game_id=invitation_to_game.id_.hex,
133127
)
134128

135129
async def invitation_to_game_is_not_active_to_accept(
@@ -140,9 +134,8 @@ async def invitation_to_game_is_not_active_to_accept(
140134
) -> None:
141135
await self._logger.ainfo(
142136
"invitation_to_game_is_not_active_to_accept",
143-
chat_id=user_id,
144137
user_id=user_id,
145-
invitation_to_game_id=invitation_to_game.id_,
138+
invitation_to_game_id=invitation_to_game.id_.hex,
146139
invitation_to_game_state=invitation_to_game_state_in_log(
147140
invitation_to_game.state,
148141
),
@@ -156,10 +149,9 @@ async def user_is_not_invited_user_to_accept_invitation_to_game(
156149
) -> None:
157150
await self._logger.ainfo(
158151
"user_is_not_invited_user_to_accept_invitation_to_game",
159-
chat_id=user_id,
160152
user_id=user_id,
161153
invited_user_id=invitation_to_game.invited_user.id,
162-
invitation_to_game_id=invitation_to_game.id_,
154+
invitation_to_game_id=invitation_to_game.id_.hex,
163155
)
164156

165157
async def users_already_in_game_to_accept_invitation_to_game(
@@ -170,9 +162,8 @@ async def users_already_in_game_to_accept_invitation_to_game(
170162
) -> None:
171163
await self._logger.ainfo(
172164
"users_already_in_game_to_accept_invitation_to_game",
173-
chat_id=invitation_to_game.invited_user.id,
174165
user_id=invitation_to_game.invited_user.id,
175-
invitation_to_game_id=invitation_to_game.id_,
166+
invitation_to_game_id=invitation_to_game.id_.hex,
176167
is_invited_user_in_game=(
177168
invitation_to_game.invited_user in users_in_game
178169
),
@@ -188,9 +179,8 @@ async def user_cancelled_invitation_to_game(
188179
) -> None:
189180
await self._logger.ainfo(
190181
"user_cancelled_invitation_to_game",
191-
chat_id=invitation_to_game.inviting_user.id,
192182
user_id=invitation_to_game.inviting_user.id,
193-
invitation_to_game_id=invitation_to_game.id_,
183+
invitation_to_game_id=invitation_to_game.id_.hex,
194184
)
195185

196186
async def user_rejected_invitation_to_game(
@@ -200,9 +190,8 @@ async def user_rejected_invitation_to_game(
200190
) -> None:
201191
await self._logger.ainfo(
202192
"user_rejected_invitation_to_game",
203-
chat_id=invitation_to_game.invited_user.id,
204193
user_id=invitation_to_game.invited_user.id,
205-
invitation_to_game_id=invitation_to_game.id_,
194+
invitation_to_game_id=invitation_to_game.id_.hex,
206195
)
207196

208197
async def user_accepted_invitation_to_game(
@@ -213,39 +202,35 @@ async def user_accepted_invitation_to_game(
213202
) -> None:
214203
await self._logger.ainfo(
215204
"user_accepted_invitation_to_game",
216-
chat_id=invitation_to_game.invited_user.id,
217205
user_id=invitation_to_game.invited_user.id,
218-
invitation_to_game_id=invitation_to_game.id_,
206+
invitation_to_game_id=invitation_to_game.id_.hex,
219207
)
220208

221209
async def no_invitation_to_game_to_accept(
222210
self, user_id: int, invitation_to_game_id: UUID, /,
223211
) -> None:
224212
await self._logger.ainfo(
225213
"no_invitation_to_game_to_accept",
226-
chat_id=user_id,
227214
user_id=user_id,
228-
invitation_to_game_id=invitation_to_game_id,
215+
invitation_to_game_id=invitation_to_game_id.hex,
229216
)
230217

231218
async def no_invitation_to_game_to_reject(
232219
self, user_id: int, invitation_to_game_id: UUID, /,
233220
) -> None:
234221
await self._logger.ainfo(
235222
"no_invitation_to_game_to_reject",
236-
chat_id=user_id,
237223
user_id=user_id,
238-
invitation_to_game_id=invitation_to_game_id,
224+
invitation_to_game_id=invitation_to_game_id.hex,
239225
)
240226

241227
async def no_invitation_to_game_to_cancel(
242228
self, user_id: int, invitation_to_game_id: UUID, /,
243229
) -> None:
244230
await self._logger.ainfo(
245231
"no_invitation_to_game_to_cancel",
246-
chat_id=user_id,
247232
user_id=user_id,
248-
invitation_to_game_id=invitation_to_game_id,
233+
invitation_to_game_id=invitation_to_game_id.hex,
249234
)
250235

251236
async def invitations_to_game_auto_cancelled(
@@ -256,7 +241,7 @@ async def invitations_to_game_auto_cancelled(
256241
await gather(*(
257242
self._logger.ainfo(
258243
"invitation_to_game_auto_cancelled",
259-
invitation_to_game_id=invitation_to_game_id,
244+
invitation_to_game_id=invitation_to_game_id.hex,
260245
)
261246
for invitation_to_game_id in ids
262247
))
@@ -266,21 +251,21 @@ async def no_invitation_to_game_to_auto_cancel(
266251
) -> None:
267252
await self._logger.awarning(
268253
"no_invitation_to_game_to_auto_cancel",
269-
invitation_to_game_id=invitation_to_game_id,
254+
invitation_to_game_id=invitation_to_game_id.hex,
270255
)
271256

272257
async def not_expired_invitation_to_game_to_auto_cancel(
273258
self, invitation_to_game: InvitationToGame, /,
274259
) -> None:
275260
await self._logger.aerror(
276261
"not_expired_invitation_to_game_to_auto_cancel",
277-
invitation_to_game_id=invitation_to_game.id_,
262+
invitation_to_game_id=invitation_to_game.id_.hex,
278263
)
279264

280265
async def invitation_to_game_state_is_not_active_to_game_to_auto_cancel(
281266
self, invitation_to_game: InvitationToGame, /,
282267
) -> None:
283268
await self._logger.ainfo(
284269
"invitation_to_game_state_is_not_active_to_game_to_auto_cancel",
285-
invitation_to_game_id=invitation_to_game.id_,
270+
invitation_to_game_id=invitation_to_game.id_.hex,
286271
)

src/ttt/infrastructure/adapters/stars_purchase_log.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ async def stars_purchase_payment_completion_started(
4646
await self._logger.ainfo(
4747
"stars_purchase_payment_completion_started",
4848
user_id=payment.user_id,
49-
chat_id=payment.user_id,
5049
purchase_id=payment.purchase_id.hex,
5150
)
5251

@@ -59,7 +58,6 @@ async def stars_purchase_payment_completed(
5958
await self._logger.ainfo(
6059
"stars_purchase_payment_completed",
6160
user_id=stars_purchase.user.id,
62-
chat_id=stars_purchase.user.id,
6361
purchase_id=stars_purchase.id_.hex,
6462
)
6563

@@ -71,7 +69,6 @@ async def double_stars_purchase_payment_completion(
7169
await self._logger.awarning(
7270
"double_stars_purchase_payment_completion",
7371
user_id=stars_purchase.user.id,
74-
chat_id=stars_purchase.user.id,
7572
purchase_id=stars_purchase.id_.hex,
7673
)
7774

@@ -83,7 +80,6 @@ async def invalid_stars_for_stars_purchase(
8380
await self._logger.aerror(
8481
"invalid_stars_for_stars_purchase",
8582
user_id=user.id,
86-
chat_id=user.id,
8783
stars=stars,
8884
)
8985

@@ -94,7 +90,6 @@ async def double_stars_purchase_payment_start(
9490
await self._logger.ainfo(
9591
"double_stars_purchase_payment_start",
9692
user_id=stars_purchase.user.id,
97-
chat_id=stars_purchase.user.id,
9893
purchase_id=stars_purchase.id_.hex,
9994
)
10095

0 commit comments

Comments
 (0)