Skip to content

Commit a38a96f

Browse files
committed
fix: handle duplicates in query
1 parent 6b15c75 commit a38a96f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/aaz_dev/command/model/configuration/_command.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -327,12 +327,12 @@ def handle_duplicated_options(arguments, has_subresource, operation_id):
327327
def can_be_replaced(arg1, arg2):
328328
# check whether you need to replace argument
329329
ret = False
330-
if _can_replace_argument(arg1, arg2, has_subresource):
330+
if _compare_argument(arg1, arg2, has_subresource):
331331
arg2.ref_schema.arg = arg1.var
332332
dropped_args.add(arg2.var)
333333
ret = False
334334

335-
elif _can_replace_argument(arg2, arg1, has_subresource):
335+
elif _compare_argument(arg2, arg1, has_subresource):
336336
arg1.ref_schema.arg = arg2.var
337337
dropped_args.add(arg1.var)
338338
ret = True
@@ -365,12 +365,14 @@ def can_be_replaced(arg1, arg2):
365365
return [arg for var, arg in arguments.items() if var not in dropped_args]
366366

367367

368-
def _can_replace_argument(arg, old_arg, has_subresource):
368+
def _compare_argument(arg, old_arg, has_subresource):
369369
arg_prefix = arg.var.split('.')[0]
370370
old_prefix = old_arg.var.split('.')[0]
371371

372-
if old_prefix in (CMDArgBuildPrefix.Query, CMDArgBuildPrefix.Header, CMDArgBuildPrefix.Path):
373-
# replace argument should only be in body
372+
if old_prefix == CMDArgBuildPrefix.Query:
373+
return True
374+
375+
if old_prefix in (CMDArgBuildPrefix.Header, CMDArgBuildPrefix.Path):
374376
return False
375377

376378
if arg_prefix in (CMDArgBuildPrefix.Query, CMDArgBuildPrefix.Header):

0 commit comments

Comments
 (0)