Merge branch 'common_dev' into cuixin_dev

.gitignore

@@ -106,4 +106,7 @@ venv.bak/
 
 host.yaml
 .DS_Store
-*/.DS_Store
+*/.DS_Store
\ No newline at end of file
+
+# docmentatiion path
+test_backend_data/topic_data/topic_reply_create.yaml
\ No newline at end of file

all_backend_api/user_request.py

@@ -23,10 +23,11 @@ class user_request(BaseRequest):
     def __init__(self):
         self.data = self.api_load(path_setting.TOPIC_FAVOR_CONFIG)
 
-    #日记贴帖子相关-收藏
+    #  日记贴帖子相关-收藏
     def topic_favor(self):
         return self.api_send(self.data["favor"])
-    #日记贴取消收藏
+
+    #  日记贴取消收藏
     def topic_canclefavor(self):
         return self.api_send(self.data["canclefavor"])
 
@@ -36,7 +37,7 @@ class user_request(BaseRequest):
         self.params["from_live"] = from_live
         return self.api_send(self.data['follow_add'])
 
-    #取消关注
+    #  取消关注
     def follow_del(self,uid,from_live):
         self.params["uid"] = uid
         self.params["from_live"] = from_live
@@ -45,17 +46,15 @@ class user_request(BaseRequest):
 
 
 
-    #我的-日记
+    #  我的-日记
     def my_diary_v2(self, start_num, count):
 
         self.params["start_num"] = start_num
         self.params["count"] = count
 
-
-
         return self.api_send(self.data["my_diary_v2"])
 
-     # 我的-帖子-我发布的
+    # 我的-帖子-我发布的
     def user_tractate(self, page, count):
 
         self.params["page"] = page
@@ -64,7 +63,7 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["user_tractate"])
 
-     # 我的-帖子-我回复的
+    # 我的-帖子-我回复的
     def reply_tractate(self, page, count, version):
 
         self.params["page"] = page
@@ -75,7 +74,7 @@ class user_request(BaseRequest):
         return self.api_send(self.data["reply_tractate"])
 
 
-     # 我的-问题-提问
+    # 我的-问题-提问
     def my_question(self, start_num, count):
 
         self.params["start_num"] = start_num
@@ -84,7 +83,7 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["my_question"])
 
-     # 我的-收藏-商品
+    # 我的-收藏-商品
     def favors_services(self, start_num, count, current_city_id, device_id, version):
 
         self.params["start_num"] = start_num
@@ -95,7 +94,7 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["favors_services"])
 
-     # 我的-问题-回答
+    # 我的-问题-回答
     def my_answer(self, start_num, count):
 
         self.params["start_num"] = start_num
@@ -103,7 +102,7 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["my_answer"])
 
-     # 我的-收藏-日记本
+    # 我的-收藏-日记本
     def favors_diaries(self, start_num, count):
 
         self.params["start_num"] = start_num
@@ -111,7 +110,7 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["favors_diaries"])
 
-     # 我的-收藏-日记贴
+    # 我的-收藏-日记贴
     def favors_topics(self, start_num, count):
 
         self.params["start_num"] = start_num
@@ -119,7 +118,21 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["favors_topics"])
 
-     # 我的-收藏-帖子
+    # 签到--签到基础信息
+    def base_sign_data(self):
+        return self.api_send(self.data["base_sign_data"])
+
+    # 签到--签到兑换记录
+    def sign_exchanged(self):
+        return self.api_send(self.data["sign_exchanged"])
+
+    # 签到--日历
+    def sign_calendar(self,year='2021',month='8'):
+        self.params["year"] = year
+        self.params["month"] = month
+        return self.api_send(self.data["sign_calendar"])
+
+    # 我的-收藏-帖子
     def favors_tractate(self, page, count):
 
         self.params["page"] = page
@@ -127,7 +140,7 @@ class user_request(BaseRequest):
 
         return self.api_send(self.data["favors_tractate"])
 
-     # 我的-收藏-回答
+    # 我的-收藏-回答
     def favors_answers(self, page, count):
 
         self.params["page"] = page
@@ -137,6 +150,8 @@ class user_request(BaseRequest):
 
 
 
+
+
 if __name__ == '__main__':
     #个人中心
     print(user_request().personal_center())
@@ -173,12 +188,6 @@ if __name__ == '__main__':
     # 我的-收藏-日记贴
     print(user_request().favors_topics(0, 10))
 
-   # 我的-收藏-帖子
-    print(user_request().favors_tractate(1, 10))
-
-   # 我的-收藏-帖子
-    print(user_request().favors_answers(1, 10))
-
 
 
 

all_backend_api/user_request.yaml

@@ -157,6 +157,37 @@ favors_topics:
   isLogin: 1
 
 
+#签到--基础信息
+base_sign_data:
+  method: GET
+  url: /api/user/base_sign_data
+  params:
+  data: {}
+  json: {}
+  isLogin: 1
+
+
+#签到--奖品兑换记录
+sign_exchanged:
+  method: GET
+  url: /api/user/sign_exchanged
+  params:
+  data: {}
+  json: {}
+  isLogin: 1
+
+
+#签到--日历
+sign_calendar:
+  method: GET
+  url: /api/user/sign_calendar
+  params:
+    year: ${year}
+    month: ${month}
+  data: {}
+  json: {}
+  isLogin: 1
+
 # 我的-收藏-帖子
 favors_tractate:
   method: GET
@@ -178,4 +209,4 @@ favors_answers:
     count: ${count}
   data: {}
   json: {}
-  isLogin: 1
+  isLogin: 1
\ No newline at end of file

path_setting.py

@@ -148,6 +148,14 @@ FEED_TAB_SERVICE = os.path.join(BASE_DIR, "backend_auto/test_backend_data/janus_
 FEED_TAB_SERVICE_DOCTORS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/service_data", "home_feed.yaml")
 
 
+# 签到接口
+SIGN = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "base_sign_data.yaml")
+# 签到兑换记录
+SIGN_EXCHANGED = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "sign_exchanged.yaml")
+# 签到日历
+SIGN_CALENDAR = os.path.join(BASE_DIR, "backend_auto/test_backend_data/user_data", "sign_calendar.yaml")
+
+
 #搜索首页-热门搜索
 KEYWORDS_CONFIG = os.path.join(BASE_DIR, "backend_auto/all_backend_api", "search_request.yaml")
 KEYWORDS = os.path.join(BASE_DIR, "backend_auto/test_backend_data/search_data", "keywords.yaml")

test_backend_case/user_case/test_base_sign_data.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestBaseSignData:
+    data = BaseRequest().api_load(path_setting.SIGN)
+    base_sign_data_case, base_sign_data_data = get_ids(data, "base_sign_data")
+
+    @pytest.mark.parametrize("param", base_sign_data_data, ids=base_sign_data_case)
+    def test_favors_diaries(self, param):
+        r = user_request().base_sign_data()
+        assert r["error"] == param["assert"]
+        #  校验字段是否存在
+        # print(r["data"])
+        assert r["data"]["wait_time"] is not None and r["data"]["wait_time"] is not ""   # 是否关注
+        assert r["data"]["new_user"] is not None and r["data"]["new_user"] is not ""   # 是否关注
+        assert r["data"]["sign_status"] is not None and r["data"]["sign_status"] is not ""   # 是否关注
+        assert r["data"]["user_id"] is not None and r["data"]["user_id"] is not ""   # 是否关注
+        assert r["data"]["days_to_gift"] is not None and r["data"]["days_to_gift"] is not ""   # 是否关注
+
+
+# assert r["data"] is True
+

test_backend_case/user_case/test_sign_calendar.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestSignCalendar:
+    data = BaseRequest().api_load(path_setting.SIGN_CALENDAR)
+    sign_calendar_case, sign_calendar_data = get_ids(data, "sign_calendar")
+
+    @pytest.mark.parametrize("param", sign_calendar_data, ids=sign_calendar_case)
+    def test_favors_diaries(self, param):
+        r = user_request().sign_calendar()
+        assert r["error"] == param["assert"]
+        assert r["data"]["user_id"] is not None and r["data"]["user_id"] is not ""   # 判断用户名是否为空

test_backend_case/user_case/test_sign_exchanged.py

+import pytest
+
+from ids_list import get_ids
+import path_setting
+from in_common.base_request import BaseRequest
+from all_backend_api.user_request import user_request
+
+
+class TestSignExchanged:
+    data = BaseRequest().api_load(path_setting.SIGN_EXCHANGED)
+    sign_exchanged_case, sign_exchanged_data = get_ids(data, "sign_exchanged")
+
+    @pytest.mark.parametrize("param", sign_exchanged_data, ids=sign_exchanged_case)
+    def test_favors_diaries(self, param):
+        r = user_request().sign_exchanged()
+        assert r["error"] == param["assert"]
+        #  校验字段是否存在
+
+
+# assert r["data"] is True
+

test_backend_data/topic_data/topic_reply_create.yaml

@@ -3,7 +3,7 @@ reply_create:
   beuzhu: '# 备注： 这个文件有冲突的话，那个版本都行不会影响，回退/接受当前版本都行，因为每次运行content都会改变'
   case: 日记贴一级评论创建--正常校验&创建二级评论--正常校验
   channel: benzhan
-  content: ces测试+2021-08-03 14:52:31
+  content: ces测试+2021-08-03 15:01:46
   message: 请勿回复重复内容
   message1: 回复成功
   message2: 你的回复有点频繁，稍后再来

test_backend_data/user_data/base_sign_data.yaml

+base_sign_data:
+  #签到基础信息
+  - case: "签到基础信息"
+    assert: 0
\ No newline at end of file

test_backend_data/user_data/sign_calendar.yaml

+sign_calendar:
+  #签到日历
+  - case: "签到日历"
+    assert: 0
\ No newline at end of file

test_backend_data/user_data/sign_exchanged.yaml

+sign_exchanged:
+  #签到奖品兑换记录
+  - case: "签到奖品兑换记录"
+    assert: 0
\ No newline at end of file