Skip to content

Commit 9344788

Browse files
stevenc987stevenc987
authored
Merge pull request #1667 from stevenc987/main
NRO Decommissioning: Allow user to modify cancel from legacy side#25224
2 parents 43de7f7 + 3cf1c83 commit 9344788

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
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.21f'
1+
__version__ = '1.2.21g'
22

‎api/namex/resources/requests.py

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ def put(nr, *args, **kwargs):
742742
return make_response(jsonify(message='Data does not include a name choice 1'), 400)
743743
if not name_choice_exists[2] and name_choice_exists[3]:
744744
return make_response(jsonify(message='Data contains a name choice 3 without a name choice 2'), 400)
745-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
745+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
746746
try:
747747
existing_nr = RequestDAO.get_inprogress(user)
748748
if existing_nr:
@@ -770,7 +770,7 @@ def put(nr, *args, **kwargs):
770770
except Exception as e:
771771
current_app.logger.debug(f"Error parsing expirationDate: {str(e)}")
772772
pass
773-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
773+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
774774
# convert NWPTA dates to correct format
775775
if json_input.get('nwpta', None):
776776
for region in json_input['nwpta']:
@@ -789,7 +789,7 @@ def put(nr, *args, **kwargs):
789789
reset = False
790790
if nrd.furnished == RequestDAO.REQUEST_FURNISHED and json_input.get('furnished', None) == 'N':
791791
reset = True
792-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
792+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
793793
nrd.additionalInfo = convert_to_ascii(json_input.get('additionalInfo', None))
794794
nrd.consentFlag = json_input.get('consentFlag', None)
795795
nrd.consent_dt = json_input.get('consent_dt', None)
@@ -828,11 +828,11 @@ def put(nr, *args, **kwargs):
828828
nrd.previousRequestId = None
829829
except KeyError:
830830
nrd.previousRequestId = None
831-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
831+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
832832
# if we're changing to a completed or cancelled state, clear reset flag on NR record
833833
if state in State.COMPLETED_STATE + [State.CANCELLED]:
834834
nrd.hasBeenReset = False
835-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
835+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
836836
# check if any of the Oracle db fields have changed, so we can send them back
837837
is_changed__request = False
838838
is_changed__previous_request = False
@@ -856,7 +856,7 @@ def put(nr, *args, **kwargs):
856856
is_changed_consent = True
857857
if nrd.consentFlag == 'R':
858858
queue_util.publish_email_notification(nrd.nrNum, 'CONSENT_RECEIVED')
859-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
859+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
860860
# Need this for a re-open
861861
if nrd.stateCd != State.CONDITIONAL and is_changed__request_state:
862862
nrd.consentFlag = None
@@ -867,7 +867,7 @@ def put(nr, *args, **kwargs):
867867
### APPLICANTS ###
868868
is_changed__applicant = False
869869
is_changed__address = False
870-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
870+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
871871
if nrd.applicants:
872872
applicants_d = nrd.applicants[0]
873873
orig_applicant = applicants_d.as_dict()
@@ -895,7 +895,7 @@ def put(nr, *args, **kwargs):
895895
applicants_d.postalCd = convert_to_ascii(appl.get('postalCd', None))
896896
applicants_d.stateProvinceCd = convert_to_ascii(appl.get('stateProvinceCd', None))
897897
applicants_d.countryTypeCd = convert_to_ascii(appl.get('countryTypeCd', None))
898-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
898+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
899899
# check if any of the Oracle db fields have changed, so we can send them back
900900
if applicants_d.lastName != orig_applicant['lastName']:
901901
is_changed__applicant = True
@@ -931,12 +931,12 @@ def put(nr, *args, **kwargs):
931931
is_changed__address = True
932932
if applicants_d.countryTypeCd != orig_applicant['countryTypeCd']:
933933
is_changed__address = True
934-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
934+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
935935
else:
936936
applicants_d.delete_from_db()
937937
is_changed__applicant = True
938938
is_changed__address = True
939-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
939+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
940940

941941
### END applicants ###
942942

@@ -947,7 +947,7 @@ def put(nr, *args, **kwargs):
947947
is_changed__name2 = False
948948
is_changed__name3 = False
949949
deleted_names = [False] * 3
950-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
950+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
951951
if len(nrd.names) == 0:
952952
new_name_choice = Name()
953953
new_name_choice.nrId = nrd.id
@@ -956,23 +956,23 @@ def put(nr, *args, **kwargs):
956956
new_name_choice.name = convert_to_ascii(new_name_choice.name)
957957

958958
nrd.names.append(new_name_choice)
959-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
959+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
960960
for nrd_name in nrd.names:
961961

962962
orig_name = nrd_name.as_dict()
963963

964964
for in_name in json_input.get('names', []):
965-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
965+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
966966
if len(nrd.names) < in_name['choice']:
967967

968968
errors = names_schema.validate(in_name, partial=False)
969969
if errors:
970970
MessageServices.add_message(MessageServices.ERROR, 'names_validation', errors)
971971
# return make_response(jsonify(errors), 400
972-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
972+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
973973
# don't save if the name is blank
974974
if in_name.get('name') and in_name.get('name') != '':
975-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
975+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
976976
new_name_choice = Name()
977977
new_name_choice.nrId = nrd.id
978978
new_name_choice.choice = in_name.get('choice')
@@ -999,7 +999,7 @@ def put(nr, *args, **kwargs):
999999
is_changed__name3 = True
10001000

10011001
elif nrd_name.choice == in_name['choice']:
1002-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1002+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10031003
errors = names_schema.validate(in_name, partial=False)
10041004
if errors:
10051005
MessageServices.add_message(MessageServices.ERROR, 'names_validation', errors)
@@ -1020,48 +1020,48 @@ def put(nr, *args, **kwargs):
10201020
nrd_name.name = in_name.get('name')
10211021
nrd_name.state = in_name.get('state')
10221022
nrd_name.name = convert_to_ascii(nrd_name.name.upper())
1023-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1023+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10241024
# set comments (existing or cleared)
10251025
if in_name.get('comment', None) is not None:
10261026

10271027
# if there is a comment ID in data, just set it
10281028
if in_name['comment'].get('id', None) is not None:
10291029
nrd_name.commentId = in_name['comment'].get('id')
1030-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1030+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10311031

10321032
# if no comment id, it's a new comment, so add it
10331033
else:
1034-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1034+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10351035
# no business case for this at this point - this code will never run
10361036
pass
10371037

10381038
else:
10391039
nrd_name.comment = None
1040-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1040+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10411041
# convert data to ascii, removing data that won't save to Oracle
10421042
# - also force uppercase
10431043
nrd_name.name = convert_to_ascii(nrd_name.name)
10441044
if (nrd_name.name is not None):
10451045
nrd_name.name = nrd_name.name.upper()
1046-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1046+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10471047
# check if any of the Oracle db fields have changed, so we can send them back
10481048
# - this is only for editing a name from the Edit NR section, NOT making a decision
10491049
if nrd_name.name != orig_name['name']:
1050-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1050+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10511051
if nrd_name.choice == 1:
1052-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1052+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10531053
is_changed__name1 = True
10541054
json_input['comments'].append({'comment': 'Name choice 1 changed from {0} to {1}'
10551055
.format(orig_name['name'], nrd_name.name)})
10561056
if nrd_name.choice == 2:
1057-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1057+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10581058
is_changed__name2 = True
10591059
if not nrd_name.name:
10601060
deleted_names[nrd_name.choice - 1] = True
10611061
json_input['comments'].append({'comment': 'Name choice 2 changed from {0} to {1}'
10621062
.format(orig_name['name'], nrd_name.name)})
10631063
if nrd_name.choice == 3:
1064-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1064+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10651065
is_changed__name3 = True
10661066
if not nrd_name.name:
10671067
deleted_names[nrd_name.choice - 1] = True
@@ -1074,17 +1074,17 @@ def put(nr, *args, **kwargs):
10741074
# we only add new comments, we do not change existing comments
10751075
# - we can find new comments in json as those with no ID
10761076
# - This must come after names section above, to handle comments re. changed names.
1077-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1077+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10781078
for in_comment in json_input['comments']:
10791079
is_new_comment = False
10801080
try:
1081-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1081+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10821082
if in_comment['id'] is None or in_comment['id'] == 0:
10831083
is_new_comment = True
10841084
except KeyError:
10851085
is_new_comment = True
10861086
if is_new_comment and in_comment['comment'] is not None:
1087-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1087+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
10881088
new_comment = Comment()
10891089
new_comment.comment = convert_to_ascii(in_comment['comment'])
10901090
new_comment.examiner = user
@@ -1096,17 +1096,17 @@ def put(nr, *args, **kwargs):
10961096

10971097
is_changed__nwpta_ab = False
10981098
is_changed__nwpta_sk = False
1099-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1099+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11001100
if nrd.partnerNS.count() > 0:
11011101
for nrd_nwpta in nrd.partnerNS.all():
1102-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1102+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11031103

11041104
orig_nwpta = nrd_nwpta.as_dict()
11051105

11061106
for in_nwpta in json_input['nwpta']:
1107-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1107+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11081108
if nrd_nwpta.partnerJurisdictionTypeCd == in_nwpta['partnerJurisdictionTypeCd']:
1109-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1109+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11101110
errors = nwpta_schema.validate(in_nwpta, partial=False)
11111111
if errors:
11121112
MessageServices.add_message(MessageServices.ERROR, 'nwpta_validation', errors)
@@ -1138,21 +1138,21 @@ def put(nr, *args, **kwargs):
11381138

11391139
# if there were errors, abandon changes and return the set of errors
11401140
warning_and_errors = MessageServices.get_all_messages()
1141-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1141+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11421142
if warning_and_errors:
11431143
for we in warning_and_errors:
11441144
if we['type'] == MessageServices.ERROR:
11451145
return make_response(jsonify(errors=warning_and_errors), 400)
1146-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1146+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11471147
if reset:
11481148
nrd.expirationDate = None
11491149
nrd.consentFlag = None
11501150
nrd.consent_dt = None
11511151
is_changed__request = True
11521152
is_changed_consent = True
1153-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1153+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11541154
else:
1155-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1155+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11561156
change_flags = {
11571157
'is_changed__request': is_changed__request,
11581158
'is_changed__previous_request': is_changed__previous_request,
@@ -1168,33 +1168,33 @@ def put(nr, *args, **kwargs):
11681168
}
11691169

11701170
if any(value is True for value in change_flags.values()):
1171-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1171+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11721172
nrd.save_to_db()
1173-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1173+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11741174

11751175
# Delete any names that were blanked out
1176-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1176+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11771177
for nrd_name in nrd.names:
1178-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1178+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11791179
if deleted_names[nrd_name.choice - 1]:
11801180
nrd_name.delete_from_db()
1181-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1181+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11821182

11831183
# if there were errors, return the set of errors
11841184
warning_and_errors = MessageServices.get_all_messages()
1185-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1185+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11861186
if warning_and_errors:
11871187
for we in warning_and_errors:
11881188
if we['type'] == MessageServices.ERROR:
11891189
return make_response(jsonify(errors=warning_and_errors), 400)
11901190

11911191
# Finally save the entire graph
1192-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1192+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11931193
nrd.save_to_db()
1194-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1194+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11951195

11961196
EventRecorder.record(user, Event.PUT, nrd, json_input)
1197-
current_app.logger.debug(f"continue...stateCd: {0}".format(nrd.stateCd))
1197+
current_app.logger.debug('continue...stateCd: {}'.format(nrd.stateCd))
11981198

11991199
except ValidationError as ve:
12001200
return make_response(jsonify(ve.messages), 400)

0 commit comments

Comments
 (0)