Skip to content

Commit 22d2d42

Browse files
nia-gaeafnia-gaeaf
authored
[Refactor:API] Semester to Term in Database Calls (#33)
To match [PR #9630](Submitty/Submitty#9630), the word `term` is changed to `semester` in database accesses.
1 parent d4bce2f commit 22d2d42

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

‎nightly_db_backup/db_backup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def main():
131131

132132
# GET ACTIVE COURSES FROM 'MASTER' DB
133133
try:
134-
sql = "select course from courses where semester='{}'".format(semester)
134+
sql = "select course from courses where term='{}'".format(semester)
135135
# psql postgresql://user:password@host/dbname?sslmode=prefer -c "COPY (SQL code) TO STDOUT"
136136
process = "psql postgresql://{}:{}@{}/submitty?sslmode=prefer -c \"COPY ({}) TO STDOUT\"".format(DB_USER, DB_PASS, DB_HOST, sql)
137137
result = list(subprocess.check_output(process, shell=True).decode('utf-8').split(os.linesep))[:-1]

‎pam_accounts/accounts.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private function init() {
132132
self::$db_query = <<<SQL
133133
SELECT DISTINCT user_id
134134
FROM courses_users
135-
WHERE semester=$1
135+
WHERE term=$1
136136
SQL;
137137
self::$workflow_function = 'add_user';
138138
break;
@@ -141,7 +141,7 @@ private function init() {
141141
self::$db_query = <<<SQL
142142
SELECT DISTINCT cu.user_id
143143
FROM courses_users as cu
144-
LEFT OUTER JOIN courses as c ON cu.course=c.course AND cu.semester=c.semester
144+
LEFT OUTER JOIN courses as c ON cu.course=c.course AND cu.term=c.term
145145
WHERE cu.user_group=1 OR (cu.user_group<>1 AND c.status=1)
146146
SQL;
147147
self::$workflow_function = 'add_user';
@@ -163,7 +163,7 @@ private function init() {
163163
self::$db_query = <<<SQL
164164
SELECT DISTINCT cu.user_id
165165
FROM courses_users as cu
166-
LEFT OUTER JOIN courses as c ON cu.course=c.course AND cu.semester=c.semester
166+
LEFT OUTER JOIN courses as c ON cu.course=c.course AND cu.term=c.term
167167
WHERE cu.user_group<>1 AND c.status<>1
168168
SQL;
169169
self::$workflow_function = 'remove_user';

‎sample_bin/registration_section_resync.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private function process() {
8484
//Loop through academic terms
8585
foreach (self::$academic_terms as $term) {
8686
//Get courses list for $term
87-
$res = pg_query_params(self::$db_conn['master'], "SELECT course FROM courses WHERE semester = $1", array($term));
87+
$res = pg_query_params(self::$db_conn['master'], "SELECT course FROM courses WHERE term = $1", array($term));
8888
if ($res === false) {
8989
exit(sprintf("Error reading course list for %s.%s", $term, PHP_EOL));
9090
}
@@ -107,7 +107,7 @@ private function process() {
107107
}
108108

109109
//First retrieve registration sections in master DB
110-
$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));
110+
$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));
111111
if ($res === false) {
112112
fprintf(STDERR, "Error reading registration sections from master DB: %s %s.%sSkipping %s %s.%s", $term, $course, PHP_EOL, $term, $course, PHP_EOL);
113113
$this->close_db_conn('course');
@@ -135,7 +135,7 @@ private function process() {
135135

136136
//INSERT $sync_list to master DB, ON CONFLICT DO NOTHING (prevents potential PK violations). We're using DB schema trigger to complete resync.
137137
foreach($sync_list as $section) {
138-
$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));
138+
$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));
139139
if ($res === false) {
140140
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);
141141
$this->close_db_conn('course');

‎student_auto_feed/add_drop_report.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public static function get_courses($term) {
147147
}
148148

149149
// Undergraduate courses from DB.
150-
$sql = "SELECT course FROM courses WHERE semester=$1 AND status=1";
150+
$sql = "SELECT course FROM courses WHERE term=$1 AND status=1";
151151
$params = array($term);
152152
$res = pg_query_params(self::$db, $sql, $params);
153153
if ($res === false)
@@ -170,7 +170,7 @@ public static function get_mapped_courses($term) {
170170
}
171171

172172
// mapped courses from DB
173-
$sql = "SELECT course, mapped_course FROM mapped_courses WHERE semester=$1";
173+
$sql = "SELECT course, mapped_course FROM mapped_courses WHERE term=$1";
174174
$params = array($term);
175175
$res = pg_query_params(self::$db, $sql, $params);
176176
if ($res === false) {
@@ -206,44 +206,44 @@ public static function count_enrollments($term, $course_list, $mapped_courses) {
206206
$grad_course = array_search($course, $mapped_courses);
207207
if ($grad_course === false) {
208208
// COURSE HAS NO GRAD SECTION (not mapped).
209-
$sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section IS NOT NULL";
209+
$sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section IS NOT NULL";
210210
$params = array($term, $course);
211211
$res = pg_query_params(self::$db, $sql, $params);
212212
if ($res === false)
213213
die("Failed to lookup enrollments for {$course}\n");
214214
$course_enrollments[$course] = (int) pg_fetch_result($res, 0);
215215

216216
// Get manual flag count
217-
$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";
217+
$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";
218218
$res = pg_query_params(self::$db, $sql, $params);
219219
if ($res === false)
220220
die("Failed to lookup counts with manual flag set for {$course}\n");
221221
$manual_flags[$course] = (int) pg_fetch_result($res, 0);
222222
} else {
223223
// UNDERGRADUATE SECTION
224-
$sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='1'";
224+
$sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='1'";
225225
$params = array($term, $course);
226226
$res = pg_query_params(self::$db, $sql, $params);
227227
if ($res === false)
228228
die("Failed to lookup enrollments for {$course}\n");
229229
$course_enrollments[$course] = (int) pg_fetch_result($res, 0);
230230

231231
// Get manual flag count
232-
$sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='1' AND manual_registration=TRUE";
232+
$sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='1' AND manual_registration=TRUE";
233233
$res = pg_query_params(self::$db, $sql, $params);
234234
if ($res === false)
235235
die("Failed to lookup counts with manual flag set for {$course} (undergrads)\n");
236236
$manual_flags[$course] = (int) pg_fetch_result($res, 0);
237237

238238
// GRADUATE SECTION
239-
$sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='2'";
239+
$sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='2'";
240240
$res = pg_query_params(self::$db, $sql, $params);
241241
if ($res === false)
242242
die("Failed to lookup enrollments for {$grad_course}\n");
243243
$course_enrollments[$grad_course] = (int) pg_fetch_result($res, 0);
244244

245245
// Get manual flag count
246-
$sql = "SELECT COUNT(*) FROM courses_users WHERE semester=$1 AND course=$2 AND user_group=4 AND registration_section='2' AND manual_registration=TRUE";
246+
$sql = "SELECT COUNT(*) FROM courses_users WHERE term=$1 AND course=$2 AND user_group=4 AND registration_section='2' AND manual_registration=TRUE";
247247
$res = pg_query_params(self::$db, $sql, $params);
248248
if ($res === false)
249249
die("Failed to lookup counts with manual flag set for {$course} (grads)\n");

‎student_auto_feed/ssaf_sql.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,19 @@ class sql {
2121
public const GET_COURSES = <<<SQL
2222
SELECT course
2323
FROM courses
24-
WHERE semester=$1
24+
WHERE term=$1
2525
AND status=1
2626
SQL;
2727

2828
public const GET_MAPPED_COURSES = <<<SQL
2929
SELECT course, registration_section, mapped_course, mapped_section
3030
FROM mapped_courses
31-
WHERE semester=$1
31+
WHERE term=$1
3232
SQL;
3333

3434
public const GET_COURSE_ENROLLMENT_COUNT = <<<SQL
3535
SELECT count(*) AS num_students FROM courses_users
36-
WHERE semester=$1
36+
WHERE term=$1
3737
AND course=$2
3838
AND user_group=4
3939
AND registration_section IS NOT NULL
@@ -72,15 +72,15 @@ class sql {
7272
// UPSERT courses_users table
7373
public const UPSERT_COURSES_USERS = <<<SQL
7474
INSERT INTO courses_users (
75-
semester,
75+
term,
7676
course,
7777
user_id,
7878
user_group,
7979
registration_section,
8080
registration_type,
8181
manual_registration
8282
) VALUES ($1, $2, $3, $4, $5, $6, $7)
83-
ON CONFLICT (semester, course, user_id) DO UPDATE
83+
ON CONFLICT (term, course, user_id) DO UPDATE
8484
SET registration_section=
8585
CASE WHEN courses_users.user_group=4
8686
AND courses_users.manual_registration=FALSE
@@ -98,7 +98,7 @@ class sql {
9898
// INSERT courses_registration_sections table
9999
public const INSERT_REG_SECTION = <<<SQL
100100
INSERT INTO courses_registration_sections (
101-
semester,
101+
term,
102102
course,
103103
registration_section_id,
104104
course_section_id
@@ -135,12 +135,12 @@ class sql {
135135
LEFT OUTER JOIN tmp_enrolled
136136
ON courses_users.user_id=tmp_enrolled.user_id
137137
WHERE tmp_enrolled.user_id IS NULL
138-
AND courses_users.semester=$1
138+
AND courses_users.term=$1
139139
AND courses_users.course=$2
140140
AND courses_users.user_group=4
141141
) AS dropped
142142
WHERE courses_users.user_id=dropped.user_id
143-
AND courses_users.semester=$1
143+
AND courses_users.term=$1
144144
AND courses_users.course=$2
145145
AND courses_users.user_group=4
146146
AND courses_users.manual_registration=FALSE

0 commit comments

Comments
 (0)