eclinical-requester 1.0.17__py3-none-any.whl → 1.0.18__py3-none-any.whl

api_requester/__init__.py

@@ -6,4 +6,4 @@
 @Description: Description
 @File: __init__.py.py
 """
-__version__ = "1.0.17"
+__version__ = "1.0.18"

api_requester/core/call_api.py

@@ -22,7 +22,8 @@ from api_requester.utils.placeholder_replacer import PlaceholderReplacer
 class ApiRequester(BizBase):
 
     def __init__(self, username=None, password=None, sponsor=None, study=None, test_env=None, app_env=None, app=None,
-                 company=None, role=None, external=False, ttype=None, org_code=None, token=None):
+                 company=None, role=None, external=False, ttype=None, org_code=None, token=None,
+                 company_level_login=False):
         u = EClinicalUser(
             username=username,
             password=password,
@@ -36,6 +37,7 @@ class ApiRequester(BizBase):
             external=external,
             org_code=org_code,
             token=token,
+            company_level_login=company_level_login,
         )
         super().__init__(u)
         self.headers = dict()

api_requester/docs/application.yaml

@@ -45,4 +45,10 @@ imaging:
   urlPrefix: /api/imaging
 
 pv:
-  urlPrefix: /api/pv
+  urlPrefix: /api/pv
+
+procheck:
+  urlPrefix: /api/procheck
+
+cmd:
+  urlPrefix: /api/cmd

api_requester/dto/user.py

@@ -11,7 +11,7 @@
 class EClinicalUser:
 
     def __init__(self, username=None, password=None, sponsor=None, study=None, test_env=None, app_env=None, app=None,
-                 company=None, role=None, external=False, org_code=None, token=None):
+                 company=None, role=None, external=False, org_code=None, token=None, company_level_login=False):
         # username 用户名
         # password 密码
         # app 访问的系统
@@ -28,7 +28,7 @@ class EClinicalUser:
         self.company = company
         self.role = role
         self.external = external
-        self.company_level_login = False
+        self.company_level_login = company_level_login
         self.org_code = org_code
         self.token = token  # 使用token直接调用接口
 

api_requester/http/authorize.py

@@ -88,6 +88,7 @@ class Authorize(BizBase, AdminAuthService, AdminUserOnBoardApplicationServiceImp
     def _user_onboard(self, company_id):
         user_onboard_dto = UserOnBoardDto(-1)
         user_onboard_dto.workForCompanyId = company_id
+        user_onboard_dto.companyLevelLogin = self.user.company_level_login
         self._build_user_onboard_dto(user_onboard_dto)
         self.user_onboard_dto = user_onboard_dto
         response = self.on_board(user_onboard_dto)

api_requester/http/gateway.py

@@ -27,6 +27,8 @@ _api = {
     AppEnum.CODING.code: (AppEnum.CODING.code,),
     AppEnum.IMAGING.code: (AppEnum.IMAGING.code,),
     AppEnum.PV.code: (AppEnum.PV.code,),
+    AppEnum.PROCHECK.code: (AppEnum.PROCHECK.code,),
+    AppEnum.CMD.code: (AppEnum.CMD.code,),
 }
 apis = LookupDict(name='api')
 

api_requester/utils/constant.py

@@ -29,6 +29,7 @@ class AppEnum(Enum):
     IMAGING = (11, "imaging", "Eclinical IMAGING System")
     CMD = (12, "cmd", "Eclinical CMD System")
     IRC = (13, "irc", "Eclinical IRC System")
+    PROCHECK = (14, "procheck", "Eclinical PROCHECK System")
 
 
 class UserType(Enum):

{eclinical_requester-1.0.17.dist-info → eclinical_requester-1.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eclinical_requester
-Version: 1.0.17
+Version: 1.0.18
 Summary: edetek api requester
 Home-page: http://example.com
 Author: xiaodong.li

{eclinical_requester-1.0.17.dist-info → eclinical_requester-1.0.18.dist-info}/RECORD

@@ -1,6 +1,6 @@
-api_requester/__init__.py,sha256=B1TzOxSfBYnxEOYd0J5PiyZM1DzrIC-yyWUKrNYqRiI,176
+api_requester/__init__.py,sha256=7_QHgcPUgIhFOvFygM3CUPs7NgPM5qkM7w4eBnML2gQ,176
 api_requester/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/core/call_api.py,sha256=do8wsRAkwTC6Xw9ZuPE6iATNSrzpIIz9mLBF5NsgDSY,3102
+api_requester/core/call_api.py,sha256=DdCrvaIRlFFs4DJnL5-Fh29mmUS-G-IE_SRLIdKGUL0,3201
 api_requester/core/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/core/admin/api/auth_api.py,sha256=dKKOuEnXIKgzhUfaNfSzNm24LREUcvPZ28xxTZisY6w,861
@@ -33,23 +33,23 @@ api_requester/core/common/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 api_requester/core/common/service/ecoa_auth_service.py,sha256=MyBqf76IcD0Aj7sjN1DmdJccoSeCjRONxrySuR3nW30,1459
 api_requester/core/common/service/subject_auth_service.py,sha256=jSoCH9m4f_UKUcTWbXb1J0I2WcSCgSiEA_EnCqglJog,867
 api_requester/core/common/service/system_env_service.py,sha256=SIKQCG2tIf1s4dUsSiFvOMAgai6JQ-xRP5HJ8MKF3Ts,787
-api_requester/docs/application.yaml,sha256=9wLlDZY-xzOweUJ3WfA0PqNtB41V--kjp4l3Scgd6hc,1199
+api_requester/docs/application.yaml,sha256=xdOKz2HR7DqK8xkfFpMCcYa069QeVob6pQeH1Es7T24,1273
 api_requester/dto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/dto/base_dto.py,sha256=nyBGidUblKE6MSK-yvcVSlYDyqPbIEdXiTOvymcFZp0,6904
 api_requester/dto/biz_base.py,sha256=4lzf6FoXCNBr0OlxbFryf-7v16wfP3Hv6c7WUh-DgNs,874
-api_requester/dto/user.py,sha256=M27az447jYRSMJScDzUrP4tUduI22SpGCMe-oZlDTN8,1446
+api_requester/dto/user.py,sha256=yORSU0fqvArc20fzsFbISPiyhmf3IOdl0n0C0b895Wk,1487
 api_requester/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_requester/http/app_url.py,sha256=jTGwxPcu_yts4WZbE9wDl6HqGOB48BdEIGw4Otmo1F0,939
-api_requester/http/authorize.py,sha256=SVYT_iat85RfgR4VJ9dmVC3TnWH-QTxIgDmpz8PAp1s,7873
+api_requester/http/authorize.py,sha256=YJWyn_jZvEbzVl9lFAOeuQcEfQZUpkLrXHI_W48rqGo,7949
 api_requester/http/authorize_ecoa.py,sha256=7KPjkCLp4xjMFybT66GSqhIeelGtn2sP-DokydBuQiI,3940
 api_requester/http/authorize_ediary.py,sha256=zWNR-4Z8jg0ytYmoZJ9upFQIjKMCsv49Qp8gj846mBc,2935
 api_requester/http/eclinical_requests.py,sha256=JUQ7EPeAvspz-J6GvpoVM2kA4hyGN4AP166hyQlmeFM,9640
 api_requester/http/exceptions.py,sha256=BG0eSOkYT50Qib_PpjSrNWkcv9p9gBanOvXOWrP7Jz8,2685
-api_requester/http/gateway.py,sha256=Ntnj-3OtyKLoGpkcCczMWQ0-0XrS5J_qkEcc9jB5AUk,3676
+api_requester/http/gateway.py,sha256=IIEoQolFFsh0O1nXhJOXhLju2ZxAdQfPw4HJVv3kYGk,3774
 api_requester/http/sample_headers.py,sha256=4a2z0ITPvnNhXiX0xZHfcexiRQdkIvEv8YUK-eGRwDU,705
 api_requester/http/token_manager.py,sha256=sQO4zd3smA0XfmEndBwXs-8rRCmjkEU48S8jWxxXevA,919
 api_requester/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_requester/utils/constant.py,sha256=SpHGa9pwLsqUMWc64U6HuDq2K1S-Q1z9hRxW1cq896k,2506
+api_requester/utils/constant.py,sha256=y_hiEGVVZ3RXjyNSz2L-N55eI8ULDu6iu7-WiRZr4wI,2568
 api_requester/utils/decrypt.py,sha256=21JPFY3VX010KgjH3DvmzGG_-YZeVXklGKaulcYPJ0Q,1007
 api_requester/utils/json_utils.py,sha256=0fTXGESYxuiHv4ezx_iIrmXv2qwb3Ozd1qRIXenToOQ,2614
 api_requester/utils/lib.py,sha256=wOXU4hB1tFPHT2X96zmVUfEb7hulowDVO8BN5kV9OpA,14429
@@ -59,8 +59,8 @@ api_requester/utils/placeholder_replacer.py,sha256=umNGeA1KCQ6Ewzsv1xEehLmHtKkgv
 api_requester/utils/read_file.py,sha256=M4oskAPDzefeVXfhhNmLe4GOjBKNi9WJLF4k474CTlo,2304
 api_requester/utils/rsa.py,sha256=dr2m3a2M_LYu1Us97EEiMcjZAkpn1yWKIOjyYYubZeg,1202
 api_requester/utils/time_utils.py,sha256=u1hHO0POBhdXaTQ7VGY_2YjaYxwlrWXGb5phP8iLfOY,579
-eclinical_requester-1.0.17.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-eclinical_requester-1.0.17.dist-info/METADATA,sha256=Mk8PeBKz4arTXZOMFMilW4qJlFZIq9Zi-ndq2nbyKIw,719
-eclinical_requester-1.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eclinical_requester-1.0.17.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
-eclinical_requester-1.0.17.dist-info/RECORD,,
+eclinical_requester-1.0.18.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+eclinical_requester-1.0.18.dist-info/METADATA,sha256=MxLDIpuMcW1IBOI2qgvz6fk25iZH9P-OdY1lJ-hsruo,719
+eclinical_requester-1.0.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eclinical_requester-1.0.18.dist-info/top_level.txt,sha256=nM6wDThrKcbLCcBGrTBPPtstqV97VyITV-YiKLoUG0U,14
+eclinical_requester-1.0.18.dist-info/RECORD,,