Merge branch 'feature/jipeihong' into 'master'

invite See merge request !6

Merge branch 'feature/jipeihong' into 'master'
invite See merge request !6
季培红
2 parents fecfea4e 57515b13
Showing 10 changed files with 228 additions and 14 deletions
README.md
tests/Staff_Management/AdminSettings/public_adminSettings.py
tests/Staff_Management/AdminSettings/test_jobSetting.py
tests/Staff_Management/AdminSettings/test_roleSetting.py
tests/Staff_Management/Invite/test_InvitationLetters.py
tests/Staff_Management/Invite/test_Invitation_authority.py
tests/Staff_Management/Organization/public_org.py
tests/Staff_Management/Organization/test_DepartmentMember.py
tests/Staff_Management/Organization/test_add_org.py
tests/Staff_Management/Organization/test_delete_org.py
@@ -38,4 +38,11 @@ git rebase feature/jipeihong
  
 rebase没问题就可以继续前面的git push命令了。
  
-rebase有问题的话需要解决下冲突。
 \ No newline at end of file
+rebase有问题的话需要解决下冲突。
+
+编码注意：
+1、Python测试文件前以'test_'命名；
+2、类之前不需要test，类名首字母大写；
+3、单词分割线用英文下划线‘_’，不要用中间线“-”；
+4、随机函数random；
+5、接口返回结果格式转换，以及结果中所需值的提取；
 \ No newline at end of file
+
+from atdd.PcPost import PcPost
+
+from atdd.PcPost import PcPost
+
+class JobSetting(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 岗位list——岗位管理页面
+    def test_getJobList(self):
+        interfaceUrl = "/Contact/Apicp/Job/List"
+        data = {
+            "page": 1,
+            "limit": 10
+        }
+        result = self.PcPost(interfaceUrl,data)
+        return result
+
+    # 获取所有岗位的ID，以list格式返回
+    def get_all_jobId(self):
+        jobList = self.test_getJobList()['result']['list']
+        jobIdList = []
+        for i in range(len(jobList)):
+            jobId = jobList[i]['jobId'].split()
+            # 将jobId加入到jobIdList中
+            jobIdList[len(jobIdList):len(jobIdList)] = jobId
+        return jobIdList
+
+    # 根据岗位名称获取岗位ID
+    def getJobID(self, jobName):
+        jobList = self.test_getJobList()['result']['list']
+        for i in range(len(jobList)):
+            if (jobList[i]['jobName'] == jobName):
+                jobId = jobList[i]['jobId']
+            else:
+                jobId = None
+            return jobId
+
+from atdd.PcPost import PcPost
+
+class RoleSetting(PcPost):
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 角色list——角色管理页面
+    def test_getRoleList(self):
+        interfaceUrl = "/Contact/Apicp/Role/List"
+        data = {
+            "page": 1,
+            "limit": 10
+        }
+        result = self.PcPost(interfaceUrl,data)
+        return result
+
+    # 获取所有角色的ID，以list格式返回
+    def get_all_roleId(self):
+        roleList = self.test_getRoleList()['result']['list']
+        roleIdList = []
+        for i in range(len(roleList)):
+            jobId = roleList[i]['roleId'].split()
+            # 将jobId加入到jobIdList中
+            roleIdList[len(roleIdList):len(roleIdList)] = jobId
+        return roleIdList
+
+    # 根据角色名称获取角色ID
+    def getRoleID(self, roleName):
+        roleList = self.test_getRoleList()['result']['list']
+        for i in range(len(roleList)):
+            if (roleList[i]['roleName'] == roleName):
+                roleId = roleList[i]['roleId']
+            else:
+                roleId = None
+            return roleId
+
+from atdd.PcPost import PcPost
+
+class InvitationLetter(PcPost):
+
+    interfaceUrl = "/contact/Apicp/Invite/Save"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_invitationLetter(self):
+        data = {
+            "content": "<p>欢迎加入【小仙女】！</p><p>这里是学习成长赋能新平台，深度整合公司资料、知识、技能、能力测评以及各种好"
+                       "玩的活动和服务，真正帮助大家达到能力提升、快速高效提高工作效能。</p><p>大家可以通过碎片化时间随时随地参与"
+                       "学习各种新知识、技能，了解公司新动态，公司构建平台的目的是希望同事们可以互动沟通，人人学习、人人分享，大家"
+                       "一起享受企业赋能的无限可能。</p><p>打通员工、公司总部、培训管理之间的时空距离，提升大家学习成长体验，打造"
+                       "不一样的共同成长氛围。333</p>",
+            "share_content": "点击链接加入“【小仙女】”，一起享受企业赋能之旅吧。222"
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        return result
+
+
+from atdd.PcPost import PcPost
+from tests.Staff_Management.AdminSettings.test_jobSetting import JobSetting
+from tests.Staff_Management.AdminSettings.test_roleSetting import RoleSetting
+import random
+
+class InvitationAuth(PcPost):
+
+    interfaceUrl = "/Public/Apicp/ChooseMem/ConfirmChoose"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    # 选择成员
+    def test_invitationauth_mem(self):
+        data = {
+            "_identifier": "yuanquan",
+            "memArray[0][memID]": self.jipeihong_uid
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+    # 选择岗位
+    def test_invitationauth_job(self):
+        jobIdList = JobSetting().get_all_jobId()
+        x = random.randint(0,len(jobIdList)-1)
+        data = {
+            "_identifier": "yuanquan",
+            "jobArray[0][jobID]": jobIdList[x]
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
+    # 选择角色
+    def test_invitationauth_role(self):
+        roleIdList = RoleSetting().get_all_roleId()
+        x = random.randint(0,len(roleIdList)-1)
+        data = {
+            "_identifier": "yuanquan",
+            "roleArray[0][roleID]": roleIdList[x]
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
+        return result
+
@@ -2,7 +2,9 @@
 from atdd.PcPost import PcPost
  
 class PulbicOrg(PcPost):
+    url_ListChildren = "/Contact/Apicp/Department/ListChildren"
  
+    # 获取顶级部门的ID
     def get_top_org(self):
         url = "/Contact/Apicp/Department/List"
         data = {
@@ -13,13 +15,12 @@ class PulbicOrg(PcPost):
         top_dpId = result['result']['list'][0]['dpId']
         return top_dpId
  
-    # 查找所有部门的dpId,包括顶级部门，以list格式返回
-    def get_all_dpId(self):
-        url = "/Contact/Apicp/Department/ListChildren"
+    # 查找某一个部门以及其子部门的dpId,以list格式返回
+    def get_all_dpId(self,dpParentId):
         data = {
-            "dpParentId":self.get_top_org()
+            "dpParentId":dpParentId
         }
-        result = self.PcPost(url,data)
+        result = self.PcPost(self.url_ListChildren,data)
         orglist = result['result']['list']     # 组织列表的list信息
         dpIdList = []
         for i in range(len(orglist)):
@@ -28,6 +29,16 @@ class PulbicOrg(PcPost):
             dpIdList[len(dpIdList):len(dpIdList)] = dpId
         return dpIdList
  
+    # 获取组织下的人员总数
+    def get_org_user_total(self,dpParentId):
+        data = {
+            "dpParentId": dpParentId
+        }
+        result = self.PcPost(self.url_ListChildren,data)
+        user_total = result['result']['list'][0]['user_total']
+        return user_total
+
+
  
  
  
+from atdd.PcPost import PcPost
+from tests.Staff_Management.Organization.public_org import PulbicOrg
+import random
+
+# 点击组织，跳转至人员列表页面，即查询该组织下的人员情况
+class DepartmentMember(PcPost):
+
+    interfaceUrl = "/contact/Apicp/User/DepartmentMember"
+
+    def setUp(self):
+        self.do_login(self.host, self.mobile, self.psw, self.domain)
+
+    def test_departmentMember(self):
+        top_Id = PulbicOrg().get_top_org()
+        dpId_all = PulbicOrg().get_all_dpId(top_Id)  # 所有部门的dpId
+        x = random.randint(0, len(dpId_all) - 1)  # 在所有部门中随机取一个部门
+        data = {
+            "department_id[0]": dpId_all[x]
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
 \ No newline at end of file
@@ -11,6 +11,8 @@ class AddOrg(PcPost):
     def setUp(self):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
+
+    # 添加非门店
     def test_add_org(self):
         x = random.randint(0,1000)
         top_dpId = PulbicOrg().get_top_org()
@@ -26,4 +28,31 @@ class AddOrg(PcPost):
         }
         result = self.PcPost(self.interfaceUrl,data)
         print(result)
-        return result
 \ No newline at end of file
+        return result
+
+    # 新增门店
+    def test_add_mendian(self):
+        x = random.randint(0,1000)
+        top_dpId = PulbicOrg().get_top_org()
+        data = {
+            "department_id": None,
+            "parent_id": top_dpId, # 顶级部门
+            "dp_name": "门店"+ str(x),
+            "is_all": 1,
+            "is_dept": 0,
+            "extList[755DD98A0A69039F18591A29234CC182]": 1,
+            "extList[755DD98B0A69039F18591A29737749E6]": 2,
+            "extList[755DD98C0A69039F18591A295933D690]": 1,
+            "extList[755DD98D0A69039F18591A2959748F91][province]": "山西省",
+            "extList[755DD98D0A69039F18591A2959748F91][city]": "晋城市",
+            "extList[755DD98D0A69039F18591A2959748F91][town]": "泽州县",
+            "extList[755DD98E0A69039F18591A2935DC27D1]": 222,
+            "extList[755DD98F0A69039F18591A2929431878]": 222,
+            "extList[755DD9900A69039F18591A298A2C8C20]": 22222,
+            "extList[755DD9920A69039F18591A29EFFCB47E]": 222,
+            "dpt_id": "755DD9880A69039F18591A294E089AC7",
+            "dp_serial_num": 33,
+            "dp_leader_uids[0]": self.jipeihong_uid
+        }
+        result = self.PcPost(self.interfaceUrl,data)
+        print(result)
@@ -12,19 +12,22 @@ class DeleteOrg(PcPost):
         self.do_login(self.host, self.mobile, self.psw, self.domain)
  
     def test_delete_org(self):
-        dpIdList = PulbicOrg().get_all_dpId()
-        if len(dpIdList)>1:
-            x = random.randint(0,len(dpIdList)-2) #从第一个组织ID到倒数第二个组织ID，去掉顶级部门
+        top_Id = PulbicOrg().get_top_org()
+        dpId_all = PulbicOrg().get_all_dpId(top_Id)   # 所有部门的dpId
+        x = random.randint(0, len(dpId_all)-1)    # 在所有部门中随机取一个部门
+        dpIdList = PulbicOrg().get_all_dpId(dpId_all[x])  #获取该部门以及子部门的ID
+        user_total = PulbicOrg().get_org_user_total(dpId_all[x]) # 获取该该部门的人员总数
+        if len(dpIdList)>1 or user_total>0 or len(dpId_all)==1 : # 如果存在子部门或人员 或只剩下顶级部门
+            code = 700
             data = {
                 "department_id": dpIdList[x]
             }
-            result = self.PcPost(self.interfaceUrl,data)
-        else: # 删除顶级部门
-            code = 700
+            result = self.PcPostAbnormal(self.interfaceUrl,data,code)
+        else: # 删除非顶级部门，且部门下无子部门和人员
             data = {
                 "department_id": dpIdList[0]  #顶级部门
             }
-            result = self.PcPostAbnormal(self.interfaceUrl,data,code)
+            result = self.PcPost(self.interfaceUrl,data)
             print(result)
         return result