Merge pull request #2904 from uw-it-aca/qa

Qa

Author: fanglinfang

.github/workflows/cicd.yml

@@ -68,10 +68,10 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 
@@ -82,10 +82,10 @@ jobs:
           exclude_paths: 'migrations'
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-$(echo ${{ hashFiles('Dockerfile') }} | head -c 16)
@@ -101,7 +101,7 @@ jobs:
         run: echo "VUE_DEVTOOLS=True" >> $GITHUB_ENV
 
       - name: Build App Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           target: app-container
           tags: ${{ needs.context.outputs.image_tag }}
@@ -112,7 +112,7 @@ jobs:
           cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Build Test Image
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           target: app-test-container
           tags: app-test-container
@@ -141,7 +141,7 @@ jobs:
           image_tag: ${{ needs.context.outputs.image_tag }}
           gcp_json_key: ${{ secrets.GCP_JSON_KEY }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: python-coverage
           path: .coverage.*
@@ -157,9 +157,9 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -180,9 +180,9 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -211,7 +211,7 @@ jobs:
           apt install lcov -y
           lcov -a lcov-jest.info -a coverage/lcov.info -o lcov.info
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: jest-cypress-coverage
           path: lcov.info
@@ -222,18 +222,18 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: python-coverage
 
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: jest-cypress-coverage
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 
@@ -265,7 +265,7 @@ jobs:
 
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Deployment Pipeline
         if: >-
@@ -301,7 +301,7 @@ jobs:
       - name: 'Surface context from executed build step'
         id: context
         shell: bash
-        run: echo "::set-output name=context::$(< ${CONTEXT_FILENAME})"
+        run: echo "context=$(< ${CONTEXT_FILENAME})" >> $GITHUB_OUTPUT
 
   housekeeping:
     if: github.event_name == 'push' &&

docker/prod-values.yml

@@ -187,7 +187,7 @@ environmentVariables:
   - name: BOOKSTORE_ENV
     value: PROD
   - name: BOOK_POOL_SIZE
-    value: "20"
+    value: "25"
   - name: BOOK_TIMEOUT
     value: "15"
 
@@ -215,7 +215,7 @@ environmentVariables:
   - name: GRAD_ENV
     value: PROD
   - name: GRAD_POOL_SIZE
-    value: "10"
+    value: "15"
   - name: GRAD_TIMEOUT
     value: "10"
 
@@ -238,14 +238,14 @@ environmentVariables:
   - name: HFS_TIMEOUT
     value: "5"
   - name: HFS_POOL_SIZE
-    value: "20"
+    value: "30"
 
   - name: IASYSTEM_UW_ENV
     value: PROD
   - name: IASYSTEM_UW_TIMEOUT
     value: "10"
   - name: IASYSTEM_UW_POOL_SIZE
-    value: "15"
+    value: "20"
 
   - name: IASYSTEM_UWB_ENV
     value: PROD
@@ -285,7 +285,7 @@ environmentVariables:
   - name: LIBRARIES_ENV
     value: PROD
   - name: LIBRARIES_POOL_SIZE
-    value: "20"
+    value: "30"
   - name: LIBRARIES_TIMEOUT
     value: "7"
 
@@ -303,7 +303,7 @@ environmentVariables:
   - name: MYPLAN_TIMEOUT
     value: "10"
   - name: MYPLAN_POOL_SIZE
-    value: "20"
+    value: "30"
 
   - name: PWS_ENV
     value: PROD
@@ -315,9 +315,9 @@ environmentVariables:
   - name: SDBMYUW_ENV
     value: PROD
   - name: SDBMYUW_POOL_SIZE
-    value: "15"
+    value: "20"
   - name: SDBMYUW_TIMEOUT
-    value: "10"
+    value: "15"
 
   - name: SWS_ENV
     value: PROD
@@ -339,7 +339,7 @@ environmentVariables:
   - name: UWNETID_ENV
     value: PROD
   - name: UWNETID_POOL_SIZE
-    value: "20"
+    value: "30"
   - name: UWNETID_TIMEOUT
     value: "10"
 

docker/test-values.yml

@@ -232,7 +232,7 @@ environmentVariables:
     value: EVAL
 
   - name: UPASS_ENV
-    value: EVAL
+    value: PROD
   - name: UPASS_POOL_SIZE
     value: "5"
   - name: UPASS_TIMEOUT

myuw/dao/degree.py

@@ -10,8 +10,9 @@
 from myuw.dao import is_using_file_dao, get_netid_of_current_user
 from myuw.dao.pws import get_regid_of_current_user
 from myuw.dao.term import (
-    last_4w_inst, during_april_may, is_cur_term_before, is_cur_term_same)
-from myuw.dao.term import more_than_2terms_before as before_display_window
+    last_4instruction_weeks, during_april_may,
+    is_cur_term_before, is_cur_term_same,
+    within_2terms_after_given_term)
 
 
 def get_degrees(request):
@@ -38,18 +39,22 @@ def get_degrees_json(request):
     try:
         degrees = []
         for degree in get_degrees(request):
-            if degree.is_granted():
-                # Exclude if the degree earned term is older
-                if before_display_window(request, degree.year, degree.quarter):
-                    continue
             json_data = degree.json_data()
-            during_april_may, is_cur_term_before, is_cur_term_same
             json_data["is_degree_earned_term"] = is_cur_term_same(
                 request, degree.year, degree.quarter)
             json_data["before_degree_earned_term"] = is_cur_term_before(
                 request, degree.year, degree.quarter)
             json_data["during_april_may"] = during_april_may(request)
-            json_data["last_4w_inst"] = last_4w_inst(request)
+            if degree.has_applied():
+                json_data["last_4_inst_weeks_in_degree_term"] = (
+                    last_4instruction_weeks(
+                        request, degree.year, degree.quarter)
+                )  # MUWM-5195
+            if degree.is_granted():
+                json_data["within_2terms_after_granted"] = (
+                    within_2terms_after_given_term(
+                        request, degree.year, degree.quarter)
+                )  # MUWM-5195
             degrees.append(json_data)
         response['degrees'] = degrees
     except DataFailureException as ex:

myuw/dao/term.py

@@ -11,10 +11,10 @@
 from uw_sws import SWS_TIMEZONE, sws_now
 from uw_sws.util import convert_to_begin_of_day, convert_to_end_of_day
 from uw_sws.section import is_a_term, is_b_term, is_full_summer_term
-from uw_sws.term import get_term_by_date, get_specific_term, \
-    get_current_term, get_next_term, get_previous_term, \
-    get_term_before, get_term_after, get_next_autumn_term, \
-    get_next_non_summer_term
+from uw_sws.term import (
+    get_term_by_date, get_specific_term, get_current_term,
+    get_term_before, get_term_after, get_next_autumn_term,
+    get_next_non_summer_term)
 from restclients_core.exceptions import DataFailureException
 from myuw.dao import is_using_file_dao
 
@@ -139,24 +139,29 @@ def is_cur_term_same(request, year, quarter):
     return current_term == comparison_term
 
 
-def more_than_2terms_before(request, year, quarter):
+def within_2terms_after_given_term(request, year, quarter):
     """
     return True if year+quarter is more than 2 terms before current term
     """
-    comparison_term = get_specific_term(year, quarter)
     current_term = get_current_quarter(request)
-    prev_term = get_term_before(current_term)
-    pprev_term = get_term_before(prev_term)
-    return comparison_term < pprev_term
+    comparison_term = get_specific_term(year, quarter)
+    next_term = get_term_after(comparison_term)
+    nnext_term = get_term_after(next_term)
+    return (current_term == comparison_term or
+            current_term == next_term or
+            current_term == nnext_term)
 
 
-def last_4w_inst(request):
+def last_4instruction_weeks(request, year, quarter):
     """
     return True if it is four weeks prior last day class of the term
     """
+    current_term = get_current_quarter(request)
+    comparison_term = get_specific_term(year, quarter)
     comparison_dt = get_comparison_datetime(request)
     starting_point = get_bod_days_before_last_instruction(request, 28)
-    return comparison_dt > starting_point
+    return (
+        current_term == comparison_term and comparison_dt > starting_point)
 
 
 def get_term_from_quarter_string(quarter_string):

myuw/dao/textbook.py

@@ -7,16 +7,18 @@
 
 from uw_bookstore import Bookstore
 
+bookstore = Bookstore()
+
 
 def get_textbook_by_schedule(schedule):
     """
     returns textbooks for a valid schedule
     """
-    return Bookstore().get_books_for_schedule(schedule)
+    return bookstore.get_books_for_schedule(schedule)
 
 
 def get_order_url_by_schedule(schedule):
     """
     returns a link to the bookstore ordering page for a given schedule
     """
-    return Bookstore().get_url_for_schedule(schedule)
+    return bookstore.get_url_for_schedule(schedule)

myuw/dao/upass.py

@@ -9,8 +9,9 @@
 from uw_upass import get_upass_status
 from myuw.dao import get_netid_of_current_user
 from myuw.dao.gws import is_student
-from myuw.dao.term import Term, get_comparison_datetime,\
-    get_current_quarter, get_next_quarter
+from myuw.dao.term import (
+    Term, get_comparison_datetime, get_current_quarter,
+    get_bod_days_before_last_instruction)
 
 
 def _get_upass_status(request):
@@ -23,29 +24,11 @@ def get_upass(request):
     """
     status = _get_upass_status(request)
     ret_json = status.json_data()
-
-    if status.is_current:
-        ret_json['display_activation'] = (status.is_employee or
-                                          around_qtr_begin(request))
-    if status.is_student or is_student(request):
+    if is_student(request):
         ret_json['in_summer'] = in_summer_display_window(request)
-
     return ret_json
 
 
-def around_qtr_begin(request):
-    """
-    Between 7 days before the 1st day of class to 14 days after it
-    """
-    now = get_comparison_datetime(request)
-    term = get_current_quarter(request)
-    if now > term.get_eod_last_instruction():
-        term = get_next_quarter(request)
-    start = term.get_bod_first_day() - timedelta(days=7)
-    end = term.get_bod_first_day() + timedelta(days=15)
-    return (now > start and now < end)
-
-
 def in_summer_display_window(request):
     """
     Between the last day of class in spring quarter
@@ -55,7 +38,7 @@ def in_summer_display_window(request):
     now = get_comparison_datetime(request)
     cur_term = get_current_quarter(request)
     if cur_term.quarter.lower() == Term.SPRING:
-        return now > (cur_term.get_eod_last_instruction() - timedelta(days=1))
+        return now > get_bod_days_before_last_instruction(request, 1)
     if cur_term.is_summer_quarter():
         return True
     if cur_term.quarter.lower() == Term.AUTUMN:

myuw/resources/book/file/uw/json_utf8_202007.ubs_quarter_autumn_sln1_21838_returnlink_t

@@ -0,0 +1,3 @@
+{
+  "21838": []
+}