User account page

rpi_data/get-current-majors.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+DEST=majors-2022.json python3 modules/rpi-parse-majors.py

rpi_data/majors.json

@@ -0,0 +1,123 @@
+{
+  "Baccalaureate": [
+    "Accelerated Science, Technology, and Society (Law) B.S./J.D.",
+    "Aeronautical Engineering Curriculum",
+    "Applied Physics",
+    "Architecture",
+    "Biological Neuroscience",
+    "Biology",
+    "Biomedical Engineering",
+    "Biotechnology and Health Economics",
+    "Building Sciences B.S.",
+    "Business Analytics",
+    "Business and Management",
+    "Chemical Engineering",
+    "Chemistry - Chemical Biology Track",
+    "Chemistry - Industrial Chemistry Track",
+    "Chemistry B.S.",
+    "Civil Engineering",
+    "Cognitive Science",
+    "Communication, Media, and Design",
+    "Computer and Systems Engineering",
+    "Computer Science",
+    "Design, Innovation, and Society",
+    "Design, Innovation, and Society/Mechanical Engineering",
+    "Economics",
+    "Electrical Engineering",
+    "Electronic Arts",
+    "Engineering Core Curriculum",
+    "Engineering Science",
+    "Environmental Engineering",
+    "Environmental Science",
+    "Games and Simulation Arts and Sciences",
+    "Geology",
+    "Hydrogeology",
+    "Industrial and Management Engineering",
+    "Information Technology and Web Science",
+    "Materials Engineering",
+    "Mathematics",
+    "Mechanical Engineering Curriculum",
+    "Music",
+    "Nuclear Engineering Curriculum",
+    "Philosophy",
+    "Physician-Scientist",
+    "Physics",
+    "Program for Graduates of Naval Nuclear Power Training Command's Nuclear Power School",
+    "Psychological Science",
+    "Science, Technology, and Society",
+    "Sustainability Studies"
+  ],
+  "Masters": [
+    "Accelerated Weekend MBA Program",
+    "Applied Mathematics M.S.",
+    "Architectural Sciences (Concentration in Architectural Acoustics) M.S.",
+    "Architectural Sciences (Concentration in Built Ecologies) M.S.",
+    "Architectural Sciences M.S (Concentration in Lighting)",
+    "Astronomy M.S.",
+    "Biochemistry and Biophysics, M.S.",
+    "Biology M.S.",
+    "Biomedical Engineering M.S./M.Eng.",
+    "Chemical Engineering M.Eng.",
+    "Chemical Engineering M.S.",
+    "Chemistry M.S.",
+    "Civil and Environmental Engineering M.Eng.",
+    "Civil and Environmental Engineering M.S.",
+    "Cognitive Science M.S.",
+    "Communication and Rhetoric M.S. ",
+    "Computer Science M.S.",
+    "Critical Game Design, M.S.",
+    "Earth and Environmental Sciences Five-Year B.S.-M.S. Program",
+    "Economics M.S.",
+    "Electrical, Computer and Systems Engineering M.S.",
+    "Environmental Science M.S.",
+    "Geology M.S.",
+    "Industrial and Management Engineering M.S./M.Eng.",
+    "Information Technology M.S.",
+    "Lighting M.S.",
+    "Master of Architecture -  Professional Program",
+    "Master of Business Administration",
+    "Master of Engineering Program in Systems Engineering and Technology Management",
+    "Master of Science in Architecture Program",
+    "Master of Science in Business Analytics",
+    "Master of Science in Engineering Science (Hartford)",
+    "Master of Science in Management",
+    "Master of Science in Quantitative Finance and Risk Analytics",
+    "Master of Science in Supply Chain Management",
+    "Master of Science in Technology Commercialization and Entrepreneurship",
+    "Materials Engineering M.Eng.",
+    "Materials Engineering M.S.",
+    "Mathematics M.S.",
+    "Mechanical Engineering M.Eng. (Hartford)",
+    "Mechanical, Aerospace, and Nuclear Engineering M.Eng.",
+    "Mechanical, Aerospace, and Nuclear Engineering M.S.",
+    "Physics M.S.",
+    "Science and Technology Studies M.S.",
+    "Systems Engineering and Technology Management M.Eng. (Hartford)"
+  ],
+  "Doctoral": [
+    "Architectural Sciences (Concentration in Architectural Acoustics) Ph.D.",
+    "Architectural Sciences (Concentration in Built Ecologies) Ph.D.",
+    "Architectural Sciences (Concentration in Lighting) Ph.D.",
+    "Biochemistry and Biophysics, Ph.D.",
+    "Biology Ph.D.",
+    "Biomedical Engineering, Ph.D.",
+    "Chemical Engineering Ph.D.",
+    "Chemistry Ph.D.",
+    "Civil and Environmental Engineering Ph.D.",
+    "Cognitive Science Ph.D.",
+    "Communication and Rhetoric Ph.D.",
+    "Computer Science Ph.D.",
+    "Critical Game Design, Ph.D.",
+    "Electrical, Computer and Systems Engineering B.S.-Ph.D. Program",
+    "Electrical, Computer and Systems Engineering, Ph.D.",
+    "Electronic Arts Ph.D.",
+    "Geology Ph.D. ",
+    "Management Ph.D.",
+    "Materials Engineering Ph.D.",
+    "Mathematics Ph.D.",
+    "Mechanical, Aerospace, and Nuclear Engineering, Ph.D.",
+    "Ph.D. Decision Sciences and Engineering Systems",
+    "Physics Ph.D.",
+    "Science and Technology Studies Ph.D."
+  ]
+}

rpi_data/modules/fetch_catalog_course_info.py

@@ -3,7 +3,7 @@
 import unicodedata
 import re
 import regex #https://www.dataquest.io/blog/regex-cheatsheet/
-import json 
+import json
 from datetime import date
 from time import time
 from threading import Lock
@@ -106,6 +106,7 @@
     def __init__(self, api_key):
         self.search_endpoint = "http://rpi.apis.acalog.com/v2/search/courses"
         self.course_detail_endpoint = "http://rpi.apis.acalog.com/v2/content?options[full]=1&method=getItems&type=courses"
+        self.program_detail_endpoint = "https://rpi.apis.acalog.com/v2/search/programs?method=search&options[limit]=0"
         self.catalog_detail_endpoint = "http://rpi.apis.acalog.com/v2/content?key=3eef8a28f26fb2bcc514e6f1938929a1f9317628&format=xml&method=getCatalogs"
         self.api_key = api_key
         self.api_response_format = "xml"
@@ -156,7 +157,6 @@
             self._catalog_root = match.group("root")
             self._course_details_xml_strs.append(allow_for_extension_regex.sub("", course_details_xml_str))
 
-
     def _course_xml_ids_to_url_params(self, all_ids_xml):
         only_ids = SoupStrainer("id")
         id_tags = BeautifulSoup(all_ids_xml, "xml", parse_only=only_ids).find_all("id")
@@ -270,6 +270,23 @@
             tree = etree.parse(StringIO(courses_xml_str), parser)
             tree.write("courses21.xml", pretty_print=True)
         return self._get_all_courses(courses_xml_str)
+
+    def get_all_majors(self):
+        reqstr = self.program_detail_endpoint + f"&key={self.api_key}&catalog={self.catalog_id}&query=type:"
+        courses = {
+            "Baccalaureate":[],
+            "Masters":[],
+            "Doctoral":[]
+        }
+        for x in courses.keys():
+            res = req.get(reqstr + x)
+            tree = etree.parse(StringIO(res.content.decode().replace('encoding="utf-8"', '', 1)))
+            root = tree.getroot()
+            for name in root.findall('./search/results/result/name'):
+                courses[x].append(name.text)
+
+        return courses
+
 
 def main():
     c = acalog_client(acalog_api_key)
@@ -278,4 +295,4 @@
         dwrite_utf8_file(json.dumps(courses, indent=4), "courses21.json")
 
 if __name__ == "__main__":
-    main()
+    main()

rpi_data/modules/rpi-parse-majors.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# coding: utf-8
+# %%
+import json
+import pandas as pd
+import os
+from fetch_catalog_course_info import acalog_client as AcalogClient
+from fetch_sis_course_info import sis_client as SisClient
+from add_school_column import add_school_column
+
+acalog_api_key = "3eef8a28f26fb2bcc514e6f1938929a1f9317628"
+
+acalog_client = AcalogClient(acalog_api_key)
+
+acalog_course_info_df = pd.DataFrame(acalog_client.get_all_courses())
+
+destination = os.environ.get('DEST', 'out.json')
+
+with open(destination.replace(".csv", ".json"), "w") as file:
+    json.dump(acalog_client.get_all_majors(), file)

src/api/api_models.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel
 from typing import Optional
+from typing import List
 
 
 class SessionPydantic(BaseModel):
@@ -19,16 +20,17 @@ class updateUser(BaseModel):
     sessionID:str
     email:str
     phone:str
-    newPassword:str
-    major:str
+    password:str
+    newpassword:Optional[str] = None
+    major: List[str]
     degree:str
 
 class UserPydantic(BaseModel):
      name: str
      email: str
      phone: str
      password: str
-     major: str
+     major: List[str]
      degree: str
 
 class UserDeletePydantic(BaseModel):
@@ -44,7 +46,4 @@ class SubsemesterPydantic(BaseModel):
     semester: Optional[str] = None
 
 class DefaultSemesterSetPydantic(BaseModel):
-    default: str
-
-
-
+    default: str