Skip to content

Commit d91037b

Browse files
stevenc987stevenc987
committed
NRO Decommissioning: Allow user to modify cancel from legacy side#25224
Signed-off-by: Chen <Steven.Chen@gov.bc.ca>
1 parent 3cf1c83 commit d91037b

File tree

2 files changed

+51
-49
lines changed

2 files changed

+51
-49
lines changed

‎api/namex/VERSION.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = '1.2.21g'
1+
__version__ = '1.2.21h'
22

‎api/namex/resources/requests.py

Lines changed: 50 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -714,12 +714,12 @@ def put(nr, *args, **kwargs):
714714

715715
if state not in State.VALID_STATES:
716716
return make_response(jsonify({"message": "not a valid state"}), 406)
717-
717+
myStr = 'continue...stateCd: {}'
718718
try:
719719
user = get_or_create_user_by_jwt(g.jwt_oidc_token_info)
720720
nrd = RequestDAO.find_by_nr(nr)
721721

722-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
722+
current_app.logger.debug(myStr.format(nrd.stateCd))
723723
# current_app.logger.error("Error when replacing NR:{0} Err:{1}".format(nr, err))
724724
if not nrd:
725725
return make_response(jsonify({"message": "Request:{} not found".format(nr)}), 404)
@@ -733,7 +733,8 @@ def put(nr, *args, **kwargs):
733733

734734
if not valid_state_transition(user, nrd, state):
735735
return make_response(jsonify(message='you are not authorized to make these changes'), 401)
736-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
736+
737+
current_app.logger.debug(myStr.format(nrd.stateCd))
737738
name_choice_exists = {1: False, 2: False, 3: False}
738739
for name in json_input.get('names', None):
739740
if name['name'] and name['name'] != '':
@@ -742,7 +743,8 @@ def put(nr, *args, **kwargs):
742743
return make_response(jsonify(message='Data does not include a name choice 1'), 400)
743744
if not name_choice_exists[2] and name_choice_exists[3]:
744745
return make_response(jsonify(message='Data contains a name choice 3 without a name choice 2'), 400)
745-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
746+
747+
current_app.logger.debug(myStr.format(nrd.stateCd))
746748
try:
747749
existing_nr = RequestDAO.get_inprogress(user)
748750
if existing_nr:
@@ -770,7 +772,7 @@ def put(nr, *args, **kwargs):
770772
except Exception as e:
771773
current_app.logger.debug(f"Error parsing expirationDate: {str(e)}")
772774
pass
773-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
775+
current_app.logger.debug(myStr.format(nrd.stateCd))
774776
# convert NWPTA dates to correct format
775777
if json_input.get('nwpta', None):
776778
for region in json_input['nwpta']:
@@ -789,7 +791,7 @@ def put(nr, *args, **kwargs):
789791
reset = False
790792
if nrd.furnished == RequestDAO.REQUEST_FURNISHED and json_input.get('furnished', None) == 'N':
791793
reset = True
792-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
794+
current_app.logger.debug(myStr.format(nrd.stateCd))
793795
nrd.additionalInfo = convert_to_ascii(json_input.get('additionalInfo', None))
794796
nrd.consentFlag = json_input.get('consentFlag', None)
795797
nrd.consent_dt = json_input.get('consent_dt', None)
@@ -828,11 +830,11 @@ def put(nr, *args, **kwargs):
828830
nrd.previousRequestId = None
829831
except KeyError:
830832
nrd.previousRequestId = None
831-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
833+
current_app.logger.debug(myStr.format(nrd.stateCd))
832834
# if we're changing to a completed or cancelled state, clear reset flag on NR record
833835
if state in State.COMPLETED_STATE + [State.CANCELLED]:
834836
nrd.hasBeenReset = False
835-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
837+
current_app.logger.debug(myStr.format(nrd.stateCd))
836838
# check if any of the Oracle db fields have changed, so we can send them back
837839
is_changed__request = False
838840
is_changed__previous_request = False
@@ -856,7 +858,7 @@ def put(nr, *args, **kwargs):
856858
is_changed_consent = True
857859
if nrd.consentFlag == 'R':
858860
queue_util.publish_email_notification(nrd.nrNum, 'CONSENT_RECEIVED')
859-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
861+
current_app.logger.debug(myStr.format(nrd.stateCd))
860862
# Need this for a re-open
861863
if nrd.stateCd != State.CONDITIONAL and is_changed__request_state:
862864
nrd.consentFlag = None
@@ -867,7 +869,7 @@ def put(nr, *args, **kwargs):
867869
### APPLICANTS ###
868870
is_changed__applicant = False
869871
is_changed__address = False
870-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
872+
current_app.logger.debug(myStr.format(nrd.stateCd))
871873
if nrd.applicants:
872874
applicants_d = nrd.applicants[0]
873875
orig_applicant = applicants_d.as_dict()
@@ -895,7 +897,7 @@ def put(nr, *args, **kwargs):
895897
applicants_d.postalCd = convert_to_ascii(appl.get('postalCd', None))
896898
applicants_d.stateProvinceCd = convert_to_ascii(appl.get('stateProvinceCd', None))
897899
applicants_d.countryTypeCd = convert_to_ascii(appl.get('countryTypeCd', None))
898-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
900+
current_app.logger.debug(myStr.format(nrd.stateCd))
899901
# check if any of the Oracle db fields have changed, so we can send them back
900902
if applicants_d.lastName != orig_applicant['lastName']:
901903
is_changed__applicant = True
@@ -931,12 +933,12 @@ def put(nr, *args, **kwargs):
931933
is_changed__address = True
932934
if applicants_d.countryTypeCd != orig_applicant['countryTypeCd']:
933935
is_changed__address = True
934-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
936+
current_app.logger.debug(myStr.format(nrd.stateCd))
935937
else:
936938
applicants_d.delete_from_db()
937939
is_changed__applicant = True
938940
is_changed__address = True
939-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
941+
current_app.logger.debug(myStr.format(nrd.stateCd))
940942

941943
### END applicants ###
942944

@@ -947,7 +949,7 @@ def put(nr, *args, **kwargs):
947949
is_changed__name2 = False
948950
is_changed__name3 = False
949951
deleted_names = [False] * 3
950-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
952+
current_app.logger.debug(myStr.format(nrd.stateCd))
951953
if len(nrd.names) == 0:
952954
new_name_choice = Name()
953955
new_name_choice.nrId = nrd.id
@@ -956,23 +958,23 @@ def put(nr, *args, **kwargs):
956958
new_name_choice.name = convert_to_ascii(new_name_choice.name)
957959

958960
nrd.names.append(new_name_choice)
959-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
961+
current_app.logger.debug(myStr.format(nrd.stateCd))
960962
for nrd_name in nrd.names:
961963

962964
orig_name = nrd_name.as_dict()
963965

964966
for in_name in json_input.get('names', []):
965-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
967+
current_app.logger.debug(myStr.format(nrd.stateCd))
966968
if len(nrd.names) < in_name['choice']:
967969

968970
errors = names_schema.validate(in_name, partial=False)
969971
if errors:
970972
MessageServices.add_message(MessageServices.ERROR, 'names_validation', errors)
971973
# return make_response(jsonify(errors), 400
972-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
974+
current_app.logger.debug(myStr.format(nrd.stateCd))
973975
# don't save if the name is blank
974976
if in_name.get('name') and in_name.get('name') != '':
975-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
977+
current_app.logger.debug(myStr.format(nrd.stateCd))
976978
new_name_choice = Name()
977979
new_name_choice.nrId = nrd.id
978980
new_name_choice.choice = in_name.get('choice')
@@ -999,7 +1001,7 @@ def put(nr, *args, **kwargs):
9991001
is_changed__name3 = True
10001002

10011003
elif nrd_name.choice == in_name['choice']:
1002-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1004+
current_app.logger.debug(myStr.format(nrd.stateCd))
10031005
errors = names_schema.validate(in_name, partial=False)
10041006
if errors:
10051007
MessageServices.add_message(MessageServices.ERROR, 'names_validation', errors)
@@ -1020,48 +1022,48 @@ def put(nr, *args, **kwargs):
10201022
nrd_name.name = in_name.get('name')
10211023
nrd_name.state = in_name.get('state')
10221024
nrd_name.name = convert_to_ascii(nrd_name.name.upper())
1023-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1025+
current_app.logger.debug(myStr.format(nrd.stateCd))
10241026
# set comments (existing or cleared)
10251027
if in_name.get('comment', None) is not None:
10261028

10271029
# if there is a comment ID in data, just set it
10281030
if in_name['comment'].get('id', None) is not None:
10291031
nrd_name.commentId = in_name['comment'].get('id')
1030-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1032+
current_app.logger.debug(myStr.format(nrd.stateCd))
10311033

10321034
# if no comment id, it's a new comment, so add it
10331035
else:
1034-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1036+
current_app.logger.debug(myStr.format(nrd.stateCd))
10351037
# no business case for this at this point - this code will never run
10361038
pass
10371039

10381040
else:
10391041
nrd_name.comment = None
1040-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1042+
current_app.logger.debug(myStr.format(nrd.stateCd))
10411043
# convert data to ascii, removing data that won't save to Oracle
10421044
# - also force uppercase
10431045
nrd_name.name = convert_to_ascii(nrd_name.name)
10441046
if (nrd_name.name is not None):
10451047
nrd_name.name = nrd_name.name.upper()
1046-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1048+
current_app.logger.debug(myStr.format(nrd.stateCd))
10471049
# check if any of the Oracle db fields have changed, so we can send them back
10481050
# - this is only for editing a name from the Edit NR section, NOT making a decision
10491051
if nrd_name.name != orig_name['name']:
1050-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1052+
current_app.logger.debug(myStr.format(nrd.stateCd))
10511053
if nrd_name.choice == 1:
1052-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1054+
current_app.logger.debug(myStr.format(nrd.stateCd))
10531055
is_changed__name1 = True
10541056
json_input['comments'].append({'comment': 'Name choice 1 changed from {0} to {1}'
10551057
.format(orig_name['name'], nrd_name.name)})
10561058
if nrd_name.choice == 2:
1057-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1059+
current_app.logger.debug(myStr.format(nrd.stateCd))
10581060
is_changed__name2 = True
10591061
if not nrd_name.name:
10601062
deleted_names[nrd_name.choice - 1] = True
10611063
json_input['comments'].append({'comment': 'Name choice 2 changed from {0} to {1}'
10621064
.format(orig_name['name'], nrd_name.name)})
10631065
if nrd_name.choice == 3:
1064-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1066+
current_app.logger.debug(myStr.format(nrd.stateCd))
10651067
is_changed__name3 = True
10661068
if not nrd_name.name:
10671069
deleted_names[nrd_name.choice - 1] = True
@@ -1074,17 +1076,17 @@ def put(nr, *args, **kwargs):
10741076
# we only add new comments, we do not change existing comments
10751077
# - we can find new comments in json as those with no ID
10761078
# - This must come after names section above, to handle comments re. changed names.
1077-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1079+
current_app.logger.debug(myStr.format(nrd.stateCd))
10781080
for in_comment in json_input['comments']:
10791081
is_new_comment = False
10801082
try:
1081-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1083+
current_app.logger.debug(myStr.format(nrd.stateCd))
10821084
if in_comment['id'] is None or in_comment['id'] == 0:
10831085
is_new_comment = True
10841086
except KeyError:
10851087
is_new_comment = True
10861088
if is_new_comment and in_comment['comment'] is not None:
1087-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1089+
current_app.logger.debug(myStr.format(nrd.stateCd))
10881090
new_comment = Comment()
10891091
new_comment.comment = convert_to_ascii(in_comment['comment'])
10901092
new_comment.examiner = user
@@ -1096,17 +1098,17 @@ def put(nr, *args, **kwargs):
10961098

10971099
is_changed__nwpta_ab = False
10981100
is_changed__nwpta_sk = False
1099-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1101+
current_app.logger.debug(myStr.format(nrd.stateCd))
11001102
if nrd.partnerNS.count() > 0:
11011103
for nrd_nwpta in nrd.partnerNS.all():
1102-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1104+
current_app.logger.debug(myStr.format(nrd.stateCd))
11031105

11041106
orig_nwpta = nrd_nwpta.as_dict()
11051107

11061108
for in_nwpta in json_input['nwpta']:
1107-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1109+
current_app.logger.debug(myStr.format(nrd.stateCd))
11081110
if nrd_nwpta.partnerJurisdictionTypeCd == in_nwpta['partnerJurisdictionTypeCd']:
1109-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1111+
current_app.logger.debug(myStr.format(nrd.stateCd))
11101112
errors = nwpta_schema.validate(in_nwpta, partial=False)
11111113
if errors:
11121114
MessageServices.add_message(MessageServices.ERROR, 'nwpta_validation', errors)
@@ -1138,21 +1140,21 @@ def put(nr, *args, **kwargs):
11381140

11391141
# if there were errors, abandon changes and return the set of errors
11401142
warning_and_errors = MessageServices.get_all_messages()
1141-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1143+
current_app.logger.debug(myStr.format(nrd.stateCd))
11421144
if warning_and_errors:
11431145
for we in warning_and_errors:
11441146
if we['type'] == MessageServices.ERROR:
11451147
return make_response(jsonify(errors=warning_and_errors), 400)
1146-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1148+
current_app.logger.debug(myStr.format(nrd.stateCd))
11471149
if reset:
11481150
nrd.expirationDate = None
11491151
nrd.consentFlag = None
11501152
nrd.consent_dt = None
11511153
is_changed__request = True
11521154
is_changed_consent = True
1153-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1155+
current_app.logger.debug(myStr.format(nrd.stateCd))
11541156
else:
1155-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1157+
current_app.logger.debug(myStr.format(nrd.stateCd))
11561158
change_flags = {
11571159
'is_changed__request': is_changed__request,
11581160
'is_changed__previous_request': is_changed__previous_request,
@@ -1168,33 +1170,33 @@ def put(nr, *args, **kwargs):
11681170
}
11691171

11701172
if any(value is True for value in change_flags.values()):
1171-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1173+
current_app.logger.debug(myStr.format(nrd.stateCd))
11721174
nrd.save_to_db()
1173-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1175+
current_app.logger.debug(myStr.format(nrd.stateCd))
11741176

11751177
# Delete any names that were blanked out
1176-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1178+
current_app.logger.debug(myStr.format(nrd.stateCd))
11771179
for nrd_name in nrd.names:
1178-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1180+
current_app.logger.debug(myStr.format(nrd.stateCd))
11791181
if deleted_names[nrd_name.choice - 1]:
11801182
nrd_name.delete_from_db()
1181-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1183+
current_app.logger.debug(myStr.format(nrd.stateCd))
11821184

11831185
# if there were errors, return the set of errors
11841186
warning_and_errors = MessageServices.get_all_messages()
1185-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1187+
current_app.logger.debug(myStr.format(nrd.stateCd))
11861188
if warning_and_errors:
11871189
for we in warning_and_errors:
11881190
if we['type'] == MessageServices.ERROR:
11891191
return make_response(jsonify(errors=warning_and_errors), 400)
11901192

11911193
# Finally save the entire graph
1192-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1194+
current_app.logger.debug(myStr.format(nrd.stateCd))
11931195
nrd.save_to_db()
1194-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1196+
current_app.logger.debug(myStr.format(nrd.stateCd))
11951197

11961198
EventRecorder.record(user, Event.PUT, nrd, json_input)
1197-
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
1199+
current_app.logger.debug(myStr.format(nrd.stateCd))
11981200

11991201
except ValidationError as ve:
12001202
return make_response(jsonify(ve.messages), 400)

0 commit comments

Comments
 (0)