Skip to content

Commit cf73a1c

Browse files
fanglinfangfanglinfang
authored
Revert "muwm 5352"
1 parent 8a39ebf commit cf73a1c

File tree

33 files changed

+124
-281
lines changed

33 files changed

+124
-281
lines changed

‎docker/test-values.yml

+17-17
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ environmentVariables:
160160
- name: BOOKSTORE_ENV
161161
value: PROD
162162
- name: BOOK_TIMEOUT
163-
value: "45"
163+
value: "30"
164164

165165
- name: CALENDAR_ENV
166166
value: PROD
167167
- name: CALENDAR_TIMEOUT
168-
value: "15"
168+
value: "5"
169169

170170
- name: CANVAS_ENV
171171
value: PROD
@@ -175,7 +175,7 @@ environmentVariables:
175175
- name: CODA_ENV
176176
value: PROD
177177
- name: CODA_TIMEOUT
178-
value: "15"
178+
value: "5"
179179

180180
- name: GRAD_ENV
181181
value: PROD
@@ -185,54 +185,54 @@ environmentVariables:
185185
- name: GRADEPAGE_ENV
186186
value: PROD
187187
- name: GRADEPAGE_TIMEOUT
188-
value: "10"
188+
value: "5"
189189

190190
- name: GWS_ENV
191191
value: PROD
192192
- name: GWS_TIMEOUT
193-
value: "10"
193+
value: "5"
194194

195195
- name: HFS_ENV
196196
value: PROD
197197
- name: HFS_TIMEOUT
198-
value: "15"
198+
value: "5"
199199

200200
- name: IASYSTEM_UW_ENV
201201
value: PROD
202202
- name: IASYSTEM_UW_TIMEOUT
203-
value: "15"
203+
value: "5"
204204

205205
- name: IASYSTEM_UWB_ENV
206206
value: PROD
207207
- name: IASYSTEM_UWB_TIMEOUT
208-
value: "15"
208+
value: "5"
209209

210210
- name: IASYSTEM_UWT_ENV
211211
value: PROD
212212
- name: IASYSTEM_UWT_POOL_SIZE
213213
value: "10"
214214
- name: IASYSTEM_UWT_TIMEOUT
215-
value: "15"
215+
value: "5"
216216

217217
- name: IASYSTEM_UWEO_AP_ENV
218218
value: PROD
219219
- name: IASYSTEM_UWEO_AP_TIMEOUT
220-
value: "15"
220+
value: "5"
221221

222222
- name: IASYSTEM_UWEO_IELP_ENV
223223
value: PROD
224224
- name: IASYSTEM_UWEO_IELP_TIMEOUT
225-
value: "15"
225+
value: "5"
226226

227227
- name: LIBCURRICS_ENV
228228
value: PROD
229229
- name: LIBCURRICS_TIMEOUT
230-
value: "15"
230+
value: "5"
231231

232232
- name: LIBRARIES_ENV
233233
value: PROD
234234
- name: LIBRARIES_TIMEOUT
235-
value: "15"
235+
value: "5"
236236

237237
- name: MAILMAN_ENV
238238
value: EVAL
@@ -251,19 +251,19 @@ environmentVariables:
251251
- name: PWS_POOL_SIZE
252252
value: "20"
253253
- name: PWS_TIMEOUT
254-
value: "15"
254+
value: "5"
255255

256256
- name: SDBMYUW_ENV
257257
value: PROD
258258
- name: SDBMYUW_TIMEOUT
259-
value: "15"
259+
value: "5"
260260

261261
- name: SWS_ENV
262262
value: EVAL
263263
- name: SWS_POOL_SIZE
264264
value: "20"
265265
- name: SWS_TIMEOUT
266-
value: "45"
266+
value: "5"
267267

268268
- name: SPACE_ENV
269269
value: EVAL
@@ -278,7 +278,7 @@ environmentVariables:
278278
- name: UWNETID_ENV
279279
value: PROD
280280
- name: UWNETID_TIMEOUT
281-
value: "15"
281+
value: "5"
282282

283283
- name: UWIDP_ENV
284284
value: PROD

‎myuw/dao/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@ def _get_file_path(settings_key, filename):
8181
def log_err(logger, msg_str, stacktrace, request):
8282
logger.error(
8383
{**get_userids(request=request),
84-
**{'Msg': msg_str,
85-
'Err': stacktrace.format_exc(chain=False).splitlines()}})
84+
**{'at': msg_str,
85+
'err': stacktrace.format_exc(chain=False).splitlines()}})

‎myuw/dao/student_profile.py

+10-17
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,16 @@ def get_academic_info(request, response):
8989
response['class_level'] = enrollment.class_level.upper()
9090
break
9191

92-
response["pending_residency_change"] = _get_residency_change(
93-
terms, enrollments, response['resident_code'])
92+
for term in terms:
93+
if term in enrollments:
94+
enrollment = enrollments[term]
95+
if enrollment.has_pending_resident_change:
96+
response['has_pending_residency_change'] = True
97+
response['pending_residency_change_term'] = {
98+
'year': term.year,
99+
'quarter': term.quarter
100+
}
101+
break
94102

95103
response['term_majors'] = _get_degrees_for_terms(terms, enrollments,
96104
"majors")
@@ -168,18 +176,3 @@ def _has_only_dropped_degrees(first, second):
168176
has_dropped = len(set(first) - set(second)) > 0
169177
has_added = len(set(second) - set(first)) > 0
170178
return has_dropped and not has_added
171-
172-
def _get_residency_change(terms, enrollments, current_resident_code):
173-
# MUWM-5352
174-
for term in terms:
175-
if term in enrollments:
176-
enrollment = enrollments[term]
177-
if (enrollment.pending_resident_code != current_resident_code and
178-
enrollment.pending_resident_code != "0"):
179-
# MUWM-5352
180-
return {
181-
"pending_resident_code": enrollment.pending_resident_code,
182-
"pending_resident_desc": enrollment.pending_resident_desc,
183-
"term": {"year": term.year, "quarter": term.quarter}
184-
}
185-
return None

‎myuw/resources/sws/file/student/v5/enrollment.json_reg_id_10000000000000000000000000000002_verbose_true_transcriptable_course_all_changed_since_date_

-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
"PendingHonorsChange": false,
3838
"PendingMajorChange": false,
3939
"PendingResidentChange": false,
40-
"PendingResidencyDescription": null,
41-
"PendingResident": "0",
4240
"PendingSpecialProgramChange": false,
4341
"Person": {
4442
"Href": "/student/v5/person/10000000000000000000000000000002.json",

‎myuw/resources/sws/file/student/v5/enrollment.json_reg_id_10000000000000000000000000000010_verbose_true_transcriptable_course_all_changed_since_date_

-6
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
"PendingHonorsChange": false,
3636
"PendingMajorChange": false,
3737
"PendingResidentChange": false,
38-
"PendingResidencyDescription": null,
39-
"PendingResident": "0",
4038
"PendingSpecialProgramChange": false,
4139
"Person": {
4240
"Href": "/student/v5/person/10000000000000000000000000000010.json",
@@ -168,8 +166,6 @@
168166
"PendingHonorsChange": false,
169167
"PendingMajorChange": false,
170168
"PendingResidentChange": false,
171-
"PendingResidencyDescription": null,
172-
"PendingResident": "0",
173169
"PendingSpecialProgramChange": false,
174170
"Person": {
175171
"Href": "/student/v5/person/10000000000000000000000000000010.json",
@@ -378,8 +374,6 @@
378374
"PendingHonorsChange": false,
379375
"PendingMajorChange": false,
380376
"PendingResidentChange": false,
381-
"PendingResidencyDescription": null,
382-
"PendingResident": "0",
383377
"PendingSpecialProgramChange": false,
384378
"Person": {
385379
"Href": "/student/v5/person/10000000000000000000000000000010.json",

‎myuw/resources/sws/file/student/v5/enrollment.json_reg_id_12345678901234567890123456789012_verbose_true_transcriptable_course_all_changed_since_date_

-8
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
"PendingHonorsChange": false,
3333
"PendingMajorChange": false,
3434
"PendingResidentChange": false,
35-
"PendingResidencyDescription": null,
36-
"PendingResident": "0",
3735
"PendingSpecialProgramChange": false,
3836
"Person": {
3937
"Href": "/student/v5/person/12345678901234567890123456789012.json",
@@ -350,8 +348,6 @@
350348
"PendingHonorsChange": false,
351349
"PendingMajorChange": false,
352350
"PendingResidentChange": false,
353-
"PendingResidencyDescription": null,
354-
"PendingResident": "0",
355351
"PendingSpecialProgramChange": false,
356352
"Person": {
357353
"Href": "/student/v5/person/12345678901234567890123456789012.json",
@@ -403,8 +399,6 @@
403399
"PendingHonorsChange": false,
404400
"PendingMajorChange": false,
405401
"PendingResidentChange": false,
406-
"PendingResidencyDescription": null,
407-
"PendingResident": "0",
408402
"PendingSpecialProgramChange": false,
409403
"Person": {
410404
"Href": "/student/v5/person/12345678901234567890123456789012.json",
@@ -461,8 +455,6 @@
461455
"PendingHonorsChange": false,
462456
"PendingMajorChange": false,
463457
"PendingResidentChange": false,
464-
"PendingResidencyDescription": null,
465-
"PendingResident": "0",
466458
"PendingSpecialProgramChange": false,
467459
"Person": {
468460
"Href": "/student/v5/person/12345678901234567890123456789012.json",

‎myuw/resources/sws/file/student/v5/enrollment.json_reg_id_55555333366711D5BE060004AC494FFE_verbose_true_transcriptable_course_all_changed_since_date_

-8
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
"PendingHonorsChange": false,
3737
"PendingMajorChange": false,
3838
"PendingResidentChange": false,
39-
"PendingResidencyDescription": null,
40-
"PendingResident": "0",
4139
"PendingSpecialProgramChange": false,
4240
"Person": {
4341
"Href": "/student/v5/person/55555333366711D5BE060004AC494FFE.json",
@@ -114,8 +112,6 @@
114112
"PendingHonorsChange": false,
115113
"PendingMajorChange": false,
116114
"PendingResidentChange": false,
117-
"PendingResidencyDescription": null,
118-
"PendingResident": "0",
119115
"PendingSpecialProgramChange": false,
120116
"Person": {
121117
"Href": "/student/v5/person/55555333366711D5BE060004AC494FFE.json",
@@ -192,8 +188,6 @@
192188
"PendingHonorsChange": false,
193189
"PendingMajorChange": false,
194190
"PendingResidentChange": false,
195-
"PendingResidencyDescription": null,
196-
"PendingResident": "0",
197191
"PendingSpecialProgramChange": false,
198192
"Person": {
199193
"Href": "/student/v5/person/55555333366711D5BE060004AC494FFE.json",
@@ -270,8 +264,6 @@
270264
"PendingHonorsChange": false,
271265
"PendingMajorChange": false,
272266
"PendingResidentChange": false,
273-
"PendingResidencyDescription": null,
274-
"PendingResident": "0",
275267
"PendingSpecialProgramChange": false,
276268
"Person": {
277269
"Href": "/student/v5/person/55555333366711D5BE060004AC494FF.json",

‎myuw/resources/sws/file/student/v5/enrollment.json_reg_id_9136CCB8F66711D5BE060004AC494001_verbose_true_transcriptable_course_all_changed_since_date_

+1-11
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"PendingHonorsChange": false,
4242
"PendingMajorChange": false,
4343
"PendingResidentChange": false,
44-
"PendingResidencyDescription": null,
45-
"PendingResident": "0",
4644
"PendingSpecialProgramChange": false,
4745
"Person": {
4846
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494001.json",
@@ -363,8 +361,6 @@
363361
"PendingHonorsChange": false,
364362
"PendingMajorChange": false,
365363
"PendingResidentChange": false,
366-
"PendingResidencyDescription": null,
367-
"PendingResident": "0",
368364
"PendingSpecialProgramChange": false,
369365
"Person": {
370366
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494001.json",
@@ -428,9 +424,7 @@
428424
"PendingClassChange": false,
429425
"PendingHonorsChange": false,
430426
"PendingMajorChange": false,
431-
"PendingResidentChange": true,
432-
"PendingResidencyDescription": "RESIDENT IMMIGRANT",
433-
"PendingResident": "2",
427+
"PendingResidentChange": false,
434428
"PendingSpecialProgramChange": false,
435429
"Person": {
436430
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494001.json",
@@ -494,8 +488,6 @@
494488
"PendingHonorsChange": false,
495489
"PendingMajorChange": false,
496490
"PendingResidentChange": false,
497-
"PendingResidencyDescription": null,
498-
"PendingResident": "0",
499491
"PendingSpecialProgramChange": false,
500492
"Person": {
501493
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494001.json",
@@ -538,8 +530,6 @@
538530
"PendingHonorsChange": false,
539531
"PendingMajorChange": false,
540532
"PendingResidentChange": false,
541-
"PendingResidencyDescription": null,
542-
"PendingResident": "0",
543533
"PendingSpecialProgramChange": false,
544534
"Person": {
545535
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494001.json",

‎myuw/resources/sws/file/student/v5/enrollment.json_reg_id_9136CCB8F66711D5BE060004AC494002_verbose_true_transcriptable_course_all_changed_since_date_

-10
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"PendingHonorsChange": false,
4242
"PendingMajorChange": false,
4343
"PendingResidentChange": false,
44-
"PendingResidencyDescription": null,
45-
"PendingResident": "0",
4644
"PendingSpecialProgramChange": false,
4745
"Person": {
4846
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494002.json",
@@ -348,8 +346,6 @@
348346
"PendingHonorsChange": false,
349347
"PendingMajorChange": false,
350348
"PendingResidentChange": false,
351-
"PendingResidencyDescription": null,
352-
"PendingResident": "0",
353349
"PendingSpecialProgramChange": false,
354350
"Person": {
355351
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494002.json",
@@ -408,8 +404,6 @@
408404
"PendingHonorsChange": false,
409405
"PendingMajorChange": false,
410406
"PendingResidentChange": true,
411-
"PendingResidencyDescription": "NONRESIDENT IMMIGRANT",
412-
"PendingResident": "4",
413407
"PendingSpecialProgramChange": false,
414408
"Person": {
415409
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494002.json",
@@ -467,8 +461,6 @@
467461
"PendingHonorsChange": false,
468462
"PendingMajorChange": false,
469463
"PendingResidentChange": false,
470-
"PendingResidencyDescription": null,
471-
"PendingResident": "0",
472464
"PendingSpecialProgramChange": false,
473465
"Person": {
474466
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494002.json",
@@ -516,8 +508,6 @@
516508
"PendingHonorsChange": false,
517509
"PendingMajorChange": false,
518510
"PendingResidentChange": false,
519-
"PendingResidencyDescription": null,
520-
"PendingResident": "0",
521511
"PendingSpecialProgramChange": false,
522512
"Person": {
523513
"Href": "/student/v5/person/9136CCB8F66711D5BE060004AC494002.json",

0 commit comments

Comments
 (0)