eclinical-requester 1.0.16__tar.gz → 1.0.18__tar.gz

{eclinical_requester-1.0.16/src/eclinical_requester.egg-info → eclinical_requester-1.0.18}/PKG-INFO

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

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/api_requester/__init__.py

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

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/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()
@@ -62,6 +64,12 @@ class ApiRequester(BizBase):
             url = AppUrl(self.user.app, self.user.test_env).which_url(self.user.app)(api)
         else:
             url = AppUrl(self.user.app, self.user.test_env).external_url(api)
+        if self.user.test_env == "us.prod":
+            if method.lower() != "get":
+                raise Exception(
+                    f"Request method '{method.upper()}' is not allowed in the 'us.prod' environment. "
+                    "Only GET requests are permitted."
+                )
         return request(method, url, headers=self.headers, **kwargs)
 
     def user_replacer(self):

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/api_requester/docs/application.yaml

@@ -6,6 +6,7 @@ serverUrl:
   test01: http://test-01-app-01.chengdudev.edetekapps.cn
   us.dev: https://ec.eclinical-dev.edetekapps.com
   us.demo: https://ec4.ec4demo.edetekapps.com
+  us.prod: https://ec.eclinical.edetekapps.com
 
 admin:
   urlPrefix: /api/admin
@@ -44,4 +45,10 @@ imaging:
   urlPrefix: /api/imaging
 
 pv:
-  urlPrefix: /api/pv
+  urlPrefix: /api/pv
+
+procheck:
+  urlPrefix: /api/procheck
+
+cmd:
+  urlPrefix: /api/cmd

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/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直接调用接口
 

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/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)

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/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')
 

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/src/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.16 → eclinical_requester-1.0.18/src/eclinical_requester.egg-info}/PKG-INFO

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

{eclinical_requester-1.0.16 → eclinical_requester-1.0.18}/tests/test_api_requester.py

@@ -21,11 +21,23 @@ class TestApiRequester(unittest.TestCase):
                          app=AppEnum.CODING.code, company="For internal automated testing", role="DM")
         c.login()
 
+    @staticmethod
+    def test_procheck_login():
+        c = ApiRequester("CRC01", "Admin@123", "Edetek", None, "dev03", "dev",
+                         app=AppEnum.PROCHECK.code, company="Edetek", role="DM")
+        c.login()
+
+    @staticmethod
+    def test_cmd_login():
+        c = ApiRequester("CRC01", "Admin@123", None, None, "dev03", None,
+                         app=AppEnum.CMD.code, company="Edetek", company_level_login=True)
+        c.login()
+
     @staticmethod
     def test_ecoa_login():
         c = ApiRequester("CRC01", "7IG4CALi", app=AppEnum.EDC.code, test_env="dev03", ttype=EdcAppType.ECOA.name)
         c.login()
-        assert c.user.study == "CRN04894-13"
+        assert c.user.study == 'Study-229-2436'
         response = c.request("get", "/mobile/user/ecoa-study-language")
         assert response.json().get("payload")
 
@@ -34,7 +46,7 @@ class TestApiRequester(unittest.TestCase):
         c = ApiRequester("31176557", "886506", app=AppEnum.EDC.code, test_env="dev03", ttype=EdcAppType.EDIARY.name)
         c.login()
         response = c.request("get", "/study/information")
-        assert response.json().get("payload").get("name") == "CRN04894-13"
+        assert response.json().get("payload").get("name") == 'Study-229-2436'
 
     @staticmethod
     def test_ediary_login_with_org_code():