fix: Add missing commas in function calls and improve code formatting
This commit is contained in:
@@ -434,36 +434,36 @@ class AuthService:
|
||||
async def update_user_profile(self, user: User, data: dict) -> User:
|
||||
"""Update user profile information."""
|
||||
logger.info("Updating profile for user: %s", user.email)
|
||||
|
||||
|
||||
# Only allow updating specific fields
|
||||
allowed_fields = {"name"}
|
||||
update_data = {k: v for k, v in data.items() if k in allowed_fields}
|
||||
|
||||
|
||||
if not update_data:
|
||||
return user
|
||||
|
||||
|
||||
# Update user
|
||||
for field, value in update_data.items():
|
||||
setattr(user, field, value)
|
||||
|
||||
|
||||
self.session.add(user)
|
||||
await self.session.commit()
|
||||
await self.session.refresh(user, ["plan"])
|
||||
|
||||
|
||||
logger.info("Profile updated successfully for user: %s", user.email)
|
||||
return user
|
||||
|
||||
async def change_user_password(
|
||||
self, user: User, current_password: str | None, new_password: str
|
||||
self, user: User, current_password: str | None, new_password: str,
|
||||
) -> None:
|
||||
"""Change user's password."""
|
||||
# Store user email before any operations to avoid session detachment issues
|
||||
user_email = user.email
|
||||
logger.info("Changing password for user: %s", user_email)
|
||||
|
||||
|
||||
# Store whether user had existing password before we modify it
|
||||
had_existing_password = user.password_hash is not None
|
||||
|
||||
|
||||
# If user has existing password, verify it
|
||||
if had_existing_password:
|
||||
if not current_password:
|
||||
@@ -473,24 +473,24 @@ class AuthService:
|
||||
else:
|
||||
# User doesn't have a password (OAuth-only user), so we're setting their first password
|
||||
logger.info("Setting first password for OAuth user: %s", user_email)
|
||||
|
||||
|
||||
# Hash new password
|
||||
new_password_hash = PasswordUtils.hash_password(new_password)
|
||||
|
||||
|
||||
# Update user
|
||||
user.password_hash = new_password_hash
|
||||
self.session.add(user)
|
||||
await self.session.commit()
|
||||
|
||||
logger.info("Password %s successfully for user: %s",
|
||||
|
||||
logger.info("Password %s successfully for user: %s",
|
||||
"changed" if had_existing_password else "set", user_email)
|
||||
|
||||
async def user_to_response(self, user: User) -> UserResponse:
|
||||
"""Convert User model to UserResponse with plan information."""
|
||||
# Load plan relationship if not already loaded
|
||||
if not hasattr(user, 'plan') or not user.plan:
|
||||
if not hasattr(user, "plan") or not user.plan:
|
||||
await self.session.refresh(user, ["plan"])
|
||||
|
||||
|
||||
return UserResponse(
|
||||
id=user.id,
|
||||
email=user.email,
|
||||
|
||||
@@ -56,14 +56,14 @@ class DashboardService:
|
||||
try:
|
||||
# Calculate the date filter based on period
|
||||
date_filter = self._get_date_filter(period)
|
||||
|
||||
|
||||
# Get top sounds from repository
|
||||
top_sounds = await self.sound_repository.get_top_sounds(
|
||||
sound_type=sound_type,
|
||||
date_filter=date_filter,
|
||||
limit=limit,
|
||||
)
|
||||
|
||||
|
||||
return [
|
||||
{
|
||||
"id": sound["id"],
|
||||
@@ -86,7 +86,7 @@ class DashboardService:
|
||||
period,
|
||||
)
|
||||
raise
|
||||
|
||||
|
||||
def _get_date_filter(self, period: str) -> datetime | None:
|
||||
"""Calculate the date filter based on the period."""
|
||||
now = datetime.now(UTC)
|
||||
|
||||
@@ -272,9 +272,8 @@ class PlaylistService:
|
||||
# Ensure position doesn't create gaps - if position is too high, place at end
|
||||
current_sounds = await self.playlist_repo.get_playlist_sounds(playlist_id)
|
||||
max_position = len(current_sounds)
|
||||
if position > max_position:
|
||||
position = max_position
|
||||
|
||||
position = min(position, max_position)
|
||||
|
||||
await self.playlist_repo.add_sound_to_playlist(playlist_id, sound_id, position)
|
||||
logger.info(
|
||||
"Added sound %s to playlist %s for user %s at position %s",
|
||||
@@ -306,10 +305,10 @@ class PlaylistService:
|
||||
)
|
||||
|
||||
await self.playlist_repo.remove_sound_from_playlist(playlist_id, sound_id)
|
||||
|
||||
|
||||
# Reorder remaining sounds to eliminate gaps
|
||||
await self._reorder_playlist_positions(playlist_id)
|
||||
|
||||
|
||||
logger.info(
|
||||
"Removed sound %s from playlist %s for user %s and reordered positions",
|
||||
sound_id,
|
||||
@@ -326,7 +325,7 @@ class PlaylistService:
|
||||
sounds = await self.playlist_repo.get_playlist_sounds(playlist_id)
|
||||
if not sounds:
|
||||
return
|
||||
|
||||
|
||||
# Create sequential positions: 0, 1, 2, 3...
|
||||
sound_positions = [(sound.id, index) for index, sound in enumerate(sounds)]
|
||||
await self.playlist_repo.reorder_playlist_sounds(playlist_id, sound_positions)
|
||||
|
||||
Reference in New Issue
Block a user