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

Qa

Author: fanglinfang

myuw/dao/__init__.py

@@ -1,17 +1,60 @@
+import os
+from django.conf import settings
 from restclients.dao import SWS_DAO
-from myuw.dao.pws import get_netid_of_current_user
+from userservice.user import UserService
 from myuw.models import User
 
 
+def get_netid_of_current_user():
+    return UserService().get_user()
+
+
 def get_user_model():
     user_netid = get_netid_of_current_user()
-
     user, created = User.objects.get_or_create(uwnetid=user_netid)
-
     return user
 
 
 def is_using_file_dao():
     dao = SWS_DAO()._getDAO()
     class_name = dao.__class__.__name__
     return class_name == "File" or class_name == "ByWeek"
+
+
+THRIVE = "thrive"
+OPTIN = "optin"
+
+
+def _is_optin_user(uwnetid):
+    return _is_netid_in_list(uwnetid, OPTIN)
+
+
+def is_fyp_thrive_viewer(uwnetid):
+    return _is_netid_in_list(uwnetid, THRIVE)
+
+
+def _is_netid_in_list(username, user_type):
+    if THRIVE == user_type:
+        file_path = getattr(settings, "MYUW_MANDATORY_SWITCH_PATH", None)
+        if not file_path:
+            current_dir = os.path.dirname(os.path.realpath(__file__))
+
+            file_path = os.path.abspath(os.path.join(current_dir,
+                                                     "..", "data",
+                                                     "thrive-viewer-list.txt"))
+
+    else:
+        file_path = getattr(settings, "MYUW_OPTIN_SWITCH_PATH", None)
+        if not file_path:
+            current_dir = os.path.dirname(os.path.realpath(__file__))
+
+            file_path = os.path.abspath(os.path.join(current_dir,
+                                                     "..", "data",
+                                                     "optin-list.txt"))
+
+    with open(file_path) as data_source:
+        for line in data_source:
+            if line.rstrip() == username:
+                return True
+
+    return False

myuw/dao/affiliation.py

@@ -2,25 +2,20 @@
 This module provides affiliations of the current user
 """
 
-import os
-import json
 import logging
 import traceback
 from django.conf import settings
 from myuw.logger.logback import log_info, log_exception
+from myuw.dao import is_fyp_thrive_viewer, get_netid_of_current_user
 from myuw.dao.schedule import get_current_quarter_schedule
-from myuw.dao.pws import get_netid_of_current_user
 from myuw.dao.gws import is_grad_student, is_student,\
     is_current_graduate_student, is_undergrad_student,\
     is_pce_student, is_student_employee, is_employee, is_faculty,\
     is_seattle_student, is_bothell_student, is_tacoma_student,\
     is_staff_employee
 from myuw.dao.enrollment import get_main_campus
-from myuw.models import UserMigrationPreference
 
 
-THRIVE = "thrive"
-OPTIN = "optin"
 logger = logging.getLogger(__name__)
 
 
@@ -83,6 +78,10 @@ def get_all_affiliations(request):
     return data
 
 
+def is_thrive_viewer():
+    return is_fyp_thrive_viewer(get_netid_of_current_user())
+
+
 def _get_campuses_by_schedule(schedule):
     """
     Returns a dictionary indicating the campuses that the student
@@ -164,68 +163,3 @@ def get_base_campus(request):
             campus = ""
             pass
     return campus
-
-
-def is_oldmyuw_user():
-    if has_legacy_preference():
-        return True
-    if is_optin_user():
-        return False
-    if is_staff_employee():
-        return True
-    if is_faculty():
-        return True
-    if is_current_graduate_student():
-        return True
-    if is_undergrad_student():
-        return False
-    return True
-
-
-def has_legacy_preference():
-    username = get_netid_of_current_user()
-
-    try:
-        saved = UserMigrationPreference.objects.get(username=username)
-        if saved.use_legacy_site:
-            return True
-    except UserMigrationPreference.DoesNotExist:
-        return False
-    return False
-
-
-def is_optin_user():
-    return _is_user_in_list(
-        get_netid_of_current_user(), OPTIN)
-
-
-def is_thrive_viewer():
-    return _is_user_in_list(
-        get_netid_of_current_user(), THRIVE)
-
-
-def _is_user_in_list(username, user_type):
-    if THRIVE == user_type:
-        file_path = getattr(settings, "MYUW_MANDATORY_SWITCH_PATH", None)
-        if not file_path:
-            current_dir = os.path.dirname(os.path.realpath(__file__))
-
-            file_path = os.path.abspath(os.path.join(current_dir,
-                                                     "..", "data",
-                                                     "thrive-viewer-list.txt"))
-
-    else:
-        file_path = getattr(settings, "MYUW_OPTIN_SWITCH_PATH", None)
-        if not file_path:
-            current_dir = os.path.dirname(os.path.realpath(__file__))
-
-            file_path = os.path.abspath(os.path.join(current_dir,
-                                                     "..", "data",
-                                                     "optin-list.txt"))
-
-    with open(file_path) as data_source:
-        for line in data_source:
-            if line.rstrip() == username:
-                return True
-
-    return False

myuw/dao/gws.py

@@ -6,9 +6,9 @@
 import logging
 from django.conf import settings
 from restclients.gws import GWS
-from myuw.dao.pws import get_netid_of_current_user
 from myuw.logger.timer import Timer
 from myuw.logger.logback import log_resp_time, log_exception
+from myuw.dao import get_netid_of_current_user
 
 
 logger = logging.getLogger(__name__)

myuw/dao/hfs.py

@@ -7,7 +7,7 @@
 from restclients.hfs.idcard import get_hfs_accounts
 from restclients.exceptions import DataFailureException
 from myuw.logger.logback import log_exception
-from myuw.dao.pws import get_netid_of_current_user
+from myuw.dao import get_netid_of_current_user
 
 
 logger = logging.getLogger(__name__)

myuw/dao/pws.py

@@ -6,15 +6,12 @@
 import logging
 from django.conf import settings
 from restclients.pws import PWS
-from userservice.user import UserService
 from myuw.logger.timer import Timer
 from myuw.logger.logback import log_resp_time, log_exception, log_info
-
-logger = logging.getLogger(__name__)
+from myuw.dao import get_netid_of_current_user
 
 
-def get_netid_of_current_user():
-    return UserService().get_user()
+logger = logging.getLogger(__name__)
 
 
 def _get_person_of_current_user():

myuw/dao/user.py

@@ -0,0 +1,60 @@
+import logging
+from myuw.models import UserMigrationPreference
+from myuw.dao import _is_optin_user as is_optin_user
+from myuw.dao import get_netid_of_current_user
+from myuw.dao.gws import is_staff_employee, is_student_employee,\
+    is_undergrad_student, is_current_graduate_student, is_employee, is_faculty
+
+
+logger = logging.getLogger(__name__)
+
+
+def set_preference_to_new_myuw(uwnetid):
+    obj, is_new = UserMigrationPreference.objects.get_or_create(
+        username=uwnetid)
+    obj.use_legacy_site = False
+    obj.save()
+
+
+def set_preference_to_old_myuw(uwnetid):
+    obj, is_new = UserMigrationPreference.objects.get_or_create(
+        username=uwnetid)
+    obj.use_legacy_site = True
+    obj.save()
+
+
+def has_legacy_preference(uwnetid):
+    try:
+        saved = UserMigrationPreference.objects.get(username=uwnetid)
+        if saved.use_legacy_site:
+            return True
+    except UserMigrationPreference.DoesNotExist:
+        pass
+    return False
+
+
+def has_newmyuw_preference(uwnetid):
+    try:
+        saved = UserMigrationPreference.objects.get(username=uwnetid)
+        if saved and not saved.use_legacy_site:
+            return True
+    except UserMigrationPreference.DoesNotExist:
+        pass
+    return False
+
+
+def is_oldmyuw_user():
+    uwnetid = get_netid_of_current_user()
+    if has_legacy_preference(uwnetid):
+        return True
+    if is_optin_user(uwnetid) or has_newmyuw_preference(uwnetid):
+        return False
+    if is_staff_employee():
+        return True
+    if is_faculty():
+        return True
+    if is_current_graduate_student():
+        return True
+    if is_undergrad_student():
+        return False
+    return True

myuw/dao/uwemail.py

@@ -6,7 +6,7 @@
 import logging
 from restclients.uwnetid.subscription import get_email_forwarding
 from restclients.exceptions import DataFailureException
-from myuw.dao.pws import get_netid_of_current_user
+from myuw.dao import get_netid_of_current_user
 
 
 logger = logging.getLogger(__name__)

myuw/management/commands/check_preference.py

@@ -20,12 +20,14 @@ class Command(BaseCommand):
         '4. Move the mapping file into myuw/dao/;\n' +\
         '5. Add and commit the notice_categorization.py'
 
-    args = "<spreadsheet csv path>, <outfile>"
+    def add_arguments(self, parser):
+        parser.add_argument('spreadsheet-csv-path')
+        parser.add_argument('outfile')
 
     def handle(self, *args, **options):
         try:
-            csv_path = args[0]
-            outfile = args[1]
+            csv_path = options['spreadsheet-csv-path']
+            outfile = options['outfile']
             output_string = "NOTICE_CATEGORIES = {\n"
             with open(csv_path, "rb") as f_obj:
                 reader = csv.reader(f_obj)

myuw/management/commands/notice_mapping.py

@@ -0,0 +1,14 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+</head>
+<body>
+    <div class="group">
+        <span class="member" type="eff_member">currgrad</span>
+        <div class="parent_group">
+            <a rel="parent_group" class="group"  href='/restclients/view/gws/group_sws/v2/group/uw_affiliation_graduate-grad/'>uw_affiliation_graduate-grad</a>
+        </div>
+    </div>
+    <div class="status">{status}</div>
+</body>
+</html>

myuw/resources/gws/file/group_sws/v2/group/uw_affiliation_graduate-grad/effective_member/currgrad

@@ -0,0 +1,50 @@
+from django.test.utils import override_settings
+from django.test.client import RequestFactory
+from django.contrib.auth.models import User
+from userservice.user import UserServiceMiddleware
+
+FDAO_SWS = 'restclients.dao_implementation.sws.File'
+fdao_sws_override = override_settings(
+    RESTCLIENTS_SWS_DAO_CLASS=FDAO_SWS)
+
+FDAO_PWS = 'restclients.dao_implementation.pws.File'
+fdao_pws_override = override_settings(
+    RESTCLIENTS_PWS_DAO_CLASS=FDAO_PWS
+)
+
+
+def get_request():
+    """
+    mock request with UserServiceMiddleware initialization
+    """
+    now_request = RequestFactory().get("/")
+    now_request.session = {}
+    UserServiceMiddleware().process_request(now_request)
+    return now_request
+
+
+def get_request_with_date(date_str):
+    now_request = get_request()
+    if date_str:
+        now_request.session["myuw_override_date"] = date_str
+    return now_request
+
+
+def get_request_with_user(username, now_request=None):
+    if now_request is None:
+        now_request = get_request()
+    now_request.user = get_user(username)
+    return now_request
+
+
+def get_user(username):
+    try:
+        user = User.objects.get(username=username)
+        return user
+    except Exception as ex:
+        user = User.objects.create_user(username, password='pass')
+        return user
+
+
+def get_user_pass(username):
+    return 'pass'