Merge pull request #5656 from lyttam/NS-1798

Author: pauline2k

bea/test_utils/nessie_timeline_utils.py

@@ -453,14 +453,14 @@ def get_sis_appts(student):
                      sis_advising_notes.advising_appointments.advisor_sid,
                      sis_advising_notes.advising_appointments.created_at AS created_date,
                      sis_advising_notes.advising_appointments.updated_at AS updated_date,
-                     sis_advising_notes.advising_appointment_advisors.first_name,
-                     sis_advising_notes.advising_appointment_advisors.last_name,
+                     sis_advising_notes.advisors.first_name,
+                     sis_advising_notes.advisors.last_name,
                      sis_advising_notes.advising_note_topics.note_topic AS topic,
                      sis_advising_notes.advising_note_attachments.sis_file_name,
                      sis_advising_notes.advising_note_attachments.user_file_name
                 FROM sis_advising_notes.advising_appointments
-           LEFT JOIN sis_advising_notes.advising_appointment_advisors
-                  ON sis_advising_notes.advising_appointments.advisor_sid = sis_advising_notes.advising_appointment_advisors.sid
+           LEFT JOIN sis_advising_notes.advisors
+                  ON sis_advising_notes.advising_appointments.advisor_sid = sis_advising_notes.advisors.sid
            LEFT JOIN sis_advising_notes.advising_note_topics
                   ON sis_advising_notes.advising_appointments.id = sis_advising_notes.advising_note_topics.advising_note_id
            LEFT JOIN sis_advising_notes.advising_note_attachments

boac/externals/data_loch.py

@@ -491,13 +491,13 @@ def match_appointment_advisors_by_name(prefixes, limit=None):
     for prefix in prefixes:
         idx = prefixes.index(prefix)
         prefix_conditions.append(
-            f"""JOIN {sis_advising_notes_schema()}.advising_appointment_advisor_names an{idx}
+            f"""JOIN {sis_advising_notes_schema()}.advisor_names an{idx}
             ON an{idx}.name LIKE %(prefix_{idx})s
             AND an{idx}.uid = a.uid""",
         )
         prefix_kwargs[f'prefix_{idx}'] = f'{prefix}%'
     sql = f"""SELECT DISTINCT a.first_name, a.last_name, a.sid, a.uid
-        FROM {sis_advising_notes_schema()}.advising_appointment_advisors a
+        FROM {sis_advising_notes_schema()}.advisors a
         {' '.join(prefix_conditions)}
         ORDER BY a.first_name, a.last_name"""
     if limit:
@@ -762,7 +762,7 @@ def get_sis_advising_appointments(sid):
             aa.last_name AS advisor_last_name, a.appointment_id, a.created_by, a.updated_by,
             a.note_body AS details, a.created_at, a.updated_at
         FROM {sis_advising_notes_schema()}.advising_appointments a
-        LEFT JOIN {sis_advising_notes_schema()}.advising_appointment_advisors aa ON a.advisor_sid = aa.sid
+        LEFT JOIN {sis_advising_notes_schema()}.advisors aa ON a.advisor_sid = aa.sid
         WHERE a.sid=%(sid)s
         ORDER BY created_at, updated_at, id"""
     return safe_execute_rds(sql, sid=sid)
@@ -791,7 +791,7 @@ def get_advising_appointments_by_ids(ids):
             spi.uid, spi.first_name, spi.last_name, aa.first_name AS advisor_first_name,
             aa.last_name AS advisor_last_name
         FROM {sis_advising_notes_schema()}.advising_appointments an
-        LEFT JOIN {sis_advising_notes_schema()}.advising_appointment_advisors aa ON an.advisor_sid = aa.sid
+        LEFT JOIN {sis_advising_notes_schema()}.advisors aa ON an.advisor_sid = aa.sid
         LEFT JOIN {student_schema()}.student_profile_index spi ON an.sid = spi.sid
         WHERE an.id = ANY(%(ids)s)
         ORDER BY an.created_at DESC, an.id DESC"""
@@ -1013,7 +1013,7 @@ def search_advising_appointments(
             an.created_by, an.created_at, an.updated_at, an.note_category, an.note_subcategory,
             spi.uid, spi.first_name, spi.last_name, aa.first_name AS advisor_first_name, aa.last_name AS advisor_last_name"""
     query_tables = f"""{sis_advising_notes_schema()}.advising_appointments an
-        LEFT JOIN {sis_advising_notes_schema()}.advising_appointment_advisors aa ON an.advisor_sid = aa.sid
+        LEFT JOIN {sis_advising_notes_schema()}.advisors aa ON an.advisor_sid = aa.sid
         JOIN {student_schema()}.student_profile_index spi ON an.sid = spi.sid"""
     if search_phrase:
         query_tables += f"""

fixtures/loch/loch.sql

@@ -368,18 +368,19 @@ CREATE TABLE sis_advising_notes.advising_appointments
     updated_at TIMESTAMP WITH TIME ZONE NOT NULL
 );
 
-CREATE TABLE sis_advising_notes.advising_appointment_advisor_names
+CREATE TABLE sis_advising_notes.advisor_names
 (
     uid VARCHAR NOT NULL,
     name VARCHAR NOT NULL
 );
 
-CREATE TABLE sis_advising_notes.advising_appointment_advisors
+CREATE TABLE sis_advising_notes.advisors
 (
     uid VARCHAR NOT NULL,
     sid VARCHAR NOT NULL,
     first_name VARCHAR NOT NULL,
-    last_name VARCHAR NOT NULL
+    last_name VARCHAR NOT NULL,
+    campus_email VARCHAR
 );
 
 CREATE TABLE sis_advising_notes.advising_notes
@@ -966,7 +967,7 @@ CREATE MATERIALIZED VIEW sis_advising_notes.advising_appointments_search_index A
   FROM sis_advising_notes.advising_appointments
 );
 
-INSERT INTO sis_advising_notes.advising_appointment_advisor_names
+INSERT INTO sis_advising_notes.advisor_names
 (uid, name)
 VALUES
 ('1081940', 'LORAMPS'),
@@ -978,13 +979,13 @@ VALUES
 ('1133397', 'Robert'),
 ('1133397', 'Johnson');
 
-INSERT INTO sis_advising_notes.advising_appointment_advisors
-(uid, sid, first_name, last_name)
+INSERT INTO sis_advising_notes.advisors
+(uid, sid, first_name, last_name, campus_email)
 VALUES
-('1081940', '100200300', 'Loramps', 'Glub'),
-('1133398', '700600500', 'Charlie', 'Christian'),
-('53791', '53791', 'Milicent', 'Balthazar'),
-('1133397', '600500400', 'Robert', 'Johnson');
+('1081940', '100200300', 'Loramps', 'Glub', 'blub@berkeley.edu'),
+('1133398', '700600500', 'Charlie', 'Christian', NULL),
+('53791', '53791', 'Milicent', 'Balthazar', 'mbalth@berkeley.edu'),
+('1133397', '600500400', 'Robert', 'Johnson', NULL);
 
 INSERT INTO sis_advising_notes.advising_notes
 (id, sid, student_note_nr, advisor_sid, appointment_id, note_category, note_subcategory, note_body, created_by, updated_by, created_at, updated_at)