fix list project supervisors and students endpoints for coordinator view

backend/app/project_supervisor/models.py

@@ -27,7 +27,8 @@ class ProjectSupervisor(Base, Person):
         project_supervisors_query = cls.query
 
         if year_group_id is not None:
-            project_supervisors_query = project_supervisors_query.filter(YearGroup.id == year_group_id)
+            project_supervisors_query = project_supervisors_query.join(YearGroupProjectSupervisors). \
+                filter(YearGroupProjectSupervisors.year_group_id == year_group_id)
 
         if fullname is not None:
             project_supervisors_query = project_supervisors_query.filter(

backend/app/students/models.py

@@ -137,7 +137,8 @@ class Student(Person):
     def search_by_fullname_and_mode_and_order_by_first_name_or_last_name(cls, year_group_id: int, fullname: str = None,
                                                                          order_by_first_name: str = None,
                                                                          order_by_last_name: str = None) -> BaseQuery:
-        student_query = cls.query.filter(YearGroup.id == year_group_id)
+        student_query = cls.query.join(YearGroupStudents, isouter=True). \
+            filter(YearGroupStudents.year_group_id == year_group_id)
 
         if fullname is not None:
             student_query = student_query.filter((Student.first_name + ' ' + Student.last_name).like(f'{fullname}%'))

backend/migrations/versions/b3003ddd0564_.py

@@ -0,0 +1,208 @@
+"""empty message
+
+Revision ID: b3003ddd0564
+Revises: 
+Create Date: 2023-01-03 18:37:53.103562
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'b3003ddd0564'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('project_supervisors',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('first_name', sa.String(length=255), nullable=False),
+    sa.Column('last_name', sa.String(length=255), nullable=False),
+    sa.Column('email', sa.String(length=120), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('email')
+    )
+    op.create_index(op.f('ix_project_supervisors_first_name'), 'project_supervisors', ['first_name'], unique=False)
+    op.create_index(op.f('ix_project_supervisors_last_name'), 'project_supervisors', ['last_name'], unique=False)
+    op.create_table('students',
+    sa.Column('first_name', sa.String(length=255), nullable=False),
+    sa.Column('last_name', sa.String(length=255), nullable=False),
+    sa.Column('email', sa.String(length=120), nullable=True),
+    sa.Column('pesel', sa.String(length=11), nullable=True),
+    sa.Column('index', sa.Integer(), nullable=False),
+    sa.PrimaryKeyConstraint('index'),
+    sa.UniqueConstraint('email')
+    )
+    op.create_index(op.f('ix_students_first_name'), 'students', ['first_name'], unique=False)
+    op.create_index(op.f('ix_students_last_name'), 'students', ['last_name'], unique=False)
+    op.create_table('year_groups',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(length=50), nullable=False),
+    sa.Column('mode', sa.String(length=1), nullable=False),
+    sa.Column('created_at', sa.DateTime(), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('examination_schedules',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('title', sa.String(length=100), nullable=False),
+    sa.Column('duration_time', sa.Integer(), nullable=False),
+    sa.Column('start_date_for_enrollment_students', sa.DateTime(), nullable=True),
+    sa.Column('end_date_for_enrollment_students', sa.DateTime(), nullable=True),
+    sa.Column('start_date', sa.DateTime(), nullable=False),
+    sa.Column('end_date', sa.DateTime(), nullable=False),
+    sa.Column('year_group_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['year_group_id'], ['year_groups.id'], ),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('title')
+    )
+    op.create_table('groups',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('name', sa.String(length=60), nullable=False),
+    sa.Column('cdyd_kod', sa.String(length=60), nullable=True),
+    sa.Column('prz_kod', sa.String(length=60), nullable=True),
+    sa.Column('tzaj_kod', sa.String(length=60), nullable=True),
+    sa.Column('project_supervisor_id', sa.Integer(), nullable=True),
+    sa.Column('year_group_id', sa.Integer(), nullable=True),
+    sa.Column('points_for_first_term', sa.Integer(), nullable=False),
+    sa.Column('points_for_second_term', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['project_supervisor_id'], ['project_supervisors.id'], ),
+    sa.ForeignKeyConstraint(['year_group_id'], ['year_groups.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('year_group_project_supervisors',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('project_supervisor_id', sa.Integer(), nullable=False),
+    sa.Column('year_group_id', sa.Integer(), nullable=False),
+    sa.Column('limit_group', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['project_supervisor_id'], ['project_supervisors.id'], ),
+    sa.ForeignKeyConstraint(['year_group_id'], ['year_groups.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('year_group_students',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('year_group_id', sa.Integer(), nullable=True),
+    sa.Column('student_index', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['student_index'], ['students.index'], ondelete='CASCADE'),
+    sa.ForeignKeyConstraint(['year_group_id'], ['year_groups.id'], ondelete='CASCADE'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('project_grade_sheets',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('group_id', sa.Integer(), nullable=True),
+    sa.Column('presentation_required_content_1', sa.Integer(), nullable=True),
+    sa.Column('presentation_required_content_2', sa.Integer(), nullable=True),
+    sa.Column('presentation_was_compatible_1', sa.Integer(), nullable=True),
+    sa.Column('presentation_was_compatible_2', sa.Integer(), nullable=True),
+    sa.Column('presentation_showing_1', sa.Integer(), nullable=True),
+    sa.Column('presentation_showing_2', sa.Integer(), nullable=True),
+    sa.Column('presentation_answers_to_questions_from_committee_1', sa.Integer(), nullable=True),
+    sa.Column('presentation_answers_to_questions_from_committee_2', sa.Integer(), nullable=True),
+    sa.Column('documentation_project_vision_1', sa.Integer(), nullable=True),
+    sa.Column('documentation_project_vision_2', sa.Integer(), nullable=True),
+    sa.Column('documentation_requirements_1', sa.Integer(), nullable=True),
+    sa.Column('documentation_requirements_2', sa.Integer(), nullable=True),
+    sa.Column('documentation_for_clients_1', sa.Integer(), nullable=True),
+    sa.Column('documentation_for_clients_2', sa.Integer(), nullable=True),
+    sa.Column('documentation_for_developers_1', sa.Integer(), nullable=True),
+    sa.Column('documentation_for_developers_2', sa.Integer(), nullable=True),
+    sa.Column('documentation_license_1', sa.Integer(), nullable=True),
+    sa.Column('documentation_license_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_regularity_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_regularity_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_division_of_work_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_division_of_work_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_contact_with_client_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_contact_with_client_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_management_of_risk_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_management_of_risk_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_work_methodology_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_work_methodology_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_management_of_source_code_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_management_of_source_code_2', sa.Integer(), nullable=True),
+    sa.Column('group_work_devops_1', sa.Integer(), nullable=True),
+    sa.Column('group_work_devops_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_complexity_of_product_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_complexity_of_product_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_access_to_application_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_access_to_application_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_security_issues_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_security_issues_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_access_to_test_application_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_access_to_test_application_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_acceptance_criteria_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_acceptance_criteria_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_expected_functionality_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_expected_functionality_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_promises_well_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_promises_well_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_has_been_implemented_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_has_been_implemented_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_is_useful_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_is_useful_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_prototype_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_prototype_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_tests_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_tests_2', sa.Integer(), nullable=True),
+    sa.Column('products_project_technology_1', sa.Integer(), nullable=True),
+    sa.Column('products_project_technology_2', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['group_id'], ['groups.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('students_groups',
+    sa.Column('group_id', sa.Integer(), nullable=False),
+    sa.Column('student_index', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['group_id'], ['groups.id'], ),
+    sa.ForeignKeyConstraint(['student_index'], ['students.index'], )
+    )
+    op.create_table('temporary_availabilities',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('start_date', sa.DateTime(), nullable=False),
+    sa.Column('end_date', sa.DateTime(), nullable=False),
+    sa.Column('examination_schedule_id', sa.Integer(), nullable=False),
+    sa.Column('project_supervisor_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['examination_schedule_id'], ['examination_schedules.id'], ),
+    sa.ForeignKeyConstraint(['project_supervisor_id'], ['project_supervisors.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('term_of_defences',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('start_date', sa.DateTime(), nullable=False),
+    sa.Column('end_date', sa.DateTime(), nullable=False),
+    sa.Column('examination_schedule_id', sa.Integer(), nullable=True),
+    sa.Column('group_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['examination_schedule_id'], ['examination_schedules.id'], ),
+    sa.ForeignKeyConstraint(['group_id'], ['groups.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('committees',
+    sa.Column('term_of_defence_id', sa.Integer(), nullable=True),
+    sa.Column('project_supervisor_id', sa.Integer(), nullable=True),
+    sa.ForeignKeyConstraint(['project_supervisor_id'], ['project_supervisors.id'], ),
+    sa.ForeignKeyConstraint(['term_of_defence_id'], ['term_of_defences.id'], )
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table('committees')
+    op.drop_table('term_of_defences')
+    op.drop_table('temporary_availabilities')
+    op.drop_table('students_groups')
+    op.drop_table('project_grade_sheets')
+    op.drop_table('year_group_students')
+    op.drop_table('year_group_project_supervisors')
+    op.drop_table('groups')
+    op.drop_table('examination_schedules')
+    op.drop_table('year_groups')
+    op.drop_index(op.f('ix_students_last_name'), table_name='students')
+    op.drop_index(op.f('ix_students_first_name'), table_name='students')
+    op.drop_table('students')
+    op.drop_index(op.f('ix_project_supervisors_last_name'), table_name='project_supervisors')
+    op.drop_index(op.f('ix_project_supervisors_first_name'), table_name='project_supervisors')
+    op.drop_table('project_supervisors')
+    # ### end Alembic commands ###

docker-compose.yaml

@@ -22,3 +22,4 @@ services:
       - "3000:3000"
     environment:
       - CHOKIDAR_USEPOLLING=true
+      - REACT_APP_BASE_URL=http://127.0.0.1:5000/api