From 22d2d423b4b49203145297f8c19ab299891c1a65 Mon Sep 17 00:00:00 2001 From: Nia Heermance <51209504+NiaHeermance@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:08:56 -0400 Subject: [PATCH] [Refactor:API] Semester to Term in Database Calls (#33) To match [PR #9630](https://github.com/Submitty/Submitty/pull/9630), the word `term` is changed to `semester` in database accesses. --- nightly_db_backup/db_backup.py | 2 +- pam_accounts/accounts.php | 6 +++--- sample_bin/registration_section_resync.php | 6 +++--- student_auto_feed/add_drop_report.php | 16 ++++++++-------- student_auto_feed/ssaf_sql.php | 16 ++++++++-------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nightly_db_backup/db_backup.py b/nightly_db_backup/db_backup.py index 24801d3..2e54cf5 100644 --- a/nightly_db_backup/db_backup.py +++ b/nightly_db_backup/db_backup.py @@ -131,7 +131,7 @@ def main(): # GET ACTIVE COURSES FROM 'MASTER' DB try: - sql = "select course from courses where semester='{}'".format(semester) + sql = "select course from courses where term='{}'".format(semester) # psql postgresql://user:password@host/dbname?sslmode=prefer -c "COPY (SQL code) TO STDOUT" process = "psql postgresql://{}:{}@{}/submitty?sslmode=prefer -c \"COPY ({}) TO STDOUT\"".format(DB_USER, DB_PASS, DB_HOST, sql) result = list(subprocess.check_output(process, shell=True).decode('utf-8').split(os.linesep))[:-1] diff --git a/pam_accounts/accounts.php b/pam_accounts/accounts.php index d7b5274..923fef6 100644 --- a/pam_accounts/accounts.php +++ b/pam_accounts/accounts.php @@ -132,7 +132,7 @@ private function init() { self::$db_query = <<1 AND c.status=1) SQL; self::$workflow_function = 'add_user'; @@ -163,7 +163,7 @@ private function init() { self::$db_query = <<1 AND c.status<>1 SQL; self::$workflow_function = 'remove_user'; diff --git a/sample_bin/registration_section_resync.php b/sample_bin/registration_section_resync.php index 92c3db1..ed0738b 100755 --- a/sample_bin/registration_section_resync.php +++ b/sample_bin/registration_section_resync.php @@ -84,7 +84,7 @@ private function process() { //Loop through academic terms foreach (self::$academic_terms as $term) { //Get courses list for $term - $res = pg_query_params(self::$db_conn['master'], "SELECT course FROM courses WHERE semester = $1", array($term)); + $res = pg_query_params(self::$db_conn['master'], "SELECT course FROM courses WHERE term = $1", array($term)); if ($res === false) { exit(sprintf("Error reading course list for %s.%s", $term, PHP_EOL)); } @@ -107,7 +107,7 @@ private function process() { } //First retrieve registration sections in master DB - $res = pg_query_params(self::$db_conn['master'], "SELECT registration_section_id FROM courses_registration_sections WHERE semester=$1 AND course=$2", array($term, $course)); + $res = pg_query_params(self::$db_conn['master'], "SELECT registration_section_id FROM courses_registration_sections WHERE term=$1 AND course=$2", array($term, $course)); if ($res === false) { fprintf(STDERR, "Error reading registration sections from master DB: %s %s.%sSkipping %s %s.%s", $term, $course, PHP_EOL, $term, $course, PHP_EOL); $this->close_db_conn('course'); @@ -135,7 +135,7 @@ private function process() { //INSERT $sync_list to master DB, ON CONFLICT DO NOTHING (prevents potential PK violations). We're using DB schema trigger to complete resync. foreach($sync_list as $section) { - $res = pg_query_params(self::$db_conn['master'], "INSERT INTO courses_registration_sections (semester, course, registration_section_id) VALUES ($1, $2, $3) ON CONFLICT ON CONSTRAINT courses_registration_sections_pkey DO UPDATE SET semester=$1, course=$2, registration_section_id=$3", array($term, $course, $section)); + $res = pg_query_params(self::$db_conn['master'], "INSERT INTO courses_registration_sections (term, course, registration_section_id) VALUES ($1, $2, $3) ON CONFLICT ON CONSTRAINT courses_registration_sections_pkey DO UPDATE SET term=$1, course=$2, registration_section_id=$3", array($term, $course, $section)); if ($res === false) { fprintf(STDERR, "Error during re-sync procedure: %s %s section %s.%s.This section could not be synced.%s", $term, $course, $section, PHP_EOL, PHP_EOL); $this->close_db_conn('course'); diff --git a/student_auto_feed/add_drop_report.php b/student_auto_feed/add_drop_report.php index b6ec03a..b49e2d3 100644 --- a/student_auto_feed/add_drop_report.php +++ b/student_auto_feed/add_drop_report.php @@ -147,7 +147,7 @@ public static function get_courses($term) { } // Undergraduate courses from DB. - $sql = "SELECT course FROM courses WHERE semester=$1 AND status=1"; + $sql = "SELECT course FROM courses WHERE term=$1 AND status=1"; $params = array($term); $res = pg_query_params(self::$db, $sql, $params); if ($res === false) @@ -170,7 +170,7 @@ public static function get_mapped_courses($term) { } // mapped courses from DB - $sql = "SELECT course, mapped_course FROM mapped_courses WHERE semester=$1"; + $sql = "SELECT course, mapped_course FROM mapped_courses WHERE term=$1"; $params = array($term); $res = pg_query_params(self::$db, $sql, $params); if ($res === false) { @@ -206,7 +206,7 @@ public static function count_enrollments($term, $course_list, $mapped_courses) { $grad_course = array_search($course, $mapped_courses); if ($grad_course === false) { // COURSE HAS NO GRAD SECTION (not mapped). - $sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section IS NOT NULL"; + $sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section IS NOT NULL"; $params = array($term, $course); $res = pg_query_params(self::$db, $sql, $params); if ($res === false) @@ -214,14 +214,14 @@ public static function count_enrollments($term, $course_list, $mapped_courses) { $course_enrollments[$course] = (int) pg_fetch_result($res, 0); // Get manual flag count - $sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section IS NOT NULL AND manual_registration=TRUE"; + $sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section IS NOT NULL AND manual_registration=TRUE"; $res = pg_query_params(self::$db, $sql, $params); if ($res === false) die("Failed to lookup counts with manual flag set for {$course}\n"); $manual_flags[$course] = (int) pg_fetch_result($res, 0); } else { // UNDERGRADUATE SECTION - $sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='1'"; + $sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='1'"; $params = array($term, $course); $res = pg_query_params(self::$db, $sql, $params); if ($res === false) @@ -229,21 +229,21 @@ public static function count_enrollments($term, $course_list, $mapped_courses) { $course_enrollments[$course] = (int) pg_fetch_result($res, 0); // Get manual flag count - $sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='1' AND manual_registration=TRUE"; + $sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='1' AND manual_registration=TRUE"; $res = pg_query_params(self::$db, $sql, $params); if ($res === false) die("Failed to lookup counts with manual flag set for {$course} (undergrads)\n"); $manual_flags[$course] = (int) pg_fetch_result($res, 0); // GRADUATE SECTION - $sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='2'"; + $sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='2'"; $res = pg_query_params(self::$db, $sql, $params); if ($res === false) die("Failed to lookup enrollments for {$grad_course}\n"); $course_enrollments[$grad_course] = (int) pg_fetch_result($res, 0); // Get manual flag count - $sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='2' AND manual_registration=TRUE"; + $sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='2' AND manual_registration=TRUE"; $res = pg_query_params(self::$db, $sql, $params); if ($res === false) die("Failed to lookup counts with manual flag set for {$course} (grads)\n"); diff --git a/student_auto_feed/ssaf_sql.php b/student_auto_feed/ssaf_sql.php index 2f03218..15c6a4d 100644 --- a/student_auto_feed/ssaf_sql.php +++ b/student_auto_feed/ssaf_sql.php @@ -21,19 +21,19 @@ class sql { public const GET_COURSES = <<