From b1a24049f19a86e41360f0aad1df2e3fe09da2d1 Mon Sep 17 00:00:00 2001
From: chenyongzhiaaron <262667641@qq.com>
Date: Tue, 29 Aug 2023 15:37:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=87=BD=E6=95=B0=E5=A6=82{{random=5Fid=5Fca?=
 =?UTF-8?q?rd()}}=E4=B8=8D=E5=B8=A6=E5=8F=82=E6=95=B0=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=98=AF=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E5=87=BD=E6=95=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/api_project.iml                       |  4 +--
 common/bif_functions/bif_faker.py           |  2 +-
 common/data_analysis/dependent_parameter.py | 38 +++++++++++----------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.idea/api_project.iml b/.idea/api_project.iml
index dacc414..4523d19 100644
--- a/.idea/api_project.iml
+++ b/.idea/api_project.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
+    <option name="format" value="GOOGLE" />
+    <option name="myDocStringFormat" value="Google" />
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_FOLDERS">
diff --git a/common/bif_functions/bif_faker.py b/common/bif_functions/bif_faker.py
index a01565a..638713b 100644
--- a/common/bif_functions/bif_faker.py
+++ b/common/bif_functions/bif_faker.py
@@ -16,7 +16,7 @@ __all__ = [
     "random_string", "random_ssn",
     "random_email", "random_id_card",
     "random_int", "random_male_name",
-    "random_female_name", "random_current_time"
+    "random_female_name", "random_current_time",
 ]
 
 f = Faker(locale='Zh-CN')
diff --git a/common/data_analysis/dependent_parameter.py b/common/data_analysis/dependent_parameter.py
index 4a2dab2..a0a7d19 100644
--- a/common/data_analysis/dependent_parameter.py
+++ b/common/data_analysis/dependent_parameter.py
@@ -31,8 +31,11 @@ class DependentParameter(DataExtractor):
         """
 
         def execute_method_chain(obj, methods, args=None):
+            """处理参数为调用链的函数"""
             if not methods:
-                return obj(*args) if callable(obj) else obj
+                if args and args[0]:
+                    return obj(*args) if callable(obj) else obj
+                return obj() if callable(obj) else obj
             method_name, *remaining_methods = methods
             if hasattr(obj(), method_name) and callable(getattr(obj(), method_name)):
                 method = getattr(obj(), method_name)
@@ -40,14 +43,16 @@ class DependentParameter(DataExtractor):
             return None
 
         def get_method_call_and_method_names(strings):
+            """获取方法命名及参数列表"""
             first_method_call_match = self.FUNCTION_CALL_MATCHER.search(strings)
             if first_method_call_match:
                 first_method_call = "{{" + f'{first_method_call_match.group()}'.split("(")[0] + "()" + "}}"
                 first_fun = first_method_call_match.group()
                 args_string = self.ARGS_MATCHER.search(first_method_call_match.group())
+                # 获取字符串参数
                 args_list = args_string.group(1).split(',') if args_string else []
             else:
-                raise ParameterExtractionError(key, "在关联参数表中查询不到,请检查关联参数字段提取及填写是否正常")
+                raise ParameterExtractionError(strings, "在关联参数表中查询不到,请检查关联参数字段提取及填写是否正常")
 
                 # raise ValueError(f"函数写法错误：无法匹配函数调用格式，字符串为：{strings}")
             remaining_method_names = self.METHOD_NAME_MATCHER.findall(strings)
@@ -58,6 +63,7 @@ class DependentParameter(DataExtractor):
         json_string = json.dumps(json_string) if isinstance(json_string, (dict, list)) else json_string
         while self.PARAMETER_MATCHER.search(json_string):
             if self.FUNCTION_CHAIN_MATCHER.search(json_string):
+                # 匹配调用链
                 function_pattern = self.FUNCTION_CHAIN_MATCHER.search(json_string).group()
                 function_with_args, key, remaining_methods, args = get_method_call_and_method_names(function_pattern)
                 if key in self.get_environments().keys():
@@ -66,7 +72,6 @@ class DependentParameter(DataExtractor):
                     json_string = json_string.replace(function_pattern, str(obj))
                 else:
                     ParameterExtractionError(key, "在关联参数表中查询不到,请检查关联参数字段提取及填写是否正常")
-                    # logger.error(f"函数key:{key},在关联参数表中查询不到,请检查关联参数字段提取及填写是否正常\n")
                     break
             else:
                 key = self.PARAMETER_MATCHER.search(json_string)
@@ -81,20 +86,21 @@ class DependentParameter(DataExtractor):
                     json_string = json_string.replace(key.group(), str(obj))
                 else:
                     ParameterExtractionError(key, "在关联参数表中查询不到,请检查关联参数字段提取及填写是否正常")
-                    # logger.error(f"字符串key:{key},字符串在关联参数表中查询不到,请检查关联参数字段提取及填写是否正常\n")
                     break
             json_string = json_string.replace("True", "true").replace("False", "false")
         if self.BRACE_MATCHER.search(json_string) and not self.FUNCTION_CHAIN_MATCHER.search(json_string):
             try:
                 json_string = json.loads(json_string)
             except json.JSONDecodeError as e:
-                ResponseJsonConversionError(json_string,e)
-                # logger.error(f"JSONDecodeError:{json_string}:{e}")
+                ResponseJsonConversionError(json_string, e)
         return json_string
 
 
 if __name__ == '__main__':
-    from common.utils.environments import Environments
+    from common.validation import loaders
+    from common import bif_functions
+
+    loader = loaders.Loaders()
 
     dps = {
         "{{var_a}}": "foo",
@@ -105,13 +111,8 @@ if __name__ == '__main__':
         "{{var_f}}": ["baz", False],
         "{{var_g}}": {'g': 'gg', 'g1': 'gg', 'g2': 'gg2'}
     }
-
-    d = Environments()
-    d.set_environments(dps)
-    from common.validation import loaders
-    from common import bif_functions
-
-    loaders.Loaders().set_bif_fun(bif_functions)
+    loader.set_environments(dps)
+    loader.set_bif_fun(bif_functions)
     dat = {
         "a": "{{var_a}}",
         "b": {"c": "{{var_c}}", "d": "{{var_d}}", "e": ["{{var_e_1}}", "{{var_e_2}}"]},
@@ -119,8 +120,9 @@ if __name__ == '__main__':
         "g": "{{var_g}}",
         "t": "{{get_timestamp()}}",
         "fk": "{{fk().email()}}",
-        "rt": "{{fk().ean(length=13)}}",
-        "st": "{{ms_fmt_hms(2000)}}"
+        "ft": "{{fk().ean(length=13)}}",
+        "st": "{{ms_fmt_hms(2000)}}",
+        "time": "{{random_id_card()}}",
     }
-    d = DependentParameter()
-    print(d.replace_dependent_parameter(dat))
+    ret = loader.replace_dependent_parameter(dat)
+    print(ret)