feat(v3.4.0): support multi-career subjects with subject_careers Many-to-Many and enhance Google Sheets importer for 6 days
This commit is contained in:
@@ -112,9 +112,14 @@ def get_subjects():
|
||||
|
||||
query = Subject.query
|
||||
if search:
|
||||
query = query.filter((Subject.name.ilike(f'%{search}%')) | (Subject.code.ilike(f'%{search}%')) | (Subject.department.ilike(f'%{search}%')))
|
||||
query = query.filter(
|
||||
(Subject.name.ilike(f'%{search}%')) |
|
||||
(Subject.code.ilike(f'%{search}%')) |
|
||||
(Subject.department.ilike(f'%{search}%')) |
|
||||
(Subject.careers.any(Career.name.ilike(f'%{search}%')))
|
||||
)
|
||||
if career_id:
|
||||
query = query.filter(Subject.career_id == career_id)
|
||||
query = query.filter((Subject.career_id == career_id) | (Subject.careers.any(Career.id == career_id)))
|
||||
if active == 'true':
|
||||
query = query.filter(Subject.is_active == True)
|
||||
elif active == 'false':
|
||||
@@ -125,6 +130,12 @@ def get_subjects():
|
||||
|
||||
subjects_data = []
|
||||
for s in subjects:
|
||||
c_list = [{'id': c.id, 'name': c.name, 'code': c.code} for c in s.careers] if s.careers else []
|
||||
if not c_list and s.career_obj:
|
||||
c_list = [{'id': s.career_obj.id, 'name': s.career_obj.name, 'code': s.career_obj.code}]
|
||||
|
||||
c_names = ", ".join([c['name'] for c in c_list]) if c_list else (s.career_obj.name if s.career_obj else (s.department or 'General'))
|
||||
|
||||
subjects_data.append({
|
||||
'id': s.id,
|
||||
'code': s.code,
|
||||
@@ -132,6 +143,8 @@ def get_subjects():
|
||||
'career_id': s.career_id,
|
||||
'career_name': s.career_obj.name if s.career_obj else (s.department or 'General'),
|
||||
'career_obj': {'id': s.career_obj.id, 'name': s.career_obj.name} if s.career_obj else None,
|
||||
'careers': c_list,
|
||||
'career_names': c_names,
|
||||
'department': s.department or 'General',
|
||||
'description': getattr(s, 'description', '') or '',
|
||||
'credits': getattr(s, 'credits', 4),
|
||||
@@ -190,7 +203,9 @@ def get_commissions():
|
||||
if subject_id:
|
||||
query = query.filter(Commission.subject_id == subject_id)
|
||||
if career_id:
|
||||
query = query.join(Subject, Commission.subject_id == Subject.id).filter(Subject.career_id == career_id)
|
||||
query = query.join(Subject, Commission.subject_id == Subject.id).filter(
|
||||
(Subject.career_id == career_id) | (Subject.careers.any(Career.id == career_id))
|
||||
)
|
||||
if shift:
|
||||
query = query.filter(Commission.shift == shift)
|
||||
if active == 'true':
|
||||
@@ -214,6 +229,8 @@ def get_commissions():
|
||||
continue
|
||||
|
||||
career_name = c.career_name if hasattr(c, 'career_name') else 'Carrera General'
|
||||
career_names = c.career_names if hasattr(c, 'career_names') else career_name
|
||||
careers_list = c.careers if hasattr(c, 'careers') else []
|
||||
career_id_val = c.career_id if hasattr(c, 'career_id') else (c.subject.career_id if c.subject else None)
|
||||
|
||||
commissions_data.append({
|
||||
@@ -225,6 +242,8 @@ def get_commissions():
|
||||
'subject_code': c.subject.code if c.subject else '-',
|
||||
'career_id': career_id_val,
|
||||
'career_name': career_name,
|
||||
'career_names': career_names,
|
||||
'careers': careers_list,
|
||||
'semester': getattr(c, 'semester', '1C') or '1C',
|
||||
'year': getattr(c, 'year', 2026) or 2026,
|
||||
'academic_term_id': getattr(c, 'academic_term_id', None),
|
||||
@@ -721,6 +740,25 @@ def create_subject():
|
||||
description=description,
|
||||
is_active=bool(is_active)
|
||||
)
|
||||
|
||||
career_ids = data.get('career_ids')
|
||||
if career_ids:
|
||||
if isinstance(career_ids, str):
|
||||
c_id_list = [int(x.strip()) for x in career_ids.split(',') if x.strip().isdigit()]
|
||||
elif isinstance(career_ids, list):
|
||||
c_id_list = [int(x) for x in career_ids if str(x).isdigit()]
|
||||
else:
|
||||
c_id_list = []
|
||||
if c_id_list:
|
||||
c_objs = Career.query.filter(Career.id.in_(c_id_list)).all()
|
||||
subject.careers = c_objs
|
||||
if c_objs and not subject.career_id:
|
||||
subject.career_id = c_objs[0].id
|
||||
elif career_id:
|
||||
c_obj = Career.query.get(career_id)
|
||||
if c_obj:
|
||||
subject.careers = [c_obj]
|
||||
|
||||
db.session.add(subject)
|
||||
db.session.commit()
|
||||
|
||||
@@ -756,6 +794,26 @@ def update_subject(id):
|
||||
c_id = data['career_id']
|
||||
subject.career_id = int(c_id) if c_id else None
|
||||
|
||||
if 'career_ids' in data:
|
||||
career_ids = data.get('career_ids')
|
||||
if isinstance(career_ids, str):
|
||||
c_id_list = [int(x.strip()) for x in career_ids.split(',') if x.strip().isdigit()]
|
||||
elif isinstance(career_ids, list):
|
||||
c_id_list = [int(x) for x in career_ids if str(x).isdigit()]
|
||||
else:
|
||||
c_id_list = []
|
||||
if c_id_list:
|
||||
c_objs = Career.query.filter(Career.id.in_(c_id_list)).all()
|
||||
subject.careers = c_objs
|
||||
if c_objs and not subject.career_id:
|
||||
subject.career_id = c_objs[0].id
|
||||
else:
|
||||
subject.careers = []
|
||||
elif 'career_id' in data and subject.career_id:
|
||||
c_obj = Career.query.get(subject.career_id)
|
||||
if c_obj and c_obj not in subject.careers:
|
||||
subject.careers = [c_obj]
|
||||
|
||||
if 'description' in data:
|
||||
subject.description = data['description'].strip()
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ OPENAPI_SPEC = {
|
||||
"info": {
|
||||
"title": "Edu-Space REST API",
|
||||
"description": "Enterprise Academic & Physical Space Management REST API with JWT Authentication and Role-Based Access Control.",
|
||||
"version": "3.3.0"
|
||||
"version": "3.4.0"
|
||||
},
|
||||
"servers": [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user