From fd0c4b215a0a9969475859905da5fa2a7421e30c Mon Sep 17 00:00:00 2001 From: liming <1084611818@qq.com> Date: Sun, 26 May 2024 03:30:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90admin=5Forder=5Fservice?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/admin_order_service.py | 41 ++++++++ service/admin_order_service_test.py | 149 ++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/service/admin_order_service.py b/service/admin_order_service.py index e69de29..7191c4d 100644 --- a/service/admin_order_service.py +++ b/service/admin_order_service.py @@ -0,0 +1,41 @@ +from typing import List +import requests +from service.common import * +from dataclasses import dataclass, asdict + + +def get_all_orders(client: requests.Session,host: str): + """ + GET + /api/v1/adminorderservice/adminorder + """ + url = "/api/v1/adminorderservice/adminorder" + response = client.request(url=host + url, method='GET', + headers={"Accept": "*/*"}) + return response.json() + +def add_order(client: requests.Session,order:dict,host: str): + """ + POST + /api/v1/adminorderservice/adminorder + """ + url = "/api/v1/adminorderservice/adminorder" + response = client.request(url=host + url, method='POST', + headers={"Accept": "*/*"},json=order) + return response.json() + +def update_order(client: requests.Session,order:dict,host: str): + url = "/api/v1/adminorderservice/adminorder" + response = client.request(url=host + url, method='PUT',json=order) + return response.json() + +def delete_order(client: requests.Session,orderId:str,trainNumber:str,host: str): + url = f"/api/v1/adminorderservice/adminorder/{orderId}/{trainNumber}" + response=client.request(url=host+url, method='DELETE') + return response.json() + +def get_welcome(client: requests.Session,host: str): + url = "/api/v1/adminorderservice/welcome" + response=client.request(url=host+url, method='GET', + headers={"Accept": "*/*"}) + return response.text diff --git a/service/admin_order_service_test.py b/service/admin_order_service_test.py index e69de29..bf366f1 100644 --- a/service/admin_order_service_test.py +++ b/service/admin_order_service_test.py @@ -0,0 +1,149 @@ +import requests +import uuid + +from service.admin_order_service import * +from dataclasses import dataclass, asdict +from service.auth_service import users_login + +BASE_URL = "http://10.10.10.220:31948" + +headers = { + 'Proxy-Connection': 'keep-alive', + 'Accept': 'application/json', + 'X-Requested-With': 'XMLHttpRequest', + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36', + 'Content-Type': 'application/json', + 'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8', + 'Connection': 'keep-alive', +} + +@dataclass +class DtoLoginUser(DataclassInstance): + password: str + username: str + verificationCode: str + +def test_get_all_orders(): + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + result = get_all_orders(client, BASE_URL) + print(len(result['data'])) + assert result['msg'] == 'Get the orders successfully!' + +def test_add_order(): + client = requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + + newOrder = { + "accountId": str(uuid.uuid4()), + "boughtDate": "string", + "coachNumber": 0, + "contactsDocumentNumber": "string", + "contactsName": "string", + "differenceMoney": "string", + "documentType": 0, + "from": "string", + "id": str(uuid.uuid4()), + "price": "string", + "seatClass": 0, + "seatNumber": "string", + "status": 0, + "to": "string", + "trainNumber": "string", + "travelDate": "string", + "travelTime": "string" + } + ret = add_order(client,newOrder,BASE_URL) + assert ret['msg'] == 'Success' + +def test_update_order(): + client = requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + newOrder = { + "accountId": "string", + "boughtDate": "string", + "coachNumber": 0, + "contactsDocumentNumber": "string", + "contactsName": "string", + "differenceMoney": "string", + "documentType": 0, + "from": "string", + "id": '3ddae130-38c1-4e8e-abee-11d83f87561f', + "price": "string", + "seatClass": 0, + "seatNumber": "string", + "status": 0, + "to": "string", + "trainNumber": "string", + "travelDate": "string", + "travelTime": "string" + } + ret = update_order(client,newOrder,BASE_URL) + assert ret['msg'] == 'Success' + +def test_delete_order(): + orderID='e1cfc963-4324-47ee-9846-f0362df2861d' + trainNumber='G1237' + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + ret = delete_order(client,orderID,trainNumber,BASE_URL) + assert ret['msg'] == 'Delete Order Success' + +def test_get_welcome(): + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + ret = get_welcome(client,BASE_URL) + assert ret == 'Welcome to [Admin Order Service] !' + +def test_whole_chain(): + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + + newOrderId = str(uuid.uuid4()) + + newOrder = { + "accountId": str(uuid.uuid4()), + "boughtDate": "string", + "coachNumber": 0, + "contactsDocumentNumber": "string", + "contactsName": "string", + "differenceMoney": "string", + "documentType": 0, + "from": "string", + "id": newOrderId, + "price": "string", + "seatClass": 0, + "seatNumber": "string", + "status": 0, + "to": "string", + "trainNumber": "U23", + "travelDate": "string", + "travelTime": "string" + } + + ret = get_welcome(client,BASE_URL) + assert ret == 'Welcome to [Admin Order Service] !' + ret = add_order(client,newOrder,BASE_URL) + assert ret['msg'] == 'Success' + ret = update_order(client,newOrder,BASE_URL) + assert ret['msg']=='Success' + ret = delete_order(client,newOrderId,'U23',BASE_URL) + assert ret['msg'] == 'Delete Order Success' From cf8b4c67f97e9d01a7cda55c965292c181abcf0b Mon Sep 17 00:00:00 2001 From: liming <1084611818@qq.com> Date: Wed, 29 May 2024 20:25:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?travel=E9=83=A8=E5=88=86=E5=88=9D=E7=89=88?= =?UTF-8?q?=EF=BC=88=E6=9C=AADubug=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/admin_order_service_test.py | 39 +++++----- service/admin_travel_service.py | 29 ++++++++ service/admin_travel_service_test.py | 104 +++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 20 deletions(-) create mode 100644 service/admin_travel_service_test.py diff --git a/service/admin_order_service_test.py b/service/admin_order_service_test.py index bf366f1..5d64034 100644 --- a/service/admin_order_service_test.py +++ b/service/admin_order_service_test.py @@ -30,7 +30,7 @@ def test_get_all_orders(): token=users_login(client, basic_auth_dto, headers, BASE_URL) client.headers.update({'Authorization': f'Bearer {token}'}) result = get_all_orders(client, BASE_URL) - print(len(result['data'])) + print(result['data']) assert result['msg'] == 'Get the orders successfully!' def test_add_order(): @@ -48,13 +48,13 @@ def test_add_order(): "contactsName": "string", "differenceMoney": "string", "documentType": 0, - "from": "string", + "from": "beijing", "id": str(uuid.uuid4()), "price": "string", "seatClass": 0, "seatNumber": "string", "status": 0, - "to": "string", + "to": "shanghai", "trainNumber": "string", "travelDate": "string", "travelTime": "string" @@ -69,23 +69,22 @@ def test_update_order(): token=users_login(client, basic_auth_dto, headers, BASE_URL) client.headers.update({'Authorization': f'Bearer {token}'}) newOrder = { - "accountId": "string", - "boughtDate": "string", - "coachNumber": 0, - "contactsDocumentNumber": "string", - "contactsName": "string", - "differenceMoney": "string", - "documentType": 0, - "from": "string", - "id": '3ddae130-38c1-4e8e-abee-11d83f87561f', - "price": "string", - "seatClass": 0, - "seatNumber": "string", - "status": 0, - "to": "string", - "trainNumber": "string", - "travelDate": "string", - "travelTime": "string" + "boughtDate": "string", + "coachNumber": 0, + "contactsDocumentNumber": "string", + "contactsName": "string", + "differenceMoney": "string", + "documentType": 0, + "from": "string", + "id": '3ddae130-38c1-4e8e-abee-11d83f87561f', + "price": "string", + "seatClass": 0, + "seatNumber": "string", + "status": 0, + "to": "string", + "trainNumber": "string", + "travelDate": "string", + "travelTime": "string" } ret = update_order(client,newOrder,BASE_URL) assert ret['msg'] == 'Success' diff --git a/service/admin_travel_service.py b/service/admin_travel_service.py index e69de29..d316020 100644 --- a/service/admin_travel_service.py +++ b/service/admin_travel_service.py @@ -0,0 +1,29 @@ +import requests + +def get_all_travels(client: requests.Session,host: str): + url = "/api/v1/admintravelservice/admintravel" + response = client.request(url=host + url, method='GET', + headers={"Accept": "*/*"}) + return response.json() + +def add_travel(client: requests.Session,travel:dict,host: str): + url = "/api/v1/admintravelservice/admintravel" + response = client.request(url=host + url, method='POST', + headers={"Accept": "*/*"},json=travel) + return response.json() + +def update_travel(client: requests.Session,travel:dict,host: str): + url = "/api/v1/admintravelservice/admintravel" + response = client.request(url=host + url, method='PUT',json=travel) + return response.json() + +def delete_travel(client: requests.Session,tripId:str,host: str): + url = f"/api/v1/admintravelservice/admintravel/{tripId}" + response=client.request(url=host+url, method='DELETE') + return response.json() + +def get_welcome(client: requests.Session,host: str): + url = "/api/v1/admintracelservice/welcome" + response=client.request(url=host+url, method='GET', + headers={"Accept": "*/*"}) + return response.text \ No newline at end of file diff --git a/service/admin_travel_service_test.py b/service/admin_travel_service_test.py new file mode 100644 index 0000000..5ba4497 --- /dev/null +++ b/service/admin_travel_service_test.py @@ -0,0 +1,104 @@ +import uuid + +from service import DataclassInstance +from service.admin_travel_service import * +from dataclasses import dataclass +from service.auth_service import users_login + +BASE_URL = "http://10.10.10.220:31948" + +headers = { + 'Proxy-Connection': 'keep-alive', + 'Accept': 'application/json', + 'X-Requested-With': 'XMLHttpRequest', + 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36', + 'Content-Type': 'application/json', + 'Accept-Language': 'zh-CN,zh;q=0.9,en;q=0.8', + 'Connection': 'keep-alive', +} + +@dataclass +class DtoLoginUser(DataclassInstance): + password: str + username: str + verificationCode: str + +def test_get_all_travels(): + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + result = get_all_travels(client, BASE_URL) + print(result['data']) + assert result['msg'] == 'Travel Service Admin Query All Travel Success' + +def test_add_order(): + client = requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + + newOrder = { + "endTime": "string", + "loginId": "string", + "routeId": "string", + "startStationName": "string", + "startTime": "string", + "stationsName": "string", + "terminalStationName": "string", + "trainTypeName": "string", + "tripId": "string" + } + + ret = add_travel(client,newOrder,BASE_URL) + assert ret['msg'] == 'Success' + +def test_update_travel(): + client = requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + newTravel = { + "accountId": "4d2a46c7-71cb-4cf1-b5bb-b68406d9da6f", + "boughtDate": "string", + "coachNumber": 0, + "contactsDocumentNumber": "string", + "contactsName": "string", + "differenceMoney": "string", + "documentType": 0, + "from": "string", + "id": '76f5c408-0b16-48a4-9eb5-38693c7cd823', + "price": "string", + "seatClass": 0, + "seatNumber": "string", + "status": 0, + "to": "string", + "trainNumber": "string", + "travelDate": "string", + "travelTime": "string" + } + ret = update_travel(client,newTravel,BASE_URL) + assert ret['msg'] == 'Success' + +def test_delete_travel(): + travelId='76f5c408-0b16-48a4-9eb5-38693c7cd823' + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + ret = delete_travel(client,travelId,BASE_URL) + print(ret) + assert ret['msg'] == 'Delete Order Success' + +def test_get_welcome(): + client=requests.Session() + basic_auth_dto=DtoLoginUser(username='admin', + password='222222', verificationCode="123") + token=users_login(client, basic_auth_dto, headers, BASE_URL) + client.headers.update({'Authorization': f'Bearer {token}'}) + ret = get_welcome(client,BASE_URL) + assert ret == 'Welcome to [Admin Order Service] !' \ No newline at end of file