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

Qa

Author: fanglinfang

myuw/data/resource_link_import.csv

@@ -56,16 +56,18 @@ Services for Faculty and Staff,Finance and Procurement,all,,,https://finance.uw.
 Services for Faculty and Staff,Finance and Procurement,all,"http://wd5.myworkday.com/uw/login.htmld	",Workday,,,,,,,no
 Services for Faculty and Staff,Others,all,http://registrar.washington.edu/staffandfaculty/electronic-academic-records-system-ears,Electronic Advising Records System (EARS),,,,,,,no
 Services for Faculty and Staff,Others,all,,,https://itconnect.uw.edu/,IT Connect,https://www.uwb.edu/it,Information Technologies,https://www.tacoma.uw.edu/uwt/it,Information Technology,no
-Services for Faculty and Staff,Others,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Software and Hardware,,,,,,,
+Services for Faculty and Staff,Others,all,https://itconnect.uw.edu/tools-services-support/software-computers/uware/,Software and Hardware,,,,,,,no
 Services for Faculty and Staff,Others,all,,,https://www.ehs.washington.edu/,Environmental Health & Safety,https://www.uwb.edu/safety/ehs-emergency/environment-health-safety,Environmental Health & Safety,https://www.tacoma.uw.edu/fa/environmental-health-safety,Environmental Health & Safety,no
 Services for Faculty and Staff,Others,all,,,https://facilities.uw.edu/,UW Facilities,https://www.uwb.edu/facilities/,Facilities and Campus Operations,https://www.tacoma.uw.edu/fa/facilities,Facilities Services,no
 Services for Faculty and Staff,Others,all,,,https://facilities.uw.edu/services/requests,UW Facilities: Request Service,http://dlweb.megamation.com/uwb/DLWEB.php/O4W_INFO_PAGE,Facilities Maintenance Request,https://www.tacoma.uw.edu/fa/facilities/work-order-request,Facilities Services: Work Order Request,no
+Services for Faculty and Staff,Others,all,https://astra.admin.uw.edu/astra/,ASTRA,,,,,,,no
 Campus Life,Campus Retail,all,,,http://www.bookstore.washington.edu/student_faculty/student_faculty.taf?verba=uwseattle,University Book Store,http://www.bookstore.washington.edu/student_faculty/student_faculty.taf?verba=uwbothell,University Book Store,http://www.bookstore.washington.edu/student_faculty/student_faculty.taf?verba=uwtacoma,University Book Store,no
 Campus Life,Campus Safety,all,,,https://www.washington.edu/safety/,Campus Safety,https://www.uwb.edu/safety,Campus Safety Department,https://www.tacoma.uw.edu/uwt/fa/safety/,Campus Safety & Security,no
 Campus Life,Campus Safety,all,http://www.washington.edu/safecampus/,SafeCampus,,,,,,,no
 Campus Life,Campus Safety,all,,,https://www.ehs.washington.edu/,Environmental Health & Safety,https://www.uwb.edu/safety/ehs-emergency/environment-health-safety,Environmental Health & Safety,https://www.tacoma.uw.edu/fa/environmental-health-safety,Environmental Health & Safety,no
 Campus Life,Campus Safety,all,https://cspc.admin.uw.edu/mychem,MyChem,,,,,,,no
 Campus Life,Campus Safety,all,,,https://www.washington.edu/uwem/,UW Emergency Management,https://www.uwb.edu/emergency,UW Bothell Emergency Page,https://www.tacoma.uw.edu/fa/safety/emergency-preparedness,UW Tacoma Emergency Response,no
+Campus Life,Campus Safety,all,https://www.washington.edu/titleix/report/,Make a Title IX report,,,,,,,no
 Campus Life,Getting Around Campus,all,,,http://www.washington.edu/maps/,Campus Map,https://www.uwb.edu/wp-content/uploads/2023/09/uw-bothell-campus-map.pdf,Campus Map,http://www.tacoma.uw.edu/campus-map/campus-map,Campus Map,no
 Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/park-directions,Getting to Seattle Campus,http://www.uwb.edu/visitors/directions,Getting to UW Bothell Campus,https://www.tacoma.uw.edu/fa/facilities/transportation/parking-and-transportation-resources#permalink-19448,Getting to UW Tacoma Campus,no
 Campus Life,Getting Around Campus,all,,,https://facilities.uw.edu/transportation/student-u-pass,U-PASS for Students,https://www.uwb.edu/commuter-services/transportation/upass,U-PASS,https://www.tacoma.uw.edu/uwt/fa/facilities/transportation/u-pass,U-PASS,no
@@ -97,10 +99,11 @@ Campus Life,Support Services,all,http://grad.uw.edu/diversity/go-map/,Graduate O
 Campus Life,Support Services,all,https://sites.uw.edu/qcenter/,Q Center,,,,,,,no
 Campus Life,Support Services,all,http://depts.washington.edu/womenctr/,Women's Center,,,,,,,no
 Campus Life,Support Services,all,https://www.washington.edu/ombud/,Office of the Ombud,,,,,,,no
-Campus Life,Support Services,all,https://www.washington.edu/compliance/titleix/,Discrimination and Title IX Compliance,,,,,,,no
+Campus Life,Support Services,all,https://www.washington.edu/compliance/titleix/,Office of the Title IX Coordinator,,,,,,,no
 Campus Life,Support Services,all,http://www.washington.edu/bias/,Reporting Bias Incidents,,,,,,,no
 Campus Life,Support Services,all,http://www.washington.edu/sexualassault/,Sexual Assault Resources,,,,,,,no
 Campus Life,Support Services,all,http://depts.washington.edu/slsuw/,Student Legal Services,,,,,,,no
+Campus Life,Support Services,all,https://www.washington.edu/cr-investigations/,Civil Rights Investigation Office,,,,,,,no
 Employment,Employment Resources,all,,,http://careers.uw.edu/,Career & Internship Center,http://www.bothell.washington.edu/careers,Career Services,https://www.tacoma.uw.edu/uwt/career,Career Development,no
 Employment,Employment Resources,all,https://wd5.myworkday.com/uw/d/home.htmld,Workday,,,,,,,no
 Employment,Employment Resources,all,https://prp.admin.uw.edu/legacyess,Legacy ESS,,,,,,,no

myuw/test/api/test_books.py

@@ -0,0 +1,38 @@
+# Copyright 2023 UW-IT, University of Washington
+# SPDX-License-Identifier: Apache-2.0
+
+import json
+from myuw.test.api import require_url, MyuwApiTest
+from myuw.dao.registration import get_schedule_by_term
+from myuw.dao.instructor_schedule import get_instructor_schedule_by_term
+from myuw.views.api.textbook import (
+    get_textbook_by_schedule, _get_schedule_textbooks, index_by_sln)
+from myuw.test import get_request_with_user, get_request_with_date
+
+
+@require_url('myuw_current_book')
+class TestInstructorTextbookCur(MyuwApiTest):
+
+    def test_get(self):
+        self.set_user('billpce')
+        self.set_date("2013-10-16 09:00:00")
+        resp = self.get_response_by_reverse('myuw_current_book')
+        data = json.loads(resp.content)
+        self.assertEqual(data, {'21838': []})
+
+    def test_get_uwt_inst_textbook(self):
+        # MUWM-5311: uwt no longer has books
+        req = get_request_with_user('billtac',
+                                    get_request_with_date("2013-04-01"))
+        schedule = get_instructor_schedule_by_term(req)
+        bkData = get_textbook_by_schedule(schedule)
+        self.assertEqual(bkData, {})
+        self.assertEqual(index_by_sln(bkData), {})
+
+        data = _get_schedule_textbooks(schedule)
+        self.assertEqual(data, {})
+
+        self.set_user('billtac')
+        resp = self.get_response_by_reverse('myuw_current_book')
+        data = json.loads(resp.content)
+        self.assertEqual(data, {})

myuw/test/api/test_instructor_textbook.py

@@ -2,15 +2,54 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import json
-from myuw.test.api import require_url, MyuwApiTest
+from myuw.test.api import MyuwApiTest, require_url, fdao_bookstore_override
+from myuw.test import get_request_with_user, get_request_with_date
 
 
-@require_url('myuw_current_book')
-class TestInstructorTextbookCur(MyuwApiTest):
+VERBACOMPARE_URL_PREFIX = 'http://uw-seattle.verbacompare.com'
+IMAGE_URL_PREFIX = 'www7.bookstore.washington.edu/MyUWImage.taf'
 
-    def test_get(self):
-        self.set_user('billpce')
-        self.set_date("2013-10-16 09:00:00")
-        resp = self.get_response_by_reverse('myuw_current_book')
-        data = json.loads(resp.content)
-        self.assertEqual(data, {'21838': []})
+
+@fdao_bookstore_override
+class TestApiBooks(MyuwApiTest):
+    '''Tests textbooks api'''
+
+    @require_url('myuw_home')
+    def test_javerage_books(self):
+        self.set_user('javerage')
+        response = self.get_response_by_reverse(
+            'myuw_book_api',
+            kwargs={'year': 2013,
+                    'quarter': 'spring',
+                    'summer_term': ''})
+        self.assertEquals(response.status_code, 200)
+
+        data = json.loads(response.content)
+
+        self.assertEquals(data["order_url"],
+                          ('http://www.ubookstore.com/adoption-search' +
+                           '-results?ccid=9335,1132,5320,2230,4405'))
+
+        self.assertGreaterEqual(len(data['18532']), 1)
+        book = data['18532'][0]
+        self.assertEquals(
+            book["cover_image_url"],
+            ("%s?isbn=9780878935970&key=46c9ef715edb2ec69517e2c8e6ec9c18" %
+             IMAGE_URL_PREFIX))
+        self.assertEquals(len(book["authors"]), 1)
+        self.assertTrue(book["is_required"])
+        self.assertIsNone(book["price"])
+        self.assertIsNone(book["used_price"])
+        self.assertEquals(book["isbn"], '9780878935970')
+        self.assertEquals(book["notes"], 'required')
+        self.assertIsNone(book["price"])
+
+    @require_url('myuw_home')
+    def test_no_sche_books(self):
+        self.set_user('billtac')  # MUWM-5311
+        response = self.get_response_by_reverse(
+            'myuw_book_api',
+            kwargs={'year': 2013,
+                    'quarter': 'spring',
+                    'summer_term': ''})
+        self.assertEquals(response.status_code, 200)

myuw/test/api/test_textbook.py

@@ -46,8 +46,15 @@ def test_get_order_url_by_schedule(self):
     def test_get_inst_textbook(self):
         req = get_request_with_user('billpce',
                                     get_request_with_date("2013-10-01"))
-        term = get_current_quarter(req)
         schedule = get_instructor_schedule_by_term(req)
 
         books = get_textbook_by_schedule(schedule)
         self.assertEquals(len(books), 1)
+
+    def test_get_uwt_inst_textbook(self):
+        req = get_request_with_user('billtac',
+                                    get_request_with_date("2013-04-01"))
+        schedule = get_instructor_schedule_by_term(req)
+        self.assertEqual(len(schedule.sections), 3)
+        books = get_textbook_by_schedule(schedule)
+        self.assertEquals(len(books), 0)

myuw/test/dao/test_textbook.py

@@ -42,7 +42,7 @@ def respond(self, timer, request, term, summer_term):
             try:
                 schedule = get_schedule_by_term(
                     request, term=term, summer_term=summer_term)
-                by_sln.update(self._get_schedule_textbooks(schedule))
+                by_sln.update(_get_schedule_textbooks(schedule))
 
                 order_url = get_order_url_by_schedule(schedule)
                 if order_url:
@@ -55,14 +55,15 @@ def respond(self, timer, request, term, summer_term):
             try:
                 schedule = get_instructor_schedule_by_term(
                     request, term=term, summer_term="full-term")
-                by_sln.update(self._get_schedule_textbooks(schedule))
+                by_sln.update(_get_schedule_textbooks(schedule))
             except DataFailureException as ex:
                 if ex.status != 404:
                     raise
 
-            if len(by_sln) == 0:
-                log_data_not_found_response(logger, timer)
-                return data_not_found()
+            # MUWM-5311: uwt no longer has books
+            # if len(by_sln) == 0:
+            #    log_data_not_found_response(logger, timer)
+            #    return data_not_found()
 
             log_api_call(timer, request, "Get Textbook for {}.{}".format(
                 term.year, term.quarter))
@@ -71,12 +72,13 @@ def respond(self, timer, request, term, summer_term):
         except Exception:
             return handle_exception(logger, timer, traceback)
 
-    def _get_schedule_textbooks(self, schedule):
-        by_sln = {}
-        if schedule and len(schedule.sections):
-            book_data = get_textbook_by_schedule(schedule)
-            by_sln.update(index_by_sln(book_data))
-        return by_sln
+
+def _get_schedule_textbooks(schedule):
+    by_sln = {}
+    if schedule and len(schedule.sections):
+        book_data = get_textbook_by_schedule(schedule)
+        by_sln.update(index_by_sln(book_data))
+    return by_sln
 
 
 def index_by_sln(book_data):

myuw/views/api/textbook.py

@@ -30,39 +30,26 @@
           </li>
         </template>
         <li v-if="section.sln" class="mb-1">
-          <a
-            :href="textbookHref"
-            :title="`Textbooks of ${section.label}`"
-          >
-            Textbooks
-          </a>
+          <uw-textbook :section="section" />
         </li>
       </ul>
     </div>
   </div>
 </template>
 
 <script>
+import TextbookLink from '../textbook.vue';
 export default {
+  components: {
+    'uw-textbook': TextbookLink,
+  },
   props: {
     section: {
       type: Object,
       required: true,
     },
   },
   computed: {
-    textbookHref() {
-      let url = `/textbooks/${this.section.year},${this.section.quarter}`;
-
-      if (this.section.requestSummerTerm) {
-        url += `,${this.section.requestSummerTerm.toLowerCase()}`;
-      }
-      url += `/${this.section.curriculum_abbr}${
-        this.section.course_number
-      }${this.section.section_id}`;
-
-      return url;
-    },
     hasResources() {
       return (
         this.section.class_website_url ||

myuw_vue/components/_common/course/student/resources.vue

@@ -0,0 +1,50 @@
+<template>
+  <a
+    :href="uwtCourse ? uwtTextbookUrl : textbookPageUrl"
+    :title="`Textbooks of ${section.label}`"
+  >Textbooks</a>
+</template>
+
+<script>
+export default {
+  props: {
+    section: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    termId() {
+      if (this.section.quarter.toLowerCase() === "winter") return "1";
+      if (this.section.quarter.toLowerCase() === "spring") return "2";
+      if (this.section.quarter.toLowerCase() === "summer") return "3";
+      return "4";
+    },
+    uwtTextbookUrl() {
+      // MUWM-5311
+      return (
+        "https://www.bkstr.com/webApp/discoverView?" +
+        "bookstore_id-1=2335&div-1=&term_id-1=" +
+         String(this.section.year) + this.termId +
+        "&dept-1=" + encodeURIComponent(this.section.curriculum_abbr) +
+        "&course-1=" + this.section.course_number +
+        "&section-1=" + this.section.section_id);
+    },
+    uwtCourse() {
+      return this.section.course_campus.toLowerCase() === 'tacoma';
+    },
+    textbookPageUrl() {
+      let url = `/textbooks/${this.section.year},${this.section.quarter}`;
+
+      if (this.section.requestSummerTerm) {
+        url += `,${this.section.requestSummerTerm.toLowerCase()}`;
+      }
+      url += (
+        '#' + this.section.curriculum_abbr +
+        this.section.course_number + this.section.section_id);
+
+      return url;
+    },
+  },
+};
+</script>