mirror of
https://github.com/rzmk/learnhouse.git
synced 2025-12-19 04:19:25 +00:00
feat: Add User Courses in Profile
This commit is contained in:
parent
31c27bb70e
commit
b1aec48947
6 changed files with 233 additions and 8 deletions
|
|
@ -1,4 +1,4 @@
|
|||
from typing import Literal
|
||||
from typing import Literal, List
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request, UploadFile
|
||||
from pydantic import EmailStr
|
||||
from sqlmodel import Session
|
||||
|
|
@ -9,6 +9,7 @@ from src.services.users.password_reset import (
|
|||
from src.services.orgs.orgs import get_org_join_mechanism
|
||||
from src.security.auth import get_current_user
|
||||
from src.core.events.database import get_db_session
|
||||
from src.db.courses.courses import CourseRead
|
||||
|
||||
from src.db.users import (
|
||||
PublicUser,
|
||||
|
|
@ -33,6 +34,7 @@ from src.services.users.users import (
|
|||
update_user_avatar,
|
||||
update_user_password,
|
||||
)
|
||||
from src.services.courses.courses import get_user_courses
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
|
@ -277,3 +279,26 @@ async def api_delete_user(
|
|||
Delete User
|
||||
"""
|
||||
return await delete_user_by_id(request, db_session, current_user, user_id)
|
||||
|
||||
|
||||
@router.get("/{user_id}/courses", response_model=List[CourseRead], tags=["users"])
|
||||
async def api_get_user_courses(
|
||||
*,
|
||||
request: Request,
|
||||
db_session: Session = Depends(get_db_session),
|
||||
current_user: PublicUser = Depends(get_current_user),
|
||||
user_id: int,
|
||||
page: int = 1,
|
||||
limit: int = 10,
|
||||
) -> List[CourseRead]:
|
||||
"""
|
||||
Get courses made or contributed by a user.
|
||||
"""
|
||||
return await get_user_courses(
|
||||
request=request,
|
||||
current_user=current_user,
|
||||
user_id=user_id,
|
||||
db_session=db_session,
|
||||
page=page,
|
||||
limit=limit,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -638,7 +638,88 @@ async def delete_course(
|
|||
return {"detail": "Course deleted"}
|
||||
|
||||
|
||||
|
||||
async def get_user_courses(
|
||||
request: Request,
|
||||
current_user: PublicUser | AnonymousUser,
|
||||
user_id: int,
|
||||
db_session: Session,
|
||||
page: int = 1,
|
||||
limit: int = 10,
|
||||
) -> List[CourseRead]:
|
||||
# Verify user is not anonymous
|
||||
await authorization_verify_if_user_is_anon(current_user.id)
|
||||
|
||||
# Get all resource authors for the user
|
||||
statement = select(ResourceAuthor).where(
|
||||
and_(
|
||||
ResourceAuthor.user_id == user_id,
|
||||
ResourceAuthor.authorship_status == ResourceAuthorshipStatusEnum.ACTIVE
|
||||
)
|
||||
)
|
||||
resource_authors = db_session.exec(statement).all()
|
||||
|
||||
# Extract course UUIDs from resource authors
|
||||
course_uuids = [author.resource_uuid for author in resource_authors]
|
||||
|
||||
if not course_uuids:
|
||||
return []
|
||||
|
||||
# Get courses with the extracted UUIDs
|
||||
statement = select(Course).where(Course.course_uuid.in_(course_uuids))
|
||||
|
||||
# Apply pagination
|
||||
statement = statement.offset((page - 1) * limit).limit(limit)
|
||||
|
||||
courses = db_session.exec(statement).all()
|
||||
|
||||
# Convert to CourseRead objects
|
||||
result = []
|
||||
for course in courses:
|
||||
# Get authors for the course
|
||||
authors_statement = select(ResourceAuthor).where(
|
||||
ResourceAuthor.resource_uuid == course.course_uuid
|
||||
)
|
||||
authors = db_session.exec(authors_statement).all()
|
||||
|
||||
# Convert authors to AuthorWithRole objects
|
||||
authors_with_role = []
|
||||
for author in authors:
|
||||
# Get user for the author
|
||||
user_statement = select(User).where(User.id == author.user_id)
|
||||
user = db_session.exec(user_statement).first()
|
||||
|
||||
if user:
|
||||
authors_with_role.append(
|
||||
AuthorWithRole(
|
||||
user=UserRead.model_validate(user),
|
||||
authorship=author.authorship,
|
||||
authorship_status=author.authorship_status,
|
||||
creation_date=author.creation_date,
|
||||
update_date=author.update_date,
|
||||
)
|
||||
)
|
||||
|
||||
# Create CourseRead object
|
||||
course_read = CourseRead(
|
||||
id=course.id,
|
||||
org_id=course.org_id,
|
||||
name=course.name,
|
||||
description=course.description,
|
||||
about=course.about,
|
||||
learnings=course.learnings,
|
||||
tags=course.tags,
|
||||
thumbnail_image=course.thumbnail_image,
|
||||
public=course.public,
|
||||
open_to_contributors=course.open_to_contributors,
|
||||
course_uuid=course.course_uuid,
|
||||
creation_date=course.creation_date,
|
||||
update_date=course.update_date,
|
||||
authors=authors_with_role,
|
||||
)
|
||||
|
||||
result.append(course_read)
|
||||
|
||||
return result
|
||||
|
||||
|
||||
## 🔒 RBAC Utils ##
|
||||
|
|
|
|||
|
|
@ -153,13 +153,13 @@ async def create_user_with_invite(
|
|||
user = await create_user(request, db_session, current_user, user_object, org_id)
|
||||
|
||||
# Check if invite code contains UserGroup
|
||||
if inviteCode.get("usergroup_id"):
|
||||
if inviteCode.get("usergroup_id"): # type: ignore
|
||||
# Add user to UserGroup
|
||||
await add_users_to_usergroup(
|
||||
request,
|
||||
db_session,
|
||||
InternalUser(id=0),
|
||||
int(inviteCode.get("usergroup_id")), # Convert to int since usergroup_id is expected to be int
|
||||
int(inviteCode.get("usergroup_id")), # type: ignore / Convert to int since usergroup_id is expected to be int
|
||||
str(user.id),
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue