From 48c6f4a74471d9d9c316e5f1831a1bb1ff63eaa4 Mon Sep 17 00:00:00 2001
From: Mo8it <mo8it@proton.me>
Date: Mon, 16 May 2022 21:49:34 +0200
Subject: [PATCH] Replace count()

---
 advlabdb/customClasses.py | 45 ++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/advlabdb/customClasses.py b/advlabdb/customClasses.py
index 36c5917..b3404b5 100644
--- a/advlabdb/customClasses.py
+++ b/advlabdb/customClasses.py
@@ -5,9 +5,10 @@ from flask_admin.helpers import get_form_data
 from flask_admin.model.helpers import get_mdict_item_or_list
 from flask_admin.model.template import EndpointLinkRowAction
 from flask_security import current_user
-from sqlalchemy import and_
+from sqlalchemy import and_, select
 
-from .dependent_funs import reportBadAttempt, userActiveSemester
+from . import db
+from .dependent_funs import get_count, reportBadAttempt, userActiveSemester
 from .exceptions import DataBaseException, ModelViewException
 from .models import (
     Assistant,
@@ -39,15 +40,17 @@ class SecureAdminIndexView(CustomIndexView):
 
     @expose("/")
     def index(self):
-        active_semester_experiment_marks_query = ExperimentMark.query.filter(
-            ExperimentMark.part_student.has(PartStudent.part.has(Part.semester == userActiveSemester()))
+        active_semester_experiment_mark_ids_stmt = (
+            select(ExperimentMark.final_experiment_mark)
+            .join(PartStudent)
+            .join(Part)
+            .where(Part.semester == userActiveSemester())
         )
+        number_of_all_experiment_marks = get_count(active_semester_experiment_mark_ids_stmt)
 
-        number_of_all_experiment_marks = active_semester_experiment_marks_query.count()
-
-        number_of_missing_final_experiment_marks = active_semester_experiment_marks_query.filter(
-            ExperimentMark.final_experiment_mark == None
-        ).count()
+        number_of_missing_final_experiment_marks = get_count(
+            active_semester_experiment_mark_ids_stmt.where(ExperimentMark.final_experiment_mark == None)
+        )
 
         return self.render(
             "admin_index.html",
@@ -62,22 +65,20 @@ class SecureAssistantIndexView(CustomIndexView):
 
     @expose("/")
     def index(self):
-        active_semester_experiment_marks_query = ExperimentMark.query.filter(
-            ExperimentMark.group_experiment.has(
-                GroupExperiment.semester_experiment.has(
-                    and_(
-                        SemesterExperiment.semester == userActiveSemester(),
-                        SemesterExperiment.assistants.any(Assistant.user == current_user),
-                    )
-                )
-            )
+        active_semester_experiment_mark_ids_stmt = (
+            select(ExperimentMark.final_experiment_mark)
+            .join(GroupExperiment)
+            .join(SemesterExperiment)
+            .where(SemesterExperiment.semester == userActiveSemester())
+            .join(SemesterExperiment.assistants)
+            .where(Assistant.user == current_user)
         )
 
-        number_of_all_experiment_marks = active_semester_experiment_marks_query.count()
+        number_of_all_experiment_marks = get_count(active_semester_experiment_mark_ids_stmt)
 
-        number_of_missing_final_experiment_marks = active_semester_experiment_marks_query.filter(
-            ExperimentMark.final_experiment_mark == None
-        ).count()
+        number_of_missing_final_experiment_marks = get_count(
+            active_semester_experiment_mark_ids_stmt.where(ExperimentMark.final_experiment_mark == None)
+        )
 
         return self.render(
             "assistant_index.html",