Merge pull request #211 from datakind/fix/eda_endpoint_updates

fix: use latest edvise EdaSummary

Author: vishpillai123

cloudbuild-webapp.yaml

@@ -36,6 +36,19 @@ steps:
       - '${_REGION}-docker.pkg.dev/${PROJECT_ID}/edvise-api/webapp:$COMMIT_SHA'
       - '--region'
       - '${_REGION}'
+  - name: curlimages/curl
+    args:
+      - '-X'
+      - POST
+      - '-H'
+      - 'Content-Type: application/json'
+      - '-f'
+      - '-d'
+      - >-
+        {"text":"🚀 *$REPO_NAME* deployed · `$BRANCH_NAME` · $TRIGGER_NAME · $BUILD_ID"}
+      - >-
+        https://hooks.slack.com/triggers/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
+    id: notify-slack
 timeout: 600s
 options:
   logging: CLOUD_LOGGING_ONLY

src/webapp/routers/data.py

@@ -510,15 +510,21 @@ class GpaChartData(BaseModel):
     min_gpa: Optional[float] = None
 
 
-class TermSeries(BaseModel):
-    key: str
-    label: str
-    data: List[int]
+class TermCountPct(BaseModel):
+    count: int
+    percentage: float
+    name: str
+
+
+class YearTermSummary(BaseModel):
+    year: str
+    total: int
+    terms: List[TermCountPct]
 
 
 class StudentsByCohortTerm(BaseModel):
     years: List[str]
-    terms: List[TermSeries]
+    by_year: List[YearTermSummary]
 
 
 class TermChartData(BaseModel):

src/webapp/routers/data_test.py

@@ -854,10 +854,16 @@ def mock_read_csv(bucket_name: str, blob_path: str) -> pd.DataFrame:
     assert "2020" in data["gpa_by_enrollment_type"]["cohort_years"]
     assert "2021" in data["gpa_by_enrollment_type"]["cohort_years"]
 
-    # Check term data structure
+    # Check term data structure (degree_types style: years + by_year with total and terms[{ count, percentage, name }])
     assert "years" in data["students_by_cohort_term"]
-    assert "terms" in data["students_by_cohort_term"]
+    assert "by_year" in data["students_by_cohort_term"]
     assert len(data["students_by_cohort_term"]["years"]) == 2
+    by_year = data["students_by_cohort_term"]["by_year"]
+    assert len(by_year) == 2
+    assert "year" in by_year[0] and "total" in by_year[0] and "terms" in by_year[0]
+    assert all(
+        "count" in t and "percentage" in t and "name" in t for t in by_year[0]["terms"]
+    )
 
     # Check enrollment type by intensity has categories and series
     assert "categories" in data["enrollment_type_by_intensity"]